From ed00694ffefde24b89d1cab3fc460d11bb891819 Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Sun, 7 Jul 2024 13:28:41 +0800
Subject: [PATCH] =?UTF-8?q?[6.5.0]=E5=A2=9E=E5=8A=A0=E7=BA=A2=E7=BB=BF?=
 =?UTF-8?q?=E7=81=AF=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/layout/taxi_base_fragment.xml    | 12 +++++++++++
 .../main/res/layout/taxi_p_base_fragment.xml  | 20 +++++++++++++++----
 .../layout/unmanned_taxi_base_fragment.xml    | 12 +++++++++++
 .../res/layout/taxt_u_p_base_fragment.xml     | 20 ++++++++++++++++---
 4 files changed, 57 insertions(+), 7 deletions(-)

diff --git a/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
index f41ff6699a..37dd353921 100644
--- a/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
+++ b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
@@ -161,6 +161,18 @@
         android:visibility="gone"
         />
 
+    <!--红绿灯提醒-->
+    <com.mogo.eagle.core.function.hmi.ui.notice.traffic.TrafficLightPromptView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginTop="@dimen/dp_350"
+        android:layout_marginRight="@dimen/dp_50"
+        app:promptUser="driver"
+        android:visibility="gone"
+        />
+
     <!--  地图marker点击触发路侧直播  -->
     <com.mogo.eagle.core.function.hmi.ui.camera.RoadCrossLiveView
         android:layout_width="@dimen/dp_800"
diff --git a/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml
index 9f792f5a28..801eecb16e 100644
--- a/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml
+++ b/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml
@@ -218,13 +218,25 @@
     <com.mogo.eagle.core.function.hmi.ui.notice.exploration.AutomaticExplorationView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:layout_marginTop="@dimen/dp_482"
-        app:explorationUser="passenger"
+        android:layout_marginEnd="@dimen/dp_50"
+        android:layout_marginBottom="-80dp"
+        app:layout_constraintBottom_toTopOf="@id/aciv_xiaozhi_normal"
+        app:layout_constraintEnd_toEndOf="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_marginEnd="@dimen/dp_50"
+        android:layout_marginBottom="-80dp"
+        app:layout_constraintBottom_toTopOf="@id/aciv_xiaozhi_normal"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:visibility="gone"
+        app:promptUser="passenger"
+        />
+
     <!--  地图marker点击触发路侧直播  -->
     <com.mogo.eagle.core.function.hmi.ui.camera.RoadCrossLiveView
         android:layout_width="@dimen/dp_650"
diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml
index 2c665828e3..b636f59cce 100644
--- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml
+++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml
@@ -211,6 +211,18 @@
         android:visibility="gone"
         />
 
+    <!--红绿灯提醒-->
+    <com.mogo.eagle.core.function.hmi.ui.notice.traffic.TrafficLightPromptView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginTop="@dimen/dp_350"
+        android:layout_marginRight="@dimen/dp_50"
+        app:promptUser="driver"
+        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/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 765ff88660..a64a0f19ae 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
@@ -113,13 +113,27 @@
     <com.mogo.eagle.core.function.hmi.ui.notice.exploration.AutomaticExplorationView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:layout_marginTop="@dimen/dp_482"
+        android:layout_marginEnd="@dimen/dp_50"
+        android:layout_marginBottom="-80dp"
+        app:layout_constraintBottom_toTopOf="@id/aciv_xiaozhi_normal"
+        app:layout_constraintEnd_toEndOf="parent"
         app:explorationUser="passenger"
         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_marginEnd="@dimen/dp_50"
+        android:layout_marginBottom="-80dp"
+        app:layout_constraintBottom_toTopOf="@id/aciv_xiaozhi_normal"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:visibility="gone"
+        app:promptUser="passenger"
+        />
+
+
     <!--转向灯-->
     <com.mogo.eagle.core.function.hmi.ui.vehicle.TurnLightViewStatus
         android:layout_width="wrap_content"