|
|
@@ -25,6 +25,7 @@ import com.grkj.iscs.extentions.toByteArray
|
|
|
import com.grkj.iscs.extentions.toHexStrings
|
|
|
import com.grkj.iscs.modbus.DockBean
|
|
|
import com.grkj.iscs.modbus.ModBusController
|
|
|
+import com.grkj.iscs.model.Constants.NEED_AUTH
|
|
|
import com.grkj.iscs.model.Constants.PERMISSION_REQUEST_CODE
|
|
|
import com.grkj.iscs.model.DeviceConst.DEVICE_TYPE_CARD
|
|
|
import com.grkj.iscs.model.DeviceConst.DEVICE_TYPE_FINGERPRINT
|
|
|
@@ -80,6 +81,10 @@ object BusinessManager {
|
|
|
LogUtil.i("设备状态:${(res as List<ByteArray>).map { it.toHexStrings() }}")
|
|
|
res.forEach { bytes ->
|
|
|
val dockBean = ModBusController.updateStatus(bytes) ?: return@forEach
|
|
|
+ val loginUser = SPUtils.getLoginUser(MyApplication.instance!!.applicationContext!!)
|
|
|
+ if (NEED_AUTH && (loginUser == null || loginUser.userId == 0L)) {
|
|
|
+ return@forEach
|
|
|
+ }
|
|
|
when (dockBean.type) {
|
|
|
DOCK_TYPE_KEY -> {
|
|
|
dockBean.getKeyList().forEach { keyBean ->
|