Release 2.2.1

Author: wangzhzh

aop/build.gradle

@@ -30,7 +30,8 @@ dependencies {
 
     implementation gradleApi()
     implementation localGroovy()
-
+    compile 'org.ow2.asm:asm:7.0'
+    compile 'org.ow2.asm:asm-commons:7.0'
     compileOnly 'com.android.tools.build:gradle:3.0.0'
 }
 

aop/ext.gradle

@@ -1,5 +1,5 @@
 project.ext {
-    pluginVersion = '2.2.0'
+    pluginVersion = '2.2.1'
     Properties properties = new Properties()
     if (project.file('local.properties').exists()) {
         properties.load(project.file('local.properties').newDataInputStream())

aop/src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsClassVisitor.groovy

@@ -18,7 +18,7 @@ class SensorsAnalyticsClassVisitor extends ClassVisitor implements Opcodes {
     }
 
     SensorsAnalyticsClassVisitor(final ClassVisitor classVisitor) {
-        super(Opcodes.ASM5, classVisitor)
+        super(Opcodes.ASM7, classVisitor)
         this.classVisitor = classVisitor
     }
 
@@ -228,7 +228,7 @@ class SensorsAnalyticsClassVisitor extends ClassVisitor implements Opcodes {
                     }
                 }
 
-                if (mClassName.startsWith('android')) {
+                if (mClassName.startsWith('android') || mClassName.startsWith('androidx')) {
                     return
                 }
 

aop/src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsDefaultMethodVisitor.groovy

@@ -8,7 +8,7 @@ public class SensorsAnalyticsDefaultMethodVisitor extends AdviceAdapter {
     String methodName
 
     public SensorsAnalyticsDefaultMethodVisitor(MethodVisitor mv, int access, String name, String desc) {
-        super(Opcodes.ASM5, mv, access, name, desc)
+        super(Opcodes.ASM7, mv, access, name, desc)
         methodName = name
         Logger.info("开始扫描方法：${Logger.accCode2String(access)} ${methodName}${desc}")
     }

aop/src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsTransform.groovy

@@ -26,12 +26,12 @@ import java.util.zip.ZipEntry
 
 class SensorsAnalyticsTransform extends Transform {
     private static Project project
-    private static HashSet<String> exclude = ['com.sensorsdata.analytics.android.sdk', 'android.support']
+    private static HashSet<String> exclude = ['com.sensorsdata.analytics.android.sdk', 'android.support', 'androidx']
     private static HashSet<String> include = ['butterknife.internal.DebouncingOnClickListener',
                                               'com.jakewharton.rxbinding.view.ViewClickOnSubscribe',
                                               'com.facebook.react.uimanager.NativeViewHierarchyManager']
     protected static boolean disableJar
-    private static final String VERSION = "v2.2.0"
+    private static final String VERSION = "v2.2.1"
 
     SensorsAnalyticsTransform(Project project) {
         this.project = project
@@ -285,17 +285,11 @@ class SensorsAnalyticsTransform extends Transform {
     }
 
     static byte[] modifyClasses(String className, byte[] srcByteCode) {
-        byte[] classBytesCode = null
         try {
-            classBytesCode = modifyClass(srcByteCode)
-            return classBytesCode
+            return modifyClass(srcByteCode)
         } catch (Exception e) {
-            e.printStackTrace()
-        }
-        if (classBytesCode == null) {
-            classBytesCode = srcByteCode
+            return srcByteCode
         }
-        return classBytesCode
     }
     /**
      * 真正修改类中方法字节码

aop/src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsUtil.groovy

@@ -20,6 +20,13 @@ class SensorsAnalyticsUtil implements Opcodes {
         targetFragmentClass.add('android/support/v4/app/Fragment')
         targetFragmentClass.add('android/support/v4/app/ListFragment')
         targetFragmentClass.add('android/support/v4/app/DialogFragment')
+
+        /**
+         * For AndroidX Fragment
+         */
+        targetFragmentClass.add('androidx/fragment/app/Fragment')
+        targetFragmentClass.add('androidx/fragment/app/ListFragment')
+        targetFragmentClass.add('androidx/fragment/app/DialogFragment')
     }
 
     static boolean isSynthetic(int access) {