Release 3.0.3

Author: wangzhzh

aop/ext.gradle

@@ -1,5 +1,5 @@
 project.ext {
-    pluginVersion = '3.0.2'
+    pluginVersion = '3.0.3'
     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

@@ -10,14 +10,6 @@ class SensorsAnalyticsHookConfig {
     static HashMap<String, SensorsAnalyticsMethodCell> sInterfaceMethods = new HashMap<>()
 
     static {
-        sInterfaceMethods.put('onClick(Landroid/view/View;)V', new SensorsAnalyticsMethodCell(
-                'onClick',
-                '(Landroid/view/View;)V',
-                'android/view/View$OnClickListener',
-                'trackViewOnClick',
-                '(Landroid/view/View;)V',
-                1, 1,
-                [Opcodes.ALOAD]))
         sInterfaceMethods.put('onCheckedChanged(Landroid/widget/CompoundButton;Z)V', new SensorsAnalyticsMethodCell(
                 'onCheckedChanged',
                 '(Landroid/widget/CompoundButton;Z)V',

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

@@ -0,0 +1,10 @@
+package com.sensorsdata.analytics.android.plugin;
+
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.commons.JSRInlinerAdapter;
+
+public class SensorsAnalyticsJSRAdapter extends JSRInlinerAdapter {
+    protected SensorsAnalyticsJSRAdapter(int api, MethodVisitor mv, int access, String name, String desc, String signature, String[] exceptions) {
+        super(api, mv, access, name, desc, signature, exceptions);
+    }
+}

aop/src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsJSRAdapter.java

@@ -28,7 +28,7 @@ import java.util.zip.ZipEntry
 
 class SensorsAnalyticsTransform extends Transform {
     private SensorsAnalyticsTransformHelper transformHelper
-    public static final String VERSION = "3.0.2"
+    public static final String VERSION = "3.0.3"
     public static final String MIN_SDK_VERSION = "3.0.0"
     private WaitableExecutor waitableExecutor
 
@@ -59,11 +59,7 @@ class SensorsAnalyticsTransform extends Transform {
         return !transformHelper.disableSensorsAnalyticsIncremental
     }
 
-    @Override
-    boolean isCacheable() {
-        return !transformHelper.disableSensorsAnalyticsIncremental
-    }
-/**
+    /**
      * 打印提示信息
      */
     private static void printCopyRight() {
@@ -302,7 +298,7 @@ class SensorsAnalyticsTransform extends Transform {
                     className = entryName.replace("/", ".").replace(".class", "")
                     ClassNameAnalytics classNameAnalytics = transformHelper.analytics(className)
                     if (classNameAnalytics.isShouldModify) {
-                        modifiedClassBytes = modifyClasses(sourceClassBytes,classNameAnalytics)
+                        modifiedClassBytes = modifyClass(sourceClassBytes,classNameAnalytics)
                     }
                 }
                 if (modifiedClassBytes == null) {
@@ -318,32 +314,18 @@ class SensorsAnalyticsTransform extends Transform {
         return outputJar
     }
 
-    private byte[] modifyClasses(byte[] srcByteCode,ClassNameAnalytics classNameAnalytics) {
-        try {
-            return modifyClass(srcByteCode,classNameAnalytics)
-        } catch (UnsupportedOperationException e) {
-            throw e
-        } catch (Exception ex) {
-            ex.printStackTrace()
-            if (transformHelper.extension.debug) {
-                throw new Error()
-            }
-            return srcByteCode
-        }
-    }
     /**
      * 真正修改类中方法字节码
      */
-    private byte[] modifyClass(byte[] srcClass,ClassNameAnalytics classNameAnalytics) throws IOException {
+    private byte[] modifyClass(byte[] srcClass, ClassNameAnalytics classNameAnalytics) {
         try {
             ClassWriter classWriter = new ClassWriter(ClassWriter.COMPUTE_MAXS)
-            ClassVisitor classVisitor = new SensorsAnalyticsClassVisitor(classWriter,classNameAnalytics,transformHelper)
+            ClassVisitor classVisitor = new SensorsAnalyticsClassVisitor(classWriter, classNameAnalytics, transformHelper)
             ClassReader cr = new ClassReader(srcClass)
             cr.accept(classVisitor, ClassReader.EXPAND_FRAMES)
             return classWriter.toByteArray()
-        } catch (UnsupportedOperationException e) {
-            throw e
         } catch(Exception ex) {
+            println("$classNameAnalytics.className 类执行 modifyClass 方法出现异常")
             ex.printStackTrace()
             if (transformHelper.extension.debug) {
                 throw new Error()
@@ -363,7 +345,7 @@ class SensorsAnalyticsTransform extends Transform {
             ClassNameAnalytics classNameAnalytics = transformHelper.analytics(className)
             if (classNameAnalytics.isShouldModify) {
                 byte[] sourceClassBytes = IOUtils.toByteArray(new FileInputStream(classFile))
-                byte[] modifiedClassBytes = modifyClasses(sourceClassBytes,classNameAnalytics)
+                byte[] modifiedClassBytes = modifyClass(sourceClassBytes, classNameAnalytics)
                 if (modifiedClassBytes) {
                     modified = new File(tempDir, className.replace('.', '') + '.class')
                     if (modified.exists()) {

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

@@ -10,7 +10,7 @@ class SensorsAnalyticsTransformHelper {
 
     boolean disableSensorsAnalyticsIncremental
 
-    HashSet<String> exclude = ['com.sensorsdata.analytics.android.sdk', 'android.support', 'androidx','com.qiyukf','com.amap.api','com.autonavi']
+    HashSet<String> exclude = ['com.sensorsdata.analytics.android.sdk', 'android.support', 'androidx','com.qiyukf']
     HashSet<String> include = ['butterknife.internal.DebouncingOnClickListener',
                                               'com.jakewharton.rxbinding.view.ViewClickOnSubscribe',
                                               'com.facebook.react.uimanager.NativeViewHierarchyManager']

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

@@ -49,10 +49,6 @@ class SensorsAnalyticsUtil implements Opcodes {
         return targetMenuMethodDesc.contains(nameDesc)
     }
 
-    static boolean isTargetFragmentClass(String className) {
-        return targetFragmentClass.contains(className)
-    }
-
     static boolean isInstanceOfFragment(String superName) {
         return targetFragmentClass.contains(superName)
     }