feat:

config.gradle

@@ -10,7 +10,7 @@ ext {
             "m-fm"            : "0.0.30.00",
             "m-user"          : "0.0.60.25",
             "m-home"          : "0.0.22.31",
-            "m-im"            : "0.0.18.15",
+            "m-im"            : "0.0.18.16",
             "m-dynamic"       : "0.0.7.13",
             "m-article"       : "0.0.0.6",
 
@@ -33,10 +33,11 @@ ext {
             //-------------- 功能组件 --------------
 
             //第一步
-            "ydl-platform"    : "0.0.39.49",
+            "ydl-platform"    : "0.0.39.52",
 
             //第二步 若干
             "ydl-webview"     : "0.0.38.32",
+            "ydl-webview"     : "0.0.38.32",
             "ydl-media"       : "0.0.21.6",
             "ydl-pay"         : "0.0.18.9",
             "m-audioim"       : "0.0.49.29.7",
@@ -93,7 +94,7 @@ ext {
             "m-fm"            : "0.0.23.5",
             "m-user"          : "0.0.41.4",
             "m-home"          : "0.0.6.26",
-            "m-im"            : "0.0.3.9",
+            "m-im"            : "0.0.3.10",
             "m-dynamic"       : "0.0.1.7",
 
             "m-muse"          : "0.0.20.7",
@@ -114,7 +115,7 @@ ext {
             //-------------- 功能组件 --------------
 
             //第一步
-            "ydl-platform"    : "0.0.39.49",
+            "ydl-platform"    : "0.0.39.52",
 
             //第二步 若干
             "ydl-webview"     : "0.0.38.31",
@@ -263,7 +264,7 @@ ext {
             "protector"                    : "com.ydl:protector:1.0.1-SNAPSHOT@aar",
             "ydl-hnet"                     : "com.ydl:h-net:0.0.8",
             "ydl-user-router"              : "com.ydl:router:1.0.0-SNAPSHOT@aar",
-            "ydl-device"                   : "com.ydl:device-id:0.0.25@aar",
+            "ydl-device"                   : "com.ydl:device-id:0.0.10@aar",//0.0.27
             "ydl-net"                      : "com.ydl:ydl-net:${ydlCompileVersion["ydl-net"]}",
             "ydl-utils"                    : "com.ydl:ydl-utils:${ydlCompileVersion["ydl-utils"]}",
 

ydl-platform/src/main/java/com/ydl/ydlcommon/app/YdlRepository.kt

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.app.Application
 import android.os.Build
 import com.alibaba.android.arouter.launcher.ARouter
+import com.bun.miitmdid.core.JLibrary
 import com.ydl.devicesidlib.DeviceIDHelper
 import com.ydl.ydlcommon.base.BaseApp
 import com.ydl.ydlcommon.data.http.UpLoadLogUtils
@@ -28,7 +29,7 @@ object YdlRepository {
     // 需要在主 module 的 application 的 onCreate 方法中调用此方法
     fun initApp(app: Application,isDebug:Boolean) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-//            JLibrary.InitEntry(app)
+            JLibrary.InitEntry(app)
         }
         if (AppProgressUtils.isMainProcess(app)){
 //            DeviceIDHelper.getInstance().init(app.applicationContext)

ydl-platform/src/main/java/com/ydl/ydlcommon/utils/YdlBuryPointUtil.java

@@ -5,7 +5,7 @@ import android.util.Log;
 
 import com.umeng.analytics.MobclickAgent;
 import com.ydl.burypointlib.BuryPointHelper;
-import com.ydl.devicesidlib.DemoHelper;
+//import com.ydl.devicesidlib.DemoHelper;
 import com.ydl.devicesidlib.DeviceIDHelper;
 import com.ydl.pushserver.pushagent.YdlPushAgent;
 import com.ydl.pushserver.pushagent.common.listener.IYDLPushListener;
@@ -18,7 +18,7 @@ import com.yidianling.common.tools.RxAppTool;
 import com.yidianling.common.tools.RxDeviceTool;
 import com.yidianling.common.tools.RxNetTool;
 
-import static com.bun.miitmdid.content.ContextKeeper.getApplicationContext;
+//import static com.bun.miitmdid.content.ContextKeeper.getApplicationContext;
 //import com.ydl.burypointlib.BuryPointHelper;
 
 //埋点工具类
@@ -40,48 +40,43 @@ public class YdlBuryPointUtil {
             if (isTest){
                 YdlPushAgent.setDebugAdree("121.41.92.140",8091);
             }
-            DemoHelper helper=new DemoHelper(new DemoHelper.AppIdsUpdater() {
-                @Override public void OnIdsAvalid(String ids) {
-                    Log.e("AAAAA","getDeviceId:"+ids);
-                    RegisterEventBean registerEventBean = new RegisterEventBean();
-                    registerEventBean.setAppId(context.getPackageName());
-                    registerEventBean.setAppVersion(RxAppTool.getAppVersionName(context));
-//                    String deviceId = DeviceIDHelper.getInstance().getDeviceId();
-                    registerEventBean.setDeviceId(ids);
-                    registerEventBean.setManufacturer(RxDeviceTool.getBuildMANUFACTURER());
-                    registerEventBean.setChannel(YdlCommonOut.Companion.getChannelName());
-                    registerEventBean.setOs("Android");
-                    registerEventBean.setModel(RxDeviceTool.getBuildBrandModel());
-                    registerEventBean.setOsVersion(RxDeviceTool.getOsBuileVersion());
-                    registerEventBean.setUid(ModularServiceManager.INSTANCE.getPlatformUserService().getUser().getUserId()+"");
-                    registerEventBean.setScreenHeight(RxDeviceTool.getScreenHeight(context));
-                    registerEventBean.setScreenWidth(RxDeviceTool.getScreenWidth(context));
-                    registerEventBean.setWifi(RxNetTool.getNetWorkTypeName(context));
-                    LogUtil.d(registerEventBean.toString());
-                    YdlPushAgent.init(registerEventBean,appDebug, context1, new IYDLPushListener() {
-                        @Override
-                        public void onPushEvent() {
-                            MobclickAgent.onEvent(context1, "socket_push_event");
-                        }
-
-                        @Override
-                        public void onPushRescueEvent() {
-                            MobclickAgent.onEvent(context1, "socket_push_rescue_event");
-                        }
-
-                        @Override
-                        public void onSocketReconnect() {
-                            MobclickAgent.onEvent(context1, "socket_reconnect");
-                        }
-
-                        @Override
-                        public void onSocketDisconnect() {
-                            MobclickAgent.onEvent(context1, "socket_disconnect");
-                        }
-                    });
+            RegisterEventBean registerEventBean = new RegisterEventBean();
+            registerEventBean.setAppId(context.getPackageName());
+            registerEventBean.setAppVersion(RxAppTool.getAppVersionName(context));
+                    String deviceId = DeviceIDHelper.getInstance().getDeviceId();
+            registerEventBean.setDeviceId(deviceId);
+            registerEventBean.setManufacturer(RxDeviceTool.getBuildMANUFACTURER());
+            registerEventBean.setChannel(YdlCommonOut.Companion.getChannelName());
+            registerEventBean.setOs("Android");
+            registerEventBean.setModel(RxDeviceTool.getBuildBrandModel());
+            registerEventBean.setOsVersion(RxDeviceTool.getOsBuileVersion());
+            registerEventBean.setUid(ModularServiceManager.INSTANCE.getPlatformUserService().getUser().getUserId()+"");
+            registerEventBean.setScreenHeight(RxDeviceTool.getScreenHeight(context));
+            registerEventBean.setScreenWidth(RxDeviceTool.getScreenWidth(context));
+            registerEventBean.setWifi(RxNetTool.getNetWorkTypeName(context));
+            LogUtil.d(registerEventBean.toString());
+            YdlPushAgent.init(registerEventBean,appDebug, context1, new IYDLPushListener() {
+                @Override
+                public void onPushEvent() {
+                    MobclickAgent.onEvent(context1, "socket_push_event");
+                }
+
+                @Override
+                public void onPushRescueEvent() {
+                    MobclickAgent.onEvent(context1, "socket_push_rescue_event");
                 }
-            },getApplicationContext());
-            helper.getDeviceIds(getApplicationContext());
+
+                @Override
+                public void onSocketReconnect() {
+                    MobclickAgent.onEvent(context1, "socket_reconnect");
+                }
+
+                @Override
+                public void onSocketDisconnect() {
+                    MobclickAgent.onEvent(context1, "socket_disconnect");
+                }
+            });
+
             BuryPointHelper.setDebug(isTest,isEditAlis,true,appDebug);
             BuryPointHelper.init();