From 24684d9cc63bed24b9f5014ee0dd43c0306d7f62 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 21 Jul 2023 11:52:17 +0800 Subject: [PATCH] =?UTF-8?q?[3.4.0]=20[=E8=93=9D=E7=89=99=E5=92=8C=E5=BC=80?= =?UTF-8?q?=E5=85=B3=E9=97=A8=E5=B1=95=E7=A4=BA]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../taxi_p_blue_tooth_close.png | Bin 851 -> 1418 bytes .../drawable-xhdpi/taxi_p_blue_tooth_open.png | Bin 925 -> 851 bytes .../taxi_p_top_right_door_bg.9.png | Bin 0 -> 2393 bytes .../layout/taxi_p_start_autopilot_view.xml | 21 ++++++++++++++++++ .../src/main/res/layout/taxi_p_statusview.xml | 4 ++-- .../src/main/res/values/colors.xml | 1 + 6 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_top_right_door_bg.9.png diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_blue_tooth_close.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_blue_tooth_close.png index 55896f84335c1f93f166d4e79fb8da3a77746369..fcedabb20aa409337b12ad26d0921273f306fca6 100644 GIT binary patch delta 1307 zcmV+$1?2kE28s)ifPVz^NklpM2$g>5;P)|-EC`88>y+r01to)1c(X`s0ow+52W}LqluJg2wJg=h6IG_ z)?Iez_|4YY-dVTo?943qFq>@V-gD2n=ljmNbLPwtc|R`#UVj9<2zU|jBH%^9i+~pa zhY?_h_Lj^WHb`}wwM&ut<#MXx*e$nKey11;i9iSrK91**sO=gouJwh^Bgtma(b47go zM}*3_1LbkRv>@{0x)%Cq!fLt1B)2(nL@b-3XHey8hJ1?;Wo$s`>Lx65QhX6NdN*#5bkc`8befZRsaIlw)Bu$Ok0I##-U?Nn+-m++ZtPa+fP z9F@$x$);f9h?u@tj9KfC(i4dK8g*~ncTL(^>IS)5Rj!Wp!gIPecaJuya_qIKW(qxI zmX$YiwST3G#H3RrdBF^Ud;Na8H=C6o4Y|+9kD<&5QE=Wyc0z_+zaslBi5N#!nVqq# z#B>09@zC!xGZ_AjNXF-7%zYqqWqytUD&;wVd9pvs@2hgVW7mo4KtQe;Ix$OYz|CClzg!rbEzMCEQ0{ICdlW z;V-KLboWoo`FHD(t!X;0isy4PX%?+Pqx)4+9p-FR6)mm=DcxVih)rKBfgcXgHWZB; zixNYRh|XnCq*dk>U3VxP;fOff^_ngjl{`%!<3W9Ash!-ehK4`aGZtPeqm!p-mlaYv z2!H4WP(e3_V-hz&xp8%sSmPTqMo!S@=sIpw!Rg;Q3g(}p#3xl5Y*yCAQB zX_w2=XJ{{?ev|4Pnd(SHX;Eq%TH1o2{(s!6nMyOza&+R44(s2a$ec`?dO+?fLuBXb znApVE-d`$6jZJOBXoF)v9(`DKtB2Ax+J8XSIr)3;2amyp3->Jsj|#!QMjRav>? zs&Wlf{RwRnNo5H4k2D%`y~?4JUDUslw-~aKt_`cC0k1ck5tN(FI{b-mEG;z4%72?V z%9xg=4SIBkUGkrJGBzbFkV04Ta4JRL6_P?=-g-Jp3w~X~xeu(vdzUwIL~L{bFPY3e zIhV{Q(MilrG&2gw`F}W@&FCXHBhzE^n&?E>$BS`%m+J3$dAZGjBVtEi<&(jBnuqH4 zuHQ#9kFVgbt>8eGuQlm0{{EndA;873n+*@u=VK3)hhG6I6xcyPUr%Tyrva zR6LwG9)0<{cazMe|nW&2W6XL$x$BvBG^)I+BY*45ZfM)7$MwpXamX zg~Ph`1v!eL5NT=VJvmrR-6#@oCah!hG`$FT5%415MZk-I7XdE<|MLj^0~D{Pp%?4g RCMN&@002ovPDHLkV1mzZelq|7 delta 735 zcmV<50wDd03)2RWfPVtLNkl&NYJQ+ zLZVfOL?N;Yg$mgywpt0RLP5b&hyo!BR5no%tVaAjZ}Q#b<7S_y_Imw$l_sltW z-uK+^&d=BDRjU=K6{r=c6{r=c6{r=c73fF>mca9OA9uN~=zj?BR+?6r1U?5FTeCV4 z;Dt%tG}zez?n#OvVG=h3_9Zhjcg|}WKPF7#et=^w`B}QRGU`jPKQVern8XRApshfO zA^vXHE*|$0h}chX9E8jZyH3y-(1>cT@(+d{@UMO20di*pB)qUg#B2srf&54K)`G0I zfYC$ZuHc_e&oa9W zz~B<_#Uy-KC!;_tMzIX0k z@!!E=P_&(bofnt7|3v&q(TWVYld}}}mbmREuMn+d-NL@QI8%ozwaA%gHtl(nTFNs002ovPDHLkV1h;uWd{HN diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_blue_tooth_open.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_blue_tooth_open.png index 4d07f9ecf67450795900f5db5bcb6002e8afb5e9..55896f84335c1f93f166d4e79fb8da3a77746369 100644 GIT binary patch delta 793 zcmV+!1Lpjl2h#>2iBL{Q4GJ0x0000DNk~Le0000s0000s2nGNE0E|Uy-H{R{4 z00aO40096105$*s008qtE~Eee0=-E@K~!i3?U+4`PC*ogzxBToKTA*u5s9E>Yso4! zqLxU|sDwhIRft3(vI>O?*(kPJ39CXu!BU6+W+Id|Uo-0#lM*XvcQ6{r=ce-)?|s1>Lcs1>Lc=tu>Y!1H$>ce$?U2=7*!R+t1n z2OC?nIuPK6N!&Ep*#YiJiXmYVHv{%1Gc$M2YZ*T#OyYikV=ehvy0f3QQuYz9+- z{73lKf~>ZH(L>^{;Gb`pg@mbF`DcLMcJtPBeFL_EtfuecDzL=Vo&?R$DkhAO-lBf2 z&)3f~yA8nL67b|6;9CV^!Zh(b3FKYFC&9(o1(9^Z~?n z5?zo}VCxOZv~Sdoq*|>&tw60ntw60ntw627e^P-z X0}E0<*gIFA00000NkvXXu0mjfX+CYk delta 868 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 LNkvXXu0mjf@->TT literal 0 HcmV?d00001 diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml index cd73b5e294..03e838328b 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml @@ -136,4 +136,25 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"/> + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_statusview.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_statusview.xml index 93de004200..2a72067edc 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_statusview.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_statusview.xml @@ -26,8 +26,8 @@ app:layout_constraintBottom_toBottomOf="@+id/gl_horizontal" app:layout_constraintEnd_toEndOf="parent" android:layout_marginEnd="@dimen/dp_93" - android:layout_width="@dimen/dp_18" - android:layout_height="@dimen/dp_26" + android:layout_width="@dimen/dp_54" + android:layout_height="@dimen/dp_54" android:src="@drawable/taxi_p_blue_tooth_open" android:layout_gravity="center"/> diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml index d69aad1d46..8c99e3489f 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml @@ -85,6 +85,7 @@ #76D7FF #255BAA #80F8FF + #2B364B