Просмотр исходного кода

refactor(修改):
- 如果上报锁信息的时候如果网络异常则隐藏取锁弹窗

周文健 5 месяцев назад
Родитель
Сommit
c6cc881db4

+ 6 - 5
app/src/main/java/com/grkj/iscs/BusinessManager.kt

@@ -1753,11 +1753,12 @@ object BusinessManager {
                                     LogUtil.e("Lock take report fail")
                                     ToastUtils.tip(R.string.lock_take_report_fail)
                                     if (mDeviceTakeList.any { it.deviceType == DEVICE_TYPE_LOCK && it.ticketId == info.ticketId }) {
-                                        sendLoadingEventMsg(
-                                            MyApplication.instance?.applicationContext?.getString(
-                                                R.string.take_out_lock_tip,
-                                                mDeviceTakeList.count { it.deviceType == DEVICE_TYPE_LOCK && it.ticketId == info.ticketId })
-                                        )
+//                                        sendLoadingEventMsg(
+//                                            MyApplication.instance?.applicationContext?.getString(
+//                                                R.string.take_out_lock_tip,
+//                                                mDeviceTakeList.count { it.deviceType == DEVICE_TYPE_LOCK && it.ticketId == info.ticketId })
+//                                        )
+                                        sendLoadingEventMsg(null, false)
                                     }
                                     return@runOnMain
                                 }

+ 0 - 31
app/src/main/java/com/grkj/iscs/util/NetHttpManager.kt

@@ -79,10 +79,6 @@ class NetHttpManager {
                     itPreChain.proceed()
                     return@addSerialPreprocessor
                 }
-//                requestTokenAndRefreshIfExpired {
-//                    itPreChain.task.addHeader("Authorization", it)
-//                    itPreChain.proceed()
-//                }
                 itPreChain.task.addHeader("Authorization", Token.fromSp(context!!)?.token)
                 itPreChain.proceed()
             }
@@ -118,30 +114,6 @@ class NetHttpManager {
             ToastUtils.tip(context!!.resources.getString(R.string.please_login))
             return
         }
-//        myHttp.async(LOGIN_CARD)
-//            .skipPreproc()
-//            .addBodyPara("cardNfc", loginUser.cardNfc)
-//            .nextOnIO()
-//            .setOnResponse {
-//                exceptionCount = 0
-//                if (!it.isSuccessful) {
-//                    callback(null)
-//                    return@setOnResponse
-//                }
-//                try {
-//                    val newToken = it.body.toBean(Token::class.java)
-//                    newToken.saveToSp(context!!)
-//                    callback(newToken.token)
-//                } catch (e: Exception) {
-//                    callback(null)
-//                    return@setOnResponse
-//                }
-//            }
-//            .setOnException {
-//                evictHttpConnectPool(it)
-//                callback(null)
-//            }
-//            .post()
         callback(null)
     }
 
@@ -228,9 +200,6 @@ class NetHttpManager {
                 mapperCallBack.invoke(it)
             }
         }
-//            .setOnResMapper {
-//                mapperCallBack?.invoke(it)
-//            }
         if (isGet) {
             httpTask.addUrlPara(bodyParas)
             fileList?.forEach {