临时注释掉可能影响的代码；新增工作票结束标志打印

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

@@ -389,13 +389,13 @@ object BusinessManager {
     }
 
     fun handleRsp(bleBean: BleBean, byteArray: ByteArray, loadingCallBack: (Boolean, String?) -> Unit) {
-        val len = byteArray[2].toInt()
-        val token = byteArray.copyOfRange(len + 7, len + 11)
-        if (token.contentEquals(bleBean.token)) {
-            LogUtil.i("Token is right")
-        } else {
-            LogUtil.e("Token is wrong")
-        }
+//        val len = byteArray[2].toInt()
+//        val token = byteArray.copyOfRange(len + 7, len + 11)
+//        if (token.contentEquals(bleBean.token)) {
+//            LogUtil.i("Token is right")
+//        } else {
+//            LogUtil.e("Token is wrong")
+//        }
         when {
             // 获取令牌
             byteArray.startsWith(BleConst.RSP_GET_TOKEN) -> handleToken(bleBean.bleDevice, byteArray)

app/src/main/java/com/grkj/iscs/ble/BleCmdManager.kt

@@ -67,13 +67,13 @@ object BleCmdManager {
     }
 
     fun handleRsp(bleBean: BleBean, byteArray: ByteArray) {
-        val len = byteArray[2].toInt()
-        val token = byteArray.copyOfRange(len + 7, len + 11)
-        if (token.contentEquals(bleBean.token)) {
-            LogUtil.i("Token is right")
-        } else {
-            LogUtil.e("Token is wrong")
-        }
+//        val len = byteArray[2].toInt()
+//        val token = byteArray.copyOfRange(len + 7, len + 11)
+//        if (token.contentEquals(bleBean.token)) {
+//            LogUtil.i("Token is right")
+//        } else {
+//            LogUtil.e("Token is wrong")
+//        }
         when {
             // 获取令牌
             byteArray.startsWith(BleConst.RSP_GET_TOKEN) -> handleToken(bleBean.bleDevice, byteArray)
@@ -186,24 +186,30 @@ object BleCmdManager {
             0x0E.toByte() -> LogUtil.i("Work ticket send data crc error")
             0x14.toByte() -> LogUtil.i("Work ticket send json error")
         }
-        if (idx != total - 1 && (res == 0x00.toByte() || res == 0x02.toByte())) {
-            // TODO 要判断res
-            sendWorkTicket(
-                BleUtil.instance?.getBleDeviceByMac(bleBean.bleDevice.mac)?.ticketSend!!,
-                if (res == 0x00.toByte()) idx + 1 else idx,
-                bleBean.bleDevice,
-                object : CustomBleWriteCallback() {
-                    override fun onPrompt(promptStr: String?) {}
+        if (idx != total - 1) {
+            if (res == 0x00.toByte() || res == 0x02.toByte()) {
+                // TODO 要判断res
+                sendWorkTicket(
+                    BleUtil.instance?.getBleDeviceByMac(bleBean.bleDevice.mac)?.ticketSend!!,
+                    if (res == 0x00.toByte()) idx + 1 else idx,
+                    bleBean.bleDevice,
+                    object : CustomBleWriteCallback() {
+                        override fun onPrompt(promptStr: String?) {}
 
-                    override fun onConnectPrompt(promptStr: String?) {}
+                        override fun onConnectPrompt(promptStr: String?) {}
 
-                    override fun onDisConnectPrompt(promptStr: String?) {}
+                        override fun onDisConnectPrompt(promptStr: String?) {}
 
-                    override fun onWriteSuccess(current: Int, total: Int, justWrite: ByteArray?) {}
+                        override fun onWriteSuccess(current: Int, total: Int, justWrite: ByteArray?) {}
 
-                    override fun onWriteFailure(exception: BleException?) {}
+                        override fun onWriteFailure(exception: BleException?) {}
 
-                })
+                    })
+            }
+        } else {
+            if (res == 0x00.toByte()) {
+                LogUtil.i("Work ticket is done")
+            }
         }
     }