新增保持代码

Author: FlyJingFish

android-aop-annotation/src/main/java/com/flyjingfish/android_aop_annotation/AndroidAopJoinPoint.java

@@ -300,11 +300,17 @@ private void getTargetMethod(){
             try {
                 originalMethod = tClass.getDeclaredMethod(originalMethodName, classes);
             } catch (NoSuchMethodException exc) {
-                String realMethodName = getRealMethodName(originalMethodName);
-                if (realMethodName == null){
+//                String realMethodName = getRealMethodName(originalMethodName);
+//                if (realMethodName == null){
+//                    throw new RuntimeException(exc);
+//                }
+//                originalMethod = tClass.getDeclaredMethod(realMethodName, classes);
+                System.out.println("=======>"+originalMethodName);
+                originalMethod = Utils.INSTANCE.findMethodWithKeepName(tClass,originalMethodName,classes);
+                if (originalMethod == null){
                     throw new RuntimeException(exc);
                 }
-                originalMethod = tClass.getDeclaredMethod(realMethodName, classes);
+                System.out.println("=======>"+originalMethodName+"<==Success="+originalMethod.getName());
             }
             targetMethod.setAccessible(true);
             originalMethod.setAccessible(true);

android-aop-annotation/src/main/java/com/flyjingfish/android_aop_annotation/aop_anno/AopKeep.kt

@@ -1,7 +1,7 @@
 package com.flyjingfish.android_aop_annotation.aop_anno
 
 
-@Retention(AnnotationRetention.BINARY)
+@Retention(AnnotationRetention.RUNTIME)
 @Target(
     AnnotationTarget.TYPE,
     AnnotationTarget.ANNOTATION_CLASS,
@@ -11,4 +11,4 @@ package com.flyjingfish.android_aop_annotation.aop_anno
     AnnotationTarget.PROPERTY_GETTER,
     AnnotationTarget.FIELD
 )
-annotation class AopKeep
+annotation class AopKeep(val keepName: String = "")

android-aop-annotation/src/main/java/com/flyjingfish/android_aop_annotation/utils/Utils.kt

@@ -2,6 +2,7 @@ package com.flyjingfish.android_aop_annotation.utils
 
 import com.flyjingfish.android_aop_annotation.AndroidAopJoinPoint
 import com.flyjingfish.android_aop_annotation.ProceedReturn
+import com.flyjingfish.android_aop_annotation.aop_anno.AopKeep
 import com.flyjingfish.android_aop_annotation.base.OnBaseSuspendReturnListener
 import com.flyjingfish.android_aop_annotation.base.OnSuspendReturnListener
 import com.flyjingfish.android_aop_annotation.base.OnSuspendReturnListener2
@@ -154,4 +155,22 @@ internal object Utils {
         val matcher: Matcher = InvokeStaticClassPattern.matcher(className)
         return matcher.find()
     }
+
+    fun findMethodWithKeepName(
+        clazz: Class<*>,
+        keepName: String,
+        parameterTypes: Array<Class<*>>
+    ): Method? {
+        return clazz.declaredMethods.firstOrNull { method ->
+            // 1. 参数列表必须完全匹配
+            if (!method.parameterTypes.contentEquals(parameterTypes)) {
+                return@firstOrNull false
+            }
+            // 2. 注解必须存在并且 keepName 一致
+            val annotation = method.getAnnotation(AopKeep::class.java)
+            annotation?.keepName == keepName
+        }
+    }
+
+
 }

android-aop-plugin/src/main/kotlin/com/flyjingfish/android_aop_plugin/scanner_visitor/WovenIntoCode.kt

@@ -38,6 +38,7 @@ import javassist.bytecode.AnnotationsAttribute
 import javassist.bytecode.AttributeInfo
 import javassist.bytecode.ConstPool
 import javassist.bytecode.annotation.Annotation
+import javassist.bytecode.annotation.StringMemberValue
 import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
@@ -954,6 +955,14 @@ object WovenIntoCode {
         val ctMethodNoneHasKeep = annotationsAttribute.getAnnotation(KEEP_CLASS) == null
         if (ctMethodNoneHasKeep){
             val annotation = Annotation(KEEP_CLASS, constPool)
+
+            // 给注解添加参数 keepName = 方法名
+            val methodName = this.name
+            annotation.addMemberValue(
+                "keepName",
+                StringMemberValue(methodName, constPool)
+            )
+
             annotationsAttribute.addAnnotation(annotation)
             if (visibleTagAttribute == null){
                 methodInfo.addAttribute(annotationsAttribute)