优化 OnResBean 与 OnResList 便捷回调调用机制，修复其在 Android 上调用失败的问题：troyzhxu#61

troyzhxu · troyzhxu · commit 4714e6ae522f · 2022-05-05T14:28:08.000+08:00
diff --git a/okhttps/src/main/java/com/ejlchina/okhttps/AHttpTask.java b/okhttps/src/main/java/com/ejlchina/okhttps/AHttpTask.java
@@ -4,20 +4,19 @@
 import com.ejlchina.data.Mapper;
 import com.ejlchina.data.TypeRef;
 import com.ejlchina.okhttps.HttpResult.State;
-import com.ejlchina.okhttps.internal.*;
+import com.ejlchina.okhttps.internal.AbstractHttpClient;
+import com.ejlchina.okhttps.internal.CopyInterceptor;
+import com.ejlchina.okhttps.internal.RealHttpResult;
 import okhttp3.Call;
 import okhttp3.Callback;
 import okhttp3.Response;
 
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.function.Consumer;
 
-
 /**
  * &#24322;&#27493; Http &#35831;&#27714;&#20219;&#21153;
  *  
@@ -431,14 +430,15 @@ interface ResponseCallback {
 		void on(Runnable runnable, boolean onIo);
 	}
 
+	@SuppressWarnings("unchecked")
     private synchronized Consumer<HttpResult> complexOnResponse(OkHttpCall call) {
 		return res -> {
 			Consumer<HttpResult> onResp = onResponse;
 			Consumer<HttpResult.Body> onBody = onResBody;
 			Consumer<Mapper> onMapper = onResMapper;
 			Consumer<Array> onArray = onResArray;
-			Consumer<?> onBean = onResBean;
-			Consumer<?> onList = onResList;
+			Consumer<Object> onBean = (Consumer<Object>) onResBean;
+			Consumer<Object> onList = (Consumer<Object>) onResList;
 			Consumer<String> onString = onResString;
 
 			int count = 0;
@@ -494,23 +494,11 @@ public void run() {
 			}
 			if (onBean != null) {
 				Object bean = body.toBean(beanType);
-				callback.on(() -> {
-					try {
-						callbackMethod(onBean.getClass(), bean.getClass()).invoke(onBean, bean);
-					} catch (IllegalAccessException | InvocationTargetException e) {
-						throw new OkHttpsException("&#22238;&#35843;&#26041;&#27861;&#35843;&#29992;&#22833;&#36133;&#65281;", e);
-					}
-				}, resBeanOnIO);
+				callback.on(() -> onBean.accept(bean), resBeanOnIO);
 			}
 			if (onList != null) {
 				List<?> list = body.toList(listType);
-				callback.on(() -> {
-					try {
-						callbackMethod(onList.getClass(), list.getClass()).invoke(onList, list);
-					} catch (IllegalAccessException | InvocationTargetException e) {
-						throw new OkHttpsException("&#22238;&#35843;&#26041;&#27861;&#35843;&#29992;&#22833;&#36133;&#65281;", e);
-					}
-				}, resListOnIO);
+				callback.on(() -> onList.accept(list), resListOnIO);
 			}
 			if (onString != null) {
 				String string = body.toString();
@@ -519,21 +507,6 @@ public void run() {
 		};
 	}
 
-	static final String OnCallbackMethod = Consumer.class.getDeclaredMethods()[0].getName();
-
-	private Method callbackMethod(Class<?> clazz, Class<?> paraType) {
-		Method[] methods = clazz.getDeclaredMethods();
-		for (Method method : methods) {
-			Class<?>[] paraTypes = method.getParameterTypes();
-			if (method.getName().equals(OnCallbackMethod) && paraTypes.length == 1
-					&& paraTypes[0].isAssignableFrom(paraType)) {
-				method.setAccessible(true);
-				return method;
-			}
-		}
-		throw new IllegalStateException("&#27809;&#26377;&#21487;&#35843;&#29992;&#30340;&#26041;&#27861;");
-	}
-	
     private void initBeanType(Type type) {
     	if (type == null) {
     		throw new IllegalArgumentException(" bean type can not be null!");
