设备联调，接口参数优化

app/src/main/java/com/shuwei/intelligent/shelves/HomeActivity.kt

@@ -115,7 +115,8 @@ class HomeActivity : BaseActivity() {
 
         val androidId = Settings.Secure.getString(contentResolver, Settings.Secure.ANDROID_ID)
         Log.d(TAG, "onCreate: androidId=${androidId}")
-        App.getInstance().deviceId = "53babf69-0d2f-3875-a649-f2e12f80ad4c1"
+        App.getInstance().deviceId = androidId
+        //"53babf69-0d2f-3875-a649-f2e12f80ad4c1"
 
         val swDpValue = resources?.configuration?.smallestScreenWidthDp
         Log.d(TAG, "onCreate: swDpValue=$swDpValue")
@@ -166,8 +167,8 @@ class HomeActivity : BaseActivity() {
         val subList01 = tempList.subList(0, 5)
         val subList02 = tempList.subList(5, 10)
         repeat(5) { index ->
-            list.add(subList01[index])
-            list.add(subList02[index])
+            list.add(subList01[index].also { it.deviceId = App.getInstance().deviceId })
+            list.add(subList02[index].also { it.deviceId = App.getInstance().deviceId })
         }
         shelfAdapter.notifyDataSetChanged()
     }
@@ -189,15 +190,16 @@ class HomeActivity : BaseActivity() {
             data = serialReader.toString()
         } else if (srcData.startsWith(HEADER) && srcData.contains(FOOTER).not()) {
             serialReader.clear()
-            serialReader.append(srcData)
+            serialReader.append(srcData).append(",")
             return
-        } else if (srcData.contains(FOOTER).not()) {
-            serialReader.append(srcData)
+        } else if (srcData.startsWith(HEADER).not() && srcData.contains(FOOTER).not()) {
+            serialReader.append(srcData).append(",")
             return
         } else {
             val endIndex = srcData.indexOf(FOOTER) + FOOTER.length
             serialReader.append(srcData.substring(0, endIndex))
-            data = serialReader.toString()
+            Log.d(TAG, "receiveSerialPortData:serialReader: $serialReader")
+            data = serialReader.toString().replace(",","")
         }
 
         val cmd = data.substring(HEADER.length, HEADER.length + 4)
@@ -274,8 +276,9 @@ class HomeActivity : BaseActivity() {
             if (index <= 10) {
                 list.firstOrNull { it.deviceNo == index }?.let {
                     it.weight = realWeightDouble
+                    val pos = list.indexOf(it)
+                    shelfAdapter.notifyItemChanged(pos)
                 }
-                shelfAdapter.notifyItemChanged(index)
             }
 
             count += 8
@@ -337,6 +340,7 @@ class HomeActivity : BaseActivity() {
                             val model =
                                 getSerializableExtra(ShelfActivity.SHELF_MODEL) as ShelfModel
                             list[position].apply {
+                                goodsId = model.goodsId
                                 goodsName = model.goodsName
                                 weight = model.weight
                                 createTime = model.createTime