From f71b7dcc0803bb53e64fe0ac9d68a3c44bc297be Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Tue, 9 Jun 2020 16:28:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=A4=9A=E5=AA=92=E4=BD=93?= =?UTF-8?q?=E6=B5=AE=E6=A1=86=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/media/MediaWindow2.java | 2 +- .../module_media_default_music_img.png | Bin 0 -> 2803 bytes .../drawable-xhdpi/module_media_next_song.png | Bin 872 -> 644 bytes .../module_media_window_pop_pause.png | Bin 629 -> 453 bytes .../module_media_window_pop_play.png | Bin 343 -> 337 bytes .../src/main/res/values-xhdpi/dimens.xml | 4 ++-- .../src/main/res/values/dimens.xml | 4 ++-- 7 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_default_music_img.png diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/MediaWindow2.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/MediaWindow2.java index f8638830d4..d5d9568953 100644 --- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/MediaWindow2.java +++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/MediaWindow2.java @@ -170,7 +170,7 @@ public class MediaWindow2 implements IMusicView { if (mCircleImg != null) { com.bumptech.glide.request.RequestOptions options = new com.bumptech.glide.request.RequestOptions() - .placeholder(R.drawable.module_media_share_default_icon); + .placeholder(R.drawable.module_media_default_music_img); GlideApp.with(mContext).applyDefaultRequestOptions(options).load(mMediaInfoData.getMediaImg()).into(mCircleImg); } diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_default_music_img.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_default_music_img.png new file mode 100644 index 0000000000000000000000000000000000000000..4aab1a19b36fe0955b2a16d0cda1163263bbd62a GIT binary patch literal 2803 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 FV1i0PJqG{) literal 0 HcmV?d00001 diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_next_song.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_next_song.png index d692431fa8c4f0c85f7676607789293f2d9995af..a3898c582733a602f45bfb55e8f9a20b3e906103 100644 GIT binary patch literal 644 zcmV-~0(y?-atj! z6>lXaJu)25IWs+HcD8%yh7)adcYXEOPE~h{kq?cWj{=yx!bQQNVB!%dDVn%IjqVi% z8$*=1K~XSqfg0WGq@bBC0lR?Hk{&hg5@}#&mw-L+zm+s#P14@TrMmT^X7&r%4r~A? zC0&T!c%HqP{i(rKrY31y>^@x;^oZ8S8gNw7mskg;*_+wq`v1%%Mf)2)!8e-WzzblX zqKY+8qilnJ3w1H0@$=W?!Pq7AS&1LuKLlD=0H#*m_u@DD?q_jFDxxaGZQ8^z|?d;)ez`Zh)d z9sDh@Q_}hv0j~o`B)uA2iu!^146s^1eT+rH`=Nb%GPW||*B#5i(yVSKX9b@Dha}yZ z_c_fG&Bq$^EeId(D*bxhLxws5(WiLW6YJuRb0>M43Vd`O;0 zlZ6SX0{WGqU+FJP^1GPMBSpZ+p=dwoOjVnh0$}wv;a3o=-fq>;bBjWz@HXL4yTd{C z#-cz|TD7fxUFsWXGuP|%__CP}^}Tih>^q`EuU8ZtI^uorR}}0!qC>A&6dXF@eeYKk e>^q`EulE-S^+QM(ceHo_0000q7@r2Jv%W~cbV#;5B2T;mzEp4 ztz-WxCwb|`K3^_X!TI00rxmmmS8|5m7nQys1_q=$=cd_1Y&d0ZACAepK#YWpT*pyR7PSe%2?F3uLFWTtC0HWWuG^^&jVL?=QS89$vIB*l1?4-pfPf3>L4I?`B0Q zc`%l9G%R1+A$881IWkmStdcR6|9Qn9r!{|X99sJa6!!U@GalFHTg>08kmzrPAUbX%GDn99(y8@aym!JE0das`1-EA%h{<9`u+Gns$ zYjxWVi_Po!J2Wn}MwKjR>-Ap0@}ApK`>7L>Vpkko@kcfo#DA)9V3)XO*6N5SasT#9 wJ!@M2nd!-=|LKcaFRC#LDG)*uDj)b?EuCG?xpK{UVAf&qboFyt=akR{0RLl*f&c&j diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_pause.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_pause.png index 967dfe701d392ca1f1327c55fdf348ef7e01256c..a908c23da5e667ba3926caded7c3de4b99e970c5 100644 GIT binary patch delta 428 zcmV;d0aO0<1jPf8BYy#mNkl`BV(3g@> zOQ3VT0>{7w@Ld9G4fLjaV7EksaseH*NQ80%{WM*K_JP|Rw`>WZcV&rCNnn-;l?M80 z-T`|S5mEt~MMw!~5+Oz4q!CgEP7)z?U~+_N0Y*otCSX*AY6N-tM5oO>c5m5wA8WAO+NkmkDW)Ue3G>=G0V3vqj0zZJ21t-WF5lf)kF4&wq zL6L}90{wR~>%ime^O2^$lL;-J#PO7eZ3#f=B04a%LM7_Q`vlb|6uQ1X!O#k+AO8j2 WNiEnVL9<){0000Px%FG)l}RA>e5n!heYK@`Rm254V4N-ar{~kc45wV4ah^Tl1TCVSGoMf}f&dl9A=ghgAndHmN&WxG! zn=|{_e~qFj8Y4qoMu(WKgO&m7p5dIqoI&F!Q09uxf#nK%g@4YWX~=wOl=wgR1e&ET zqHnaD&>8gG)o-d93OI|X-}^-Vi2iM;-Df;$cjy(Jazwd;v3sZmO*rNy843mT1viEX zd(bnq;hU^E9t)6Toj6*D0#fSgS>p$l|G zc_m~GkU_W5i1JFvDjy)CG{4R=E*c*A4I? z6pZK91@H#}A3}E=cxXKyIx*qAN*`)j&LDj(xeu*D?SDZJ*lGr^0ki{s4hqJ9XASV< zAMAz$tXf;SqGTec&>|EKjt<8{1}m8eLAXlF3`Q{#7aWbH%3w4Tu?863M0|i+S5(YI ze1IBPRMbR#fRY(hF%ci2R0h>dL>o}uM0|j;u4pn7@d1Wj(J#kBNlnBNS7#_RgKwDq z(z6(u2v&V385BQa;SK%(BOhSPymB#p00000NkvXXu0mjfXh8)J diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_play.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_play.png index 21a77a0c44d978dba895c372fc6ad40cd3632d7d..ab6f5e4d7c53ac040325d408879455368ad6f96a 100644 GIT binary patch delta 311 zcmV-70m%N>0?`7HBYy!HNklCgI0~G!OIA_(#t?{oiJ$Ch<_Tq&%E%(%=5-hvua?l zD6zG=70Ol(2tsgtpAj+>Da$?hEY7T5LdXy@giLs7BV-7fmrX;8lA@$2DOy&5HbI-9 zP1JM2dVlavW;%d*9vte!sK%(qsK%(qs8-nnw24pJg!SWOg^X1r+6S$lmn#OX8c~DR zKL}I|S~a2u!!ViOdI1Jo6UgdAFk8Xa>mk^hKvo}u*$TE^{{R%k2iV3GGK)J|9n5dM(P2J??bl=Dmw8 zAM6)4a}>T)$^5VToy>)2AALS}yIwcjzy0;jxI%g3D@`w_KUp2cVpX0gms|fb?WV4e zy|lrJ-fKouYH0?wR~m&RP5LbsEK8r)&G~89RgKxyVR}zXsCo0|dd9W?&#wRV$Tqos z580px 120px 112px - 20px + 30px 90px 230px - 20px + 14px 35px 24px 56px diff --git a/modules/mogo-module-media/src/main/res/values/dimens.xml b/modules/mogo-module-media/src/main/res/values/dimens.xml index 257216648f..430d3312f0 100644 --- a/modules/mogo-module-media/src/main/res/values/dimens.xml +++ b/modules/mogo-module-media/src/main/res/values/dimens.xml @@ -64,10 +64,10 @@ 322px 66.7px 60px - 12px + 18px 48px 123px - 13px + 10px 18px 14px 30px