From bf245d118fa4443452f530391391745bc62afe91 Mon Sep 17 00:00:00 2001 From: Quyunshuo Date: Sat, 29 Aug 2020 17:13:05 +0800 Subject: [PATCH] =?UTF-8?q?Modify:=20=E6=B7=BB=E5=8A=A0=E7=BD=91=E7=BB=9C?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=97=A5=E5=BF=97=E6=8B=A6=E6=88=AA=E5=99=A8?= =?UTF-8?q?(=E5=B8=A6UI)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Lib_Base/build.gradle | 2 ++ .../main/java/com/quyunshuo/base/BaseApplication.kt | 6 ++++++ Lib_Common/build.gradle | 2 ++ .../com/quyunshuo/common/net/NetServiceCreator.kt | 11 +++++++---- README.md | 1 - .../DependencyManager.kt | 2 ++ moduleBase.gradle | 1 + 7 files changed, 20 insertions(+), 5 deletions(-) diff --git a/Lib_Base/build.gradle b/Lib_Base/build.gradle index b0b6979..72f4551 100644 --- a/Lib_Base/build.gradle +++ b/Lib_Base/build.gradle @@ -76,4 +76,6 @@ dependencies { kapt GitHub.GlideCompiler kapt GitHub.ARouteCompiler kapt GitHub.EventBusAPT + + debugImplementation GitHub.Chuck } \ No newline at end of file diff --git a/Lib_Base/src/main/java/com/quyunshuo/base/BaseApplication.kt b/Lib_Base/src/main/java/com/quyunshuo/base/BaseApplication.kt index c9c8129..3a1575a 100644 --- a/Lib_Base/src/main/java/com/quyunshuo/base/BaseApplication.kt +++ b/Lib_Base/src/main/java/com/quyunshuo/base/BaseApplication.kt @@ -15,8 +15,14 @@ import com.tencent.bugly.crashreport.CrashReport */ open class BaseApplication : Application() { + companion object { + // 全局Context + lateinit var context: Context + } + override fun onCreate() { super.onCreate() + context = applicationContext initialize() } diff --git a/Lib_Common/build.gradle b/Lib_Common/build.gradle index 9f91c8b..5d86a74 100644 --- a/Lib_Common/build.gradle +++ b/Lib_Common/build.gradle @@ -44,4 +44,6 @@ dependencies { kapt GitHub.GlideCompiler kapt GitHub.ARouteCompiler kapt GitHub.EventBusAPT + + debugImplementation GitHub.Chuck } \ No newline at end of file diff --git a/Lib_Common/src/main/java/com/quyunshuo/common/net/NetServiceCreator.kt b/Lib_Common/src/main/java/com/quyunshuo/common/net/NetServiceCreator.kt index 5b2e66a..e1c73d5 100644 --- a/Lib_Common/src/main/java/com/quyunshuo/common/net/NetServiceCreator.kt +++ b/Lib_Common/src/main/java/com/quyunshuo/common/net/NetServiceCreator.kt @@ -1,7 +1,9 @@ package com.quyunshuo.common.net +import com.quyunshuo.base.BaseApplication import com.quyunshuo.base.BuildConfig import com.quyunshuo.common.constant.NetUrl +import com.readystatesoftware.chuck.ChuckInterceptor import okhttp3.OkHttpClient import okhttp3.logging.HttpLoggingInterceptor import retrofit2.Retrofit @@ -32,10 +34,11 @@ object NetServiceCreator { private val okHttpClient by lazy(mode = LazyThreadSafetyMode.SYNCHRONIZED) { OkHttpClient.Builder() - .connectTimeout(CONNECT_TIME_OUT, TimeUnit.SECONDS) // 连接超时 - .readTimeout(READ_TIME_OUT, TimeUnit.SECONDS) // 读取超时 - .addInterceptor(if (BuildConfig.DEBUG) BODY else NONE) // 请求日志拦截器 - .retryOnConnectionFailure(true) // 失败重连 + .connectTimeout(CONNECT_TIME_OUT, TimeUnit.SECONDS) // 连接超时 + .readTimeout(READ_TIME_OUT, TimeUnit.SECONDS) // 读取超时 + .addInterceptor(if (BuildConfig.DEBUG) BODY else NONE) // 请求日志拦截器 + .addInterceptor(ChuckInterceptor(BaseApplication.context)) // 请求日志拦截器(UI) + .retryOnConnectionFailure(true) // 失败重连 .build() } diff --git a/README.md b/README.md index ba81354..56fa024 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,6 @@ note: 1. 测试打包脚本 2. 对比开源项目flow的封装 - 3. 网络请求库 资源文件相关{ 资源相关文件属于项目相关的，因此需要放在Common组件内，不要放在Base组件里 diff --git a/buildSrc/src/main/java/com.quyunshuo.androidbaseframemvvm.build/DependencyManager.kt b/buildSrc/src/main/java/com.quyunshuo.androidbaseframemvvm.build/DependencyManager.kt index 8a37d4a..a61a95c 100644 --- a/buildSrc/src/main/java/com.quyunshuo.androidbaseframemvvm.build/DependencyManager.kt +++ b/buildSrc/src/main/java/com.quyunshuo.androidbaseframemvvm.build/DependencyManager.kt @@ -43,6 +43,7 @@ object Version { const val Bugly = "3.2.33" // Bugly 异常上报 const val PermissionX = "1.3.0" // 权限申请 const val LeakCanary = "2.4" // 检测内存泄漏 + const val Chuck = "1.1.0" // OkHttp 请求信息拦截器(UI) } object AndroidX { @@ -100,4 +101,5 @@ object GitHub { const val Bugly = "com.tencent.bugly:crashreport:${Version.Bugly}" const val PermissionX = "com.permissionx.guolindev:permissionx:${Version.PermissionX}" const val LeakCanary = "com.squareup.leakcanary:leakcanary-android:${Version.LeakCanary}" + const val Chuck = "com.readystatesoftware.chuck:library:${Version.Chuck}" } \ No newline at end of file diff --git a/moduleBase.gradle b/moduleBase.gradle index 0ababc3..87048f4 100644 --- a/moduleBase.gradle +++ b/moduleBase.gradle @@ -79,4 +79,5 @@ dependencies { kapt GitHub.GlideCompiler kapt GitHub.ARouteCompiler kapt GitHub.EventBusAPT + debugImplementation GitHub.Chuck } \ No newline at end of file