1. 蓝牙通信和业务逻辑剥离

app/src/main/java/com/iscs/comm/MainActivity.kt

@@ -1,7 +1,6 @@
 package com.iscs.comm
 
 import android.os.Bundle
-import android.util.Log
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
@@ -25,20 +24,23 @@ import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.iscs.comm.entity.BleTicketDataPackage
 import com.iscs.comm.entity.device.Device
-import com.iscs.comm.extension.CommFrameExt
-import com.iscs.comm.extension.CommFrameExt.buildBLEGetPowerCMD
-import com.iscs.comm.extension.CommFrameExt.buildBLEGetStatusCMD
-import com.iscs.comm.extension.CommFrameExt.getPower
-import com.iscs.comm.extension.CommFrameExt.getRunMode
-import com.iscs.comm.extension.CommFrameExt.getToken
+import com.iscs.comm.extension.BleFrameExt
+import com.iscs.comm.extension.BleFrameExt.buildBLEGetTicketInfoCMD
+import com.iscs.comm.extension.BleFrameExt.getTicketPackageInfo
+import com.iscs.comm.extension.BleFrameExt.getToken
 import com.iscs.comm.extension.byteArrayToHexString
 import com.iscs.comm.intf.IDeviceListener
-import com.iscs.comm.manager.BLEManager
+import com.iscs.comm.manager.BleManager
 import com.iscs.comm.ui.theme.CommDemoTheme
+import com.iscs.comm.utils.ISCSLog
 
 class MainActivity : ComponentActivity() {
 
+    val testJobJson =
+        "{\"cardNo\":\"D2931A25\",\"data\":[{\"codeId\":1,\"dataList\":[{\"dataId\":87,\"equipName\":\"E_29\",\"equipRfidNo\":\"1B9105AF\",\"target\":0},{\"dataId\":88,\"equipName\":\"E_30\",\"equipRfidNo\":\"FB9091E5\",\"target\":0}],\"taskCode\":\"165\"}],\"lockList\":[{\"lockId\":1,\"rfid\":\"C097D395\"},{\"lockId\":2,\"rfid\":\"A04AD495\"}],\"password\":\"123456\"}"
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
@@ -67,17 +69,8 @@ class MainActivity : ComponentActivity() {
             CommManager.addOnDeviceListener(listener)
             // SDK初始化
             CommManager.init()
-            // 测试蓝牙扫描
-            val bm = BLEManager(this@MainActivity.application, mac = "CC:BA:97:21:71:E6")
-            val result = bm.connect()
-            if (result.connected) {
-                val token = bm.writeByResponse(CommFrameExt.buildBLEGetTokenCMD()).getToken()
-                Log.i("xiaoming", "获取设备token ${token.byteArrayToHexString()}")
-                val power = bm.writeByResponse(token.buildBLEGetPowerCMD()).getPower()
-                Log.i("xiaoming", "当前设备电量：$power")
-                val runMode = bm.writeByResponse(token.buildBLEGetStatusCMD()).getRunMode()
-                Log.i("xiaoming", "当前工作模式：$runMode")
-            }
+            // 蓝牙钥匙功能测试
+            // bleKeyTest()
         }
         DisposableEffect("") {
             // 移除页面监听
@@ -106,4 +99,48 @@ class MainActivity : ComponentActivity() {
         }
 
     }
+
+    private suspend fun bleKeyTest() {
+        // 测试蓝牙扫描
+        val bm = BleManager(this@MainActivity.application, mac = "CC:BA:97:21:71:E6")
+        val result = bm.connect()
+        if (result.connected) {
+            val token = bm.writeByResponse(BleFrameExt.buildBLEGetTokenCMD()).getToken()
+            ISCSLog.i("xiaoming", "获取设备token ${token.byteArrayToHexString()}")
+//                val power = bm.writeByResponse(token.buildBLEGetPowerCMD()).getPower()
+//                ISCSLog.i("xiaoming", "当前设备电量：$power")
+//                val runMode = bm.writeByResponse(token.buildBLEGetStatusCMD()).getRunMode()
+//                ISCSLog.i("xiaoming", "当前工作模式：$runMode")
+//                val switch = bm.writeByResponse(token.buildBLESwitchRunModeCMD(RunMode.STBY)).getSwitchRunModeResult()
+//                ISCSLog.i("xiaoming", "切换工作模式：$switch")
+//                val tickets = token.buildBLETicketDataCMDList(testJobJson)
+//                var ticketSendOk = true
+//                tickets.forEach {
+//                    val ticket = bm.writeByResponse(it).getSendTicketResult()
+//                    ISCSLog.i("xiaoming", "下发作业票：分包${it.data[4].toInt()}发送结果：$ticket")
+//                    if (ticket != 0) {
+//                        ticketSendOk = false
+//                        return@forEach
+//                    }
+//                }
+//                ISCSLog.i("xiaoming", "下发作业票：$ticketSendOk")
+//                val switch = bm.writeByResponse(token.buildBLESwitchRunModeCMD(RunMode.WORK)).getSwitchRunModeResult()
+//                ISCSLog.i("xiaoming", "切换工作模式：$switch")
+            // 读取作业票信息
+            val pkgList = ArrayList<BleTicketDataPackage>()
+            val ticketInfo = bm.writeByResponse(token.buildBLEGetTicketInfoCMD()).getTicketPackageInfo()
+            pkgList.add(ticketInfo)
+            ISCSLog.i("xiaoming", "读取作业票：首包信息：$ticketInfo")
+            // 校验是否有子包，如果有，继续读取子包数据
+            for (idx in 1 until ticketInfo.pkgTotal) {
+                val ticketSubPackageInfo = bm.writeByResponse(token.buildBLEGetTicketInfoCMD(idx, ticketInfo.pkgTotal)).getTicketPackageInfo()
+                pkgList.add(ticketSubPackageInfo)
+                ISCSLog.i("xiaoming", "读取作业票：子包信息：$ticketSubPackageInfo")
+            }
+            var datas = byteArrayOf()
+            pkgList.forEach { datas += it.pkgData }
+            ISCSLog.i("xiaoming", "读取作业票：${String(datas)}")
+        }
+    }
+
 }

transport/src/main/java/com/iscs/comm/entity/BleFrame.kt

@@ -7,4 +7,14 @@ package com.iscs.comm.entity
  * @param data      请求或响应数据
  * @param rspCode   响应码
  */
-data class BleFrame(val reqCode: ByteArray, val data: ByteArray, val rspCode: ByteArray)
+data class BleFrame(val reqCode: ByteArray, val data: ByteArray, val rspCode: ByteArray, val writeUUID: String = "")
+
+/**
+ * 蓝牙作业票数据包信息
+ *
+ * @param pkgIdx    当前包索引
+ * @param pkgSize   当前包大小
+ * @param pkgData   当前包数据
+ * @param pkgTotal  总包数
+ */
+data class BleTicketDataPackage(val pkgIdx: Int, val pkgSize: Int, val pkgData: ByteArray, val pkgTotal: Int)

transport/src/main/java/com/iscs/comm/extension/BleFrameExt.kt

@@ -0,0 +1,174 @@
+package com.iscs.comm.extension
+
+import com.iscs.comm.entity.BleFrame
+import com.iscs.comm.entity.BleTicketDataPackage
+import com.iscs.comm.enums.RunMode
+import com.iscs.comm.protocol.BleProtocol
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+object BleFrameExt {
+
+    /**
+     * 构建蓝牙设备获取设备token的操作
+     */
+    fun buildBLEGetTokenCMD(): BleFrame {
+        return BleFrame(BleProtocol.REQ_GET_TOKEN, getUnixTime(), BleProtocol.RSP_GET_TOKEN)
+    }
+
+    /**
+     * 构建蓝牙设备获取蓝牙设备电量
+     */
+    fun ByteArray.buildBLEGetPowerCMD(): BleFrame {
+        return BleFrame(BleProtocol.REQ_POWER_STATUS, getUnixTime() + this, BleProtocol.RSP_POWER_STATUS)
+    }
+
+    /**
+     * 构建蓝牙获取当前设备状态
+     */
+    fun ByteArray.buildBLEGetStatusCMD(): BleFrame {
+        return BleFrame(BleProtocol.REQ_CURRENT_STATUS, getUnixTime() + this, BleProtocol.RSP_CURRENT_STATUS)
+    }
+
+    /**
+     * 切换当前工作模式
+     *
+     * @param runMode 有效运行模式 WORK STBY
+     */
+    fun ByteArray.buildBLESwitchRunModeCMD(runMode: RunMode): BleFrame {
+        var mode = 0x00
+        if (runMode == RunMode.WORK) {
+            mode = 0x01
+        } else if (runMode == RunMode.STBY) {
+            mode = 0x02
+        }
+        return BleFrame(BleProtocol.REQ_SWITCH_MODE, byteArrayOf(mode.toByte()) + getUnixTime() + this, BleProtocol.RSP_SWITCH_MODE)
+    }
+
+    /**
+     * 构建用于作业票下发的指令集合
+     */
+    fun ByteArray.buildBLETicketDataCMDList(json: String): List<BleFrame> {
+        val cmds = ArrayList<BleFrame>()
+        // 先将数据转换为字节数组
+        val pkg = json.toByteArray()
+        // 包大小
+        val pkgSize = pkg.size
+        // 分包数
+        val pkgCount = (pkgSize + 128 - 1) / 128
+        for (idx in 0 until pkgCount) {
+            val endIdx = if ((idx + 1) == pkgCount) pkgSize else ((idx + 1) * 128)
+            // 将包做切片操作
+            val subPkg = pkg.copyOfRange(idx * 128, endIdx)
+            // 封装数据包操作
+            val data = pkgCount.toByteArray() + idx.toByteArray() + subPkg.crc16(0, subPkg.size) + subPkg.size.toByteArray() + subPkg
+            // 装包处理
+            cmds.add(
+                BleFrame(
+                    BleProtocol.REQ_SEND_WORK_TICKET,
+                    (data.size + 1).toByteArray(1) + 0x02.toByteArray(1) + data + getUnixTime() + this,
+                    BleProtocol.RSP_SEND_WORK_TICKET,
+                    BleProtocol.WRITE_UUID
+                )
+            )
+        }
+        return cmds
+    }
+
+    /**
+     * 构建获取作业票信息命令
+     */
+    fun ByteArray.buildBLEGetTicketInfoCMD(idx: Int = 0, pkgTotal: Int = 0): BleFrame {
+        if (idx > 0) {
+            return BleFrame(
+                BleProtocol.REQ_WORK_TICKET_RESULT_PART,
+                idx.toByteArray() + pkgTotal.toByteArray() + byteArrayOf(0x00) + getUnixTime() + this,
+                BleProtocol.RSP_WORK_TICKET_RESULT
+            )
+        }
+        return BleFrame(BleProtocol.REQ_WORK_TICKET_RESULT, getUnixTime() + this, BleProtocol.RSP_WORK_TICKET_RESULT)
+    }
+
+    /**
+     * 获取token
+     */
+    fun BleFrame.getToken(): ByteArray {
+        if (this.rspCode.contentEquals(BleProtocol.RSP_GET_TOKEN)) {
+            return this.data
+        }
+        return byteArrayOf()
+    }
+
+    /**
+     * 获取当前运行模式
+     */
+    fun BleFrame.getRunMode(): RunMode {
+        if (this.rspCode.contentEquals(BleProtocol.RSP_CURRENT_STATUS)) {
+            return when (this.data[0]) {
+                0x01.toByte() -> RunMode.WORK
+                0x02.toByte() -> RunMode.STBY
+                0x03.toByte() -> RunMode.FAILURE
+                else -> RunMode.NONE
+            }
+        }
+        return RunMode.NONE
+    }
+
+    /**
+     * 获取当前设备电量
+     */
+    fun BleFrame.getPower(): Int {
+        if (this.rspCode.contentEquals(BleProtocol.RSP_POWER_STATUS)) {
+            return this.data[0].toInt()
+        }
+        return -1
+    }
+
+    /**
+     * 获取当前工作模式切换是否成功
+     */
+    fun BleFrame.getSwitchRunModeResult(): Boolean {
+        if (this.rspCode.contentEquals(BleProtocol.RSP_SWITCH_MODE)) {
+            return this.data[1].toInt() == 1
+        }
+        return false
+    }
+
+    /**
+     * 响应发送工作票结果
+     *
+     * @return 0-成功 1-失败 2-超时 13-idx超出范围
+     */
+    fun BleFrame.getSendTicketResult(): Int {
+        if (this.rspCode.contentEquals(BleProtocol.RSP_SEND_WORK_TICKET)) {
+            return this.data[4].toInt()
+        }
+        return 99
+    }
+
+    fun BleFrame.getTicketPackageInfo(): BleTicketDataPackage {
+        if (this.rspCode.contentEquals(BleProtocol.RSP_WORK_TICKET_RESULT)) {
+            // 解析数据
+            val pkgCount = this.data[2] + this.data[3]
+            val pkgIdx = this.data[4] + this.data[5]
+            val pkgSize = this.data[8].toUByte() + this.data[9].toUByte()
+            val pkgData = this.data.copyOfRange(10, pkgSize.toInt() + 10)
+            // ISCSLog.i("getTicketPackageInfo", "包信息：总包数：$pkgCount, 当前包：$pkgIdx, 当前包大小：$pkgSize, 当前包数据：${pkgData.byteArrayToHexString("")}")
+            return BleTicketDataPackage(pkgIdx, pkgSize.toInt(), pkgData, pkgCount)
+        }
+        return BleTicketDataPackage(0, 0, byteArrayOf(), 0)
+    }
+
+}
+
+private fun getUnixTime(): ByteArray {
+    val tempArr = (System.currentTimeMillis() / 1000).toByteArray()
+    val timeStampArr = byteArrayOf(tempArr[0], tempArr[1], tempArr[2], tempArr[3])
+    return timeStampArr
+}
+
+private fun Long.toByteArray(): ByteArray {
+    return ByteBuffer.allocate(java.lang.Long.BYTES)
+        .order(ByteOrder.LITTLE_ENDIAN)
+        .putLong(this).array()
+}

transport/src/main/java/com/iscs/comm/extension/DataConvertExt.kt

@@ -1,5 +1,7 @@
 package com.iscs.comm.extension
 
+import com.iscs.comm.utils.CRC16
+
 /**
  * 将4位字节转为Int类型
  *
@@ -56,3 +58,28 @@ fun String.hexToByteArray(): ByteArray {
         .map { it.toInt(16).toByte() }
         .toByteArray()
 }
+
+/**
+ * 将Int转为ByteArray数组
+ */
+fun Int.toByteArray(capability: Int = 2): ByteArray {
+    val bytes = ByteArray(capability)
+    for (i in 0 until capability) {
+        // 大端模式
+        // bytes[capability - i - 1] = ((this ushr (i * 8)) and 0xFF).toByte()
+        // 小端模式
+        bytes[i] = ((this ushr (i * 8)) and 0xFF).toByte()
+    }
+    return bytes
+}
+
+/**
+ * CRC16 校验值
+ * @return 两字节的校验值
+ */
+fun ByteArray.crc16(from: Int = 0, to: Int = size) : ByteArray {
+    val value = CRC16.crc16(this, from.coerceAtLeast(0), to.coerceAtMost(size))
+    val c1 = (0xff00 and value shr 8).toByte()
+    val c2 = (0xff and value).toByte()
+    return byteArrayOf(c1, c2)
+}

transport/src/main/java/com/iscs/comm/extension/CommFrameExt.kt → transport/src/main/java/com/iscs/comm/extension/FrameExt.kt

@@ -1,9 +1,6 @@
 package com.iscs.comm.extension
 
-import com.iscs.comm.entity.BleFrame
 import com.iscs.comm.entity.Frame
-import com.iscs.comm.enums.RunMode
-import com.iscs.comm.protocol.BLEProtocol
 import com.iscs.comm.protocol.CanProtocol.CAN_ID_BASE
 import com.iscs.comm.protocol.CanProtocol.CAN_LOCK_RFID
 import com.iscs.comm.protocol.CanProtocol.CAN_READ_CMD
@@ -11,8 +8,6 @@ import com.iscs.comm.protocol.CanProtocol.CAN_SLOT_RW
 import com.iscs.comm.protocol.CanProtocol.CAN_SLOT_STATUS
 import com.iscs.comm.protocol.CanProtocol.CAN_WRITE_CMD_2BYTE
 import com.iscs.comm.utils.ISCSLog
-import java.nio.ByteBuffer
-import java.nio.ByteOrder
 
 /**
  * 构建读CAN总线下设备信息命令集合
@@ -93,76 +88,4 @@ fun Frame.buildCtrlReadDeviceStatus(): Frame {
             0x00, 0x00, 0x00, 0x00, 0x00
         )
     }
-}
-
-object CommFrameExt {
-
-    /**
-     * 构建蓝牙设备获取设备token的操作
-     */
-    fun buildBLEGetTokenCMD(): BleFrame {
-        return BleFrame(BLEProtocol.REQ_GET_TOKEN, getUnixTime(), BLEProtocol.RSP_GET_TOKEN)
-    }
-
-    /**
-     * 构建蓝牙设备获取蓝牙设备电量
-     */
-    fun ByteArray.buildBLEGetPowerCMD(): BleFrame {
-        return BleFrame(BLEProtocol.REQ_POWER_STATUS, getUnixTime() + this, BLEProtocol.RSP_POWER_STATUS)
-    }
-
-    /**
-     * 构建蓝牙获取当前设备状态
-     */
-    fun ByteArray.buildBLEGetStatusCMD(): BleFrame {
-        return BleFrame(BLEProtocol.REQ_CURRENT_STATUS, getUnixTime() + this, BLEProtocol.RSP_CURRENT_STATUS)
-    }
-
-    /**
-     * 获取token
-     */
-    fun BleFrame.getToken(): ByteArray {
-        if (this.rspCode.contentEquals(BLEProtocol.RSP_GET_TOKEN)) {
-            return this.data
-        }
-        return byteArrayOf()
-    }
-
-    /**
-     * 获取当前运行模式
-     */
-    fun BleFrame.getRunMode(): RunMode {
-        if (this.rspCode.contentEquals(BLEProtocol.RSP_CURRENT_STATUS)) {
-            return when (this.data[0]) {
-                0x01.toByte() -> RunMode.WORK
-                0x02.toByte() -> RunMode.STBY
-                0x03.toByte() -> RunMode.FAILURE
-                else -> RunMode.NONE
-            }
-        }
-        return RunMode.NONE
-    }
-
-    /**
-     * 获取当前设备电量
-     */
-    fun BleFrame.getPower(): Int {
-        if (this.rspCode.contentEquals(BLEProtocol.RSP_POWER_STATUS)) {
-            return this.data[0].toInt()
-        }
-        return -1
-    }
-
-}
-
-private fun getUnixTime(): ByteArray {
-    val tempArr = (System.currentTimeMillis() / 1000).toByteArray()
-    val timeStampArr = byteArrayOf(tempArr[0], tempArr[1], tempArr[2], tempArr[3])
-    return timeStampArr
-}
-
-private fun Long.toByteArray(): ByteArray {
-    return ByteBuffer.allocate(java.lang.Long.BYTES)
-        .order(ByteOrder.LITTLE_ENDIAN)
-        .putLong(this).array()
 }

transport/src/main/java/com/iscs/comm/manager/BLEManager.kt → transport/src/main/java/com/iscs/comm/manager/BleManager.kt

@@ -19,7 +19,7 @@ import com.iscs.comm.entity.BleConnectResult
 import com.iscs.comm.entity.BleFrame
 import com.iscs.comm.extension.byteArrayToHexString
 import com.iscs.comm.extension.hexToByteArray
-import com.iscs.comm.protocol.BLEProtocol
+import com.iscs.comm.protocol.BleProtocol
 import com.iscs.comm.utils.ISCSLog
 import kotlinx.coroutines.CancellableContinuation
 import kotlinx.coroutines.CompletableDeferred
@@ -35,13 +35,13 @@ import java.util.concurrent.ConcurrentHashMap
 /**
  * 蓝牙连接管理器
  */
-class BLEManager(
+class BleManager(
     val app: Application,
     val mac: String = "",
     val mtu: Int = 500,
     val needIndicate: Boolean = true,
-    val indicateUUID: String = BLEProtocol.INDICATE_UUID,
-    val serviceUUID: String = BLEProtocol.SERVICE_UUID,
+    val writeUUID: String = BleProtocol.INDICATE_UUID,
+    val serviceUUID: String = BleProtocol.SERVICE_UUID,
 ) {
 
     companion object {
@@ -120,9 +120,9 @@ class BLEManager(
                 val indicateOk = enableIndicate()
                 SystemClock.sleep(2000)
                 if (needIndicate) {
-                    this@BLEManager.doneConnect?.resume(BleConnectResult(indicateOk), null)
+                    if (!(this@BleManager.doneConnect?.isCompleted ?: false)) this@BleManager.doneConnect?.resume(BleConnectResult(indicateOk), null)
                 } else {
-                    this@BLEManager.doneConnect?.resume(BleConnectResult(true), null)
+                    if (!(this@BleManager.doneConnect?.isCompleted ?: false)) this@BleManager.doneConnect?.resume(BleConnectResult(true), null)
                 }
             }.start()
         }
@@ -130,17 +130,27 @@ class BLEManager(
         @SuppressLint("MissingPermission")
         override fun onCharacteristicRead(gatt: BluetoothGatt, characteristic: BluetoothGattCharacteristic, value: ByteArray, status: Int) {
             super.onCharacteristicRead(gatt, characteristic, value, status)
-            ISCSLog.i(TAG, "gattCallback onCharacteristicRead() ${gatt.readCharacteristic(characteristic)} ${value.contentToString()}")
+            ISCSLog.i(TAG, "gattCallback onCharacteristicRead()")
         }
 
         override fun onCharacteristicWrite(gatt: BluetoothGatt, characteristic: BluetoothGattCharacteristic, status: Int) {
             super.onCharacteristicWrite(gatt, characteristic, status)
-            ISCSLog.i(TAG, "gattCallback onCharacteristicWrite() data write success ${characteristic.value.byteArrayToHexString(" ")}")
+            ISCSLog.w(TAG, "gattCallback ---> ${characteristic.value.byteArrayToHexString(" ")}")
+        }
+
+        override fun onDescriptorRead(gatt: BluetoothGatt, descriptor: BluetoothGattDescriptor, status: Int, value: ByteArray) {
+            super.onDescriptorRead(gatt, descriptor, status, value)
+            ISCSLog.i(TAG, "gattCallback onDescriptorRead() data write success")
+        }
+
+        override fun onDescriptorRead(gatt: BluetoothGatt?, descriptor: BluetoothGattDescriptor?, status: Int) {
+            super.onDescriptorRead(gatt, descriptor, status)
+            ISCSLog.i(TAG, "gattCallback onDescriptorRead() data write success")
         }
 
         override fun onCharacteristicChanged(gatt: BluetoothGatt?, characteristic: BluetoothGattCharacteristic?) {
             super.onCharacteristicChanged(gatt, characteristic)
-            ISCSLog.i(TAG, "gattCallback onCharacteristicChanged() get notification data ${characteristic?.value?.byteArrayToHexString(" ")}")
+            ISCSLog.w(TAG, "gattCallback <--- ${characteristic?.value?.byteArrayToHexString(" ")}")
             val data = characteristic?.value ?: byteArrayOf()
             var key = ""
             receiverPool.forEach { item ->
@@ -162,7 +172,23 @@ class BLEManager(
 
         override fun onCharacteristicChanged(gatt: BluetoothGatt, characteristic: BluetoothGattCharacteristic, value: ByteArray) {
             super.onCharacteristicChanged(gatt, characteristic, value)
-            ISCSLog.i(TAG, "gattCallback onCharacteristicChanged() get notification data ${value.byteArrayToHexString(" ")}")
+            ISCSLog.w(TAG, "gattCallback <--- ${value.byteArrayToHexString(" ")}")
+            var key = ""
+            receiverPool.forEach { item ->
+                if (value.byteArrayToHexString().startsWith(item.key.split("_")[1])) {
+                    // 找到指定响应体
+                    key = item.key
+                    return@forEach
+                }
+            }
+            if (key.isNotEmpty()) {
+                val deferred = receiverPool.remove(key)
+                if (deferred != null && !deferred.isCompleted) {
+                    val spl = key.split("_")
+                    val rspCodeLen = spl[1].length / 2
+                    deferred.complete(BleFrame(spl[0].hexToByteArray(), value.copyOfRange(rspCodeLen, value.size), spl[1].hexToByteArray()))
+                }
+            }
         }
     }
 
@@ -183,7 +209,7 @@ class BLEManager(
         if (ba == null || !ba.isEnabled) {
             // 蓝牙不可用
             ISCSLog.e(TAG, "scan() bluetooth unused")
-            this.doneConnect?.resume(BleConnectResult(false), null)
+            if (!(this.doneConnect?.isCompleted ?: false)) this.doneConnect?.resume(BleConnectResult(false), null)
             return
         }
         // 获取扫描对象
@@ -231,8 +257,8 @@ class BLEManager(
      * 是否使能Indicate
      */
     @SuppressLint("MissingPermission")
-    private fun enableIndicate(): Boolean {
-        gatt?.getService(UUID.fromString(serviceUUID))?.getCharacteristic(UUID.fromString(indicateUUID))?.let {
+    private fun enableIndicate(uuid: String = writeUUID): Boolean {
+        gatt?.getService(UUID.fromString(serviceUUID))?.getCharacteristic(UUID.fromString(uuid))?.let {
             // 开启通知
             val open = gatt?.setCharacteristicNotification(it, true)
             ISCSLog.i(TAG, "enableIndicate() open notification $open")
@@ -259,16 +285,15 @@ class BLEManager(
     @SuppressLint("MissingPermission")
     suspend fun writeByResponse(frame: BleFrame) = withContext(Dispatchers.IO) {
         val deferred = CompletableDeferred<BleFrame>()
+        val writeUUID = if (frame.writeUUID.isNotEmpty()) UUID.fromString(frame.writeUUID) else UUID.fromString(writeUUID)
         receiverPool["${frame.reqCode.byteArrayToHexString()}_${frame.rspCode.byteArrayToHexString()}"] = deferred
         // 发送数据方法兼容处理
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            gatt?.getService(UUID.fromString(serviceUUID))?.getCharacteristic(UUID.fromString(indicateUUID))?.let {
-                ISCSLog.i(TAG, "writeByResponse() write characteristic find result ${it.uuid}")
+            gatt?.getService(UUID.fromString(serviceUUID))?.getCharacteristic(writeUUID)?.let {
                 gatt?.writeCharacteristic(it, frame.reqCode + frame.data, BluetoothGattCharacteristic.WRITE_TYPE_DEFAULT)
             }
         } else {
-            val characteristic = gatt?.getService(UUID.fromString(serviceUUID))?.getCharacteristic(UUID.fromString(indicateUUID))
-            ISCSLog.i(TAG, "writeByResponse() write characteristic find result ${characteristic?.uuid}")
+            val characteristic = gatt?.getService(UUID.fromString(serviceUUID))?.getCharacteristic(writeUUID)
             characteristic?.value = frame.reqCode + frame.data
             characteristic?.writeType = BluetoothGattCharacteristic.WRITE_TYPE_DEFAULT
             gatt?.writeCharacteristic(characteristic)

transport/src/main/java/com/iscs/comm/protocol/BLEProtocol.kt

@@ -1,32 +0,0 @@
-package com.iscs.comm.protocol
-
-/**
- * 封装用于蓝牙通信的协议
- */
-object BLEProtocol {
-
-    // 服务特征
-    const val SERVICE_UUID = "0000FEE7-0000-1000-8000-00805F9B34FB"
-
-    // 写入特征
-    const val INDICATE_UUID = "0000FED1-0000-1000-8000-00805F9B34FB"
-
-    // 获取令牌，需增加4字节的时间戳，总长8个字节长度
-    val REQ_GET_TOKEN = byteArrayOf(0x01, 0x01, 0x05, 0x00)
-
-    // 获取令牌响应，最后4个是token，总长15个字节长度
-    val RSP_GET_TOKEN = byteArrayOf(0x01, 0x02, 0x04)
-
-    // 获取钥匙电量
-    val REQ_POWER_STATUS = byteArrayOf(0x03, 0x01, 0x01, 0x03)
-
-    // 获取钥匙电量响应
-    val RSP_POWER_STATUS = byteArrayOf(0x03, 0x02, 0x03, 0x03)
-
-    // 获取设备当前状态
-    val REQ_CURRENT_STATUS = byteArrayOf(0x03, 0x01, 0x01, 0x01)
-
-    // 获取当前设备响应
-    val RSP_CURRENT_STATUS = byteArrayOf(0x03, 0x02, 0x02, 0x01)
-
-}

transport/src/main/java/com/iscs/comm/protocol/BleProtocol.kt

@@ -0,0 +1,56 @@
+package com.iscs.comm.protocol
+
+/**
+ * 封装用于蓝牙通信的协议
+ */
+object BleProtocol {
+
+    // 服务特征
+    const val SERVICE_UUID = "0000FEE7-0000-1000-8000-00805F9B34FB"
+
+    // 写入其他数据特征
+    const val INDICATE_UUID = "0000FED1-0000-1000-8000-00805F9B34FB"
+
+    // 写作业票数据特征
+    const val WRITE_UUID = "0000FED2-0000-1000-8000-00805F9B34FB"
+
+    // 获取令牌，需增加4字节的时间戳，总长8个字节长度
+    val REQ_GET_TOKEN = byteArrayOf(0x01, 0x01, 0x05, 0x00)
+
+    // 获取令牌响应，最后4个是token，总长15个字节长度
+    val RSP_GET_TOKEN = byteArrayOf(0x01, 0x02, 0x04)
+
+    // 获取钥匙电量
+    val REQ_POWER_STATUS = byteArrayOf(0x03, 0x01, 0x01, 0x03)
+
+    // 获取钥匙电量响应
+    val RSP_POWER_STATUS = byteArrayOf(0x03, 0x02, 0x03, 0x03)
+
+    // 获取当前设备请求
+    val REQ_CURRENT_STATUS = byteArrayOf(0x03, 0x01, 0x01, 0x01)
+
+    // 获取当前设备响应
+    val RSP_CURRENT_STATUS = byteArrayOf(0x03, 0x02, 0x02, 0x01)
+
+    // 工作模式切换请求
+    val REQ_SWITCH_MODE = byteArrayOf(0x02, 0x01, 0x02, 0x01)
+
+    // 工作模式切换响应
+    val RSP_SWITCH_MODE = byteArrayOf(0x02, 0x02, 0x03, 0x01)
+
+    // 工作票下发
+    val REQ_SEND_WORK_TICKET = byteArrayOf(0x02, 0x01)
+
+    // 工作票下发响应
+    val RSP_SEND_WORK_TICKET = byteArrayOf(0x02, 0x02, 0x06, 0x02)
+
+    // 获取设备工作票完成情况
+    val REQ_WORK_TICKET_RESULT = byteArrayOf(0x03, 0x01, 0x01, 0x02)
+
+    // 获取设备工作票完成情况响应
+    val RSP_WORK_TICKET_RESULT = byteArrayOf(0x03, 0x02)
+
+    // 获取设备工作票完成情况分包
+    val REQ_WORK_TICKET_RESULT_PART = byteArrayOf(0x03, 0x01, 0x06, 0x02)
+
+}

transport/src/main/java/com/iscs/comm/utils/CRC16.kt

@@ -0,0 +1,124 @@
+package com.iscs.comm.utils
+
+object CRC16 {
+    private val auchCRCHi = byteArrayOf(
+        0x00, 0xC1.toByte(), 0x81.toByte(),
+        0x40.toByte(), 0x01.toByte(), 0xC0.toByte(), 0x80.toByte(), 0x41.toByte(),
+        0x01.toByte(), 0xC0.toByte(), 0x80.toByte(), 0x41.toByte(), 0x00.toByte(),
+        0xC1.toByte(), 0x81.toByte(), 0x40.toByte(), 0x01.toByte(), 0xC0.toByte(),
+        0x80.toByte(), 0x41.toByte(), 0x00.toByte(), 0xC1.toByte(), 0x81.toByte(),
+        0x40.toByte(), 0x00.toByte(), 0xC1.toByte(), 0x81.toByte(), 0x40.toByte(),
+        0x01.toByte(), 0xC0.toByte(), 0x80.toByte(), 0x41.toByte(), 0x01.toByte(),
+        0xC0.toByte(), 0x80.toByte(), 0x41.toByte(), 0x00.toByte(), 0xC1.toByte(),
+        0x81.toByte(), 0x40.toByte(), 0x00.toByte(), 0xC1.toByte(), 0x81.toByte(),
+        0x40.toByte(), 0x01.toByte(), 0xC0.toByte(), 0x80.toByte(), 0x41.toByte(),
+        0x00.toByte(), 0xC1.toByte(), 0x81.toByte(), 0x40.toByte(), 0x01.toByte(),
+        0xC0.toByte(), 0x80.toByte(), 0x41.toByte(), 0x01.toByte(), 0xC0.toByte(),
+        0x80.toByte(), 0x41.toByte(), 0x00.toByte(), 0xC1.toByte(), 0x81.toByte(),
+        0x40.toByte(), 0x01.toByte(), 0xC0.toByte(), 0x80.toByte(), 0x41.toByte(),
+        0x00.toByte(), 0xC1.toByte(), 0x81.toByte(), 0x40.toByte(), 0x00.toByte(),
+        0xC1.toByte(), 0x81.toByte(), 0x40.toByte(), 0x01.toByte(), 0xC0.toByte(),
+        0x80.toByte(), 0x41.toByte(), 0x00.toByte(), 0xC1.toByte(), 0x81.toByte(),
+        0x40.toByte(), 0x01.toByte(), 0xC0.toByte(), 0x80.toByte(), 0x41.toByte(),
+        0x01.toByte(), 0xC0.toByte(), 0x80.toByte(), 0x41.toByte(), 0x00.toByte(),
+        0xC1.toByte(), 0x81.toByte(), 0x40.toByte(), 0x00.toByte(), 0xC1.toByte(),
+        0x81.toByte(), 0x40.toByte(), 0x01.toByte(), 0xC0.toByte(), 0x80.toByte(),
+        0x41.toByte(), 0x01.toByte(), 0xC0.toByte(), 0x80.toByte(), 0x41.toByte(),
+        0x00.toByte(), 0xC1.toByte(), 0x81.toByte(), 0x40.toByte(), 0x01.toByte(),
+        0xC0.toByte(), 0x80.toByte(), 0x41.toByte(), 0x00.toByte(), 0xC1.toByte(),
+        0x81.toByte(), 0x40.toByte(), 0x00.toByte(), 0xC1.toByte(), 0x81.toByte(),
+        0x40.toByte(), 0x01.toByte(), 0xC0.toByte(), 0x80.toByte(), 0x41.toByte(),
+        0x01.toByte(), 0xC0.toByte(), 0x80.toByte(), 0x41.toByte(), 0x00.toByte(),
+        0xC1.toByte(), 0x81.toByte(), 0x40.toByte(), 0x00.toByte(), 0xC1.toByte(),
+        0x81.toByte(), 0x40.toByte(), 0x01.toByte(), 0xC0.toByte(), 0x80.toByte(),
+        0x41.toByte(), 0x00.toByte(), 0xC1.toByte(), 0x81.toByte(), 0x40.toByte(),
+        0x01.toByte(), 0xC0.toByte(), 0x80.toByte(), 0x41.toByte(), 0x01.toByte(),
+        0xC0.toByte(), 0x80.toByte(), 0x41.toByte(), 0x00.toByte(), 0xC1.toByte(),
+        0x81.toByte(), 0x40.toByte(), 0x00.toByte(), 0xC1.toByte(), 0x81.toByte(),
+        0x40.toByte(), 0x01.toByte(), 0xC0.toByte(), 0x80.toByte(), 0x41.toByte(),
+        0x01.toByte(), 0xC0.toByte(), 0x80.toByte(), 0x41.toByte(), 0x00.toByte(),
+        0xC1.toByte(), 0x81.toByte(), 0x40.toByte(), 0x01.toByte(), 0xC0.toByte(),
+        0x80.toByte(), 0x41.toByte(), 0x00.toByte(), 0xC1.toByte(), 0x81.toByte(),
+        0x40.toByte(), 0x00.toByte(), 0xC1.toByte(), 0x81.toByte(), 0x40.toByte(),
+        0x01.toByte(), 0xC0.toByte(), 0x80.toByte(), 0x41.toByte(), 0x00.toByte(),
+        0xC1.toByte(), 0x81.toByte(), 0x40.toByte(), 0x01.toByte(), 0xC0.toByte(),
+        0x80.toByte(), 0x41.toByte(), 0x01.toByte(), 0xC0.toByte(), 0x80.toByte(),
+        0x41.toByte(), 0x00.toByte(), 0xC1.toByte(), 0x81.toByte(), 0x40.toByte(),
+        0x01.toByte(), 0xC0.toByte(), 0x80.toByte(), 0x41.toByte(), 0x00.toByte(),
+        0xC1.toByte(), 0x81.toByte(), 0x40.toByte(), 0x00.toByte(), 0xC1.toByte(),
+        0x81.toByte(), 0x40.toByte(), 0x01.toByte(), 0xC0.toByte(), 0x80.toByte(),
+        0x41.toByte(), 0x01.toByte(), 0xC0.toByte(), 0x80.toByte(), 0x41.toByte(),
+        0x00.toByte(), 0xC1.toByte(), 0x81.toByte(), 0x40.toByte(), 0x00.toByte(),
+        0xC1.toByte(), 0x81.toByte(), 0x40.toByte(), 0x01.toByte(), 0xC0.toByte(),
+        0x80.toByte(), 0x41.toByte(), 0x00.toByte(), 0xC1.toByte(), 0x81.toByte(),
+        0x40.toByte(), 0x01.toByte(), 0xC0.toByte(), 0x80.toByte(), 0x41.toByte(),
+        0x01.toByte(), 0xC0.toByte(), 0x80.toByte(), 0x41.toByte(), 0x00.toByte(),
+        0xC1.toByte(), 0x81.toByte(), 0x40.toByte()
+    )
+
+    private val auchCRCLo = byteArrayOf(
+        0x00.toByte(), 0xC0.toByte(), 0xC1.toByte(),
+        0x01.toByte(), 0xC3.toByte(), 0x03.toByte(), 0x02.toByte(), 0xC2.toByte(),
+        0xC6.toByte(), 0x06.toByte(), 0x07.toByte(), 0xC7.toByte(), 0x05.toByte(),
+        0xC5.toByte(), 0xC4.toByte(), 0x04.toByte(), 0xCC.toByte(), 0x0C.toByte(),
+        0x0D.toByte(), 0xCD.toByte(), 0x0F.toByte(), 0xCF.toByte(), 0xCE.toByte(),
+        0x0E.toByte(), 0x0A.toByte(), 0xCA.toByte(), 0xCB.toByte(), 0x0B.toByte(),
+        0xC9.toByte(), 0x09.toByte(), 0x08.toByte(), 0xC8.toByte(), 0xD8.toByte(),
+        0x18.toByte(), 0x19.toByte(), 0xD9.toByte(), 0x1B.toByte(), 0xDB.toByte(),
+        0xDA.toByte(), 0x1A.toByte(), 0x1E.toByte(), 0xDE.toByte(), 0xDF.toByte(),
+        0x1F.toByte(), 0xDD.toByte(), 0x1D.toByte(), 0x1C.toByte(), 0xDC.toByte(),
+        0x14.toByte(), 0xD4.toByte(), 0xD5.toByte(), 0x15.toByte(), 0xD7.toByte(),
+        0x17.toByte(), 0x16.toByte(), 0xD6.toByte(), 0xD2.toByte(), 0x12.toByte(),
+        0x13.toByte(), 0xD3.toByte(), 0x11.toByte(), 0xD1.toByte(), 0xD0.toByte(),
+        0x10.toByte(), 0xF0.toByte(), 0x30.toByte(), 0x31.toByte(), 0xF1.toByte(),
+        0x33.toByte(), 0xF3.toByte(), 0xF2.toByte(), 0x32.toByte(), 0x36.toByte(),
+        0xF6.toByte(), 0xF7.toByte(), 0x37.toByte(), 0xF5.toByte(), 0x35.toByte(),
+        0x34.toByte(), 0xF4.toByte(), 0x3C.toByte(), 0xFC.toByte(), 0xFD.toByte(),
+        0x3D.toByte(), 0xFF.toByte(), 0x3F.toByte(), 0x3E.toByte(), 0xFE.toByte(),
+        0xFA.toByte(), 0x3A.toByte(), 0x3B.toByte(), 0xFB.toByte(), 0x39.toByte(),
+        0xF9.toByte(), 0xF8.toByte(), 0x38.toByte(), 0x28.toByte(), 0xE8.toByte(),
+        0xE9.toByte(), 0x29.toByte(), 0xEB.toByte(), 0x2B.toByte(), 0x2A.toByte(),
+        0xEA.toByte(), 0xEE.toByte(), 0x2E.toByte(), 0x2F.toByte(), 0xEF.toByte(),
+        0x2D.toByte(), 0xED.toByte(), 0xEC.toByte(), 0x2C.toByte(), 0xE4.toByte(),
+        0x24.toByte(), 0x25.toByte(), 0xE5.toByte(), 0x27.toByte(), 0xE7.toByte(),
+        0xE6.toByte(), 0x26.toByte(), 0x22.toByte(), 0xE2.toByte(), 0xE3.toByte(),
+        0x23.toByte(), 0xE1.toByte(), 0x21.toByte(), 0x20.toByte(), 0xE0.toByte(),
+        0xA0.toByte(), 0x60.toByte(), 0x61.toByte(), 0xA1.toByte(), 0x63.toByte(),
+        0xA3.toByte(), 0xA2.toByte(), 0x62.toByte(), 0x66.toByte(), 0xA6.toByte(),
+        0xA7.toByte(), 0x67.toByte(), 0xA5.toByte(), 0x65.toByte(), 0x64.toByte(),
+        0xA4.toByte(), 0x6C.toByte(), 0xAC.toByte(), 0xAD.toByte(), 0x6D.toByte(),
+        0xAF.toByte(), 0x6F.toByte(), 0x6E.toByte(), 0xAE.toByte(), 0xAA.toByte(),
+        0x6A.toByte(), 0x6B.toByte(), 0xAB.toByte(), 0x69.toByte(), 0xA9.toByte(),
+        0xA8.toByte(), 0x68.toByte(), 0x78.toByte(), 0xB8.toByte(), 0xB9.toByte(),
+        0x79.toByte(), 0xBB.toByte(), 0x7B.toByte(), 0x7A.toByte(), 0xBA.toByte(),
+        0xBE.toByte(), 0x7E.toByte(), 0x7F.toByte(), 0xBF.toByte(), 0x7D.toByte(),
+        0xBD.toByte(), 0xBC.toByte(), 0x7C.toByte(), 0xB4.toByte(), 0x74.toByte(),
+        0x75.toByte(), 0xB5.toByte(), 0x77.toByte(), 0xB7.toByte(), 0xB6.toByte(),
+        0x76.toByte(), 0x72.toByte(), 0xB2.toByte(), 0xB3.toByte(), 0x73.toByte(),
+        0xB1.toByte(), 0x71.toByte(), 0x70.toByte(), 0xB0.toByte(), 0x50.toByte(),
+        0x90.toByte(), 0x91.toByte(), 0x51.toByte(), 0x93.toByte(), 0x53.toByte(),
+        0x52.toByte(), 0x92.toByte(), 0x96.toByte(), 0x56.toByte(), 0x57.toByte(),
+        0x97.toByte(), 0x55.toByte(), 0x95.toByte(), 0x94.toByte(), 0x54.toByte(),
+        0x9C.toByte(), 0x5C.toByte(), 0x5D.toByte(), 0x9D.toByte(), 0x5F.toByte(),
+        0x9F.toByte(), 0x9E.toByte(), 0x5E.toByte(), 0x5A.toByte(), 0x9A.toByte(),
+        0x9B.toByte(), 0x5B.toByte(), 0x99.toByte(), 0x59.toByte(), 0x58.toByte(),
+        0x98.toByte(), 0x88.toByte(), 0x48.toByte(), 0x49.toByte(), 0x89.toByte(),
+        0x4B.toByte(), 0x8B.toByte(), 0x8A.toByte(), 0x4A.toByte(), 0x4E.toByte(),
+        0x8E.toByte(), 0x8F.toByte(), 0x4F.toByte(), 0x8D.toByte(), 0x4D.toByte(),
+        0x4C.toByte(), 0x8C.toByte(), 0x44.toByte(), 0x84.toByte(), 0x85.toByte(),
+        0x45.toByte(), 0x87.toByte(), 0x47.toByte(), 0x46.toByte(), 0x86.toByte(),
+        0x82.toByte(), 0x42.toByte(), 0x43.toByte(), 0x83.toByte(), 0x41.toByte(),
+        0x81.toByte(), 0x80.toByte(), 0x40.toByte()
+    )
+
+    fun crc16(puchMsg: ByteArray, from: Int, to: Int): Int {
+        var uchCRCHi = 0xFF.toByte()
+        var uchCRCLo = 0xFF.toByte()
+        for (i in from..<to) {
+            val uIndex = (uchCRCHi.toInt() xor puchMsg[i].toInt()) and 0xff
+            uchCRCHi = (uchCRCLo.toInt() xor auchCRCHi[uIndex].toInt()).toByte()
+            uchCRCLo = auchCRCLo[uIndex]
+        }
+        return (((uchCRCHi.toInt()) shl 8 or ((uchCRCLo.toInt()) and 0xff))) and 0xffff
+    }
+}

transport/src/main/java/com/iscs/comm/utils/ISCSLog.kt

@@ -23,7 +23,7 @@ object ISCSLog {
     fun i(tag: String = "", msg: String) {
         if (level != LogLevel.INFO && level != LogLevel.ALL) return
         val time = formatTimestamp(System.currentTimeMillis())
-        Log.i(TAG, "I $time $tag $msg")
+        Log.d(TAG, "I $time $tag $msg")
     }
 
     /**