调整EasyReflect代理逻辑

Author: yjfnypeu

docs/MVP.md

@@ -1,2 +1,5 @@
 # MVP
 
+### 写在前面
+
+MVP本身只是种编程分层架构思想，

utils/src/main/java/com/haoge/easyandroid/easy/EasyFormatter.kt

@@ -1,7 +1,6 @@
 package com.haoge.easyandroid.easy
 
 import android.util.Log
-import com.haoge.easyandroid.tools.CommonUtil
 import org.json.JSONArray
 import org.json.JSONObject
 import java.lang.reflect.Modifier
@@ -240,10 +239,7 @@ class EasyFormatter private constructor(private val builder: Builder) {
                 field.isAccessible = true
             }
 
-            val value = field.get(any)
-            if (CommonUtil.isEmpty(value)) {
-                continue
-            }
+            val value = field.get(any) ?: continue
 
             container[field.name] = value
         }

utils/src/main/java/com/haoge/easyandroid/easy/EasyReflect.kt

@@ -167,26 +167,25 @@ class EasyReflect private constructor(val clazz: Class<*>, var instance:Any?){
         @Suppress("UNCHECKED_CAST")
         return Proxy.newProxyInstance(proxy.classLoader, arrayOf(proxy), {_, method, args ->
             try {
-                return@newProxyInstance this@EasyReflect.call(method.name, *args)
+                // 优先匹配存在的方法
+                return@newProxyInstance this@EasyReflect.callWithReturn(method.name, *args).get()
             } catch (e:Exception) {
-                val methodName = method.name
-                if (methodName.startsWith("get")) {
-                    val name = methodName.substring(3,4).toLowerCase() + methodName.substring(4)
-                    // 当方法名为getter方法，读取成员变量字段或者读取map中对应key值
-                    try {
-                        val result = if (instance is Map<*, *>) {
-                            (instance as Map<String, *>)[name]
-                        } else {
-                            getFieldValue(name)
-                        }
-                        if (method.returnType.isInstance(result)) {
-                            return@newProxyInstance result
-                        }
-                    } catch (e:Exception) {
-                        // ignore, GO ON!
+                try {
+                    val methodName = method.name
+                    if (methodName == "get" && args.size == 1 && args[0] is String) {
+                        return@newProxyInstance getFieldValue(args[0] as String)
+                    } else if (methodName == "set" && args.size == 2 && args[0] is String) {
+                        setField(args[0] as String, args[1])
+                    } else if (methodName.startsWith("get") && method.returnType != Void::class.java) {
+                        val name = methodName.substring(3,4).toLowerCase() + methodName.substring(4)
+                        return@newProxyInstance getFieldValue(name)
+                    } else if (methodName.startsWith("set") && args.size == 1) {
+                        val name = methodName.substring(3,4).toLowerCase() + methodName.substring(4)
+                        setField(name, args[0])
                     }
+                } catch (e:Exception) {
+                    // ignore
                 }
-
                 return@newProxyInstance when (method.returnType.name) {
                     "int", "byte", "char", "long", "double", "float", "short" -> 0
                     "boolean" -> false

utils/src/main/java/com/haoge/easyandroid/tools/CommonUtil.kt

@@ -16,8 +16,7 @@
  */
 @RunWith(JUnit4.class)
 public class EasyReflectTest {
-
-    EasyReflect reflect;
+    private EasyReflect reflect;
 
     @Before
     public void setUp() {
@@ -107,6 +106,30 @@ public void fields() {
         assertEquals(reflect.getFieldValue("name"), "new_name");
     }
 
+    @Test
+    public void proxy() {
+        ReflectProxy proxy = reflect.proxy(ReflectProxy.class);
+        // 通过代理的同名方法进行调用
+        assertEquals("Hello", proxy.getMessage("Hello"));
+        proxy.varargsParams("Hello", "World");
+
+        // 通过getXXX/setXXX对指定字段进行赋值与读取
+        proxy.setName("EasyReflect");
+        assertEquals("EasyReflect", proxy.getName());
+
+        // 通过set/get方法对指定字段进行读取与赋值
+        proxy.set("TAG", "NewValue");
+        assertEquals("NewValue", proxy.get("TAG"));
+    }
+}
+
+interface ReflectProxy {
+    String getMessage(String message);// 代理到TestReflectClass.getMessage方法
+    void varargsParams(String ... args);// 代理到TestReflectClass.varargsParams方法
+    String getName();// 读取TestReflectClass.name字段的实例
+    void setName(String name);// 为TestReflectClass.name进行赋值
+    Object get(String name);// 获取TestReflectClass指定name的字段
+    void set(String name, Object value);// 获取TestReflectClass指定name的字段
 }
 
 class TestReflectClass {