فهرست منبع

refactor(更新) :
- 还钥匙之后默认保持连接,不断开,因为尝试连接的时候会标记立即连接,如果连接数超了会直接断开所有连接,重新开始

周文健 5 ماه پیش
والد
کامیت
2ac7cf76a4

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

@@ -356,7 +356,7 @@ object BusinessManager {
                             ) { isLeft, res ->
                                 ModBusController.controlKeyCharge(
                                     true,
-                                    keyBean.idx == 1,
+                                    keyBean.isLeft,
                                     dockBean.addr
                                 )
                                 if (res.size < 11) {
@@ -1838,8 +1838,8 @@ object BusinessManager {
                             false, currentModeMsg.bleBean.bleDevice.mac
                         )
                         sendLoadingEventMsg(null, false)
-                        //连上之后没有工作票要下发就断开
-                        BleManager.getInstance().disconnect(currentModeMsg.bleBean.bleDevice)
+                        //连上之后没有工作票要下发就断开 todo不断开,还钥匙的时候断开全部
+//                        BleManager.getInstance().disconnect(currentModeMsg.bleBean.bleDevice)
                     }
                 }
             }

+ 1 - 1
app/src/main/java/com/grkj/iscs/view/presenter/StepPresenter.kt

@@ -168,7 +168,7 @@ class StepPresenter : BasePresenter<IStepView>() {
                         .forEach { key ->
                             ModBusController.controlKeyCharge(false, key.isLeft, dock.addr) {
                                 ThreadUtils.runOnIO {
-                                    delay(500)
+                                    delay(3000)
                                     ModBusController.controlKeyCharge(true, key.isLeft, dock.addr)
                                 }
                             }

+ 1 - 1
app/src/main/java/com/grkj/iscs/view/presenter/WorkerPresenter.kt

@@ -141,7 +141,7 @@ class WorkerPresenter : BasePresenter<IWorkerView>() {
                     .forEach { key ->
                         ModBusController.controlKeyCharge(false, key.isLeft, dock.addr) {
                             ThreadUtils.runOnIO {
-                                delay(500)
+                                delay(3000)
                                 ModBusController.controlKeyCharge(true, key.isLeft, dock.addr)
                             }
                         }