From e4023f474d8f8fec0638c51df8c019e15951cd55 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 22 Mar 2024 18:41:47 +0800 Subject: [PATCH] =?UTF-8?q?[6.3.0]=20[=E5=8C=85=E8=BD=A6UI=E8=B0=83?= =?UTF-8?q?=E6=95=B4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/music/list/MusicListItemAdapter.kt | 3 +++ .../ui/music/playing/MusicPlayingViewModel.kt | 1 + .../drawable-nodpi/charter_p_music_split.png | Bin 0 -> 1430 bytes .../drawable/charter_p_music_list_bottom.xml | 6 ++++++ .../main/res/layout/charter_p_bottom_bar.xml | 6 ++++++ .../res/layout/charter_p_bottom_music.xml | 3 ++- .../res/layout/charter_p_bottom_stop_site.xml | 3 ++- .../src/main/res/layout/charter_p_music.xml | 10 ++++++---- .../main/res/layout/charter_p_music_list.xml | 4 ++-- .../res/layout/charter_p_music_playing.xml | 1 + .../passenger/src/main/res/values/color.xml | 1 + .../taxt_p_location_center_checked.png | Bin 2463 -> 1624 bytes 12 files changed, 30 insertions(+), 8 deletions(-) create mode 100644 OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_music_split.png create mode 100644 OCH/charter/passenger/src/main/res/drawable/charter_p_music_list_bottom.xml mode change 100755 => 100644 OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_p_location_center_checked.png diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/music/list/MusicListItemAdapter.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/music/list/MusicListItemAdapter.kt index 570ef5f028..deea92b6c6 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/music/list/MusicListItemAdapter.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/music/list/MusicListItemAdapter.kt @@ -1,6 +1,7 @@ package com.mogo.och.charter.passenger.ui.music.list import android.content.Context +import android.graphics.Typeface import android.graphics.drawable.GradientDrawable import android.os.Build import android.view.LayoutInflater @@ -76,8 +77,10 @@ class MusicListItemAdapter( if(musicData.select==true){ holder.itemView.background = gradientDrawable + holder.musicName.setTypeface(null,Typeface.BOLD) }else{ holder.itemView.background = null + holder.musicName.setTypeface(null,Typeface.NORMAL) } if (musicData.state==PlayState.Playing) { diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/music/playing/MusicPlayingViewModel.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/music/playing/MusicPlayingViewModel.kt index aded9fbd34..f43e922495 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/music/playing/MusicPlayingViewModel.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/music/playing/MusicPlayingViewModel.kt @@ -41,6 +41,7 @@ class MusicPlayingViewModel : ViewModel(), AuditionManager.MusicDataChangeListen if(musicList.size>0){ val first = musicList.first() setMusicData(first) + viewCallback?.setSelect(first,null) } } } diff --git a/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_music_split.png b/OCH/charter/passenger/src/main/res/drawable-nodpi/charter_p_music_split.png new file mode 100644 index 0000000000000000000000000000000000000000..155676614e0e3e78ae54123f9dce0b6ca7ee04b7 GIT binary patch literal 1430 zcmV;H1!?+;P)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR910-yr`1ONa40RR92w*UYD0RCg>YXATR07*naR7eelSId&zL=bGXq?y?n z?XK56?IS_>V7`a%;O09=g8$&ciBI4IeD&E}On?c);(bUXsYPa0b?Y?~C}O3as>;f& zsvb>m_UeaUF59vxy|ZgvJU)KRXdEs4bgYYPZqb;h&Rwm8k2QngqpNwinzGcMBP`d5*8^7-QFbu_NkOKW2Rn zVVm8Ba?zsjIciCfGVdS=nJ*=LPSLN}yBvD1urFNWTp_6K(RnEX3H%QGtM3uB+3ZXY zENeYQ=QCe_YB6m+i`hCaYPJ-1r)7w+zU!vlz=jPy@@Pa8dk8o!c|Hr)pco@1t4V@W zo(+ut2+c<>oU7ahCW+~LB;0IbpO2^d99Wl88CQhogsW?FUWUb#5k-KYLf=Ptc@~~8 zW6B6`<07BtDOyg)mzgi)yh!K(^WuuA5Fkur$d1nQ@@-RRi6ZzuE6Nr##lYuq3Fb}N z`5wSEZ&V1G6-aizPBdm3e5MH|M-zqs85~?u1n2MWbpv^aJW_?`jqK#A5*K`-51F@3 z2Nx_kh22eMs4(k-PRC>J)s)L(NGe0A(9{BYY(pzbT?~zSpj=1;+F|_xN+T@BqtB>I zi=McWLXM8eQOY z<9maCUJ!=2Xw)O5+!~qpgJ{Nc@Q9F0-iM;6=JzzAVjk~vMPau_J-sf_ujrx-{7ek` zLx!0~E^;iI$tG-@R^Q>Gfu!>58Jn36iPYeJOxS5cnZZyp&yZNk0QldU8sg;uV=`#80%hDEP2Z7RXP$Yyr~!;Tn2` z^pDZifovW;PG=^AkSw>%Lyz-Mb#*iJV)yz!FYwvAlpV?^__XI~8t zof1@nqdwXM=lv+p2? z@)HGG<|JdXz)|Go%lAVUxo~Jw8ApdhDFb=QB9Af2vR?Rns^@0}$n>XJMT`|owL-B*^$^WlE-@8=T1hvW>6Qtp6MSAxeyRG6>(95V}hhSCy6 k8!5^H|C-T^|9fu#0~f;T)%#sXN&o-=07*qoM6N<$f*iT0Pyhe` literal 0 HcmV?d00001 diff --git a/OCH/charter/passenger/src/main/res/drawable/charter_p_music_list_bottom.xml b/OCH/charter/passenger/src/main/res/drawable/charter_p_music_list_bottom.xml new file mode 100644 index 0000000000..5eff764421 --- /dev/null +++ b/OCH/charter/passenger/src/main/res/drawable/charter_p_music_list_bottom.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_bar.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_bar.xml index ccbbfda691..e6e33a09fc 100644 --- a/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_bar.xml +++ b/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_bar.xml @@ -43,6 +43,7 @@ @@ -20,7 +21,7 @@ app:layout_constraintStart_toStartOf="@+id/aciv_center_image" app:layout_constraintEnd_toEndOf="@+id/aciv_center_image" app:layout_constraintBottom_toBottomOf="parent" - android:layout_marginBottom="@dimen/dp_4_5" + android:layout_marginBottom="@dimen/dp_9" android:textSize="@dimen/dp_20" android:text="靠边停车" android:textColor="@color/charter_p_090f28" diff --git a/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_stop_site.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_stop_site.xml index e933597fd0..14a4d229a1 100644 --- a/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_stop_site.xml +++ b/OCH/charter/passenger/src/main/res/layout/charter_p_bottom_stop_site.xml @@ -12,6 +12,7 @@ app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" + android:layout_marginTop="-10dp" android:layout_width="@dimen/dp_90" android:layout_height="@dimen/dp_90"/> @@ -20,7 +21,7 @@ app:layout_constraintStart_toStartOf="@+id/aciv_center_image" app:layout_constraintEnd_toEndOf="@+id/aciv_center_image" app:layout_constraintBottom_toBottomOf="parent" - android:layout_marginBottom="@dimen/dp_4_5" + android:layout_marginBottom="@dimen/dp_9" android:textSize="@dimen/dp_20" android:text="靠边停车" android:textColor="@color/charter_p_090f28" diff --git a/OCH/charter/passenger/src/main/res/layout/charter_p_music.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_music.xml index d659532f59..b40f4965a9 100644 --- a/OCH/charter/passenger/src/main/res/layout/charter_p_music.xml +++ b/OCH/charter/passenger/src/main/res/layout/charter_p_music.xml @@ -36,11 +36,13 @@ android:layout_width="@dimen/dp_460" android:layout_height="@dimen/dp_440"/> - + android:src="@drawable/charter_p_music_split" + android:layout_width="2dp" + android:layout_height="@dimen/dp_439"/> diff --git a/OCH/charter/passenger/src/main/res/layout/charter_p_music_list.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_music_list.xml index 5691db52b9..682b1807bb 100644 --- a/OCH/charter/passenger/src/main/res/layout/charter_p_music_list.xml +++ b/OCH/charter/passenger/src/main/res/layout/charter_p_music_list.xml @@ -21,10 +21,10 @@ \ No newline at end of file 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 6e750eede6..d484782591 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 @@ -45,6 +45,7 @@ app:layout_constraintEnd_toEndOf="parent" android:layout_marginTop="@dimen/dp_30" android:textSize="@dimen/dp_21" + android:textStyle="bold" tools:text="Current" android:textColor="@color/charter_p_303C52" android:layout_width="wrap_content" diff --git a/OCH/charter/passenger/src/main/res/values/color.xml b/OCH/charter/passenger/src/main/res/values/color.xml index aae988baa5..f3b456cb7b 100644 --- a/OCH/charter/passenger/src/main/res/values/color.xml +++ b/OCH/charter/passenger/src/main/res/values/color.xml @@ -65,5 +65,6 @@ #598CFF #4D6A83A5 #6A83A5 + #80FFFFFF \ No newline at end of file diff --git a/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_p_location_center_checked.png b/OCH/taxi/pcommon/src/main/res/drawable-nodpi/taxt_p_location_center_checked.png old mode 100755 new mode 100644 index 1467d91e06f82a5c0cfb536e5fdee43874b32c24..6ef5c257e92c6410ba19def49255be4b45100f9d GIT binary patch delta 1572 zcmV+<2HW|c6W9zPiBL{Q4GJ0x0000DNk~Le0000f0000g2nGNE050@$Sdk$}e<`2? z00aO40096104e|g004)8{*M3v1;R;0K~z`??O1DUR83*hb9dY{;0tQh>5WgADEOXL_`|}T#T3?u`$txQ zRioHa9<}Z6o-@vzySKZ&?QZXGfA^ozoSAdx79o$%9SwAw(XbE|ocwhw z{*^D)m@h?TJ83x)wGdDt0$vOOF712)+w!4bp;<9(0e6tL>udhervG0q_3FLwZl??Wo zZ4||)b&Nt5m>NfriCv*5IPP&lYzRw-@qfjkfjJ^z1{O$=+2?b=9DqC#Sn#n z$nLP{?X_NTABG7)uMn zI4u}dD;RhK5MFlRJAlL)-hoY%YUo*i5M9T8NY6X2_iB_{if8SLW1TCdvV>cV48`q?KZ~LaaGtXbn^>?>M=h6 z#V&6#En5uFDZ~>(e@hujbXeEgk{X&WyiCuyAQ%0>6^!t(tHc%vssm?MVZ`P68JpLk z4j?=)vZBK}D};enGGuy&w|j1cZe+nCuP}cK+zm!I37?M;d+uR8@X+a%*y5G-Lr>mJ zKXP6#5M6w3N>v;WDHzot^9@E*ZicS5dW;6EI;h~>S$&vdfBJ#3jBpl$3OaAZdsIkM zuY<_xv4s8b6nxFwy@0dFRk}Q;VRT+=fIrT{rP3N&uNdHZj{TSbMTJ$}b(S z#K8nB`@uk$97(Bq(<$Mg6mzuSR4g4%CnS9LK(;at%1|cx@!oL&!%{dS^k!JZCqP(X zK<#6{TGPr6e`h#L@SF?v+Ifd5=kFKx^Y#&u6vxv)Q4ab`!L~}gvX*GcFGr!A8DkaB zECc$zq#n63bQRMdC3#uQ2&$Y&CeRTaQwm-gr9lB*Qve;m@4=qTek4}%ZPUdE@~v)l zgI1^7A5lw2DISM0wT@QnK{zNKlKsgp1>o_%M*JYtf6{T!Nm!p2x1X8atxB}Q@~2AdX3uwu3VU=gSOX@cHGMkkL%n_Oej1g_uDNOT zbbo&of4IGaN*hJ1z`pG%Qn167%QU*t&m?2t$@MsNK_B66W|_S$q{)anxdj?~xN$hB zqi_P_@F)M%sz?vPY>L846Q_G@=OlS(*YIv=jI-Q>J&ky5T*EBj8>A>(6rsrjLliMX zrotNJcFh?but+`yL42`}|=3L}YJ zZWeCxq?OoP5Qd8LyR&ahlFp}E@;R^if(knOpjt-_f6}ToCT0qyA+}$N+<9~6wQ`;w zdI}i$xO@Bf&2c)j69Sp4bb5n1%28aA!h8R>t$`;}=$xlnZ+Fg?Ca~}-$O!~*#M1v) zB;}+T;eN`u)(CzMMBXB)h&-P?%0uUXF0mwUAPa+P8{a@J{Oe=gO}E?xyK;v$a^-&- W&UG$|&!E2m0000VIxij}ZqU1^l zBm@!y34w$_LLecK5J(7o3J7o`_3_?5NxgNNRvV)0QcSP?cOCC*r2c7N8U~n%@Pci! zmqb?PAUU-8f9q0D|f3fZSriHH0 z7vKqAXGUmYk$f5j4FgP=Ql&VQlb0%64_U(itB0|*Xd?j@kzxWY0Tz)!#NvsECBPyQ zh*&)Fumo5{0uhT(`=?PypUfB=r4{b5JYih9jqs*Q`1+PC5?7Eq``FO_v_rd3bn`$& z`)Xc%+JIgEvMhGTOt;DKf88c4pCK2307;OF%K!yfNL6m(A&*=>hUe!@3vEC17!TK+ zMimO{4s6M*(mp<7e(GlEe!y`8P=H}!0iFe<&&I;?p2a9c3r)ceqF&E!U#4eXTFod` zzpJjmI{qvx-K@N5vSywIq8?=-==2Nj0V?EOIj_^QTE;Kuc_AH~f0d%nQ&01`dLgUZ zD%tU>yUvL05dkd!VjZsFpD%+yL8d}`=WW;tWVl$Lyj$;?X~k%U-fZcT8?2xXf9eA4 z#(lEhkUR}*?T!Qkh}w-!L(fD%QMvaYop;z7M*&+-<>7)JIOJ)*k!v|a{Z~FL3;aT{ zCb0wSIDm~oF+W$Ef7N^oE9^09p2LTkoo-6;O|4Bl=j4x^c_-G>tmc%{#twfSm3AWi z*mCvtcwUGH4`$ow80~KRq0Ehy7L*4=7fU-!4oW+AQICi#^EBoJu}N1zFNX0+M|i`r zHPi=?zMqxu%I7voD>f6KM67#6GJ?e-U!Us7>qqao-|=@#e`~0XG*)0Y_Pe_mv&cS`6l6BgT8E-jAs>^KJ*KI9?A}=ey2hlOueYar*aX*J`U}FTr5GigOV@o;5Su=y*Zizoe+h zw34MDL|?vDF0Yc@^DYhc&IPQD7b=yVWZt0quzke{D+s|0i;M1s96ZBh_d*{R$;t?-28NH3pOw*3 zEDjOVk@rSlnwIucYjNQzORiE6vwT93Lbn%dV5lig&t9xhkY9DsKYDxWH;ebnX)&gg zSjroY?PaWlU&5%j2aV|98$cWxA&nJ#19>e{jE9Xsc8o#;1%ijr?1vTFKu_siXC`eM zfBH3_sZcI2E5bnJ)vNe`Z^*~tRh~z}2&3=x_=d!{-_E0Vryimut~mY6Xy2*TG+p(StVUU`j5xa|?ybk!1q`A8+l%&B@XlPN>Tbpj zJ%E8}_Lb|*v=@>?allgLu>gB#1rH#qe;m^Wbe15BVVWYvZYvL)CsjVxtF1@oLibau z*v5N>h`xhH9y42YYYJ+No^)eWxYZ=~{u=!_t7ydz(7IvnZXN7ge0Q`?HS)JFJ}+ycbh-o6@XC$q zJ@Tl!u=OmTlCS!sxejfLqBCk)Z?;6ORb~0*2PKUq?5|kGR!p2J0$T3O5sC~Spe%1Z z{s6yGPHp>EnQhJ^z`OJmzEdx^e@ATgR2((zRy7b}6?R;@@9ZxAeK|d~kjDy4J9x`$ z((=i$dDG3vwZS&B-CD*6x@S0y)mH+;Cn&4OaL#-9n7-hQ(YWihWBRfG-lj%}Pq)2i6tZ$nf3Z*RL$Dz6 zoSz5K{yUcf*F5O>W7m9I-P40(keIL7VpzD}|G1rxniat3PL44Zp6JQZXFaeeTi%1}1@x;RtU=ayK zEZ#64hS!LahrBosEh&#^XU&Q?3^4qV?CNMd zVi&^up&el1hrnyzNPZ}mpBGFTUBi4D1r}WWE4dVY_W8@2XrR$x1$|7?gg`