diff --git a/foudations/mogo-commons/src/main/AndroidManifest.xml b/foudations/mogo-commons/src/main/AndroidManifest.xml index be5afff8c7..e4207a4d4e 100644 --- a/foudations/mogo-commons/src/main/AndroidManifest.xml +++ b/foudations/mogo-commons/src/main/AndroidManifest.xml @@ -3,5 +3,15 @@ + + + + + + + + + + diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/utils/MogoAnalyticUtils.kt b/foudations/mogo-commons/src/main/java/com/mogo/commons/utils/MogoAnalyticUtils.kt index 8b7d16bba8..19a163687f 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/utils/MogoAnalyticUtils.kt +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/utils/MogoAnalyticUtils.kt @@ -9,10 +9,12 @@ import com.elegant.analytics.IAnalyticsParamsProvider import com.elegant.analytics.UploadMode import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.data.app.AppConfigInfo +import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.util.AppUtils import com.mogo.eagle.core.utilcode.util.DateTimeUtils +import com.mogo.eagle.core.utilcode.util.NetworkUtils import org.json.JSONObject /** @@ -32,13 +34,13 @@ object MogoAnalyticUtils { // 设置参数提供者 AnalyticsConfig.getInstance(context).paramsProvider = object : IAnalyticsParamsProvider { // 静态参数 - override fun staticParams(): Map { - return getAnalyticsCustomParams(isDebug) + override fun staticParams(): Map? { + return null } //动态参数 override fun dynamicParams(): Map? { - return null + return getAnalyticsCustomParams(isDebug) } } Analytics.getInstance().start(context) @@ -51,6 +53,15 @@ object MogoAnalyticUtils { * @param properties 事件参数 */ fun track(event: String?, properties: MutableMap) { + try { + properties["network_type"] = NetworkUtils.getNetworkType() + properties["network_ssid"] = NetworkUtils.getSSID() + properties["network_wifi_enabled "] = NetworkUtils.getWifiEnabled() + properties["network_is_available"] = NetworkUtils.isAvailable() + properties["network_is_available_by_ping"] = NetworkUtils.isAvailableByPing("49.233.99.26") + } catch (e: Exception) { + properties["network_type"] = "获取设备网络状态错误" + } Analytics.getInstance().track(event, properties) } @@ -91,11 +102,18 @@ object MogoAnalyticUtils { } map["app_support_business"] = FunctionBuildConfig.supportBusiness - map["plate_number"] = AppConfigInfo.plateNumber map["product_type"] = AppIdentityModeUtils.getProduct(FunctionBuildConfig.appIdentityMode).name - map["car_type"] = AppIdentityModeUtils.getCarType(FunctionBuildConfig.appIdentityMode).name map["time"] = DateTimeUtils.getTimeText(DateTimeUtils.yyyy_MM_dd_HH_mm_ss_SSS) + + // 自动驾驶工控机相关信息 + map["plate_number"] = AppConfigInfo.plateNumber + map["docker_version"] = AppConfigInfo.dockerVersion + map["ipc_mac_address"] = AppConfigInfo.iPCMacAddress + map["protocol_version_number"] = AppConfigInfo.protocolVersionNumber + map["ad_hd_map_version"] = AppConfigInfo.adHdMapVersion + map["car_type"] = AppIdentityModeUtils.getCarType(FunctionBuildConfig.appIdentityMode).name + return map } } \ No newline at end of file