1、修复多个app模块织入配置混乱的问题

FlyJingFish · FlyJingFish · commit db830cbe8a26 · 2025-10-17T13:47:56.000+08:00
diff --git a/android-aop-annotation/src/main/java/com/flyjingfish/android_aop_annotation/AndroidAopJoinPoint.java b/android-aop-annotation/src/main/java/com/flyjingfish/android_aop_annotation/AndroidAopJoinPoint.java
@@ -299,15 +299,11 @@ private void getTargetMethod(){
             try {
                 targetMethod = tClass.getDeclaredMethod(targetMethodName, classes);
             } catch (NoSuchMethodException exc) {
-                Method oriMethod = Utils.INSTANCE.findMethodWithKeepName(tClass,targetMethodName,classes);
-                if (oriMethod == null){
-                    String realMethodName = getRealMethodName(targetMethodName);
-                    if (realMethodName == null){
-                        throw new RuntimeException(exc);
-                    }
-                    oriMethod = tClass.getDeclaredMethod(realMethodName, classes);
+                Method tarMethod = Utils.INSTANCE.findMethodWithKeepName(tClass,targetMethodName,classes);
+                if (tarMethod == null){
+                    throw new RuntimeException(exc);
                 }
-                targetMethod = oriMethod;
+                targetMethod = tarMethod;
             }
             try {
                 originalMethod = tClass.getDeclaredMethod(originalMethodName, classes);
diff --git a/android-aop-plugin/src/main/kotlin/com/flyjingfish/android_aop_plugin/plugin/CompilePlugin.kt b/android-aop-plugin/src/main/kotlin/com/flyjingfish/android_aop_plugin/plugin/CompilePlugin.kt
@@ -13,6 +13,7 @@ import com.flyjingfish.android_aop_plugin.scanner_visitor.SuspendReturnScanner
 import com.flyjingfish.android_aop_plugin.scanner_visitor.WovenIntoCode
 import com.flyjingfish.android_aop_plugin.tasks.CompileAndroidAopTask
 import com.flyjingfish.android_aop_plugin.tasks.DebugModeFileTask
+import com.flyjingfish.android_aop_plugin.utils.AppClasses
 import com.flyjingfish.android_aop_plugin.utils.ClassFileUtils
 import com.flyjingfish.android_aop_plugin.utils.ClassPoolUtils
 import com.flyjingfish.android_aop_plugin.utils.FileHashUtils
@@ -171,10 +172,17 @@ class CompilePlugin(private val fromRootSet:Boolean): BasePlugin() {
             project.rootProject.gradle.taskGraph.addTaskExecutionGraphListener(object :
                 TaskExecutionGraphListener {
                 override fun graphPopulated(it: TaskExecutionGraph) {
+                    val appTask = it.allTasks.firstOrNull {
+                        val project = it.project
+                        val isApp = project.plugins.hasPlugin(AppPlugin::class.java)
+                        isApp
+                    }
                     startTask = true
-                    AndroidAopConfig.syncConfig(project)
-                    if (AndroidAopConfig.cutInfoJson){
-                        InitConfig.initCutInfo(runtimeProject,true)
+                    appTask?.let {
+                        AndroidAopConfig.syncConfig(it.project)
+                        if (AndroidAopConfig.cutInfoJson){
+                            InitConfig.initCutInfo(runtimeProject,true)
+                        }
                     }
                     project.rootProject.gradle.taskGraph.removeTaskExecutionGraphListener(this)
                 }
diff --git a/android-aop-plugin/src/main/kotlin/com/flyjingfish/android_aop_plugin/plugin/TransformPlugin.kt b/android-aop-plugin/src/main/kotlin/com/flyjingfish/android_aop_plugin/plugin/TransformPlugin.kt
@@ -7,6 +7,7 @@ import com.android.build.gradle.internal.tasks.DexArchiveBuilderTask
 import com.flyjingfish.android_aop_plugin.config.AndroidAopConfig
 import com.flyjingfish.android_aop_plugin.tasks.AssembleAndroidAopTask
 import com.flyjingfish.android_aop_plugin.utils.AppClasses
+import com.flyjingfish.android_aop_plugin.utils.InitConfig
 import com.flyjingfish.android_aop_plugin.utils.RuntimeProject
 import io.github.flyjingfish.fast_transform.tasks.DefaultTransformTask
 import io.github.flyjingfish.fast_transform.toTransformAll
@@ -30,9 +31,28 @@ object TransformPlugin : BasePlugin() {
             }
             return
         }
-        if (isApp){
-            project.rootProject.gradle.taskGraph.addTaskExecutionGraphListener {
-                AppClasses.clearModuleNames()
+        val androidAopConfig = project.extensions.getByType(AndroidAopConfig::class.java)
+
+        project.rootProject.gradle.taskGraph.addTaskExecutionGraphListener {
+            for (task in it.allTasks) {
+                val project = task.project
+                val isDynamic = project.plugins.hasPlugin(DynamicFeaturePlugin::class.java)
+                if (isDynamic && task is AssembleAndroidAopTask){
+                    task.doFirst {
+                        AndroidAopConfig.syncConfig(project)
+                    }
+                }
+            }
+            val appTask = it.allTasks.firstOrNull {
+                val project = it.project
+                val isApp = project.plugins.hasPlugin(AppPlugin::class.java)
+                isApp
+            }
+            appTask?.let { app ->
+                AndroidAopConfig.syncConfig(app.project)
+            }
+            AppClasses.clearModuleNames()
+            if (isApp){
                 for (task in it.allTasks) {
                     val project = task.project
                     val isApp = project.plugins.hasPlugin(AppPlugin::class.java)
@@ -42,44 +62,40 @@ object TransformPlugin : BasePlugin() {
                     }
                 }
                 try {
-                    var lastCanModifyTask : Task? =null
-                    var dexTask : DexArchiveBuilderTask? =null
-                    var aopTask : AssembleAndroidAopTask? =null
-                    for (task in it.allTasks) {
-                        if (task is AssembleAndroidAopTask){
-                            aopTask = task
-                        }
-                        if (task is DexArchiveBuilderTask){
-                            dexTask = task
-                            break
-                        }
-                        lastCanModifyTask = task
+                    val assembleAndroidAopTasks =  it.allTasks.filter {
+                        it is AssembleAndroidAopTask
                     }
-                    if (lastCanModifyTask != null && dexTask != null && aopTask != null){
-                        if (lastCanModifyTask !is AssembleAndroidAopTask && lastCanModifyTask !is DefaultTransformTask){
-                            if (aopTask.isFastDex){
-                                val hintText = "When fastDex is enabled, you should put [id 'android.aop'] at the end to make ${aopTask.name} execute after ${lastCanModifyTask.name}"
+
+                    for ((index,aopTask) in assembleAndroidAopTasks.withIndex()) {
+                        val nextTask = it.allTasks[index+1]
+                        var lastCanModifyTask : Task? =null
+                        for (i in index+1 until it.allTasks.size) { // 0..list.size-1
+                            val task = it.allTasks[i]
+                            if (task is DexArchiveBuilderTask){
+                                break
+                            }
+                            lastCanModifyTask = task
+                        }
+                        if (aopTask is AssembleAndroidAopTask && aopTask.isFastDex && nextTask !is DexArchiveBuilderTask && lastCanModifyTask != null && lastCanModifyTask !is AssembleAndroidAopTask){
+                            val hintText = "When fastDex is enabled, you should put [id 'android.aop'] at the end to make ${aopTask.name} execute after ${lastCanModifyTask.name}"
+                            project.logger.error(hintText)
+                            aopTask.doLast {
+                                project.logger.error(hintText)
+                            }
+                            it.allTasks[it.allTasks.size - 1].doLast {
                                 project.logger.error(hintText)
-                                aopTask.doLast {
-                                    project.logger.error(hintText)
-                                }
-                                it.allTasks[it.allTasks.size - 1].doLast {
-                                    project.logger.error(hintText)
-                                }
                             }
                         }
                     }
+
                 } catch (_: Exception) {
                 }
             }
         }
         val androidComponents = project.extensions.getByType(AndroidComponentsExtension::class.java)
         androidComponents.onVariants { variant ->
             val runtimeProject = RuntimeProject.get(project)
-            val androidAopConfig = project.extensions.getByType(AndroidAopConfig::class.java)
-            if (isApp){
-                androidAopConfig.initConfig()
-            }
+
             val buildTypeName = variant.buildType
             if (androidAopConfig.enabled && !isDebugMode(buildTypeName,variant.name)){
                 val fastDex = isFastDex(buildTypeName,variant.name)
diff --git a/settings.gradle b/settings.gradle
@@ -32,7 +32,7 @@ include ':android-aop-plugin'
 include ':android-aop-core'
 include ':android-aop-apt'
 include ':android-aop-extra'
-//include ':test-app'
+include ':test-app'
 include ':test-java-lib'
 //include ':sub-modules'
 //include ':sub-modules:sub1'
diff --git a/test-app/build.gradle b/test-app/build.gradle
@@ -13,12 +13,13 @@ androidAopConfig {
     // debug 为true打开日志方便调试
     debug true
     // 测试
-    include 'com.flyjingfish.test'
+    include 'com.flyjingfish.test_app'
     //默认关闭，开启后将会生成切点信息json文件在 /build/tmp/cutInfo.json
     cutInfoJson true
     increment true
     // 移除kotlin相关，编译错误和提升速度
 //    exclude 'kotlin.jvm', 'kotlin.internal','kotlinx.coroutines.internal', 'kotlinx.coroutines.android'
+    excludePackaging 'META-INF/DEPENDENCIES', 'META-INF/NOTICE' , 'META-INF/LICENSE' , 'META-INF/LICENSE.txt' , 'META-INF/NOTICE.txt' , 'license/README.dom.txt' , 'license/LICENSE.dom-documentation.txt' , 'license/NOTICE' , 'license/LICENSE.dom-software.txt' , 'license/LICENSE'
 }
 android {
     namespace 'com.flyjingfish.test_app'
@@ -82,16 +83,23 @@ android {
 
     packagingOptions {
         exclude 'META-INF/kotlinx_coroutines_core.version'
+        exclude 'META-INF/DEPENDENCIES'
+        exclude 'META-INF/NOTICE'
+        exclude 'META-INF/LICENSE'
+        exclude 'META-INF/LICENSE.txt'
+        exclude 'META-INF/NOTICE.txt'
+        exclude 'license/README.dom.txt'
+        exclude 'license/LICENSE.dom-documentation.txt'
+        exclude 'license/NOTICE'
+        exclude 'license/LICENSE.dom-software.txt'
+        exclude 'license/LICENSE'
     }
 
 }
 
 dependencies {
-    implementation libs.core.ktx
-    implementation libs.appcompat
-    implementation libs.material
     implementation project(path: ":test-lib")
-    if (TestType == "0"){
+    if (TestType == "-1"){
         //本地
         ksp project(':android-aop-apt')
 //        kapt project(':android-aop-apt')
diff --git a/test-app/src/main/java/com/flyjingfish/test_app/MainActivity.kt b/test-app/src/main/java/com/flyjingfish/test_app/MainActivity.kt
@@ -15,7 +15,7 @@ import com.flyjingfish.android_aop_core.annotations.Permission
 import com.flyjingfish.android_aop_core.annotations.SingleClick
 import com.flyjingfish.android_aop_core.annotations.TryCatch
 import com.flyjingfish.android_aop_core.enums.ThreadType
-import com.flyjingfish.androidaop.databinding.ActivityMainBinding
+import com.flyjingfish.test_app.databinding.ActivityMainBinding
 import com.flyjingfish.test_lib.LocaleTransform
 import com.flyjingfish.test_lib.PermissionRejectListener
 import com.flyjingfish.test_lib.TestMatch
@@ -28,7 +28,7 @@ import java.lang.Thread.sleep
 
 class MainActivity: AppCompatActivity(), PermissionRejectListener{
 //    val haha = 1
-    lateinit var binding:ActivityMainBinding
+    lateinit var binding: ActivityMainBinding
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityMainBinding.inflate(layoutInflater)
diff --git a/test-app/src/main/java/com/flyjingfish/test_app/MyTestApp.java b/test-app/src/main/java/com/flyjingfish/test_app/MyTestApp.java
@@ -38,7 +38,7 @@ public void onCreate() {
         AndroidAop.INSTANCE.setOnPermissionsInterceptListener(new OnPermissionsInterceptListener() {
             @SuppressLint("CheckResult")
             @Override
-            public void requestPermission(@NonNull ProceedJoinPoint joinPoint, @NonNull Permission permission, @NonNull OnRequestPermissionListener call) {
+            public void requestPermission(@NonNull ProceedJoinPoint joinPoint, @NonNull Permission permission, @NonNull OnRequestPermissionListener call) throws Throwable {
                 Object target = joinPoint.getTarget();
                 String[] permissions = permission.value();
                 permissions = check13ReadExternalStorage(permissions);
@@ -70,7 +70,7 @@ public void requestPermission(@NonNull ProceedJoinPoint joinPoint, @NonNull Perm
         AndroidAop.INSTANCE.setOnCustomInterceptListener(new OnCustomInterceptListener() {
             @Nullable
             @Override
-            public Object invoke(@NonNull ProceedJoinPoint joinPoint, @NonNull CustomIntercept customIntercept) {
+            public Object invoke(@NonNull ProceedJoinPoint joinPoint, @NonNull CustomIntercept customIntercept) throws Throwable {
                 // TODO: 2023/11/11 在此写你的逻辑 在合适的地方调用 joinPoint.proceed()，
                 //  joinPoint.proceed(args)可以修改方法传入的参数，如果需要改写返回值，则在 return 处返回即可
                 //  不调用 proceed 就不会执行拦截切面方法内的代码
