1、修改FastRetrofit里初始化多BaseUrl 类FastMultiUrl.with方法

2、新增FastRetrofit里获取Retrofit、OkHttp 对象及Builder方法用于外边自定义并将原setHttpClient标记为废弃

Author: AriesHoo

apk/sample.apk

@@ -15,7 +15,7 @@ android {
         minSdkVersion ext.minSdkVersion
         targetSdkVersion ext.targetSdkVersion
         versionCode 219
-        versionName "2.1.9-alpha"
+        versionName "2.1.9-beta"
         multiDexEnabled true
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         buildConfigField "String", "BASE_URL", "\"https://api.douban.com/\""

app/build.gradle

@@ -60,7 +60,9 @@ public void onCreate() {
                 //.setHeaders(header)//设置统一请求头
                 .setLogEnable(BuildConfig.DEBUG)//设置请求全局log-可设置tag及Level类型
                 //.setLogEnable(BuildConfig.DEBUG, TAG, HttpLoggingInterceptor.Level.BASIC)
-                .setTimeout(20);//设置统一超时--也可单独调用read/write/connect超时(可以设置时间单位TimeUnit)
+                //设置统一超时--也可单独调用read/write/connect超时(可以设置时间单位TimeUnit)
+                //默认20 s
+                .setTimeout(20);
 
         //以下为配置多BaseUrl
         //step1

app/src/main/java/com/aries/library/fast/demo/App.java

@@ -9,7 +9,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 25
         versionCode 219
-        versionName "2.1.9-alpha"
+        versionName "2.1.9-beta"
     }
     buildTypes {
         release {

library/build.gradle

@@ -76,10 +76,8 @@ private FastConfig(@Nullable Context context) {
         if (context == null) {
             throw new NullPointerException(FastConstant.EXCEPTION_FAST_CONFIG_CONTEXT_NOT_NULL);
         }
-        LoggerManager.i("FastConfig:" + context);
         if (context != null) {
             this.mContext = context.getApplicationContext();
-            LoggerManager.i("FastConfig:" + mContext + ";isApplication:" + (mContext instanceof Application));
             if (FastUtil.isClassExist("com.aries.ui.view.title.TitleBarView")) {
                 setTitleConfig(new FastTitleConfigEntity()
                         .setTitleBackgroundResource(R.color.colorTitleBackground)

library/src/main/java/com/aries/library/fast/FastConfig.java

@@ -6,7 +6,6 @@
 import android.view.View;
 
 import com.aries.library.fast.i.IFastTitleView;
-import com.aries.library.fast.manager.LoggerManager;
 import com.aries.library.fast.module.activity.FastTitleActivity;
 
 /**
@@ -134,7 +133,6 @@ public FastTitleConfigEntity setLightStatusBarEnable(boolean lightStatusBarEnabl
      * @return
      */
     public FastTitleConfigEntity setTitleElevation(float mTitleElevation) {
-        LoggerManager.i("mTitleElevation:"+mTitleElevation);
         this.mTitleElevation = mTitleElevation;
         return this;
     }

library/src/main/java/com/aries/library/fast/entity/FastTitleConfigEntity.java

@@ -42,6 +42,7 @@ public class FastMultiUrl {
     private final List<OnUrlChangedListener> mListeners = new ArrayList<>();
     private FastUrlParser mUrlParser;
     private static volatile FastMultiUrl instance;
+    private OkHttpClient.Builder builder;
 
     public interface OnUrlChangedListener {
         /**
@@ -108,6 +109,7 @@ public Response intercept(Chain chain) throws IOException {
      * @return
      */
     public OkHttpClient.Builder with(OkHttpClient.Builder builder) {
+        this.builder = builder;
         return builder
                 .addInterceptor(mInterceptor);
     }
@@ -131,7 +133,7 @@ public Request processRequest(Request request) {
         }
         if (null != httpUrl) {
             HttpUrl newUrl = mUrlParser.parseUrl(httpUrl, request.url());
-            LoggerManager.d(FastMultiUrl.TAG, "New Url is { " + newUrl.toString() + " },Old Url is { " + request.url().toString() + " }");
+            LoggerManager.i(FastMultiUrl.TAG, "New Url is { " + newUrl.toString() + " },Old Url is { " + request.url().toString() + " }");
             Object[] listeners = listenersToArray();
             if (listeners != null) {
                 for (int i = 0; i < listeners.length; i++) {

library/src/main/java/com/aries/library/fast/retrofit/FastMultiUrl.java

@@ -35,7 +35,7 @@ public class FastRetrofit {
     private static volatile Retrofit.Builder sRetrofitBuilder;
     private static OkHttpClient.Builder sClientBuilder;
     private static OkHttpClient sClient;
-    private long mDelayTime = 10;
+    private long mDelayTime = 20;
     private HttpLoggingInterceptor mLoggingInterceptor;
 
     private FastRetrofit() {
@@ -44,6 +44,7 @@ private FastRetrofit() {
                 .addConverterFactory(GsonConverterFactory.create())
                 .addCallAdapterFactory(RxJava2CallAdapterFactory.create());
         setTimeout(mDelayTime);
+        FastMultiUrl.getInstance().with(sClientBuilder);
     }
 
     public static FastRetrofit getInstance() {
@@ -57,13 +58,38 @@ public static FastRetrofit getInstance() {
         return sManager;
     }
 
-    public <T> T createService(Class<T> apiService) {
-        setHttpClient(sClientBuilder.build());
+    /**
+     * 对外暴露 OkHttpClient,方便自定义
+     *
+     * @return
+     */
+    public static OkHttpClient.Builder getOkHttpClientBuilder() {
+        return getInstance().sClientBuilder;
+    }
+
+    public static OkHttpClient getOkHttpClient() {
+        return getOkHttpClientBuilder().build();
+    }
+
+    /**
+     * 对外暴露 Retrofit,方便自定义
+     *
+     * @return
+     */
+    public static Retrofit.Builder getRetrofitBuilder() {
+        sRetrofitBuilder.client(getOkHttpClient());
+        return getInstance().sRetrofitBuilder;
+    }
+
+    public static Retrofit getRetrofit() {
         if (sRetrofit == null) {
-            sRetrofit = sRetrofitBuilder.build();
+            sRetrofit = getRetrofitBuilder().build();
         }
-        FastMultiUrl.getInstance().with(sClientBuilder);
-        return sRetrofit.create(apiService);
+        return sRetrofit;
+    }
+
+    public <T> T createService(Class<T> apiService) {
+        return getRetrofit().create(apiService);
     }
 
     /**
@@ -79,11 +105,15 @@ public FastRetrofit setBaseUrl(String baseUrl) {
     }
 
     /**
-     * 设置自定义OkHttpClient
+     * 设置自定义OkHttpClient--2.1.9-beta版本后废弃可调用
+     * 可以调用以下方法实现自定义
+     * {@link #getOkHttpClient()}{@link #getOkHttpClientBuilder()}
+     * {@link #getRetrofitBuilder()}{@link #getRetrofit()}
      *
      * @param okClient
      * @return
      */
+    @Deprecated
     public FastRetrofit setHttpClient(OkHttpClient okClient) {
         if (okClient != null && sClient != okClient) {
             sClient = okClient;