From a616838566024ae6a51d9a0aaa0601977087609f Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Mon, 14 Oct 2024 15:44:25 +0800
Subject: [PATCH] =?UTF-8?q?[6.7.0]BUS=E4=B9=98=E5=AE=A2=E7=AB=AF=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=BA=A2=E7=BB=BF=E7=81=AF=E5=92=8C=E7=BA=A2=E7=BB=BF?=
 =?UTF-8?q?=E7=81=AF=E6=8F=90=E9=86=92View?=
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/m2/layout/bus_p_m2_fragment.xml  | 23 +++++++++++++++++++
 .../main/res/layout/shuttle_base_fragment.xml | 23 +++++++++++++++++++
 .../res/m2/layout/shuttle_p_m2_fragment.xml   |  2 ++
 .../hmi_view_fusion_traffic_light_p_bus.xml   |  8 +++----
 5 files changed, 75 insertions(+), 4 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 bd33539f86..1f4ada6ab6 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,6 +102,29 @@
         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/bus/passenger/src/main/res/m2/layout/bus_p_m2_fragment.xml b/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_fragment.xml
index 1612ae80cf..b9ef96c15f 100644
--- a/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_fragment.xml
+++ b/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_fragment.xml
@@ -157,6 +157,29 @@
         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"
+        />
+
+    <!--融合红绿灯-->
+    <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_bug_b2_p_version"
         app:layout_constraintBottom_toBottomOf="parent"
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 d3129d4325..552a90b857 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,6 +111,29 @@
         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
         android:layout_width="@dimen/hmi_take_over_request_width"
diff --git a/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_fragment.xml b/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_fragment.xml
index 013ff4c731..1ac803d603 100644
--- a/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_fragment.xml
+++ b/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_fragment.xml
@@ -165,6 +165,7 @@
         app:layout_constraintBottom_toTopOf="@id/zv_msg_pop_bottom"
         app:layout_constraintEnd_toEndOf="parent"
         app:promptUser="passenger_bus"
+        android:visibility="gone"
         />
 
     <!--融合红绿灯-->
@@ -176,6 +177,7 @@
         app:layout_constraintTop_toBottomOf="@id/och_shadow_layout"
         android:layout_marginTop="@dimen/dp_30"
         app:fusionLightUser="passenger_bus"
+        android:visibility="gone"
         />
 
 
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 c04846bd8e..2037dead22 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
@@ -10,12 +10,13 @@
 
     <com.mogo.eagle.core.function.hmi.ui.widget.ProportionChartView
         android:id="@+id/fusionTrafficLightProportion"
-        android:layout_width="@dimen/dp_113"
-        android:layout_height="@dimen/dp_113"
+        android:layout_width="@dimen/dp_124"
+        android:layout_height="@dimen/dp_124"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
+        app:ringWidth="@dimen/dp_5"
         />
 
     <ImageView
@@ -47,7 +48,7 @@
         android:layout_width="@dimen/dp_18"
         android:layout_height="@dimen/dp_18"
         app:layout_constraintCircle="@id/fusionTrafficLightState"
-        app:layout_constraintCircleRadius="@dimen/dp_46"
+        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"
@@ -64,7 +65,6 @@
         android:textColor="#063330"
         android:textSize="@dimen/sp_42"
         app:textType="DS_DIGIB_2"
-        android:text="10"
         />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file