From 5e2b645a8b19c25dc73644cbfaa52e7d6aeb600f Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Tue, 18 Feb 2025 14:44:48 +0800
Subject: [PATCH] =?UTF-8?q?[6.10.0]=E6=88=91=E7=9A=84=E8=BD=A6=E8=BE=86?=
 =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/function/hmi/bone/tab/CarInfoTabView.kt     | 11 +++++++++++
 .../src/main/res/layout/view_car_info_tab.xml        | 12 ++++++++----
 2 files changed, 19 insertions(+), 4 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 936769975c..a9fba7e79d 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
@@ -4,6 +4,7 @@ import android.content.Context
 import android.util.AttributeSet
 import android.util.Log
 import android.view.LayoutInflater
+import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.mogo.commons.debug.DebugConfig
 import com.mogo.commons.storage.SharedPrefsMgr
@@ -284,6 +285,11 @@ class CarInfoTabView @JvmOverloads constructor(
                 }
                 CallerLogger.i(SceneConstant.M_HMI + TAG, "updateGridMapVersion, gridMapVersion:${AppConfigInfo.gridMapVersion}")
                 tvGridMapVersion.text = context.getString(R.string.tab_version_grid_map_info) + AppConfigInfo.gridMapVersion
+                tvGridMapVersion.visibility = View.VISIBLE
+            }
+        }else{
+            UiThreadHandler.post{
+                tvGridMapVersion.visibility = View.GONE
             }
         }
     }
@@ -299,6 +305,11 @@ class CarInfoTabView @JvmOverloads constructor(
                 }
                 CallerLogger.i(SceneConstant.M_HMI + TAG, "updateSlamMapVersion, slamMapVersion:${AppConfigInfo.slamMapVersion}")
                 tvSlamMapVersion.text = context.getString(R.string.tab_version_slam_map_info) + AppConfigInfo.slamMapVersion
+                tvSlamMapVersion.visibility = View.VISIBLE
+            }
+        }else{
+            UiThreadHandler.post{
+                tvSlamMapVersion.visibility = View.GONE
             }
         }
     }
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_car_info_tab.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_car_info_tab.xml
index 359a5779da..0d7505ac8e 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_car_info_tab.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_car_info_tab.xml
@@ -221,7 +221,7 @@
 
             <TextView
                 android:id="@+id/tvADMapVersion"
-                android:layout_width="wrap_content"
+                android:layout_width="@dimen/dp_0"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_20"
                 android:gravity="center_vertical"
@@ -229,11 +229,13 @@
                 android:textColor="@color/white"
                 android:textSize="@dimen/dp_32"
                 app:layout_constraintLeft_toLeftOf="@+id/tvHDMapVersion"
-                app:layout_constraintTop_toBottomOf="@+id/tvHDMapVersion" />
+                app:layout_constraintTop_toBottomOf="@+id/tvHDMapVersion"
+                app:layout_constraintRight_toRightOf="@id/tvCarExit"
+                />
 
             <TextView
                 android:id="@+id/tvGridMapVersion"
-                android:layout_width="wrap_content"
+                android:layout_width="@dimen/dp_0"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_20"
                 android:gravity="center_vertical"
@@ -242,11 +244,12 @@
                 android:textSize="@dimen/dp_32"
                 app:layout_constraintLeft_toLeftOf="@+id/tvADMapVersion"
                 app:layout_constraintTop_toBottomOf="@+id/tvADMapVersion"
+                app:layout_constraintRight_toRightOf="@id/tvCarExit"
                 />
 
             <TextView
                 android:id="@+id/tvSlamMapVersion"
-                android:layout_width="wrap_content"
+                android:layout_width="@dimen/dp_0"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_20"
                 android:gravity="center_vertical"
@@ -255,6 +258,7 @@
                 android:textSize="@dimen/dp_32"
                 app:layout_constraintLeft_toLeftOf="@+id/tvGridMapVersion"
                 app:layout_constraintTop_toBottomOf="@+id/tvGridMapVersion"
+                app:layout_constraintRight_toRightOf="@id/tvCarExit"
                 />
 
             <TextView