Merge branch 'fix/lp/lp_fix_log_androidid' into 'release'

feat: 合规化androidId问题修复

See merge request app_android_lib/YDL-Component!230

config.gradle

@@ -20,7 +20,7 @@ ext {
             //mdt 组件
             "ydl-tuicore"   : "0.0.25",
             //第一步
-            "ydl-platform"    : "0.0.41.51",
+            "ydl-platform"    : "0.0.41.54",
 
             //第二步 若干
             "ydl-webview"     : "0.0.39.03",
@@ -104,7 +104,7 @@ ext {
             //mdt 组件
             "ydl-tuicore"   : "0.0.25",
             //第一步
-            "ydl-platform"    : "0.0.41.51",
+            "ydl-platform"    : "0.0.41.54",
 
 
             //第二步 若干

ydl-pay/src/main/java/com/yidianling/ydl_pay/common/http/utils/RxDeviceTool.java

@@ -239,15 +239,6 @@ public class RxDeviceTool {
         return tm.getSimState();
     }
 
-    /**
-     * 获取ANDROID ID
-     *
-     * @param context
-     * @return
-     */
-    public static String getAndroidId(Context context) {
-        return Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID);
-    }
 
     /**
      * 获取设备型号，如MI2SC

ydl-platform/src/main/java/com/ydl/ydlcommon/utils/JPushUtils.kt

@@ -10,7 +10,11 @@ import com.ydl.ydlcommon.base.BaseApp
  */
 object JPushUtils{
 
-    fun getRegistrationID():String{
-        return JPushInterface.getRegistrationID(BaseApp.getApp());
+    fun getRegistrationID(): String? {
+        return if (DeviceTool.checkHasAgreeSecret()) {
+            JPushInterface.getRegistrationID(BaseApp.getApp());
+        } else {
+            null;
+        }
     }
 }
\ No newline at end of file

ydl-platform/src/main/java/com/ydl/ydlcommon/utils/actionutil/ActionCountUtils.kt

@@ -288,10 +288,11 @@ class ActionCountUtils {
                 baiduActionDataParams.appName(appName)
                 try {
                     @SuppressLint("HardwareIds") val id =
-                        Settings.Secure.getString(
-                            RxTool.getContext().contentResolver,
-                            Settings.Secure.ANDROID_ID
-                        )
+                        if (DeviceTool.checkHasAgreeSecret()){
+                            Settings.Secure.getString(RxTool.getContext().contentResolver, Settings.Secure.ANDROID_ID)
+                        }else{
+                            ""
+                        }
                     LogUtil.e("androidid未加密:${id}")
                 } catch (e: java.lang.Exception) {