Browse Source

发热丝状态变更

ccc 4 weeks ago
parent
commit
03ce28a28a

+ 2 - 1
module_backstage/src/main/java/com/module/backstage/fragment/param/DebugParamFragment.kt

@@ -219,7 +219,8 @@ class DebugParamFragment :
         Log.d(TAG, "paramDataList1: " + lis)
         while (i < len) {
             when (i) {
-                14 -> getValue(lis, i, 3)
+//                14 -> getValue(lis, i, 3)
+                7 -> getValue(lis, i, 3)
             }
             i++
         }

+ 4 - 3
module_backstage/src/main/java/com/module/backstage/vm/DebugParamFragmentVM.kt

@@ -327,9 +327,10 @@ class DebugParamFragmentVM @Inject constructor(private val mRepo: DebugParamFrag
                 val hexStr2BinStr = HexUtils.hexStr2BinStr(data)
                 val split = hexStr2BinStr.split("")
                 updateOtherState(split)
-                val data1 =messageEvent.data.substring(52,58)
-                Log.d(TAG, "调试页 cmdHeartbeat1: "+data1)
-                val hexStr2BinStr1 = HexUtils.hexStr2BinStr(data1)
+        val data1 =messageEvent.data.substring(52,58)
+        val data2 =messageEvent.data.substring(20,22)
+                Log.d(TAG, "调试页 cmdHeartbeat1: "+data2)
+                val hexStr2BinStr1 = HexUtils.hexStr2BinStr(data2)
                 val split1 = hexStr2BinStr1.split("")
                 updateOtherState1(split1)
                 val data3=messageEvent.data.substring(58,62)

+ 1 - 1
serialport-api/src/main/java/com/hboxs/serialport/plc/thread/ThreadHomeParam.kt

@@ -76,7 +76,7 @@ class ThreadHomeParam : LifecycleObserver {
                     Log.d(TAG, "startPreheat: isActivePreheatOpen=true")
                     VboxSerialPortSendQueue.getInstance()
                         .sendCommand(VboxWriteCommand(VboxCommand.CMD_IO,
-                            VboxCommand.DEBUG_ID+"0501"))
+                            VboxCommand.DEBUG_ID+"0502"))
                 delay(5000) // 每隔5秒重复执行
             }
         }