Release 3.3.1

Author: weiqiangliu

plugin/ext.gradle

@@ -1,5 +1,5 @@
 project.ext {
-    pluginVersion = '3.3.0'
+    pluginVersion = '3.3.1'
     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/SensorsAnalyticsTransform.groovy

@@ -45,7 +45,7 @@ import java.util.jar.JarOutputStream
 
 class SensorsAnalyticsTransform extends Transform {
     private SensorsAnalyticsTransformHelper transformHelper
-    public static final String VERSION = "3.3.0"
+    public static final String VERSION = "3.3.1"
     public static final String MIN_SDK_VERSION = "4.3.2"
     private WaitableExecutor waitableExecutor
     private URLClassLoader urlClassLoader

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

@@ -17,6 +17,7 @@
 package com.sensorsdata.analytics.android.plugin
 
 
+import org.objectweb.asm.Label
 import org.objectweb.asm.MethodVisitor
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.Type
@@ -89,13 +90,18 @@ class SensorsAnalyticsWebViewMethodVisitor extends AdviceAdapter implements Opco
                         loadLocal(tmp)
                     }
                     super.visitMethodInsn(opcode, owner, name, desc, itf)
-                    //将局部变量表中的数据压入操作数栈中触发我们需要插入的方法
-                    positionList.reverseEach { tmp ->
-                        loadLocal(tmp)
+                    //处理 Dcloud 中 WebView 的写法，缩小范围为 AdaWebView
+                    if (isDCloud(owner, className)) {
+                        hookDCloud(positionList, name, desc)
+                    } else {
+                        //将局部变量表中的数据压入操作数栈中触发我们需要插入的方法
+                        positionList.reverseEach { tmp ->
+                            loadLocal(tmp)
+                        }
+                        desc = reStructureDesc(desc)
+                        //为保持新 SDK 使用旧版插件问题，会使用新 SDK loadUrl + 2 后缀的方法
+                        mv.visitMethodInsn(INVOKESTATIC, SensorsAnalyticsHookConfig.SENSORS_ANALYTICS_API, name + "2", desc, false)
                     }
-                    desc = reStructureDesc(desc)
-                    //为保持新 SDK 使用旧版插件问题，会使用新 SDK loadUrl + 2 后缀的方法
-                    mv.visitMethodInsn(INVOKESTATIC, SensorsAnalyticsHookConfig.SENSORS_ANALYTICS_API, name + "2", desc, false)
                     return
                 }
             }
@@ -105,6 +111,30 @@ class SensorsAnalyticsWebViewMethodVisitor extends AdviceAdapter implements Opco
         super.visitMethodInsn(opcode, owner, name, desc, itf)
     }
 
+    private boolean isDCloud(String owner, String className) {
+        return owner == "io/dcloud/common/adapter/ui/webview/DCWebView" && className.contains("AdaWebview")
+    }
+
+    private void hookDCloud(List<Integer> positionList, String name, String desc) {
+        boolean isCask = false
+        int tmpPosition = positionList.last()
+        loadLocal(tmpPosition)
+        mv.visitTypeInsn(INSTANCEOF, "android/view/View")
+        Label label = new Label()
+        mv.visitJumpInsn(IFEQ, label)
+        positionList.reverseEach { tmp ->
+            loadLocal(tmp)
+            if (!isCask) {
+                isCask = true
+                mv.visitTypeInsn(CHECKCAST, "android/view/View")
+            }
+        }
+        desc = reStructureDesc(desc)
+        //为保持新 SDK 使用旧版插件问题，会使用新 SDK loadUrl + 2 后缀的方法
+        mv.visitMethodInsn(INVOKESTATIC, SensorsAnalyticsHookConfig.SENSORS_ANALYTICS_API, name + "2", desc, false)
+        mv.visitLabel(label)
+    }
+
     /**
      * 判断方法的 owner 是否是 WebView 的子类
      *
@@ -116,6 +146,9 @@ class SensorsAnalyticsWebViewMethodVisitor extends AdviceAdapter implements Opco
             if (OWNER_WHITE_SET.contains(owner)) {
                 return true
             }
+            if (isDCloud(owner, className)) {
+                return true
+            }
             Class ownerClass = transformHelper.urlClassLoader.loadClass(owner.replace("/", "."))
             if (x5WebViewStatus == X5WebViewStatus.FOUND && isPreviousX5WebView) {
                 if (checkX5WebView(ownerClass, owner)) {