Merge remote-tracking branch 'origin/dev_robotaxi-d_250603_8.1.0' into dev_robotaxi-d_250603_8.1.0

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

@@ -81,6 +81,7 @@ class ExamControlWindow constructor(activity: Activity): View.OnTouchListener{
     private lateinit var ivTakeOverRecover: ImageView //恢复自驾
     private lateinit var ivTakeOverRequest: ImageView //接管请求
     private lateinit var ivEmergencyStop: ImageView //应急停车
+    private lateinit var ivCancelAutopilot: ImageView //退出自驾
 
     init {
         initFloatWindow()
@@ -133,6 +134,8 @@ class ExamControlWindow constructor(activity: Activity): View.OnTouchListener{
         ivTakeOverRecover = mFloatLayout.findViewById(R.id.ivTakeOverRecover)
         ivTakeOverRequest = mFloatLayout.findViewById(R.id.ivTakeOverRequest)
         ivEmergencyStop = mFloatLayout.findViewById(R.id.ivEmergencyStop)
+        ivCancelAutopilot = mFloatLayout.findViewById(R.id.ivCancelAutopilot)
+
         //关闭按钮
         ivCloseExam.setOnClickListener {
             clickListener?.closeWindow()
@@ -275,6 +278,11 @@ class ExamControlWindow constructor(activity: Activity): View.OnTouchListener{
         ivEmergencyStop.setOnClickListener {
             CallerAutoPilotControlManager.sendPlanningPullOverCmd(3)
         }
+        //退出自驾
+        ivCancelAutopilot.setOnClickListener {
+            //取消自动驾驶
+            CallerAutoPilotControlManager.cancelAutoPilot()
+        }
 
         //主驾
         tbSeatMainDriver.isChecked = mainDriverStatus

core/function-impl/mogo-core-function-devatools/src/main/res/drawable/exam_cancel_autopilot_selector.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/icon_cancel_autopilot_normal" android:state_pressed="false"/>
+    <item android:drawable="@drawable/icon_cancel_autopilot_pressed" android:state_pressed="true"/>
+</selector>

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

@@ -490,14 +490,26 @@
 
     <ImageView
         android:id="@+id/ivEmergencyStop"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/dp_395"
+        android:layout_height="@dimen/dp_139"
         app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         android:src="@drawable/exam_emergency_stop_selector"
         android:contentDescription="@string/exam_emergency_stop"
-        android:layout_marginBottom="@dimen/dp_31"
+        android:layout_marginBottom="@dimen/dp_35"
+        android:layout_marginStart="@dimen/dp_72"
+        />
+
+    <ImageView
+        android:id="@+id/ivCancelAutopilot"
+        android:layout_width="@dimen/dp_395"
+        android:layout_height="@dimen/dp_139"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:src="@drawable/exam_cancel_autopilot_selector"
+        android:contentDescription="@string/exam_cancel_autopilot"
+        android:layout_marginBottom="@dimen/dp_35"
+        android:layout_marginEnd="@dimen/dp_72"
         />
 
 

core/function-impl/mogo-core-function-devatools/src/main/res/values/strings.xml

@@ -36,6 +36,7 @@
     <string name="exam_take_over_request">接管请求</string>
     <string name="exam_take_over_recover">恢复自驾</string>
     <string name="exam_emergency_stop">应急停车</string>
+    <string name="exam_cancel_autopilot">退出自驾</string>
     <string name="exam_close">关闭考试车辆控制</string>
 
     <string name="identified_vehicle_malfunction">识别到车辆故障（%ds）</string>

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt

@@ -122,6 +122,7 @@ import com.mogo.eagle.core.utilcode.util.DeviceUtils
 import com.mogo.eagle.core.utilcode.util.FileUtils
 import com.mogo.eagle.core.utilcode.util.KeyboardUtils
 import com.mogo.eagle.core.utilcode.util.NetworkUtils
+import com.mogo.eagle.core.utilcode.util.SPUtils
 import com.mogo.eagle.core.utilcode.util.ScreenUtils
 import com.mogo.eagle.core.utilcode.util.StringUtils
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
@@ -609,11 +610,13 @@ internal class DebugSettingView @JvmOverloads constructor(
         //动态配置鹰眼显示MAP版本
         if(AppConfigInfo.mapShowName.isEmpty()){
             AppConfigInfo.mapShowName = CallerAutoPilotStatusListenerManager.getDockerVersion()+""
+            SPUtils.getInstance().put("mapShowName", AppConfigInfo.mapShowName)
         }
         etMapShowName.setText(AppConfigInfo.mapShowName)
         etMapShowName.text?.let { etMapShowName.setSelection(it.length) }
         btnEnsureMap.setOnClickListener {
             AppConfigInfo.mapShowName = etMapShowName.text.toString()
+            SPUtils.getInstance().put("mapShowName", AppConfigInfo.mapShowName)
             tvIpcVersionInfo.text = "MAP：${AppConfigInfo.mapShowName}"
             tvIpcVersionInfoKey.text = "MAP：${AppConfigInfo.mapShowName}"
             CallerMapShowNameManager.invokeMapShowName(AppConfigInfo.mapShowName)

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt

@@ -2,6 +2,7 @@ package com.mogo.eagle.core.data.app
 
 import android.os.Build
 import com.mogo.eagle.core.utilcode.util.AppUtils
+import com.mogo.eagle.core.utilcode.util.SPUtils
 
 /**
  * @author xiaoyuzhou
@@ -64,7 +65,7 @@ object AppConfigInfo {
     var slamMapVersion: String =""
     //鹰眼可动态展示的MAP版本
     @Volatile
-    var mapShowName: String = ""
+    var mapShowName: String = SPUtils.getInstance().getString("mapShowName", "")
 
     //业务状态信息
     /**