移除部分TODO事项

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

@@ -54,7 +54,7 @@ object BusinessManager {
 
     // 已连接的蓝牙钥匙集合
     var deviceList: MutableList<BleBean> = mutableListOf()
-    // TODO 是否正在进行准备流程
+    // 是否正在进行准备流程
     private var isPreparing: Boolean = false
 
     // Modbus数据页面监听
@@ -72,13 +72,12 @@ object BusinessManager {
     // 蓝牙连接准备监听集合，全是待准备连接的，准备完毕的会移除
     private val connectListeners = mutableListOf<ConnectListener>()
 
-    // TODO 归还设备是否需要登录
+    // 归还设备是否需要登录
     var NEED_AUTH = true
 
     // 归还设备是否需要登录及角色验证
     private var CAN_RETURN = true
         get() {
-            // TODO 临时注掉，方便调试
             val loginUser = SPUtils.getLoginUser(MyApplication.instance!!.applicationContext!!)
             return (NEED_AUTH && loginUser != null) || !NEED_AUTH
         }
@@ -531,9 +530,8 @@ object BusinessManager {
                     bleDevice.mac?.let { itMac ->
                         unregisterConnectListener(itMac)
                     }
-                    // TODO 待定
                     if (!isActiveDisConnected) {
-                        // TODO 断开和重连之间最好间隔一段时间，否则可能会出现长时间连接不上的情况
+                        // 断开和重连之间最好间隔一段时间，否则可能会出现长时间连接不上的情况
                         Executor.delayOnMain(300) {
                             registerConnectListener(bleDevice.mac)
                         }

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

@@ -398,23 +398,7 @@ object BleCmdManager {
         val total = byteArray[15] + byteArray[16]
         val idx = byteArray[13] + byteArray[14]
         if (idx != total - 1 && (res == 0x00.toByte() || res == 0x02.toByte())) {
-            // TODO 不用等回复再发
-//            sendFile(type.toInt(),
-//                BleUtil.instance?.getBleDeviceByMac(bleBean.bleDevice.mac)?.fileSend!!,
-//                if (res == 0x00.toByte()) idx + 1 else idx,
-//                bleBean.bleDevice.mac,
-//                object : CustomBleWriteCallback() {
-//                    override fun onPrompt(promptStr: String?) {}
-//
-//                    override fun onConnectPrompt(promptStr: String?) {}
-//
-//                    override fun onDisConnectPrompt(promptStr: String?) {}
-//
-//                    override fun onWriteSuccess(current: Int, total: Int, justWrite: ByteArray?) {}
-//
-//                    override fun onWriteFailure(exception: BleException?) {}
-//
-//                })
+            // 不用等回复再发
         }
     }
 

app/src/main/java/com/grkj/iscs/modbus/DockBean.kt

@@ -31,7 +31,6 @@ class DockBean(
             // 因为都是一个寄存器返回的，所以一定能得到2个钥匙的状态或者10把锁具的状态
             when (it) {
                 DOCK_TYPE_KEY -> {
-                    // TODO 未验证
                     val leftHasKey = (byteArray[4].toInt() shr 0) and 0x1 == 1
                     val isLeftCharging = (byteArray[4].toInt() shr 1) and 0x1 == 1
                     val rightHasKey = (byteArray[3].toInt() shr 0) and 0x1 == 1

app/src/main/java/com/grkj/iscs/modbus/ModBusController.kt

@@ -118,7 +118,6 @@ object ModBusController {
     /**
      * 初始化所有设备的状态
      */
-    // TODO 通电后多久执行？App每次重启的执行是什么
     fun initDevicesStatus() {
         readDeviceType { res ->
             res.forEach { bytes ->
@@ -133,15 +132,12 @@ object ModBusController {
                     else -> "未知"
                 }
                 LogUtil.i("initDevicesStatus 设备（${bytes[0].toInt()}）类型：$type")
-
-                // TODO 设置所有钥匙的模式
-                // TODO 通过HTTP获取所有钥匙的Mac
             }
             // TODO 待完善
             Executor.repeatOnMain({
                 if (isInitReady) {
                     initLock()    // 打开所有无锁的卡扣、关闭所有有锁的卡扣、读取所有锁的RFID
-                    initKey()     // 打开所有无钥匙的卡扣、关闭所有有钥匙的卡扣、关闭所有钥匙灯光、读取所有钥匙的RFID
+                    initKey()     // 打开所有无钥匙的卡扣、关闭所有有钥匙的卡扣、读取所有钥匙的RFID
                     return@repeatOnMain false
                 } else {
                     return@repeatOnMain true
@@ -191,10 +187,12 @@ object ModBusController {
                         }
                         val rfid = res.copyOfRange(3, 11).toHexStrings(false).removeLeadingZeros()
                         LogUtil.i("初始化钥匙 RFID : $rfid")
+                        // 更新rfid
                         updateKeyRfid(dockBean.addr.toInt(), isLeft, rfid)
                         // 蓝牙准备操作
                         NetApi.getKeyInfo(rfid) {
                             if (it != null && !it.macAddress.isNullOrEmpty()) {
+                                // 更新mac
                                 updateKeyMac(dockBean.addr.toInt(), key.isLeft, it.macAddress)
                                 BusinessManager.registerConnectListener(it.macAddress)
                             } else {

app/src/main/java/com/grkj/iscs/modbus/ModBusManager.kt

@@ -316,6 +316,7 @@ class ModBusManager(
      *
      * @param leftAction、rightAction 0：保持当前状态 1：点亮 2：熄灭 默认0
      */
+    @Deprecated("已取消")
     fun generateKeyLightCmd(leftAction: Int = 0, rightAction: Int = 0): MBFrame {
         return MBFrame(
             FRAME_TYPE_WRITE,

app/src/main/java/com/grkj/iscs/presentation/LockerActivity.kt

@@ -79,16 +79,7 @@ class LockerActivity : BaseActivity<ActivityLockerBinding>() {
                     LogUtil.i("confirm开锁卡扣 : ${res.toHexStrings()}")
                 }
             }
-            if (lockerStatus == 0 || lockerStatus == 1) {
-                // TODO 业务变动，demo临时注掉
-//                BusinessManager.sendTicketBusiness(PresentationManager.keyMac, this) { b, s ->
-//                    handleLoading(b, s)
-//                    if (s.equals("切换工作模式成功")) {
-//                        ModBusController.controlKeyBuckle(true, isLeft = true, dockList[0].addr.toInt() - 1)
-//                        finish()
-//                    }
-//                }
-            }
+            if (lockerStatus == 0 || lockerStatus == 1) { }
         }
     }
 }

app/src/main/java/com/grkj/iscs/view/activity/TicketListActivity.kt

@@ -27,7 +27,6 @@ class TicketListActivity : BaseActivity<ActivityTicketListBinding>() {
             }
 
             override fun getItemCount(): Int {
-                // TODO 根据intent获取的值
                 return 4
             }
         }

app/src/main/java/com/grkj/iscs/view/presenter/JobProgressPresenter.kt

@@ -74,7 +74,6 @@ class JobProgressPresenter : BasePresenter<IJobProgressView>() {
      * 上锁人上锁流程
      */
     fun handleLockProcess(ticketId: Long) {
-        // TODO 上锁人上锁流程
         getTicketDetail(ticketId) { ticketDetail ->
             val role = ticketDetail?.jobTicketUserList?.find { it.userId == SPUtils.getLoginUser(mContext!!)?.userId && it.userType == USER_TYPE_LOCKER }
             if (role == null) {
@@ -141,7 +140,6 @@ class JobProgressPresenter : BasePresenter<IJobProgressView>() {
      * 上锁人解锁流程
      */
     fun handleUnlockProcess(ticketId: Long) {
-        // TODO 上锁人解锁流程
         getTicketDetail(ticketId) { ticketDetail ->
             val role = ticketDetail?.jobTicketUserList?.find { it.userId == SPUtils.getLoginUser(mContext!!)?.userId && it.userType == USER_TYPE_LOCKER }
             if (role == null) {

app/src/main/java/com/grkj/iscs/view/presenter/LoginPresenter.kt

@@ -7,8 +7,6 @@ import com.grkj.iscs.extentions.removeLeadingZeros
 import com.grkj.iscs.extentions.toHexStrings
 import com.grkj.iscs.modbus.ModBusController
 import com.grkj.iscs.model.DeviceConst.DEVICE_TYPE_CARD
-import com.grkj.iscs.model.DeviceConst.DEVICE_TYPE_KEY
-import com.grkj.iscs.model.DeviceConst.DEVICE_TYPE_LOCK
 import com.grkj.iscs.model.vo.card.CardInfoRespVO
 import com.grkj.iscs.util.Executor
 import com.grkj.iscs.util.NetApi
@@ -76,40 +74,6 @@ class LoginPresenter : BasePresenter<ILoginView>() {
                             }
                         }
                     }
-
-                    DEVICE_TYPE_KEY -> {
-                        // TODO 是否处理工作票
-//                        Executor.runOnMain {
-//                            BusinessManager.getTicketStatusBusiness(
-//                                PresentationManager.keyMac,
-//                                this
-//                            ) { b, s ->
-//                                (mvpView as BaseActivity<*>).handleLoading(b, s)
-//                                if (!s.isNullOrEmpty() && s.startsWith("工作票完成接收")) {
-//                                    val ticket = s.substring(7)
-//                                    val ticketStatusBean = Gson().fromJson(
-//                                        ticket,
-//                                        WorkTicketStatusBean::class.java
-//                                    )
-//                                    PresentationManager.updateWorkTicket(ticketStatusBean)
-//                                }
-//                            }
-//                        }
-                    }
-
-                    DEVICE_TYPE_LOCK -> {
-                        // TODO 是否处理
-//                        Executor.runOnMain {
-//                            ModBusController.readLockRfid(
-//                                dockBean.addr.toInt() - 1,
-//                                deviceBean.idx
-//                            ) { res ->
-//                                val rfid = res.copyOfRange(3, 11).toHexStrings(false)
-//                                    .removeLeadingZeros()
-//                                PresentationManager.updateLockReturnStatus(rfid)
-//                            }
-//                        }
-                    }
                 }
             }
         }

app/src/main/java/com/grkj/iscs/view/widget/CustomMarkLayer.kt

@@ -146,7 +146,7 @@ class CustomMarkLayer @JvmOverloads constructor(
                     val goal = floatArrayOf(mark.x, mark.y)
                     currentMatrix.mapPoints(goal)
 
-                    // TODO 文字背景
+                    // 文字背景
                     val width = paint.measureText(point.name)
                     paint.color = Color.parseColor("#70b26f")
                     paint.style = Paint.Style.FILL
@@ -205,7 +205,7 @@ class CustomMarkLayer @JvmOverloads constructor(
                             )
                         }
                     }
-                    // TODO 定位点，仅调试用，不要显示
+                    // 定位点，仅调试用，不要显示
 //                    canvas.drawCircle(goal[0], goal[1], 2f, paint)
                 }
             }