Release 3.1.6

Author: wangzhzh

plugin/ext.gradle

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

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

@@ -320,7 +320,7 @@ class SensorsAnalyticsClassVisitor extends ClassVisitor {
                     SensorsAnalyticsMethodCell sensorsAnalyticsMethodCell = SensorsAnalyticsHookConfig.FRAGMENT_METHODS.get(nameDesc)
                     if (sensorsAnalyticsMethodCell != null) {
                         visitedFragMethods.add(nameDesc)
-                        if (isSetUserVisibleHint){
+                        if (isSetUserVisibleHint) {
                             methodVisitor.visitVarInsn(ALOAD, 0)
                             methodVisitor.visitVarInsn(ILOAD, variableID)
                             methodVisitor.visitMethodInsn(Opcodes.INVOKESTATIC, SensorsAnalyticsHookConfig.SENSORS_ANALYTICS_API, sensorsAnalyticsMethodCell.agentName, sensorsAnalyticsMethodCell.agentDesc, false)
@@ -361,8 +361,10 @@ class SensorsAnalyticsClassVisitor extends ClassVisitor {
                     return
                 }
 
-                if ((mClassName.startsWith('android/') || mClassName.startsWith('androidx/')) && !(mClassName.startsWith("android/support/v17/leanback") || mClassName.startsWith("androidx/leanback"))) {
-                    return
+                if (!SensorsAnalyticsUtil.isTargetClassInSpecial(mClassName)) {
+                    if ((mClassName.startsWith('android/') || mClassName.startsWith('androidx/')) && !(mClassName.startsWith("android/support/v17/leanback") || mClassName.startsWith("androidx/leanback"))) {
+                        return
+                    }
                 }
 
                 if (nameDesc == 'onItemSelected(Landroid/widget/AdapterView;Landroid/view/View;IJ)V' || nameDesc == "onListItemClick(Landroid/widget/ListView;Landroid/view/View;IJ)V") {
@@ -397,11 +399,13 @@ class SensorsAnalyticsClassVisitor extends ClassVisitor {
                         isHasTracked = true
                         return
                     } else {
-                        SensorsAnalyticsMethodCell sensorsAnalyticsMethodCell = SensorsAnalyticsHookConfig.INTERFACE_METHODS.get(nameDesc)
-                        if (sensorsAnalyticsMethodCell != null && mInterfaces.contains(sensorsAnalyticsMethodCell.parent)) {
-                            visitMethodWithLoadedParams(methodVisitor, INVOKESTATIC, SensorsAnalyticsHookConfig.SENSORS_ANALYTICS_API, sensorsAnalyticsMethodCell.agentName, sensorsAnalyticsMethodCell.agentDesc, sensorsAnalyticsMethodCell.paramsStart, sensorsAnalyticsMethodCell.paramsCount, sensorsAnalyticsMethodCell.opcodes)
-                            isHasTracked = true
-                            return
+                        for (interfaceName in mInterfaces) {
+                            SensorsAnalyticsMethodCell sensorsAnalyticsMethodCell = SensorsAnalyticsHookConfig.INTERFACE_METHODS.get(interfaceName + nameDesc)
+                            if (sensorsAnalyticsMethodCell != null) {
+                                visitMethodWithLoadedParams(methodVisitor, INVOKESTATIC, SensorsAnalyticsHookConfig.SENSORS_ANALYTICS_API, sensorsAnalyticsMethodCell.agentName, sensorsAnalyticsMethodCell.agentDesc, sensorsAnalyticsMethodCell.paramsStart, sensorsAnalyticsMethodCell.paramsCount, sensorsAnalyticsMethodCell.opcodes)
+                                isHasTracked = true
+                                return
+                            }
                         }
                     }
                 }

plugin/src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsExtension.groovy

@@ -22,15 +22,15 @@ import org.gradle.internal.reflect.Instantiator
 
 
 class SensorsAnalyticsExtension {
-    boolean debug = false
-    boolean disableJar = false
-    boolean useInclude = false
-    boolean lambdaEnabled = true
+    public boolean debug = false
+    public boolean disableJar = false
+    public boolean useInclude = false
+    public boolean lambdaEnabled = true
 
-    ArrayList<String> exclude = []
-    ArrayList<String> include = []
+    public ArrayList<String> exclude = []
+    public ArrayList<String> include = []
 
-    SensorsAnalyticsSDKExtension sdk
+    public SensorsAnalyticsSDKExtension sdk
 
     SensorsAnalyticsExtension(Instantiator ins) {
         sdk = ins.newInstance(SensorsAnalyticsSDKExtension)

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

@@ -19,12 +19,12 @@ package com.sensorsdata.analytics.android.plugin
 
 class SensorsAnalyticsSDKExtension {
     // 同SensorsAnalyticsSDKHookConfig中方法对应, disableIMEI,disableLog,disableJsInterface，disableAndroidID
-    boolean disableIMEI = false
-    boolean disableLog = false
-    boolean disableJsInterface = false
-    boolean disableAndroidID = false
-    boolean disableMacAddress = false
-    boolean disableCarrier = false
+    public boolean disableIMEI = false
+    public boolean disableLog = false
+    public boolean disableJsInterface = false
+    public boolean disableAndroidID = false
+    public boolean disableMacAddress = false
+    public boolean disableCarrier = false
 
     @Override
     String toString() {

plugin/src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsSDKExtension.groovy

@@ -45,7 +45,7 @@ import java.util.jar.JarOutputStream
 
 class SensorsAnalyticsTransform extends Transform {
     private SensorsAnalyticsTransformHelper transformHelper
-    public static final String VERSION = "3.1.5"
+    public static final String VERSION = "3.1.6"
     public static final String MIN_SDK_VERSION = "3.0.0"
     private WaitableExecutor waitableExecutor
 

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

@@ -23,10 +23,15 @@ class SensorsAnalyticsTransformHelper {
     SensorsAnalyticsSDKHookConfig sensorsAnalyticsHookConfig
     boolean disableSensorsAnalyticsMultiThread
     boolean disableSensorsAnalyticsIncremental
-    HashSet<String> exclude = ['com.sensorsdata.analytics.android.sdk', 'android.support', 'androidx', 'com.qiyukf', 'android.arch']
+    HashSet<String> exclude = ['com.sensorsdata.analytics.android.sdk', 'android.support', 'androidx', 'com.qiyukf', 'android.arch', 'com.google.android']
     HashSet<String> include = ['butterknife.internal.DebouncingOnClickListener',
                                'com.jakewharton.rxbinding.view.ViewClickOnSubscribe',
                                'com.facebook.react.uimanager.NativeViewHierarchyManager']
+    /** 将一些特例需要排除在外 */
+    public static final HashSet<String> special = ['android.support.design.widget.TabLayout$ViewPagerOnTabSelectedListener',
+                                                   'com.google.android.material.tabs.TabLayout$ViewPagerOnTabSelectedListener',
+                                                   'android.support.v7.app.ActionBarDrawerToggle',
+                                                   'androidx.appcompat.app.ActionBarDrawerToggle']
 
     SensorsAnalyticsTransformHelper(SensorsAnalyticsExtension extension) {
         this.extension = extension
@@ -73,6 +78,12 @@ class SensorsAnalyticsTransformHelper {
                 classNameAnalytics.isShouldModify = true
             }
         } else if (!classNameAnalytics.isAndroidGenerated()) {
+            for (pkgName in special) {
+                if (className.startsWith(pkgName)) {
+                    classNameAnalytics.isShouldModify = true
+                    return classNameAnalytics
+                }
+            }
             if (extension.useInclude) {
                 for (pkgName in include) {
                     if (className.startsWith(pkgName)) {

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

@@ -23,6 +23,7 @@ class SensorsAnalyticsUtil {
     public static final ASM_VERSION = Opcodes.ASM6
     private static final HashSet<String> targetFragmentClass = new HashSet()
     private static final HashSet<String> targetMenuMethodDesc = new HashSet()
+    private static final HashSet<String> specialClass = new HashSet()
 
     static {
         /**
@@ -52,6 +53,11 @@ class SensorsAnalyticsUtil {
         targetFragmentClass.add('androidx/fragment/app/Fragment')
         targetFragmentClass.add('androidx/fragment/app/ListFragment')
         targetFragmentClass.add('androidx/fragment/app/DialogFragment')
+
+        for (className in SensorsAnalyticsTransformHelper.special) {
+            specialClass.add(className.replace('.', '/'))
+        }
+
     }
 
     static boolean isPublic(int access) {
@@ -69,4 +75,8 @@ class SensorsAnalyticsUtil {
     static boolean isInstanceOfFragment(String superName) {
         return targetFragmentClass.contains(superName)
     }
+
+    static boolean isTargetClassInSpecial(String className) {
+        return specialClass.contains(className)
+    }
 }