Merge pull request #3 from nasduck/develop

optimize
nasduck · Aug 6, 2019 · 4554a35 · 4554a35
2 parents d5efa78 + 8697cc0
commit 4554a35
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/config.gradle b/config.gradle
@@ -62,7 +62,6 @@ ext {
 
             //zoo park
             "banana-utils"                  : "com.github.nasduck:BananaUtils:0.2",
-            "RafikiPermissions"             : "com.github.nasduck:RafikiPermissions:1.2.0"
-
+            "RafikiPermissions"             : "com.github.nasduck:RafikiPermissions:1.2.0",
     ]
 }
diff --git a/lib/build.gradle b/lib/build.gradle
@@ -42,7 +42,7 @@ dependencies {
 
     // ZooPark
     api rootProject.ext.dependencies["banana-utils"]
-    api rootProject.ext.dependencies['RafikiPermissions']
+    api rootProject.ext.dependencies["RafikiPermissions"]
 
     // Rx
     api rootProject.ext.dependencies["rxpermissions2"]

diff --git a/lib/src/main/java/com/zoopark/lib/inject/module/ClientModule.java b/lib/src/main/java/com/zoopark/lib/inject/module/ClientModule.java
@@ -2,12 +2,9 @@
 
 import android.app.Application;
 import android.support.annotation.Nullable;
-import android.util.Log;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.zoopark.lib.BuildConfig;
-import com.zoopark.lib.common.Resp;
+import com.zoopark.lib.BaseApplication;
+import com.zoopark.lib.inject.iconfig.OkhttpConfiguration;
 import com.zoopark.lib.inject.iconfig.RetrofitConfiguration;
 
 import java.util.concurrent.TimeUnit;
@@ -56,15 +53,28 @@ static Retrofit provideRetrofit(Application application, OkHttpClient client,
      */
     @Singleton
     @Provides
-    static OkHttpClient provideClient() {
-        OkHttpClient.Builder builder = new OkHttpClient.Builder();
+    static OkHttpClient provideClient(@Nullable OkhttpConfiguration configuration, OkHttpClient.Builder builder) {
+
         HttpLoggingInterceptor interceptor = new HttpLoggingInterceptor();
         interceptor.setLevel(HttpLoggingInterceptor.Level.BODY);
         builder.connectTimeout(10, TimeUnit.SECONDS)
                 .readTimeout(10, TimeUnit.SECONDS)
                 .addInterceptor(interceptor);
+        if (configuration != null) {
+            configuration.configOkhttp(BaseApplication.context, builder);
+        }
 
         return builder.build();
+
+    }
+
+
+    @Singleton
+    @Provides
+    static OkHttpClient.Builder provideClientBuilder() {
+        return new OkHttpClient.Builder();
     }
 
 }
+
+