From c15fbf67226ae034a147e5d828ea0de7b65b22a5 Mon Sep 17 00:00:00 2001
From: renwj <renwenjie920@hotmail.com>
Date: Thu, 12 Sep 2024 14:50:59 +0800
Subject: [PATCH] =?UTF-8?q?[6.6.0][=E5=B4=A9=E6=BA=83=E7=BB=9F=E8=AE=A1]?=
 =?UTF-8?q?=20=E5=9F=8B=E7=82=B9=E4=BA=8B=E4=BB=B6=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=B4=A9=E6=BA=83=E7=89=88=E6=9C=AC=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logcat/CrashLogAnalyticsManager.kt                    | 8 +++++---
 .../logcat/MoGoLogRecordProviderImpl.kt                   | 4 +++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcat/CrashLogAnalyticsManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcat/CrashLogAnalyticsManager.kt
index 84ea124f4b..8bfa108210 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcat/CrashLogAnalyticsManager.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcat/CrashLogAnalyticsManager.kt
@@ -26,6 +26,7 @@ object CrashLogAnalyticsManager {
     private const val crashBranchHash = "branchHash" //Git Hash
     private const val crashKeyMessage = "keyMessage" //崩溃核心信息
     private const val crashIsDriver = "isDriver" //是否是司机屏
+    private const val crashAppVersion = "crashAppVersion" //是否是司机屏
 
     /**
      * 崩溃统计
@@ -39,7 +40,7 @@ object CrashLogAnalyticsManager {
      * @param branchHash Git Hash
      */
     private fun realCrashLogAnalytics(cosPath: String,type: String,plateNumber: String,carSn: String,mapVersion: String,eyeVersion: String,
-                                      appFlavor: String,branchHash: String,keyMessage: String,isDriver: Boolean){
+                                      appFlavor: String,branchHash: String,keyMessage: String,isDriver: Boolean, crashVersion: String){
         val crashLogParams = HashMap<String,Any>()
         crashLogParams[crashCosPath] = cosPath
         crashLogParams[crashType] = type
@@ -51,6 +52,7 @@ object CrashLogAnalyticsManager {
         crashLogParams[crashBranchHash] = branchHash
         crashLogParams[crashKeyMessage] = keyMessage
         crashLogParams[crashIsDriver] = isDriver
+        crashLogParams[crashAppVersion] = crashVersion
         MogoAnalyticUtils.track(crashLogRecord,crashLogParams)
     }
 
@@ -59,7 +61,7 @@ object CrashLogAnalyticsManager {
      * @param crashType 崩溃类型
      * @param keyMessage 崩溃关键信息
      */
-    fun crashLogAnalytics(crashType: String,keyMessage: String){
+    fun crashLogAnalytics(crashType: String, keyMessage: String, crashAppVersion: String){
         val crashCosPath = StringBuilder()
         crashCosPath.append("CarPad/")
         if(DebugConfig.isDebug()){
@@ -74,7 +76,7 @@ object CrashLogAnalyticsManager {
         realCrashLogAnalytics(crashCosPath.toString(),crashType, AppConfigInfo.plateNumber,
             SharedPrefsMgr.getInstance().sn,
             CallerAutoPilotStatusListenerManager.getDockerVersion() ?: "",
-            AppUtils.getAppVersionName(),AppConfigInfo.flavor,AppConfigInfo.workingBranchHash,keyMessage,AppConfigInfo.isDriver)
+            AppUtils.getAppVersionName(),AppConfigInfo.flavor,AppConfigInfo.workingBranchHash,keyMessage,AppConfigInfo.isDriver, crashAppVersion)
     }
 
 }
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcat/MoGoLogRecordProviderImpl.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcat/MoGoLogRecordProviderImpl.kt
index 0bb516bc3e..31d0275237 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcat/MoGoLogRecordProviderImpl.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcat/MoGoLogRecordProviderImpl.kt
@@ -284,7 +284,9 @@ internal class MoGoLogRecordProviderImpl: IMoGoLogRecordProvider,
                                     NativeCrash -> "NativeCrash"
                                     ANRCrash -> "ANRCrash"
                                 }
-                                CrashLogAnalyticsManager.crashLogAnalytics(typeStr, keyMessage)
+                                val appVersion = extra?.get("App version") ?: ""
+                                Log.d(TAG, "-- app version: $appVersion")
+                                CrashLogAnalyticsManager.crashLogAnalytics(typeStr, keyMessage, appVersion)
                             } catch (e: Throwable) {
                                 e.printStackTrace()
                             } finally {