Release 3.1.9

Author: dengshiwei

plugin/ext.gradle

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

@@ -254,13 +254,54 @@ class SensorsAnalyticsClassVisitor extends ClassVisitor {
                     methodVisitor.visitVarInsn(ASTORE, localId)
                     localIds.add(localId)
                 }
+                if (transformHelper.isHookOnMethodEnter) {
+                    handleCode()
+                }
             }
 
             @Override
             protected void onMethodExit(int opcode) {
                 super.onMethodExit(opcode)
+                if (!transformHelper.isHookOnMethodEnter) {
+                    handleCode()
+                }
+            }
 
-                if (isSensorsDataIgnoreTrackOnClick || isHasInstrumented || classNameAnalytics.isSensorsDataAPI) {
+            void handleCode(){
+                if (isHasInstrumented || classNameAnalytics.isSensorsDataAPI) {
+                    return
+                }
+
+                /**
+                 * Fragment
+                 * 目前支持以下 Fragment 页面浏览事件：
+                 * android/app/Fragment，android/app/ListFragment， android/app/DialogFragment，
+                 * android/support/v4/app/Fragment，android/support/v4/app/ListFragment，android/support/v4/app/DialogFragment，
+                 * androidx/fragment/app/Fragment，androidx/fragment/app/ListFragment，androidx/fragment/app/DialogFragment
+                 */
+                if (SensorsAnalyticsUtil.isInstanceOfFragment(mSuperName)) {
+                    SensorsAnalyticsMethodCell sensorsAnalyticsMethodCell = SensorsAnalyticsHookConfig.FRAGMENT_METHODS.get(nameDesc)
+                    if (sensorsAnalyticsMethodCell != null) {
+                        visitedFragMethods.add(nameDesc)
+                        if (isSetUserVisibleHint) {
+                            methodVisitor.visitVarInsn(ALOAD, 0)
+                            methodVisitor.visitVarInsn(ILOAD, variableID)
+                            methodVisitor.visitMethodInsn(Opcodes.INVOKESTATIC, SensorsAnalyticsHookConfig.SENSORS_ANALYTICS_API, sensorsAnalyticsMethodCell.agentName, sensorsAnalyticsMethodCell.agentDesc, false)
+                        } else if (localIds != null){
+                            methodVisitor.visitVarInsn(ALOAD, 0)
+                            for (localId in localIds) {
+                                methodVisitor.visitVarInsn(ALOAD, localId)
+                            }
+                            methodVisitor.visitMethodInsn(Opcodes.INVOKESTATIC, SensorsAnalyticsHookConfig.SENSORS_ANALYTICS_API, sensorsAnalyticsMethodCell.agentName, sensorsAnalyticsMethodCell.agentDesc, false)
+                        } else {
+                            visitMethodWithLoadedParams(methodVisitor, Opcodes.INVOKESTATIC, SensorsAnalyticsHookConfig.SENSORS_ANALYTICS_API, sensorsAnalyticsMethodCell.agentName, sensorsAnalyticsMethodCell.agentDesc, sensorsAnalyticsMethodCell.paramsStart, sensorsAnalyticsMethodCell.paramsCount, sensorsAnalyticsMethodCell.opcodes)
+                        }
+                        isHasTracked = true
+                        return
+                    }
+                }
+
+                if (isSensorsDataIgnoreTrackOnClick) {
                     return
                 }
 
@@ -320,34 +361,6 @@ class SensorsAnalyticsClassVisitor extends ClassVisitor {
                     return
                 }
 
-                /**
-                 * Fragment
-                 * 目前支持以下 Fragment 页面浏览事件：
-                 * android/app/Fragment，android/app/ListFragment， android/app/DialogFragment，
-                 * android/support/v4/app/Fragment，android/support/v4/app/ListFragment，android/support/v4/app/DialogFragment，
-                 * androidx/fragment/app/Fragment，androidx/fragment/app/ListFragment，androidx/fragment/app/DialogFragment
-                 */
-                if (SensorsAnalyticsUtil.isInstanceOfFragment(mSuperName)) {
-                    SensorsAnalyticsMethodCell sensorsAnalyticsMethodCell = SensorsAnalyticsHookConfig.FRAGMENT_METHODS.get(nameDesc)
-                    if (sensorsAnalyticsMethodCell != null) {
-                        visitedFragMethods.add(nameDesc)
-                        if (isSetUserVisibleHint) {
-                            methodVisitor.visitVarInsn(ALOAD, 0)
-                            methodVisitor.visitVarInsn(ILOAD, variableID)
-                            methodVisitor.visitMethodInsn(Opcodes.INVOKESTATIC, SensorsAnalyticsHookConfig.SENSORS_ANALYTICS_API, sensorsAnalyticsMethodCell.agentName, sensorsAnalyticsMethodCell.agentDesc, false)
-                        } else if (localIds != null){
-                            methodVisitor.visitVarInsn(ALOAD, 0)
-                            for (localId in localIds) {
-                                methodVisitor.visitVarInsn(ALOAD, localId)
-                            }
-                            methodVisitor.visitMethodInsn(Opcodes.INVOKESTATIC, SensorsAnalyticsHookConfig.SENSORS_ANALYTICS_API, sensorsAnalyticsMethodCell.agentName, sensorsAnalyticsMethodCell.agentDesc, false)
-                        } else {
-                            visitMethodWithLoadedParams(methodVisitor, Opcodes.INVOKESTATIC, SensorsAnalyticsHookConfig.SENSORS_ANALYTICS_API, sensorsAnalyticsMethodCell.agentName, sensorsAnalyticsMethodCell.agentDesc, sensorsAnalyticsMethodCell.paramsStart, sensorsAnalyticsMethodCell.paramsCount, sensorsAnalyticsMethodCell.opcodes)
-                        }
-                        isHasTracked = true
-                        return
-                    }
-                }
 
                 /**
                  * Menu

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

@@ -144,7 +144,30 @@ class SensorsAnalyticsHookConfig {
                 '(Landroid/content/DialogInterface;I)V',
                 1, 2,
                 [Opcodes.ALOAD, Opcodes.ILOAD]))
-        // Todo: 扩展
+        addInterfaceMethod(new SensorsAnalyticsMethodCell(
+                'onMenuItemClick',
+                '(Landroid/view/MenuItem;)Z',
+                'android/widget/PopupMenu$OnMenuItemClickListener',
+                'trackMenuItem',
+                '(Landroid/view/MenuItem;)V',
+                1, 1,
+                [Opcodes.ALOAD]))
+        addInterfaceMethod(new SensorsAnalyticsMethodCell(
+                'onMenuItemClick',
+                '(Landroid/view/MenuItem;)Z',
+                'androidx/appcompat/widget/PopupMenu$OnMenuItemClickListener',
+                'trackMenuItem',
+                '(Landroid/view/MenuItem;)V',
+                1, 1,
+                [Opcodes.ALOAD]))
+        addInterfaceMethod(new SensorsAnalyticsMethodCell(
+                'onMenuItemClick',
+                '(Landroid/view/MenuItem;)Z',
+                'android/support/v7/widget/PopupMenu$OnMenuItemClickListener',
+                'trackMenuItem',
+                '(Landroid/view/MenuItem;)V',
+                1, 1,
+                [Opcodes.ALOAD]))
     }
 
     static void addInterfaceMethod(SensorsAnalyticsMethodCell sensorsAnalyticsMethodCell) {
@@ -319,6 +342,30 @@ class SensorsAnalyticsHookConfig {
                 '(Landroid/content/DialogInterface;I)V',
                 1, 2,
                 [Opcodes.ALOAD, Opcodes.ILOAD]))
+        addLambdaMethod(new SensorsAnalyticsMethodCell(
+                'onMenuItemClick',
+                '(Landroid/view/MenuItem;)Z',
+                'Landroid/widget/PopupMenu$OnMenuItemClickListener;',
+                'trackMenuItem',
+                '(Landroid/view/MenuItem;)V',
+                1, 1,
+                [Opcodes.ALOAD]))
+        addLambdaMethod(new SensorsAnalyticsMethodCell(
+                'onMenuItemClick',
+                '(Landroid/view/MenuItem;)Z',
+                'Landroidx/appcompat/widget/PopupMenu$OnMenuItemClickListener;',
+                'trackMenuItem',
+                '(Landroid/view/MenuItem;)V',
+                1, 1,
+                [Opcodes.ALOAD]))
+        addLambdaMethod(new SensorsAnalyticsMethodCell(
+                'onMenuItemClick',
+                '(Landroid/view/MenuItem;)Z',
+                'Landroid/support/v7/widget/PopupMenu$OnMenuItemClickListener;',
+                'trackMenuItem',
+                '(Landroid/view/MenuItem;)V',
+                1, 1,
+                [Opcodes.ALOAD]))
 
         // Todo: 扩展
     }

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

@@ -33,19 +33,22 @@ class SensorsAnalyticsPlugin implements Plugin<Project> {
         boolean disableSensorsAnalyticsPlugin = false
         boolean disableSensorsAnalyticsMultiThreadBuild = false
         boolean disableSensorsAnalyticsIncrementalBuild = false
+        boolean isHookOnMethodEnter = false
         Properties properties = new Properties()
         if (project.rootProject.file('gradle.properties').exists()) {
             properties.load(project.rootProject.file('gradle.properties').newDataInputStream())
             disableSensorsAnalyticsPlugin = Boolean.parseBoolean(properties.getProperty("sensorsAnalytics.disablePlugin", "false")) ||
                     Boolean.parseBoolean(properties.getProperty("disableSensorsAnalyticsPlugin", "false"))
             disableSensorsAnalyticsMultiThreadBuild = Boolean.parseBoolean(properties.getProperty("sensorsAnalytics.disableMultiThreadBuild", "false"))
             disableSensorsAnalyticsIncrementalBuild = Boolean.parseBoolean(properties.getProperty("sensorsAnalytics.disableIncrementalBuild", "false"))
+            isHookOnMethodEnter = Boolean.parseBoolean(properties.getProperty("sensorsAnalytics.isHookOnMethodEnter", "false"))
         }
         if (!disableSensorsAnalyticsPlugin) {
             AppExtension appExtension = project.extensions.findByType(AppExtension.class)
             SensorsAnalyticsTransformHelper transformHelper = new SensorsAnalyticsTransformHelper(extension)
             transformHelper.disableSensorsAnalyticsIncremental = disableSensorsAnalyticsIncrementalBuild
             transformHelper.disableSensorsAnalyticsMultiThread = disableSensorsAnalyticsMultiThreadBuild
+            transformHelper.isHookOnMethodEnter = isHookOnMethodEnter
             appExtension.registerTransform(new SensorsAnalyticsTransform(transformHelper))
             project.afterEvaluate {
                 Logger.setDebug(extension.debug)

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

@@ -45,7 +45,7 @@ import java.util.jar.JarOutputStream
 
 class SensorsAnalyticsTransform extends Transform {
     private SensorsAnalyticsTransformHelper transformHelper
-    public static final String VERSION = "3.1.8"
+    public static final String VERSION = "3.1.9"
     public static final String MIN_SDK_VERSION = "3.0.0"
     private WaitableExecutor waitableExecutor
 
@@ -89,6 +89,7 @@ class SensorsAnalyticsTransform extends Transform {
         println("[SensorsAnalytics]: 是否开启多线程编译:${!transformHelper.disableSensorsAnalyticsMultiThread}")
         println("[SensorsAnalytics]: 是否开启增量编译:${!transformHelper.disableSensorsAnalyticsIncremental}")
         println("[SensorsAnalytics]: 此次是否增量编译:$isIncremental")
+        println("[SensorsAnalytics]: 是否在方法进入时插入代码:${transformHelper.isHookOnMethodEnter}")
         long startTime = System.currentTimeMillis()
         if (!isIncremental) {
             outputProvider.deleteAll()

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

@@ -23,6 +23,7 @@ class SensorsAnalyticsTransformHelper {
     SensorsAnalyticsSDKHookConfig sensorsAnalyticsHookConfig
     boolean disableSensorsAnalyticsMultiThread
     boolean disableSensorsAnalyticsIncremental
+    boolean isHookOnMethodEnter
     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',