From 64fcdc04227efcfe797757f0df4137c98404b8e1 Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Thu, 10 Jul 2025 11:02:19 +0800
Subject: [PATCH] =?UTF-8?q?[8.1.2]=E5=8A=A8=E6=80=81=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=B9=B0=E7=9C=BC=E6=98=BE=E7=A4=BAMAP=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8DBug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../function/hmi/bone/tab/CarInfoTabView.kt   |  6 ++-
 .../hmi/ui/setting/DebugSettingView.kt        | 13 +++++-
 .../function/hmi/ui/widget/VersionNameView.kt |  6 +++
 .../main/res/layout/view_debug_setting.xml    | 40 ++++++++++++++-----
 4 files changed, 51 insertions(+), 14 deletions(-)

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt
index 757fcef971..4f4a59c696 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt
@@ -265,8 +265,10 @@ class CarInfoTabView @JvmOverloads constructor(
             if(AppConfigInfo.mapShowName.isNotEmpty()){
                 tvADVersionName.text = AppConfigInfo.mapShowName
             }else{
-                CallerAutoPilotStatusListenerManager.getDockerVersion()?.let {
-                    tvADVersionName.text = it
+                if(CallerAutoPilotStatusListenerManager.getDockerVersion().isNullOrEmpty()){
+                    tvADVersionName.text = ""
+                }else{
+                    tvADVersionName.text = CallerAutoPilotStatusListenerManager.getDockerVersion()
                 }
             }
         }
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
index e762f22ca2..48b8a02519 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
@@ -152,6 +152,7 @@ import kotlinx.android.synthetic.main.view_debug_setting.view.btChangeEnv
 import kotlinx.android.synthetic.main.view_debug_setting.view.btnAppReboot
 import kotlinx.android.synthetic.main.view_debug_setting.view.btnAutoCheck
 import kotlinx.android.synthetic.main.view_debug_setting.view.btnBrakeThreshold
+import kotlinx.android.synthetic.main.view_debug_setting.view.btnClearMap
 import kotlinx.android.synthetic.main.view_debug_setting.view.btnConnectServerIp
 import kotlinx.android.synthetic.main.view_debug_setting.view.btnDeleteDB
 import kotlinx.android.synthetic.main.view_debug_setting.view.btnDisconnectIpc
@@ -610,8 +611,6 @@ internal class DebugSettingView @JvmOverloads constructor(
             }
         }
         //动态配置鹰眼显示MAP版本
-        etMapShowName.setText(AppConfigInfo.mapShowName)
-        etMapShowName.text?.let { etMapShowName.setSelection(it.length) }
         btnEnsureMap.setOnClickListener {
             AppConfigInfo.mapShowName = etMapShowName.text.toString()
             SPUtils.getInstance().put("mapShowName", AppConfigInfo.mapShowName)
@@ -620,6 +619,16 @@ internal class DebugSettingView @JvmOverloads constructor(
             CallerMapShowNameManager.invokeMapShowName(AppConfigInfo.mapShowName)
         }
 
+        //清空动态配置鹰眼显示MAP版本
+        btnClearMap.setOnClickListener {
+            etMapShowName.setText("")
+            AppConfigInfo.mapShowName = ""
+            SPUtils.getInstance().put("mapShowName", AppConfigInfo.mapShowName)
+            tvIpcVersionInfo.text = "MAP：${AppConfigInfo.mapShowName}"
+            tvIpcVersionInfoKey.text = "MAP：${AppConfigInfo.mapShowName}"
+            CallerMapShowNameManager.invokeMapShowName(AppConfigInfo.mapShowName)
+        }
+
         /**
          * 状态中心
          */
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VersionNameView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VersionNameView.kt
index 36882a73d0..b6e86431e9 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VersionNameView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VersionNameView.kt
@@ -77,6 +77,12 @@ class VersionNameView @JvmOverloads constructor(
                     it.text = version
                 }
             }
+        }else if(version.isNullOrEmpty()){
+            scope.launch {
+                tvMapVersionName?.also {
+                    it.text = ""
+                }
+            }
         }
 
     }
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
index 520f95c0c3..a876494c64 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
@@ -563,19 +563,39 @@
                     android:paddingBottom="@dimen/dp_10"
                     android:paddingStart="@dimen/dp_20"
                     android:paddingEnd="@dimen/dp_20"
+                    android:hint="请输入要展示的MAP版本"
                     />
 
-                <Button
-                    android:id="@+id/btnEnsureMap"
-                    android:layout_width="wrap_content"
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="确定"
-                    style="@style/DebugSettingText"
-                    android:paddingStart="@dimen/dp_30"
-                    android:paddingEnd="@dimen/dp_30"
-                    android:paddingTop="@dimen/dp_10"
-                    android:paddingBottom="@dimen/dp_10"
-                    />
+                    android:orientation="horizontal">
+
+                    <Button
+                        android:id="@+id/btnEnsureMap"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="确定"
+                        style="@style/DebugSettingText"
+                        android:paddingStart="@dimen/dp_30"
+                        android:paddingEnd="@dimen/dp_30"
+                        android:paddingTop="@dimen/dp_10"
+                        android:paddingBottom="@dimen/dp_10"
+                        />
+
+                    <Button
+                        android:id="@+id/btnClearMap"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="清空"
+                        style="@style/DebugSettingText"
+                        android:paddingStart="@dimen/dp_30"
+                        android:paddingEnd="@dimen/dp_30"
+                        android:paddingTop="@dimen/dp_10"
+                        android:paddingBottom="@dimen/dp_10"
+                        />
+
+                </LinearLayout>
 
                 <View
                     android:layout_width="match_parent"