移除冗余

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

@@ -306,7 +306,7 @@ object BusinessManager {
     }
 
     /**
-     * 检查钥匙和锁具数量 TODO 钥匙要是存在的、有RFID、有Mac、连接的
+     * 检查钥匙和锁具数量
      *
      * @param needLockCount 需要的锁具的数量（可能在别的机柜取过）
      */
@@ -623,7 +623,11 @@ object BusinessManager {
     /**
      * 读取工作票完成情况
      */
-    fun getTicketStatusBusiness(mac: String, activity: AppCompatActivity, loadingCallBack: ((Boolean, String?, Boolean?) -> Unit)?) {
+    fun getTicketStatusBusiness(
+        mac: String,
+        activity: AppCompatActivity,
+        loadingCallBack: ((Boolean, String?, Boolean?) -> Unit)?
+    ) {
         registerConnectListener(mac) { isDone, bleBean ->
             if (isDone) {
                 Executor.delayOnMain(500) {
@@ -736,8 +740,6 @@ object BusinessManager {
                 loadingCallBack?.invoke(false, null, null)
             }
         }
-        // TODO 切换完不断开
-//        BleManager.getInstance().disconnectAllDevice()
     }
 
     /**

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

@@ -3,10 +3,6 @@ package com.grkj.iscs.ble
 import com.clj.fastble.data.BleDevice
 import com.clj.fastble.exception.BleException
 import com.grkj.iscs.BusinessManager
-import com.grkj.iscs.extentions.crc16
-import com.grkj.iscs.extentions.startsWith
-import com.grkj.iscs.extentions.toByteArray
-import com.grkj.iscs.extentions.toHexStrings
 import com.grkj.iscs.ble.BleConst.REQ_CURRENT_STATUS
 import com.grkj.iscs.ble.BleConst.REQ_GET_TOKEN
 import com.grkj.iscs.ble.BleConst.REQ_GET_VERSION
@@ -17,6 +13,10 @@ import com.grkj.iscs.ble.BleConst.REQ_TRANSFER_FILE
 import com.grkj.iscs.ble.BleConst.REQ_WORK_TICKET_RESULT
 import com.grkj.iscs.ble.BleConst.REQ_WORK_TICKET_RESULT_PART
 import com.grkj.iscs.ble.BleConst.WRITE_UUID
+import com.grkj.iscs.extentions.crc16
+import com.grkj.iscs.extentions.startsWith
+import com.grkj.iscs.extentions.toByteArray
+import com.grkj.iscs.extentions.toHexStrings
 import com.grkj.iscs.util.Executor
 import com.grkj.iscs.util.log.LogUtil
 import java.io.File
@@ -36,7 +36,7 @@ object BleCmdManager {
     /**
      * 拼接时间戳 + token
      */
-     fun assembleData(bleBean: BleBean, byteArray: ByteArray): ByteArray? {
+     private fun assembleData(bleBean: BleBean, byteArray: ByteArray): ByteArray? {
         bleBean.token?.let {
             return assembleTimeStamp(byteArray) + it
         } ?: run {
@@ -295,7 +295,7 @@ object BleCmdManager {
     /**
      * 获取工作票完成情况分包
      */
-    fun getTicketStatusPart(idx: ByteArray, total: ByteArray, res: ByteArray, bleDevice: BleDevice, callback: CustomBleWriteCallback?) {
+    private fun getTicketStatusPart(idx: ByteArray, total: ByteArray, res: ByteArray, bleDevice: BleDevice, callback: CustomBleWriteCallback?) {
         BusinessManager.getBleDeviceByMac(bleDevice.mac)?.let {
             BleUtil.instance?.write(it.bleDevice, cmd = assembleData(it, REQ_WORK_TICKET_RESULT_PART + idx + total + res), writeCallback = callback)
         }