瀏覽代碼

补充部分提示语

Frankensteinly 7 月之前
父節點
當前提交
ea9383a143

+ 3 - 1
app/src/main/java/com/grkj/iscs/BusinessManager.kt

@@ -151,6 +151,7 @@ object BusinessManager {
                                 // 强制结束Loading防止有loading仍在显示
                                 Executor.delayOnMain(500) {
                                     mEventBus.postValue(MsgEvent(MSG_EVENT_LOADING, LoadingMsg(false, null, true)))
+                                    ToastUtils.tip(R.string.take_out_key)
                                 }
                             } else {
                                 LogUtil.e("切换工作模式失败 : ${it.data.bleBean.bleDevice.mac}")
@@ -1198,7 +1199,8 @@ object BusinessManager {
                             mDeviceTakeList.removeIf { it.deviceType == DEVICE_TYPE_LOCK && it.nfc == info.nfc }
                             // 检查当前工作票是否取完挂锁
                             if (mDeviceTakeList.any { it.deviceType == DEVICE_TYPE_LOCK && it.ticketId == info.ticketId }) {
-                                LogUtil.i("等待所有挂锁取出")
+                                LogUtil.i("Waiting all locks to take out")
+                                ToastUtils.tip(R.string.take_out_rest_locks)
                                 return@updateLockTake
                             }
                             // 检查有无当前工作票的钥匙

+ 3 - 0
app/src/main/java/com/grkj/iscs/view/presenter/JobProgressPresenter.kt

@@ -122,6 +122,9 @@ class JobProgressPresenter : BasePresenter<IJobProgressView>() {
                         }
                     }
                 }
+            } else {
+                LogUtil.w("Can't lock in current step")
+                ToastUtils.tip(R.string.can_not_lock_in_current_step)
             }
         }
     }

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

@@ -244,4 +244,7 @@
     <string name="loading_msg_get_ticket_status_start">正在读取钥匙作业票</string>
     <string name="key_return_success">钥匙归还成功</string>
     <string name="continue_the_ticket">请继续完成作业票</string>
+    <string name="can_not_lock_in_current_step">当前进度不允许执行上锁</string>
+    <string name="take_out_rest_locks">请取出剩余开启卡扣的挂锁</string>
+    <string name="take_out_key">请取出钥匙</string>
 </resources>