Ver Fonte

添加上锁人解锁操作提示

Frankensteinly há 10 meses atrás
pai
commit
9c96b669dc

+ 5 - 0
app/src/main/java/com/grkj/iscs/presentation/simple/SimpleProcessActivity.kt

@@ -63,6 +63,11 @@ class SimpleProcessActivity : BaseActivity<ActivitySimpleProcessBinding>() {
         }
 
         mBinding?.llConfirmComplete?.setOnClickListener {
+            val doneCount = PresentationManager.mSimpleTicket?.lockerTogetherList?.filter { it.status == 2 }?.size ?: 0
+            if (doneCount < 2) {
+                ToastUtils.tip(R.string.simple_please_wait_for_colocker_to_finish)
+                return@setOnClickListener
+            }
             PresentationManager.mStep = 6
             changeStep(6)
             PresentationManager.checkSimpleEquip(this)

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

@@ -168,4 +168,5 @@
     <string name="simple_wait_for_device_return">等待归还钥匙和挂锁</string>
     <string name="simple_tip_process6">流程提示\n等待主锁人解锁后,归还钥匙和挂锁,结束作业票。</string>
     <string name="simple_tip_complete">作业票流程已技术,请返回首页</string>
+    <string name="simple_please_wait_for_colocker_to_finish">请等待维修人员完成操作</string>
 </resources>

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

@@ -168,4 +168,5 @@
     <string name="simple_wait_for_device_return">Waiting for the return ofthe key and lock</string>
     <string name="simple_tip_process6">Process Instructions:\nWait for the primary lock owner to unlock and returnthe key and lock to complete the work permit.</string>
     <string name="simple_tip_complete">The work permit process has been completed.\nPlease return to the homepage.</string>
+    <string name="simple_please_wait_for_colocker_to_finish">Waiting for maintenance workers to finish</string>
 </resources>