Commit b26b8de4 by 霍志良

fix:修复部分手机获取ID的问题,更新deviceID 组件到0.0.22版本

parent 2f12450b
...@@ -33,7 +33,7 @@ ext { ...@@ -33,7 +33,7 @@ ext {
//-------------- 功能组件 -------------- //-------------- 功能组件 --------------
//第一步 //第一步
"ydl-platform" : "0.0.39.42", "ydl-platform" : "0.0.39.43",
//第二步 若干 //第二步 若干
"ydl-webview" : "0.0.38.32", "ydl-webview" : "0.0.38.32",
...@@ -263,7 +263,7 @@ ext { ...@@ -263,7 +263,7 @@ ext {
"protector" : "com.ydl:protector:1.0.1-SNAPSHOT@aar", "protector" : "com.ydl:protector:1.0.1-SNAPSHOT@aar",
"ydl-hnet" : "com.ydl:h-net:0.0.8", "ydl-hnet" : "com.ydl:h-net:0.0.8",
"ydl-user-router" : "com.ydl:router:1.0.0-SNAPSHOT@aar", "ydl-user-router" : "com.ydl:router:1.0.0-SNAPSHOT@aar",
"ydl-device" : "com.ydl:device-id:0.0.10@aar", "ydl-device" : "com.ydl:device-id:0.0.22@aar",
"ydl-net" : "com.ydl:ydl-net:${ydlCompileVersion["ydl-net"]}", "ydl-net" : "com.ydl:ydl-net:${ydlCompileVersion["ydl-net"]}",
"ydl-utils" : "com.ydl:ydl-utils:${ydlCompileVersion["ydl-utils"]}", "ydl-utils" : "com.ydl:ydl-utils:${ydlCompileVersion["ydl-utils"]}",
......
...@@ -4,7 +4,6 @@ import android.annotation.SuppressLint ...@@ -4,7 +4,6 @@ import android.annotation.SuppressLint
import android.app.Application import android.app.Application
import android.os.Build import android.os.Build
import com.alibaba.android.arouter.launcher.ARouter import com.alibaba.android.arouter.launcher.ARouter
import com.bun.miitmdid.core.JLibrary
import com.ydl.devicesidlib.DeviceIDHelper import com.ydl.devicesidlib.DeviceIDHelper
import com.ydl.ydlcommon.base.BaseApp import com.ydl.ydlcommon.base.BaseApp
import com.ydl.ydlcommon.data.http.UpLoadLogUtils import com.ydl.ydlcommon.data.http.UpLoadLogUtils
...@@ -29,10 +28,10 @@ object YdlRepository { ...@@ -29,10 +28,10 @@ object YdlRepository {
// 需要在主 module 的 application 的 onCreate 方法中调用此方法 // 需要在主 module 的 application 的 onCreate 方法中调用此方法
fun initApp(app: Application,isDebug:Boolean) { fun initApp(app: Application,isDebug:Boolean) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
JLibrary.InitEntry(app) // JLibrary.InitEntry(app)
} }
if (AppProgressUtils.isMainProcess(app)){ if (AppProgressUtils.isMainProcess(app)){
DeviceIDHelper.getInstance().init(app.applicationContext) // DeviceIDHelper.getInstance().init(app.applicationContext)
} }
LogHelper.getInstance().deleteExpireLogSync() LogHelper.getInstance().deleteExpireLogSync()
LogUtil.debug = BaseApp.instance.getGlobalConfig().appDebug LogUtil.debug = BaseApp.instance.getGlobalConfig().appDebug
......
package com.ydl.ydlcommon.utils; package com.ydl.ydlcommon.utils;
import android.content.Context; import android.content.Context;
import android.util.Log;
import com.umeng.analytics.MobclickAgent; import com.umeng.analytics.MobclickAgent;
import com.ydl.burypointlib.BuryPointHelper; import com.ydl.burypointlib.BuryPointHelper;
import com.ydl.devicesidlib.DemoHelper;
import com.ydl.devicesidlib.DeviceIDHelper; import com.ydl.devicesidlib.DeviceIDHelper;
import com.ydl.pushserver.pushagent.YdlPushAgent; import com.ydl.pushserver.pushagent.YdlPushAgent;
import com.ydl.pushserver.pushagent.common.listener.IYDLPushListener; import com.ydl.pushserver.pushagent.common.listener.IYDLPushListener;
...@@ -15,6 +17,8 @@ import com.ydl.ydlcommon.router.YdlCommonOut; ...@@ -15,6 +17,8 @@ import com.ydl.ydlcommon.router.YdlCommonOut;
import com.yidianling.common.tools.RxAppTool; import com.yidianling.common.tools.RxAppTool;
import com.yidianling.common.tools.RxDeviceTool; import com.yidianling.common.tools.RxDeviceTool;
import com.yidianling.common.tools.RxNetTool; import com.yidianling.common.tools.RxNetTool;
import static com.bun.miitmdid.content.ContextKeeper.getApplicationContext;
//import com.ydl.burypointlib.BuryPointHelper; //import com.ydl.burypointlib.BuryPointHelper;
//埋点工具类 //埋点工具类
...@@ -36,12 +40,14 @@ public class YdlBuryPointUtil { ...@@ -36,12 +40,14 @@ public class YdlBuryPointUtil {
if (isTest){ if (isTest){
YdlPushAgent.setDebugAdree("121.41.92.140",8091); YdlPushAgent.setDebugAdree("121.41.92.140",8091);
} }
DemoHelper helper=new DemoHelper(new DemoHelper.AppIdsUpdater() {
@Override public void OnIdsAvalid(String ids) {
Log.e("AAAA","getDeviceId:"+ids);
RegisterEventBean registerEventBean = new RegisterEventBean(); RegisterEventBean registerEventBean = new RegisterEventBean();
registerEventBean.setAppId(context.getPackageName()); registerEventBean.setAppId(context.getPackageName());
registerEventBean.setAppVersion(RxAppTool.getAppVersionName(context)); registerEventBean.setAppVersion(RxAppTool.getAppVersionName(context));
String deviceId = DeviceIDHelper.getInstance().getDeviceId(); // String deviceId = DeviceIDHelper.getInstance().getDeviceId();
registerEventBean.setDeviceId(deviceId); registerEventBean.setDeviceId(ids);
registerEventBean.setManufacturer(RxDeviceTool.getBuildMANUFACTURER()); registerEventBean.setManufacturer(RxDeviceTool.getBuildMANUFACTURER());
registerEventBean.setChannel(YdlCommonOut.Companion.getChannelName()); registerEventBean.setChannel(YdlCommonOut.Companion.getChannelName());
registerEventBean.setOs("Android"); registerEventBean.setOs("Android");
...@@ -51,9 +57,7 @@ public class YdlBuryPointUtil { ...@@ -51,9 +57,7 @@ public class YdlBuryPointUtil {
registerEventBean.setScreenHeight(RxDeviceTool.getScreenHeight(context)); registerEventBean.setScreenHeight(RxDeviceTool.getScreenHeight(context));
registerEventBean.setScreenWidth(RxDeviceTool.getScreenWidth(context)); registerEventBean.setScreenWidth(RxDeviceTool.getScreenWidth(context));
registerEventBean.setWifi(RxNetTool.getNetWorkTypeName(context)); registerEventBean.setWifi(RxNetTool.getNetWorkTypeName(context));
LogUtil.d(registerEventBean.toString()); LogUtil.d(registerEventBean.toString());
YdlPushAgent.init(registerEventBean,appDebug, context1, new IYDLPushListener() { YdlPushAgent.init(registerEventBean,appDebug, context1, new IYDLPushListener() {
@Override @Override
public void onPushEvent() { public void onPushEvent() {
...@@ -75,8 +79,9 @@ public class YdlBuryPointUtil { ...@@ -75,8 +79,9 @@ public class YdlBuryPointUtil {
MobclickAgent.onEvent(context1, "socket_disconnect"); MobclickAgent.onEvent(context1, "socket_disconnect");
} }
}); });
}
},getApplicationContext());
helper.getDeviceIds(getApplicationContext());
BuryPointHelper.setDebug(isTest,isEditAlis,true,appDebug); BuryPointHelper.setDebug(isTest,isEditAlis,true,appDebug);
BuryPointHelper.init(); BuryPointHelper.init();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment