完善归还钥匙是否需要登录配置逻辑

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

@@ -59,12 +59,11 @@ object BusinessManager {
     var NEED_AUTH = true
 
     // 归还设备是否需要登录及角色验证
-    var CAN_RETURN = true
+    private var CAN_RETURN = true
         get() {
             // TODO 临时注掉，方便调试
-//            val loginUser = SPUtils.getLoginUser(MyApplication.instance!!.applicationContext!!)
-//            return !(NEED_AUTH && (loginUser == null || loginUser.userId == 0L))
-            return true
+            val loginUser = SPUtils.getLoginUser(MyApplication.instance!!.applicationContext!!)
+            return (NEED_AUTH && loginUser != null) || !NEED_AUTH
         }
 
     /****************************************** ModBus ******************************************/

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

@@ -1,5 +1,6 @@
 package com.grkj.iscs.util
 
+import com.grkj.iscs.BusinessManager
 import com.grkj.iscs.MyApplication
 import com.grkj.iscs.model.Token
 import com.grkj.iscs.model.UrlConsts
@@ -303,7 +304,7 @@ object NetApi {
                     callBack.invoke(getRefBean(it))
                 }
                 // TODO isAuth需要配置
-            }, isGet = false, isAuth = true
+            }, isGet = false, isAuth = BusinessManager.NEED_AUTH
         )
     }
 
@@ -322,7 +323,7 @@ object NetApi {
                     callBack.invoke(getRefBean(it))
                 }
                 // TODO isAuth需要配置
-            }, isGet = false, isAuth = true
+            }, isGet = false, isAuth = BusinessManager.NEED_AUTH
         )
     }
 
@@ -394,7 +395,8 @@ object NetApi {
             ),
             { res, _, _ ->
                 callBack.invoke(res != null)
-            }, isGet = false, isAuth = true
+                // TODO isAuth需要配置
+            }, isGet = false, isAuth = BusinessManager.NEED_AUTH
         )
     }