From 2439813e2563017b88bcbaf04885415c07006a2e Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 10 Nov 2023 17:28:36 +0800 Subject: [PATCH] =?UTF-8?q?[6.2.0]=20[B2]=20[=E6=A0=B7=E5=BC=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../m2/res/drawable-nodpi/m2_arrived_an_0.png | Bin 172 -> 179 bytes .../m2/res/drawable-nodpi/m2_arrived_an_1.png | Bin 377 -> 608 bytes .../m2/res/drawable-nodpi/m2_arrived_an_2.png | Bin 599 -> 1107 bytes .../drawable-nodpi/shuttle_p_line_tile.png | Bin 818 -> 993 bytes .../res/layout/p_m2_driving_info_fragment.xml | 30 +++++++++--------- .../src/m2/res/layout/p_m2_fragment.xml | 22 ++++++++++--- 6 files changed, 32 insertions(+), 20 deletions(-) diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_arrived_an_0.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/m2_arrived_an_0.png index d316e9eb436bf599060988533a9ff989aaec1d2e..62ed7bb92d6284a93ad0f713df59d5bceae6bfbd 100644 GIT binary patch delta 116 zcmZ3(xS3J0Gr-TCmrII^fq{Y7)59eQNb>`+0tXwAJgcL$a-yP#7yklg1{NTn5hMe| z3@*!)?*J)TPZ!4!3&G?B3D(7m22xB2qFI-Pfqel3qks1`9gqf3S3j3^P6^Yaqi5#JJh_qvG(eAf1K~< z+;hI&2k`$j=72{e#&a}0nWOf`e@FmvdTBO{qO(s$w_}&o+eiYT6=aMA;L$=p?TwvK zYt#h7_;65#ZGyB$vljH`H;{>JrTshW(TJL&e^aRf1|i`n?&Mh z7!;g4cy|Uhn|5uTx8@m1U4bZUj(-mrg@uX<2nf{iJyvi1112un7y?A+V?D;5{eX3e zIx7+4#^K4SLKd!P*r6Er+h+~4eUqZc5XK$5n^SjcSOX?)#bhrgJawv&g@Zxjf~kpQ zOvjFE+xn|A-0k@T{4i#TdK+=e-fYr z00aO40096101*HH007+y$b|p^0OLtSK~y*qV_+EB!146|El#KZFKhV!p9xn;;FLht z@b?>o(66umBKIC-s6iG-W)o%5pPvj_|9&w2`SXLJ%whk35o7~kY@!T0=Eiv8*SCLj zet-SP{pCG_A51ecO_V_(4S&A>e?Rj3+kb|?-~O2)8vtXoz!-$+|KFK!|NZ}u;V;8~ zA#7@iHt5H^C&M8f3& O0000b)<4i% z@TX0THnvsJ`yjrUf{0IIP@(ii@CUu9pr8-6;tz@sg4$L=L5zrf2~lH0NwMmSHfpT> zNfm;Yn&$5L8Nb=RyZ79B&%I~Qf9#q0zL_&;W{J8D5#B!I_ivvG3p-}yiEbvk$K4de zQ!>OXUzIvxzJL5Cey@BlS5pe{>Kq*po-*-7Sc#mxHT;cij%`%#3jTVCkBjHW6xbqI z5rTX?Fe$5Ig05gSn7D;s5hw2lC)AqjlV*6j1KbcXJC4Y}okyfMR;cWjf0+m2`KScW zBY^zS&0osu(#}jA4)20_a>>cD;lpxGsnGS?K|UXX*)2}PR{~xhLa4IO+a~=v627Pf zn&pgd9KVhKj!CwTg+s)$Q};wDBQ}>!-^C|P$mr8xk=0^u^c-G~frZRZwLHU+dN4YWC2K~+u^DXIV%SP5~JR6MfEM8%gUI5gBjC%&%Jv}gxn3)J%^@w&Ewn% z8w6DIi~jZ)yq;;wJ6h7Ss}mA)bp_sln?ceRR3S=Y`PLZx(Y@@+f79tQbVPAg1y&`J z_Jd|!lNYR98iQ3v$n(Kh71x)>2Ep;^qRklXCVjC^W$|VnQ1l|SB54O$D+vt%UDr+p z7(k`PkI8g`eN*}iZvrh11f6r!HP#l}`Jq?-7XDX+` zGTN)fM?BlZ$-^;FWfaHr)gE)Rwq)MXcY`wgByR{y|47r{Gq<<%E3)QsyA8#&v*=|l z+i+m^1^z1s|9MI60qL_H=BaqajmABfN$7h&u*F zPfKZ06nD(;t&PXVT|Hat*5b-?U|x>KJbGqd(gBP~E|7(LN3;FCqjmxF$qSU#>wn7{ V87|%r+=e-fYr z00aO40096101*HH007+y$b|p^0l`T`K~y*qm6E?pTtN`WXWl(SAc*9!3kdNC2sQ!H zLi~Y+7#q<>5DX|<!qRd`~d_x8ukxPu&A zxi|3k?ac1?v-4dRp}`pa$;T+zf85pz<6qxmUXv%aN$j63TCzNR{SUV5H4TG^V3A$& z+gqL+IhE-eEDAJG=Hr2~?5~L=l_9(n2MeJy@CMekrm!dw87TUkXHSmclZq;1SRo51 z&TvoZJB&qx*yBg>=*h`)?~$~skUV}1FmO3fMT34!<1aR{Lq=ZlBTTBWf5}0K9YC=Zr{+<2q#MN)uJnS#SJYf1bd-_BmpV^%hzVz?OC$gh zvf6%UrHBkw&7(UahlAmC5G&^@?AeiGxVIK^@K^Jwj=DDF9aVV=5FV1WaHv9?(YUbA zprk_-$mg^bY^8v>e!YVKaaHJY_yECbAx-u)kFpjXWF`&|<~jMSqV_czWCIiI@Z!%Z zUTO_>Xe8QJH dbf>HJ^(Uhk-39bv`3nF5002ovPDHLkV1j^y?3w@o diff --git a/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/shuttle_p_line_tile.png b/OCH/shuttle/passenger/src/m2/res/drawable-nodpi/shuttle_p_line_tile.png index 29914bfc8c0966d18eb7cae4880b230983f0c785..44070336fa1ff5736c01a7e3930b2fa24eb9c8f8 100644 GIT binary patch delta 936 zcmV;Z16TaA2H^)GiBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^pPP*e;}X( z00aO40096103ZMW0069pV)Fn114~InK~z`??N>`r6hRQKo?#_m;v<+yGzJifH)4b# zMi1}@3?6pz6(ccvQE&bLV~GDiFX}-&Ai5j`PhL>sBgld=CVEi8T@xjS7!xrn;B@&l zJ3TLE-3RV^v64>L>#M4nuIcU(f0To^wC%60Hfq|LXcr4^5k%Vs(`FX5iI~;{R*kX7 zfiGfS!1xNkIrw}M%&m+UT1ZJcvRpue z72k{1Xmy*D=>=ZKbbfdde;!QDh>08^VYI58nbgn|(PYIhp~=qpLzyKVy4M&OjFm~rVl_+F6hsuSVDtFb?)D_imgN^O+e|o%)1LZ107$%Mg zO+1#K92!hRR6X!d>3;!{Z$MVZYXA1S*fC>mRLsc3NZ4|;$x3{P0+gy_TSgvckp&=0 zJvtU&MfoXm3Cf?=%aE%8oD<8}vpLVTWNyxh}^N@!9l5au1quCwymp{>8Gh zDu#-sVn%@@3oxa4f2f?_KN|RgvR_643(;Zof2Cq5UmY`yi)=z^Qs1_=gXc_PTPUC_ z3@TKXM4i~;57}&{q$&HnzX30TSAb#s!~v1DFm;=T>{gf5h$GBH=iz{@A|Y;?0;Tvn zK;?4CT>`ApJ=|KpX+ybYl|$vy@dFQtt9K_1546#lmjJpDe$o{r;$QMS9C6(bP#1pB z#}#K+A?CbtxIgn8z3~V!uvfE{PoM2*4`VxD(soj`SP+>-juIC+v;@0000< KMNUMnLSTZdp{ptY delta 760 zcmVL8$9a3GAXeeLie--$Tb<9h| ztW1Tu`x`4-o}GO8*&o}kpGakvLv%n@2De}$QoJ7n0UfN%nRqHQM@)J>wr`5sfjtoc zIGWX{H=_v13qT;4-y7LUhm&dZ21+)Br@jsw6U_G%iTqAP!dNDGUMe-rOdEK}SFj@- zPn%0{4!GbpL-c%jJ2vb3f6dsF7yD1I+j7R^GJVG`tR?XVTHQeo0nJLQb+^!~2p0SR zHC)7C3zj^RLTPQCBUXGjK8oQ{ya(T~MGr-wy9nsxshAz_))KmOf2I9@i6SS%hLnSe z3+D80>IsdrVSXeLPKVonV*mZSHNw6xBl`%>zAxeFH}t{LT&)qte@14+%!7rTb(cvz z41*i_n&WVx5ynOm;dtmfb!A{5UfyeAa3f!Hs$A*|W4(U{oZ^ev1V^d>#+O({9wJQM z+V^ppK9#c8QH}G&Sn<;uvDqYAp~m%VdNb0HM9M6qbjNgGHzC9T3prW!>fej&N=P8_xK_>=Jxp_H%Zr>r>_T+b%c{a$r6&e8G_0)xy3b{kC-^AB8) q3fZyuK5X5tg9S%(wT9O66Mh4$yVT4up @@ -139,8 +139,8 @@ app:layout_constraintBottom_toBottomOf="@+id/tv_next_station_title" app:layout_constraintStart_toEndOf="@+id/tv_next_station_title" android:id="@+id/iv_animal_list" - android:layout_width="@dimen/dp_25" - android:layout_height="@dimen/dp_30" + android:layout_width="@dimen/dp_18" + android:layout_height="@dimen/dp_32" android:src="@drawable/bg_p_m2_arrived_station" android:visibility="gone" android:layout_marginStart="@dimen/dp_7" /> @@ -149,14 +149,14 @@ android:id="@+id/station_name_tv" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/dp_18" + android:layout_marginTop="@dimen/dp_6" android:ellipsize="marquee" android:marqueeRepeatLimit="marquee_forever" android:gravity="left" android:singleLine="true" android:text="@string/m2_p_empty_tv" android:textColor="@color/shuttle_color_17417B" - android:textSize="@dimen/dp_46" + android:textSize="@dimen/dp_56" android:textStyle="bold" app:customGap="0.2" app:layout_constraintStart_toStartOf="@+id/tv_next_station_title" @@ -174,9 +174,9 @@ @@ -219,15 +219,15 @@ @@ -338,7 +338,7 @@ android:format12Hour="HH:mm" android:format24Hour="HH:mm" android:gravity="center" - android:layout_marginTop="@dimen/dp_25" + android:layout_marginTop="@dimen/dp_10" app:layout_constraintTop_toTopOf="@+id/aciv_speed_time_bg" app:layout_constraintStart_toEndOf="@+id/view_split" android:layout_marginEnd="@dimen/dp_90" diff --git a/OCH/shuttle/passenger/src/m2/res/layout/p_m2_fragment.xml b/OCH/shuttle/passenger/src/m2/res/layout/p_m2_fragment.xml index d9ffccbf35..c1a974d194 100644 --- a/OCH/shuttle/passenger/src/m2/res/layout/p_m2_fragment.xml +++ b/OCH/shuttle/passenger/src/m2/res/layout/p_m2_fragment.xml @@ -23,6 +23,7 @@ android:layout_width="1080dp" android:layout_height="@dimen/dp_612"/> + android:layout_marginBottom="-40dp" + app:layout_constraintBottom_toTopOf="@+id/zv_msg_pop_bottom" + app:layout_constraintEnd_toEndOf="parent" + android:layout_marginEnd="@dimen/dp_40" + /> - + + + + \ No newline at end of file