Release 3.0.5

Author: wangzhzh

README.md

@@ -16,7 +16,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:2.2.3'
         //添加 android-gradle-plugin 依赖
-        classpath 'com.sensorsdata.analytics.android:android-gradle-plugin2:2.0.4'
+        classpath 'com.sensorsdata.analytics.android:android-gradle-plugin2:3.0.4'
     }
 }
 
@@ -37,21 +37,16 @@ apply plugin: 'com.sensorsdata.analytics.android'
 dependencies {
    compile 'com.android.support:appcompat-v7:25.1.1'
    //添加 Sensors Analytics SDK 依赖
-   compile 'com.sensorsdata.analytics.android:SensorsAnalyticsSDK:2.0.2'
+   compile 'com.sensorsdata.analytics.android:SensorsAnalyticsSDK:3.1.0'
 }
 ```
 
-*注*：
-1、由于 SDK 会依赖 appcompat-v7 处理下面几个控件：
-
-* android.support.v7.widget.SwitchCompat
-* android.support.v7.app.AlertDialog
+## To Learn More
 
-需要添加下面依赖( 如果项目中已引入了 v7包，可以不添加 )：
+See our [full manual](http://www.sensorsdata.cn/manual/android_sdk.html)
 
-```android
-compile 'com.android.support:appcompat-v7:25.1.1'
-```
+或者加入 QQ 讨论群：<br>
+![ QQ 讨论群](https://github.com/sensorsdata/sa-sdk-android/raw/master/screenshots/qrCode.jpeg)
 
 ## 感谢
 [hugo](https://github.com/JakeWharton/hugo)
@@ -64,17 +59,14 @@ compile 'com.android.support:appcompat-v7:25.1.1'
 
 
 ## 新书推荐
-神策数据出品的[《Android 全埋点解决方案》](https://item.jd.com/12574672.html)发售啦！！！
+神策数据出品的[《Android 全埋点解决方案》](https://u.jd.com/2JFaeG)发售啦！！！
 
-[![《Android 全埋点解决方案》](screenshots/android_autotrack_book.png)](https://item.jd.com/12574672.html)
+[![《Android 全埋点解决方案》](https://github.com/sensorsdata/sa-sdk-android/raw/master/screenshots/android_autotrack_book.png)](https://u.jd.com/2JFaeG)
 
-## To Learn More
-
-See our [full manual](http://www.sensorsdata.cn/manual/android_sdk.html)
 
 ## License
 
-Copyright 2015－2017 Sensors Data Inc.
+Copyright 2015－2019 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.
@@ -93,3 +85,5 @@ 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.gradle_plugin_android_aspectjx
+
+**禁止一切基于神策数据开源 SDK 的商业活动！**

aop/ext.gradle

@@ -1,5 +1,5 @@
 project.ext {
-    pluginVersion = '3.0.4'
+    pluginVersion = '3.0.5'
     Properties properties = new Properties()
     if (project.file('local.properties').exists()) {
         properties.load(project.file('local.properties').newDataInputStream())

aop/src/main/groovy/com/sensorsdata/analytics/android/plugin/ClassNameAnalytics.groovy

@@ -1,5 +1,19 @@
-/**Created by renqingyou on 2018/11/01.
- * Copyright © 2015－2019 Sensors Data Inc. All rights reserved. */
+/*
+ * Created by renqingyou on 2018/12/01.
+ * Copyright 2015－2019 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
 

aop/src/main/groovy/com/sensorsdata/analytics/android/plugin/Logger.groovy

@@ -1,5 +1,20 @@
-/**Created by wangzhuozhou on 2015/08/01.
- * Copyright © 2015－2019 Sensors Data Inc. All rights reserved. */
+/*
+ * Created by wangzhuozhou on 2015/08/12.
+ * Copyright 2015－2019 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
 
 import java.lang.reflect.Array

aop/src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsClassVisitor.groovy

@@ -1,5 +1,19 @@
-/**Created by wangzhuozhou on 2015/08/01.
- * Copyright © 2015－2019 Sensors Data Inc. All rights reserved. */
+/*
+ * Created by wangzhuohou on 2015/08/01.
+ * Copyright 2015－2019 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
 
@@ -30,7 +44,7 @@ class SensorsAnalyticsClassVisitor extends ClassVisitor {
         return super.clone()
     }
 
-    SensorsAnalyticsClassVisitor(final ClassVisitor classVisitor,ClassNameAnalytics classNameAnalytics,SensorsAnalyticsTransformHelper transformHelper) {
+    SensorsAnalyticsClassVisitor(final ClassVisitor classVisitor, ClassNameAnalytics classNameAnalytics, SensorsAnalyticsTransformHelper transformHelper) {
         super(Opcodes.ASM5, classVisitor)
         this.classVisitor = classVisitor
         this.classNameAnalytics = classNameAnalytics
@@ -102,7 +116,7 @@ class SensorsAnalyticsClassVisitor extends ClassVisitor {
         }
 
         for (cell in methodCells) {
-            transformHelper.sensorsAnalyticsHookConfig."${cell.agentName}"(classVisitor,cell)
+            transformHelper.sensorsAnalyticsHookConfig."${cell.agentName}"(classVisitor, cell)
         }
 
         Logger.info("结束扫描类：${mClassName}\n")
@@ -113,14 +127,14 @@ class SensorsAnalyticsClassVisitor extends ClassVisitor {
     FieldVisitor visitField(int access, String name, String descriptor, String signature, Object value) {
         if (classNameAnalytics.isSensorsDataAPI) {
             if ('VERSION' == name) {
-                String version = (String)value
+                String version = (String) value
                 if (SensorsAnalyticsTransform.MIN_SDK_VERSION > version) {
                     String errMessage = "你目前集成的神策埋点 SDK 版本号为 v${version}，请升级到 v${SensorsAnalyticsTransform.MIN_SDK_VERSION} 及以上的版本。详情请参考：https://github.com/sensorsdata/sa-sdk-android"
                     Logger.error(errMessage)
                     throw new Error(errMessage)
                 }
             } else if ('MIN_PLUGIN_VERSION' == name) {
-                String minPluginVersion = (String)value
+                String minPluginVersion = (String) value
                 if (minPluginVersion != "" && minPluginVersion != null) {
                     if (SensorsAnalyticsTransform.VERSION < minPluginVersion) {
                         String errMessage = "你目前集成的神策插件版本号为 v${SensorsAnalyticsTransform.VERSION}，请升级到 v${minPluginVersion} 及以上的版本。详情请参考：https://github.com/sensorsdata/sa-sdk-android-plugin2"
@@ -132,8 +146,8 @@ class SensorsAnalyticsClassVisitor extends ClassVisitor {
         }
         return super.visitField(access, name, descriptor, signature, value)
     }
-/**
-     *  该方法是当扫描器扫描到类的方法时进行调用
+    /**
+     * 该方法是当扫描器扫描到类的方法时进行调用
      * @param access 表示方法的修饰符
      * @param name 表示方法名，在 ASM 中 “visitMethod” 方法会处理（构造方法、静态代码块、私有方法、受保护的方法、共有方法、native类型方法）。
      *                  在这些范畴中构造方法的方法名为 “<init>”，静态代码块的方法名为 “<clinit>”。
@@ -162,6 +176,7 @@ class SensorsAnalyticsClassVisitor extends ClassVisitor {
             int variableID = 0
             //nameDesc是'onClick(Landroid/view/View;)V'字符串
             boolean isOnClickMethod = false
+            boolean isOnItemClickMethod = false
             //name + desc
             String nameDesc
 
@@ -188,6 +203,11 @@ class SensorsAnalyticsClassVisitor extends ClassVisitor {
                     variableID = newLocal(Type.getObjectType("java/lang/Integer"))
                     methodVisitor.visitVarInsn(ALOAD, 1)
                     methodVisitor.visitVarInsn(ASTORE, variableID)
+                } else if (nameDesc == 'onItemClick(Landroid/widget/AdapterView;Landroid/view/View;IJ)V' && pubAndNoStaticAccess) {
+                    isOnItemClickMethod = true
+                    variableID = newLocal(Type.getObjectType("java/lang/Integer"))
+                    methodVisitor.visitVarInsn(ALOAD, 1)
+                    methodVisitor.visitVarInsn(ASTORE, variableID)
                 }
             }
 
@@ -319,11 +339,20 @@ class SensorsAnalyticsClassVisitor extends ClassVisitor {
                 }
 
                 if (mInterfaces != null && mInterfaces.length > 0) {
-                    SensorsAnalyticsMethodCell sensorsAnalyticsMethodCell = SensorsAnalyticsHookConfig.sInterfaceMethods.get(nameDesc)
-                    if (sensorsAnalyticsMethodCell != null && mInterfaces.contains(sensorsAnalyticsMethodCell.parent)) {
-                        visitMethodWithLoadedParams(methodVisitor, Opcodes.INVOKESTATIC, SensorsAnalyticsHookConfig.sSensorsAnalyticsAPI, sensorsAnalyticsMethodCell.agentName, sensorsAnalyticsMethodCell.agentDesc, sensorsAnalyticsMethodCell.paramsStart, sensorsAnalyticsMethodCell.paramsCount, sensorsAnalyticsMethodCell.opcodes)
+                    if (isOnItemClickMethod && mInterfaces.contains('android/widget/AdapterView$OnItemClickListener')) {
+                        methodVisitor.visitVarInsn(ALOAD, variableID)
+                        methodVisitor.visitVarInsn(ALOAD, 2)
+                        methodVisitor.visitVarInsn(ILOAD, 3)
+                        methodVisitor.visitMethodInsn(INVOKESTATIC, SensorsAnalyticsHookConfig.sSensorsAnalyticsAPI, "trackListView", "(Landroid/widget/AdapterView;Landroid/view/View;I)V", false)
                         isHasTracked = true
                         return
+                    } else {
+                        SensorsAnalyticsMethodCell sensorsAnalyticsMethodCell = SensorsAnalyticsHookConfig.sInterfaceMethods.get(nameDesc)
+                        if (sensorsAnalyticsMethodCell != null && mInterfaces.contains(sensorsAnalyticsMethodCell.parent)) {
+                            visitMethodWithLoadedParams(methodVisitor, INVOKESTATIC, SensorsAnalyticsHookConfig.sSensorsAnalyticsAPI, sensorsAnalyticsMethodCell.agentName, sensorsAnalyticsMethodCell.agentDesc, sensorsAnalyticsMethodCell.paramsStart, sensorsAnalyticsMethodCell.paramsCount, sensorsAnalyticsMethodCell.opcodes)
+                            isHasTracked = true
+                            return
+                        }
                     }
                 }
 
@@ -363,7 +392,7 @@ class SensorsAnalyticsClassVisitor extends ClassVisitor {
                         void visit(String key, Object value) {
                             super.visit(key, value)
                             if ("eventName" == key) {
-                                eventName = (String)value
+                                eventName = (String) value
                             } else if ("properties" == key) {
                                 eventProperties = value.toString()
                             }

aop/src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsDefaultMethodVisitor.groovy

@@ -1,5 +1,19 @@
-/**Created by wangzhuozhou on 2015/08/01.
- * Copyright © 2015－2019 Sensors Data Inc. All rights reserved. */
+/*
+ * Created by wangzhuozhou on 2015/08/12.
+ * Copyright 2015－2019 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
 

aop/src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsExtension.groovy

@@ -1,5 +1,19 @@
-/**Created by wangzhuozhou on 2015/08/01.
- * Copyright © 2015－2019 Sensors Data Inc. All rights reserved. */
+/*
+ * Created by wangzhuozhou on 2015/08/12.
+ * Copyright 2015－2019 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
 
@@ -45,14 +59,14 @@ class SensorsAnalyticsExtension {
                 includeBuilder.append(",")
             }
         }
-        return  " debug=" + debug + "\n" +
-                " disableJar=" + disableJar + "\n" +
-                " useInclude=" + useInclude + "\n" +
-                " lambdaEnabled=" + lambdaEnabled + "\n" +
-                " exclude=[" + excludeBuilder.toString() +"]"+ "\n" +
-                " include=[" + includeBuilder.toString() +"]"+ "\n" +
-                " sdk {\n" + sdk + "\n"+
-                "}"
+        return  "\tdebug=" + debug + "\n" +
+                "\tdisableJar=" + disableJar + "\n" +
+                "\tuseInclude=" + useInclude + "\n" +
+                "\tlambdaEnabled=" + lambdaEnabled + "\n" +
+                "\texclude=[" + excludeBuilder.toString() +"]"+ "\n" +
+                "\tinclude=[" + includeBuilder.toString() +"]"+ "\n" +
+                "\tsdk {\n" + sdk + "\n"+
+                "\t}"
     }
 }
 

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

@@ -1,5 +1,19 @@
-/**Created by wangzhuozhou on 2015/08/01.
- * Copyright © 2015－2019 Sensors Data Inc. All rights reserved. */
+/*
+ * Created by wangzhuozhou on 2015/08/12.
+ * Copyright 2015－2019 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
 
@@ -53,14 +67,6 @@ class SensorsAnalyticsHookConfig {
                 '(Landroid/content/DialogInterface;I)V',
                 1, 2,
                 [Opcodes.ALOAD, Opcodes.ILOAD]))
-        sInterfaceMethods.put('onItemClick(Landroid/widget/AdapterView;Landroid/view/View;IJ)V', new SensorsAnalyticsMethodCell(
-                'onItemClick',
-                '(Landroid/widget/AdapterView;Landroid/view/View;IJ)V',
-                'android/widget/AdapterView$OnItemClickListener',
-                'trackListView',
-                '(Landroid/widget/AdapterView;Landroid/view/View;I)V',
-                1, 3,
-                [Opcodes.ALOAD, Opcodes.ALOAD, Opcodes.ILOAD]))
         sInterfaceMethods.put('onItemSelected(Landroid/widget/AdapterView;Landroid/view/View;IJ)V', new SensorsAnalyticsMethodCell(
                 'onItemSelected',
                 '(Landroid/widget/AdapterView;Landroid/view/View;IJ)V',

aop/src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsJSRAdapter.java

@@ -1,5 +1,19 @@
-/**Created by renqingyou on 2018/12/01.
- * Copyright © 2015－2019 Sensors Data Inc. All rights reserved. */
+/*
+ * Created by renqingyou on 2018/12/01.
+ * Copyright 2015－2019 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;
 

aop/src/main/groovy/com/sensorsdata/analytics/android/plugin/SensorsAnalyticsMethodCell.groovy

@@ -1,5 +1,19 @@
-/**Created by wangzhuozhou on 2015/08/01.
- * Copyright © 2015－2019 Sensors Data Inc. All rights reserved. */
+/*
+ * Created by wangzhuozhou on 2015/08/12.
+ * Copyright 2015－2019 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