Merge branch 'dev_robotaxi-d_240912_6.7.0' into 'tmp_6.7.0_arrow'

# Conflicts:
#   core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/exam/ExamControlWindow.kt

@@ -89,8 +89,8 @@ class ExamControlWindow constructor(activity: Activity): View.OnTouchListener{
             it.format = PixelFormat.RGBA_8888
             it.flags = WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL
             it.gravity = Gravity.START or Gravity.TOP
-            it.width = 844
-            it.height = 1114
+            it.width = 906
+            it.height = 1176
             it.alpha = 1.0f
         }
     }

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)
     }
 
 }

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 {

core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_exam_control.xml

@@ -1,38 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="@dimen/dp_844"
-    android:layout_height="@dimen/dp_1114"
+    android:layout_width="@dimen/dp_906"
+    android:layout_height="@dimen/dp_1176"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@drawable/bg_exam_control">
 
-    <View
-        android:id="@+id/viewTitleBg"
-        android:layout_width="@dimen/dp_844"
-        android:layout_height="@dimen/dp_102"
-        android:background="@drawable/bg_exam_control_title"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        />
-
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="@id/viewTitleBg"
-        app:layout_constraintBottom_toBottomOf="@id/viewTitleBg"
-        app:layout_constraintLeft_toLeftOf="@id/viewTitleBg"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
         android:text="@string/exam_vehicle_control"
         android:textSize="@dimen/sp_34"
         android:textColor="@color/white"
-        android:layout_marginStart="@dimen/dp_63"
+        android:layout_marginStart="@dimen/dp_94"
+        android:layout_marginTop="@dimen/dp_58"
         />
 
     <ImageView
         android:id="@+id/ivCloseExam"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="@id/viewTitleBg"
-        app:layout_constraintBottom_toBottomOf="@id/viewTitleBg"
+        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         android:src="@drawable/icon_exam_close"
         android:contentDescription="@string/exam_close"
@@ -40,6 +29,7 @@
         android:paddingTop="@dimen/dp_30"
         android:paddingBottom="@dimen/dp_30"
         android:paddingStart="@dimen/dp_56"
+        android:layout_margin="@dimen/dp_31"
         />
 
     <View
@@ -49,7 +39,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        android:layout_marginTop="@dimen/dp_142"
+        android:layout_marginTop="@dimen/dp_173"
         android:background="@drawable/bg_exam_vehicle_mode"
         />
 
@@ -197,7 +187,7 @@
         app:layout_constraintTop_toBottomOf="@id/viewVehicleModeBg"
         app:layout_constraintLeft_toLeftOf="parent"
         android:layout_marginTop="@dimen/dp_40"
-        android:layout_marginLeft="@dimen/dp_47"
+        android:layout_marginLeft="@dimen/dp_78"
         android:background="@drawable/bg_exam_seat_status"
         />
 
@@ -269,7 +259,7 @@
         app:layout_constraintRight_toRightOf="parent"
         android:src="@drawable/exam_line_to_right_selector"
         android:layout_marginTop="@dimen/dp_40"
-        android:layout_marginRight="@dimen/dp_47"
+        android:layout_marginRight="@dimen/dp_78"
         android:contentDescription="@string/exam_line_to_right"
         />
 
@@ -340,6 +330,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         android:src="@drawable/exam_emergency_stop_selector"
         android:contentDescription="@string/exam_emergency_stop"
+        android:layout_marginBottom="@dimen/dp_31"
         />