修复替换切面也替换super和构造方法的问题

FlyJingFish · Nov 18, 2024 · e4e2124 · e4e2124
1 parent 3ad4c76
commit e4e2124
Show file tree

Hide file tree

Showing 6 changed files with 84 additions and 2 deletions.
diff --git a/...n/kotlin/com/flyjingfish/android_aop_plugin/scanner_visitor/MethodReplaceInvokeAdapter.kt b/...n/kotlin/com/flyjingfish/android_aop_plugin/scanner_visitor/MethodReplaceInvokeAdapter.kt
@@ -62,6 +62,8 @@ class MethodReplaceInvokeAdapter(private val className:String,private val superN
         descriptor: String,
         isInterface: Boolean
     ) {
+        val isInMethodInner = opcode == Opcodes.INVOKESPECIAL && owner == superName  && name == methodName && descriptor == methodDesc
+
         var replaceMethodInfo = getReplaceInfo(owner, name, "")
         var isReplaceClass = replaceMethodInfo != null && replaceMethodInfo.replaceType == ReplaceMethodInfo.ReplaceType.NEW && replaceMethodInfo.newClassName.isNotEmpty()
         if (!isReplaceClass){
@@ -91,10 +93,16 @@ class MethodReplaceInvokeAdapter(private val className:String,private val superN
             } else {
                 descriptor.replace("(", "(L${replaceMethodInfo.oldOwner};") == replaceMethodInfo.newMethodDesc || descriptor.replace("(", "(Ljava/lang/Object;") == replaceMethodInfo.newMethodDesc
             }
-            if (shouldReplace) {
+            if (shouldReplace && !isInMethodInner) {
+                val isThisInit = owner == className && methodName == "<init>" && methodName == name
+                val isInitAop = replaceMethodInfo.replaceType == ReplaceMethodInfo.ReplaceType.INIT
+                if (isInitAop && isThisInit){
+                    super.visitMethodInsn(opcode, owner, name, descriptor, isInterface)
+                    return
+                }
                 if (replaceMethodInfo.replaceType == ReplaceMethodInfo.ReplaceType.NEW && replaceMethodInfo.isCallNew()) {
                     super.visitMethodInsn(opcode, replaceMethodInfo.newClassName, name, descriptor, isInterface)
-                }else if (replaceMethodInfo.replaceType == ReplaceMethodInfo.ReplaceType.INIT) {
+                }else if (isInitAop) {
                     super.visitMethodInsn(opcode, owner, name, descriptor, isInterface)
                 }
                 InitConfig.addReplaceMethodInfo(replaceMethodInfo)

diff --git a/app/src/main/java/com/flyjingfish/androidaop/MainActivity.kt b/app/src/main/java/com/flyjingfish/androidaop/MainActivity.kt
@@ -27,6 +27,7 @@ import com.flyjingfish.androidaop.test2.StaticClass
 import com.flyjingfish.androidaop.test.TestBean
 import com.flyjingfish.test_lib.mycut.TestParams
 import com.flyjingfish.androidaop.test.TestReplace
+import com.flyjingfish.androidaop.testReplace.BaseBean
 import com.flyjingfish.test_lib.BaseActivity
 import com.flyjingfish.test_lib.annotation.MyAnno3
 import com.flyjingfish.test_lib.PermissionRejectListener
@@ -76,6 +77,8 @@ class MainActivity: BaseActivity2(), PermissionRejectListener{
             }
 
         })
+        val bbean = BaseBean(0,0)
+        bbean.test()
 //        binding.btnIOThread.setOnClickListener {
 //            onIOThread()
 //        }

diff --git a/app/src/main/java/com/flyjingfish/androidaop/testReplace/BaseBean.java b/app/src/main/java/com/flyjingfish/androidaop/testReplace/BaseBean.java
@@ -0,0 +1,19 @@
+package com.flyjingfish.androidaop.testReplace;
+
+public class BaseBean {
+    int num1;
+    int num2;
+
+    public BaseBean(int num1, int num2) {
+        this.num1 = num1;
+        this.num2 = num2;
+    }
+
+    public BaseBean(int num1) {
+        this(num1,0);
+    }
+
+    public void test(){
+
+    }
+}
diff --git a/app/src/main/java/com/flyjingfish/androidaop/testReplace/BeanH.java b/app/src/main/java/com/flyjingfish/androidaop/testReplace/BeanH.java
@@ -0,0 +1,12 @@
+package com.flyjingfish.androidaop.testReplace;
+
+public class BeanH extends BaseBean{
+    public BeanH(int num1, int num2) {
+        super(num1, num2);
+    }
+
+    @Override
+    public void test() {
+        super.test();
+    }
+}
diff --git a/app/src/main/java/com/flyjingfish/androidaop/testReplace/ReplaceBaseBean.kt b/app/src/main/java/com/flyjingfish/androidaop/testReplace/ReplaceBaseBean.kt
@@ -0,0 +1,19 @@
+package com.flyjingfish.androidaop.testReplace
+
+import com.flyjingfish.android_aop_annotation.anno.AndroidAopReplaceClass
+import com.flyjingfish.android_aop_annotation.anno.AndroidAopReplaceMethod
+
+//@AndroidAopReplaceClass("com.flyjingfish.androidaop.testReplace.BaseBean")
+object ReplaceBaseBean {
+    @AndroidAopReplaceMethod("<init>(int,int)")
+    @JvmStatic
+    fun getBaseBean(testBean: BaseBean) : BaseBean {
+        return testBean
+    }
+
+    @AndroidAopReplaceMethod("void test()")
+    @JvmStatic
+    fun test(testBean: BaseBean){
+        testBean.test()
+    }
+}
diff --git a/app/src/main/java/com/flyjingfish/androidaop/testReplace/ReplaceBaseBean2.java b/app/src/main/java/com/flyjingfish/androidaop/testReplace/ReplaceBaseBean2.java
@@ -0,0 +1,21 @@
+package com.flyjingfish.androidaop.testReplace;
+
+import android.util.Log;
+
+import com.flyjingfish.android_aop_annotation.anno.AndroidAopReplaceClass;
+import com.flyjingfish.android_aop_annotation.anno.AndroidAopReplaceMethod;
+
+@AndroidAopReplaceClass("com.flyjingfish.androidaop.testReplace.BaseBean")
+public class ReplaceBaseBean2 {
+    @AndroidAopReplaceMethod("<init>(int,int)")
+    public static BaseBean getBaseBean(BaseBean testBean)  {
+        Log.e("ReplaceBaseBean2","getBaseBean");
+        return testBean;
+    }
+
+    @AndroidAopReplaceMethod("void test()")
+    public static void test(BaseBean testBean){
+        Log.e("ReplaceBaseBean2","test");
+        testBean.test();
+    }
+}