소스 검색

优化八大步骤更新步骤逻辑

Frankensteinly 7 달 전
부모
커밋
b72276cd6a
2개의 변경된 파일14개의 추가작업 그리고 3개의 파일을 삭제
  1. 13 3
      app/src/main/java/com/grkj/iscs/view/fragment/StepFragment.kt
  2. 1 0
      app/src/main/res/values/strings.xml

+ 13 - 3
app/src/main/java/com/grkj/iscs/view/fragment/StepFragment.kt

@@ -227,17 +227,27 @@ class StepFragment(val goBack: () -> Unit, val changePage: (PageChangeBO) -> Uni
     }
 
     private fun handleStep(step: Int) {
+        if (mStep == 0) return
         when (step) {
             3 -> {
-                if (mStep == 0 || mStep > 5) return
+                if (mStep > 5 || mStep != 2) {
+                    ToastUtils.tip(R.string.current_step_can_not_be_process)
+                    return
+                }
                 changePage(PageChangeBO(1, mChangePage?.workstationId, mChangePage?.ticketId, mChangePage?.machineryId, mChangePage?.machineryName))
             }
             4 -> {
-                if (mStep == 0 || mStep >= 4) return
+                if (mStep != 3) {
+                    ToastUtils.tip(R.string.current_step_can_not_be_process)
+                    return
+                }
                 updateStep(4)
             }
             5, 6, 7, 8 -> {
-                if (mStep == 0 || mStep != step - 1) return
+                if (mStep != step - 1) {
+                    ToastUtils.tip(R.string.current_step_can_not_be_process)
+                    return
+                }
                 updateStep(step)
             }
         }

+ 1 - 0
app/src/main/res/values/strings.xml

@@ -268,4 +268,5 @@
     <string name="face_active_fail">人脸识别激活失败</string>
     <string name="face_can_not_process">人脸引擎激活失败,识别暂不可用</string>
     <string name="face_detected_do_login">检测到人脸,正在登录······</string>
+    <string name="current_step_can_not_be_process">当前步骤暂时无法处理</string>
 </resources>