修复钥匙工作票json参数错误；蓝牙准备重试延时增加到2s；重试暂时移除直接从indicate往下走

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

@@ -533,7 +533,7 @@ object BusinessManager {
                 if (!isDone) {
                     // 判断是否仍然待连，防止拿走；移到末尾，防止循环影响
                     unregisterConnectListener(listener.mac)
-                    Executor.delayOnMain(500) {
+                    Executor.delayOnMain(2000) {
                         registerConnectListener(listener.mac, listener.callBack)
                     }
                     return@runOnMain
@@ -563,12 +563,12 @@ object BusinessManager {
     ) {
         Executor.runOnMain {
             // 如果是已经连上的设备，从indicate开始往下走，不需要再扫描了
-            if (BleManager.getInstance().isConnected(mac)) {
-                deviceList.find { it.bleDevice.mac == mac }?.let { itBleDevice ->
-                    indicate(itBleDevice, isNeedLoading, prepareDoneCallBack)
-                    return@runOnMain
-                }
-            }
+//            if (BleManager.getInstance().isConnected(mac)) {
+//                deviceList.find { it.bleDevice.mac == mac }?.let { itBleDevice ->
+//                    indicate(itBleDevice, isNeedLoading, prepareDoneCallBack)
+//                    return@runOnMain
+//                }
+//            }
             CommonUtils.checkBlePermission(activity) {
                 doScanBle(mac, isNeedLoading, prepareDoneCallBack)
             }
@@ -908,9 +908,6 @@ object BusinessManager {
                 pointVO.prePointId?.let {
                     task.prevId = it.toInt()
                 }
-                if (!isLock) {
-                    task.infoRfidNo = pointVO.lockId.toString()
-                }
                 // TODO partCode待补充
                 taskList.add(task)
             }