接入免验证通过NFC获取钥匙信息接口；将登录用户清理移至应用启动处

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

@@ -29,19 +29,15 @@ class MyApplication : Application() {
         BleUtil.instance?.initBle(this)
         NetHttpManager.getInstance().initCtx(this)
 
-        BusinessManager.registerMainListener()
+        NetApi.logout()
+        SPUtils.clearLoginUser(this)
         Token.clear(this)
+
+        BusinessManager.registerMainListener()
     }
 
     override fun attachBaseContext(base: Context?) {
         super.attachBaseContext(base)
         MultiDex.install(base)
     }
-
-    override fun onTerminate() {
-        super.onTerminate()
-        NetApi.logout()
-        SPUtils.clearLoginUser(this)
-        Token.clear(this)
-    }
 }

app/src/main/java/com/grkj/iscs/model/UrlConsts.kt

@@ -82,6 +82,11 @@ object UrlConsts {
      */
     const val KEY_INFO_BY_NFC = "/iscs/key/selectIsKeyByNfc"
 
+    /**
+     * 通过NFC编号获取钥匙详细信息 - 免验证
+     */
+    const val KEY_INFO_BY_NFC_WITHOUT_AUTH = "/iscs/key/selectIsKeyByNfcWithoutAuth"
+
     /**
      * 通过NFC编号获取锁详细信息
      */

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

@@ -310,15 +310,20 @@ object NetApi {
      * 通过nfc编号获取key信息
      */
     fun getKeyInfo(keyNfc: String, callBack: (KeyInfoRespVO?) -> Unit) {
+        val loginUser = SPUtils.getLoginUser(MyApplication.instance?.applicationContext!!)
         NetHttpManager.getInstance().doRequestNet(
-            UrlConsts.KEY_INFO_BY_NFC,
+            if (loginUser == null) {
+                UrlConsts.KEY_INFO_BY_NFC_WITHOUT_AUTH
+            } else {
+                UrlConsts.KEY_INFO_BY_NFC
+            },
             false,
             mapOf("nfc" to keyNfc),
             { res, _, _ ->
                 res?.let {
                     callBack.invoke(getRefBean(it))
                 }
-            }, isGet = true, isAuth = true
+            }, isGet = true, isAuth = loginUser != null
         )
     }