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版本"
/>
-
+ android:orientation="horizontal">
+
+
+
+
+
+