Ver código fonte

优化初始化设备时对钥匙内未完成工作票的处理,防止设备无法使用

Frankensteinly 7 meses atrás
pai
commit
8b22f9933f

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

@@ -1074,6 +1074,12 @@ object BusinessManager {
                     handleKeyReturn(bleDevice, workTicketGetBO)
                 }) {
                     BleManager.getInstance().disconnect(bleDevice)
+                    // 打开卡扣,防止初始化的时候选择不处理钥匙导致无法使用
+                    val dock = ModBusController.getDockByKeyMac(bleDevice.mac)
+                    val keyBean = dock?.getKeyList()?.find { it.mac == bleDevice.mac }
+                    keyBean?.let {
+                        ModBusController.controlKeyBuckle(true, keyBean.isLeft, dock.addr)
+                    }
                 }
             }
         }

+ 0 - 1
app/src/main/java/com/grkj/iscs/modbus/PortManager.kt

@@ -101,7 +101,6 @@ class PortManager private constructor(
             try {
                 val file = File(if(usb) "/dev/ttyUSB${port}" else "/dev/ttyS${port}")
                 LogUtil.i("连接 port file")
-                // TODO 判断file是否为空,防止不接线导致黑屏
                 SerialPort(file, bps, 0).run {
                     blocked = false
                     LogUtil.i("建立 SerialPort")