1.2.5

- 修复网络请求异常时可能引发的空指针异常问题；

Author: kongzue

BaseOkHttpX/build.gradle

@@ -7,7 +7,7 @@ android {
     defaultConfig {
         minSdk 21
         versionCode 7
-        versionName "1.2.4"
+        versionName "1.2.5"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -23,7 +23,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    compileOnly 'com.github.kongzue:BaseJson:1.2.9.6+'
+    compileOnly 'com.github.kongzue:BaseJson:1.2.8+'
     compileOnly 'com.squareup.okhttp3:okhttp:4.9.1+'
     compileOnly 'androidx.appcompat:appcompat:1.3.0'
 }

BaseOkHttpX/src/main/java/com/kongzue/baseokhttp/x/interfaces/BitmapResponseListener.java

@@ -17,6 +17,10 @@ public abstract class BitmapResponseListener implements BaseResponseListener {
     @Override
     @Deprecated
     public void response(BaseHttpRequest httpRequest, ResponseBody responseBody, Exception error) {
+        if (error != null) {
+            response(httpRequest, Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888), error);
+            return;
+        }
         try {
             InputStream inputStream = responseBody.byteStream();
             response(httpRequest, BitmapFactory.decodeStream(inputStream), error);

BaseOkHttpX/src/main/java/com/kongzue/baseokhttp/x/interfaces/BytesResponseListener.java

@@ -1,5 +1,7 @@
 package com.kongzue.baseokhttp.x.interfaces;
 
+import android.graphics.Bitmap;
+
 import com.kongzue.baseokhttp.x.util.BaseHttpRequest;
 
 import okhttp3.ResponseBody;
@@ -12,6 +14,10 @@ public abstract class BytesResponseListener implements BaseResponseListener {
     @Override
     @Deprecated
     public void response(BaseHttpRequest httpRequest, ResponseBody responseBody, Exception error) {
+        if (error != null) {
+            response(httpRequest, new byte[0], error);
+            return;
+        }
         try {
             byte[] data = responseBody.bytes();
             response(httpRequest, data, error);

BaseOkHttpX/src/main/java/com/kongzue/baseokhttp/x/interfaces/ResponseListener.java

@@ -1,5 +1,7 @@
 package com.kongzue.baseokhttp.x.interfaces;
 
+import android.graphics.Bitmap;
+
 import com.kongzue.baseokhttp.x.util.BaseHttpRequest;
 
 import okhttp3.ResponseBody;
@@ -12,6 +14,10 @@ public abstract class ResponseListener implements BaseResponseListener  {
     @Override
     @Deprecated
     public void response(BaseHttpRequest httpRequest, ResponseBody responseBody, Exception error) {
+        if (error != null) {
+            response(httpRequest, "", error);
+            return;
+        }
         try {
             String data = responseBody.string();
             response(httpRequest, data, error);

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

@@ -182,7 +182,7 @@ public void go() {
         requestInfo = new RequestInfo(url, getRequestParameter());
         if (BaseOkHttpX.disallowSameRequest && equalsRequestInfo(requestInfo) != null) {
             LockLog.logE(TAG_RETURN, "拦截重复请求:" + requestInfo);
-            onFail(new SameRequestException( requestInfo));
+            onFail(new SameRequestException(requestInfo));
             return;
         }
         addRequestInfo(requestInfo);
@@ -366,14 +366,12 @@ public void run() {
     }
 
     private void callCallbacks() {
-        ResponseBody interceptRequestBody = ResponseBody.create(responseBytes, responseMediaType);
         if (BaseOkHttpX.responseInterceptListener != null &&
-                BaseOkHttpX.responseInterceptListener.onIntercept(BaseHttpRequest.this, interceptRequestBody, responseException)) {
+                BaseOkHttpX.responseInterceptListener.onIntercept(BaseHttpRequest.this, (responseBytes == null || responseMediaType == null) ? null : ResponseBody.create(responseBytes, responseMediaType), responseException)) {
             return;
         }
         for (BaseResponseListener callback : callbacks) {
-            ResponseBody result = ResponseBody.create(responseBytes, responseMediaType);
-            callback.response(BaseHttpRequest.this, result, responseException);
+            callback.response(BaseHttpRequest.this, (responseBytes == null || responseMediaType == null) ? null :ResponseBody.create(responseBytes, responseMediaType), responseException);
         }
     }
 
@@ -1081,7 +1079,6 @@ public void cancel() {
 
     /**
      * 重新发起请求。
-     *
      */
     public void retry() {
         cancel();

app/build.gradle

@@ -9,7 +9,7 @@ android {
         minSdk 21
         targetSdk 31
         versionCode 7
-        versionName "1.2.4"
+        versionName "1.2.5"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/com/kongzue/baseokhttpx/demo/MainActivity.java

@@ -45,8 +45,13 @@ protected void onCreate(Bundle savedInstanceState) {
         binding = ActivityMainBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
 
+        // 设置总服务器地址
         BaseOkHttpX.serviceUrl = "https://api.apiopen.top/";
-        BaseOkHttpX.reserveServiceUrls = new String[]{"https://api.apiopen2.top/", "https://api.apiopen3.top/", "https://api.apiopen4.top/"};
+
+        // 容灾地址测试
+        //BaseOkHttpX.reserveServiceUrls = new String[]{"https://api.apiopen2.top/", "https://api.apiopen3.top/", "https://api.apiopen4.top/"};
+
+        // 全局参数测试
         //BaseOkHttpX.globalParameter = new Parameter().add("t1", "v1");
 
         // 日志拦截器测试