update RetrofitManager

Vens Chen · Vens Chen · commit ebc378b52ab0 · 2018-08-03T12:33:56.000+08:00
diff --git a/README.md b/README.md
@@ -117,6 +117,15 @@ public class HttpInterceptor implements Interceptor {
 ```
 
 ## 简单使用
+
+### 初始化
+```
+        RetrofitManager.getInstence()
+                .baseUrl("your baseurl")
+                .addInterceptor(new HttpInterceptor())
+                .create();
+```
+
 ### 业务请求
 具体的业务请求类继承HttpPresenter，传入一些配置参数：
 ```
@@ -125,9 +134,7 @@ public class DocPresenter extends HttpPresenter {
     public DocPresenter(ILoadingView iLoadingView)
     {
         super(iLoadingView);
-        //这里传入baseURL，拦截器，定义接口的类
-        mApi = RetrofitManager.getInstence().getRetrofitService("your baseUrl",
-                new HttpInterceptor(),ApiService.class);
+        mApi = RetrofitManager.getInstence().getRetrofitService(ApiService.class);
     }
 
     /**
diff --git a/app/src/main/java/com/threetree/thttp/BaseActivity.java b/app/src/main/java/com/threetree/thttp/BaseActivity.java
@@ -28,9 +28,5 @@ public boolean isActive()
         return false;
     }
 
-    @Override
-    public void toast(int i, String s)
-    {
 
-    }
 }
diff --git a/app/src/main/java/com/threetree/thttp/CommonPresenter.java b/app/src/main/java/com/threetree/thttp/CommonPresenter.java
@@ -19,8 +19,7 @@ public CommonPresenter(Context context,ILoadingView iLoadingView)
     {
         super(iLoadingView);
         mContext = context;
-        String url = "your url";
-        mApiService = RetrofitManager.getInstence().getRetrofitService(url,new HttpInterceptor(),ApiService.class);
+        mApiService = RetrofitManager.getInstence().getRetrofitService(ApiService.class);
     }
 
     @Override
diff --git a/app/src/main/java/com/threetree/thttp/MainActivity.java b/app/src/main/java/com/threetree/thttp/MainActivity.java
@@ -8,6 +8,7 @@
 import android.widget.Toast;
 
 import com.threetree.ttdialog.LoadingDialog;
+import com.threetree.tthttp.RetrofitManager;
 import com.threetree.tthttp.presenter.DownLoadPresenter;
 import com.threetree.tthttp.viewbind.IProgressView;
 
@@ -25,15 +26,26 @@ protected void onCreate(Bundle savedInstanceState)
     {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+
+        RetrofitManager.getInstence()
+                .baseUrl("your baseurl")
+                .addInterceptor(new HttpInterceptor())
+                .create();
+
         mActive = true;
         mIv = (ImageView)findViewById(R.id.iv);
         mDocPresenter = new DocPresenter(this,this);
-        findViewById(R.id.tv).setOnClickListener(new View.OnClickListener() {
+        findViewById(R.id.load_tv).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v)
+            {
+                download();
+            }
+        });
+        findViewById(R.id.doc_tv).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v)
             {
-//                download();
-
                 mDocPresenter.getDoc();
             }
         });
@@ -79,7 +91,7 @@ public void success()
                 {
                     mIv.setImageBitmap(BitmapFactory.decodeFile(FileUtil.getFilePath()));
                 }
-            }, "your baseUrl");
+            }, "your baseurl");
         }
         mDownLoadPresenter.setFileDir(FileUtil.ROOT_PATH);
         mDownLoadPresenter.setDestFileName(FileUtil.NAME);
@@ -115,6 +127,6 @@ public boolean isActive()
     @Override
     public void onSuccess(String doc)
     {
-
+        Toast.makeText(this,doc,Toast.LENGTH_SHORT).show();
     }
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -7,13 +7,23 @@
     >
 
     <TextView
-        android:id="@+id/tv"
+        android:id="@+id/doc_tv"
         android:layout_gravity="center_horizontal"
         android:gravity="center"
         android:layout_marginTop="60dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Hello World!"
+        android:text="请求"
+        />
+
+    <TextView
+        android:id="@+id/load_tv"
+        android:layout_gravity="center_horizontal"
+        android:gravity="center"
+        android:layout_marginTop="60dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="下载图片"
         />
 
     <ImageView
diff --git a/tthttp/src/main/java/com/threetree/tthttp/RetrofitManager.java b/tthttp/src/main/java/com/threetree/tthttp/RetrofitManager.java
@@ -1,6 +1,5 @@
 package com.threetree.tthttp;
 
-import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import okhttp3.Interceptor;
@@ -15,6 +14,14 @@
 
 public class RetrofitManager {
     private static RetrofitManager mRetrofitManager;
+    private String mBaseUrl;
+    private Retrofit mRetrofit;
+    private OkHttpClient.Builder mClientBuilder;
+
+    private RetrofitManager()
+    {
+        mClientBuilder = new OkHttpClient.Builder();
+    }
 
     public static RetrofitManager getInstence()
     {
@@ -28,67 +35,38 @@ public static RetrofitManager getInstence()
         return mRetrofitManager;
     }
 
-    private OkHttpClient getHttpClient(List<Interceptor> interceptors)
+    public RetrofitManager addInterceptor(Interceptor interceptor)
     {
-        OkHttpClient.Builder builder = new OkHttpClient.Builder();
-        builder.connectTimeout(15, TimeUnit.SECONDS);//超时
-        if(interceptors != null && interceptors.size() > 0)
-        {
-            for (Interceptor interceptor:interceptors)
-            {
-                builder.addInterceptor(interceptor);
-            }
-        }
-        return builder.build();
+        mClientBuilder.addInterceptor(interceptor);
+        return this;
     }
 
-    private OkHttpClient getHttpClient(Interceptor interceptor)
+    public RetrofitManager baseUrl(String baseUrl)
     {
-        OkHttpClient.Builder builder = new OkHttpClient.Builder();
-        builder.connectTimeout(15, TimeUnit.SECONDS);//超时
-        if(interceptor != null)
-        {
-            builder.addInterceptor(interceptor);
-        }
-        return builder.build();
+        mBaseUrl = baseUrl;
+        return this;
     }
 
-
-    public <T> T getRetrofitService(String baseUrl, List<Interceptor> interceptors, Class<T> service)
+    public void create()
     {
-        Retrofit retrofit = new Retrofit.Builder().baseUrl(baseUrl)
-                //将client与retrofit关联
-                .client(getHttpClient(interceptors))
-                .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
-                .addConverterFactory(GsonConverterFactory.create())
-                .build();
-        //到这一步创建完成
-        T retrofitService = null;
-        try {
-            Class<T> className = (Class<T>) Class.forName(service.getName());
-            retrofitService = retrofit.create(className);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return retrofitService;
+        Retrofit.Builder builder = new Retrofit.Builder();
+        builder.baseUrl(mBaseUrl);
+        builder.addCallAdapterFactory(RxJava2CallAdapterFactory.create());
+        builder.addConverterFactory(GsonConverterFactory.create());
+
+        mClientBuilder.connectTimeout(15, TimeUnit.SECONDS);//超时
+        mClientBuilder.readTimeout(20, TimeUnit.SECONDS);
+        mClientBuilder.writeTimeout(20, TimeUnit.SECONDS);
+        mClientBuilder.retryOnConnectionFailure(true);//重连
+
+        builder.client(mClientBuilder.build());
+        mRetrofit = builder.build();
     }
 
-    public <T> T getRetrofitService(String baseUrl, Interceptor interceptor, Class<T> service)
+    public <T> T getRetrofitService(Class<T> service)
     {
-        Retrofit retrofit = new Retrofit.Builder().baseUrl(baseUrl)
-                //将client与retrofit关联
-                .client(getHttpClient(interceptor))
-                .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
-                .addConverterFactory(GsonConverterFactory.create())
-                .build();
-        //到这一步创建完成
-        T retrofitService = null;
-        try {
-            Class<T> className = (Class<T>) Class.forName(service.getName());
-            retrofitService = retrofit.create(className);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return retrofitService;
+        if (mRetrofit == null)
+            throw new RuntimeException("retrofit must be init");
+        return mRetrofit.create(service);
     }
 }
diff --git a/tthttp/src/main/java/com/threetree/tthttp/presenter/DownLoadPresenter.java b/tthttp/src/main/java/com/threetree/tthttp/presenter/DownLoadPresenter.java
@@ -4,7 +4,6 @@
 import android.os.Message;
 import android.text.TextUtils;
 
-import com.threetree.tthttp.RetrofitManager;
 import com.threetree.tthttp.RetrofitService;
 import com.threetree.tthttp.filedownload.FileLoadEvent;
 import com.threetree.tthttp.interceptor.ProgressInterceptor;
@@ -16,12 +15,17 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.ref.WeakReference;
+import java.util.concurrent.TimeUnit;
 
 import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.functions.Consumer;
 import io.reactivex.schedulers.Schedulers;
+import okhttp3.OkHttpClient;
 import okhttp3.ResponseBody;
+import retrofit2.Retrofit;
+import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
+import retrofit2.converter.gson.GsonConverterFactory;
 
 /**
  * Created by Administrator on 2018/7/13.
@@ -64,7 +68,25 @@ public DownLoadPresenter(IProgressView iProgressView, String baseUrl)
     {
         super(iProgressView);
         this.iProgressView = iProgressView;
-        mRetrofitService = RetrofitManager.getInstence().getRetrofitService(baseUrl,new ProgressInterceptor(mHandler),RetrofitService.class);
+        mRetrofitService = getRetrofit(baseUrl).create(RetrofitService.class);
+    }
+
+    private Retrofit getRetrofit(String baseUrl)
+    {
+        OkHttpClient client = new OkHttpClient.Builder()
+                .addInterceptor(new ProgressInterceptor(mHandler))
+                .connectTimeout(15, TimeUnit.SECONDS)//超时
+                .readTimeout(20, TimeUnit.SECONDS)
+                .writeTimeout(20, TimeUnit.SECONDS)
+                .retryOnConnectionFailure(true)//重连
+                .build();
+
+        return new Retrofit.Builder()
+                .baseUrl(baseUrl)
+                .client(client)
+                .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+                .addConverterFactory(GsonConverterFactory.create())
+                .build();
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,5 @@ public boolean isActive()`
`28`	`28`	`return false;`
`29`	`29`	`}`
`30`	`30`
`31`		`- @Override`
`32`		`- public void toast(int i, String s)`
`33`		`- {`
`34`	`31`
`35`		`- }`
`36`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,7 @@ public CommonPresenter(Context context,ILoadingView iLoadingView)`
`19`	`19`	`{`
`20`	`20`	`super(iLoadingView);`
`21`	`21`	`mContext = context;`
`22`		`- String url = "your url";`
`23`		`- mApiService = RetrofitManager.getInstence().getRetrofitService(url,new HttpInterceptor(),ApiService.class);`
	`22`	`+ mApiService = RetrofitManager.getInstence().getRetrofitService(ApiService.class);`
`24`	`23`	`}`
`25`	`24`
`26`	`25`	`@Override`