瀏覽代碼

添加归还设备是否需要授权配置和逻辑

Frankensteinly 11 月之前
父節點
當前提交
0b1413468e

+ 5 - 0
app/src/main/java/com/grkj/iscs/BusinessManager.kt

@@ -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 ->

+ 2 - 0
app/src/main/java/com/grkj/iscs/model/Constants.kt

@@ -4,6 +4,8 @@ object Constants {
     const val PERMISSION_REQUEST_CODE = 1
     const val BLE_LOCAL_NAME = "keyLock"
 
+    const val NEED_AUTH = false  // 归还设备是否需要登录验证
+
     /**************************  角色  **************************/
     const val USER_ROLE_DRAWER = "jtdrawer"         // 作业管理员/开票人
     const val USER_ROLE_LOCKER = "jtlocker"         // 作业负责人/上锁人