fix:更新deviceID aar

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

@@ -117,56 +117,60 @@ class ActionCountUtils {
 
 
             try {
-                val actionDataParams = ActionDataBean.Builder()
-                actionDataParams.partId(partId)
-                actionDataParams.position(position)
-                actionDataParams.url(url)
-
-                uid?.let {
-                    actionDataParams.uid(uid)
-                }
-                actionDataParams.time(System.currentTimeMillis())
-                actionDataParams.appVersion(RxDeviceTool.getAppVersionName(BaseApp.getApp()))
-                actionDataParams.appId(appId)
-                actionDataParams.api(api)
-                actionDataParams.manufacturer(android.os.Build.BRAND.trim().toUpperCase())
-                actionDataParams.model(android.os.Build.MODEL)
-                actionDataParams.os(BIConstants.OS)
-                actionDataParams.osVersion(android.os.Build.VERSION.RELEASE)
-                actionDataParams.wifi(if (isWifi()) 0 else 1)
-
-                actionDataParams.deviceId(DeviceIDHelper.getInstance().deviceId)
 
+                val helper = DemoHelper(DemoHelper.AppIdsUpdater { ids ->
+                    val actionDataParams = ActionDataBean.Builder()
+                    actionDataParams.partId(partId)
+                    actionDataParams.position(position)
+                    actionDataParams.url(url)
 
-                signs == null ?: signs.forEachIndexed { index, s ->
-                    //拓展参数个数确定，暂不使用反射调用
-                    //actionDataParams.javaClass.getMethod("sign$index").invoke(s)
-                    when (index) {
-                        0 -> {
-                            actionDataParams.sign1(s)
-                        }
-                        1 -> {
-                            actionDataParams.sign2(s)
-                        }
-                        2 -> {
-                            actionDataParams.sign3(s)
-                        }
-                        3 -> {
-                            actionDataParams.sign4(s)
-                        }
-                        4 -> {
-                            actionDataParams.sign5(s)
+                    uid?.let {
+                        actionDataParams.uid(uid)
+                    }
+                    actionDataParams.time(System.currentTimeMillis())
+                    actionDataParams.appVersion(RxDeviceTool.getAppVersionName(BaseApp.getApp()))
+                    actionDataParams.appId(appId)
+                    actionDataParams.api(api)
+                    actionDataParams.manufacturer(android.os.Build.BRAND.trim().toUpperCase())
+                    actionDataParams.model(android.os.Build.MODEL)
+                    actionDataParams.os(BIConstants.OS)
+                    actionDataParams.osVersion(android.os.Build.VERSION.RELEASE)
+                    actionDataParams.wifi(if (isWifi()) 0 else 1)
+
+                    actionDataParams.deviceId(ids)
+                    signs == null ?: signs.forEachIndexed { index, s ->
+                        //拓展参数个数确定，暂不使用反射调用
+                        //actionDataParams.javaClass.getMethod("sign$index").invoke(s)
+                        when (index) {
+                            0 -> {
+                                actionDataParams.sign1(s)
+                            }
+                            1 -> {
+                                actionDataParams.sign2(s)
+                            }
+                            2 -> {
+                                actionDataParams.sign3(s)
+                            }
+                            3 -> {
+                                actionDataParams.sign4(s)
+                            }
+                            4 -> {
+                                actionDataParams.sign5(s)
+                            }
                         }
+
                     }
+                    actionDataParams.screenWidth(RxDeviceTool.getScreenWidth(RxTool.getContext()!!))
+                    actionDataParams.screenHeight(RxDeviceTool.getScreenHeight(RxTool.getContext()!!))
 
-                }
-                actionDataParams.screenWidth(RxDeviceTool.getScreenWidth(RxTool.getContext()!!))
-                actionDataParams.screenHeight(RxDeviceTool.getScreenHeight(RxTool.getContext()!!))
+                    //剩余额外参数根据需求定义
 
-                //剩余额外参数根据需求定义
+                    //请求
+                    request(actionDataParams.build())
+
+                }, ContextKeeper.getApplicationContext())
+                helper.getDeviceIds(ContextKeeper.getApplicationContext())
 
-                //请求
-                request(actionDataParams.build())
 
             } catch (e: Exception) {
                 LogUtil.i(TAG, e.toString())