1.屏蔽json解析异常字段 未用到

HttpCoreLibrary/src/main/java/com/rc/httpcore/HttpConfig.kt

@@ -5,11 +5,11 @@ class HttpConfig {
     companion object {
         //        var API_BASE_URL = "http://lab.zjznai.com/nwsuaf/api/"  //公网域名
 //        var API_BASE_URL = "http://192.168.1.43/api/"
-//        var API_BASE_URL = "http://192.168.1.8/api/"
-        var API_BASE_URL = "http://172.16.0.65/api/"
+        var API_BASE_URL = "http://192.168.1.8/api/"
+//        var API_BASE_URL = "http://172.16.0.65/api/"
 //        var API_BASE_IMG_URL = "http://192.168.1.43/api"  //图片资源
-//        var API_BASE_IMG_URL = "http://192.168.1.8/api"  //图片资源
-        var API_BASE_IMG_URL = "http://172.16.0.65/api/"  //图片资源
+        var API_BASE_IMG_URL = "http://192.168.1.8/api"  //图片资源
+//        var API_BASE_IMG_URL = "http://172.16.0.65/api/"  //图片资源
 
         var API_BASE_QC_URL = "http://lab.zjznai.com/labTest"  //二维码地址  用于打印出的二维码路径跳转到小程序
 //        http://lab.zjznai.com/labAppTest?code=1760903781269671937&type=1   MSDS 路径生成

HttpCoreLibrary/src/main/java/com/rc/httpcore/bean/UserData.kt

@@ -3,7 +3,7 @@ package com.rc.httpcore.bean
 data class UserData(
     val account: String,  //工号or学号
     val avatar: String,
-    val expiresIn: Int,
+//    val expiresIn: Int,
     val isInitPasswd: Any,
     val license: String,
     val tenantId: Int,

HttpCoreLibrary/src/main/java/com/rc/httpcore/client/retrofit/ChemicalRetrofit.kt

@@ -1,6 +1,7 @@
 package com.rc.httpcore.client.retrofit
 
 import android.util.Log
+import com.blankj.utilcode.util.LogUtils
 import com.google.gson.Gson
 import com.rc.httpcore.HttpClient
 import com.rc.httpcore.HttpConfig

HttpCoreLibrary/src/main/java/com/rc/httpcore/interceptor/ParameterValidationInterceptor.kt

@@ -2,6 +2,7 @@ package com.rc.httpcore.interceptor
 
 import android.annotation.SuppressLint
 import android.util.Log
+import com.blankj.utilcode.util.AppUtils
 import com.blankj.utilcode.util.LogUtils
 import okhttp3.Interceptor
 import okhttp3.Response
@@ -62,8 +63,9 @@ class ParameterValidationInterceptor : Interceptor {
 //                }
 //            }
 //        }
-
-        LogUtils.d(request.toString())
+        if (!AppUtils.isAppDebug()) {
+            LogUtils.d(request.toString())
+        }
         // 打印所有请求参数（合并为一行）
 //        Log.d(TAG, "Request body: $bodyParametersLog")
 //        Log.d(TAG, "Request query: $queryParametersLog")
@@ -83,7 +85,9 @@ class ParameterValidationInterceptor : Interceptor {
 
         // 打印返回值日志
 //        Log.d(TAG, "Response: $responseBodyString")
-        LogUtils.d(response.toString(),responseBodyString)
+        if (!AppUtils.isAppDebug()) {
+            LogUtils.d(response.toString(), responseBodyString)
+        }
         // 创建一个新的响应体，以便返回
         return response.newBuilder()
             .body(ResponseBody.create(responseBody?.contentType(), responseBodyString))

app/src/main/java/com/example/chemical/ui/MainActivity.kt

@@ -214,7 +214,6 @@ class MainActivity : RcBaseActivity<ActivityMainBinding>() {
 
     override fun initViews(savedInstanceState: Bundle?) {
         super.initViews(savedInstanceState)
-        LogUtils.d(ActivityUtils.getLauncherActivity())
         getUserIds()
         val handler = Handler(Looper.getMainLooper())
         timeUpdater = TimeUpdater(handler) { currentTime ->
@@ -597,6 +596,7 @@ class MainActivity : RcBaseActivity<ActivityMainBinding>() {
     private fun basicConfLog() {
         val disposable = ApiRepository.basicConfig(ChemicalApp.subjectId!!)
             .subscribe({ data ->
+                LogUtils.json(data)
                 ChemicalApp.confs = data
                 mLoginType = data.loginType     //登陆方式
                 if (mLoginType == null) {
@@ -666,6 +666,7 @@ class MainActivity : RcBaseActivity<ActivityMainBinding>() {
                                 else -> {
                                     //3条
                                     try {
+                                        LogUtils.d(669)
                                         map["mtypes"] = "0"
                                         map["faceList"] = faceList.toString()
                                         UiManager.switcher(

app/src/main/java/com/example/chemical/ui/login/FacialLoginActivity.kt

@@ -2,10 +2,12 @@ package com.example.chemical.ui.login
 
 
 import android.os.*
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.MotionEvent
 import android.view.View
 import android.widget.TextView
+import com.blankj.utilcode.util.LogUtils
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.request.RequestOptions
@@ -80,9 +82,11 @@ class FacialLoginActivity : BaseCountDownActivity<ActivityFacialLoginBinding>()
                 "1" -> {
                     viewBinding.linType.visibility = View.GONE
                 }
+
                 "4" -> {
                     viewBinding.tvScan.visibility = View.GONE
                 }
+
                 "5" -> {
                     viewBinding.tvSwipe.visibility = View.GONE
                 }
@@ -93,7 +97,7 @@ class FacialLoginActivity : BaseCountDownActivity<ActivityFacialLoginBinding>()
         }
 
         val map = mutableMapOf<String, String>()
-        if (mtypes!=null){
+        if (mtypes != null) {
             map["mtypes"] = mtypes
         }
         if (str != null && str.length > 0) {
@@ -225,7 +229,9 @@ class FacialLoginActivity : BaseCountDownActivity<ActivityFacialLoginBinding>()
         val disposable = ApiRepository.faceCompare(featureData, param)
             .subscribe({ success ->
                 dismissLoading()
+                LogUtils.json(success)
                 ChemicalApp.userData = success
+                LogUtils.d(success.userId, ChemicalApp.subjectId)
                 authenticationInfo(success.userId, ChemicalApp.subjectId!!)
             }, { throwable ->
                 dismissLoading()
@@ -236,9 +242,11 @@ class FacialLoginActivity : BaseCountDownActivity<ActivityFacialLoginBinding>()
 
     //验证当前人员身份
     private fun authenticationInfo(userId: String, subId: String) {
+        LogUtils.d(userId, subId)
         showLoading("验证中...")
         val disposable = ApiRepository.userCardValidation(userId, subId)
             .subscribe({ data ->
+                LogUtils.json(data)
                 dismissLoading()
                 val allFalse = with(data) {
                     cabinetAdmin == false &&
@@ -367,6 +375,7 @@ class FacialLoginActivity : BaseCountDownActivity<ActivityFacialLoginBinding>()
      * 异常处理
      */
     private fun throwableView(throwable: Throwable) {
+        LogUtils.e(Log.getStackTraceString(throwable))
         when (throwable) {
             is NetException -> {
                 if (throwable.message.isNullOrEmpty()) {
@@ -375,10 +384,11 @@ class FacialLoginActivity : BaseCountDownActivity<ActivityFacialLoginBinding>()
                     throwable.message!!
                 }
             }
+
             is SocketTimeoutException -> "请求超时，请稍后重试"
             is ConnectException -> "无法连接服务器，请检查网络"
             is HttpException -> "服务器繁忙，请稍后重试"
-            else -> null
+            else -> "服务器异常"
         }?.let { customDialogView(2, "$it") }
     }