fix: 选择柜子类型按钮不显示

app/src/main/java/com/emato/ich/MainActivity.java

@@ -312,7 +312,7 @@ public class MainActivity extends AppCompatActivity  {
         ichPublishClient.subscribe(ICHTopic.EXECUTE_SHELL_SCRIPT, (msgId, msg) -> {
             if (msg != null) {
                 try {
-                    ShellVo shellVo = objectMapper.readValue(msg.getPayload(), ShellVo.class);
+                    ShellVo shellVo = JacksonUtils.objectmapper.readValue(msg.getPayload(), ShellVo.class);
                     ShellVo result = shellVo;
                     if (shellVo != null && shellVo.getScript() != null && "".equals(shellVo.getScript()) && shellVo.getScript().length() > 0) {
                         BaseUtils.executeShell(shellVo);
@@ -322,7 +322,7 @@ public class MainActivity extends AppCompatActivity  {
                     }
                     MqttMessage mqttMessage = new MqttMessage();
                     mqttMessage.setQos(1);
-                    mqttMessage.setPayload(objectMapper.writeValueAsString(result).getBytes());
+                    mqttMessage.setPayload(JacksonUtils.objectmapper.writeValueAsString(result).getBytes());
                     ichPublishClient.publish(ICHTopic.EXECUTE_SHELL_SCRIPT_RESPONSE, mqttMessage);
                 } catch (Exception e) {
                     Log.e(TAG, "onCreate: 发送执行脚本结果失败! ", e);

app/src/main/java/com/emato/ich/fragment/ChooseCabinetFragment.java

@@ -1,6 +1,7 @@
 package com.emato.ich.fragment;
 
 import android.annotation.SuppressLint;
+import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.os.CountDownTimer;
 import android.util.Log;
@@ -8,6 +9,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -51,11 +53,12 @@ public class ChooseCabinetFragment extends Fragment {
     private FragmentChooseCabinetBinding binding;
     private CountDownTimer timer;
 
-    private void isDisable(Integer available, Button button){
+    @SuppressLint("ResourceAsColor")
+    private void isDisable(Integer available, Button button, TextView textView){
         if (available <= 0) {
             button.setEnabled(false);
         } else {
-            button.setBackgroundColor(500156);
+            textView.setBackgroundColor(android.graphics.Color.parseColor("#44CE3B"));
         }
     }
 
@@ -110,19 +113,19 @@ public class ChooseCabinetFragment extends Fragment {
                                         switch (cabinetInfoVo.getType()) {
                                             case "mini":
                                                 binding.tinyCabinet.append("可用" + cabinetInfoVo.getAvailable() + "个");
-                                                isDisable(cabinetInfoVo.getAvailable(), binding.tinyCabinetBtn);
+                                                isDisable(cabinetInfoVo.getAvailable(), binding.tinyCabinetBtn, binding.tinyCabinetBg);
                                                 break;
                                             case "small":
                                                 binding.smallCabinet.append("可用" + cabinetInfoVo.getAvailable() + "个");
-                                                isDisable(cabinetInfoVo.getAvailable(), binding.smallCabinetBtn);
+                                                isDisable(cabinetInfoVo.getAvailable(), binding.smallCabinetBtn, binding.smallCabinetBg);
                                                 break;
                                             case "medium":
                                                 binding.mediumCabinet.append("可用" + cabinetInfoVo.getAvailable() + "个");
-                                                isDisable(cabinetInfoVo.getAvailable(), binding.mediumCabinetBtn);
+                                                isDisable(cabinetInfoVo.getAvailable(), binding.mediumCabinetBtn, binding.mediumCabinetBg);
                                                 break;
                                             case "large":
                                                 binding.bigCabinet.append("可用" + cabinetInfoVo.getAvailable() + "个");
-                                                isDisable(cabinetInfoVo.getAvailable(), binding.bigCabinetBtn);
+                                                isDisable(cabinetInfoVo.getAvailable(), binding.bigCabinetBtn, binding.bigCabinetBg);
                                                 break;
                                             default:
                                                 break;

app/src/main/java/com/emato/ich/utils/BaseUtils.java

@@ -111,8 +111,8 @@ public class BaseUtils {
     }
 
     public static String getClientId() {
-//        return Md5Utils.string2Md5_16(getMac()).toUpperCase();
-        return "285F18D92D0B6568";
+        return Md5Utils.string2Md5_16(getMac()).toUpperCase();
+//        return "285F18D92D0B6568";
     }
 
     public static String getMac2() {