Release 3.2.3

Author: dengshiwei

README.md

@@ -18,7 +18,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:3.2.0'
         //添加 android-gradle-plugin 依赖
-        classpath 'com.sensorsdata.analytics.android:android-gradle-plugin2:3.1.4'
+        classpath 'com.sensorsdata.analytics.android:android-gradle-plugin2:3.2.3'
     }
 }
 
@@ -38,7 +38,7 @@ apply plugin: 'com.sensorsdata.analytics.android'
 
 dependencies {
    //添加 Sensors Analytics SDK 依赖
-   compile 'com.sensorsdata.analytics.android:SensorsAnalyticsSDK:3.2.4'
+   compile 'com.sensorsdata.analytics.android:SensorsAnalyticsSDK:4.0.7'
 }
 ```
 

plugin/ext.gradle

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

@@ -255,6 +255,16 @@ class SensorsAnalyticsClassVisitor extends ClassVisitor {
                     methodVisitor.visitVarInsn(ALOAD, 2)
                     methodVisitor.visitVarInsn(ASTORE, localId)
                     localIds.add(localId)
+                } else if (nameDesc == "onCheckedChanged(Landroid/widget/RadioGroup;I)V" && pubAndNoStaticAccess) {
+                    localIds = new ArrayList<>()
+                    int firstLocalId = newLocal(Type.getObjectType("android/widget/RadioGroup"))
+                    methodVisitor.visitVarInsn(ALOAD, 1)
+                    methodVisitor.visitVarInsn(ASTORE, firstLocalId)
+                    localIds.add(firstLocalId)
+                    int secondLocalId = newLocal(Type.INT_TYPE)
+                    methodVisitor.visitVarInsn(ILOAD, 2)
+                    methodVisitor.visitVarInsn(ISTORE, secondLocalId)
+                    localIds.add(secondLocalId)
                 }
                 if (transformHelper.isHookOnMethodEnter) {
                     handleCode()
@@ -422,6 +432,17 @@ class SensorsAnalyticsClassVisitor extends ClassVisitor {
                         methodVisitor.visitMethodInsn(INVOKESTATIC, SensorsAnalyticsHookConfig.SENSORS_ANALYTICS_API, "trackListView", "(Landroid/widget/AdapterView;Landroid/view/View;I)V", false)
                         isHasTracked = true
                         return
+                    } else if (mInterfaces.contains('android/widget/RadioGroup$OnCheckedChangeListener')
+                            && nameDesc == 'onCheckedChanged(Landroid/widget/RadioGroup;I)V') {
+                        SensorsAnalyticsMethodCell sensorsAnalyticsMethodCell = SensorsAnalyticsHookConfig.INTERFACE_METHODS
+                                .get('android/widget/RadioGroup$OnCheckedChangeListeneronCheckedChanged(Landroid/widget/RadioGroup;I)V')
+                        if (sensorsAnalyticsMethodCell != null) {
+                            methodVisitor.visitVarInsn(ALOAD, localIds.get(0))
+                            methodVisitor.visitVarInsn(ILOAD, localIds.get(1))
+                            methodVisitor.visitMethodInsn(INVOKESTATIC, SensorsAnalyticsHookConfig.SENSORS_ANALYTICS_API, sensorsAnalyticsMethodCell.agentName, sensorsAnalyticsMethodCell.agentDesc, false)
+                            isHasTracked = true
+                            return
+                        }
                     } else {
                         for (interfaceName in mInterfaces) {
                             SensorsAnalyticsMethodCell sensorsAnalyticsMethodCell = SensorsAnalyticsHookConfig.INTERFACE_METHODS.get(interfaceName + nameDesc)

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

@@ -41,10 +41,11 @@ import java.util.concurrent.Callable
 import java.util.jar.JarEntry
 import java.util.jar.JarFile
 import java.util.jar.JarOutputStream
+import java.util.zip.ZipEntry
 
 class SensorsAnalyticsTransform extends Transform {
     private SensorsAnalyticsTransformHelper transformHelper
-    public static final String VERSION = "3.2.2"
+    public static final String VERSION = "3.2.3"
     public static final String MIN_SDK_VERSION = "4.0.7"
     private WaitableExecutor waitableExecutor
     private URLClassLoader urlClassLoader
@@ -250,8 +251,14 @@ class SensorsAnalyticsTransform extends Transform {
     }
 
     void forEachJar(boolean isIncremental, JarInput jarInput, TransformOutputProvider outputProvider, Context context) {
+        String destName = jarInput.file.name
+        //截取文件路径的 md5 值重命名输出文件，因为可能同名，会覆盖
+        def hexName = DigestUtils.md5Hex(jarInput.file.absolutePath).substring(0, 8)
+        if (destName.endsWith(".jar")) {
+            destName = destName.substring(0, destName.length() - 4)
+        }
         //获得输出文件
-        File destFile = outputProvider.getContentLocation(jarInput.name, jarInput.contentTypes, jarInput.scopes, Format.JAR)
+        File destFile = outputProvider.getContentLocation(destName + "_" + hexName, jarInput.contentTypes, jarInput.scopes, Format.JAR)
         if (isIncremental) {
             Status status = jarInput.getStatus()
             switch (status) {