Эх сурвалжийг харах

refactor(用户管理):
- `UserManageFilterVo`: 将`cardCode`字段重命名为`cardNfc`,以更准确地反映其用途。
- `UserLogic`: 更新用户列表查询和过滤逻辑,以适应`cardNfc`字段的变更。

refactor(人脸识别):
- `ArcSoftUtil`: 移除在`initCamera`方法中获取`DisplayMetrics`的冗余代码。

fix(作业执行):
- `JobExecuteFragment`: 修复在特定条件下,未完成当前步骤时,仍可点击执行下一步骤的问题。
- `JobExecuteFragment`: 调整选择协作者的逻辑,确保`enableAddColocker`或`enableReduceColocker`为`true`时才允许选择协作者。

周文健 1 сар өмнө
parent
commit
111eb5d19a

+ 2 - 2
app/src/main/java/com/grkj/iscs/features/main/fragment/job_manage/JobExecuteFragment.kt

@@ -300,7 +300,7 @@ class JobExecuteFragment : BaseFragment<FragmentJobExecuteBinding>() {
                     if (item.stepIndex < viewModel.currentStepData?.stepIndex!!) {
                         return@observe
                     }
-                    if (item.stepId != viewModel.currentStepData?.stepId && !workflowStep.enableSetLocker && !workflowStep.enableSetColocker) {
+                    if (item.stepId != viewModel.currentStepData?.stepId) {
                         showToast(
                             CommonUtils.getStr(
                                 "please_done_operation",
@@ -387,7 +387,7 @@ class JobExecuteFragment : BaseFragment<FragmentJobExecuteBinding>() {
     private fun checkSelectMember(
         workflowStep: IsJobTicketStepDataVo?
     ): Boolean {
-        if (workflowStep?.enableSetLocker == true || workflowStep?.enableSetColocker == true && (workflowStep?.enableAddColocker == true || workflowStep?.enableReduceColocker == true)) {
+        if (workflowStep?.enableSetLocker == true || workflowStep?.enableSetColocker == true && (workflowStep.enableAddColocker || workflowStep.enableReduceColocker)) {
             GlobalDataTempStore.getInstance().saveData(
                 DataTransferConstants.KEY_CAN_SELECT_COLOCKER,
                 viewModel.workflowModes.find { it.modeId == viewModel.ticketData?.modeId }?.isColockSupport == true

+ 4 - 4
data/src/main/java/com/grkj/data/logic/impl/standard/UserLogic.kt

@@ -313,20 +313,20 @@ class UserLogic @Inject constructor(
             }
             user.workstationIds = userWorkstations.map { it.workstationId }
             user.workstationNames = userWorkstations.map { it.workstationName }
-            user.cardNfc = jobCardDos.find { it.userId == user.userId }?.cardCode ?: ""
+            user.cardNfc = jobCardDos.find { it.userId == user.userId }?.cardNfc ?: ""
             user.fingerprintSize =
                 userCharacteristicDos.groupBy { it.group }
                     .count { it.value.any { it.userId == user.userId && it.type == "1" } }
         }
         val nickname = userManageFilterData?.nickname
         val status = userManageFilterData?.status
-        val cardCode = userManageFilterData?.cardCode
+        val cardNfc = userManageFilterData?.cardNfc
         val workstationName = userManageFilterData?.workstationName
 
         val filteredList = userManageVos.filter { user ->
             (nickname.isNullOrEmpty() || user.nickName.contains(nickname)) &&
                     (status == null || user.status == (if (status) "1" else "0")) &&
-                    (cardCode.isNullOrEmpty() || user.cardNfc.contains(cardCode)) &&
+                    (cardNfc.isNullOrEmpty() || user.cardNfc.contains(cardNfc)) &&
                     (workstationName.isNullOrEmpty() || user.workstationNames.any {
                         it?.contains(
                             workstationName
@@ -405,7 +405,7 @@ class UserLogic @Inject constructor(
             }
             user.workstationIds = userWorkstations.map { it.workstationId }
             user.workstationNames = userWorkstations.map { it.workstationName }
-            user.cardNfc = jobCardDos.find { it.userId == user.userId }?.cardCode ?: ""
+            user.cardNfc = jobCardDos.find { it.userId == user.userId }?.cardNfc ?: ""
             user.fingerprintSize =
                 userCharacteristicDos.count { it.userId == user.userId && it.type == "1" }
         }

+ 1 - 1
data/src/main/java/com/grkj/data/model/vo/UserManageFilterVo.kt

@@ -5,7 +5,7 @@ package com.grkj.data.model.vo
  */
 data class UserManageFilterVo(
     val nickname: String,
-    val cardCode: String,
+    val cardNfc: String,
     val workstationName: String?,
     val status: Boolean?
 )

+ 0 - 3
shared/src/main/java/com/grkj/shared/utils/ArcSoftUtil.kt

@@ -194,9 +194,6 @@ object ArcSoftUtil {
         needCheckCenter: Boolean = false,
         callBack: (Bitmap?, Int, Boolean) -> Unit
     ) {
-        val metrics = DisplayMetrics()
-        windowManager.defaultDisplay.getMetrics(metrics)
-
         val cameraListener: CameraListener = object : CameraListener {
             override fun onCameraOpened(
                 camera: Camera, cameraId: Int, displayOrientation: Int, isMirror: Boolean