From c7c4fcdd307d65bd20cbdf10d966ab6fe962b582 Mon Sep 17 00:00:00 2001
From: donghongyu-pc <donghongyu@zhidaoauto.com>
Date: Wed, 4 Sep 2024 19:25:01 +0800
Subject: [PATCH] =?UTF-8?q?[6.6.0]=201=E3=80=81=E5=9C=A8=E5=9F=8B=E7=82=B9?=
 =?UTF-8?q?=E7=9A=84=E5=9F=BA=E7=A1=80=E5=8F=82=E6=95=B0=E4=B8=AD=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0wifi=E3=80=81docker=E7=AD=89=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo-commons/src/main/AndroidManifest.xml | 10 +++++++
 .../mogo/commons/utils/MogoAnalyticUtils.kt   | 28 +++++++++++++++----
 2 files changed, 33 insertions(+), 5 deletions(-)

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 @@
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.INTERNET" />
+
+
+    <application>
+        <meta-data android:name="com.elegant.analytics.AnalyticsConfig.BulkUploadLimit" android:value="100"/>
+        <meta-data android:name="com.elegant.analytics.AnalyticsConfig.FlushInterval" android:value="50000"/>
+    </application>
+
 
 </manifest>
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<String, Any> {
-                return getAnalyticsCustomParams(isDebug)
+            override fun staticParams(): Map<String, Any>? {
+                return null
             }
 
             //动态参数
             override fun dynamicParams(): Map<String, Any>? {
-                return null
+                return getAnalyticsCustomParams(isDebug)
             }
         }
         Analytics.getInstance().start(context)
@@ -51,6 +53,15 @@ object MogoAnalyticUtils {
      * @param properties 事件参数
      */
     fun track(event: String?, properties: MutableMap<String, Any>) {
+        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