From 119a69bbbce94df73451fb2794b7e4270f818a53 Mon Sep 17 00:00:00 2001
From: lvmeng <848755140@qq.com>
Date: Wed, 19 Nov 2025 08:31:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shelves/activity/HomeActivity.kt          | 35 +++++++++++--------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/com/shuwei/intelligent/shelves/activity/HomeActivity.kt b/app/src/main/java/com/shuwei/intelligent/shelves/activity/HomeActivity.kt
index 340c276..9066de9 100644
--- a/app/src/main/java/com/shuwei/intelligent/shelves/activity/HomeActivity.kt
+++ b/app/src/main/java/com/shuwei/intelligent/shelves/activity/HomeActivity.kt
@@ -415,6 +415,8 @@ class HomeActivity : BaseActivity() {
             //val percent = 10 * list.count { it.goodsName.isNullOrBlank().not() }
 
             updateLeftStatus("${deviceName} [$temperatureHex] ${showTemperatureC}°C / -%")
+
+            getFixDataBody(data, temperatureEndIndex)
         }.onFailure {
             it.printStackTrace()
         }
@@ -465,21 +467,6 @@ class HomeActivity : BaseActivity() {
 //            intent.putExtra(ShelfActivity.SHELF_WEIGHT, weightArray[shelfIndex])
 //            LocalBroadcastManager.getInstance(this).sendBroadcast(intent)
 //        }
-
-        val temperatureEndIndex = end
-        if (terminalId.isBlank() || terminalVersion.isBlank()) {
-            try {
-                val fixDataBodyStartIndex = temperatureEndIndex + 1
-                val fixDataBody = data.substring(fixDataBodyStartIndex, data.length- FOOTER.length)
-                if (fixDataBody.length == 42) {
-                    terminalId = fixDataBody.substring(0, 30)
-                    terminalVersion = fixDataBody.substring(30, 40)
-                    log("receiveSerialPortData:从设备状态获取数据，终端id:${terminalId},固件版本:${terminalVersion}")
-                }
-            } catch (e: Exception) {
-                e.printStackTrace()
-            }
-        }
     }
 
     private fun getDeviceInfo(data: String) {
@@ -507,6 +494,24 @@ class HomeActivity : BaseActivity() {
             data = data
         )
 
+        getFixDataBody(data, temperatureEndIndex)
+    }
+
+    fun getFixDataBody(data:String, temperatureEndIndex: Int) {
+        try {
+            if (terminalId.isNotBlank() && terminalVersion.isNotBlank()) {
+                return
+            }
+            val fixDataBodyStartIndex = temperatureEndIndex + 1
+            val fixDataBody = data.substring(fixDataBodyStartIndex, data.length- FOOTER.length)
+            if (fixDataBody.length == 42) {
+                terminalId = fixDataBody.substring(0, 30)
+                terminalVersion = fixDataBody.substring(30, 40)
+                log("receiveSerialPortData:从设备状态获取数据，终端id:${terminalId},固件版本:${terminalVersion}")
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
     }
 
     override fun onDestroy() {