From 05a75395d4396b9e4c2f6c100765a6afe5105c0a Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Fri, 18 Oct 2024 16:37:11 +0800
Subject: [PATCH] =?UTF-8?q?[6.7.0]BUS=E4=B9=98=E5=AE=A2=E7=AB=AF=E7=BA=A2?=
 =?UTF-8?q?=E7=BB=BF=E7=81=AFUI=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hmi_view_fusion_traffic_light_p_bus.xml   | 22 +++++-----
 .../view_traffic_light_prompt_p_bus.xml       | 42 +++++++++++--------
 2 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_fusion_traffic_light_p_bus.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_fusion_traffic_light_p_bus.xml
index 2037dead22..23c3fe2edb 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_fusion_traffic_light_p_bus.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_fusion_traffic_light_p_bus.xml
@@ -19,6 +19,17 @@
         app:ringWidth="@dimen/dp_5"
         />
 
+    <ImageView
+        android:id="@+id/fusionTrafficLightPointer"
+        android:layout_width="@dimen/dp_18"
+        android:layout_height="@dimen/dp_18"
+        app:layout_constraintCircle="@id/fusionTrafficLightState"
+        app:layout_constraintCircleRadius="@dimen/dp_44"
+        android:src="@drawable/icon_light_green_pointer_p_bus"
+        android:contentDescription="@string/fusion_traffic_light_pointer"
+        tools:ignore="MissingConstraints"
+        />
+
     <ImageView
         android:id="@+id/fusionTrafficLightState"
         android:layout_width="@dimen/dp_110"
@@ -43,17 +54,6 @@
         android:contentDescription="@string/fusion_traffic_light_scale"
         />
 
-    <ImageView
-        android:id="@+id/fusionTrafficLightPointer"
-        android:layout_width="@dimen/dp_18"
-        android:layout_height="@dimen/dp_18"
-        app:layout_constraintCircle="@id/fusionTrafficLightState"
-        app:layout_constraintCircleRadius="@dimen/dp_44"
-        android:src="@drawable/icon_light_green_pointer_p_bus"
-        android:contentDescription="@string/fusion_traffic_light_pointer"
-        tools:ignore="MissingConstraints"
-        />
-
     <com.mogo.eagle.core.function.hmi.ui.widget.TypefaceTextView
         android:id="@+id/fusionTrafficLightNum"
         android:layout_width="wrap_content"
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_traffic_light_prompt_p_bus.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_traffic_light_prompt_p_bus.xml
index 85cc51afd0..0c82e7e8d7 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_traffic_light_prompt_p_bus.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_traffic_light_prompt_p_bus.xml
@@ -29,28 +29,34 @@
         android:textStyle="bold"
         />
 
-    <com.mogo.eagle.core.function.hmi.ui.widget.TypefaceTextView
-        android:id="@+id/tvTrafficNum"
+    <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:layout_constraintBottom_toBottomOf="@id/tvPromptContent"
         app:layout_constraintLeft_toRightOf="@id/tvPromptContent"
-        android:textSize="@dimen/sp_90"
-        android:layout_marginStart="@dimen/dp_19"
-        app:textType="DS_DIGIB_2"
-        android:layout_marginBottom="@dimen/dp_m_10"
-        />
+        app:layout_constraintRight_toRightOf="parent"
+        android:layout_marginEnd="@dimen/dp_25"
+        >
 
-    <com.mogo.eagle.core.function.hmi.ui.widget.TypefaceTextView
-        android:id="@+id/tvTrafficNumDecimal"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="@id/tvPromptContent"
-        app:layout_constraintLeft_toRightOf="@id/tvTrafficNum"
-        android:layout_marginStart="@dimen/dp_2"
-        android:textSize="@dimen/sp_50"
-        app:textType="DS_DIGIB_2"
-        android:layout_marginBottom="@dimen/dp_m_2"
-        />
+        <com.mogo.eagle.core.function.hmi.ui.widget.TypefaceTextView
+            android:id="@+id/tvTrafficNum"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="@dimen/sp_90"
+            app:textType="DS_DIGIB_2"
+            android:layout_marginBottom="@dimen/dp_m_10"
+            />
+
+        <com.mogo.eagle.core.function.hmi.ui.widget.TypefaceTextView
+            android:id="@+id/tvTrafficNumDecimal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_2"
+            android:textSize="@dimen/sp_50"
+            app:textType="DS_DIGIB_2"
+            android:layout_marginBottom="@dimen/dp_m_2"
+            />
+
+    </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file