Release 3.2.2

dengshiwei · dengshiwei · commit ce7a6fd8b6e6 · 2020-05-23T15:03:06.000+08:00
diff --git a/plugin/ext.gradle b/plugin/ext.gradle
@@ -1,5 +1,5 @@
 project.ext {
-    pluginVersion = '3.2.1'
+    pluginVersion = '3.2.2'
     Properties properties = new Properties()
     if (project.file('local.properties').exists()) {
         properties.load(project.file('local.properties').newDataInputStream())
diff --git a/plugin/src/main/groovy/com/sensorsdata/analytics/android/plugin/ClassNameAnalytics.groovy b/plugin/src/main/groovy/com/sensorsdata/analytics/android/plugin/ClassNameAnalytics.groovy
@@ -1,6 +1,6 @@
 /*
  * Created by renqingyou on 2018/12/01.
- * Copyright 2015－2019 Sensors Data Inc.
+ * Copyright 2015－2020 Sensors Data Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.sensorsdata.analytics.android.plugin
 
 class ClassNameAnalytics {
diff --git a/plugin/src/main/groovy/com/sensorsdata/analytics/android/plugin/LogUI.groovy b/plugin/src/main/groovy/com/sensorsdata/analytics/android/plugin/LogUI.groovy
@@ -1,3 +1,19 @@
+/*
+ * Created by zhangwei on 2020/05/21.
+ * Copyright 2015－2020 Sensors Data Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.sensorsdata.analytics.android.plugin
 
 /**
diff --git a/plugin/src/main/groovy/com/sensorsdata/analytics/android/plugin/Logger.groovy b/plugin/src/main/groovy/com/sensorsdata/analytics/android/plugin/Logger.groovy
@@ -1,6 +1,6 @@
 /*
  * Created by wangzhuozhou on 2015/08/12.
- * Copyright 2015－2019 Sensors Data Inc.
+ * Copyright 2015－2020 Sensors Data Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.sensorsdata.analytics.android.plugin
 
 import org.objectweb.asm.Opcodes
diff --git a/plugin/src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsClassVisitor.groovy b/plugin/src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsClassVisitor.groovy
@@ -1,6 +1,6 @@
 /*
  * Created by wangzhuohou on 2015/08/01.
- * Copyright 2015－2019 Sensors Data Inc.
+ * Copyright 2015－2020 Sensors Data Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.sensorsdata.analytics.android.plugin
 
 import org.objectweb.asm.AnnotationVisitor
@@ -173,6 +172,9 @@ 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)
+        }
         SensorsAnalyticsDefaultMethodVisitor sensorsAnalyticsDefaultMethodVisitor = new SensorsAnalyticsDefaultMethodVisitor(methodVisitor, access, name, desc) {
             boolean isSensorsDataTrackViewOnClickAnnotation = false
             boolean isSensorsDataIgnoreTrackOnClick = false
diff --git a/plugin/src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsDefaultMethodVisitor.groovy b/plugin/src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsDefaultMethodVisitor.groovy
@@ -1,6 +1,6 @@
 /*
  * Created by wangzhuozhou on 2015/08/12.
- * Copyright 2015－2019 Sensors Data Inc.
+ * Copyright 2015－2020 Sensors Data Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.sensorsdata.analytics.android.plugin
 
 import org.objectweb.asm.AnnotationVisitor
diff --git a/plugin/src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsExtension.groovy b/plugin/src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsExtension.groovy
@@ -1,6 +1,6 @@
 /*
  * Created by wangzhuozhou on 2015/08/12.
- * Copyright 2015－2019 Sensors Data Inc.
+ * Copyright 2015－2020 Sensors Data Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.sensorsdata.analytics.android.plugin
 
 import org.gradle.api.Action
@@ -26,6 +25,7 @@ class SensorsAnalyticsExtension {
     public boolean disableJar = false
     public boolean useInclude = false
     public boolean lambdaEnabled = true
+    public boolean autoHandleWebView = true
 
     public ArrayList<String> exclude = []
     public ArrayList<String> include = []
@@ -62,6 +62,7 @@ class SensorsAnalyticsExtension {
         return "\tdebug=" + debug + "\n" +
                 "\tdisableJar=" + disableJar + "\n" +
                 "\tuseInclude=" + useInclude + "\n" +
+                "\tautoHandleWebView=" + autoHandleWebView + "\n" +
                 "\tlambdaEnabled=" + lambdaEnabled + "\n" +
                 "\texclude=[" + excludeBuilder.toString() + "]" + "\n" +
                 "\tinclude=[" + includeBuilder.toString() + "]" + "\n" +
diff --git a/plugin/src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsHookConfig.groovy b/plugin/src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsHookConfig.groovy
@@ -1,6 +1,6 @@
 /*
  * Created by wangzhuozhou on 2015/08/12.
- * Copyright 2015－2019 Sensors Data Inc.
+ * Copyright 2015－2020 Sensors Data Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.sensorsdata.analytics.android.plugin
 
 import org.objectweb.asm.Opcodes
@@ -168,6 +167,38 @@ class SensorsAnalyticsHookConfig {
                 '(Landroid/view/MenuItem;)V',
                 1, 1,
                 [Opcodes.ALOAD]))
+        addInterfaceMethod(new SensorsAnalyticsMethodCell(
+                'onNavigationItemSelected',
+                '(Landroid/view/MenuItem;)Z',
+                'com/google/android/material/navigation/NavigationView$OnNavigationItemSelectedListener',
+                'trackMenuItem',
+                '(Landroid/view/MenuItem;)V',
+                1, 1,
+                [Opcodes.ALOAD]))
+        addInterfaceMethod(new SensorsAnalyticsMethodCell(
+                'onNavigationItemSelected',
+                '(Landroid/view/MenuItem;)Z',
+                'android/support/design/widget/NavigationView$OnNavigationItemSelectedListener',
+                'trackMenuItem',
+                '(Landroid/view/MenuItem;)V',
+                1, 1,
+                [Opcodes.ALOAD]))
+        addInterfaceMethod(new SensorsAnalyticsMethodCell(
+                'onNavigationItemSelected',
+                '(Landroid/view/MenuItem;)Z',
+                'android/support/design/widget/BottomNavigationView$OnNavigationItemSelectedListener',
+                'trackMenuItem',
+                '(Landroid/view/MenuItem;)V',
+                1, 1,
+                [Opcodes.ALOAD]))
+        addInterfaceMethod(new SensorsAnalyticsMethodCell(
+                'onNavigationItemSelected',
+                '(Landroid/view/MenuItem;)Z',
+                'com/google/android/material/bottomnavigation/BottomNavigationView$OnNavigationItemSelectedListener',
+                'trackMenuItem',
+                '(Landroid/view/MenuItem;)V',
+                1, 1,
+                [Opcodes.ALOAD]))
     }
 
     static void addInterfaceMethod(SensorsAnalyticsMethodCell sensorsAnalyticsMethodCell) {
@@ -302,6 +333,14 @@ class SensorsAnalyticsHookConfig {
                 '(Ljava/lang/String;)V',
                 1, 1,
                 [Opcodes.ALOAD]))
+        addLambdaMethod(new SensorsAnalyticsMethodCell(
+                'onNavigationItemSelected',
+                '(Landroid/view/MenuItem;)Z',
+                'Lcom/google/android/material/navigation/NavigationView$OnNavigationItemSelectedListener;',
+                'trackMenuItem',
+                '(Landroid/view/MenuItem;)V',
+                1, 1,
+                [Opcodes.ALOAD]))
         addLambdaMethod(new SensorsAnalyticsMethodCell(
                 'onNavigationItemSelected',
                 '(Landroid/view/MenuItem;)Z',
@@ -310,6 +349,22 @@ class SensorsAnalyticsHookConfig {
                 '(Landroid/view/MenuItem;)V',
                 1, 1,
                 [Opcodes.ALOAD]))
+        addLambdaMethod(new SensorsAnalyticsMethodCell(
+                'onNavigationItemSelected',
+                '(Landroid/view/MenuItem;)Z',
+                'Landroid/support/design/widget/BottomNavigationView$OnNavigationItemSelectedListener;',
+                'trackMenuItem',
+                '(Landroid/view/MenuItem;)V',
+                1, 1,
+                [Opcodes.ALOAD]))
+        addLambdaMethod(new SensorsAnalyticsMethodCell(
+                'onNavigationItemSelected',
+                '(Landroid/view/MenuItem;)Z',
+                'Lcom/google/android/material/bottomnavigation/BottomNavigationView$OnNavigationItemSelectedListener;',
+                'trackMenuItem',
+                '(Landroid/view/MenuItem;)V',
+                1, 1,
+                [Opcodes.ALOAD]))
         addLambdaMethod(new SensorsAnalyticsMethodCell(
                 'onMenuItemClick',
                 '(Landroid/view/MenuItem;)Z',
diff --git a/plugin/src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsJSRAdapter.java b/plugin/src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsJSRAdapter.java
@@ -1,6 +1,6 @@
 /*
  * Created by renqingyou on 2018/12/01.
- * Copyright 2015－2019 Sensors Data Inc.
+ * Copyright 2015－2020 Sensors Data Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.sensorsdata.analytics.android.plugin;
 
 import org.objectweb.asm.MethodVisitor;
diff --git a/plugin/src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsMethodCell.groovy b/plugin/src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsMethodCell.groovy
@@ -1,6 +1,6 @@
 /*
  * Created by wangzhuozhou on 2015/08/12.
- * Copyright 2015－2019 Sensors Data Inc.
+ * Copyright 2015－2020 Sensors Data Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.sensorsdata.analytics.android.plugin
 
 class SensorsAnalyticsMethodCell {
diff --git a/plugin/src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsPlugin.groovy b/plugin/src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsPlugin.groovy
@@ -1,6 +1,6 @@
 /*
  * Created by wangzhuozhou on 2015/08/12.
- * Copyright 2015－2019 Sensors Data Inc.
+ * Copyright 2015－2020 Sensors Data Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.sensorsdata.analytics.android.plugin
 
 import com.android.build.gradle.AppExtension
diff --git a/plugin/src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsSDKExtension.groovy b/plugin/src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsSDKExtension.groovy
@@ -1,6 +1,6 @@
 /*
  * Created by renqingyou on 2018/12/01.
- * Copyright 2015－2019 Sensors Data Inc.
+ * Copyright 2015－2020 Sensors Data Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.sensorsdata.analytics.android.plugin
 
 class SensorsAnalyticsSDKExtension {
diff --git a/plugin/src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsSDKHookConfig.groovy b/plugin/src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsSDKHookConfig.groovy
@@ -1,6 +1,6 @@
 /*
  * Created by renqingyou on 2018/12/01.
- * Copyright 2015－2019 Sensors Data Inc.
+ * Copyright 2015－2020 Sensors Data Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.sensorsdata.analytics.android.plugin
 
 import org.objectweb.asm.ClassVisitor
diff --git a/plugin/src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsTransform.groovy b/plugin/src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsTransform.groovy
@@ -1,6 +1,6 @@
 /*
  * Created by wangzhuozhou on 2015/08/12.
- * Copyright 2015－2019 Sensors Data Inc.
+ * Copyright 2015－2020 Sensors Data Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.sensorsdata.analytics.android.plugin
 
 import com.android.build.api.transform.Context
@@ -45,8 +44,8 @@ import java.util.jar.JarOutputStream
 
 class SensorsAnalyticsTransform extends Transform {
     private SensorsAnalyticsTransformHelper transformHelper
-    public static final String VERSION = "3.2.1"
-    public static final String MIN_SDK_VERSION = "3.0.0"
+    public static final String VERSION = "3.2.2"
+    public static final String MIN_SDK_VERSION = "4.0.7"
     private WaitableExecutor waitableExecutor
     private URLClassLoader urlClassLoader
 
@@ -81,6 +80,7 @@ class SensorsAnalyticsTransform extends Transform {
     void transform(TransformInvocation transformInvocation) throws TransformException, InterruptedException, IOException {
         beforeTransform(transformInvocation)
         transformClass(transformInvocation.context, transformInvocation.inputs, transformInvocation.outputProvider, transformInvocation.incremental)
+        afterTransform()
     }
 
     private void transformClass(Context context, Collection<TransformInput> inputs, TransformOutputProvider outputProvider, boolean isIncremental)
@@ -141,6 +141,17 @@ class SensorsAnalyticsTransform extends Transform {
         traverseForClassLoader(transformInvocation)
     }
 
+    private void afterTransform() {
+        try {
+            if (urlClassLoader != null) {
+                urlClassLoader.close()
+                urlClassLoader = null
+            }
+        } catch (Exception e) {
+            e.printStackTrace()
+        }
+    }
+
     private void traverseForClassLoader(TransformInvocation transformInvocation) {
         def urlList = []
         def androidJar = transformHelper.androidJar()
diff --git a/plugin/src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsTransformHelper.groovy b/plugin/src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsTransformHelper.groovy
@@ -1,6 +1,6 @@
 /*
  * Created by renqingyou on 2018/12/01.
- * Copyright 2015－2019 Sensors Data Inc.
+ * Copyright 2015－2020 Sensors Data Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.sensorsdata.analytics.android.plugin
 
 import com.android.build.gradle.AppExtension
@@ -24,13 +23,11 @@ class SensorsAnalyticsTransformHelper {
     SensorsAnalyticsExtension extension
     AppExtension android
     RN_STATE rnState = RN_STATE.NOT_FOUND
-
-
     SensorsAnalyticsSDKHookConfig sensorsAnalyticsHookConfig
     boolean disableSensorsAnalyticsMultiThread
     boolean disableSensorsAnalyticsIncremental
     boolean isHookOnMethodEnter
-    HashSet<String> exclude = new HashSet<>(['com.sensorsdata.analytics.android.sdk', 'android.support', 'androidx', 'com.qiyukf', 'android.arch', 'com.google.android'])
+    HashSet<String> exclude = new HashSet<>(['com.sensorsdata.analytics.android.sdk', 'android.support', 'androidx', 'com.qiyukf', 'android.arch', 'com.google.android', "com.tencent.smtt"])
     HashSet<String> include = new HashSet<>(['butterknife.internal.DebouncingOnClickListener',
                                              'com.jakewharton.rxbinding.view.ViewClickOnSubscribe',
                                              'com.facebook.react.uimanager.NativeViewHierarchyManager'])
diff --git a/plugin/src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsUtil.groovy b/plugin/src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsUtil.groovy
diff --git a/plugin/src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsWebViewMethodVisitor.groovy b/plugin/src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsWebViewMethodVisitor.groovy
