Browse Source

refactor(更新)
- 执行界面提示新增

周文健 4 months ago
parent
commit
c27508bcc2

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

@@ -5,6 +5,7 @@ import android.view.ViewGroup
 import android.widget.LinearLayout
 import androidx.core.view.isVisible
 import androidx.fragment.app.viewModels
+import androidx.lifecycle.ViewModel
 import com.drake.brv.BindingAdapter
 import com.drake.brv.annotaion.DividerOrientation
 import com.drake.brv.utils.dividerSpace
@@ -184,7 +185,16 @@ class JobExecuteFragment : BaseFragment<FragmentJobExecuteBinding>() {
         itemBinding.stepLayout.setDebouncedClickListener {
             val workflowStep =
                 viewModel.workflowSteps.find { it.stepId == item.workflowStepId }
+            if (item.stepIndex < viewModel.currentStepData?.stepIndex!!) {
+                return@setDebouncedClickListener
+            }
             if (item.stepId != viewModel.currentStepData?.stepId && workflowStep?.enableSetLocker == false && workflowStep.enableSetColocker == false) {
+                PopTip(
+                    getString(
+                        R.string.please_done_operation,
+                        viewModel.currentStepData?.androidStepContent
+                    )
+                )
                 return@setDebouncedClickListener
             }
             if (workflowStep?.confirmType != 0 &&

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

@@ -380,5 +380,6 @@
     <string name="please_complete_release_colock">Please release coLock</string>
     <string name="has_lock_not_unlocked">Your point %s are not unlocked</string>
     <string name="please_do_colock">Please have co-locker perform co-lock</string>
+    <string name="please_done_operation">Please done operation %s first</string>
 
 </resources>

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

@@ -380,5 +380,6 @@
     <string name="please_complete_release_colock">请先完成共锁解除</string>
     <string name="has_lock_not_unlocked">您还有%s点位未解锁</string>
     <string name="please_do_colock">请共锁人能完成共锁</string>
+    <string name="please_done_operation">请先完成%s</string>
 
 </resources>

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

@@ -383,5 +383,6 @@
     <string name="please_complete_release_colock">请先完成共锁解除</string>
     <string name="has_lock_not_unlocked">您还有%s点位未解锁</string>
     <string name="please_do_colock">请共锁人能完成共锁</string>
+    <string name="please_done_operation">请先完成%s</string>
 
 </resources>