From e64e0254da7b00bded512182d7b0460e621db055 Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Mon, 14 Oct 2024 15:52:05 +0800
Subject: [PATCH] =?UTF-8?q?[6.7.0]=E5=8E=BB=E6=8E=89BUS=E5=8F=B8=E6=9C=BA?=
 =?UTF-8?q?=E7=AB=AF=E7=BA=A2=E7=BB=BF=E7=81=AF=EF=BC=88=E8=AF=AF=E5=8A=A0?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/layout/bus_base_fragment.xml | 23 -------------------
 .../main/res/layout/shuttle_base_fragment.xml | 22 ------------------
 2 files changed, 45 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 1f4ada6ab6..bd33539f86 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
@@ -102,29 +102,6 @@
         app:layout_constraintTop_toTopOf="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"
-        />
-
-    <!--融合红绿灯-->
-    <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"
-        />
-
     <!--  地图marker点击触发路侧直播  -->
     <com.mogo.eagle.core.function.hmi.ui.camera.RoadCrossLiveView
         android:layout_width="@dimen/dp_800"
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 552a90b857..11bbbc066a 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
@@ -111,28 +111,6 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <!--红绿灯提醒-->
-    <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"
-        />
 
     <!--接管提示-->
     <com.mogo.eagle.core.function.hmi.ui.vehicle.TakeOverView