Release 3.4.7

Author: weiqiangliu

plugin/ext.gradle

@@ -1,5 +1,5 @@
 project.ext {
-    pluginVersion = '3.4.6'
+    pluginVersion = '3.4.7'
     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/ClassNameAnalytics.groovy

@@ -22,6 +22,7 @@ class ClassNameAnalytics {
     boolean isShouldModify = false
     boolean isSensorsDataAPI = false
     boolean isSensorsDataUtils = false
+    boolean isOAIDHelper = false
     boolean isSALog = false
     def methodCells = new ArrayList<SensorsAnalyticsMethodCell>()
     boolean isAppWebViewInterface = false
@@ -30,13 +31,14 @@ class ClassNameAnalytics {
         this.className = className
         isSensorsDataAPI = (className == 'com.sensorsdata.analytics.android.sdk.SensorsDataAPI')
         isSensorsDataUtils = (className == 'com.sensorsdata.analytics.android.sdk.util.SensorsDataUtils')
+        isOAIDHelper = (className == 'com.sensorsdata.analytics.android.sdk.advert.utils.OaidHelper')
         isSALog = (className == 'com.sensorsdata.analytics.android.sdk.SALog')
         isAppWebViewInterface = ((className == 'com.sensorsdata.analytics.android.sdk.AppWebViewInterface')
                 || (className == 'com.sensorsdata.analytics.android.sdk.visual.WebViewVisualInterface'))
     }
 
     boolean isSDKFile() {
-        return isSALog || isSensorsDataAPI || isSensorsDataUtils || isAppWebViewInterface
+        return isSALog || isSensorsDataAPI || isSensorsDataUtils || isAppWebViewInterface || isOAIDHelper
     }
 
     boolean isLeanback() {

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

@@ -490,6 +490,7 @@ class SensorsAnalyticsClassVisitor extends ClassVisitor {
                  * android/support/v4/app/Fragment，android/support/v4/app/ListFragment，android/support/v4/app/DialogFragment，
                  * androidx/appcompat/app/AppCompatDialogFragment
                  * androidx/fragment/app/Fragment，androidx/fragment/app/ListFragment，androidx/fragment/app/DialogFragment
+                 * com/google/android/material/bottomsheet/BottomSheetDialogFragment
                  */
                 if (SensorsAnalyticsUtil.isInstanceOfFragment(mSuperName)) {
                     SensorsAnalyticsMethodCell sensorsAnalyticsMethodCell = SensorsFragmentHookConfig.FRAGMENT_METHODS.get(nameDesc)

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

@@ -24,6 +24,7 @@ class SensorsAnalyticsSDKExtension {
     boolean disableAndroidID = false
     boolean disableMacAddress = false
     boolean disableCarrier = false
+    boolean disableOAID = false
 
     @Override
     String toString() {
@@ -32,7 +33,8 @@ class SensorsAnalyticsSDKExtension {
                 "\t\tdisableJsInterface=" + disableJsInterface + "\n" +
                 "\t\tdisableAndroidID=" + disableAndroidID + "\n" +
                 "\t\tdisableMacAddress=" + disableMacAddress + "\n" +
-                "\t\tdisableCarrier=" + disableCarrier
+                "\t\tdisableCarrier=" + disableCarrier + "\n" +
+                "\t\tdisableOAID=" + disableOAID
     }
 }
 

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

@@ -76,6 +76,14 @@ class SensorsAnalyticsSDKHookConfig {
         methodCells.put(methodName, macMethodCells)
     }
 
+    void disableOAID(String methodName) {
+        def oaid = new SensorsAnalyticsMethodCell('getOAID', '(Landroid/content/Context;)Ljava/lang/String;', 'createGetOAID')
+        def methods = [oaid]
+        def oaidMethodCells = new HashMap<String, ArrayList<SensorsAnalyticsMethodCell>>()
+        oaidMethodCells.put("com/sensorsdata/analytics/android/sdk/advert/utils/OaidHelper", methods)
+        methodCells.put(methodName, oaidMethodCells)
+    }
+
     //todo 扩展
 
     void createGetIMEI(ClassVisitor classVisitor, SensorsAnalyticsMethodCell methodCell) {
@@ -163,6 +171,15 @@ class SensorsAnalyticsSDKHookConfig {
         mv.visitEnd()
     }
 
+    void createGetOAID(ClassVisitor classVisitor, SensorsAnalyticsMethodCell methodCell) {
+        def mv = classVisitor.visitMethod(Opcodes.ACC_PUBLIC + 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

@@ -48,7 +48,7 @@ import java.util.jar.JarOutputStream
 
 class SensorsAnalyticsTransform extends Transform {
     private SensorsAnalyticsTransformHelper transformHelper
-    public static final String VERSION = "3.4.6"
+    public static final String VERSION = "3.4.7"
     public static final String MIN_SDK_VERSION = "5.4.3"
     private WaitableExecutor waitableExecutor
     private URLClassLoader urlClassLoader

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

@@ -59,6 +59,8 @@ class SensorsAnalyticsUtil {
         targetFragmentClass.add('androidx/fragment/app/DialogFragment')
         targetFragmentClass.add('androidx/appcompat/app/AppCompatDialogFragment')
 
+        targetFragmentClass.add('com/google/android/material/bottomsheet/BottomSheetDialogFragment')
+
         targetActivityClass.add('android/app/Activity')
         targetActivityClass.add('android/support/v7/app/AppCompatActivity')
         targetActivityClass.add('androidx/appcompat/app/AppCompatActivity')