change download method

okhttplib/bintrayUpload.gradle

@@ -7,7 +7,7 @@ def siteUrl = 'https://github.com/BenYanYi/OkHttp' // 项目主页。
 def gitUrl = 'https://github.com/BenYanYi/OkHttp.git' // Git仓库的url。
 
 group = "com.yanyi.benyanyi"// 唯一包名,比如compile 'com.ansen.http:okhttpencapsulation:1.0.1'中的com.ansen.http就是这里配置的。
-version = "1.0.1"//项目引用的版本号，比如compile 'com.ansen.http:okhttpencapsulation:1.0.1'中的1.0.1就是这里配置的。
+version = "1.0.2"//项目引用的版本号，比如compile 'com.ansen.http:okhttpencapsulation:1.0.1'中的1.0.1就是这里配置的。
 install {
     repositories.mavenInstaller {
         // This generates POM.xml with proper parameters
@@ -15,7 +15,7 @@ install {
             project {
                 packaging 'aar'
                 // Add your description here
-                name 'multi-format 1D/2D barcode image processing use zxing.'
+                name 'okhttp3 + rxjava2'
                 url siteUrl
                 // Set your license
                 licenses {

okhttplib/src/main/java/com/mylove/okhttp/DownloadObservable.java

@@ -2,13 +2,13 @@ package com.mylove.okhttp;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.os.Environment;
 import android.support.annotation.NonNull;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 import io.reactivex.Observable;
@@ -20,11 +20,9 @@ import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
 import okhttp3.Call;
 import okhttp3.Callback;
-import okhttp3.FormBody;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
-import okhttp3.ResponseBody;
 
 /**
  * @author myLove
@@ -35,15 +33,13 @@ class DownloadObservable {
     private static DownloadObservable instance;
     @SuppressLint("StaticFieldLeak")
     private static Context mContext;
-    private static RequestType requestType;
-    private static CallType callType;
-    private static String fileName;
+    private String filePath;
     private static OkHttpClient okHttpClient;
 
     private DownloadObservable() {
     }
 
-    static DownloadObservable getInstance(Context context, String file, RequestType type1, CallType type2) {
+    static DownloadObservable getInstance(Context context) {
         if (instance == null) {
             synchronized (DownloadObservable.class) {
                 if (instance == null) {
@@ -60,226 +56,149 @@ class DownloadObservable {
             }
         }
         mContext = context;
-        requestType = type1;
-        callType = type2;
-        fileName = file;
         return instance;
     }
 
-    static DownloadObservable getInstance(Context context, RequestType type1, CallType type2) {
-        if (instance == null) {
-            synchronized (DownloadObservable.class) {
-                if (instance == null) {
-                    instance = new DownloadObservable();
-                    OkHttpClient httpClient = new OkHttpClient();
-                    okHttpClient = httpClient.newBuilder()
-                            .addNetworkInterceptor(new CacheInterceptor())
-                            .cache(Cache.privateCache(context))
-                            .connectTimeout(30, TimeUnit.SECONDS)
-                            .readTimeout(30, TimeUnit.SECONDS)
-                            .build();
-                }
-            }
-        }
-        mContext = context;
-        requestType = type1;
-        callType = type2;
-        return instance;
-    }
-
-    void request(String url, Map<Object, Object> oMap, final onOkHttpListener onOkHttpListener) {
-        getObservable(url, oMap).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Observer<String>() {
+    void request(String url, String filePath, final OnDownloadListener onDownloadListener) {
+        this.filePath = filePath;
+        getObservable(url).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Observer<DownloadBean>() {
                     @Override
                     public void onSubscribe(Disposable d) {
 
                     }
 
                     @Override
-                    public void onNext(String str) {
-                        onOkHttpListener.onSuccess(str);
+                    public void onNext(DownloadBean bean) {
+                        onDownloadListener.onDownloading(bean.progress);
+                        if (bean.status == 1) {
+                            onDownloadListener.onSuccess(bean.filePath);
+                        }
                     }
 
                     @Override
                     public void onError(Throwable e) {
-                        onOkHttpListener.onFailure(e);
+                        onDownloadListener.onFailure(e);
                     }
 
                     @Override
                     public void onComplete() {
-                        onOkHttpListener.onCompleted();
+                        onDownloadListener.onCompleted();
                     }
                 });
     }
 
-    private Observable<String> getObservable(final String url, final Map<Object, Object> oMap) {
-        return Observable.create(new ObservableOnSubscribe<String>() {
+    private Observable<DownloadBean> getObservable(final String url) {
+        return Observable.create(new ObservableOnSubscribe<DownloadBean>() {
             @Override
-            public void subscribe(ObservableEmitter<String> e) {
-                send(url, oMap, e);
+            public void subscribe(ObservableEmitter<DownloadBean> e) {
+                send(url, e);
             }
         });
     }
 
-    private void send(final String url, final Map<Object, Object> oMap, final ObservableEmitter<String> subscriber) {
+    private void send(final String url, final ObservableEmitter<DownloadBean> subscriber) {
         InternetBean bean = Internet.ifInternet(mContext);
         if (bean.getStatus()) {
-            Call call = okHttpClient.newCall(getRequest(url, oMap));
+            Request request = new Request.Builder()
+                    .url(url)
+                    .build();
+            Call call = okHttpClient.newCall(request);
             sendCall(url, call, subscriber);
         } else {
             subscriber.onError(new Exception(bean.getMsg()));
-            subscriber.onComplete();
-        }
-    }
-
-    /**
-     * 请求
-     */
-    private void sendCall(String url, Call call, ObservableEmitter<String> subscriber) {
-        if (callType == CallType.SYNC) {
-            sync(url, call, subscriber);
-        } else if (callType == CallType.ASYNC) {
-            async(url, call, subscriber);
-        }
-    }
-
-    /**
-     * 异步请求
-     */
-    private void sync(final String url, Call call, final ObservableEmitter<String> subscriber) {
-        try {
-            Response execute = call.execute();
-            if (execute.isSuccessful()) {
-                save(execute.body(), url, subscriber);
-            } else {
-                subscriber.onError(new Error("请求失败"));
-            }
-        } catch (IOException e) {
-            subscriber.onError(e);
         }
         subscriber.onComplete();
     }
 
     /**
-     * 同步请求
+     * 请求
      */
-    private void async(final String url, Call call, final ObservableEmitter<String> subscriber) {
+    private void sendCall(final String url, Call call, final ObservableEmitter<DownloadBean> subscriber) {
         call.enqueue(new Callback() {
             @Override
             public void onFailure(@NonNull Call call, @NonNull IOException e) {
                 subscriber.onError(e);
-                subscriber.onComplete();
             }
 
             @Override
             public void onResponse(@NonNull Call call, @NonNull Response response) throws IOException {
-                save(response.body(), url, subscriber);
-            }
-        });
-    }
-
-    /**
-     * 保存
-     *
-     * @param body
-     */
-    private void save(ResponseBody body, String url, ObservableEmitter<String> subscriber) {
-        if (null == fileName && "".equals(fileName) && fileName.length() <= 0) {
-            int lastIndexOf = url.lastIndexOf("/");
-            String pathStr = url.subSequence(lastIndexOf + 1, url.length()).toString();
-            fileName = FileUtil.getSDPath() + "/" + mContext.getPackageName() + "/" + pathStr;
-        }
-        File file = new File(fileName);
-        InputStream is = null;
-        FileOutputStream fos = null;
-        try {
-            byte[] buf = new byte[2048];
-            int len;
-            is = body.byteStream();
-            fos = new FileOutputStream(file);
-            while ((len = is.read(buf)) != -1) {
-                fos.write(buf, 0, len);
-            }
-            fos.flush();
-            subscriber.onNext(fileName);
-        } catch (Exception e) {
-            subscriber.onError(e);
-        } finally {
-            try {
-                if (is != null) {
-                    is.close();
-                }
-                if (fos != null) {
-                    fos.close();
+                DownloadBean bean = new DownloadBean();
+                InputStream is = null;
+                byte[] buf = new byte[2048];
+                int len = 0;
+                FileOutputStream fos = null;
+                // 储存下载文件的目录
+                String savePath = isExistDir(filePath);
+                try {
+                    is = response.body().byteStream();
+                    long total = response.body().contentLength();
+                    File file = new File(savePath, getNameFromUrl(url));
+                    bean.filePath = file.getAbsolutePath();
+                    fos = new FileOutputStream(file);
+                    long sum = 0;
+                    while ((len = is.read(buf)) != -1) {
+                        fos.write(buf, 0, len);
+                        sum += len;
+                        int progress = (int) (sum * 1.0f / total * 100);
+                        bean.status = 0;
+                        bean.progress = progress;
+                        // 下载中
+                        subscriber.onNext(bean);
+                    }
+                    fos.flush();
+                    // 下载完成
+                    bean.status = 1;
+                    subscriber.onNext(bean);
+                } catch (Exception e) {
+                    subscriber.onError(e);
+                } finally {
+                    try {
+                        if (is != null)
+                            is.close();
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                    try {
+                        if (fos != null)
+                            fos.close();
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
                 }
-            } catch (Exception e) {
-                subscriber.onError(e);
             }
-        }
-        subscriber.onComplete();
+        });
     }
 
     /**
-     * 判断请求方式
-     *
-     * @param url  地址
-     * @param oMap 键值
-     * @return request
+     * @param saveDir
+     * @return
+     * @throws IOException 判断下载目录是否存在
      */
-    private Request getRequest(String url, Map<Object, Object> oMap) {
-        if (requestType == null) {
-            requestType = RequestType.GET;
-        }
-        switch (requestType) {
-            case GET:
-                return get(url, oMap);
-            case POST:
-                return post(url, oMap);
-            default:
-                return get(url, oMap);
+    private String isExistDir(String saveDir) throws IOException {
+        // 下载位置
+        File downloadFile = new File(Environment.getExternalStorageDirectory(), saveDir);
+        if (!downloadFile.mkdirs()) {
+            downloadFile.createNewFile();
         }
+        return downloadFile.getAbsolutePath();
     }
 
     /**
-     * get上传参数
-     *
-     * @param url  地址
-     * @param oMap 键值
-     * @return request
+     * @param url
+     * @return 从下载连接中解析出文件名
      */
-    private Request get(String url, Map<Object, Object> oMap) {
-        StringBuilder str = new StringBuilder(url);
-        if (FormatUtil.isMapNotEmpty(oMap)) {
-            str.append("?");
-            for (Map.Entry<Object, Object> entry : oMap.entrySet()) {
-                str.append(entry.getKey()).append("=").append(entry).append("&");
-            }
-            str = new StringBuilder(str.substring(0, str.length() - 1));
-        }
-        return new Request.Builder()
-                .url(str.toString())
-                .get()
-                .build();
+    @NonNull
+    private String getNameFromUrl(String url) {
+        return url.substring(url.lastIndexOf("/") + 1);
     }
 
     /**
-     * post上传参数
-     *
-     * @param url  地址
-     * @param oMap 键值
-     * @return request
+     * 下载状态
      */
-    private Request post(String url, Map<Object, Object> oMap) {
-        FormBody.Builder builder = new FormBody.Builder();
-        if (FormatUtil.isMapNotEmpty(oMap)) {
-            for (Map.Entry<Object, Object> entry : oMap.entrySet()) {
-                builder.add(entry.getKey().toString(), entry.getValue().toString());
-            }
-        }
-        FormBody build = builder.build();
-        return new Request.Builder()
-                .url(url)
-                .post(build)
-                .build();
+    class DownloadBean {
+        int progress;
+        int status = 0;
+        String filePath;
     }
 }

okhttplib/src/main/java/com/mylove/okhttp/DownloadRequest.java

@@ -3,8 +3,6 @@ package com.mylove.okhttp;
 import android.annotation.SuppressLint;
 import android.content.Context;
 
-import java.util.Map;
-
 /**
  * @author myLove
  */
@@ -15,9 +13,8 @@ public class DownloadRequest {
     private static String url;
     @SuppressLint("StaticFieldLeak")
     private static Context mContext;
-    private static RequestType requestType;
 
-    public static DownloadRequest getInstance(Context context, String str, RequestType type) {
+    public static DownloadRequest getInstance(Context context, String str) {
         if (instance == null) {
             synchronized (DownloadRequest.class) {
                 if (instance == null) {
@@ -27,23 +24,18 @@ public class DownloadRequest {
         }
         mContext = context;
         url = str;
-        requestType = type;
         return instance;
     }
 
-    public void sync(Map<Object, Object> oMap, onOkHttpListener onOkHttpListener) {
-        DownloadObservable.getInstance(mContext, requestType, CallType.SYNC).request(url, oMap, onOkHttpListener);
-    }
-
-    public void sync(Map<Object, Object> oMap, String fileName, onOkHttpListener onOkHttpListener) {
-        DownloadObservable.getInstance(mContext, fileName, requestType, CallType.SYNC).request(url, oMap, onOkHttpListener);
-    }
-
-    public void async(Map<Object, Object> oMap, onOkHttpListener onOkHttpListener) {
-        DownloadObservable.getInstance(mContext, requestType, CallType.ASYNC).request(url, oMap, onOkHttpListener);
-    }
-
-    public void async(Map<Object, Object> oMap, String fileName, onOkHttpListener onOkHttpListener) {
-        DownloadObservable.getInstance(mContext, fileName, requestType, CallType.ASYNC).request(url, oMap, onOkHttpListener);
+    /**
+     * @param filePath           储存下载文件的SDCard目录
+     * @param onDownloadListener 监听
+     */
+    public void download(String filePath, OnDownloadListener onDownloadListener) {
+        //saveDir判断不能为空
+        if (FormatUtil.isEmpty(filePath)) {
+            throw new NullPointerException("filePath is the SDCard directory of the downloaded file, cannot be empty.");
+        }
+        DownloadObservable.getInstance(mContext, filePath).request(url, onDownloadListener);
     }
 }

okhttplib/src/main/java/com/mylove/okhttp/ObservableRequests.java

@@ -122,9 +122,8 @@ class ObservableRequests<T> {
             } else {
                 subscriber.onError(new Error(bean.getMsg()));
             }
-            subscriber.onComplete();
         }
-
+        subscriber.onComplete();
     }
 
     /**
@@ -164,7 +163,6 @@ class ObservableRequests<T> {
                 }
                 T t = new Gson().fromJson(str, tClass);
                 subscriber.onNext(t);
-                subscriber.onComplete();
             } else {
                 String json = CacheUtils.getInstance(mContext).getCacheToLocalJson(mCacheUrl);
                 if (FormatUtil.isNotEmpty(json)) {
@@ -173,7 +171,6 @@ class ObservableRequests<T> {
                 } else {
                     subscriber.onError(new Exception("请求失败"));
                 }
-                subscriber.onComplete();
             }
         } catch (IOException e) {
             String json = CacheUtils.getInstance(mContext).getCacheToLocalJson(mCacheUrl);
@@ -184,7 +181,6 @@ class ObservableRequests<T> {
                 subscriber.onError(e);
             }
             e.printStackTrace();
-            subscriber.onComplete();
         }
 
     }
@@ -204,7 +200,6 @@ class ObservableRequests<T> {
                     subscriber.onError(e);
                 }
                 e.printStackTrace();
-                subscriber.onComplete();
             }
 
             @Override
@@ -228,7 +223,6 @@ class ObservableRequests<T> {
                 }
                 T t = new Gson().fromJson(str, tClass);
                 subscriber.onNext(t);
-                subscriber.onComplete();
             }
         });
     }

okhttplib/src/main/java/com/mylove/okhttp/OkHttpUtil.java

@@ -46,6 +46,6 @@ public class OkHttpUtil {
     }
 
     public DownloadRequest downloadFile(String url) {
-        return DownloadRequest.getInstance(mContext, url, RequestType.GET);
+        return DownloadRequest.getInstance(mContext, url);
     }
 }

okhttplib/src/main/java/com/mylove/okhttp/OnDownloadListener.java

@@ -0,0 +1,14 @@
+package com.mylove.okhttp;
+
+/**
+ * @author BenYanYi
+ * @date 2018/9/11 11:27
+ * @email ben@yanyi.red
+ * @overview
+ */
+public interface OnDownloadListener extends onOkHttpListener {
+    /**
+     * @param progress 下载进度
+     */
+    void onDownloading(int progress);
+}