فهرست منبع

补充部分提示语

Frankensteinly 7 ماه پیش
والد
کامیت
314abb79ca

+ 8 - 0
app/src/main/java/com/grkj/iscs/BusinessManager.kt

@@ -1075,6 +1075,8 @@ object BusinessManager {
                 showKeyReturnDialog({
                     handleKeyReturn(bleDevice, workTicketGetBO)
                 }) {
+                    sendLoadingEventMsg(null, false)
+                    ToastUtils.tip(R.string.continue_the_ticket)
                     BleManager.getInstance().disconnect(bleDevice)
                     // 打开卡扣,防止初始化的时候选择不处理钥匙导致无法使用
                     val dock = ModBusController.getDockByKeyMac(bleDevice.mac)
@@ -1113,6 +1115,8 @@ object BusinessManager {
                 updateList.add(updateVO)
             }
 
+            sendLoadingEventMsg(null, false)
+            ToastUtils.tip(R.string.key_return_success)
             if (CAN_RETURN) {
                 // 上报点位钥匙绑定
                 NetApi.updateLockPointBatch(updateList) { isSuccess ->
@@ -1308,4 +1312,8 @@ object BusinessManager {
             }
         }
     }
+
+    fun sendLoadingEventMsg(str: String?, isShow: Boolean = true) {
+        mEventBus.postValue(MsgEvent(MSG_EVENT_LOADING, LoadingMsg(isShow, str, false)))
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.grkj.iscs.view.presenter
 
 import com.grkj.iscs.BusinessManager
+import com.grkj.iscs.R
 import com.grkj.iscs.model.DeviceConst.DOCK_TYPE_KEY
 import com.grkj.iscs.util.Executor
 import com.grkj.iscs.view.base.BasePresenter
@@ -19,9 +20,11 @@ class HomePresenter : BasePresenter<IHomeView>() {
                         if (keyBean.isExist) {
                             Executor.repeatOnMain({
                                 keyBean.mac?.let {
+                                    BusinessManager.sendLoadingEventMsg(mContext?.getString(R.string.loading_msg_return_key_start))
                                     BusinessManager.registerConnectListener(it) { isDone, bleBean ->
                                         if (isDone && bleBean != null) {
                                             Executor.delayOnMain(300) {
+                                                BusinessManager.sendLoadingEventMsg(mContext?.getString(R.string.loading_msg_get_ticket_status_start))
                                                 BusinessManager.getCurrentStatus(4, bleBean.bleDevice)
                                             }
                                         }

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

@@ -240,4 +240,8 @@
     <string name="face_add_success_tip">已成功录入您的人脸数据</string>
     <string name="face_delete_confirm_tip">确定要删除人脸数据吗?</string>
     <string name="my_face">我的人脸</string>
+    <string name="loading_msg_return_key_start">开始连接钥匙,请稍候······</string>
+    <string name="loading_msg_get_ticket_status_start">正在读取钥匙作业票</string>
+    <string name="key_return_success">钥匙归还成功</string>
+    <string name="continue_the_ticket">请继续完成作业票</string>
 </resources>