1、完善打包过程

FlyJingFish · Dec 13, 2024 · cd00fe4 · cd00fe4
1 parent 6d6a0d3
commit cd00fe4
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 7 deletions.
diff --git a/...lugin/src/main/kotlin/com/flyjingfish/android_aop_plugin/scanner_visitor/WovenIntoCode.kt b/...lugin/src/main/kotlin/com/flyjingfish/android_aop_plugin/scanner_visitor/WovenIntoCode.kt
@@ -524,12 +524,15 @@ object WovenIntoCode {
                             "        "+returnStr+";}"
                 ctMethod.setBody(newMethodBody)
                 InitConfig.putCutInfo(value)
-            } catch (e: NotFoundException) {
-                throw RuntimeException(e)
-            } catch (e: CannotCompileException) {
+            } catch (e: Exception) {
                 printLog("newMethodBody=$newMethodBody")
-                ClassFileUtils.deleteInvokeClass(realInvokeClassNameReal)
-                throw RuntimeException(e)
+                if (e is NotFoundException || e is CannotCompileException){
+                    WovenInfoUtils.deleteAopMethodCutInnerClassInfoInvokeMethod(Utils.dotToSlash(targetClassName),targetMethodName,oldDescriptor)
+                    ClassFileUtils.deleteInvokeClass(invokeClassName)
+                    e.printStackTrace()
+                }else{
+                    throw e
+                }
             }
         }
         val wovenBytes = ctClass.toBytecode()

diff --git a/...oid-aop-plugin/src/main/kotlin/com/flyjingfish/android_aop_plugin/utils/WovenInfoUtils.kt b/...oid-aop-plugin/src/main/kotlin/com/flyjingfish/android_aop_plugin/utils/WovenInfoUtils.kt
@@ -694,6 +694,18 @@ object WovenInfoUtils {
         }
     }
 
+    fun deleteAopMethodCutInnerClassInfoInvokeMethod(className:String,
+                                                  newMethodName: String,
+                                                  descriptor: String){
+        if (descriptor.endsWith("Lkotlin/coroutines/Continuation;)Ljava/lang/Object;")) {
+            synchronized(aopMethodCutInnerClassInfoInvokeMethod){
+                val key = "$className&$newMethodName&$descriptor"
+                aopMethodCutInnerClassInfoInvokeMethod.remove(key)
+            }
+
+        }
+    }
+
     fun isHasAopMethodCutInnerClassInfoInvokeMethod(className:String,
                                                   newMethodName: String,
                                                   descriptor: String):Boolean{

diff --git a/app/build.gradle b/app/build.gradle
@@ -16,7 +16,6 @@ androidAopConfig {
     // debug 为true打开日志方便调试
     debug true
     // 测试
-    include 'com.flyjingfish','androidx.appcompat.widget.AppCompatImageView','com.google.android.material.textview'
     //默认关闭，开启后将会生成切点信息json文件在 /build/tmp/cutInfo.json
     cutInfoJson true
     increment false
@@ -90,6 +89,7 @@ android {
 }
 
 dependencies {
+//    implementation(fileTree("libs"))
     implementation libs.core.ktx
     implementation libs.appcompat
     implementation libs.material
@@ -114,4 +114,27 @@ dependencies {
     androidTestImplementation libs.androidx.rules
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0"
     implementation libs.gson
-}
+//    implementation 'com.google.android.material:material:1.5.0'
+//    implementation 'androidx.appcompat:appcompat:1.6.1'
+//    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
+//    implementation 'com.google.protobuf:protobuf-javalite:3.13.0'
+//    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0'
+//    implementation 'com.github.bumptech.glide:annotations:4.11.0'
+//    implementation 'com.github.bumptech.glide:glide:4.11.0'
+//    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.20'
+//    implementation 'org.jetbrains.kotlin:kotlin-reflect:1.7.20'
+//    implementation 'androidx.core:core-ktx:1.8.0'
+//    implementation 'com.google.android.exoplayer:exoplayer-core:2.17.1'
+//    implementation 'com.google.android.exoplayer:exoplayer-ui:2.17.1'
+//    implementation 'com.google.crypto.tink:tink-android:1.5.0'
+//    implementation 'com.google.code.gson:gson:2.8.1'
+//    implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
+//    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
+//    implementation 'androidx.activity:activity-ktx:1.4.0'
+//    implementation 'androidx.fragment:fragment-ktx:1.4.1'
+//    implementation 'androidx.viewpager2:viewpager2:1.0.0'
+//    implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.10.0'
+//    implementation 'androidx.navigation:navigation-fragment-ktx:2.5.0'
+//    implementation 'androidx.navigation:navigation-ui-ktx:2.5.0'
+//    implementation 'org.greenrobot:eventbus:3.1.1'
+}
diff --git a/app/libs/cciSDK.aar b/app/libs/cciSDK.aar