Release to v1.5.0

Author: JessYanCoding

README-zh.md

@@ -1,5 +1,5 @@
 # ProgressManager
-[ ![Bintray](https://img.shields.io/badge/bintray-v1.3.3-brightgreen.svg) ](https://bintray.com/jessyancoding/maven/progressmanager/1.3.3/link)
+[ ![Bintray](https://img.shields.io/badge/bintray-v1.5.0-brightgreen.svg) ](https://bintray.com/jessyancoding/maven/progressmanager/1.5.0/link)
 [ ![Build Status](https://travis-ci.org/JessYanCoding/ProgressManager.svg?branch=master) ](https://travis-ci.org/JessYanCoding/ProgressManager)
 [ ![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-ProgressManager-brightgreen.svg?style=flat)](https://android-arsenal.com/details/1/5865)
 [ ![API](https://img.shields.io/badge/API-14%2B-blue.svg?style=flat-square) ](https://developer.android.com/about/versions/android-4.0.html)
@@ -32,7 +32,7 @@
 
 ## Download
 ``` gradle
- compile 'me.jessyan:progressmanager:1.3.3'
+ compile 'me.jessyan:progressmanager:1.5.0'
 ```
 
 ## Usage

README.md

@@ -1,5 +1,5 @@
 # ProgressManager
-[ ![Bintray](https://img.shields.io/badge/bintray-v1.3.3-brightgreen.svg) ](https://bintray.com/jessyancoding/maven/progressmanager/1.3.3/link)
+[ ![Bintray](https://img.shields.io/badge/bintray-v1.5.0-brightgreen.svg) ](https://bintray.com/jessyancoding/maven/progressmanager/1.5.0/link)
 [ ![Build Status](https://travis-ci.org/JessYanCoding/ProgressManager.svg?branch=master) ](https://travis-ci.org/JessYanCoding/ProgressManager)
 [ ![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-ProgressManager-brightgreen.svg?style=flat)](https://android-arsenal.com/details/1/5865)
 [ ![API](https://img.shields.io/badge/API-14%2B-blue.svg?style=flat-square) ](https://developer.android.com/about/versions/android-4.0.html)
@@ -31,7 +31,7 @@
 
 ## Download
 ``` gradle
- compile 'me.jessyan:progressmanager:1.3.3'
+ compile 'me.jessyan:progressmanager:1.5.0'
 ```
 
 ## Usage

app/src/main/java/me/jessyan/progressmanager/demo/MainActivity.java

@@ -58,8 +58,8 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
      * 为什么这样做? 因为如果直接使用 String mUrl = "url", 这个 url 字符串会被加入全局字符串常量池, 池中的字符串将不会被回收
      * 既然 {@code key} 没被回收, 那 {@link WeakHashMap} 中的值也不会被移除
      */
-    public static final String IMAGE_URL = new String("https://raw.githubusercontent.com/JessYanCoding/MVPArmsTemplate/master/art/step.png");
-    public static final String DOWNLOAD_URL = new String("https://raw.githubusercontent.com/JessYanCoding/MVPArmsTemplate/master/art/MVPArms.gif");
+    public static final String IMAGE_URL = new String("http://jessyancoding.github.io/images/RxCache.png");
+    public static final String DOWNLOAD_URL = new String("http://jessyancoding.github.io/images/RxCache.png");
     public static final String UPLOAD_URL = new String("http://upload.qiniu.com/");
 
     private ImageView mImageView;

app/src/test/java/me/jessyan/progressmanager/demo/ExampleUnitTest.java

@@ -7,12 +7,6 @@
 import java.util.WeakHashMap;
 import java.util.concurrent.TimeUnit;
 
-import me.jessyan.progressmanager.ProgressListener;
-import me.jessyan.progressmanager.ProgressManager;
-import me.jessyan.progressmanager.body.ProgressInfo;
-import okhttp3.HttpUrl;
-import okhttp3.Request;
-
 /**
  * Example local unit test, which will execute on the development machine (host).
  *
@@ -22,35 +16,15 @@ public class ExampleUnitTest {
 
     @Test
     public void test(){
-//        testWeakHashMapAPIs();
+        testWeakHashMapAPIs();
         testString();
     }
 
-    private void testRequest(){
-        String newUrl = ProgressManager.getInstance().addDiffResponseListenerOnSameUrl("http://www.baidu.com/user", new ProgressListener() {
-            @Override
-            public void onProgress(ProgressInfo progressInfo) {
-
-            }
-
-            @Override
-            public void onError(long id, Exception e) {
-
-            }
-        });
-        Request request = new Request
-                .Builder()
-                .url(newUrl)
-                .build();
-        ProgressManager.getInstance().wrapRequestBody(request);
-    }
-
     private void testString(){
         String s =  "http://www.baidu.com/user$JessYan$456";
-        String substring = s.substring(0, s.indexOf("$JessYan$"));
-        System.out.println(HttpUrl.parse("http://www.baidu.com/abc/d").toString());
+        int index = s.indexOf("$JessYan$");
+        String substring = s.substring(0, index);
         System.out.println(substring);
-        System.out.println(s);
     }
 
     private void testWeakHashMapAPIs() {

build.gradle

@@ -26,6 +26,6 @@ ext {
     targetSdkVersion = 26
     compileSdkVersion = 26
     buildToolsVersion = "26.0.2"
-    versionCode = 16
-    versionName = "1.3.3"
+    versionCode = 20
+    versionName = "1.5.0"
 }

progress/src/main/java/me/jessyan/progressmanager/ProgressManager.java

@@ -36,6 +36,7 @@
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
+import okhttp3.internal.http2.Header;
 
 /**
  * ================================================
@@ -73,6 +74,7 @@ public final class ProgressManager {
     public static final int DEFAULT_REFRESH_TIME = 150;
     public static final String IDENTIFICATION_NUMBER = "?JessYan=";
     public static final String IDENTIFICATION_HEADER = "JessYan";
+    public static final String LOCATION_HEADER = "Location";
 
 
     static {
@@ -209,13 +211,22 @@ public Request wrapRequestBody(Request request) {
         return request;
     }
 
+    /**
+     * 如果 {@code url} 中含有 {@link #addDiffResponseListenerOnSameUrl(String, String, ProgressListener)}
+     * 或 {@link #addDiffRequestListenerOnSameUrl(String, String, ProgressListener)} 加入的标识符,则将加入标识符
+     * 从 {code url} 中删除掉,继续使用 {@code originUrl} 进行请求
+     *
+     * @param url     {@code url} 地址
+     * @param request 原始 {@link Request}
+     * @return 返回可能被修改过的 {@link Request}
+     */
     private Request pruneIdentification(String url, Request request) {
         boolean needPrune = url.contains(IDENTIFICATION_NUMBER);
         if (!needPrune)
             return request;
         return request.newBuilder()
-                .url(url.substring(0, url.indexOf(IDENTIFICATION_NUMBER)))
-                .header(IDENTIFICATION_HEADER, url)
+                .url(url.substring(0, url.indexOf(IDENTIFICATION_NUMBER))) //删除掉标识符
+                .header(IDENTIFICATION_HEADER, url) //将有标识符的 url 加入 header中, 便于wrapResponseBody(Response) 做处理
                 .build();
     }
 
@@ -231,13 +242,14 @@ public Response wrapResponseBody(Response response) {
             return response;
 
         String key = response.request().url().toString();
-        if (!TextUtils.isEmpty(response.request().header(IDENTIFICATION_HEADER))) {
+        if (!TextUtils.isEmpty(response.request().header(IDENTIFICATION_HEADER))) { //从 header 中拿出有标识符的 url
             key = response.request().header(IDENTIFICATION_HEADER);
         }
 
         if (haveRedirect(response)) {
             resolveRedirect(mRequestListeners, response, key);
-            resolveRedirect(mResponseListeners, response, key);
+            String location = resolveRedirect(mResponseListeners, response, key);
+            response = modifyLocation(response, location);
             return response;
         }
 
@@ -253,11 +265,27 @@ public Response wrapResponseBody(Response response) {
         return response;
     }
 
+    /**
+     * 查看 location 是否被加入了标识符, 如果是, 则放入 {@link Header} 中重新定义 {@link Response}
+     *
+     * @param response 原始的 {@link Response}
+     * @param location {@code location} 重定向地址
+     * @return 返回可能被修改过的 {@link Response}
+     */
+    private Response modifyLocation(Response response, String location) {
+        if (!TextUtils.isEmpty(location) && location.contains(IDENTIFICATION_NUMBER)) { //将被加入标识符的新的 location 放入 header 中
+            response = response.newBuilder()
+                    .header(LOCATION_HEADER, location)
+                    .build();
+        }
+        return response;
+    }
+
     /**
      * 当出现需要使用同一个 {@code url} 根据 Post 请求参数的不同而下载不同资源的情况
      * 请使用 {@link #addDiffResponseListenerOnSameUrl(String, ProgressListener)} 代替 {@link #addResponseListener}
      * {@link #addDiffResponseListenerOnSameUrl(String, ProgressListener)} 会返回一个加入了时间戳的新的 {@code url}
-     * 请使用这个新的 {@code url} 去代替 {@code originUrl} 进行下载的请求即可
+     * 请使用这个新的 {@code url} 去代替 {@code originUrl} 进行下载的请求即可 (当实际请求时依然使用 {@code originUrl} 进行网络请求)
      * <p>
      * {@link #addDiffResponseListenerOnSameUrl(String, ProgressListener)} 与 {@link #addDiffResponseListenerOnSameUrl(String, String, ProgressListener)}
      * 的区别在于:
@@ -277,7 +305,7 @@ public String addDiffResponseListenerOnSameUrl(String originUrl, ProgressListene
      * 当出现需要使用同一个 {@code url} 根据 Post 请求参数的不同而下载不同资源的情况
      * 请使用 {@link #addDiffResponseListenerOnSameUrl(String, String, ProgressListener)} 代替 {@link #addResponseListener}
      * 请使用 {@link #addDiffResponseListenerOnSameUrl(String, String, ProgressListener)} 会返回一个 {@code originUrl} 结合 {@code key} 生成的新的 {@code url}
-     * 请使用这个新的 {@code url} 去代替 {@code originUrl} 进行下载的请求即可
+     * 请使用这个新的 {@code url} 去代替 {@code originUrl} 进行下载的请求即可 (当实际请求时依然使用 {@code originUrl} 进行网络请求)
      * <p>
      * {@link #addDiffResponseListenerOnSameUrl(String, ProgressListener)} 与 {@link #addDiffResponseListenerOnSameUrl(String, String, ProgressListener)}
      * 的区别在于:
@@ -322,7 +350,7 @@ public String addDiffResponseListenerOnSameUrl(String originUrl, String key, Pro
      * 当出现需要使用同一个 {@code url} 根据 Post 请求参数的不同而上传不同资源的情况
      * 请使用 {@link #addDiffRequestListenerOnSameUrl(String, ProgressListener)} 代替 {@link #addRequestListener}
      * {@link #addDiffRequestListenerOnSameUrl(String, ProgressListener)} 会返回一个加入了时间戳的新的 {@code url}
-     * 请使用这个新的 {@code url} 去代替 {@code originUrl} 进行上传的请求即可
+     * 请使用这个新的 {@code url} 去代替 {@code originUrl} 进行上传的请求即可 (当实际请求时依然使用 {@code originUrl} 进行网络请求)
      * <p>
      * {@link #addDiffRequestListenerOnSameUrl(String, ProgressListener)} 与 {@link #addDiffRequestListenerOnSameUrl(String, String, ProgressListener)}
      * 的区别在于:
@@ -343,7 +371,7 @@ public String addDiffRequestListenerOnSameUrl(String originUrl, ProgressListener
      * 当出现需要使用同一个 {@code url} 根据 Post 请求参数的不同而上传不同资源的情况
      * 请使用 {@link #addDiffRequestListenerOnSameUrl(String, ProgressListener)} 代替 {@link #addRequestListener}
      * {@link #addDiffRequestListenerOnSameUrl(String, ProgressListener)} 会返回一个 {@code originUrl} 结合 {@code key} 生成的新的 {@code url}
-     * 请使用这个新的 {@code url} 去代替 {@code originUrl} 进行上传的请求即可
+     * 请使用这个新的 {@code url} 去代替 {@code originUrl} 进行上传的请求即可 (当实际请求时依然使用 {@code originUrl} 进行网络请求)
      * <p>
      * {@link #addDiffRequestListenerOnSameUrl(String, ProgressListener)} 与 {@link #addDiffRequestListenerOnSameUrl(String, String, ProgressListener)}
      * 的区别在于:
@@ -410,11 +438,15 @@ private boolean haveRedirect(Response response) {
      * @param response 原始的 {@link Response}
      * @param url      {@code url} 地址
      */
-    private void resolveRedirect(Map<String, List<ProgressListener>> map, Response response, String url) {
+    private String resolveRedirect(Map<String, List<ProgressListener>> map, Response response, String url) {
+        String location = null;
         List<ProgressListener> progressListeners = map.get(url); //查看此重定向 url ,是否已经注册过监听器
         if (progressListeners != null && progressListeners.size() > 0) {
-            String location = response.header("Location");// 重定向地址
+            location = response.header(LOCATION_HEADER);// 重定向地址
             if (!TextUtils.isEmpty(location)) {
+                if (url.contains(IDENTIFICATION_NUMBER) && !location.contains(IDENTIFICATION_NUMBER)) { //如果 url 有标识符,那也将标识符加入用于重定向的 location
+                    location += url.substring(url.indexOf(IDENTIFICATION_NUMBER), url.length());
+                }
                 if (!map.containsKey(location)) {
                     map.put(location, progressListeners); //将需要重定向地址的监听器,提供给重定向地址,保证重定向后也可以监听进度
                 } else {
@@ -427,6 +459,7 @@ private void resolveRedirect(Map<String, List<ProgressListener>> map, Response r
                 }
             }
         }
+        return location;
     }