From 33e474ea7fc084adfb97e21b5abd719937d36eaa Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Thu, 12 Dec 2024 12:06:24 +0800
Subject: [PATCH] =?UTF-8?q?[6.8.2]=20[fix]=20[=E6=9A=82=E6=97=B6=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F=E8=B7=AF=E5=8F=A3=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   | 62 +++++++++----------
 1 file changed, 31 insertions(+), 31 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 81567e8f78..a5d1564386 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
@@ -146,39 +146,39 @@
         app:layout_constraintBottom_toTopOf="@+id/video_fragment"
         app:layout_constraintEnd_toEndOf="parent" />
 
-    <!--  事件弹框  -->
-    <com.mogo.eagle.core.function.hmi.ui.v2n.RoadV2NEventWindowView
-        android:id="@+id/roadV2NEventWindowView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="-70dp"
-        android:layout_marginRight="14dp"
-        app:layout_constraintBottom_toTopOf="@+id/zv_msg_pop_bottom"
-        app:layout_constraintRight_toRightOf="parent"
-        android:visibility="gone"/>
+<!--    &lt;!&ndash;  事件弹框  &ndash;&gt;-->
+<!--    <com.mogo.eagle.core.function.hmi.ui.v2n.RoadV2NEventWindowView-->
+<!--        android:id="@+id/roadV2NEventWindowView"-->
+<!--        android:layout_width="wrap_content"-->
+<!--        android:layout_height="wrap_content"-->
+<!--        android:layout_marginBottom="-70dp"-->
+<!--        android:layout_marginRight="14dp"-->
+<!--        app:layout_constraintBottom_toTopOf="@+id/zv_msg_pop_bottom"-->
+<!--        app:layout_constraintRight_toRightOf="parent"-->
+<!--        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.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.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"
-        />
+<!--    &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"-->
+<!--        />-->
 
     <TextView
         android:id="@+id/tv_shuttle_b2_p_version"