|
@@ -23,7 +23,6 @@ import com.grkj.iscs.extentions.startsWith
|
|
|
import com.grkj.iscs.extentions.toHexStrings
|
|
import com.grkj.iscs.extentions.toHexStrings
|
|
|
import com.grkj.iscs.modbus.DockBean
|
|
import com.grkj.iscs.modbus.DockBean
|
|
|
import com.grkj.iscs.modbus.ModBusController
|
|
import com.grkj.iscs.modbus.ModBusController
|
|
|
-import com.grkj.iscs.model.Constants
|
|
|
|
|
import com.grkj.iscs.model.Constants.PERMISSION_REQUEST_CODE
|
|
import com.grkj.iscs.model.Constants.PERMISSION_REQUEST_CODE
|
|
|
import com.grkj.iscs.model.Constants.USER_TYPE_LOCKER
|
|
import com.grkj.iscs.model.Constants.USER_TYPE_LOCKER
|
|
|
import com.grkj.iscs.model.DeviceConst.DEVICE_TYPE_CARD
|
|
import com.grkj.iscs.model.DeviceConst.DEVICE_TYPE_CARD
|
|
@@ -213,8 +212,17 @@ object BusinessManager {
|
|
|
fun registerMainListener() {
|
|
fun registerMainListener() {
|
|
|
ModBusController.registerStatusListener(this) { res ->
|
|
ModBusController.registerStatusListener(this) { res ->
|
|
|
LogUtil.i("设备状态:${(res as List<ByteArray>).map { it.toHexStrings() }}")
|
|
LogUtil.i("设备状态:${(res as List<ByteArray>).map { it.toHexStrings() }}")
|
|
|
- if (res.isEmpty() || res.all { it.isEmpty() }) {
|
|
|
|
|
- ToastUtils.tip(R.string.no_board_responses)
|
|
|
|
|
|
|
+ if (res.isEmpty() || res.any { it.isEmpty() }) {
|
|
|
|
|
+ var tipStr = MyApplication.instance?.applicationContext?.getString(R.string.no_response_board_exists) + " : "
|
|
|
|
|
+ val addressList = mutableListOf<String>()
|
|
|
|
|
+
|
|
|
|
|
+ ModBusController.modBusManager?.mSlaveAddressList?.forEach { itDock ->
|
|
|
|
|
+ if (res.none { it.isNotEmpty() && it[0] == itDock }) {
|
|
|
|
|
+ addressList.add("0x${String.format("%02X", itDock)}")
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ tipStr += addressList
|
|
|
|
|
+ ToastUtils.tip(tipStr)
|
|
|
}
|
|
}
|
|
|
res.forEach { bytes ->
|
|
res.forEach { bytes ->
|
|
|
val dockBean = ModBusController.updateStatus(bytes) ?: return@forEach
|
|
val dockBean = ModBusController.updateStatus(bytes) ?: return@forEach
|