From ed47603a292c03479171dcef59526a770771ff12 Mon Sep 17 00:00:00 2001 From: Yutousama <583819556@qq.com> Date: Sat, 11 Jun 2022 23:47:41 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E9=9A=8F=E6=9C=BA?= =?UTF-8?q?=E5=8F=AF=E8=83=BD=E4=BC=9A=E9=87=8D=E5=A4=8D=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20add:=E6=96=B0=E5=A2=9E=E9=95=BF=E6=8C=89=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=88=B0=E6=92=AD=E6=94=BE=E5=88=97=E8=A1=A8=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=20update=EF=BC=9A=E6=9B=B4=E6=96=B0POPdialog=E4=BE=9D?= =?UTF-8?q?=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/libs/POPDialog-release.aar | Bin 21930 -> 22000 bytes .../Adapters/MusicLibsAdapter.java | 76 +++++++++++++++++- .../containers/MusicContainer.java | 26 ++++-- 3 files changed, 94 insertions(+), 8 deletions(-) diff --git a/app/libs/POPDialog-release.aar b/app/libs/POPDialog-release.aar index 8798a58937e9ffc62ee48b73f1fc4df1b3e1b901..570f379005008b1ee02a5abd759066c0a6df891e 100644 GIT binary patch delta 17613 zcmV(lK=i+=s{!z<0kEGJ39fK>FfY@#uf(Fe*iN&c{zFE|Mf*I z1hBC)u(bf#(i&MCI65XP&dMPPAb*>-G?`Qv`|$yZeEJK@7*pJZWSECbBoh9XFdFcO zz6uj^HOtsq69w?xg}U8Oj1L7`cs#~3_GnmkV{~`Dbl-esd~JWfzFl$om8u)5TV;~J zCTS*u@ho1DBV;VY(O_ZnXdkoKijRs1C`XmutEUiy6+Yj(qiMRw_k4| z-A1uj8`)S+fxC8@u5I}tjxD5~th@7FL^t(iyOgBj9Dv++e_MJHr#+V5#-OjGy~9h6 zWc}l83H`LEKXU@Ld6K->cOn8l@oguMo$U!V*pIqnTnj0}`<``z;v-+-qn~czK}aQJk+6QM*&(&%WIiUX zWbsBCEotVOAy z{HbVV6kMGB$I>Y^3n`M@l@HW=i6;WM6!)!sR8OI6Y~dxl4x`-<+*m3VG%W;989krs z;F#?2t*zZDUT1)1vyGSzi_rz#E^fcJ!}FQ`s2W`*NJJ^qw6JBNcJk>5qbBA!r#Qhv#zVI@XmWAYa4i(E~q(e{ElW_y9(HKff*j zK-c=o24l}wD;FL27b`WrTJ~)hYSqa{$-(d@8Heq9t*!g|(5`K2f4oW!S+MV#pX9|= z;D!R^2ULCHG@LCvYt)}LPfWxp_rmdGAcU;ffA6qa2I=EyaxWY$&7%ntmOZ6yI2e`m z+n#?V6R*#0!-9kp7le`N6OQX!I){9|O_Vxj8HRo6&O3Ke4jQ+7)>@-^AH8k|hTJYK zt?5M!=chuaH{dB(+vKx?T)Qpo=bTX06c;rsyXy3uK{~iNkE$I`t=le9k17$~wpk@} zf1||37)`R%G7?|W7~D|5NnS8$Po%WE2Wrv2RIJ<|v#R7!rVNohlHMY`qc4~ZqmG(T zN~)Bh8Tdy^ctyz}o{lCT-+3UeW`O5ri1mU%qseO1IEWC@i)VNxMp&9guJ<{6b)j4?X5?VbCxP%x%Nh0JzSdB9+{-^E)>!M+)S-22fTZn?-|cAs4lz0ZBv~`42o| zj?C$z!CBYX*Kov9P4n6|O^P_-gI`M4+KVlPfT_p5?=S^@$N54$L(vI0?yQJMe=JbP zA{vw{w#6!VB4j|mdPQ_kGm?z?d)dqBsCuZ2gho{I&#X*Q5_#bD!GsSAgqj@%I;ZRw za7MdPxE5DL2G5O}cuD1@n_;=`26De6Paiao$+LX@Kv@* z&&GR-yXs4l5)w)6o_J`Cs#~8Gf3h>Zr-RU#?|7m4i4JWsK5PB?Du@;`j?KQqjq9Vl?K0G7&7P+A?9uk|-5`MqL-ered2P z?Utk9I_97uxeQ!>PEX1-pU{UNx-K98J5J59*5k6U(<=_|lFI zHuEiGSB42w`kCv!Kh>p|yen(etbe`IcA!PP5N7Q%zd;H(pAV!#MHxz{1kAJI5DNYz zL|dP1+f)?e^2ZErZT8E7d|WCEqEw3=$AZ%EE>8cY0q5eFA6$CyiOsH z^Zae!8>BI1<0mm?WB?)&P8$x6$Pk_+tYD~YC~c^1NN7w(g8L2f?*gJG_)$^+kAP(S zBOna_t$-K-Y)vixB_PBM|B{esWi2Ia5#(YHO?MNELbI=iwYqVl01mzFD9}5wwnG zZo;`Y9n{*~g!i?He=|hgmtj(AJY_0wzOY%0*NTkSM=Xg76S~Zg#I@5BSsbI&qEVWG z<KV4ZVxCZQ?mG7gkO@`DZ%z$}q=qtY8;Wbehg6ygb*Z0H3yJZf`p3y2 zFtt^vKnj)1yBE)`p~+NEh@;T3h!~qjzM$WupxnHA4p@(Be~Yf4C=@}r@~-!8K?wEW zKt`}Rn0nB@W6a#)!)u%~Y* z%f$P;*r(^4f4dkt|74EA{uxf@i#YeFIwxd>J5DT0g#}hqBDByCoUpNS%tiwx zbgjeSRk<+0rihJ$2z`m?qNIZvOY4Y3L0xXzjHy;R8-@GN~)x8~$zYI;Lak%#Q@!H0TK zfK~sT`#GV>9cV{cBblwz$I{wkKt+O)tBB~nOJNJmKG!oW{iCXK-=GYxR3#o(Co44E zvzq&tfBLNNR#;S3xWiJCW`afbXqTwd$iplh>M*rf(y`!JGis3worpjg^EAYhyP66{ z7tC@PNIf;p=`O>mDbzhOV#%3`gi$N3$DJVlNTb9mG~I zDQ{#7@4dw!6LtLN&b=TkPl{54#~G33d}!-gf9~*mxXa|->kwd!cZ7@2sEtJD^O>Tn zv%4_%4!83jyk=X5Pnw5#6gef)IO|3mnMqW%oDy<}HQ zEJ0Etn@#-MVa$m(oujj)KA~tL;m}_o3F*Rp>cCX-IJHgWgVB9TzWfG2pfb|T$V+}8 zf8-@h$V+>GhC-L6% z$L@f_{+qLSS-imJ6WPljZMYvu!24bpf7NKi@*A{~gDH`NX(#>7^m%l)b_Zz6DA=H+ zic*y4Rz+V~Wf^f(p>yPY{XH=x*@9Cw`SD7Kj|mOjh#Unj=?22$a+NY94@=Eql>C08 zWf-dT#syg8IXEHbuFB*nH9}jn1~Eke=~=5#c)z_ez|x?-kKT#b7F!`CKC=G6f85Ai z3sLcP68d0mKe!sDL=ySx<_}$>8Tyx;9U>2k~=X&(a+P+MO5AXso5#Xj_P8&3hYiiF9=hjxDmbo zFK7m6J#`~&HH-uu6UZyk6B#sCGJLG;2n-&L$pb|Jjx##yUPyS7c1 zm6n&Q2Dx$Xwko9TL};E~wd3L|$H`Gt&{W~=hVLIQ8;Ns&crxgDslk51NV9_hwobk3AE1YoLAy;FSr`56oN!s z@tNOIGunqxig=h+J7jA+U4n2Pg9>rZ;jl8aS%y&h@rLMUHJfBkK10by+FboZp7-YD zK}yz}vdp&$(_^H%mcjCjG{{6*OlRuX=&Q4&vAL2l%@N@S;YG5%f7J?_m~i5v7Bpye zn`5!N210cE2xp)XT>=_wGQ!f*>0{|>BQi)#X)I@NpQLG_T4@`?OM^CW54hKEryrpI zPNLlV-XZ6Iis;t=$c3A@{d2{0{O6AMze{MclFom)aGplpF4KdcVE7(E@pWrOql78~ zyf1tiNsEdO#$Uk^f8cIqAx{usD~&5N86|M>uUK!OXI90+)$j88s>$oZ$&^n&P2G)t z2Temo2|SJ`Gh2?c?JqMAy*{r9eK1~A^cW-2yBDgMtpTQ+RZ_UaSp5t83uNg>k)bj* zO;O2wSAGm`T3(^x2x?gU`|l|bO5hwJ6gB4()EB?h8v2zWf8mZ9sboKe3Q3(Qlf+Ayhy(Mz|t5NL{OQ%%ugld@E z6@vnO&{)CHtpnv4I|^Mod5Lda~|`Nh*rhFDemFZ|4)r2$W?EeFgAl*RScC0nG|l%X*>gzJh?FObiP5e90O{vtv98B`|gk-=)q-Ln)g{Md>i88 zUY#X6B!oXTpwTL$OY6ldN*9@J!}8Xnx*H{yYY$6wAw3z&`#zQRvxW*7A7tOJ`a)T`sf{(B|EcjRp&_GhHO z?KgKV67hqfO|XNSPV{%J<7a8PfRsNeM|cxUKM_c;(d4~;V$T+z+x=#B(`L8kys0s( ze=nmy^R91hU3@#(vm-c~GICYa=E$y0H@~-s#V{^C(+ayK5pLueB(26&7&JuMBPg^9 zkkl&MLiAyz3j@wr+Sb#UFjJXptfDNkmeE(+su-&55Agn-!IE5}qkI39!MuOUAoYLC zU{ecQ3&;P%0qgunlZK~JXI&8rS)QD{f1ns2*+gnM_O}o*M12YHuSGQ6sks>Xx@;1z zjS9dgww}zVxEFnN>^J#AHmIbEpm$oj=j=9z<8?RF$HQvt4G`*WnnA_>a@NaJUnQ5= zwt|Yo>V_jL8*6T`>T|TR;*Hsfkv?=e$o6i`jf3Q|4 zmBxYpV^X7+sfm`V#5q6t-ss#gytm+HKcbLnhf{gja5|$1_=lp|1M~q-K;o%r0TyZv zy>N-ygv8KXqF=Nw*hU<^6MJp)BcYJ%3K|Ll)#Z*RD?=J%`SDl6M)e*8L~X z3IFd--c(7Ytowl5MwgX~nn_n3e}PgBu_XNxCK4e)W{Qf633?}UF}f(ap-Q=x;stR{ zW<=CJn2;~lYzjMKR>C%~%vfWsWp}VO zZd?iGSR~bT$kZg~V~soU7?#+BaHoeh{iC%=|0EX6Bcfop3EbvI>YXRAf3Uh!Q1wf| zDh&5q_YA=`;J-1F2xyoK->ww(GoLajKhCqdb; zTXzHHn`)6Y#6Ll8&o=#I;k8uXrLqQC14(2#P7|?d+*=pP|2B2jQ_c(-g+kN5eI;PC zM@7Y+hh`af*=MJ)hqR@;e?t$!Y9THrDzf%HPDVM`A!b9 z?v535r9eLjdeLhKf>C-^kbZ05Q!-}_an@V#9%^L90tw6vW1V$ge-sCxFiKa_v!-#r z^dr@LrWalZp^DCo*s%T>bbL!+FGWfknKqD(LmzE1 zb(yDy#Z(%OWpJpuWlXN)~*A-QGNX}hlk)oUgz;l zvaF~WDB~t)q)p9ovfWLu|Cd+P9z`6KmSL%KDN`|LQCURTRN7cMpExg!Nq%tC3g%=> z{cTjHdM@cHsL53wLQ>@7JJ1Sccn-35W&qu>3xlb1Iq?}cy(CkGNs2QTS7q-JB1yiJt zGYvbrTC>FbVz(vq7jO_JhZf^*lOuG_n0T|DMxj|P#SF48?~uAWF@rMPGepTVadi#T#7^2+nK+JCTS(&eOC+jinWDdUQ_N~locLiI-yrcIY8eMBmDds1df~}KVDs2*< zSBn}|R+C#Po2=Pwu@q{-v4K)fu0v>sGXG}3DhI(;ta|U0q9?A?(Mo^7`|++Y*)$Xu<7I9*O`e+`kT8iYyOaKjPD(wqu^ho^SNk$j2C zJcfzu_!o$C=P76+JBbgPQd;Z&j>qolip?JIo@pVw$2Z(#g{`GEE7aNlNwv`ym@hez z!qWd$V`vL<2eb;T4QEHxH%9mG%&FEsOKV310+M0=hduutbN;hIs|l{J{PgwXqnFTm zf8anYCWvkT3LU3C0y+c=+3-gfe(e`Z>>&w4?XMb7&c)Pr{i<`^Gkx|FAkmhrRTwk#^stILH zg|kSy3)s_*t_wR2%s;NqGX|8<6)H#59`b-EG3S!Ko@YB|bO?9vZ!DK7`}l0^LGeNZ z={E`_mkBcmph-^OI;c)j;Bi&o)*YN+qDWdk$QJ_l*7bG$aGQdh+!7ef0lNX z=H}*PSj>Lr`GEH3&Os~)ktgvnyvLQ$f_VNh2xbfyN>j|$r4qL0S_m;UC(yviR##D{ zL5LtB)Z;UhFND&lDpdJuN6OXqvLI0o3*u-~%w!#07tF~dEE_0v=|rzUNxTBbK!OJo z1N0<7XqgyGX%AV@c|mvyJQ+i@e}aR!78=^9G3iFJzdSx?s)cnhol5gVW`X}TzZ3YY zKIbf2Op{0J`8*8*-_YSxsNh~1A7nhbu9PJH?6$F>>l|}Qf-*wQqu3`7r}0$*q!Mwm zbm772Qj7eO6@pnQWyzg{C1Xjl{%j#8*^wd*swvWXg@e+SOGO}#zE>khe?5n}2Kj2I zIcYXul<6FGNq}khaMPAbhr-Tf0hEbkVPskfOa&5@%$qcq&H!_rf(&FA zjs1dRe%l-XLuBEzVIwN?f83&7{1)=nLb$g_iml)RB>(ufg`|UT9mOB%NOeig)=2@R z+Rkt*+0Le3$R4^R3o?F5rAe|xRf>B&rbO48i7#yqTb(MJZWGl!WX&@*Z10WQNd2Y= z#*irnR=qylvJ0>aqi;lHgUDKA>R`y&|J;@YlxmSf+mXTwwYO@Zf0MDADSshEBj9E} zB&&rVoFd*9c(yN4wZ#Sjjc-M|B_Xr4pBF8iJl`Vjwy_=;hA0WWna5Te6~y%~WT3I;@#a}>SUK&j~hX?po$RC!=z*i#T z=K}GTZ89m+B`gt8ij`JULJ+5cveET$AZJzRkIy(5x*OMD*UP~$!|bX*y=*2<3Z;E} zXV9@G!8T6=D+q}`AFIUWjeIvA_D(d9T%|-60!GvEiGJm)+Y5=DaGS-dNuEJbT#Re+eI>c7-WV+b;k&rcCYelN`=PK1|9#8arGs z5md{1oe&Tdf93p=HWBh~T@(rv!*`Lv$6O+5C~`X*VD&X_7M_()thu*)(|1RAU+E<& zo0S-^LiM-Ok11i`nNT*7u}xKnTs?aflR2mE)LATXJ-r}GOG1B2Ll)Bbnhd*!ICt>? zM)*606#;_gtpj~1u^wpYK))k@{M3|)TiPwVPNTplZs(xj59#}jK&e8cWs-V!%8@h=S*2L?79V5b>!MJ>_V5PCJgClm znL5CBe^}H6Weu4a9U9=!ob7X2lq+AYeQm#ZLU1DOS7yrD!u(++&!j`IOu^&_(j(1> z_U)@+UZ^+FnPB}}aBI&6=S+&8`BcFd$}-&Ux5`&-vNjTkG@rQhFDpEkrr^xfUl#Ig zyP$h6MLFM!nC1r=IN9$%tQG~>UI3Gywcu}ke>-RVia}#vp<2!}ly@58d#=CM>`nCO z=7KId%*M@s^+t}=GCI9~fm|2e|J5YsKR>E$vlWXP-8GKRM}$2V0$JH*AHmV=shsBHwrHXDz#)*mjh#GbRx*WB;t ze@a27Yw>!1hLl3(wp@0HYGSkhK1_{!;&HeCqaSo6TN` z<#--6b{eoCbTgd-7FNLvY{;1o+EhuzPRLF7x3IKzlf_IbI|S$XLvs|N)l&8}GGhpr^}J1df9&mXH?p!OUBYL|Kz59r z_GtaA|1@Qoh971}N79zZC5%|1N<#yO(j*}xDH`S^FQ+xw(8yf^%YbULM};-W*a>sf+ZIxX@HYr=gJwGWLCb5A7Yt&QT3o8mg8A*u6)j1odPl#A0A z|Cu3guMPxx#f?4rL*DLA$W00*%$54fu^`0Z4mrt$JAGEj#3VgJJ(|+ey+Tql3asmI z*kT4bD>RzgoK^$c)r;LNBOhcpf8Z=4f=jtNI6Bwx}gzG z!diC^FFK9uwzTe%2THSYkIc zHBGV>Q_;7hokNB-2Z)_AMRC!^7h$LfvTLMGmUTIxNVVYC8j8&Bic7^me}iqCnwgvf z0y>;%!4b_H$I~tW*W4(mz^ZY*bLbfuf4U5WE@l@9U7cSxptZk)G*5Q9Pd-La!0vnJ zcWjy-R!iqnOAl^qUd+%kvekwH;R1+eza8v8QJkode{yXA%YaF?>a!c3h`J%2V+g6; zfHcMDxgzOZ2~)O>Oi4j~f681{lRFDeTV_VGWro!*#<$f>FgC&Of1|IVy>@X(YCVd7 z-?Jjm9 z0PZegbf#5EoW8?2e_vTGUPKrKSYF@=wnypE8BG&yIj{3|u?`_B@5DLmYP@C%*O7mX z$s#l5FNVzZnB5pBITV{ShPkw0HRt_j_al*0ZB)fpwjn7OzjSE!jaZa?X$DCN4Cugi zGCltIQ%5gI#22uyJvv{Xo}l7bL*ESC04tXXKDxu5(7>SDf2%25psoIm8(NpvebJk*95{$bOj2GKFQ zJI506!rlktf0i_m1)yd2_0Nz6u!(MDl@Tt$&3TQiiXpHl^5jFubnWlrijkBK8N~?q zPt?DN5Cuzh(_G%UpZxaj8&mwBI?h!CJBbHSw@NH+wMBI#+xK0GdT|eH<7<-M&6F0e zbR$^7O?SWk2`UrkzEga^;y;zhiF`70sNxrg-%7lEf3Npbk0?@o)0LlHmWmO!es?Rg z9YVXs<1QB;DHUrj&Gh0j3ag($3npay9vrF#pRF@DFzE+^SP@hFax&=gmm~H1!C`-p z&h@=HRC{&i7=+(fgtiv%*~=k&gRzfRy8Ujt=YwyK=-?|$l>9!3%O#r9CLz5uBkQGD zNatAkf2HicPeGC2>xWq0%4n8Gi}}7=&&O}V>U+@3b!PAlzF_vZsbY95&U2k29(WBt zrQ6a$mc(P6TL%~CvnEikTO^kPVtnT)&^1&@2dpPR&JbD5^IK;=qgcZf8&g>dw2&WX;GEAK_{TAAI~DTGeq@t z36i-r$>bzVij%h*0yiH;XlBb}sAzqKr?92QB}7OFkCjk1EQ^@sqtItO4`+)bf#}e1 zf0AJlwAIMVlYjgCc8NQ%d8M$miKCezFh7p4`C!*tj`86T z+6fIvOto;!D9CY0L2H{$EKO&1<+w&lf9c#(s&;Lc>(k8i%!tyTb+T&R&>?VCR|@Ym zTO*HB*66HQro||)7bV^2rLYm6Z?a~#Th%1e-MqNvC32p+qAn}(cXhY9GIj36`ddOI>+9MB=m+x*SA}rjTxddqb=s&S;xG(f9C)< zipq8@Rs^7!XfP>SSFCDD()U3&wMq;VGb5x0n%CU=`>0Zkj+x5Ktou8qN5MX~;ry@d zMzEnR(~)|`&yG}|xXdM`aQ|0<(A18iHpk$ z-X$FVd4#1CGCpLWMh6vN^6ymSe|9JpBrS50xrmw=8V}=W_awDLsKRLNli1&fTbR_d zLD{cuxiQAh$UJ(1y^HI|(mB5hpjz~+CIz!Ad4sa*=}+09&yKSym;bCJ_yO6|L4+2D zF@DQFye{Wq6e-Ydda_3+mkCt45B(7Al((UcyPifd$n;!Se*8LDu(~`ve{BUA_ADK~mEW7zbptDvXflM~m?bKQ6QTO*!bj%aMDByCfF==vN{zwULH~)r z!lJ~F)G2`Q{G&{+CMpWff568N$~h&MyAPi(3!ywt4dw8rZ66;OOvEg<1vEE>WTU8) z<4x}38Rb;q-u5pXjhY;IN>(pr<`|?C4i`Y-W#K64_A}B(C5!EG)gnACy3~dP)(0G5;I_F_<|?joP)S}M<$Eraf%*A zBKi@q9Nry%?Jl|FI@H!%a)}FoE+hC0o+)o72kiXCT9d!he_a#Gol#fvPP&enKVh^prjD5Z%JEUYyey`Rm~&|2)CMu;l42Qh zxzpFaTnajYF)LThx%)9l-*89um}1zua_Yp?tV}^Ef<5RFprM^WPySO}NWu)fI$5Vr zi?Ya_5&dDpjQ4{&N7#{-ve)saqy>Yjwy?Mfbe3jL8-BeVf93dv{_PaQQvB2oL*!KI z(WIdW6@5yQaorSvt9&LD(W zc<@Bg`_#$}fBhFNFTlPY8OvD8AldvcQId*A5OHC6bWN}>YpFiDv_84=9n+wc*c`*U zrNJv_3sik%Wkk;(=&zus?4UZ#_tR@pnTz5dJp~=4!W-4W{9c2Ii;rcAU&WkeP}&VB zvo>}!Kq|ZK8S4mY0d~`{WxPe^&whRs^lfl2L~eW z@hIN0Kw-D_`kUTP?s#9sXQg~L@Fxzr3fs*EBfm~6Y80*?8!cxEI3k}k(_^tutB?HMVDOVIf9>VfYI!PrF{{|`ydU>%A&v2{MH-(`zH3D_$h<$ z=7kGJf8|9Ze%tK#9mP!w%|joy(3>lB<|=sRn%%hoI;f>DO~0g-UR)HrZI#rATnP7E zk7^`F$CWF!TVD?0t_K;D@H++(g-s)qfNot{d&KBTukO4S>?``)hvN%m_J{e@#zPFz zH6B}8{g-nNiag%ND3P!X1Mbzskel{_Ku(c=f5iRkBySF`QLM)YD@>$4jo_U}N;+8D zaWs#YkFzYC9(k(NzGsDzm&PZ@$U~)J7xM@VgYFu@&N*te7#j5WjjN<2AfK zhxt#~9`!V1b`BaL{r%yaOO4XLCcmvVUQjXj?`}S6qP;N^H(a6E0dSW^Y!7HF+)$rf zf4>tx39MZ&oF;JpYl?Slo@f+LB!Al6o*|k|$oQFj_*Q%V@Sl3OHG->Vk|}NoCFmd1 z*+ln^0o6#>8QUF^9M<)n()3y%op!0K9Q7!_Pf2a9yyt){-h~>f>y2 zQwvq7n7%46^Ix7Khw=VwO%;v;vCwHlQKYI)O9hplq3 z8U+h9!7TvERr&ZYCYq~Hw4)>Pa5}QLz+g4}^c{TWUdZwvRF_Y#B>P$diLV^YGv}ng zWT%$gdSZaNCnrdPD`xM6Z@(x{e@y?2*riDQWibE=vja|b>B(E#!q{GrDC~oMaXcZ% zd$ZuWy%f=Ek(xX&6Qfnd<#^njCBzfg75w>2GQQVu2Xc{GKsVSVV@xoQM{b9#jlI(gWGt2bdx-laxj zT>b#bg*|8I2#&E)zx=a4i6kL~T~m%Bmu24NkkHH1!Gi_)%LPRQf61JnXPzVcd?sd2 zIgFk;gBLgmPlm*AcIeL>v&7(ay=F{`)n1m(UX%OClbzUt;j}UrCuoe!WaI8%=FB3^ zzIrQIs2H_nXmSPq$8EC400tX^+24WFgUn_r)1|q*rPFU-TE4LOB~GwS{_J%DO+t<& z&<;_M5PeIfD9jGEf2@YRtPZu9VJxBg<9?&41jMNLQ>9n;7qmZ5mijkaUda+=RGh z^DMw<*vdBZoI^q`Gy~6JI_Bm|FfmI=(T$nR3j|;T0V$xLe+dHaU~4ez=5wTh8!(*u z^0ED7Fg}C3rO5CgEb0AkmS2uw-R5(-Fx!@PV|kU(J{!BPFyDQ?)lai1?wy)I7;CH_^Q`erGE1&o*hI|%Cdx9W@_ zb8G5a0`h=;F!X{Uny}*VHb? zVAIj^RCmZDrs-B?DyVB$#9G|IpQ+{K3pQ}{i@ z_t+RmEFi%x)S&JuyLhVu0R9W5cPKj~d*JGT(Ac7=Y;rb8>sgoDF;z{OCY1Krenxg} zv%hWPm?y-)^2A9I617n_Ovl#A_e`UUZdJ z*@ZhEXa%Ddk&*3~NeEw*!L>mJU5Hj)inX7mMS0TE(z|<$UnjvFp*z@m87jy#e}^ZK z^bHbAkrB$eOgt1;$RZU?9cNrogAl#*1~Z;IWUj6N1CuOKwUEx~!p{X=u+;>o_`87C z7b^f^%&p`Ch)vgkp68LrW5joOIvOO()_9wz@2}ig-2U}V-nEUfsrZ8w`f#e#`CN#F zkvDn|2Y)T89ZdG)4GCuybHnMtfA2fWnC*ks0(Rupa8Kk7P2?Mv0uj)O7|``LdoSc8 z_tY}fqqn+W=7Yfk7E!5cFTTpyIzzA#O$dW`JIR55ND*lv%}}$v7%te;}Zce}shg z|A&bD=ahTOW|HUr2vhdt>Y_;FsP zu<^6|zOwP#%=3)saj(o4e<8Y1J6TA8nBdLBm5ZEpoDN zaFu?&gZ+#h2@ugnchJlUQT54|BJ|QeV*S?e}OZ8g0_Fw0<%~=5T3H&K!wp{@+m40J7_%VB-})0nEYO-|944q zBwAdZs+`@;CZUZ;ui~+m^}O*z4~=>r)p6~#*{M9p@r)A!0Phj>HsvXfD~BeWrpGRN zM*iW$ED09jCe6w%)rSr|fLN1-rWRj~z6Tf8YcxvkJNQ&cf4yHQ%bM3^Z&(!<_ZH=e z3Kdj|+$#~)`n=1gU{kO%WFtL~FKGDx|p^mv`tvo22iLgQ|EsDFSTp1V}~r@ zAJ_r@$ua(4VCQ0C;_65z;%4C_=(SpF#hi?HW@i21!SHZXHJ{Y7U{{* zVjlu!8kDs4e>TMcgr@&kW0MIqFbHu8fLq5{c!}7JNah<#rb0pr4~G&`e=m%Bk-^eY zM-(r8*>ddNPIo+6y}{%A#XTSt@@6_`ALB`R$^qUlAk}uIzsiBU?RnP4j%Zn2s=SMa zsjCFKB?%qXzwHR8Q+oB@IrBb)OJW#CpC&bcW|>Z)e_5q^f(aeJuT2zAZios!gz*>Q zt5QN8UBZt@;*>qy2``!v{X9DkI`XL!-b2v4GiM#Lwh}RpfIfmC_%C9AaOvb%0oxZd zPWrn~-ui&+3inZq_R#|RHb+z(sWg@n7JR>V1m2(MiNj{`8aOjDjmVR>;j2cZNL<@d zYFxP?fA{OlqJc?k6GE$X?%7EMP8jbTU&eNvt*MtntrNUOWC6RGX`W@A}#0_iDZ8l=yKomVQ-Q9Dli&M z7EQFCmxk4~yN=qeY*vwmr@XTkEL$~mZU|DVf1Vp>wT+r2T$&jVl*bO4T1qEd%f=I` z`8!NONJ^jM4}XVb2(NI)>J5Amj;~WKh;Ao0(X-_O`f*GTvD&! z2fqWpeqGRgTz=&I4uk(Be~WwZ&V6a$*(L*g-W;t0Sr7ISFO5Vy9a@jDGR89)e^KXC zP!M5YtS#KJgC1s6fww8^Mh>m;tKiJUeZg4t4a z=2{?GVREth$_t8S7?c*3t$eO4H}61EaN4Rv(PC=5VY%Fvrd+1%N19D=+e@xGi<$N}aZQC_4%DCyQl>!OLFMo1wdCkhLj zt9syKg=@@DFQLf5_euVck9_2VJa`ot1+QA~PT^`oJ#v8YCLe@yIL1+gL| zTipqRVz5f)@VEG1r`#x2Bbh(i>QbpD7|xV;^Ft)}e^E^2K+`3oQ5lq zQ+DvppSmK-zv?F-Ljx08hI_X|7bAWxmkPDD!l96<7dFI2dJ$qLy^d9C9q6(Izigyf z4tz;0;=(Lcu|nI3e+!lPlHCs^c?C+UGQ%kgf&rDDB}1ARiie*l(-0&p{SuE@;E0MB zTzOtR*}~0A;R5#CbpMmLc+v5e+N|?pfDC3cds7H?&Q9lm7eJ9wOya78mZeIIKm|8K zAu8N77$xP_S1swQdiDL2-z1rO3b`1hgXhM#2d1<-(PwZvl?8t-=Tr$JrWA_TD9pe=x3t( zs6gi0@zoYK8`&wPaT|xHHwD}?^a^odlrbY;?fB_U$JHBE3&GV(nZJaofH)H5NRsbC zLD{z zX0WB0l8+~kLSDN>PYDUSQ8Ea;fuzRy2`e>!c1TCc}boKb$KRYB zWJnd%f4*=af~`q%cZ8}}C1R0u%ap;+VxOAFP&<`X`OsdWGxIamez`LFr(m9A6gm%ARle7{oOFjkp1iJFv5e-6q=1;`|J8khX= z^0afix@X1vB*?I#>*MpAgMb{u7tAjJ>^RZNe^vHXc2|%0xJXc*+;a-(gxdIag5M3n znil5mj?YN9;@>$!0}bo>G8yo&k?cx-kFp#69o$lBxeRP$F_B<6a|xaL z?25{>*;@mtN(FE2M&^(TqwhWAhjT_m;R^UGN-kM!#Jwc=C=7cNma?=A_7lHmDEH~; ze=S#rCoyLomh4Zo!el_-Sekva7811}2Wntsk^qyHt|@;c@Ur1DEGI6ZIH}DnU?7czznnfBNv-UPLpI6sC+aimYrjnxt>GYaT_}>O41} zHnfSyIcy2|kXof@7Hc}o_HZ2$<}ztfvb z;>+Bt85Y8TeZMR-d4e1bkcwmIGC?{Wa^{nzBCdFx$P`Ipi2zfAb_V z`+_^n5HkCUcn3CF!Or0MeEo=ACwiXX`t6W>i@#cuff()fh(Wd zhzWss*+U$m<796fc-(TNT#;CU!vP}VGY5OH?KrsCx5&ICZf%a-n;f`kApx=Ac)0^7 zE*@EfNd06({TuN2()&>R7vphif0qHm1U>s*h9@~gtC$UDC#K(;n^T>3X?*>Cdiujo zNn;WCIOqeC9aR~y&<1QwMWN|ylbhTF(467U?88-A_#;MBjgeD1Wa&I|3`#Y(WOI$5 zG|a&sn*!)Rq9EUsc@cG4d4rR;cwRU=d55N5F@Sw7Xg#>WH)I1wj-1ifKUAc%%zr&X zX_;A^cRF6N60V`k_ukiCgw~Gz-r#Zv4n8hDu~-`1J?-3_(g=iNlmjf4rMHE4d31AZ z;kne(`4A>7_B)rS9lTPEWW@ohHg<~5z_a!z1*o$|^kfCmWcF%Qy%A{7p^>(G!})ns zZZvM)=8#HEZ5+|Lv%A6mw^Dz7mVeJK0JAD?7$jfWWO#CDV=po*hkV#u-(kKE%@9AJ zJPsf15e2U%$gTyiC_d9PK1juIzMj|#!ECpk2W6&!`diP)L?%t@898;p9vrF%jdt^G zSg;K$CXID{-TJ`)GbwKNxwn_=#%wD%dT6uQyv-k$wQm2%kJ?C5l=uGO!+*%Ya0`f4 zaWs;gN;7j(oWXm7q3gRRp7uNBAky~#@KRS6#}93KJ=Ud;$&dJw5BVmo@z|ldLy@_s z)Z^uZOS67Ntn-Qa!C*I~Fp6hWak0_;ng8vdpP9M-eZN1$bPF$~E?e2(R(u>EqxN3P z7I-mn!aA??hla;r8{d8&xPO!_@%Wy#TTZ_{xFK}iy{Xb)6F1kyt3NrTS)JH+R_64J zigg8Rf|yvHHeK3nntk})f>8el6BfjBx>sCpdGRuGzQF2Joa!k)4?irkmoD6X+Rcpr z)k(w6zt4y={#Q%Bw>d(<@65(IlI!=W*Cy*d7e1JiDJdF%L)i4=M=uSxqy>e(tTdruZH)GKW{rzeo zZ~vhk^l;$&nOVX>o__=oYXGsYYlx$+r=J_5uODBOnv`LGIf!_l{{ zBMhIh%XNVyjj^m zdia3wFECISxB`H9lORtUvjIg#3kfB|E}>vU006U-Pf$t%Ek%=?P&f!#MF0SDWpgi+ zu~8h8pi~Y4eUk=JHUXxSJyA~qo|BDHP63pY+)+9K!IKwKO#zRSWl~NEX-NP8a%FQb zlO9zUlhRTe0hE*NQcVGqlRHy50lt%TQ$hiNlebep0kV_#Q&0k%PLpv?JClS|Dgr)F zldx1Z3ujLN0Cr()b!Breld(}8lMGc30gjU!RWt#$lTcMV0ppX5RTu^cPyhe`0G9JU AyZ`_I delta 17554 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 diff --git a/app/src/main/java/com/yutou/nas_music_player/Adapters/MusicLibsAdapter.java b/app/src/main/java/com/yutou/nas_music_player/Adapters/MusicLibsAdapter.java index 0a63c51..d8c2380 100644 --- a/app/src/main/java/com/yutou/nas_music_player/Adapters/MusicLibsAdapter.java +++ b/app/src/main/java/com/yutou/nas_music_player/Adapters/MusicLibsAdapter.java @@ -7,9 +7,11 @@ import android.graphics.Bitmap; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.Button; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; +import android.widget.PopupWindow; import android.widget.Toast; import androidx.annotation.NonNull; @@ -19,7 +21,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.alibaba.fastjson.JSONObject; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; -import com.kaopiz.kprogresshud.KProgressHUD; import com.yutou.nas_music_player.Datas.MusicData; import com.yutou.nas_music_player.Interfaces.NetworkInterface; import com.yutou.nas_music_player.MyApplication; @@ -176,7 +177,17 @@ public class MusicLibsAdapter extends RecyclerView.Adapter clickAllList(data)); + itemView.setOnClickListener(v -> { + clickAllList(data); + } + ); + itemView.setOnLongClickListener(new View.OnLongClickListener() { + @Override + public boolean onLongClick(View view) { + showPOPWindows(data); + return true; + } + }); } } @@ -215,6 +226,17 @@ public class MusicLibsAdapter extends RecyclerView.Adapter { + AppTools.showHud(context); + if(!data.isDir()){ + MusicContainer.getInstance().addPlayList(data); + AppTools.hideHud(); + AppTools.toast( "已添加到队列中"); + popupWindow.dismiss(); + return; + } + JSONObject json = new JSONObject(); + json.put("path", data.getFile()); + json.put("type", true); + MusicContainer.getLibs().onDirMusicData(json, new NetworkInterface() { + @Override + public void httpGetData(Object data1, int state) { + List list = (List) data1; + int i = 0; + for (MusicData musicData : list) { + if (!musicData.isDir()) { + MusicContainer.getInstance().addPlayList(musicData); + i++; + } + } + AppTools.hideHud(); + AppTools.toast(i + "首歌已添加到队列中"); + popupWindow.dismiss(); + MusicContainer.getInstance().setPlayModel(MusicContainer.PLAY_MODEL_ORDER); + MusicContainer.getInstance().playNext(); + } + + @Override + public void httpError(Exception e) { + AppTools.toast("添加失败:" + e.getMessage()); + } + }); + }); + popupWindow = new PopupWindow(button, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); + popupWindow.setOutsideTouchable(true); + + popupWindow.showAsDropDown(itemView, 200, 0); + } } } diff --git a/app/src/main/java/com/yutou/nas_music_player/containers/MusicContainer.java b/app/src/main/java/com/yutou/nas_music_player/containers/MusicContainer.java index 5a33f2f..0e9daf1 100644 --- a/app/src/main/java/com/yutou/nas_music_player/containers/MusicContainer.java +++ b/app/src/main/java/com/yutou/nas_music_player/containers/MusicContainer.java @@ -72,13 +72,14 @@ public class MusicContainer { collectionMapList = new LinkedHashMap<>(); previousPlayerList = new PreviousPlayerList(); browserHelpers = new ArrayList<>(); - playIndex = ConfigTools.getPreferences().getInt("playIndex", -1); + playIndex = ConfigTools.getConfigPreferences().getInt("playIndex", -1); initMediaPlayer(); libs = new MusicLibs(); } public void setPlayModel(int playModel) { this.playModel = playModel; + ConfigTools.getConfigPreferences().edit().putInt("playModel", playModel).apply(); } private void initMediaPlayer() { @@ -235,7 +236,7 @@ public class MusicContainer { isPause = false; return; } - ConfigTools.getPreferences().edit().putInt("playIndex", playIndex).apply(); + ConfigTools.getConfigPreferences().edit().putInt("playIndex", playIndex).apply(); nowPlayData = data; String url = data.getPlayUrl(); previousPlayerList.add(data); @@ -401,9 +402,8 @@ public class MusicContainer { playOfAllRandom(); AppTools.toast("当前播放列表为空,随机播放"); } else {//播放列表中的歌单 - ConfigTools.getPreferences().edit().putInt("playModel", MusicContainer.PLAY_MODEL_ORDER).apply(); if (isRandom) { - playIndex = new Random().nextInt(playList.size()); + playIndex = randomPlayIndex(); } else { if (playList.size() > (playIndex + 1)) { playIndex++; @@ -416,6 +416,14 @@ public class MusicContainer { } } + private int randomPlayIndex() { + int tmp = new Random().nextInt(playList.size()); + if (tmp == playIndex) { + return randomPlayIndex(); + } + return tmp; + } + /** * 单曲循环 */ @@ -434,7 +442,7 @@ public class MusicContainer { public List getPlayList() { System.out.println("playList.size() = " + playList.size() + " tmpList.size() = " + tmpList.size()); - List tmp=new ArrayList<>(); + List tmp = new ArrayList<>(); tmp.addAll(tmpList); tmp.addAll(playList); return tmp; @@ -478,6 +486,10 @@ public class MusicContainer { this.playList.addAll(dataList); } + public void addPlayList(MusicData data) { + this.playList.add(data); + } + public int getPlayModel() { return playModel; } @@ -486,6 +498,10 @@ public class MusicContainer { return playIndex; } + public void setPlayIndex(int i) { + this.playIndex = i; + } + public class MusicLibs { private MusicLibs() {