From e102bb6adcb25c1eb23bd224e8871caae56a223f Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Mon, 16 Jun 2025 11:52:37 +0800
Subject: [PATCH] =?UTF-8?q?[8.1.0]=E6=8C=82=E8=BD=BD=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E7=BA=A2=E7=BB=BF=E7=81=AF=E6=8E=A7=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/layout/charter_base_fragment.xml | 12 ++++----
 .../shuttle_p_weak_jl_base_fragment.xml       | 13 +++++----
 .../src/main/res/layout/taxi_p_home.xml       | 21 +++-----------
 .../res/layout/taxt_u_p_base_fragment.xml     | 19 ++----------
 .../main/res/layout/view_map_container.xml    | 29 +++++--------------
 5 files changed, 30 insertions(+), 64 deletions(-)

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 890383e853..1507c11086 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
@@ -100,15 +100,17 @@
 
 
     <!--红绿灯-->
-    <com.mogo.eagle.core.function.hmi.ui.widget.SingleTrafficLightView
+    <com.mogo.eagle.core.function.hmi.ui.widget.TrafficLightView
         android:id="@+id/viewTrafficLightVr"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_28"
-        android:layout_marginEnd="@dimen/dp_40"
-        android:visibility="gone"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginTop="@dimen/dp_14"
+        android:layout_marginEnd="@dimen/dp_21"
+        android:visibility="gone"
+        app:lightUser="passenger"
+        />
 
     <!--接管提示-->
     <com.mogo.eagle.core.function.hmi.ui.vehicle.TakeOverView
diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_base_fragment.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_base_fragment.xml
index abe9fe169d..7d8eee6561 100644
--- a/OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_base_fragment.xml
+++ b/OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_base_fragment.xml
@@ -24,15 +24,18 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-    <com.mogo.eagle.core.function.hmi.ui.widget.SingleTrafficLightView
+    <!--红绿灯-->
+    <com.mogo.eagle.core.function.hmi.ui.widget.TrafficLightView
         android:id="@+id/bus_p_traffic_light_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/dp_722"
-        android:layout_marginTop="@dimen/dp_112"
-        android:visibility="gone"
         app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent"/>
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginLeft="@dimen/dp_703"
+        android:layout_marginTop="@dimen/dp_98"
+        android:visibility="gone"
+        app:lightUser="passenger"
+        />
 
     <FrameLayout
         android:id="@+id/bus_p_route_panel"
diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_home.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_home.xml
index ba62606abf..002fb38896 100644
--- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_home.xml
+++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_home.xml
@@ -87,30 +87,17 @@
 
 
         <!--  红绿灯  -->
-        <com.mogo.eagle.core.function.hmi.ui.widget.SingleTrafficLightView
-            android:id="@+id/traffic_light_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_40"
-            android:layout_marginEnd="@dimen/dp_40"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            android:visibility="gone"
-            app:traffic_light_user="traffic_light_taxi_p" />
-
-        <!--融合红绿灯-->
-        <com.mogo.eagle.core.function.hmi.ui.widget.FusionTrafficLightView
+        <com.mogo.eagle.core.function.hmi.ui.widget.TrafficLightView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            android:layout_marginTop="@dimen/dp_40"
-            android:layout_marginEnd="@dimen/dp_40"
+            android:layout_marginTop="@dimen/dp_26"
+            android:layout_marginEnd="@dimen/dp_21"
             android:visibility="gone"
-            app:fusionLightUser="passenger_bus"
+            app:lightUser="passenger"
             />
 
-
         <com.mogo.och.unmanned.passenger.ui.bar.LeftBarView
             android:id="@+id/lbv_go2_center"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml
index b1207b6258..1f2c632dd0 100644
--- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml
+++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml
@@ -41,28 +41,15 @@
         android:layout_height="match_parent"/>
 
     <!--  红绿灯  -->
-    <com.mogo.eagle.core.function.hmi.ui.widget.SingleTrafficLightView
-        android:id="@+id/traffic_light_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_93"
-        android:layout_marginEnd="@dimen/dp_40"
-        android:visibility="gone"
-        app:layout_constraintEnd_toStartOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:traffic_light_user="traffic_light_taxi_p" />
-
-    <!--融合红绿灯-->
-    <com.mogo.eagle.core.function.hmi.ui.widget.FusionTrafficLightView
+    <com.mogo.eagle.core.function.hmi.ui.widget.TrafficLightView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        android:layout_marginTop="@dimen/dp_150"
+        android:layout_marginTop="@dimen/dp_136"
         android:visibility="gone"
-        app:fusionLightUser="passenger"
+        app:lightUser="passenger"
         />
 
     <!--  地图marker点击触发路侧直播  -->
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_map_container.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_map_container.xml
index 7843fe3193..25965027f0 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_map_container.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_map_container.xml
@@ -78,31 +78,18 @@
         app:layout_constraintEnd_toStartOf="@+id/visualAngleToggle"
         app:layout_goneMarginEnd="@dimen/dp_50" />
 
-    <com.mogo.eagle.core.function.hmi.ui.widget.SingleTrafficLightView
-        android:id="@+id/viewTrafficLightVr"
+    <com.mogo.eagle.core.function.hmi.ui.widget.TrafficLightView
+        android:id="@+id/tlvDriver"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/hmi_traffic_light_layout_margin_top"
-        android:visibility="gone"
-        app:pressed_enabled="false"
-        android:focusable="false"
-        android:focusableInTouchMode="false"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <com.mogo.eagle.core.function.hmi.ui.widget.FusionTrafficLightView
-        android:id="@+id/viewFusionTrafficLight"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/hmi_traffic_light_layout_margin_top"
+        app:layout_constraintTop_toTopOf="parent"
         android:visibility="gone"
-        app:fusionLightUser="driver"
+        app:lightUser="driver"
         android:focusable="false"
-        android:focusableInTouchMode="false"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:layout_marginTop="@dimen/hmi_traffic_light_layout_margin_top"
+        />
 
     <!--红绿灯提醒-->
     <com.mogo.eagle.core.function.hmi.ui.notice.traffic.TrafficLightPromptView
@@ -124,8 +111,8 @@
         android:layout_height="@dimen/dp_129"
         android:layout_marginTop="@dimen/dp_71"
         android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="@+id/viewTrafficLightVr"
-        app:layout_constraintTop_toBottomOf="@+id/viewTrafficLightVr"
+        app:layout_constraintEnd_toEndOf="@+id/tlvDriver"
+        app:layout_constraintTop_toBottomOf="@+id/tlvDriver"
         android:focusable="false"
         android:focusableInTouchMode="false"
         app:layout_goneMarginEnd="40dp"