1.2.3 release

- 修复了拦截回调存在的因responseBody被拦截器消费而导致实际请求回调内容为空的问题；

Author: kongzue

BaseOkHttpX/build.gradle

@@ -6,8 +6,8 @@ android {
 
     defaultConfig {
         minSdk 21
-        versionCode 5
-        versionName "1.2.2"
+        versionCode 6
+        versionName "1.2.3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"

BaseOkHttpX/src/main/java/com/kongzue/baseokhttp/x/util/BaseHttpRequest.java

@@ -36,6 +36,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
 import java.net.Proxy;
 import java.nio.charset.StandardCharsets;
 import java.security.KeyStore;
@@ -231,25 +232,26 @@ private void onStream(String line, MediaType mediaType) {
             LockLog.logI(TAG_RETURN, line);
         }
         ResponseBody responseBody = ResponseBody.create(line.getBytes(), mediaType);
+        ResponseBody interceptResponseBody = ResponseBody.create(line.getBytes(), mediaType);
         if (callbackInMainLooper) {
             Looper mainLooper = Looper.getMainLooper();
             handler = new Handler(mainLooper);
             handler.post(new Runnable() {
                 @Override
                 public void run() {
-                    callCallbacks(responseBody, null);
+                    callCallbacks(responseBody, interceptResponseBody, null);
                 }
             });
         } else {
             if (handler != null) {
                 handler.post(new Runnable() {
                     @Override
                     public void run() {
-                        callCallbacks(responseBody, null);
+                        callCallbacks(responseBody, interceptResponseBody, null);
                     }
                 });
             } else {
-                callCallbacks(responseBody, null);
+                callCallbacks(responseBody, interceptResponseBody, null);
             }
         }
     }
@@ -264,6 +266,7 @@ private void onFinish(Response response) {
                 String charset = mediaType.charset(StandardCharsets.UTF_8).name();
                 String result = new String(responseBytes, charset);
                 ResponseBody resultBody = ResponseBody.create(responseBytes, mediaType);
+                ResponseBody interceptResultBody = ResponseBody.create(responseBytes, mediaType);
 
                 if (isShowLogs()) {
                     LockLog.Builder logBuilder = LockLog.Builder.create()
@@ -290,19 +293,19 @@ private void onFinish(Response response) {
                     handler.post(new Runnable() {
                         @Override
                         public void run() {
-                            callCallbacks(resultBody, null);
+                            callCallbacks(resultBody, interceptResultBody, null);
                         }
                     });
                 } else {
                     if (handler != null) {
                         handler.post(new Runnable() {
                             @Override
                             public void run() {
-                                callCallbacks(resultBody, null);
+                                callCallbacks(resultBody, interceptResultBody, null);
                             }
                         });
                     } else {
-                        callCallbacks(resultBody, null);
+                        callCallbacks(resultBody, interceptResultBody, null);
                     }
                 }
             } else {
@@ -326,9 +329,9 @@ public void run() {
         }
     }
 
-    private void callCallbacks(ResponseBody result, Exception e) {
+    private void callCallbacks(ResponseBody result, ResponseBody interceptRequestBody, Exception e) {
         if (BaseOkHttpX.responseInterceptListener != null &&
-                BaseOkHttpX.responseInterceptListener.onIntercept(BaseHttpRequest.this, result, e)) {
+                BaseOkHttpX.responseInterceptListener.onIntercept(BaseHttpRequest.this, interceptRequestBody, e)) {
             return;
         }
         for (BaseResponseListener callback : callbacks) {
@@ -366,19 +369,19 @@ private void onFail(Exception e) {
             handler.post(new Runnable() {
                 @Override
                 public void run() {
-                    callCallbacks(null, e);
+                    callCallbacks(null, null, e);
                 }
             });
         } else {
             if (handler != null) {
                 handler.post(new Runnable() {
                     @Override
                     public void run() {
-                        callCallbacks(null, e);
+                        callCallbacks(null, null, e);
                     }
                 });
             } else {
-                callCallbacks(null, e);
+                callCallbacks(null, null, e);
             }
         }
     }
@@ -566,7 +569,7 @@ private String getRealRequestUrl(String url) {
 
     /**
      * 获取最终请求地址。
-     *
+     * <p>
      * 当为 GET 请求时会自动拼接参数。
      *
      * @return 完整的请求地址
@@ -921,7 +924,7 @@ public boolean isRequesting() {
 
     /**
      * 手动标记请求的执行状态。
-     *
+     * <p>
      * 当设置为 true 时会启动超时检测，false 则停止检测。
      *
      * @param requesting 是否处于请求状态
@@ -1106,7 +1109,7 @@ public BaseHttpRequest setCacheSettings(Cache cacheSettings) {
     /**
      * 指定下载文件的保存路径，并设置下载监听器。
      *
-     * @param file            目标文件
+     * @param file             目标文件
      * @param downloadListener 下载进度回调
      * @return 当前请求对象
      */

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "com.kongzue.baseokhttpx.demo"
         minSdk 21
         targetSdk 31
-        versionCode 5
-        versionName "1.2.2"
+        versionCode 6
+        versionName "1.2.3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }