Преглед на файлове

修复http报文不记录日志的BUG

JaycePC преди 1 година
родител
ревизия
30ab9abbfb

+ 23 - 4
HttpCoreLibrary/src/main/java/com/rc/httpcore/HttpClient.kt

@@ -1,6 +1,8 @@
 package com.rc.httpcore
 
 import android.content.Context
+import com.blankj.utilcode.util.AppUtils
+import com.blankj.utilcode.util.LogUtils
 import com.rc.httpcore.client.factory.ClientFactory
 import com.rc.httpcore.client.factory.RetrofitFactory
 import com.rc.httpcore.config.OkHttpDNS
@@ -16,13 +18,13 @@ import java.util.concurrent.TimeUnit
 
 object HttpClient {
 
-//    const val TIMEOUT_DEFAULT = 3 * 60L
+    //    const val TIMEOUT_DEFAULT = 3 * 60L
     const val TIMEOUT_DEFAULT = 10L
 
     private var mAppContext: Context? = null
 
     @Volatile
-    var token: String? =null
+    var token: String? = null
 
     var vName: String = "1.0.0"
 
@@ -60,7 +62,25 @@ object HttpClient {
     }
 
     private fun buildHttpClient(): OkHttpClient {
-
+        val logPath = "/sdcard/logs/"
+        val config = LogUtils.getConfig()
+        // log开关控制
+        config.setLogSwitch(true)
+        // log控制台开关
+        config.setConsoleSwitch(true)
+        // logTag
+        config.setGlobalTag("Jayce")
+        // log头部信息开关
+        config.setLogHeadSwitch(true)
+        // log文件开关
+        config.setLog2FileSwitch(true)
+        config.setDir(logPath)
+        // log文件前缀
+        config.setFilePrefix(AppUtils.getAppName())
+        // log边框开关
+        config.setBorderSwitch(true)
+        // log文件保存天数
+        config.setSaveDays(7)
 //        val httpLoggingInterceptor = HttpLoggingInterceptor(HttpLoggingInterceptorLog())//创建拦截对象
 //        httpLoggingInterceptor.level = HttpLoggingInterceptor.Level.BODY//这一句一定要记得写,否则没有数据输出
         return OkHttpClient.Builder()
@@ -89,5 +109,4 @@ object HttpClient {
     }
 
 
-
 }

BIN
app/release/Chemical_Xibei_1.19.apk


+ 18 - 0
app/release/output-metadata.json

@@ -0,0 +1,18 @@
+{
+  "version": 2,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "com.zhong.che",
+  "variantName": "processReleaseResources",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "versionCode": 19,
+      "versionName": "1.19",
+      "outputFile": "Chemical_Xibei_1.19.apk"
+    }
+  ]
+}

+ 2 - 2
app/src/main/java/com/example/chemical/ChemicalApp.kt

@@ -69,11 +69,11 @@ class ChemicalApp : Application() {
         config.setLog2FileSwitch(true)
         config.setDir(logPath)
         // log文件前缀
-        config.setFilePrefix(AppUtils.getAppName())
+        config.setFilePrefix(AppUtils.getAppName() + "_App")
         // log边框开关
         config.setBorderSwitch(true)
         // log文件保存天数
-        config.setSaveDays(30)
+        config.setSaveDays(7)
     }
 
     private fun initBugly() {

+ 11 - 0
app/src/main/java/com/example/chemical/ui/MainActivity.kt

@@ -50,6 +50,8 @@ import java.net.ConnectException
 import java.net.SocketTimeoutException
 import android.util.Log
 import android.widget.EditText
+import com.blankj.utilcode.util.ActivityUtils
+import com.blankj.utilcode.util.LogUtils
 import com.example.chemical.ui.warehousing.ChemicalLabelingActivity
 import com.example.chemical.utils.*
 import com.rc.core.ui.activity.RcBaseActivity
@@ -212,6 +214,7 @@ 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 ->
@@ -423,21 +426,25 @@ class MainActivity : RcBaseActivity<ActivityMainBinding>() {
                         map["doorId"] = mAdapter.data[position].cabinetDoorVoList[0].doorUniqueId
                         UiManager.switcher(this, map, InquiryActivity::class.java)
                     }
+
                     R.id.lintTwo -> {
                         map["cabinetId"] = mAdapter.data[position].cabinetDoorVoList[1].cabinetId
                         map["doorId"] = mAdapter.data[position].cabinetDoorVoList[1].doorUniqueId
                         UiManager.switcher(this, map, InquiryActivity::class.java)
                     }
+
                     R.id.lintThree -> {
                         map["cabinetId"] = mAdapter.data[position].cabinetDoorVoList[2].cabinetId
                         map["doorId"] = mAdapter.data[position].cabinetDoorVoList[2].doorUniqueId
                         UiManager.switcher(this, map, InquiryActivity::class.java)
                     }
+
                     R.id.lintFour -> {
                         map["cabinetId"] = mAdapter.data[position].cabinetDoorVoList[3].cabinetId
                         map["doorId"] = mAdapter.data[position].cabinetDoorVoList[3].doorUniqueId
                         UiManager.switcher(this, map, InquiryActivity::class.java)
                     }
+
                     R.id.imgViews -> {
                         map["cabinetId"] = "a"
                         map["doorId"] = "a"
@@ -609,11 +616,13 @@ class MainActivity : RcBaseActivity<ActivityMainBinding>() {
                                     map["mtypes"] = "1"
                                     UiManager.switcher(this, map, FacialLoginActivity::class.java)
                                 }
+
                                 "2" -> {
                                     //刷卡
                                     map["mtypes"] = "1"
                                     UiManager.switcher(this, map, SwipeActivity::class.java)
                                 }
+
                                 else -> {
                                     //扫码
                                     map["mtypes"] = "1"
@@ -653,6 +662,7 @@ class MainActivity : RcBaseActivity<ActivityMainBinding>() {
                                     }
 
                                 }
+
                                 else -> {
                                     //3条
                                     try {
@@ -703,6 +713,7 @@ class MainActivity : RcBaseActivity<ActivityMainBinding>() {
                     throwable.message!!
                 }
             }
+
             is SocketTimeoutException -> "请求超时,请稍后重试"
             is ConnectException -> "无法连接服务器,请检查网络"
             is HttpException -> "服务器繁忙,请稍后重试"

+ 2 - 2
config/config.gradle

@@ -9,8 +9,8 @@ ext {
             minSdkVersion    : 21,
             targetSdkVersion : 28,
             applicationId    : "com.zhong.che",
-            versionCode      : 18,
-            versionName      : "1.18"
+            versionCode      : 19,
+            versionName      : "1.19"
     ]
 
     test = [