Release 3.2.0

Author: dengshiwei

plugin/ext.gradle

@@ -1,5 +1,5 @@
 project.ext {
-    pluginVersion = '3.1.9'
+    pluginVersion = '3.2.0'
     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/Logger.groovy

@@ -34,12 +34,15 @@ class Logger {
     static void printCopyright() {
         println()
         println("${LogUI.C_BLACK_GREEN.value}" + "####################################################################" + "${LogUI.E_NORMAL.value}")
-        println("${LogUI.C_BLACK_GREEN.value}" + "########                                                    ########" + "${LogUI.E_NORMAL.value}")
-        println("${LogUI.C_BLACK_GREEN.value}" + "########                                                    ########" + "${LogUI.E_NORMAL.value}")
-        println("${LogUI.C_BLACK_GREEN.value}" + "########     欢迎使用 SensorsAnalytics® (v" + SensorsAnalyticsTransform.VERSION + ")编译插件    ########" + "${LogUI.E_NORMAL.value}")
-        println("${LogUI.C_BLACK_GREEN.value}" + "########          使用过程中碰到任何问题请联系我们          ########" + "${LogUI.E_NORMAL.value}")
-        println("${LogUI.C_BLACK_GREEN.value}" + "########                                                    ########" + "${LogUI.E_NORMAL.value}")
-        println("${LogUI.C_BLACK_GREEN.value}" + "########                                                    ########" + "${LogUI.E_NORMAL.value}")
+        println("${LogUI.C_BLACK_GREEN.value}" + "###                                                              ###" + "${LogUI.E_NORMAL.value}")
+        println("${LogUI.C_BLACK_GREEN.value}" + "###                                                              ###" + "${LogUI.E_NORMAL.value}")
+        println("${LogUI.C_BLACK_GREEN.value}" + "###          欢迎使用 SensorsAnalytics® (v" + SensorsAnalyticsTransform.VERSION + ")编译插件         ###" + "${LogUI.E_NORMAL.value}")
+        println("${LogUI.C_BLACK_GREEN.value}" + "###               使用过程中碰到任何问题请联系我们               ###" + "${LogUI.E_NORMAL.value}")
+        println("${LogUI.C_BLACK_GREEN.value}" + "###                      QQ 群号：785122381                      ###" + "${LogUI.E_NORMAL.value}")
+        println("${LogUI.C_BLACK_GREEN.value}" + "###                         GitHub 地址：                        ###" + "${LogUI.E_NORMAL.value}")
+        println("${LogUI.C_BLACK_GREEN.value}" + "###     https://github.com/sensorsdata/sa-sdk-android-plugin2    ###" + "${LogUI.E_NORMAL.value}")
+        println("${LogUI.C_BLACK_GREEN.value}" + "###                                                              ###" + "${LogUI.E_NORMAL.value}")
+        println("${LogUI.C_BLACK_GREEN.value}" + "###                                                              ###" + "${LogUI.E_NORMAL.value}")
         println("${LogUI.C_BLACK_GREEN.value}" + "####################################################################" + "${LogUI.E_NORMAL.value}")
         println()
     }

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

@@ -27,7 +27,8 @@ class SensorsAnalyticsSDKHookConfig {
 
     void disableIMEI(String methodName) {
         def imei = new SensorsAnalyticsMethodCell('getIMEI', '(Landroid/content/Context;)Ljava/lang/String;', 'createGetIMEI')
-        def imeiMethods = [imei]
+        def deviceID = new SensorsAnalyticsMethodCell('getDeviceID', '(Landroid/content/Context;I)Ljava/lang/String;', 'createGetDeviceID')
+        def imeiMethods = [imei, deviceID]
         def imeiMethodCells = new HashMap<String, ArrayList<SensorsAnalyticsMethodCell>>()
         imeiMethodCells.put("com/sensorsdata/analytics/android/sdk/util/SensorsDataUtils", imeiMethods)
         methodCells.put(methodName, imeiMethodCells)
@@ -154,6 +155,15 @@ class SensorsAnalyticsSDKHookConfig {
         mv.visitEnd()
     }
 
+    void createGetDeviceID(ClassVisitor classVisitor, SensorsAnalyticsMethodCell methodCell) {
+        def mv = classVisitor.visitMethod(Opcodes.ACC_PRIVATE + Opcodes.ACC_STATIC, methodCell.name, methodCell.desc, null, null)
+        mv.visitCode()
+        mv.visitLdcInsn("")
+        mv.visitInsn(Opcodes.ARETURN)
+        mv.visitMaxs(1, 1)
+        mv.visitEnd()
+    }
+
     //todo 扩展
 
 }

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.1.9"
+    public static final String VERSION = "3.2.0"
     public static final String MIN_SDK_VERSION = "3.0.0"
     private WaitableExecutor waitableExecutor
 
@@ -276,12 +276,13 @@ class SensorsAnalyticsTransform extends Transform {
             } else {
                 String className
                 JarEntry entry = new JarEntry(entryName)
-                jarOutputStream.putNextEntry(entry)
                 byte[] modifiedClassBytes = null
                 byte[] sourceClassBytes
                 try {
+                    jarOutputStream.putNextEntry(entry)
                     sourceClassBytes = IOUtils.toByteArray(inputStream)
                 } catch (Exception e) {
+                    Logger.error("Exception encountered while processing jar: " + jarFile.getAbsolutePath())
                     e.printStackTrace()
                     return null
                 }