Fix download did not return a problem.

README.md

@@ -24,7 +24,7 @@ project 下添加
 #### 方法二(最新)
 module 下添加
 
-    compile 'com.yanyi.benyanyi:okhttplib:1.0.6'
+    compile 'com.yanyi.benyanyi:okhttplib:1.0.7'
     
 ### 更新记录
-* 2018/09/12(1.0.6) 修复下载文件回调没返回问题
+* 2018/09/12(1.0.7) 修复下载文件回调没返回问题

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.6"//项目引用的版本号，比如compile 'com.ansen.http:okhttpencapsulation:1.0.1'中的1.0.1就是这里配置的。
+version = "1.0.7"//项目引用的版本号，比如compile 'com.ansen.http:okhttpencapsulation:1.0.1'中的1.0.1就是这里配置的。
 install {
     repositories.mavenInstaller {
         // This generates POM.xml with proper parameters

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

@@ -75,9 +75,10 @@ class DownloadObservable {
                         if (OkHttpInfo.isLOG) {
                             LogHelper.v(bean);
                         }
-                        onDownloadListener.onDownloading(bean.progress);
                         if (bean.status == 1) {
                             onDownloadListener.onSuccess(bean.filePath);
+                        } else {
+                            onDownloadListener.onDownloading(bean.progress);
                         }
                     }
 
@@ -189,10 +190,12 @@ class DownloadObservable {
                     if (OkHttpInfo.isLOG)
                         LogHelper.d(bean);
                     subscriber.onNext(bean);
+                    subscriber.onComplete();
                 } catch (Exception e) {
                     if (OkHttpInfo.isLOG)
                         LogHelper.e(e.getMessage());
                     subscriber.onError(e);
+                    subscriber.onComplete();
                 } finally {
                     try {
                         if (is != null)
@@ -209,7 +212,6 @@ class DownloadObservable {
                             LogHelper.e(e.getMessage());
                     }
                 }
-                subscriber.onComplete();
             }
         });
     }

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

@@ -114,10 +114,11 @@ class ObservableRequest {
             String json = CacheUtils.getInstance(mContext).getCacheToLocalJson(mCacheUrl);
             if (FormatUtil.isNotEmpty(json)) {
                 subscriber.onNext(json);
+                subscriber.onComplete();
             } else {
                 subscriber.onError(new Error(bean.getMsg()));
+                subscriber.onComplete();
             }
-            subscriber.onComplete();
         }
 
     }
@@ -150,24 +151,28 @@ class ObservableRequest {
                     }
                 }
                 subscriber.onNext(str);
+                subscriber.onComplete();
             } else {
                 String json = CacheUtils.getInstance(mContext).getCacheToLocalJson(mCacheUrl);
                 if (FormatUtil.isNotEmpty(json)) {
                     subscriber.onNext(json);
+                    subscriber.onComplete();
                 } else {
                     subscriber.onError(new Exception("请求失败"));
+                    subscriber.onComplete();
                 }
             }
         } catch (IOException e) {
             String json = CacheUtils.getInstance(mContext).getCacheToLocalJson(mCacheUrl);
             if (FormatUtil.isNotEmpty(json)) {
                 subscriber.onNext(json);
+                subscriber.onComplete();
             } else {
                 subscriber.onError(e);
+                subscriber.onComplete();
             }
             e.printStackTrace();
         }
-        subscriber.onComplete();
     }
 
     /**
@@ -180,11 +185,12 @@ class ObservableRequest {
                 String json = CacheUtils.getInstance(mContext).getCacheToLocalJson(mCacheUrl);
                 if (FormatUtil.isNotEmpty(json)) {
                     subscriber.onNext(json);
+                    subscriber.onComplete();
                 } else {
                     subscriber.onError(e);
+                    subscriber.onComplete();
                 }
                 e.printStackTrace();
-                subscriber.onComplete();
             }
 
             @Override

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

@@ -119,10 +119,11 @@ class ObservableRequests<T> {
             if (FormatUtil.isNotEmpty(json)) {
                 T t = new Gson().fromJson(json, tClass);
                 subscriber.onNext(t);
+                subscriber.onComplete();
             } else {
                 subscriber.onError(new Error(bean.getMsg()));
+                subscriber.onComplete();
             }
-            subscriber.onComplete();
         }
     }
 
@@ -163,13 +164,16 @@ 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)) {
                     T t = new Gson().fromJson(json, tClass);
                     subscriber.onNext(t);
+                    subscriber.onComplete();
                 } else {
                     subscriber.onError(new Exception("请求失败"));
+                    subscriber.onComplete();
                 }
             }
         } catch (IOException e) {
@@ -177,12 +181,13 @@ class ObservableRequests<T> {
             if (FormatUtil.isNotEmpty(json)) {
                 T t = new Gson().fromJson(json, tClass);
                 subscriber.onNext(t);
+                subscriber.onComplete();
             } else {
                 subscriber.onError(e);
+                subscriber.onComplete();
             }
             e.printStackTrace();
         }
-        subscriber.onComplete();
     }
 
     /**
@@ -196,11 +201,12 @@ class ObservableRequests<T> {
                 if (FormatUtil.isNotEmpty(json)) {
                     T t = new Gson().fromJson(json, tClass);
                     subscriber.onNext(t);
+                    subscriber.onComplete();
                 } else {
                     subscriber.onError(e);
+                    subscriber.onComplete();
                 }
                 e.printStackTrace();
-                subscriber.onComplete();
             }
 
             @Override