Release 3.2.4

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.2.3'
+        classpath 'com.sensorsdata.analytics.android:android-gradle-plugin2:3.2.4'
     }
 }
 
@@ -38,7 +38,7 @@ apply plugin: 'com.sensorsdata.analytics.android'
 
 dependencies {
    //添加 Sensors Analytics SDK 依赖
-   compile 'com.sensorsdata.analytics.android:SensorsAnalyticsSDK:4.0.7'
+   compile 'com.sensorsdata.analytics.android:SensorsAnalyticsSDK:4.0.8'
 }
 ```
 

plugin/ext.gradle

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

@@ -173,7 +173,7 @@ class SensorsAnalyticsClassVisitor extends ClassVisitor {
 
         MethodVisitor methodVisitor = cv.visitMethod(access, name, desc, signature, exceptions)
         if (transformHelper.extension != null && transformHelper.extension.autoHandleWebView && transformHelper.urlClassLoader != null) {
-            methodVisitor = new SensorsAnalyticsWebViewMethodVisitor(methodVisitor, transformHelper)
+            methodVisitor = new SensorsAnalyticsWebViewMethodVisitor(methodVisitor, transformHelper, mClassName)
         }
         SensorsAnalyticsDefaultMethodVisitor sensorsAnalyticsDefaultMethodVisitor = new SensorsAnalyticsDefaultMethodVisitor(methodVisitor, access, name, desc) {
             boolean isSensorsDataTrackViewOnClickAnnotation = false

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

@@ -45,7 +45,7 @@ import java.util.zip.ZipEntry
 
 class SensorsAnalyticsTransform extends Transform {
     private SensorsAnalyticsTransformHelper transformHelper
-    public static final String VERSION = "3.2.3"
+    public static final String VERSION = "3.2.4"
     public static final String MIN_SDK_VERSION = "4.0.7"
     private WaitableExecutor waitableExecutor
     private URLClassLoader urlClassLoader

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

@@ -33,20 +33,25 @@ class SensorsAnalyticsWebViewMethodVisitor extends MethodVisitor implements Opco
                                                  "postUrl(Ljava/lang/String;[B)V"]
     private static final def VIEW_DESC = "Landroid/view/View;"
     private static final def OWNER_WHITE_SET = new HashSet(["android/webkit/WebView", "com/tencent/smtt/sdk/WebView"])
+    private String className
 
 
-    SensorsAnalyticsWebViewMethodVisitor(MethodVisitor mv, SensorsAnalyticsTransformHelper transformHelper) {
+    SensorsAnalyticsWebViewMethodVisitor(MethodVisitor mv, SensorsAnalyticsTransformHelper transformHelper, String className) {
         super(SensorsAnalyticsUtil.ASM_VERSION, mv)
         this.transformHelper = transformHelper
+        this.className = className
     }
 
     @Override
     void visitMethodInsn(int opcode, String owner, String name, String desc, boolean itf) {
         if (TARGET_NAME_DESC.contains(name + desc)) {
-            if (isAssignableWebView(owner)) {
-                opcode = INVOKESTATIC
-                owner = SensorsAnalyticsHookConfig.SENSORS_ANALYTICS_API
-                desc = reStructureDesc(desc)
+            //忽略 WebView 的子类
+            if (!isAssignableWebView(className)) {
+                if (isAssignableWebView(owner)) {
+                    opcode = INVOKESTATIC
+                    owner = SensorsAnalyticsHookConfig.SENSORS_ANALYTICS_API
+                    desc = reStructureDesc(desc)
+                }
             }
         }
         super.visitMethodInsn(opcode, owner, name, desc, itf)