删除冗余代码

app/src/main/java/com/grkj/iscs/BusinessManager.kt

@@ -11,9 +11,7 @@ import com.grkj.iscs.model.DeviceConst.DOCK_TYPE_ELEC_LOCK_BOARD
 import com.grkj.iscs.model.DeviceConst.DOCK_TYPE_KEY
 import com.grkj.iscs.model.DeviceConst.DOCK_TYPE_LOCK
 import com.grkj.iscs.model.DeviceConst.DOCK_TYPE_PORTABLE
-import com.grkj.iscs.util.ToastUtils
 import com.grkj.iscs.util.log.LogUtil
-import java.util.stream.Collectors
 
 /**
  * 业务层管理
@@ -69,6 +67,9 @@ object BusinessManager {
                             ModBusController.controlLockBuckle(false, dockBean.addr.toInt() - 1, lockBean.idx)
                         }
                     }
+                    DOCK_TYPE_ELEC_LOCK_BOARD -> {
+                        // TODO 占位
+                    }
                     DOCK_TYPE_PORTABLE -> {
                         // TODO 便携式待完善
                         dockBean.deviceList.forEach { deviceBean ->

app/src/main/java/com/grkj/iscs/modbus/ModBusController.kt

@@ -38,6 +38,9 @@ object ModBusController {
 
     var shouldStopUpgrade = false
 
+    // TODO 临时改成5s
+    const val REPEAT_FREQUENCY = 5000L
+
     fun setSlaveCount(count: Int) {
         modBusManager?.slaveCount = count
         slaveCount = count
@@ -72,9 +75,7 @@ object ModBusController {
                         l.listener(res)
                     }
                 }
-                // TODO 临时改成5s
-//            }, 1000)
-            }, 5000)
+            }, REPEAT_FREQUENCY)
             ?.also {
                 modBusManager = it
                 Executor.runOnIO {

app/src/main/java/com/grkj/iscs/presentation/PresentationActivity.kt

@@ -33,7 +33,7 @@ class PresentationActivity :
                 "士力架包装车间-打包线1-保养",
                 "SOP001",
                 "保养",
-                mutableListOf("E-1", "E-2", "E-3")
+                mutableListOf("E-1", "E-2")
             ),
             PresentationBean(
                 "德芙车间",
@@ -42,7 +42,7 @@ class PresentationActivity :
                 "德芙包装车间-打包线2-维护",
                 "SOP002",
                 "维护",
-                mutableListOf("E-5", "E-6", "E-7")
+                mutableListOf("E-2", "E-3")
             )
         )
 

app/src/main/java/com/grkj/iscs/presentation/PresentationPresenter.kt

@@ -30,11 +30,7 @@ class PresentationPresenter : BasePresenter<IPresentationView>() {
                                         // TODO 读工作票
                                     }
                                     DEVICE_TYPE_LOCK -> {
-                                        ModBusController.readLockRfid(dockBean.addr.toInt() - 1, deviceBean.idx) { res ->
-                                            val rfid = res.copyOfRange(3, 11).toHexStrings(false).removeLeadingZeros()
-                                            ModBusController.updateLockRfid(dockBean.addr.toInt(), deviceBean.idx, rfid)
-                                        }
-                                        ModBusController.controlLockBuckle(false, deviceBean.idx, dockBean.addr.toInt() - 1)
+
                                     }
                                 }
                             }

app/src/main/java/com/grkj/iscs/presenter/ModBusPresenter.kt

@@ -2,14 +2,7 @@ package com.grkj.iscs.presenter
 
 import com.grkj.iscs.base.BasePresenter
 import com.grkj.iscs.iview.IModbusView
-import com.grkj.iscs.modbus.ModBusController
 
 class ModBusPresenter: BasePresenter<IModbusView>() {
 
-    fun initModbus() {
-        ModBusController.setSlaveCount(2)
-        ModBusController.interruptReadTrashBinStatus(false)
-        ModBusController.start(mContext!!)
-        ModBusController.unregisterListener(mContext!!)
-    }
 }