From 67610431897bd4ed243cb69c324d5d4b06696212 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Mon, 23 Nov 2020 18:17:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=9F=8B=E7=82=B9sdk?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.gradle | 2 +- .../com/mogo/commons/AbsMogoApplication.java | 16 ++++------- .../commons/analytics/AnalyticsUtils.java | 28 ++++++++++++++++++- .../roadcondition/util/AnalyticsUtil.kt | 1 - 4 files changed, 33 insertions(+), 14 deletions(-) diff --git a/config.gradle b/config.gradle index 91d3f23118..2b8a27d055 100644 --- a/config.gradle +++ b/config.gradle @@ -60,7 +60,7 @@ ext { // 语音替换方案 暂时只用TTS 解决焦点问题 aiassistReplace : "com.zhidao.mogoVoicesdk:voice:1.0.5", // 公司服务 - 埋点 - analytics : "com.elegant.analytics:analytics:1.1.19", + analytics : "com.elegant.analytics:analytics:1.1.28", retrofit : "com.squareup.retrofit2:retrofit:2.6.0", retrofitadapter : "com.squareup.retrofit2:adapter-rxjava2:2.6.0", diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java index 257e880764..3ef4ea6d4a 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java @@ -11,6 +11,9 @@ import android.widget.TextView; import com.alibaba.android.arouter.launcher.ARouter; import com.elegant.analytics.Analytics; import com.elegant.analytics.AnalyticsConfig; +import com.elegant.analytics.IAnalyticsParamsProvider; +import com.elegant.analytics.UploadMode; +import com.mogo.commons.analytics.AnalyticsUtils; import com.mogo.commons.debug.DebugConfig; import com.mogo.commons.device.Devices; import com.mogo.commons.network.AllAllowedHostnameVerifier; @@ -19,19 +22,16 @@ import com.mogo.commons.network.ParamsUtil; import com.mogo.commons.network.X509TrustManagerImpl; import com.mogo.commons.storage.SpStorage; import com.mogo.utils.ThreadPoolService; -import com.mogo.utils.TipDrawable; import com.mogo.utils.TipToast; import com.mogo.utils.network.NetConfig; -import java.io.IOException; import java.security.SecureRandom; +import java.util.Map; import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManager; -import okhttp3.Interceptor; import okhttp3.Request; -import okhttp3.Response; /** * @author congtaowang @@ -114,14 +114,8 @@ public class AbsMogoApplication extends Application { private void asyncInit() { ThreadPoolService.execute( () -> { initNetConfig(); - // 初始化toast // 初始化埋点 - Analytics.getInstance().start( sApp ); - Analytics.getInstance().setAppKey( "6bbe7e0e1ecd8e2f8dc336e1678a2791" ); - // 0 - debug 近实时上报，积累一条埋点上报，或者积累3秒上报一次。 - // 2 - 本地缓存，聚合上报，积累30条埋点上报，或者积累60秒上报一次。 - AnalyticsConfig.getInstance( sApp ).setMode( DebugConfig.isDebug() ? 0 : 2 ); - AnalyticsConfig.getInstance( sApp ).shouldLog( DebugConfig.isDebug() ); + AnalyticsUtils.init(sApp); Devices.init( getApp() ); Devices.checkBindState(); asyncInitImpl(); 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 index 599f0271ae..e457421552 100644 --- 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 @@ -1,6 +1,13 @@ 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; @@ -13,6 +20,26 @@ import java.util.Map; */ public class AnalyticsUtils { + public static void init( Context context ) { + // 1 - debug 近实时上报，积累一条埋点上报，或者积累3秒上报一次。 + // 2 - 本地缓存，聚合上报，积累30条埋点上报，或者积累60秒上报一次。 + AnalyticsConfig.getInstance( context ).setAppKey( "6bbe7e0e1ecd8e2f8dc336e1678a2791" ); + 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 ); + } + /** * 埋点 * @@ -20,7 +47,6 @@ public class AnalyticsUtils { * @param properties 事件参数 */ public static void track( String event, Map< String, Object > properties ) { - Analytics.getInstance().setCustomParams( ParamsUtil.getAnalyticsCustomParams() ); Analytics.getInstance().track( event, properties ); } } diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/AnalyticsUtil.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/AnalyticsUtil.kt index 6290f538ba..6c8ac01e1e 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/AnalyticsUtil.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/AnalyticsUtil.kt @@ -50,6 +50,5 @@ fun trackNormalEvent(event: String, data: MutableMap?, context: Con localParams["systemversion"] = getSystemVersion(context) localParams["sn"] = Utils.getSn() - Analytics.getInstance().setCustomParams(localParams) Analytics.getInstance().track(event, data) } \ No newline at end of file