From c94043344e5579dc6ad80d8bd1a1cb0e087f9eee Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Tue, 28 Feb 2023 17:12:38 +0800
Subject: [PATCH] =?UTF-8?q?[dev=5Farch=5Fopt=5F3.0]=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7=E6=98=BE=E7=A4=BAView=E6=94=B9=E4=B8=BA=E4=B8=A4?=
 =?UTF-8?q?=E8=A1=8C=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../function/hmi/ui/widget/VersionNameView.kt | 21 +++++--------------
 .../src/main/res/layout/view_version_name.xml |  4 +++-
 2 files changed, 8 insertions(+), 17 deletions(-)

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 cbfbab04bf..bc404b047d 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
@@ -6,13 +6,11 @@ import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.widget.LinearLayout
 import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo
-import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.function.main.AppListActivity
-import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.util.ActivityUtils
 import com.mogo.eagle.core.utilcode.util.AppUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
@@ -41,11 +39,8 @@ class VersionNameView @JvmOverloads constructor(
     }
 
     private fun initView(){
-        //版本水印只在司机端展示
-        if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){
-            showCurrentPadVersion()
-            showCurrentMapVersion()
-        }
+        showCurrentPadVersion()
+        showCurrentMapVersion()
 
         // 调试入口，应对M1、M2没有安装Launcher的情况
         setOnLongClickListener {
@@ -72,7 +67,7 @@ class VersionNameView @JvmOverloads constructor(
         UiThreadHandler.post {
             tvMapVersionName?.let {
                 if (!dockerVersion.isNullOrEmpty()) {
-                    it.text = " ; MAP:${dockerVersion}"
+                    it.text = "MAP:${dockerVersion}"
                 }
             }
         }
@@ -80,18 +75,12 @@ class VersionNameView @JvmOverloads constructor(
 
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
-        //版本水印只在司机端展示
-        if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){
-            CallerAutoPilotStatusListenerManager.addListener(TAG, this)
-        }
+        CallerAutoPilotStatusListenerManager.addListener(TAG, this)
     }
 
     override fun onDetachedFromWindow() {
         super.onDetachedFromWindow()
-        //版本水印只在司机端展示
-        if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){
-            CallerAutoPilotStatusListenerManager.removeListener(TAG)
-        }
+        CallerAutoPilotStatusListenerManager.removeListener(TAG)
     }
 
     override fun onAutopilotStatusResponse(autoPilotStatusInfo: AutopilotStatusInfo) {
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_version_name.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_version_name.xml
index 30319d1e89..8109c27c76 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_version_name.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_version_name.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:orientation="horizontal">
+    android:orientation="vertical">
 
     <TextView
         android:id="@+id/tvAppVersionName"
@@ -10,6 +10,7 @@
         android:layout_height="wrap_content"
         android:textSize="@dimen/dp_28"
         android:textColor="#FFBEC6EF"
+        android:layout_gravity="center_horizontal"
         />
 
     <TextView
@@ -18,6 +19,7 @@
         android:layout_height="wrap_content"
         android:textSize="@dimen/dp_28"
         android:textColor="#FFBEC6EF"
+        android:layout_gravity="center_horizontal"
         />
 
 </LinearLayout>
\ No newline at end of file