补充打印

app/src/main/java/com/grkj/iscs/BusinessManager.kt

@@ -1284,7 +1284,12 @@ object BusinessManager {
             1 -> {
                 mDeviceTakeList.find { it.deviceType == DEVICE_TYPE_LOCK && it.nfc == deviceTakeUpdateBO.nfc }?.let { info ->
                     NetApi.updateLockTake(mutableListOf(LockTakeUpdateReqVO(info.ticketId, info.nfc, MyApplication.instance?.serialNo()!!))) { isSuccess ->
-                        if (isSuccess == true) {
+                        Executor.runOnMain {
+                            if (isSuccess == false) {
+                                LogUtil.e("Lock take report fail")
+                                ToastUtils.tip(R.string.lock_take_report_fail)
+                                return@runOnMain
+                            }
                             // 检查是不是要发钥匙了
                             mDeviceTakeList.removeIf { it.deviceType == DEVICE_TYPE_LOCK && it.nfc == info.nfc }
                             // 检查当前工作票是否取完挂锁
@@ -1296,8 +1301,9 @@ object BusinessManager {
                                         mDeviceTakeList.count { it.deviceType == DEVICE_TYPE_LOCK && it.ticketId == info.ticketId })
                                 )
                                 ToastUtils.tip(R.string.take_out_rest_locks)
-                                return@updateLockTake
+                                return@runOnMain
                             } else {
+                                LogUtil.i("All locks are taken")
                                 sendLoadingEventMsg(null, false)
                             }
                             // 检查有无当前工作票的钥匙

app/src/main/java/com/grkj/iscs/MyApplication.kt

@@ -4,6 +4,7 @@ import android.app.Application
 import android.content.Context
 import androidx.multidex.MultiDex
 import com.grkj.iscs.ble.BleUtil
+import com.grkj.iscs.extentions.serialNo
 import com.grkj.iscs.model.Token
 import com.grkj.iscs.util.ArcSoftUtil
 import com.grkj.iscs.util.CrashUtil
@@ -42,7 +43,7 @@ class MyApplication : Application() {
         Executor.runOnIO {
             BusinessManager.registerMainListener()
         }
-        LogUtil.i("App start")
+        LogUtil.i("App start : ${serialNo()}")
 
         Thread.setDefaultUncaughtExceptionHandler(MyCrashHandler())
     }

app/src/main/java/com/grkj/iscs/util/NetApi.kt

@@ -393,6 +393,8 @@ object NetApi {
             { res, _, _ ->
                 res?.let {
                     callBack.invoke(getRefBean(it))
+                } ?: run {
+                    callBack.invoke(false)
                 }
                 // TODO isAuth需要配置
             }, isGet = false, isAuth = BusinessManager.NEED_AUTH

app/src/main/java/com/grkj/iscs/view/presenter/LoginPresenter.kt

@@ -60,7 +60,6 @@ class LoginPresenter : BasePresenter<ILoginView>() {
     private fun commonProcess(loginRst: Boolean?, callBack: (Boolean, UserInfoRespVO?) -> Unit) {
         if (loginRst == true) {
             NetApi.getUserInfo { userInfo ->
-                println("haha1 : $userInfo")
                 userInfo?.let { info ->
                     SPUtils.setLoginUser(mContext!!, info)
                 }

app/src/main/res/values/strings.xml

@@ -280,4 +280,5 @@
     <string name="send_ticket_fail">作业票下发失败</string>
     <string name="login_method_tip">● 您可以通过指纹或刷卡直接进行登录</string>
     <string name="no_key_available_dialog_tip">暂无可用钥匙，确认继续执行作业票吗？</string>
+    <string name="lock_take_report_fail">挂锁取出上报失败</string>
 </resources>