From d988e789bf335bc39315aa928b7be8d72860bfa3 Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Tue, 11 Jun 2024 18:55:30 +0800
Subject: [PATCH] =?UTF-8?q?[6.4.4]=E8=B0=83=E6=95=B4=E8=BF=9E=E6=8E=A5?=
 =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=98=BE=E7=A4=BAView=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../driver/src/main/res/layout/bus_base_fragment.xml |  5 +++--
 .../src/main/res/layout/charter_base_fragment.xml    |  5 +++--
 .../src/main/res/layout/shuttle_base_fragment.xml    |  5 +++--
 .../src/main/res/layout/taxi_base_fragment.xml       |  5 +++--
 .../main/res/layout/unmanned_taxi_base_fragment.xml  |  5 +++--
 .../function/hmi/ui/widget/ConnectionProcessView.kt  | 12 ++++++++++++
 .../src/main/res/layout/view_connection_process.xml  |  1 -
 7 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml b/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml
index 460966ce36..a32dea82da 100644
--- a/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml
+++ b/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml
@@ -60,6 +60,7 @@
 
     <!--APP、MAP版本-->
     <com.mogo.eagle.core.function.hmi.ui.widget.VersionNameView
+        android:id="@+id/viewVersionName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="45dp"
@@ -309,8 +310,8 @@
     <com.mogo.eagle.core.function.hmi.ui.widget.ConnectionProcessView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/dp_58"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginBottom="@dimen/dp_18"
+        app:layout_constraintBottom_toTopOf="@id/viewVersionName"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         />
diff --git a/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml b/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml
index 4c461881a0..daa6f3b6e1 100644
--- a/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml
+++ b/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml
@@ -67,6 +67,7 @@
 
     <!--APP、MAP版本-->
     <com.mogo.eagle.core.function.hmi.ui.widget.VersionNameView
+        android:id="@+id/viewVersionName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="45dp"
@@ -348,8 +349,8 @@
     <com.mogo.eagle.core.function.hmi.ui.widget.ConnectionProcessView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/dp_58"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginBottom="@dimen/dp_18"
+        app:layout_constraintBottom_toTopOf="@id/viewVersionName"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         />
diff --git a/OCH/shuttle/driver/src/main/res/layout/shuttle_base_fragment.xml b/OCH/shuttle/driver/src/main/res/layout/shuttle_base_fragment.xml
index 114b79b4f9..4e8489372e 100644
--- a/OCH/shuttle/driver/src/main/res/layout/shuttle_base_fragment.xml
+++ b/OCH/shuttle/driver/src/main/res/layout/shuttle_base_fragment.xml
@@ -57,6 +57,7 @@
 
     <!--APP、MAP版本-->
     <com.mogo.eagle.core.function.hmi.ui.widget.VersionNameView
+        android:id="@+id/viewVersionName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="45dp"
@@ -354,8 +355,8 @@
     <com.mogo.eagle.core.function.hmi.ui.widget.ConnectionProcessView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/dp_58"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginBottom="@dimen/dp_18"
+        app:layout_constraintBottom_toTopOf="@id/viewVersionName"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         />
diff --git a/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
index ab0eced429..4ec79eb3f4 100644
--- a/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
+++ b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
@@ -94,6 +94,7 @@
 
     <!--APP、MAP版本-->
     <com.mogo.eagle.core.function.hmi.ui.widget.VersionNameView
+        android:id="@+id/viewVersionName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="45dp"
@@ -353,8 +354,8 @@
     <com.mogo.eagle.core.function.hmi.ui.widget.ConnectionProcessView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/dp_58"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginBottom="@dimen/dp_18"
+        app:layout_constraintBottom_toTopOf="@id/viewVersionName"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         />
diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml
index fd1a5178bf..c0c197cf4f 100644
--- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml
+++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml
@@ -92,6 +92,7 @@
 
     <!--APP、MAP版本-->
     <com.mogo.eagle.core.function.hmi.ui.widget.VersionNameView
+        android:id="@+id/viewVersionName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="45dp"
@@ -355,8 +356,8 @@
     <com.mogo.eagle.core.function.hmi.ui.widget.ConnectionProcessView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/dp_58"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginBottom="@dimen/dp_18"
+        app:layout_constraintBottom_toTopOf="@id/viewVersionName"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         />
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ConnectionProcessView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ConnectionProcessView.kt
index d39157b735..a53d8c1de3 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ConnectionProcessView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ConnectionProcessView.kt
@@ -208,8 +208,10 @@ class ConnectionProcessView @JvmOverloads constructor(
     private fun showIPCConnectSuccessView(){
         ThreadUtils.runOnUiThread {
             this.visibility = View.VISIBLE
+            pbConnectionProgress.setPadding(5,3,5,8)
             pbConnectionProgress.progressDrawable = ContextCompat.getDrawable(context, R.drawable.connection_progress_style)
             pbConnectionProgress.progress = 25
+            tvConnectionStatus.setPadding(0,0,0,10)
             tvConnectionStatus.text = "系统启动中..."
             clConnectionTip.visibility = View.GONE
         }
@@ -221,8 +223,10 @@ class ConnectionProcessView @JvmOverloads constructor(
     private fun showSSMConnectSuccessView(){
         ThreadUtils.runOnUiThread{
             this.visibility = View.VISIBLE
+            pbConnectionProgress.setPadding(5,3,5,8)
             pbConnectionProgress.progressDrawable = ContextCompat.getDrawable(context, R.drawable.connection_progress_style)
             pbConnectionProgress.progress = 50
+            tvConnectionStatus.setPadding(0,0,0,10)
             tvConnectionStatus.text = "系统启动中..."
             clConnectionTip.visibility = View.GONE
         }
@@ -234,8 +238,10 @@ class ConnectionProcessView @JvmOverloads constructor(
     private fun showAutopilotReadySuccessView(){
         ThreadUtils.runOnUiThread{
             this.visibility = View.VISIBLE
+            pbConnectionProgress.setPadding(0,0,0,0)
             pbConnectionProgress.progressDrawable = ContextCompat.getDrawable(context, R.drawable.connection_success_style)
             pbConnectionProgress.progress = 100
+            tvConnectionStatus.setPadding(0,0,0,0)
             tvConnectionStatus.text = "系统启动成功"
             clConnectionTip.visibility = View.GONE
         }
@@ -247,8 +253,10 @@ class ConnectionProcessView @JvmOverloads constructor(
     private fun showIPCConnectFailView(){
         ThreadUtils.runOnUiThread {
             this.visibility = View.VISIBLE
+            pbConnectionProgress.setPadding(0,0,0,0)
             pbConnectionProgress.progressDrawable = ContextCompat.getDrawable(context, R.drawable.connection_fail_style)
             pbConnectionProgress.progress = 25
+            tvConnectionStatus.setPadding(0,0,0,0)
             tvConnectionStatus.text = "系统启动异常"
             clConnectionTip.visibility = View.VISIBLE
             tvConnectionTipTitle.text = "Telematics连接异常"
@@ -262,8 +270,10 @@ class ConnectionProcessView @JvmOverloads constructor(
     private fun showSSMConnectFailView(){
         ThreadUtils.runOnUiThread {
             this.visibility = View.VISIBLE
+            pbConnectionProgress.setPadding(0,0,0,0)
             pbConnectionProgress.progressDrawable = ContextCompat.getDrawable(context, R.drawable.connection_fail_style)
             pbConnectionProgress.progress = 50
+            tvConnectionStatus.setPadding(0,0,0,0)
             tvConnectionStatus.text = "系统启动异常"
             clConnectionTip.visibility = View.VISIBLE
             tvConnectionTipTitle.text = "SSM连接异常"
@@ -277,8 +287,10 @@ class ConnectionProcessView @JvmOverloads constructor(
     private fun showAutopilotReadyFailView(){
         ThreadUtils.runOnUiThread {
             this.visibility = View.VISIBLE
+            pbConnectionProgress.setPadding(0,0,0,0)
             pbConnectionProgress.progressDrawable = ContextCompat.getDrawable(context, R.drawable.connection_fail_style)
             pbConnectionProgress.progress = 100
+            tvConnectionStatus.setPadding(0,0,0,0)
             tvConnectionStatus.text = "系统启动异常"
             clConnectionTip.visibility = View.VISIBLE
             tvConnectionTipTitle.text = "系统冷启动异常"
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_connection_process.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_connection_process.xml
index dcac1411be..26ca2c4098 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_connection_process.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_connection_process.xml
@@ -32,7 +32,6 @@
         android:textSize="@dimen/sp_32"
         android:textColor="@color/white"
         android:elevation="@dimen/dp_10"
-        android:paddingBottom="@dimen/dp_10"
         />
 
     <androidx.constraintlayout.widget.ConstraintLayout