From d00f1f19a250fbdd71e40c8a02624d3a4d8ab4bf Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Fri, 15 Mar 2024 18:36:32 +0800
Subject: [PATCH] =?UTF-8?q?[6.3.0]=20[=E8=BD=A8=E8=BF=B9=E8=B4=B4=E5=9B=BE?=
 =?UTF-8?q?=E3=80=81=E7=BA=BF=E8=B7=AF=E4=BD=8D=E7=BD=AE]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/jinlv/layout/bus_p_route_fragment.xml  |  2 ++
 .../src/main/res/layout/charter_p_main_fragment.xml | 13 +++++++------
 .../main/res/layout/charter_p_order_fragment.xml    |  3 +--
 .../jinlv/layout/shuttle_p_jl_route_fragment.xml    |  2 ++
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/OCH/bus/passenger/src/main/res/jinlv/layout/bus_p_route_fragment.xml b/OCH/bus/passenger/src/main/res/jinlv/layout/bus_p_route_fragment.xml
index 74027efd21..c1dffa7d5c 100644
--- a/OCH/bus/passenger/src/main/res/jinlv/layout/bus_p_route_fragment.xml
+++ b/OCH/bus/passenger/src/main/res/jinlv/layout/bus_p_route_fragment.xml
@@ -281,6 +281,8 @@
             android:id="@+id/busPLineMapView"
             android:layout_width="@dimen/bus_p_route_info_panel_width"
             android:layout_height="@dimen/bus_p_route_line_map_view_height"
+            app:arrivedDrawable="@drawable/bus_p_map_arrow_un_arrive"
+            app:unArrivedDrawable="@drawable/bus_p_map_arrow_arrived"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintRight_toRightOf="parent" />
 
diff --git a/OCH/charter/passenger/src/main/res/layout/charter_p_main_fragment.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_main_fragment.xml
index 9c18485084..3bbc9238a9 100644
--- a/OCH/charter/passenger/src/main/res/layout/charter_p_main_fragment.xml
+++ b/OCH/charter/passenger/src/main/res/layout/charter_p_main_fragment.xml
@@ -59,12 +59,6 @@
         app:layout_constraintEnd_toEndOf="@+id/mapBizView"
         app:layout_constraintStart_toStartOf="parent" />
 
-    <com.mogo.och.common.module.manager.xiaozhimanager.ZhiView
-        android:id="@+id/zv_msg_pop_bottom"
-        android:layout_width="@dimen/dp_240"
-        android:layout_height="@dimen/dp_240"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
 
     <!--消息盒子气泡视图-->
     <com.mogo.eagle.core.function.hmi.ui.msgbox.MMsgBoxBubbleView
@@ -136,6 +130,13 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
+    <com.mogo.och.common.module.manager.xiaozhimanager.ZhiView
+        android:id="@+id/zv_msg_pop_bottom"
+        android:layout_width="@dimen/dp_240"
+        android:layout_height="@dimen/dp_240"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
     <!--调试面板-->
     <com.mogo.och.charter.passenger.ui.debugview.DebugView
         android:layout_width="wrap_content"
diff --git a/OCH/charter/passenger/src/main/res/layout/charter_p_order_fragment.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_order_fragment.xml
index 16f9377a5d..7d42148d93 100644
--- a/OCH/charter/passenger/src/main/res/layout/charter_p_order_fragment.xml
+++ b/OCH/charter/passenger/src/main/res/layout/charter_p_order_fragment.xml
@@ -10,10 +10,9 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="@dimen/dp_936"
         android:layout_height="@dimen/dp_500"
-        android:layout_marginStart="@dimen/dp_286"
         android:background="@drawable/charter_p_select_line_bg"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent">
+        app:layout_constraintEnd_toEndOf="parent">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/lsv_line_site"
diff --git a/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_route_fragment.xml b/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_route_fragment.xml
index 561c1c73b3..0f70ed78f8 100644
--- a/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_route_fragment.xml
+++ b/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_route_fragment.xml
@@ -269,6 +269,8 @@
             android:id="@+id/bus_p_line_map_view"
             android:layout_width="@dimen/shuttle_p_jl_route_info_panel_width"
             android:layout_height="@dimen/shuttle_p_jl_route_line_map_view_height"
+            app:arrivedDrawable="@drawable/shuttle_p_jl_map_arrow_un_arrive"
+            app:unArrivedDrawable="@drawable/shuttle_p_jl_map_arrow_arrived"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintRight_toRightOf="parent" />