临时提交

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

@@ -117,11 +117,6 @@ class DeviceBean(
         return sb.toString()
     }
 
-    override fun toString(): String {
-        return "DeviceBean(addr=$addr, type=$type, keyList=$keyList, lockList=$lockList)"
-    }
-
-
     /**
      * 钥匙
      */
@@ -134,6 +129,4 @@ class DeviceBean(
      * @param rfid 锁具的RFID(仅有关闭锁扣的时候读取并保存，否则为null)
      */
     data class LockBean(var idx: Int, var hasLock: Boolean, var rfid: String?)
-
-
 }

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

@@ -276,7 +276,7 @@ object ModBusController {
      * 更新钥匙RFID
      */
     fun updateKeyRfid(slaveIdx: Int, isLeft: Boolean, rfid: String) {
-        deviceList.find { it.addr?.toInt() == slaveIdx }?.keyList?.find { it.isLeft == isLeft }?.rfid = rfid
+        deviceList.find { it.addr.toInt() == slaveIdx }?.keyList?.find { it.isLeft == isLeft }?.rfid = rfid
     }
 
     /**
@@ -290,7 +290,7 @@ object ModBusController {
      * 更新锁具RFID
      */
     fun updateLockRfid(slaveIdx: Int, lockIdx: Int, rfid: String) {
-        deviceList.find { it.addr?.toInt() == slaveIdx }?.lockList?.find { it.idx == lockIdx }?.rfid = rfid
+        deviceList.find { it.addr.toInt() == slaveIdx }?.lockList?.find { it.idx == lockIdx }?.rfid = rfid
     }
 
     /**