Эх сурвалжийг харах

Demo移除从机数量自动校正,从机数量固定3个,移除钥匙底座灯控

Frankensteinly 10 сар өмнө
parent
commit
1adb8b2777

+ 2 - 1
app/src/main/java/com/grkj/iscs/BusinessManager.kt

@@ -70,7 +70,8 @@ object BusinessManager {
 
     fun connectDock(isNeedInit: Boolean = false) {
         // 暂定100上限
-        ModBusController.setSlaveCount(100)
+        // TODO demo为了快用3个
+        ModBusController.setSlaveCount(3)
         ModBusController.interruptReadTrashBinStatus(false)
         ModBusController.start(MyApplication.instance!!.applicationContext)
         ModBusController.unregisterListener(MyApplication.instance!!.applicationContext)

+ 3 - 2
app/src/main/java/com/grkj/iscs/modbus/ModBusController.kt

@@ -74,7 +74,7 @@ object ModBusController {
                 LogUtil.i("****************************************************************************")
                 // 过滤非空的数据,重置slaveCount
                 val onlineCount = res.filter { it.isNotEmpty() }.size
-                setSlaveCount(onlineCount)
+//                setSlaveCount(onlineCount)
                 for (l in listeners) {
                     if (l.type == LISTENER_TYPE_STATUS) {
                         l.listener(res)
@@ -166,7 +166,8 @@ object ModBusController {
     private fun initKey() {
         LogUtil.i("initKey : $dockList")
         dockList.filter { it.type == DOCK_TYPE_KEY || it.type == DOCK_TYPE_PORTABLE }.forEach { dockBean ->
-            controlKeyLight(dockBean.addr.toInt() - 1, 2, 2)
+            // TODO 灯不用管了
+//            controlKeyLight(dockBean.addr.toInt() - 1, 2, 2)
             dockBean.getKeyList().forEach { key ->
                 if (key.isExist) {
                     LogUtil.i("initKey : ${dockBean.addr.toInt() - 1} : ${key.isLeft}")