新增Gson自定义

goweii · May 10, 2019 · 2c6ffb4 · 2c6ffb4
1 parent 75e1d97
commit 2c6ffb4
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 5 deletions.
diff --git a/rxhttp/src/main/java/per/goweii/rxhttp/request/RequestClientManager.java b/rxhttp/src/main/java/per/goweii/rxhttp/request/RequestClientManager.java
@@ -121,12 +121,16 @@ protected Retrofit create() {
      * 创建Retrofit实例
      */
     private Retrofit create(String baseUrl) {
-        return new Retrofit.Builder()
+        Retrofit.Builder builder = new Retrofit.Builder()
                 .client(createOkHttpClient())
-                .baseUrl(BaseUrlUtils.checkBaseUrl(baseUrl))
-                .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
-                .addConverterFactory(GsonConverterFactory.create(new Gson()))
-                .build();
+                .baseUrl(BaseUrlUtils.checkBaseUrl(baseUrl));
+        builder.addCallAdapterFactory(RxJava2CallAdapterFactory.create());
+        Gson gson = RxHttp.getRequestSetting().getGson();
+        if (gson == null) {
+            gson = new Gson();
+        }
+        builder.addConverterFactory(GsonConverterFactory.create(gson));
+        return builder.build();
     }
 
     /**

diff --git a/rxhttp/src/main/java/per/goweii/rxhttp/request/setting/DefaultRequestSetting.java b/rxhttp/src/main/java/per/goweii/rxhttp/request/setting/DefaultRequestSetting.java
@@ -3,6 +3,8 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
+import com.google.gson.Gson;
+
 import java.util.Map;
 
 import okhttp3.Interceptor;
@@ -121,6 +123,12 @@ public boolean enableTls12BelowAndroidKitkat() {
     public void setOkHttpClient(OkHttpClient.Builder builder) {
     }
 
+    @Nullable
+    @Override
+    public Gson getGson() {
+        return null;
+    }
+
     @Override
     public boolean isDebug() {
         return false;

diff --git a/rxhttp/src/main/java/per/goweii/rxhttp/request/setting/RequestSetting.java b/rxhttp/src/main/java/per/goweii/rxhttp/request/setting/RequestSetting.java
@@ -4,6 +4,8 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
+import com.google.gson.Gson;
+
 import java.util.Map;
 
 import okhttp3.Interceptor;
@@ -128,6 +130,12 @@ public interface RequestSetting {
      */
     void setOkHttpClient(OkHttpClient.Builder builder);
 
+    /**
+     * 在创建OkHttpClient之前调用，及框架完成所有配置后
+     */
+    @Nullable
+    Gson getGson();
+
     /**
      * 是否打开调试模式
      */