Skip to content

Y
YDL-Component-Medical
Commit 8c78f6d9 by 霍志良
Options

feat:

parent f06b463f
Showing with 26 additions and 39 deletions
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"]}",
......
m-im/src/main/AndroidManifest.xml
......@@ -28,7 +28,7 @@
<application>
<receiver android:name="com.netease.nimlib.mixpush.hw.HWPushReceiver">
<!--<receiver android:name="com.netease.nimlib.mixpush.hw.HWPushReceiver">
<intent-filter>
<action android:name="com.huawei.android.push.intent.REGISTRATION" />
<action android:name="com.huawei.android.push.intent.RECEIVE" />
......@@ -38,7 +38,7 @@
<meta-data
android:name="CS_cloud_ablitity"
android:value="successRateAnalytics" />
</receiver>
</receiver>-->
<!-- ==================== IM ==================== -->
<!-- ==================== IM ==================== -->
......
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,14 +40,11 @@ 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);
String deviceId = DeviceIDHelper.getInstance().getDeviceId();
registerEventBean.setDeviceId(deviceId);
registerEventBean.setManufacturer(RxDeviceTool.getBuildMANUFACTURER());
registerEventBean.setChannel(YdlCommonOut.Companion.getChannelName());
registerEventBean.setOs("Android");
......@@ -79,9 +76,7 @@ public class YdlBuryPointUtil {
MobclickAgent.onEvent(context1, "socket_disconnect");
}
});
}
},getApplicationContext());
helper.getDeviceIds(getApplicationContext());
BuryPointHelper.setDebug(isTest,isEditAlis,true,appDebug);
BuryPointHelper.init();
......
ydl-platform/src/main/java/com/ydl/ydlcommon/utils/actionutil/ActionCountUtils.kt
......@@ -6,25 +6,20 @@ import android.net.NetworkInfo
import android.net.wifi.WifiManager
import android.text.TextUtils
import android.util.Log
import com.bun.miitmdid.content.ContextKeeper
//import com.bun.miitmdid.content.ContextKeeper
import com.google.gson.Gson
import com.umeng.analytics.MobclickAgent
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
import com.ydl.pushserver.pushagent.network.pack.RegisterEventBean
import com.ydl.ydlcommon.base.BaseApp
import com.ydl.ydlcommon.data.http.api.ApiRequestUtil
import com.ydl.ydlcommon.data.http.params.ActionDataBean
import com.ydl.ydlcommon.data.http.params.BaiduActionDataBean
import com.ydl.ydlcommon.modular.ModularServiceManager
import com.ydl.ydlcommon.modular.ModularServiceManager.getPlatformUserService
import com.ydl.ydlcommon.router.YdlCommonOut
import com.ydl.ydlcommon.router.YdlCommonOut.Companion.getChannelName
import com.ydl.ydlcommon.utils.DeviceTool
import com.ydl.ydlcommon.utils.YdlBuryPointUtil
import com.yidianling.common.tools.*
import com.yidianling.common.tools.LogUtil
import com.yidianling.common.tools.RxDeviceTool
import com.yidianling.common.tools.RxTool
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.schedulers.Schedulers
import java.net.Inet4Address
......@@ -118,7 +113,6 @@ class ActionCountUtils {
try {
val helper = DemoHelper(DemoHelper.AppIdsUpdater { ids ->
val actionDataParams = ActionDataBean.Builder()
actionDataParams.partId(partId)
actionDataParams.position(position)
......@@ -136,8 +130,9 @@ class ActionCountUtils {
actionDataParams.os(BIConstants.OS)
actionDataParams.osVersion(android.os.Build.VERSION.RELEASE)
actionDataParams.wifi(if (isWifi()) 0 else 1)
actionDataParams.deviceId(ids)
val deviceId =
DeviceIDHelper.getInstance().deviceId
actionDataParams.deviceId(deviceId)
signs == null ?: signs.forEachIndexed { index, s ->
//拓展参数个数确定，暂不使用反射调用
//actionDataParams.javaClass.getMethod("sign$index").invoke(s)
......@@ -168,9 +163,6 @@ class ActionCountUtils {
//请求
request(actionDataParams.build())
}, ContextKeeper.getApplicationContext())
helper.getDeviceIds(ContextKeeper.getApplicationContext())
} catch (e: Exception) {
LogUtil.i(TAG, e.toString())
......@@ -210,11 +202,12 @@ class ActionCountUtils {
actionDataParams.wifi(if (isWifi()) 0 else 1)
actionDataParams.screenWidth(RxDeviceTool.getScreenWidth(RxTool.getContext()!!))
actionDataParams.screenHeight(RxDeviceTool.getScreenHeight(RxTool.getContext()!!))
val helper = DemoHelper(DemoHelper.AppIdsUpdater { ids ->
val baiduActionDataParams = BaiduActionDataBean.Builder()
baiduActionDataParams.pkname = packageName
baiduActionDataParams.deviceType = 2
baiduActionDataParams.deviceId(ids)
val deviceId =
DeviceIDHelper.getInstance().deviceId
baiduActionDataParams.deviceId(deviceId)
baiduActionDataParams.convertType(convertType)
baiduActionDataParams.convertTime(System.currentTimeMillis() / 1000)
baiduActionDataParams.appid(0.toLong())
......@@ -248,9 +241,6 @@ class ActionCountUtils {
//请求
ActionCountUtils.request(actionDataParams.build())
}, ContextKeeper.getApplicationContext())
helper.getDeviceIds(ContextKeeper.getApplicationContext())
} catch (e: Exception) {
}
......
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