From 70cb6b528e7e69a085dd888ec5a4874e1ff8ee84 Mon Sep 17 00:00:00 2001
From: xyz <donghongyu@zhidaoauto.om>
Date: Fri, 20 Dec 2024 10:14:28 +0800
Subject: [PATCH] =?UTF-8?q?[6.8.2]=201=E3=80=81=E6=89=BE=E5=9B=9E=E8=9E=8D?=
 =?UTF-8?q?=E5=90=88=E7=BA=A2=E7=BB=BF=E7=81=AF=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../res/m2/layout/shuttle_p_m2_fragment.xml   | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_fragment.xml b/OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_fragment.xml
index a5d1564386..0e9431c390 100644
--- a/OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_fragment.xml
+++ b/OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_fragment.xml
@@ -157,28 +157,28 @@
 <!--        app:layout_constraintRight_toRightOf="parent"-->
 <!--        android:visibility="gone"/>-->
 
-<!--    &lt;!&ndash;红绿灯提醒&ndash;&gt;-->
-<!--    <com.mogo.eagle.core.function.hmi.ui.notice.traffic.TrafficLightPromptView-->
-<!--        android:layout_width="wrap_content"-->
-<!--        android:layout_height="wrap_content"-->
-<!--        android:layout_marginBottom="@dimen/dp_m_70"-->
-<!--        app:layout_constraintBottom_toTopOf="@id/zv_msg_pop_bottom"-->
-<!--        app:layout_constraintEnd_toEndOf="parent"-->
-<!--        app:promptUser="passenger_bus"-->
-<!--        android:visibility="gone"-->
-<!--        />-->
+    <!--红绿灯提醒-->
+    <com.mogo.eagle.core.function.hmi.ui.notice.traffic.TrafficLightPromptView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/dp_m_70"
+        app:layout_constraintBottom_toTopOf="@id/zv_msg_pop_bottom"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:promptUser="passenger_bus"
+        android:visibility="gone"
+        />
 
-<!--    &lt;!&ndash;融合红绿灯&ndash;&gt;-->
-<!--    <com.mogo.eagle.core.function.hmi.ui.widget.FusionTrafficLightView-->
-<!--        android:layout_width="wrap_content"-->
-<!--        android:layout_height="wrap_content"-->
-<!--        app:layout_constraintLeft_toLeftOf="parent"-->
-<!--        app:layout_constraintRight_toRightOf="parent"-->
-<!--        app:layout_constraintTop_toBottomOf="@id/och_shadow_layout"-->
-<!--        android:layout_marginTop="@dimen/dp_30"-->
-<!--        app:fusionLightUser="passenger_bus"-->
-<!--        android:visibility="gone"-->
-<!--        />-->
+    <!--融合红绿灯-->
+    <com.mogo.eagle.core.function.hmi.ui.widget.FusionTrafficLightView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/och_shadow_layout"
+        android:layout_marginTop="@dimen/dp_30"
+        app:fusionLightUser="passenger_bus"
+        android:visibility="gone"
+        />
 
     <TextView
         android:id="@+id/tv_shuttle_b2_p_version"