From 74bdbb9a78c8dbab00c383d63c93272efe9e59f0 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Thu, 18 Jul 2024 17:26:34 +0800
Subject: [PATCH] =?UTF-8?q?[6.5.0]=20[fix]=20[taxi=20=E5=8F=B8=E6=9C=BA?=
 =?UTF-8?q?=E5=B1=8F=E5=85=A8=E5=B1=80=E6=A6=82=E8=A7=88UI=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../taxi_orvermap_road_trajectory.png           | Bin 0 -> 572 bytes
 .../drawable-nodpi/taxi_overmap_endpoint.png    | Bin 0 -> 5218 bytes
 .../drawable-nodpi/taxi_overmap_road_range.png  | Bin 0 -> 573 bytes
 .../src/main/res/layout/common_overmap_view.xml |  16 ++++++++--------
 .../common/src/main/res/values/colors.xml       |   1 +
 5 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 OCH/common/common/src/main/res/drawable-nodpi/taxi_orvermap_road_trajectory.png
 create mode 100644 OCH/common/common/src/main/res/drawable-nodpi/taxi_overmap_endpoint.png
 create mode 100644 OCH/common/common/src/main/res/drawable-nodpi/taxi_overmap_road_range.png

diff --git a/OCH/common/common/src/main/res/drawable-nodpi/taxi_orvermap_road_trajectory.png b/OCH/common/common/src/main/res/drawable-nodpi/taxi_orvermap_road_trajectory.png
new file mode 100644
index 0000000000000000000000000000000000000000..97d6b8470abb9e0db916537216e08bd1b7ee40ea
GIT binary patch
literal 572
zcmeAS@N?(olHy`uVBq!ia0vp^GC-Wd!2~3w<c{Y9DaPU;cPEB*=VV?2IWDOYo@u_m
z3|c@o2Loe!CIbsd2@p#GF#`kh0!9XAAk7F8TfhXDm07?HXQzM^u9c5p15~!m)5S3)
zgZ1t7y<RMaBCY;u<*^6PIc*Sh6yVm?S(AI@TzY_uK=<1kcKHKd0`Uhf`EA>{;p#D`
zHDb~SopfSK%a8X?4`frD_w!=3&LQ4l6?IGXljfd++rQYjL|V=%csU{L`tq-Pyrx`V
zcu_aRxxczs^ZBB{-j!`~-=%`jxh|Fp=Cyrix@=Cjo9QyCsyo>}mg2oxKBixGT%S>-
zCsn${N4lX#)O&BqosgED9G6c{lWUvsEcs^kHBp<2bfp~gyT>BZdYK=r>7P7r|M~uB
z3qPB_F}YjCTzNwELrufudHa7WMDsd}XWx)5U;Q*>-)6lenZ3Vf=alT2axGs-HDZ~#
z_l8>rCNKU)7cW_;FZU@_=V|>DE4RB3H9hB)bl6Ti?c;iTf6vCNUuVbupQ>?sN|%Z2
zlyyx`YEzAG_?>%@`)$Dz&2YnSN&6?vd1_i#dHBM&1M+(oPOgu>lrgjD|JCzu5uC;X
zT+9Dn30<jlxx6l-Yetw?YO~Iiz>As3LXP+E?A2Vn=yK1>KKWwlU^mz0lEJd}&&-zf
ubom)Cv#L9j>mw;TH_fN?&y3&y4gRvQx5e)e$lWy^6my=gelF{r5}E*XS>#Co

literal 0
HcmV?d00001

diff --git a/OCH/common/common/src/main/res/drawable-nodpi/taxi_overmap_endpoint.png b/OCH/common/common/src/main/res/drawable-nodpi/taxi_overmap_endpoint.png
new file mode 100644
index 0000000000000000000000000000000000000000..61527f37c106c8ec1b5135679a3398d427b9090b
GIT binary patch
literal 5218
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

literal 0
HcmV?d00001

diff --git a/OCH/common/common/src/main/res/drawable-nodpi/taxi_overmap_road_range.png b/OCH/common/common/src/main/res/drawable-nodpi/taxi_overmap_road_range.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6b03d50c6b2cefd1a492f6f653ac15944f0bec9
GIT binary patch
literal 573
zcmeAS@N?(olHy`uVBq!ia0vp^At21b1|(&&1r7o!#^NA%Cx&(BWL^R}E~ycoX}-P;
zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyy~KS-^~7gA{JhIO_mZw%pUjF{Fa=
z?OnsH!ww9r7uURdd`HD{4S!lqgTnH=vIUB12hZ-fr10O>=1TURdCy<JK9oP_`TN%W
z`~SXvZSgKYKX1p!mCtR=Y^vRTm>T^gto4}hF0_~{_@ZUwW1|bQU6&;hf`<F#>+OTf
zHCd~iRTZ8$2Dy|i5SsAWK~u>(fb&G<0+ETbD_EY`1azI?3t=jf({N2;*J8BfpQ5yh
zd1}KPb}zx3jb0Atn3s0EaTqSzFK&16*!1mc{<JS`>*{tfU2S>I*tkv(3*#T7&mu|t
T!|XEyKvC!E>gTe~DWM4f`yI#o

literal 0
HcmV?d00001

diff --git a/OCH/common/common/src/main/res/layout/common_overmap_view.xml b/OCH/common/common/src/main/res/layout/common_overmap_view.xml
index 6f3c61a8a3..027a130ef7 100644
--- a/OCH/common/common/src/main/res/layout/common_overmap_view.xml
+++ b/OCH/common/common/src/main/res/layout/common_overmap_view.xml
@@ -10,19 +10,19 @@
         android:id="@+id/travelRealityView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:arrivedDrawable="@drawable/taxt_u_p_overmap_arrived"
-        app:bottomPadding="160"
+        app:roadRangeDrawable="@drawable/taxi_overmap_road_range"
+        app:roadTrajectoryDrawable="@drawable/taxi_orvermap_road_trajectory"
+        app:globalPathColor="@color/common_39BA90"
         app:carDrawable="@drawable/taxt_u_p_map_car"
         app:compassDrawable="@drawable/taxt_u_p_map_car_light"
-        app:endPointDrawable="@drawable/taxt_u_p_map_view_dir_end"
-        app:leftPadding="800"
+        app:endPointDrawable="@drawable/taxi_overmap_endpoint"
         app:mapStyleExtraPath="over_view_style_extra.data"
         app:mapStylePath="over_view_style.data"
         app:resetDrawable="@null"
-        app:rightPadding="160"
-        app:startPointDrawable="@drawable/taxt_u_p_map_view_dir_start"
-        app:topPadding="160"
-        app:unArrivedDrawable="@drawable/taxt_u_p_overmap_arriving" />
+        app:leftPadding="0"
+        app:topPadding="0"
+        app:rightPadding="0"
+        app:bottomPadding="160" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/ovbv_bottom_icons_cl"
diff --git a/OCH/common/common/src/main/res/values/colors.xml b/OCH/common/common/src/main/res/values/colors.xml
index e0ccf73429..5917e77527 100644
--- a/OCH/common/common/src/main/res/values/colors.xml
+++ b/OCH/common/common/src/main/res/values/colors.xml
@@ -28,4 +28,5 @@
 
     <color name="common_3B4577">#3B4577</color>
     <color name="common_232A3F">#232A3F</color>
+    <color name="common_39BA90">#39BA90</color>
 </resources>
\ No newline at end of file