From 312744e4ee887b4b42fb4a07a75b569603f3dfd6 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Mon, 20 Feb 2023 19:10:11 +0800 Subject: [PATCH] [2.13.0-arch-opt]analytics move to foundation --- .../och/bus/util/BusAnalyticsManager.java | 9 ++- .../sweeper/util/SweeperAnalyticsManager.java | 6 +- .../utils/TaxiPassengerAnalyticsManager.java | 8 +-- .../och/taxi/utils/TaxiAnalyticsManager.java | 8 +-- .../facade/analytics/ChatAnalyticsFacade.kt | 6 +- .../mogo-core-function-hmi/build.gradle | 2 +- .../eagle/core/function/main/MainActivity.kt | 4 +- .../startup/stageone/HttpDnsStartUp.kt | 8 +-- .../function/api/chat/biz/IMoGoChatFacade.kt | 2 +- core/mogo-core-function-call/build.gradle | 7 +-- ...llerChassisLocationGCJ02ListenerManager.kt | 1 - foudations/mogo-commons/build.gradle | 20 +++++-- .../commons/analytics/AnalyticsUtils.java | 56 ------------------- .../mogo/commons/utils/MogoAnalyticUtils.kt | 6 +- 14 files changed, 46 insertions(+), 97 deletions(-) delete mode 100644 foudations/mogo-commons/src/main/java/com/mogo/commons/analytics/AnalyticsUtils.java rename core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/analytics/AnalyticsManager.kt => foudations/mogo-commons/src/main/java/com/mogo/commons/utils/MogoAnalyticUtils.kt (93%) diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java index eaefe8db87..a8af2bdb38 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/util/BusAnalyticsManager.java @@ -2,14 +2,13 @@ package com.mogo.och.bus.util; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS; -import android.annotation.SuppressLint; import android.text.TextUtils; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; import com.mogo.commons.debug.DebugConfig; import com.mogo.eagle.core.data.app.AppConfigInfo; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; -import com.mogo.eagle.core.function.call.analytics.AnalyticsManager; +import com.mogo.commons.utils.MogoAnalyticUtils; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.DateTimeUtils; @@ -60,7 +59,7 @@ public class BusAnalyticsManager { , CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState() == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING); - AnalyticsManager.INSTANCE.track(mStartAutopilotKey, mStartAutopilotParams); + MogoAnalyticUtils.INSTANCE.track(mStartAutopilotKey, mStartAutopilotParams); clearStartAutopilotParams();//清空参数数据，防止误传 } @@ -111,7 +110,7 @@ public class BusAnalyticsManager { clearStartAutopilotFailureMSG(); removeWaitingCallback(); mStartAutopilotParams.put(BusConst.EVENT_PARAM_START_RESULT, true); - AnalyticsManager.INSTANCE.track(mStartAutopilotKey, mStartAutopilotParams); + MogoAnalyticUtils.INSTANCE.track(mStartAutopilotKey, mStartAutopilotParams); clearStartAutopilotParams();//清空参数数据，防止误传 } else { @@ -143,6 +142,6 @@ public class BusAnalyticsManager { params.put(BusConst.EVENT_PARAM_END_NAME, endName); params.put(BusConst.EVENT_PARAM_LINE_ID, lineId); params.put(BusConst.EVENT_PARAM_UNABLE_START_REASON, reason); - AnalyticsManager.INSTANCE.track(BusConst.EVENT_KEY_AP_UNABLE_START_REASON, params); + MogoAnalyticUtils.INSTANCE.track(BusConst.EVENT_KEY_AP_UNABLE_START_REASON, params); } } diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperAnalyticsManager.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperAnalyticsManager.java index 76f43e4388..16832a6c2b 100644 --- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperAnalyticsManager.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperAnalyticsManager.java @@ -6,7 +6,7 @@ import com.mogo.cloud.passport.MoGoAiCloudClientConfig; import com.mogo.commons.debug.DebugConfig; import com.mogo.eagle.core.data.app.AppConfigInfo; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; -import com.mogo.eagle.core.function.call.analytics.AnalyticsManager; +import com.mogo.commons.utils.MogoAnalyticUtils; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; import com.mogo.eagle.core.utilcode.util.DateTimeUtils; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; @@ -39,7 +39,7 @@ public class SweeperAnalyticsManager { mStartAutopilotParams.put(SweeperConst.EVENT_PARAM_START_RESULT , CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState() == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING); - AnalyticsManager.INSTANCE.track(mStartAutopilotKey, mStartAutopilotParams); + MogoAnalyticUtils.INSTANCE.track(mStartAutopilotKey, mStartAutopilotParams); }; /** @@ -73,7 +73,7 @@ public class SweeperAnalyticsManager { UiThreadHandler.removeCallbacks(startAutopilotRunnable); } mStartAutopilotParams.put(SweeperConst.EVENT_PARAM_START_RESULT, true); - AnalyticsManager.INSTANCE.track(mStartAutopilotKey, mStartAutopilotParams); + MogoAnalyticUtils.INSTANCE.track(mStartAutopilotKey, mStartAutopilotParams); } else { UiThreadHandler.postDelayed(startAutopilotRunnable, SweeperConst.LOOP_PERIOD_15S); } diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.java index 4ce2b41afb..5b55a89cca 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.java @@ -8,7 +8,7 @@ import com.mogo.cloud.passport.MoGoAiCloudClientConfig; import com.mogo.commons.debug.DebugConfig; import com.mogo.eagle.core.data.app.AppConfigInfo; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; -import com.mogo.eagle.core.function.call.analytics.AnalyticsManager; +import com.mogo.commons.utils.MogoAnalyticUtils; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.DateTimeUtils; @@ -63,7 +63,7 @@ public class TaxiPassengerAnalyticsManager { , CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState() == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING); - AnalyticsManager.INSTANCE.track(mStartAutopilotKey, mStartAutopilotParams); + MogoAnalyticUtils.INSTANCE.track(mStartAutopilotKey, mStartAutopilotParams); clearStartAutopilotParams();//清空参数数据，防止误传 } @@ -114,7 +114,7 @@ public class TaxiPassengerAnalyticsManager { clearStartAutopilotFailureMSG(); removeWaitingCallback(); mStartAutopilotParams.put(TaxiPassengerConst.EVENT_PARAM_START_RESULT, true); - AnalyticsManager.INSTANCE.track(mStartAutopilotKey, mStartAutopilotParams); + MogoAnalyticUtils.INSTANCE.track(mStartAutopilotKey, mStartAutopilotParams); clearStartAutopilotParams(); } else { @@ -146,6 +146,6 @@ public class TaxiPassengerAnalyticsManager { params.put(TaxiPassengerConst.EVENT_PARAM_END_NAME, endName); params.put(TaxiPassengerConst.EVENT_PARAM_ORDER_NUMBER, orderNo); params.put(TaxiPassengerConst.EVENT_PARAM_UNABLE_START_REASON, reason); - AnalyticsManager.INSTANCE.track(TaxiPassengerConst.EVENT_KEY_AP_UNABLE_START_REASON, params); + MogoAnalyticUtils.INSTANCE.track(TaxiPassengerConst.EVENT_KEY_AP_UNABLE_START_REASON, params); } } diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.java index dbdce513fa..51b18b574f 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/utils/TaxiAnalyticsManager.java @@ -7,7 +7,7 @@ import com.mogo.cloud.passport.MoGoAiCloudClientConfig; import com.mogo.commons.debug.DebugConfig; import com.mogo.eagle.core.data.app.AppConfigInfo; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; -import com.mogo.eagle.core.function.call.analytics.AnalyticsManager; +import com.mogo.commons.utils.MogoAnalyticUtils; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.DateTimeUtils; @@ -66,7 +66,7 @@ public class TaxiAnalyticsManager { mStartAutopilotParams.put(TaxiConst.EVENT_PARAM_START_RESULT, CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState() == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING); - AnalyticsManager.INSTANCE.track(mStartAutopilotKey, mStartAutopilotParams); + MogoAnalyticUtils.INSTANCE.track(mStartAutopilotKey, mStartAutopilotParams); clearStartAutopilotParams();//清空参数数据，防止误传 } @@ -112,7 +112,7 @@ public class TaxiAnalyticsManager { clearStartAutopilotFailureMSG(); removeWaitingCallback(); mStartAutopilotParams.put(TaxiConst.EVENT_PARAM_START_RESULT, true); - AnalyticsManager.INSTANCE.track(mStartAutopilotKey, mStartAutopilotParams); + MogoAnalyticUtils.INSTANCE.track(mStartAutopilotKey, mStartAutopilotParams); clearStartAutopilotParams();//清空参数数据，防止误传 } else { @@ -144,6 +144,6 @@ public class TaxiAnalyticsManager { params.put(TaxiConst.EVENT_PARAM_END_NAME, endName); params.put(TaxiConst.EVENT_PARAM_ORDER_NUMBER, orderNo); params.put(TaxiConst.EVENT_PARAM_UNABLE_START_REASON, reason); - AnalyticsManager.INSTANCE.track(TaxiConst.EVENT_KEY_AP_UNABLE_START_REASON, params); + MogoAnalyticUtils.INSTANCE.track(TaxiConst.EVENT_KEY_AP_UNABLE_START_REASON, params); } } diff --git a/core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/analytics/ChatAnalyticsFacade.kt b/core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/analytics/ChatAnalyticsFacade.kt index 089872c90a..405ecd2ff8 100644 --- a/core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/analytics/ChatAnalyticsFacade.kt +++ b/core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/analytics/ChatAnalyticsFacade.kt @@ -1,11 +1,11 @@ package com.mogo.eagle.core.function.chat.facade.analytics -import com.mogo.commons.analytics.AnalyticsUtils +import com.mogo.commons.utils.MogoAnalyticUtils import com.mogo.eagle.core.function.api.chat.biz.IMoGoAnalyticsFacade object ChatAnalyticsFacade: IMoGoAnalyticsFacade { - override fun track(eventType: String, data: Map?) { - AnalyticsUtils.track(eventType, data) + override fun track(eventType: String, data: MutableMap) { + MogoAnalyticUtils.track(eventType, data) } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/build.gradle b/core/function-impl/mogo-core-function-hmi/build.gradle index 5229ec0dd4..51edc43054 100644 --- a/core/function-impl/mogo-core-function-hmi/build.gradle +++ b/core/function-impl/mogo-core-function-hmi/build.gradle @@ -87,7 +87,7 @@ dependencies { api project(':test:crashreport-apmbyte') compileOnly project(':core:function-impl:mogo-core-function-datacenter') - compileOnly project(':foudations:mogo-commons') + implementation project(':foudations:mogo-commons') api project(':core:mogo-core-res') compileOnly project(':core:mogo-core-utils') compileOnly project(':core:mogo-core-function-call') diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt index 7cd3cc458d..814487cf90 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt @@ -14,7 +14,7 @@ import com.kwai.koom.nativeoom.leakmonitor.LeakListener import com.kwai.koom.nativeoom.leakmonitor.LeakMonitor.start import com.kwai.koom.nativeoom.leakmonitor.LeakMonitorConfig import com.kwai.koom.nativeoom.leakmonitor.LeakRecord -import com.mogo.commons.analytics.AnalyticsUtils +import com.mogo.commons.utils.MogoAnalyticUtils import com.mogo.commons.context.ContextHolderUtil import com.mogo.commons.debug.DebugConfig import com.mogo.commons.module.status.MogoStatusManager @@ -169,7 +169,7 @@ open class MainActivity : MvpActivity(), MainView, properties["app_launch_hotStartTime"] = hotStartTime } } - AnalyticsUtils.track("app_launch_time", properties) + MogoAnalyticUtils.track("app_launch_time", properties) } } diff --git a/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt b/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt index 9437ee5b85..8291a547b5 100644 --- a/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt +++ b/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt @@ -11,6 +11,7 @@ import com.mogo.cloud.passport.IMoGoTokenCallback import com.mogo.cloud.passport.MoGoAiCloudClient import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.commons.AbsMogoApplication +import com.mogo.commons.utils.MogoAnalyticUtils import com.mogo.commons.constants.SharedPrefsConstants import com.mogo.commons.debug.DebugConfig import com.mogo.commons.module.status.MogoStatusManager @@ -23,7 +24,6 @@ import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_CL import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_CONNECT_STATUS import com.mogo.eagle.core.data.map.MogoLocation import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener -import com.mogo.eagle.core.function.call.analytics.AnalyticsManager import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager import com.mogo.eagle.core.function.call.cloud.CallerCloudListenerManager import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager @@ -218,14 +218,14 @@ class HttpDnsStartUp : AndroidStartup() { //初始化网络配置 NetConfigUtils.init() // 初始化埋点 - AnalyticsManager.init(context, DebugConfig.isDebug()) + MogoAnalyticUtils.init(context, DebugConfig.isDebug()) // 加入启动统计 val mStartParams: HashMap = HashMap() mStartParams["start_time"] = TimeUtils.getNowMills() mStartParams["app_version"] = AppUtils.getAppVersionName() - mStartParams["app_flavor"] = DebugConfig.getProductFlavor(); + mStartParams["app_flavor"] = DebugConfig.getProductFlavor() mStartParams["app_identity_mode"] = FunctionBuildConfig.appIdentityMode - AnalyticsManager.track("app_start_time", mStartParams) + MogoAnalyticUtils.track("app_start_time", mStartParams) } } diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/chat/biz/IMoGoChatFacade.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/chat/biz/IMoGoChatFacade.kt index e77c682d31..321527e84d 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/chat/biz/IMoGoChatFacade.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/chat/biz/IMoGoChatFacade.kt @@ -200,5 +200,5 @@ interface IMoGoMediaFacade { interface IMoGoAnalyticsFacade { - fun track(eventType: String, data: Map? = hashMapOf()) + fun track(eventType: String, data: MutableMap = hashMapOf()) } \ No newline at end of file diff --git a/core/mogo-core-function-call/build.gradle b/core/mogo-core-function-call/build.gradle index f256ef0177..343680a5b4 100644 --- a/core/mogo-core-function-call/build.gradle +++ b/core/mogo-core-function-call/build.gradle @@ -46,16 +46,13 @@ dependencies { implementation rootProject.ext.dependencies.arouter kapt rootProject.ext.dependencies.aroutercompiler - // MoGo 数据埋点工具 - implementation rootProject.ext.dependencies.analytics - if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { implementation rootProject.ext.dependencies.mogo_core_data implementation rootProject.ext.dependencies.mogo_core_utils implementation rootProject.ext.dependencies.mogocommons } else { - implementation project(':core:mogo-core-utils') - implementation project(':foudations:mogo-commons') + compileOnly project(':core:mogo-core-utils') + compileOnly project(':core:mogo-core-data') compileOnly project(':libraries:mogo-adas') compileOnly project(':libraries:mogo-obu') api project(':libraries:mogo-map-api') diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerChassisLocationGCJ02ListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerChassisLocationGCJ02ListenerManager.kt index 1edd553d64..671a05f57a 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerChassisLocationGCJ02ListenerManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerChassisLocationGCJ02ListenerManager.kt @@ -6,7 +6,6 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Liste import com.mogo.eagle.core.function.call.base.CallerBase import com.mogo.eagle.core.utilcode.mogo.logger.Logger import com.mogo.eagle.core.utilcode.util.CoordinateTransform -import com.mogo.eagle.core.utilcode.util.FileUtils import com.mogo.eagle.core.utilcode.util.TimeUtils /** diff --git a/foudations/mogo-commons/build.gradle b/foudations/mogo-commons/build.gradle index 296811e92f..40dba94f37 100644 --- a/foudations/mogo-commons/build.gradle +++ b/foudations/mogo-commons/build.gradle @@ -1,4 +1,10 @@ -apply plugin: 'com.android.library' +plugins { + id 'com.android.library' + id 'kotlin-android' + id 'kotlin-android-extensions' + id 'kotlin-kapt' + id 'com.alibaba.arouter' +} android { compileSdkVersion rootProject.ext.android.compileSdkVersion @@ -36,13 +42,18 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation rootProject.ext.dependencies.kotlinstdlibjdk7 + implementation rootProject.ext.dependencies.androidxappcompat - implementation rootProject.ext.dependencies.analytics implementation rootProject.ext.dependencies.arouter annotationProcessor rootProject.ext.dependencies.aroutercompiler implementation rootProject.ext.dependencies.rxjava - implementation rootProject.ext.dependencies.mogoaicloudrealtime + implementation rootProject.ext.dependencies.amapnavi3dmap + implementation rootProject.ext.dependencies.analytics + + api 'org.greenrobot:eventbus:3.1.1' + api rootProject.ext.dependencies.androidautoSize if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { api rootProject.ext.dependencies.mogoaicloudservicesdk @@ -60,8 +71,7 @@ dependencies { api project(':core:mogo-core-network') } - api 'org.greenrobot:eventbus:3.1.1' - api rootProject.ext.dependencies.androidautoSize + } apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() \ No newline at end of file diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/analytics/AnalyticsUtils.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/analytics/AnalyticsUtils.java deleted file mode 100644 index de9951913a..0000000000 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/analytics/AnalyticsUtils.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.mogo.commons.analytics; - - -import android.content.Context; - -import com.elegant.analytics.Analytics; -import com.elegant.analytics.AnalyticsConfig; -import com.elegant.analytics.IAnalyticsParamsProvider; -import com.elegant.analytics.UploadMode; -import com.mogo.commons.AbsMogoApplication; -import com.mogo.commons.debug.DebugConfig; -import com.mogo.commons.network.ParamsUtil; - -import java.util.Map; - -import androidx.annotation.Keep; - -/** - * @author congtaowang - * @since 2019-12-23 - *

- * 埋点 - */ -public class AnalyticsUtils { - - @Keep - public static void init( Context context ) { - // 1 - debug 近实时上报，积累一条埋点上报，或者积累3秒上报一次。 - // 2 - 本地缓存，聚合上报，积累30条埋点上报，或者积累60秒上报一次。 - AnalyticsConfig.getInstance( context ).setAppKey( "0915430e5fdcbb553391f2a35cb8489f" ); - AnalyticsConfig.getInstance( context ).setUploadMode( DebugConfig.isDebug() ? UploadMode.instant : UploadMode.cache ); - AnalyticsConfig.getInstance( context ).setShouldLog( DebugConfig.isDebug() ); - AnalyticsConfig.getInstance( AbsMogoApplication.getApp() ).setParamsProvider(new IAnalyticsParamsProvider() { - @Override - public Map< String, Object > staticParams() { - return ParamsUtil.getAnalyticsCustomParams(); - } - - @Override - public Map< String, Object > dynamicParams() { - return null; - } - } ); - Analytics.getInstance().start( context ); - } - - /** - * 埋点 - * - * @param event 事件名称 - * @param properties 事件参数 - */ - public static void track( String event, Map< String, Object > properties ) { - Analytics.getInstance().track( event, properties ); - } -} diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/analytics/AnalyticsManager.kt b/foudations/mogo-commons/src/main/java/com/mogo/commons/utils/MogoAnalyticUtils.kt similarity index 93% rename from core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/analytics/AnalyticsManager.kt rename to foudations/mogo-commons/src/main/java/com/mogo/commons/utils/MogoAnalyticUtils.kt index 7fb33492fb..14a63addb2 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/analytics/AnalyticsManager.kt +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/utils/MogoAnalyticUtils.kt @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.call.analytics +package com.mogo.commons.utils import android.content.Context import androidx.annotation.Keep @@ -15,7 +15,7 @@ import com.mogo.eagle.core.utilcode.util.AppUtils * 埋点&数据统计 管理 * @author donghongyu */ -object AnalyticsManager { +object MogoAnalyticUtils { @Keep fun init(context: Context?, isDebug: Boolean) { @@ -45,7 +45,7 @@ object AnalyticsManager { * @param event 事件名称 * @param properties 事件参数 */ - fun track(event: String?, properties: HashMap) { + fun track(event: String?, properties: MutableMap) { Analytics.getInstance().track(event, properties) }