From bb6703c0dea58c089ad12667fbd71fdf4fdfadd2 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Mon, 7 Aug 2023 18:39:23 +0800
Subject: [PATCH] =?UTF-8?q?[3.4.0]=20[=E5=90=8C=E6=AD=A5=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../taxi/passenger/model/AutopilotManager.kt    |   2 +-
 .../och/taxi/passenger/ui/debug/DebugView.kt    |   5 ++++-
 .../res/drawable-xhdpi/taxi_overmap_arrived.png | Bin 260 -> 842 bytes
 .../src/main/res/layout/taxi_p_debug.xml        |   7 +++++++
 .../src/main/res/layout/taxi_p_itinerary.xml    |   2 +-
 .../src/main/res/values/colors.xml              |   2 +-
 6 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt b/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt
index 85d06446d3..0e6ed00158 100644
--- a/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt
+++ b/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt
@@ -163,7 +163,7 @@ object AutopilotManager : IMoGoAutopilotStatusListener {
                         TaxiPassengerModel.currentOCHOrder!!.endSiteAddr,
                         TaxiPassengerModel.currentOCHOrder!!.orderNo
                     )
-                    startServicePilotDone()
+                    //startServicePilotDone()
                 }
             }
             else -> {}
diff --git a/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt b/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt
index d9735e6037..1019d47929 100644
--- a/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt
+++ b/OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt
@@ -11,6 +11,7 @@ import com.mogo.eagle.core.utilcode.util.ActivityUtils
 import com.mogo.och.taxi.passenger.R
 import com.mogo.och.taxi.passenger.ui.TaxiPassengerBaseFragment
 import kotlinx.android.synthetic.main.taxi_p_debug.view.tv_show_arrive
+import kotlinx.android.synthetic.main.taxi_p_debug.view.tv_show_order_info
 import kotlinx.android.synthetic.main.taxi_p_debug.view.tv_show_phone_check
 import kotlinx.android.synthetic.main.taxi_p_debug.view.tv_show_start_autopilot
 import org.greenrobot.eventbus.EventBus
@@ -57,7 +58,9 @@ class DebugView @JvmOverloads constructor(
         tv_show_start_autopilot.onClick {
             fragment?.showOrHideStartAutopilotView(true)
         }
-
+        tv_show_order_info.onClick {
+            fragment?.showOrHideServingOrderFragment(true)
+        }
     }
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun changeOverview(debugEvent: DebugEvent) {
diff --git a/OCH/taxi/taxi-unmanned-passenger/src/main/res/drawable-xhdpi/taxi_overmap_arrived.png b/OCH/taxi/taxi-unmanned-passenger/src/main/res/drawable-xhdpi/taxi_overmap_arrived.png
index 45614012e30c72f4c24ab4389658e1581e79af95..95f67cfb9690078f591fe7759ca7fe58e53419a2 100644
GIT binary patch
delta 726
zcmZo+I>k1jp`K}rr;B4q1>@UU@4bTqWsc4Nd+F@V&A#DQb5kZST6Dr`%>k}6Z+i9D
zPXAl4_GMk@i46->yc8G7Zwd7?Ke#a4?DETHbBmLOcBkKwKl1I_&wY~L@7(=t^V{Zr
z@%dKk<0lT!bT-*I$M?#$C7BH@9#~L4y6By<_^6$+d_BDG4+MnI=%)ti$={fDYFeX1
zwf4K%ekG9)S&JSn;Qx3%^T~FvX}%Hf8YAi%E<ax0e`IOWhQr#&k}QlbWZrDZWb#|i
zY_9k9L6XiAk;2_`B;;SZ=a*Z@>7@p&n^7&Fb?Sg&J-3?s;tBODdSBgH`S{lNN9!+X
zi1aEO_9QG=&itJ<&iGMiaqJ@V6dz|Ly~V4%4=CQM{&L8ZXZ~BWS<aRFjy^urvOtV8
zzr*8NfMtODB9jZxzCL)j;>_jsbMBma@bjR6AIt46p+Oq&Ug}+Sy&(SW@j;h2`#Zv~
z?y{<#vCo)gXH%AUdO}u?z`pu0)fu<4b!E5jnA?;UQr>&6;mp2?ON|p;{{-9(4_nrd
zd(C>O(LCKH4@C>_?z_d_dBg9f(S)<Pk6#|*s(b$~d)CfBd}`}m6=$E#irlvMhh_Wm
z&-eR|EL{*2*Z(Z&$Anv3R^{6@U5aBpe}7F<Wv;iTQohOOZpoBlS6!k0lO8^<8|wG%
zY~FF=_w{Z6+=5;|d+o*e`e&?9*W0LjlX_1XG<`qGdqyp2*^$*rMZ&Y@dOv#ny{2@<
zyYyJ5>ffR&_fjW_>_6dm@~y?kve51)*QRnjDO;<xw6XV)-n<!i{6Z)Hv;LO)b9u*;
z_gWMA^|mfG{_xUWPT$3NX6=F%a|23s<gcb3(emF}xih@{*1`QnFK3ukINY7ZYvRbP
h;=n`zT_|CyXE3YYRx8{(;TZ!Ec)I$ztaD0e0sxOvV6FfF

delta 140
zcmX@b*1|NQp`Ibn)5S5Qg7NJIM_vX44i?8Qft&@~y}W~jYo77EN%i|$yKzTM&i^gU
mEF1y~4h;;9Oq4JVFzmg~^i|Ei{4WC#c)I$rx~y|bXaWGaog+j5

diff --git a/OCH/taxi/taxi-unmanned-passenger/src/main/res/layout/taxi_p_debug.xml b/OCH/taxi/taxi-unmanned-passenger/src/main/res/layout/taxi_p_debug.xml
index 3ac12defbe..aff989d7aa 100644
--- a/OCH/taxi/taxi-unmanned-passenger/src/main/res/layout/taxi_p_debug.xml
+++ b/OCH/taxi/taxi-unmanned-passenger/src/main/res/layout/taxi_p_debug.xml
@@ -26,4 +26,11 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
+    <TextView
+        android:id="@+id/tv_show_order_info"
+        android:text="订单信息"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+
 </androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/OCH/taxi/taxi-unmanned-passenger/src/main/res/layout/taxi_p_itinerary.xml b/OCH/taxi/taxi-unmanned-passenger/src/main/res/layout/taxi_p_itinerary.xml
index a5666659f3..8d5f3e34e3 100644
--- a/OCH/taxi/taxi-unmanned-passenger/src/main/res/layout/taxi_p_itinerary.xml
+++ b/OCH/taxi/taxi-unmanned-passenger/src/main/res/layout/taxi_p_itinerary.xml
@@ -72,7 +72,7 @@
     <View
         android:layout_width="0dp"
         android:layout_height="1dp"
-        android:background="@color/taxi_p_B35C71AB"
+        android:background="@color/taxi_p_B37E90BF"
         android:layout_marginTop="-15dp"
         app:layout_constraintEnd_toEndOf="@+id/actv_endstation"
         app:layout_constraintStart_toStartOf="@+id/actv_speed_value"
diff --git a/OCH/taxi/taxi-unmanned-passenger/src/main/res/values/colors.xml b/OCH/taxi/taxi-unmanned-passenger/src/main/res/values/colors.xml
index 5212ef2c22..0a3d6c731f 100644
--- a/OCH/taxi/taxi-unmanned-passenger/src/main/res/values/colors.xml
+++ b/OCH/taxi/taxi-unmanned-passenger/src/main/res/values/colors.xml
@@ -22,7 +22,6 @@
     <color name="taxi_p_004DC4">#004DC4</color>
     <color name="taxi_p_293449">#293449</color>
     <color name="taxi_p_203555">#203555</color>
-    <color name="taxi_p_B35C71AB">#B35C71AB</color>
     <color name="taxi_p_081831">#081831</color>
     <color name="taxi_p_112B57">#112B57</color>
     <color name="taxi_p_66476FBE">#66476FBE</color>
@@ -50,6 +49,7 @@
     <color name="taxi_p_005D6A8C">#005D6A8C</color>
     <color name="taxi_p_5D6A8C">#5D6A8C</color>
     <color name="taxi_p_995D6A8C">#995D6A8C</color>
+    <color name="taxi_p_B37E90BF">#B37E90BF</color>