设备联调优化

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

@@ -13,14 +13,17 @@ import androidx.activity.viewModels
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
+import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.GridLayoutManager
 import com.chad.library.adapter4.util.setOnDebouncedItemClick
 import com.shuwei.intelligent.shelves.adapter.ShelfAdapter
 import com.shuwei.intelligent.shelves.base.BaseActivity
 import com.shuwei.intelligent.shelves.databinding.ActivityHomeBinding
+import com.shuwei.intelligent.shelves.model.SendWeightEvent
 import com.shuwei.intelligent.shelves.model.ShelfModel
 import com.shuwei.intelligent.shelves.model.ShelfResult
+import com.shuwei.intelligent.shelves.model.WeightEvent
 import com.shuwei.intelligent.shelves.net.Loading
 import com.shuwei.intelligent.shelves.net.NetViewModel
 import com.shuwei.intelligent.shelves.net.RespData
@@ -36,6 +39,9 @@ import com.shuwei.intelligent.shelves.utils.hexToBinary
 import com.shuwei.intelligent.shelves.utils.hexToDec
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import org.greenrobot.eventbus.EventBus
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
@@ -65,18 +71,21 @@ class HomeActivity : BaseActivity() {
         const val DEVICE_INFO_CMD = "${HEADER}0301000000000000000000000000${FOOTER}"
 
         val list: MutableList<ShelfModel> = mutableListOf()
+        val weightArray = SparseArray<Double?>()
+        var shelfIndex = 0
+//        public fun getRealWeight():Double = weightArray[shelfIndex]?:0.0
     }
 
     private lateinit var binding: ActivityHomeBinding
 
     private val viewModel: NetViewModel by viewModels()
 
-    private val weightArray by lazy { SparseArray<Double?>() }
 
     @SuppressLint("NotifyDataSetChanged", "HardwareIds")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityHomeBinding.inflate(layoutInflater)
+        EventBus.getDefault().register(this)
         setContentView(binding.root)
 
         updateLeftStatus("1-1冷藏柜  -°C / -%")
@@ -316,12 +325,20 @@ class HomeActivity : BaseActivity() {
                     it.weight = realWeightDouble
                     val pos = list.indexOf(it)
                     shelfAdapter.notifyItemChanged(pos)
+                    Log.d(TAG, "getWeightInfo: deviceNo=${it.deviceNo},realWeight=${realWeight}")
+                    EventBus.getDefault().post(SendWeightEvent(it.deviceNo, realWeight))
                 }
             }
 
             count += 8
             index++
         }
+//        ShelfActivity.updateWeight(getRealWeight())
+//        if (list.isNotEmpty()) {
+//            val intent = Intent(ShelfActivity.RECEIVER_DEVICE_INFO + list[shelfIndex].deviceNo)
+//            intent.putExtra(ShelfActivity.SHELF_WEIGHT, weightArray[shelfIndex])
+//            LocalBroadcastManager.getInstance(this).sendBroadcast(intent)
+//        }
     }
 
     private fun getDeviceInfo(data: String) {
@@ -343,21 +360,14 @@ class HomeActivity : BaseActivity() {
             end = temperatureStartIndex,
             data = data
         )
-
-        if (list.isNotEmpty()) {
-            val intent = Intent(ShelfActivity.RECEIVER_DEVICE_INFO + list[shelfIndex].deviceNo)
-            intent.putExtra(ShelfActivity.SHELF_WEIGHT, weightArray[shelfIndex])
-            sendBroadcast(intent)
-        }
     }
 
-    private var shelfIndex = 0
-
     override fun onDestroy() {
         lifecycleScope.launch {
             SerialPortManager.close()
         }
         TaskManager.cancelTask()
+        EventBus.getDefault().unregister(this)
         super.onDestroy()
     }
 
@@ -365,7 +375,7 @@ class HomeActivity : BaseActivity() {
     private val shelfAdapter by lazy {
         ShelfAdapter(list).apply {
             setOnDebouncedItemClick { adapter, view, position ->
-                this@HomeActivity.shelfIndex = position
+                shelfIndex = position
                 lifecycleScope.launch {
                     val openCmd = if (list[position].deviceNo in 1..5)
                         LEFT_SHELF_OPEN_CMD
@@ -449,4 +459,9 @@ class HomeActivity : BaseActivity() {
             it.tvEmptyContent.setTextColor(Color.WHITE)
         }
     }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public fun weightEvent(event: WeightEvent) {
+
+    }
 }