修复 Gson 解析泛型失败的问题

Author: 880634

README.md

@@ -7,7 +7,7 @@
 #### Gradle 集成
 
     dependencies {
-        implementation 'com.hjq:http:3.0'
+        implementation 'com.hjq:http:3.2'
 	    implementation 'com.squareup.okhttp3:okhttp:3.12.1'
 	    implementation 'com.google.code.gson:gson:2.8.5'
     }

app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "com.hjq.http.demo"
         minSdkVersion 14
         targetSdkVersion 28
-        versionCode 30
-        versionName "3.0"
+        versionCode 32
+        versionName "3.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

app/src/main/java/com/hjq/http/demo/MainActivity.java

@@ -125,7 +125,7 @@ public void onFail(Exception e) {
 
                             @Override
                             public void onSucceed(HttpData<SearchBean> result) {
-                                ToastUtils.show("请求成功");
+                                ToastUtils.show("请求成功" + result.getData().getSize());
                             }
 
                             @Override

app/src/main/java/com/hjq/http/demo/http/model/RequestHandler.java

@@ -87,7 +87,7 @@ public void requestEnd(Context context, Call call) {
     }
 
     @Override
-    public Object requestSucceed(Context context, Response response, Class clazz) throws Exception {
+    public Object requestSucceed(Context context, Response response, Type type) throws Exception {
         if (!response.isSuccessful()) {
             // 返回响应异常
             throw new ResponseException(context.getString(R.string.http_server_error), response);
@@ -98,11 +98,11 @@ public Object requestSucceed(Context context, Response response, Class clazz) th
             return null;
         }
 
-        if (Response.class.equals(clazz)) {
+        if (Response.class.equals(type)) {
             return response;
         }
 
-        if (Bitmap.class.equals(clazz)) {
+        if (Bitmap.class.equals(type)) {
             // 如果这是一个 Bitmap 对象
             return BitmapFactory.decodeStream(body.byteStream());
         }
@@ -119,17 +119,17 @@ public Object requestSucceed(Context context, Response response, Class clazz) th
         EasyLog.json(text);
 
         final Object result;
-        if (String.class.equals(clazz)) {
+        if (String.class.equals(type)) {
             // 如果这是一个 String 对象
             result = text;
-        } else if (JSONObject.class.equals(clazz)) {
+        } else if (JSONObject.class.equals(type)) {
             try {
                 // 如果这是一个 JSONObject 对象
                 result = new JSONObject(text);
             } catch (JSONException e) {
                 throw new DataException(context.getString(R.string.http_data_explain_error), e);
             }
-        } else if (JSONArray.class.equals(clazz)) {
+        } else if (JSONArray.class.equals(type)) {
             try {
                 // 如果这是一个 JSONArray 对象
                 result = new JSONArray(text);
@@ -139,7 +139,7 @@ public Object requestSucceed(Context context, Response response, Class clazz) th
         } else {
 
             try {
-                result = GSON.fromJson(text, clazz);
+                result = GSON.fromJson(text, type);
             } catch (JsonSyntaxException e) {
                 // 返回结果读取异常
                 throw new DataException(context.getString(R.string.http_data_explain_error), e);

library/build.gradle

@@ -8,8 +8,8 @@ android {
     defaultConfig {
         minSdkVersion 11
         targetSdkVersion 26
-        versionCode 30
-        versionName "3.0"
+        versionCode 32
+        versionName "3.2"
     }
 }
 
@@ -22,7 +22,7 @@ publish {
     userOrg = 'getactivity'//填写bintray用户名，注意大小写
     groupId = 'com.hjq'//定义的maven group id最终引用形式
     artifactId = 'http'//maven的artifact id
-    version = '3.0'//maven 上发布版本号
+    version = '3.'//maven 上发布版本号
     description = 'Easy-to-use network request framework'//描述，自己定义
     website = "https://github.com/getActivity/EasyHttp"//项目在github中的地址
 }

library/src/main/java/com/hjq/http/callback/DefaultCallback.java

@@ -42,19 +42,7 @@ protected void onResponse(Response response) throws Exception {
             type = ((ParameterizedType) mListener.getClass().getGenericSuperclass()).getActualTypeArguments()[0];
         }
 
-        Class clazz;
-        if (type instanceof Class) {
-            // 如果这个是简单的 Class（String、JSONObject、JSONArray）
-            clazz = (Class) type;
-        } else if (type instanceof ParameterizedType) {
-            // 如果这个是复杂的 Class（HttpData<Bean>）
-            clazz = (Class) ((ParameterizedType) type).getRawType();
-        } else {
-            // 如果这个是其他类型 Class，就直接用 Void 代替
-            clazz = Void.TYPE;
-        }
-
-        final Object result = EasyConfig.getInstance().getHandler().requestSucceed(mContext, response, clazz);
+        final Object result = EasyConfig.getInstance().getHandler().requestSucceed(mContext, response, type);
         EasyUtils.runOnUiThread(mListener != null, new Runnable() {
 
             @SuppressWarnings("unchecked")

library/src/main/java/com/hjq/http/config/IRequestHandler.java

@@ -2,6 +2,8 @@
 
 import android.content.Context;
 
+import java.lang.reflect.Type;
+
 import okhttp3.Call;
 import okhttp3.Response;
 
@@ -34,11 +36,11 @@ public interface IRequestHandler {
      *
      * @param context           上下文对象
      * @param response          响应对象
-     * @param clazz             解析类型
+     * @param type              解析类型
      * @return                  返回结果
      * @throws Exception        回调失败方法
      */
-    Object requestSucceed(Context context, Response response, Class clazz) throws Exception;
+    Object requestSucceed(Context context, Response response, Type type) throws Exception;
 
     /**
      * 请求失败