From 35b161c61464da321e7cd3146f2db4545b6587c6 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 22 Mar 2024 21:19:57 +0800 Subject: [PATCH] =?UTF-8?q?[6.3.0]=20[taxi=20=E9=A1=B5=E9=9D=A2=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/layout/charter_p_music_playing.xml | 1 - .../drawable-nodpi/taxi_p_overmap_arrived.png | Bin 812 -> 768 bytes .../drawable-nodpi/taxi_p_overmap_arriving.png | Bin 943 -> 1009 bytes .../src/main/res/layout/taxi_p_bottom_bar.xml | 3 +++ .../och/taxi/passenger/ui/bar/LeftBarView.kt | 3 ++- .../och/taxi/passenger/ui/bar/RightBarView.kt | 1 - .../res/drawable/taxi_p_music_list_bottom.xml | 2 +- .../main/res/layout/taxi_p_music_playing.xml | 1 + .../taxt_u_p_overmap_arrived.png | Bin 812 -> 768 bytes .../taxt_u_p_overmap_arriving.png | Bin 943 -> 1009 bytes .../main/res/layout/taxt_u_p_bottom_bar.xml | 3 +++ 11 files changed, 10 insertions(+), 4 deletions(-) diff --git a/OCH/charter/passenger/src/main/res/layout/charter_p_music_playing.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_music_playing.xml index bfa7c02984..5f8c632845 100644 --- a/OCH/charter/passenger/src/main/res/layout/charter_p_music_playing.xml +++ b/OCH/charter/passenger/src/main/res/layout/charter_p_music_playing.xml @@ -81,7 +81,6 @@ android:progress="50" android:id="@+id/sb_musuc_progess" android:splitTrack="false" - android:background="@null" android:thumb="@drawable/charter_p_music_seekbar_thumb" android:duplicateParentState="true" app:layout_constraintStart_toStartOf="parent" diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_overmap_arrived.png b/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_overmap_arrived.png index 7ebe72d0807e460c229b7eec4903dac9dd2c5863..32fc7d5af8a00f83b8ee2434079b992d9252193d 100644 GIT binary patch delta 651 zcmZ3(*1$HQu|CVw#WAFU@$IbJ(`GpcxN-}KOnuNA`Rw^;>7R4<%&w5s&v2L!vh`7s z=lKf)=|78JvF5&A_1Nz2)xQhAK7PKwDNf=WclPQ_0t`$F#G?;IOmnyWm*1e%eXKq) z-Zws%z3o$%h%!#iulac3G;4=3V)!1m5Crb%C1 zPJf^ADSL7K%=DRAA)9W@a!cke`>p&p@?GB1r3-S_|19$U?R;sAous#&c)FY1Wkbu% zZjZ&0`AI@nNu4H2lMRF>EZdo-QW;l&N3KtEsb;j%v&XZdi(;=tDMZxkoA>P5R}tyM zr?^qYY{L_0rlP}alBg}CnzBQ)9Isp`JUfTo@Vb{byocLZP`sS)6-oW68?8-=+>Tz-OVAdZu8rg grGbHic=U%^V8f34r2TXiRa;k-6+^+bU+$dw8TBKUa)X6I1dhqJh*6vrXIRc@9f$Pl^rtnnU-+M&W zbBe>l2$$9On&K`cH}8M5CS>)&(z|i|-ADgTdZT;r=1ohhT(Hvy|CtrV@ZKA%^`C`M5 z|5;Qgo-Umq6t?2^6iGklgO?ab>EEw1s(1VA-d9Cq-31s@tuJ;w{?Qm%WkmOqy}YQ9kvPMN;N3 zPVak|q2Xop)7<;WvDDqJLK1y!j}pE1ExaLT@NWN|RVO2pBDbD+>A|$F;u8PGrb#>g rp1AO_wKJw{2cH^RsxZKvSPsPB58ml`N^bP0l+XkKDoi#@ diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_overmap_arriving.png b/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_overmap_arriving.png index ee96bb0edcd1a3a86bec4d50202db03ad7366d94..790562578c217dfa0672cff92a5a8b9199b36812 100644 GIT binary patch delta 893 zcmZ3_{*iq`V|}!zi(^Oy{wLypza+g3v(WOc6QR;94pZ8w&An%UQEp6#h-J-aMeXK&5( z4c6Ai@Atm1xp#Z+X{m7e^`RO3(Fy#?w-+ihusA?bJ)DJ`k#L@KhV|ci1sRoHl~!(y z%`YDQ_SKqF_AJw#Y1d=MUADK}4xe10yTD#>3H$p^UyAqM+0->HxM0=oCDzYxt@tY7K%eA|EfW#=|NTePvb_`V4ps3n`Y469kO$dUro3)Q`gJxL+p|# zO3Pp8tj`o*Rd00l!dIWhilc7T&MIBr+ukNrbqZ}e>^b>SjB&8N&Mh6U{IAuvPNi#< zlP*NWcTC!NOtW>vWTw)F+`BBV6g#Yx7^PnGPh7!Up51e3vpU}_5i!;GSz3(M+g~+g zul*gk#{6f|nqc;IoEui3dD}RDsY>DZTe+J>IKtyzAKj6$iy^%}W_RB9hijWM&P`#Q z+iA42OqEenC3wY!y(e{4cckU@xV&9j)SDIl+I;2}))O2#nO6>2=RLV{C#qAf_QsNu zdy+GsKaZ|4P_^w^qvjxWoo!CvJSNx7qhGfQ2Co<6Dyi3s=GMFO=a$ChyW6ErcBWXy zMelgUGE3t557|1q$%|)-zOOG1ulYT{?%eIqj~+kW{!?hf8S5I$@C81iKf})1>xpM- z1~1ZfR~9LjjfyL);+hh=h;7;bDR1Wfm658T`#UHbt8V!6-C>gn04n1mahG*{jD=FFT&R=JnHuj{UxWjlug>I zaW!?tF2^{)52-38_?J8GR6 eI2wpY2khBSpV)o>hr`f|P60H6`Zej)GvpE6Y;f zMs3N@7QAZrf}cYv%F|W4Q(=?5-m2b+C@0Sqe+7)s>Zre+Q(0VaZ};c4dBR4s-={t} zXZ!t5@xJH9@2kr{C$+EB(OuZGc1_F9%PTb-SUg~;9?rtaSnz~JtLtx_f}ZwydB#&q zT3+ux@IIt)Vwcc`0OlAAwl{YkaeCyitg~e}wk%99>1gx@ea;vg&Wxb!POAr>G!yD4 zM=tt4k#kD-mB()#uIDYt>YaYT&hDaJ9N!#Uj+}a7LtFjE*8LY&8AzW4(Z*?@05Pmd70G2>8y1{^kz2#N@|915T zY5u3K#?M_Vzu(+FxMZ-Y*@BeKR^$%Q^Oz`jEaBq0`y}EMEp}h4; zEPp3#zN|hyu()~mEx`rne`J~HW@Oyym8s&0y?%9L00ZX)WMqQO!DJt>KU^?FSg2a; QBLfh4y85}Sb4q9e03MxnG5`Po diff --git a/OCH/taxi/passenger/src/main/res/layout/taxi_p_bottom_bar.xml b/OCH/taxi/passenger/src/main/res/layout/taxi_p_bottom_bar.xml index db389e16c1..6853846cdb 100644 --- a/OCH/taxi/passenger/src/main/res/layout/taxi_p_bottom_bar.xml +++ b/OCH/taxi/passenger/src/main/res/layout/taxi_p_bottom_bar.xml @@ -41,6 +41,7 @@ - + \ No newline at end of file diff --git a/OCH/taxi/pcommon/src/main/res/layout/taxi_p_music_playing.xml b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_music_playing.xml index 7e50a82b04..85be1e3a15 100644 --- a/OCH/taxi/pcommon/src/main/res/layout/taxi_p_music_playing.xml +++ b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_music_playing.xml @@ -69,6 +69,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/tv_tag" android:layout_marginTop="@dimen/dp_41" + android:duplicateParentState="true" android:progressDrawable="@drawable/taxt_p_music_seekbar_style" android:paddingTop="@dimen/dp_16" android:paddingBottom="@dimen/dp_16" diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_overmap_arrived.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_overmap_arrived.png index 7ebe72d0807e460c229b7eec4903dac9dd2c5863..32fc7d5af8a00f83b8ee2434079b992d9252193d 100644 GIT binary patch delta 651 zcmZ3(*1$HQu|CVw#WAFU@$IbJ(`GpcxN-}KOnuNA`Rw^;>7R4<%&w5s&v2L!vh`7s z=lKf)=|78JvF5&A_1Nz2)xQhAK7PKwDNf=WclPQ_0t`$F#G?;IOmnyWm*1e%eXKq) z-Zws%z3o$%h%!#iulac3G;4=3V)!1m5Crb%C1 zPJf^ADSL7K%=DRAA)9W@a!cke`>p&p@?GB1r3-S_|19$U?R;sAous#&c)FY1Wkbu% zZjZ&0`AI@nNu4H2lMRF>EZdo-QW;l&N3KtEsb;j%v&XZdi(;=tDMZxkoA>P5R}tyM zr?^qYY{L_0rlP}alBg}CnzBQ)9Isp`JUfTo@Vb{byocLZP`sS)6-oW68?8-=+>Tz-OVAdZu8rg grGbHic=U%^V8f34r2TXiRa;k-6+^+bU+$dw8TBKUa)X6I1dhqJh*6vrXIRc@9f$Pl^rtnnU-+M&W zbBe>l2$$9On&K`cH}8M5CS>)&(z|i|-ADgTdZT;r=1ohhT(Hvy|CtrV@ZKA%^`C`M5 z|5;Qgo-Umq6t?2^6iGklgO?ab>EEw1s(1VA-d9Cq-31s@tuJ;w{?Qm%WkmOqy}YQ9kvPMN;N3 zPVak|q2Xop)7<;WvDDqJLK1y!j}pE1ExaLT@NWN|RVO2pBDbD+>A|$F;u8PGrb#>g rp1AO_wKJw{2cH^RsxZKvSPsPB58ml`N^bP0l+XkKDoi#@ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_overmap_arriving.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxt_u_p_overmap_arriving.png index ee96bb0edcd1a3a86bec4d50202db03ad7366d94..790562578c217dfa0672cff92a5a8b9199b36812 100644 GIT binary patch delta 893 zcmZ3_{*iq`V|}!zi(^Oy{wLypza+g3v(WOc6QR;94pZ8w&An%UQEp6#h-J-aMeXK&5( z4c6Ai@Atm1xp#Z+X{m7e^`RO3(Fy#?w-+ihusA?bJ)DJ`k#L@KhV|ci1sRoHl~!(y z%`YDQ_SKqF_AJw#Y1d=MUADK}4xe10yTD#>3H$p^UyAqM+0->HxM0=oCDzYxt@tY7K%eA|EfW#=|NTePvb_`V4ps3n`Y469kO$dUro3)Q`gJxL+p|# zO3Pp8tj`o*Rd00l!dIWhilc7T&MIBr+ukNrbqZ}e>^b>SjB&8N&Mh6U{IAuvPNi#< zlP*NWcTC!NOtW>vWTw)F+`BBV6g#Yx7^PnGPh7!Up51e3vpU}_5i!;GSz3(M+g~+g zul*gk#{6f|nqc;IoEui3dD}RDsY>DZTe+J>IKtyzAKj6$iy^%}W_RB9hijWM&P`#Q z+iA42OqEenC3wY!y(e{4cckU@xV&9j)SDIl+I;2}))O2#nO6>2=RLV{C#qAf_QsNu zdy+GsKaZ|4P_^w^qvjxWoo!CvJSNx7qhGfQ2Co<6Dyi3s=GMFO=a$ChyW6ErcBWXy zMelgUGE3t557|1q$%|)-zOOG1ulYT{?%eIqj~+kW{!?hf8S5I$@C81iKf})1>xpM- z1~1ZfR~9LjjfyL);+hh=h;7;bDR1Wfm658T`#UHbt8V!6-C>gn04n1mahG*{jD=FFT&R=JnHuj{UxWjlug>I zaW!?tF2^{)52-38_?J8GR6 eI2wpY2khBSpV)o>hr`f|P60H6`Zej)GvpE6Y;f zMs3N@7QAZrf}cYv%F|W4Q(=?5-m2b+C@0Sqe+7)s>Zre+Q(0VaZ};c4dBR4s-={t} zXZ!t5@xJH9@2kr{C$+EB(OuZGc1_F9%PTb-SUg~;9?rtaSnz~JtLtx_f}ZwydB#&q zT3+ux@IIt)Vwcc`0OlAAwl{YkaeCyitg~e}wk%99>1gx@ea;vg&Wxb!POAr>G!yD4 zM=tt4k#kD-mB()#uIDYt>YaYT&hDaJ9N!#Uj+}a7LtFjE*8LY&8AzW4(Z*?@05Pmd70G2>8y1{^kz2#N@|915T zY5u3K#?M_Vzu(+FxMZ-Y*@BeKR^$%Q^Oz`jEaBq0`y}EMEp}h4; zEPp3#zN|hyu()~mEx`rne`J~HW@Oyym8s&0y?%9L00ZX)WMqQO!DJt>KU^?FSg2a; QBLfh4y85}Sb4q9e03MxnG5`Po diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_bottom_bar.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_bottom_bar.xml index 568510a85a..abc74836b5 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_bottom_bar.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_bottom_bar.xml @@ -41,6 +41,7 @@