1.2.0

kongzue · kongzue · commit e5bc9de0ea83 · 2025-06-24T19:02:32.000+08:00
- 新增字节回调处理器 `BytesResponseListener` 和字节拦截处理器 `BytesResponseInterceptListener`，以及其对应的基础类 `BaseResponseListener` 和 `BaseResponseInterceptListener`;
diff --git a/BaseOkHttpX/build.gradle b/BaseOkHttpX/build.gradle
@@ -6,8 +6,8 @@ android {
 
     defaultConfig {
         minSdk 21
-        versionCode 2
-        versionName "1.1.0"
+        versionCode 3
+        versionName "1.2.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
diff --git a/BaseOkHttpX/src/main/java/com/kongzue/baseokhttp/x/BaseOkHttpX.java b/BaseOkHttpX/src/main/java/com/kongzue/baseokhttp/x/BaseOkHttpX.java
@@ -1,5 +1,6 @@
 package com.kongzue.baseokhttp.x;
 
+import com.kongzue.baseokhttp.x.interfaces.BaseResponseInterceptListener;
 import com.kongzue.baseokhttp.x.interfaces.HeaderInterceptListener;
 import com.kongzue.baseokhttp.x.interfaces.ParameterInterceptListener;
 import com.kongzue.baseokhttp.x.interfaces.ResponseInterceptListener;
@@ -42,7 +43,7 @@ public class BaseOkHttpX {
     public static boolean httpRequestDetailsLogs = false;
 
     // 全局拦截器
-    public static ResponseInterceptListener responseInterceptListener;
+    public static BaseResponseInterceptListener responseInterceptListener;
 
     // 全局参数拦截器
     public static ParameterInterceptListener parameterInterceptListener;
diff --git a/BaseOkHttpX/src/main/java/com/kongzue/baseokhttp/x/interfaces/BaseResponseInterceptListener.java b/BaseOkHttpX/src/main/java/com/kongzue/baseokhttp/x/interfaces/BaseResponseInterceptListener.java
@@ -0,0 +1,10 @@
+package com.kongzue.baseokhttp.x.interfaces;
+
+import com.kongzue.baseokhttp.x.util.BaseHttpRequest;
+
+import okhttp3.ResponseBody;
+
+public interface BaseResponseInterceptListener {
+
+    boolean onIntercept(BaseHttpRequest httpRequest, ResponseBody response, Exception error);
+}
diff --git a/BaseOkHttpX/src/main/java/com/kongzue/baseokhttp/x/interfaces/BaseResponseListener.java b/BaseOkHttpX/src/main/java/com/kongzue/baseokhttp/x/interfaces/BaseResponseListener.java
@@ -0,0 +1,11 @@
+package com.kongzue.baseokhttp.x.interfaces;
+
+import com.kongzue.baseokhttp.x.util.BaseHttpRequest;
+
+import okhttp3.ResponseBody;
+
+public interface BaseResponseListener {
+
+    void response(BaseHttpRequest httpRequest, ResponseBody responseBody, Exception error);
+
+}
diff --git a/BaseOkHttpX/src/main/java/com/kongzue/baseokhttp/x/interfaces/BeanResponseListener.java b/BaseOkHttpX/src/main/java/com/kongzue/baseokhttp/x/interfaces/BeanResponseListener.java
@@ -8,7 +8,7 @@
 
 import java.lang.reflect.ParameterizedType;
 
-public abstract class BeanResponseListener<T> implements ResponseListener {
+public abstract class BeanResponseListener<T> extends ResponseListener {
 
     @Override
     public void response(BaseHttpRequest httpRequest, String response, Exception error) {
diff --git a/BaseOkHttpX/src/main/java/com/kongzue/baseokhttp/x/interfaces/BytesResponseInterceptListener.java b/BaseOkHttpX/src/main/java/com/kongzue/baseokhttp/x/interfaces/BytesResponseInterceptListener.java
@@ -0,0 +1,23 @@
+package com.kongzue.baseokhttp.x.interfaces;
+
+import com.kongzue.baseokhttp.x.util.BaseHttpRequest;
+
+import java.io.IOException;
+
+import okhttp3.ResponseBody;
+
+public abstract class BytesResponseInterceptListener implements BaseResponseInterceptListener {
+
+    @Override
+    @Deprecated
+    public boolean onIntercept(BaseHttpRequest httpRequest, ResponseBody response, Exception error) {
+        try {
+            byte[] result = response.bytes();
+            return onIntercept(httpRequest, result, error);
+        } catch (IOException e) {
+            return onIntercept(httpRequest, new byte[]{}, e);
+        }
+    }
+
+    public abstract boolean onIntercept(BaseHttpRequest httpRequest, byte[] response, Exception error);
+}
diff --git a/BaseOkHttpX/src/main/java/com/kongzue/baseokhttp/x/interfaces/BytesResponseListener.java b/BaseOkHttpX/src/main/java/com/kongzue/baseokhttp/x/interfaces/BytesResponseListener.java
@@ -0,0 +1,21 @@
+package com.kongzue.baseokhttp.x.interfaces;
+
+import com.kongzue.baseokhttp.x.util.BaseHttpRequest;
+
+import okhttp3.ResponseBody;
+
+public abstract class BytesResponseListener implements BaseResponseListener {
+
+    @Override
+    @Deprecated
+    public void response(BaseHttpRequest httpRequest, ResponseBody responseBody, Exception error) {
+        try {
+            byte[] data = responseBody.bytes();
+            response(httpRequest, data, error);
+        } catch (Exception e) {
+            response(httpRequest, new byte[]{}, e);
+        }
+    }
+
+    public abstract void response(BaseHttpRequest httpRequest, byte[] response, Exception error);
+}
diff --git a/BaseOkHttpX/src/main/java/com/kongzue/baseokhttp/x/interfaces/JsonResponseListener.java b/BaseOkHttpX/src/main/java/com/kongzue/baseokhttp/x/interfaces/JsonResponseListener.java
@@ -4,7 +4,7 @@
 import com.kongzue.baseokhttp.x.exceptions.DecodeJsonException;
 import com.kongzue.baseokhttp.x.util.BaseHttpRequest;
 
-public abstract class JsonResponseListener implements ResponseListener {
+public abstract class JsonResponseListener extends ResponseListener {
 
     @Override
     public void response(BaseHttpRequest httpRequest, String response, Exception error) {
diff --git a/BaseOkHttpX/src/main/java/com/kongzue/baseokhttp/x/interfaces/OpenAIAPIResponseListener.java b/BaseOkHttpX/src/main/java/com/kongzue/baseokhttp/x/interfaces/OpenAIAPIResponseListener.java
@@ -6,7 +6,7 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
-public class OpenAIAPIResponseListener implements ResponseListener {
+public class OpenAIAPIResponseListener extends ResponseListener {
 
     StringBuilder resultBuilder = new StringBuilder();
     boolean isFinish;
diff --git a/BaseOkHttpX/src/main/java/com/kongzue/baseokhttp/x/interfaces/ResponseInterceptListener.java b/BaseOkHttpX/src/main/java/com/kongzue/baseokhttp/x/interfaces/ResponseInterceptListener.java
@@ -2,7 +2,22 @@
 
 import com.kongzue.baseokhttp.x.util.BaseHttpRequest;
 
-public interface ResponseInterceptListener {
+import java.io.IOException;
 
-    boolean onIntercept(BaseHttpRequest httpRequest, String response, Exception error);
-}
+import okhttp3.ResponseBody;
+
+public abstract class ResponseInterceptListener implements BaseResponseInterceptListener {
+
+    @Override
+    @Deprecated
+    public boolean onIntercept(BaseHttpRequest httpRequest, ResponseBody response, Exception error) {
+        try {
+            String result = response.string();
+            return onIntercept(httpRequest, result, error);
+        } catch (IOException e) {
+            return onIntercept(httpRequest, "", e);
+        }
+    }
+
+    public abstract boolean onIntercept(BaseHttpRequest httpRequest, String response, Exception error);
+}
diff --git a/BaseOkHttpX/src/main/java/com/kongzue/baseokhttp/x/interfaces/ResponseListener.java b/BaseOkHttpX/src/main/java/com/kongzue/baseokhttp/x/interfaces/ResponseListener.java
@@ -2,7 +2,20 @@
 
 import com.kongzue.baseokhttp.x.util.BaseHttpRequest;
 
-public interface ResponseListener {
+import okhttp3.ResponseBody;
 
-    void response(BaseHttpRequest httpRequest, String response, Exception error);
+public abstract class ResponseListener implements BaseResponseListener  {
+
+    @Override
+    @Deprecated
+    public void response(BaseHttpRequest httpRequest, ResponseBody responseBody, Exception error) {
+        try {
+            String data = responseBody.string();
+            response(httpRequest, data, error);
+        } catch (Exception e) {
+            response(httpRequest, "", e);
+        }
+    }
+
+    public abstract void response(BaseHttpRequest httpRequest, String response, Exception error);
 }
diff --git a/BaseOkHttpX/src/main/java/com/kongzue/baseokhttp/x/util/BaseHttpRequest.java b/BaseOkHttpX/src/main/java/com/kongzue/baseokhttp/x/util/BaseHttpRequest.java
@@ -19,8 +19,8 @@
 import com.kongzue.baseokhttp.x.BaseOkHttpX;
 import com.kongzue.baseokhttp.x.exceptions.RequestException;
 import com.kongzue.baseokhttp.x.exceptions.TimeOutException;
+import com.kongzue.baseokhttp.x.interfaces.BaseResponseListener;
 import com.kongzue.baseokhttp.x.interfaces.DownloadListener;
-import com.kongzue.baseokhttp.x.interfaces.ResponseListener;
 import com.kongzue.baseokhttp.x.interfaces.UploadListener;
 
 import org.jetbrains.annotations.NotNull;
@@ -35,6 +35,7 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.Proxy;
+import java.nio.charset.StandardCharsets;
 import java.security.KeyStore;
 import java.security.SecureRandom;
 import java.security.cert.CertificateFactory;
@@ -82,7 +83,7 @@ public enum REQUEST_BODY_TYPE {
     protected REQUEST_BODY_TYPE requestBodyType;                //请求体类型
 
     protected String url;
-    protected List<ResponseListener> callbacks = new ArrayList<>();
+    protected List<BaseResponseListener> callbacks = new ArrayList<>();
     protected Proxy proxy;
     protected OkHttpClient okHttpClient;
     protected long timeoutDuration = BaseOkHttpX.globalTimeOutDuration;     //请求超时（秒）
@@ -104,7 +105,7 @@ public enum REQUEST_BODY_TYPE {
 
     protected boolean requesting;
 
-    public void go(ResponseListener callback) {
+    public void go(BaseResponseListener callback) {
         registerCallback(callback);
         go();
     }
@@ -169,7 +170,6 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO
                         try (ResponseBody responseBody = response.body();
                              BufferedReader reader = new BufferedReader(
                                      new InputStreamReader(responseBody.byteStream()))) {
-
                             if (isShowLogs()) {
                                 LockLog.Builder logBuilder = LockLog.Builder.create()
                                         .i("<<<", "-------------------------------------")
@@ -182,7 +182,7 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO
                             }
                             String line;
                             while ((line = reader.readLine()) != null) {
-                                onStream(line);
+                                onStream(line,responseBody.contentType());
                             }
                             if (isShowLogs()) {
                                 LockLog.logI("<<<", "=====================================");
@@ -207,30 +207,31 @@ private String formatParameterStr() {
         }
     }
 
-    private void onStream(String line) {
+    private void onStream(String line, MediaType mediaType) {
         deleteRequestInfo(requestInfo);
         if (isShowLogs()) {
             LockLog.logI("<<<", line);
         }
+        ResponseBody responseBody = ResponseBody.create(line.getBytes(), mediaType);
         if (callbackInMainLooper) {
             Looper mainLooper = Looper.getMainLooper();
             handler = new Handler(mainLooper);
             handler.post(new Runnable() {
                 @Override
                 public void run() {
-                    callCallbacks(line, null);
+                    callCallbacks(responseBody, null);
                 }
             });
         } else {
             if (handler != null) {
                 handler.post(new Runnable() {
                     @Override
                     public void run() {
-                        callCallbacks(line, null);
+                        callCallbacks(responseBody, null);
                     }
                 });
             } else {
-                callCallbacks(line, null);
+                callCallbacks(responseBody, null);
             }
         }
     }
@@ -240,7 +241,11 @@ private void onFinish(Response response) {
         try {
             if (downloadFile == null) {
                 ResponseBody body = response.body();
-                String result = body == null ? "" : body.string();
+                byte[] responseBytes = body.bytes();
+                MediaType mediaType = body.contentType();
+                String charset = mediaType.charset(StandardCharsets.UTF_8).name();
+                String result = new String(responseBytes, charset);
+                ResponseBody resultBody = ResponseBody.create(responseBytes, mediaType);
 
                 if (isShowLogs()) {
                     LockLog.Builder logBuilder = LockLog.Builder.create()
@@ -267,19 +272,19 @@ private void onFinish(Response response) {
                     handler.post(new Runnable() {
                         @Override
                         public void run() {
-                            callCallbacks(result, null);
+                            callCallbacks(resultBody, null);
                         }
                     });
                 } else {
                     if (handler != null) {
                         handler.post(new Runnable() {
                             @Override
                             public void run() {
-                                callCallbacks(result, null);
+                                callCallbacks(resultBody, null);
                             }
                         });
                     } else {
-                        callCallbacks(result, null);
+                        callCallbacks(resultBody, null);
                     }
                 }
             } else {
@@ -304,12 +309,12 @@ public void run() {
         }
     }
 
-    private void callCallbacks(String result, Exception e) {
+    private void callCallbacks(ResponseBody result, Exception e) {
         if (BaseOkHttpX.responseInterceptListener != null &&
                 BaseOkHttpX.responseInterceptListener.onIntercept(BaseHttpRequest.this, result, e)) {
             return;
         }
-        for (ResponseListener callback : callbacks) {
+        for (BaseResponseListener callback : callbacks) {
             callback.response(BaseHttpRequest.this, result, e);
         }
     }
@@ -805,25 +810,25 @@ public void cancel() {
         }
     }
 
-    public BaseHttpRequest registerCallback(ResponseListener callback) {
+    public BaseHttpRequest registerCallback(BaseResponseListener callback) {
         callbacks.add(callback);
         return this;
     }
 
-    public BaseHttpRequest setCallback(ResponseListener callback) {
+    public BaseHttpRequest setCallback(BaseResponseListener callback) {
         return registerCallback(callback);
     }
 
-    public BaseHttpRequest addCallback(ResponseListener callback) {
+    public BaseHttpRequest addCallback(BaseResponseListener callback) {
         return registerCallback(callback);
     }
 
-    public BaseHttpRequest unregisterCallback(ResponseListener callback) {
+    public BaseHttpRequest unregisterCallback(BaseResponseListener callback) {
         callbacks.remove(callback);
         return this;
     }
 
-    public BaseHttpRequest removeCallback(ResponseListener callback) {
+    public BaseHttpRequest removeCallback(BaseResponseListener callback) {
         return unregisterCallback(callback);
     }
 
@@ -832,7 +837,7 @@ public BaseHttpRequest removeAllCallbacks() {
         return this;
     }
 
-    public List<ResponseListener> getCallbacks() {
+    public List<BaseResponseListener> getCallbacks() {
         return callbacks;
     }
 
diff --git a/BaseOkHttpX/src/main/java/com/kongzue/baseokhttp/x/util/RequestInfo.java b/BaseOkHttpX/src/main/java/com/kongzue/baseokhttp/x/util/RequestInfo.java
@@ -1,8 +1,5 @@
 package com.kongzue.baseokhttp.x.util;
 
-import android.util.Log;
-
-import com.kongzue.baseokhttp.x.BaseOkHttpX;
 import com.kongzue.baseokhttp.x.interfaces.ResponseListener;
 
 import java.util.ArrayList;
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.kongzue.baseokhttpx.demo"
         minSdk 21
         targetSdk 31
-        versionCode 2
-        versionName "1.1.0"
+        versionCode 3
+        versionName "1.2.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/java/com/kongzue/baseokhttpx/demo/MainActivity.java b/app/src/main/java/com/kongzue/baseokhttpx/demo/MainActivity.java
@@ -6,7 +6,6 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.View;
 
 import androidx.appcompat.app.AppCompatActivity;
@@ -19,11 +18,8 @@
 import com.kongzue.baseokhttp.x.interfaces.DownloadListener;
 import com.kongzue.baseokhttp.x.interfaces.JsonResponseListener;
 import com.kongzue.baseokhttp.x.interfaces.OpenAIAPIResponseListener;
-import com.kongzue.baseokhttp.x.interfaces.ParameterInterceptListener;
-import com.kongzue.baseokhttp.x.interfaces.UploadListener;
 import com.kongzue.baseokhttp.x.util.BaseHttpRequest;
 import com.kongzue.baseokhttp.x.util.LockLog;
-import com.kongzue.baseokhttp.x.util.Parameter;
 import com.kongzue.baseokhttpx.demo.databinding.ActivityMainBinding;
 
 import java.io.File;
