From a88e5d670e067ed3ff8637568b8948c75a54932c Mon Sep 17 00:00:00 2001
From: tongchenfei <tongchenfei@zhidaoauto.com>
Date: Tue, 9 Jun 2020 12:31:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=9A=E5=AA=92=E4=BD=93?=
 =?UTF-8?q?=E6=B5=AE=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                                |   2 +-
 .../extensions/ExtensionsPresenter.java       |   8 +-
 .../module/media/MediaCardViewFragment.java   |   4 +-
 .../com/mogo/module/media/MediaWindow.java    |   4 +-
 .../com/mogo/module/media/MediaWindow2.java   |  13 +-
 .../drawable-ldpi/module_media_next_song.png  | Bin 459 -> 0 bytes
 .../module_media_window_pop_pause.png         | Bin 440 -> 0 bytes
 .../module_media_window_pop_play.png          | Bin 288 -> 0 bytes
 .../drawable-mdpi/ic_search_choice_point.png  | Bin 1179 -> 0 bytes
 .../module_media_next_bg_selector.xml         |  14 ++
 .../ic_search_choice_point.png                | Bin
 .../ic_search_poi_location.png                | Bin
 .../ic_search_unshadow.png                    | Bin
 .../module_media_blur_default_icon.png        | Bin
 .../module_media_default_music_img.png        | Bin 0 -> 1283 bytes
 .../module_media_full_screen.png              | Bin
 .../module_media_have_heart.png               | Bin
 .../module_media_head_default_img.png         | Bin
 .../module_media_last_song.png                | Bin
 .../res/drawable/module_media_next_song.png   | Bin 0 -> 384 bytes
 .../module_media_no_heart.png                 | Bin
 .../module_media_no_img_default_icon.png      | Bin
 .../module_media_play.png                     | Bin
 .../module_media_play_bg_selector.xml         |  13 ++
 .../module_media_share_default_icon.png       | Bin
 .../module_media_share_default_icon2.png      | Bin
 .../module_media_share_default_rect_icon.png  | Bin
 .../module_media_share_fail.png               | Bin
 .../module_media_share_normal.png             | Bin
 .../module_media_share_success.png            | Bin
 .../module_media_suspend.png                  | Bin
 .../drawable/module_media_window_alert_bg.xml |   2 +-
 .../module_media_window_pop_pause.png         | Bin 0 -> 355 bytes
 .../drawable/module_media_window_pop_play.png | Bin 0 -> 181 bytes
 ...module_media_music_window_alert_layout.xml | 171 +++++++-------
 .../src/main/res/values-ldpi/colors.xml       |   6 -
 .../src/main/res/values-ldpi/dimens.xml       | 123 ----------
 .../src/main/res/values-ldpi/strings.xml      |   3 -
 .../src/main/res/values-ldpi/styles.xml       |  11 -
 .../src/main/res/values/dimens.xml            | 214 +++++++++---------
 40 files changed, 242 insertions(+), 346 deletions(-)
 delete mode 100644 modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_next_song.png
 delete mode 100644 modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_window_pop_pause.png
 delete mode 100644 modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_window_pop_play.png
 delete mode 100644 modules/mogo-module-media/src/main/res/drawable-mdpi/ic_search_choice_point.png
 create mode 100644 modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_next_bg_selector.xml
 rename modules/mogo-module-media/src/main/res/{drawable-ldpi => drawable}/ic_search_choice_point.png (100%)
 rename modules/mogo-module-media/src/main/res/{drawable-ldpi => drawable}/ic_search_poi_location.png (100%)
 rename modules/mogo-module-media/src/main/res/{drawable-mdpi => drawable}/ic_search_unshadow.png (100%)
 rename modules/mogo-module-media/src/main/res/{drawable-ldpi => drawable}/module_media_blur_default_icon.png (100%)
 create mode 100644 modules/mogo-module-media/src/main/res/drawable/module_media_default_music_img.png
 rename modules/mogo-module-media/src/main/res/{drawable-ldpi => drawable}/module_media_full_screen.png (100%)
 rename modules/mogo-module-media/src/main/res/{drawable-ldpi => drawable}/module_media_have_heart.png (100%)
 rename modules/mogo-module-media/src/main/res/{drawable-ldpi => drawable}/module_media_head_default_img.png (100%)
 rename modules/mogo-module-media/src/main/res/{drawable-ldpi => drawable}/module_media_last_song.png (100%)
 create mode 100644 modules/mogo-module-media/src/main/res/drawable/module_media_next_song.png
 rename modules/mogo-module-media/src/main/res/{drawable-ldpi => drawable}/module_media_no_heart.png (100%)
 rename modules/mogo-module-media/src/main/res/{drawable-ldpi => drawable}/module_media_no_img_default_icon.png (100%)
 rename modules/mogo-module-media/src/main/res/{drawable-ldpi => drawable}/module_media_play.png (100%)
 create mode 100644 modules/mogo-module-media/src/main/res/drawable/module_media_play_bg_selector.xml
 rename modules/mogo-module-media/src/main/res/{drawable-ldpi => drawable}/module_media_share_default_icon.png (100%)
 rename modules/mogo-module-media/src/main/res/{drawable-ldpi => drawable}/module_media_share_default_icon2.png (100%)
 rename modules/mogo-module-media/src/main/res/{drawable-ldpi => drawable}/module_media_share_default_rect_icon.png (100%)
 rename modules/mogo-module-media/src/main/res/{drawable-ldpi => drawable}/module_media_share_fail.png (100%)
 rename modules/mogo-module-media/src/main/res/{drawable-ldpi => drawable}/module_media_share_normal.png (100%)
 rename modules/mogo-module-media/src/main/res/{drawable-ldpi => drawable}/module_media_share_success.png (100%)
 rename modules/mogo-module-media/src/main/res/{drawable-ldpi => drawable}/module_media_suspend.png (100%)
 create mode 100644 modules/mogo-module-media/src/main/res/drawable/module_media_window_pop_pause.png
 create mode 100644 modules/mogo-module-media/src/main/res/drawable/module_media_window_pop_play.png
 delete mode 100644 modules/mogo-module-media/src/main/res/values-ldpi/colors.xml
 delete mode 100644 modules/mogo-module-media/src/main/res/values-ldpi/dimens.xml
 delete mode 100644 modules/mogo-module-media/src/main/res/values-ldpi/strings.xml
 delete mode 100644 modules/mogo-module-media/src/main/res/values-ldpi/styles.xml

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 2dc54c489f..707ee6e613 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
 </project>
\ No newline at end of file
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsPresenter.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsPresenter.java
index 85d0463965..cef726c5b2 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsPresenter.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsPresenter.java
@@ -125,8 +125,12 @@ public class ExtensionsPresenter extends Presenter< ExtensionsView > implements
             @Override
             public void onSuccess(UserInfoResponse userInfoBaseResponse) {
                 userInfo = userInfoBaseResponse.getResult();
-                Logger.d(TAG, "获取个人信息成功: " + userInfo);
-                mView.renderUserInfo(userInfo);
+                if(userInfo!=null) {
+                    Logger.d(TAG, "获取个人信息成功: " + userInfo);
+                    mView.renderUserInfo(userInfo);
+                }else{
+                    Logger.e(TAG,"获取个人信息失败");
+                }
             }
 
             @Override
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/MediaCardViewFragment.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/MediaCardViewFragment.java
index b79e64f3d9..7708d29202 100644
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/MediaCardViewFragment.java
+++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/MediaCardViewFragment.java
@@ -141,7 +141,6 @@ public class MediaCardViewFragment extends MvpFragment<MediaView, MediaPresenter
     private ImageView mWindowPlayNext;
     private MediaShareDialogFragment mShareDilogFragment;
     private MediaMogoVoiceListener mMediaVoiceListener;
-    private LinearLayout mWindowMediaCenter;
     private TextView mWindowCurrTime;
     private TextView mWindowMaxTime;
     private NoScrollSeekBar mWindowProgress;
@@ -626,7 +625,6 @@ public class MediaCardViewFragment extends MvpFragment<MediaView, MediaPresenter
             mScrollText = mWindowView.findViewById(R.id.window_scroll_txt);
             mWindowPlayPause = mWindowView.findViewById(R.id.window_play_pause);
             mWindowPlayNext = mWindowView.findViewById(R.id.window_music_next);
-            mWindowMediaCenter = mWindowView.findViewById(R.id.window_media_center);
             mWindowCurrTime = mWindowView.findViewById(R.id.window_current_time);
             mWindowMaxTime = mWindowView.findViewById(R.id.window_max_time);
             mWindowProgress = mWindowView.findViewById(R.id.window_progress_bar);
@@ -637,7 +635,7 @@ public class MediaCardViewFragment extends MvpFragment<MediaView, MediaPresenter
             int xPos = getContext().getResources().getDimensionPixelOffset(R.dimen.module_media_music_state_location_x);
             ServiceMediaHandler.getMogoWindowManager().addView( mWindowView, xPos, yPos, false);
             updateWindowUI(true);
-            mWindowMediaCenter.setOnClickListener(new NoDoubleClickListener() {
+            mWindowView.setOnClickListener(new NoDoubleClickListener() {
                 @Override
                 public void onClicks(View view) {
                     if (mMediaInfoData != null) {
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/MediaWindow.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/MediaWindow.java
index f13b506d43..dfa6be7426 100644
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/MediaWindow.java
+++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/MediaWindow.java
@@ -57,7 +57,6 @@ public class MediaWindow implements MediaView{
     private ScrollingTextView mScrollText;
     private ImageView mWindowPlayPause;
     private ImageView mWindowPlayNext;
-    private LinearLayout mWindowMediaCenter;
     private TextView mWindowCurrTime;
     private TextView mWindowMaxTime;
     private NoScrollSeekBar mWindowProgress;
@@ -112,7 +111,6 @@ public class MediaWindow implements MediaView{
             mScrollText = mWindowView.findViewById(R.id.window_scroll_txt);
             mWindowPlayPause = mWindowView.findViewById(R.id.window_play_pause);
             mWindowPlayNext = mWindowView.findViewById(R.id.window_music_next);
-            mWindowMediaCenter = mWindowView.findViewById(R.id.window_media_center);
             mWindowCurrTime = mWindowView.findViewById(R.id.window_current_time);
             mWindowMaxTime = mWindowView.findViewById(R.id.window_max_time);
             mWindowProgress = mWindowView.findViewById(R.id.window_progress_bar);
@@ -123,7 +121,7 @@ public class MediaWindow implements MediaView{
             int xPos = getContext().getResources().getDimensionPixelOffset(R.dimen.module_media_music_state_location_x);
             ServiceMediaHandler.getMogoWindowManager().addView( mWindowView, xPos, yPos, false);
             updateWindowUI(true);
-            mWindowMediaCenter.setOnClickListener(new NoDoubleClickListener() {
+            mWindowView.setOnClickListener(new NoDoubleClickListener() {
                 @Override
                 public void onClicks(View view) {
                     if (mMediaInfoData != null) {
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 e2a4e51276..c34f5587d0 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
@@ -1,10 +1,11 @@
 package com.mogo.module.media;
 
 import android.content.Context;
+import android.content.res.Resources;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.mogo.commons.debug.DebugConfig;
@@ -15,13 +16,11 @@ import com.mogo.module.media.listener.NoDoubleClickListener;
 import com.mogo.module.media.model.MediaInfoData;
 import com.mogo.module.media.presenter.WeCarFlowPresenter;
 import com.mogo.module.media.utils.LaunchUtils;
-import com.mogo.module.media.utils.MusicControlBroadCast;
 import com.mogo.module.media.utils.Utils;
 import com.mogo.module.media.view.IMusicView;
 import com.mogo.module.media.widget.AnimCircleImageView;
 import com.mogo.module.media.widget.NoScrollSeekBar;
 import com.mogo.module.media.widget.ScrollingTextView;
-import com.mogo.utils.TipToast;
 import com.mogo.utils.glide.GlideApp;
 import com.mogo.utils.logger.Logger;
 import com.tencent.wecarflow.flowoutside.sdk.FlowPlayControl;
@@ -44,7 +43,6 @@ public class MediaWindow2 implements IMusicView {
     private ScrollingTextView mScrollText;
     private ImageView mWindowPlayPause;
     private ImageView mWindowPlayNext;
-    private LinearLayout mWindowMediaCenter;
     private TextView mWindowCurrTime;
     private TextView mWindowMaxTime;
     private NoScrollSeekBar mWindowProgress;
@@ -87,7 +85,6 @@ public class MediaWindow2 implements IMusicView {
             mScrollText = mWindowView.findViewById(R.id.window_scroll_txt);
             mWindowPlayPause = mWindowView.findViewById(R.id.window_play_pause);
             mWindowPlayNext = mWindowView.findViewById(R.id.window_music_next);
-            mWindowMediaCenter = mWindowView.findViewById(R.id.window_media_center);
             mWindowCurrTime = mWindowView.findViewById(R.id.window_current_time);
             mWindowMaxTime = mWindowView.findViewById(R.id.window_max_time);
             mWindowProgress = mWindowView.findViewById(R.id.window_progress_bar);
@@ -98,7 +95,11 @@ public class MediaWindow2 implements IMusicView {
                     getContext().getResources().getDimensionPixelOffset(R.dimen.module_media_music_state_location);
             int xPos =
                     getContext().getResources().getDimensionPixelOffset(R.dimen.module_media_music_state_location_x);
-            ServiceMediaHandler.getMogoWindowManager().addView(mWindowView, xPos, yPos, false);
+            FrameLayout.LayoutParams params =
+                    new FrameLayout.LayoutParams((int) mContext.getResources().getDimension(R.dimen.module_media_pop_window_width), (int) mContext.getResources().getDimension(R.dimen.module_media_pop_window_height));
+            params.leftMargin = xPos;
+            params.topMargin = yPos;
+            ServiceMediaHandler.getMogoWindowManager().addView(mWindowView, params, false);
             updateWindowUI(true);
             mWindowView.setOnClickListener(new NoDoubleClickListener() {
                 @Override
diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_next_song.png b/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_next_song.png
deleted file mode 100644
index 03b6866112fa493701f759d6d4becc3a26a38595..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 459
zcmeAS@N?(olHy`uVBq!ia0vp^Iv~u!1|;QLq8Nb`V{wqX6T`Z5GB1JbR!<klkO<DV
z(`~(20tH&iSp<7hE*^<7-rM-{o<n}Z8_k}*?VTG}E<DIK??48#uLzINmq_l-r;i&L
zufNaF>|~#@Y*~D0c)qUmo1ACIg+H*^F!~<=QvZsX6kC$7*1b%>(6cnFcG}X-ZeNXl
z1nga<=hivV`{j0ZC*9rmcC~y^u33HS?92{JMfdz`7giiSUo~$A`xcjTo>$dAX0rTI
zt(j}YaqFb;vhU4te7fDiDG$?&GfW!7U+E{YT{*VH^}C7G!Tq~-2fyW=8EAcE<)!5l
z8TWS-UrYDNy<fXkuD9n$^d9NZ!>TJ%_ggIsRH_sCpRieA>+E??cP1-_K3Y@X@qFp#
zWl=w3yW>oKKZoop*fcMGso?$Y@++o`wpE9Jo$Ds}XW8%5ip5#&7NNg@R_$F`#F%w+
zeP8C4X7}KyMprh)%U)j5ym)1iBt$f+cvVbW@eQB?l{r(irazSVwmMm|cGae!r$)hg
zHCmf3&lYb;^ZBf9l5Tmuf@xlZ`U6f7W!h-p<X;}?S@NX<7&{D}u6{1-oD!M<X3)<M

diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_window_pop_pause.png b/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_window_pop_pause.png
deleted file mode 100644
index acf18155c08c6b53f99ed590ce8f97e213681fb9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 440
zcmV;p0Z0CcP)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I00001b5ch_0Itp)
z=>Px$a!Eu%R7ef&ma$3$K@f&>K@cr$d<9!88y~>Dg=nLqq_a`%B@d87OTpJr!9qw1
zD+L?%3A7OeLG=9oz`=0rp1XG&Q^bKU*`2wYe`juQxh&7~tTh2^Pe5}d`7c~_ew)EH
z?7>*}K<3$8?+DI;YydlOuSqKNJ>x=DI;(IC$1n>?%vbTZC;KD*UAXeZgWbN0eF>Hb
zT)-JDLT!r`E`&B1JivP4i2aXkwJX0mp!Pqzf<9l}ifz6%CU<ZMGd55)PEoPVuLbDU
z8(ODpoT6fzcbUlz^kLox%Hz}(+x#a?y4GRGsVla*zwD$u4&Dsq8!P5Id`{t@;+pVX
zSe3-Y{(N(NAbtcZ@avA&LQ}N*k~}&<o|G`unryBYL^h!VQKDL0-HOk-cOPDrq>jZ3
zt1`7!?QLYCt^P!%2RfM=i)zKbir<JW=mKm2$v=Hs`sQ-5g>ML5XglJrd!l^4vwBqO
iIDbN)aq=}xpYRXTB%N1One8wD0000<MNUMnLSTZF0mM}R

diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_window_pop_play.png b/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_window_pop_play.png
deleted file mode 100644
index 9e4b9720aeb35a9114dee6455324e754578bdbc1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 288
zcmV+*0pI?KP)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I00001b5ch_0Itp)
z=>Px#+DSw~R7eeD{Qv(yBf|gyrU9@MY~`rMbPIVxK^+Tp$zmWbA;Co;wIDqpy*L3Q
zo>a{O)b$03*`T^rfb=~m8yBSvl(-F*`~{?WfcOuTk3!+|G00+=r65gQC_1roIFW=w
zdO>Dj1^6t+s)1U9qZU&uBng@`8q@@Xh*}CpgPK|)Nzk0ppe7hZ)KV}S)W{(Ts=z^&
zIShP*G4Rmek>o&nu{HugYH(K6P)(^o+6{;=0x_Z12T%#aT_7$4VtpXq1;jWl#@F-#
m>Z2VPO<c4KTQrjgET{pXryZ<LN?-Q?0000<MNUMnLSTZq8)`KG

diff --git a/modules/mogo-module-media/src/main/res/drawable-mdpi/ic_search_choice_point.png b/modules/mogo-module-media/src/main/res/drawable-mdpi/ic_search_choice_point.png
deleted file mode 100644
index 13ea311e831467f236e1cef17f4e5ff47486f823..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1179
zcmX|<2~ZPf6vr1t%285Kiy#<qYGpw1pr}xxhL*!n%pf5Mgh0T6oZ$=<%aMjM)0RP!
zaL5n})QcN&GSZPtMT|fy;ZQ`N5DrD~DoP2Ikk{Q!>&)A?-}}GcJHFZd*@xn3ptnm8
zK@bD-NjG2gZHYcdbhe;==WWwB2%;hO@%D4~O!TJ5!G9JDfpHKJ13{>df}mKS(SU}B
zC_o|sJr+x$_JKzkwL%HU#dxertpp?jl7p8-W2xYH%m<-B43Khw7Kw*=H;j+P$N-!{
z4;UE-IVgr7J}6jo+)m-;s2+?q$9c2_K_D;&0@dXx7LCL4KsyHvHk|qYA}Fuk5G|qO
z6C=@X_yP<Dmcn$DK~u57WMW}3E@DgK`vjnhdVv_MLjbx1en)h)dO84vCxcQ6ORuoe
zoLrF4Lr4M)K8Dal7#@YI%^<o8PbOeh0VzD_?17GZARPo=AxMWnJ_iZekSBn8F+_a_
zo10K}3A%gXN)yCq0)L|JGxRGarTS8+$gPVbN}t^umeblF=Loerc<(n?77Ctr8dOK*
z&MsMMHhl5W<!;C!E#fo&K)#p4W&PccYnpp#Le(V0LZzpew^|h6)^tu@W*dn_HbiUg
z^L}Z2pZUVpvR?ha7Vnn|bb7d}lD8EkQ?ehyCF*;QQ#IL8g&>;y$ZoEFj?%1>2>RK>
zhI!P>c2mBSoTT)0db%Qy<5VYa>(*;gvXXzhvA^QruYY7zdE1jybdAnGdYQd;r88@G
zAa}|koF)^S>*P(k>^pu_tY6;tC6xv-pW4>fUsRQ7kG+r_dGn<3uD^kG-#^D@s_6<D
zH`Q^eWM(>^qa9-AZeQ$14ohNpg_51ESo1ebN=8e~sM<DrTUK~$J(ec&iM9i}RgLoN
zMFoNs7Qe>1qcQcU<><0-axU!V_(o=B0sl17xR!K4*1GL*;5EG+`6U7Zv9yk~N0!Fd
zAR1d|XXwfZd|TpkhLF@W7HPb=JxM$nQFn4x;A-^AF{_1I{eB8TSe)(Dzu!h`TN~m>
zX{g#=^U==Ul;tdqVbeo9(pK+%BPkCa;J%C-vKt^t*IUagl-F3HnG|kedb4Eex=~Zp
z%J}+}SB7Ij8tHO!N3?5$#iJ0x(Ql0sL@FLj^h4ap_K{5wMMAoWyUZupil$qvsd+QM
zx1HFsx6AXE*=BUG$0;^b#Aa7)n2DCPy5Bl*84bI=avDul;|IL}v2ftJTxu^K=J<c!
zHo${BXAGDM2g$osPDI4xwN3rZA+C;L%`X?YvR!wY|LmHzs6?h6n8dMsvfQL>Q1zM>
zMi|?ct*rXnHu9;eRhVL~)Rufz&RryXyn6lMZ2R#EUFJ&Bvs`=ox(c@!oe!<folm>4
nL7nUI*MHyq(}@Rjm8Xkpcusxyx01jP{aq2VJH@T}YbNhsQKxm>

diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_next_bg_selector.xml b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_next_bg_selector.xml
new file mode 100644
index 0000000000..3141e1a44a
--- /dev/null
+++ b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_next_bg_selector.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <solid android:color="#42435A" />
+            <corners android:bottomRightRadius="@dimen/module_media_window_corner" android:topRightRadius="@dimen/module_media_window_corner" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="#00000000" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/ic_search_choice_point.png b/modules/mogo-module-media/src/main/res/drawable/ic_search_choice_point.png
similarity index 100%
rename from modules/mogo-module-media/src/main/res/drawable-ldpi/ic_search_choice_point.png
rename to modules/mogo-module-media/src/main/res/drawable/ic_search_choice_point.png
diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/ic_search_poi_location.png b/modules/mogo-module-media/src/main/res/drawable/ic_search_poi_location.png
similarity index 100%
rename from modules/mogo-module-media/src/main/res/drawable-ldpi/ic_search_poi_location.png
rename to modules/mogo-module-media/src/main/res/drawable/ic_search_poi_location.png
diff --git a/modules/mogo-module-media/src/main/res/drawable-mdpi/ic_search_unshadow.png b/modules/mogo-module-media/src/main/res/drawable/ic_search_unshadow.png
similarity index 100%
rename from modules/mogo-module-media/src/main/res/drawable-mdpi/ic_search_unshadow.png
rename to modules/mogo-module-media/src/main/res/drawable/ic_search_unshadow.png
diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_blur_default_icon.png b/modules/mogo-module-media/src/main/res/drawable/module_media_blur_default_icon.png
similarity index 100%
rename from modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_blur_default_icon.png
rename to modules/mogo-module-media/src/main/res/drawable/module_media_blur_default_icon.png
diff --git a/modules/mogo-module-media/src/main/res/drawable/module_media_default_music_img.png b/modules/mogo-module-media/src/main/res/drawable/module_media_default_music_img.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8de3c1ef31a1cc633cce300ca8e03e2d07adaef
GIT binary patch
literal 1283
zcmV+e1^oJnP)<h;3K|Lk000e1NJLTq001li001lq1^@s69)wx}000EaNkl<ZSVz^F
zUrgIo6vw~k_iHJ?mX>Zq6xap<24v_mmKlxCY(^sZLbAn(8*SYa5A)SgjDNED7o4x|
zfhR4HNtU>{Xq1H+acVOEY?!zW83;xgY=8ka+OpDKb4y!FDTUwt{dnko?LFW7`JJA7
z&bjvzG>pc^Q|9|V-!lYukO-9wR7MOrAXvk)4EGpeiogaK!*vGg%~F)hZEdH#qRWzq
zp~G>qmPvG+7}bHGsM28YF=7`e#6IolIQ^|ETL7wn8(htY3G8hEd(|$q#{518dZ*LV
za(<(F8v?F><z$JGNoN2&zfob8^DYJ`bfW9C(?jdotqbgOHP?s0+5p(r6Vv$noCIq0
zcv`wr>7)d1aJt_m!W(KsM*}!x4DWZgx4yNO#+twmSMw(TJE3854W@La!_)F=GJ&MP
z5zoG<VMWcRjN!dxo?ZnUiP^JyhJhqWAR+{VK{X%3B+${sm|g)K$p%;T*kH0O!)P?Z
zV30u|ECz${`Fv`C`P{hxh4#f~j}^cUm%Cd_>XIZGijoPF$pl%JR=@=w1TZr@s}`8g
zzu4hvt%(}OfFniW3lT+bW3$<iZL@{{`eb9?>&5i+w2(Xl9f=l~n7YH|z9w41?Ah7K
z&COkciRWd@e4}Gy@Op(?h`tU_YgJ61_Xd!pZ-hP{Kxt_SEN1hX=6CMi#l*xNQTZji
zQ0N8TdxZVb;A;AuK=q=E)+`J1^YdV}E*C>y0p{nu7@wHHtXS->z+qrrot}?gCa3c?
z3xhnVy6Z~#x&{Azm@+b8$+Ch$hTrc;C=?R)!D>4OA0hY<9do*CB!cQTFHw>IRTi@X
zQ-%q_5W~!zP)11kfgy%kYH&7vKt!+W;R<`U9R+ziU@#alFxU^DUwD%x#bJznNDf!i
zmjKo20n9Zj$|_;avSIGtEdIK6LoeBg4!b}NF856WD)ds$%v7-F(JIK2jGF`3F*Ea@
zUeaJdKRKLkzTt9oQw5Npw;jbrrSSQ@xZ3wC7+*?{!7xP*m)j4(q=#O-M%AAE$hO&W
zYp5S%<D+`XFKimHS+U@W{ZEBEw4bm1fW_dV9?%P$5)x6eqMgMkFWZgbk->1*&^&lZ
z=(*|4iW%Dr3SqZzL549S%*Vrmd%5?g9+CDkq1y3Hr&C%hE3H8JuHE3xI@sz>HhTMC
z{NDGAMkn*MrbFR)ta2}Qm6WH1;l0Ioz1^7APyxe*Lu+Y%IQJ18eEPX1SYDq~WU#+S
z2JzdqE5cq5mu9Wa&!Gd=$jd8;L8Q7j;CcD{SLeil8GL3%$<f?i9(~aTgTW97u{QEz
zFo3h?JVL;+_L5s`Y2c5&bUfTvZe-jZA4B)0uQxJv^_=(yJ`62*M5;bigQCKcSO}-0
z>G{4J!~d*%eU?mO<q?U`5Iux$+nR$Tb@kxK`c#91cK3*RH|ZfX;$@*@era(Ts-LZe
zL5`2*W&Gihp>QY&mgnThd@ir$B4z8AZFqd&li0bV5Sb<g4+0CAoSMX+H~!F4mQ!D(
zaOlmrsuJ5}SpTXjDx6lAfl=tRx^7MIbb4H9N1@Z|$sh`yR*y3AJ3MWky%N(>+B_^K
tg7eli2>F1Tr&}4pAKTkMo)^r`_#d(Q0)&U`ONamf002ovPDHLkV1k^meLVmG

literal 0
HcmV?d00001

diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_full_screen.png b/modules/mogo-module-media/src/main/res/drawable/module_media_full_screen.png
similarity index 100%
rename from modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_full_screen.png
rename to modules/mogo-module-media/src/main/res/drawable/module_media_full_screen.png
diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_have_heart.png b/modules/mogo-module-media/src/main/res/drawable/module_media_have_heart.png
similarity index 100%
rename from modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_have_heart.png
rename to modules/mogo-module-media/src/main/res/drawable/module_media_have_heart.png
diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_head_default_img.png b/modules/mogo-module-media/src/main/res/drawable/module_media_head_default_img.png
similarity index 100%
rename from modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_head_default_img.png
rename to modules/mogo-module-media/src/main/res/drawable/module_media_head_default_img.png
diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_last_song.png b/modules/mogo-module-media/src/main/res/drawable/module_media_last_song.png
similarity index 100%
rename from modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_last_song.png
rename to modules/mogo-module-media/src/main/res/drawable/module_media_last_song.png
diff --git a/modules/mogo-module-media/src/main/res/drawable/module_media_next_song.png b/modules/mogo-module-media/src/main/res/drawable/module_media_next_song.png
new file mode 100644
index 0000000000000000000000000000000000000000..dcb18e202fb75663fc62bf7e83dc59833fc19c71
GIT binary patch
literal 384
zcmV-`0e}99P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003;Nkl<ZSV!%a
zzb-^U6vlsFB~kDMBJl(ot-^Z<4HAj4(MeWGBin5$ynqOvfHx4^)1vXOK*Eu;nVX2L
zosD~UMscUSnK|F@ely>k5t)ZF>r(^N4*Y)y%xnr6mDCwDF=jRbOhfmOcO<?1wl?a3
znOy@Dz#gzI={*KwW~)Fu%-fZ;RR-V@7z+h1fq6++{UFS&0kp!LmZZ(90KCpC&~yPw
zpS=nX8=%lU2NosW{Depa;JQ!1x}?MJ5Ger)-D6-y(!GDk0pPl~z>=i1Tmapl2WEiT
zVWyy80zIa4z(Q((k098T^p<)H{HF9cUKG}(0`UDl05&8&r;gzruq^2$$4z(|;^q)N
zN7Y;K0E`1}b3@Yp0Nt?CX5?*k5?GVu2QE6y%<qAn@E-7{b@b<M7*#7dA^IRGSwFhG
e2B;mV9rywiHM1dxaFxLT0000<MNUMnLSTZ+xTQV-

literal 0
HcmV?d00001

diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_no_heart.png b/modules/mogo-module-media/src/main/res/drawable/module_media_no_heart.png
similarity index 100%
rename from modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_no_heart.png
rename to modules/mogo-module-media/src/main/res/drawable/module_media_no_heart.png
diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_no_img_default_icon.png b/modules/mogo-module-media/src/main/res/drawable/module_media_no_img_default_icon.png
similarity index 100%
rename from modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_no_img_default_icon.png
rename to modules/mogo-module-media/src/main/res/drawable/module_media_no_img_default_icon.png
diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_play.png b/modules/mogo-module-media/src/main/res/drawable/module_media_play.png
similarity index 100%
rename from modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_play.png
rename to modules/mogo-module-media/src/main/res/drawable/module_media_play.png
diff --git a/modules/mogo-module-media/src/main/res/drawable/module_media_play_bg_selector.xml b/modules/mogo-module-media/src/main/res/drawable/module_media_play_bg_selector.xml
new file mode 100644
index 0000000000..eafad48464
--- /dev/null
+++ b/modules/mogo-module-media/src/main/res/drawable/module_media_play_bg_selector.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <solid android:color="#42435A" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="#00000000" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_share_default_icon.png b/modules/mogo-module-media/src/main/res/drawable/module_media_share_default_icon.png
similarity index 100%
rename from modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_share_default_icon.png
rename to modules/mogo-module-media/src/main/res/drawable/module_media_share_default_icon.png
diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_share_default_icon2.png b/modules/mogo-module-media/src/main/res/drawable/module_media_share_default_icon2.png
similarity index 100%
rename from modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_share_default_icon2.png
rename to modules/mogo-module-media/src/main/res/drawable/module_media_share_default_icon2.png
diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_share_default_rect_icon.png b/modules/mogo-module-media/src/main/res/drawable/module_media_share_default_rect_icon.png
similarity index 100%
rename from modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_share_default_rect_icon.png
rename to modules/mogo-module-media/src/main/res/drawable/module_media_share_default_rect_icon.png
diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_share_fail.png b/modules/mogo-module-media/src/main/res/drawable/module_media_share_fail.png
similarity index 100%
rename from modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_share_fail.png
rename to modules/mogo-module-media/src/main/res/drawable/module_media_share_fail.png
diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_share_normal.png b/modules/mogo-module-media/src/main/res/drawable/module_media_share_normal.png
similarity index 100%
rename from modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_share_normal.png
rename to modules/mogo-module-media/src/main/res/drawable/module_media_share_normal.png
diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_share_success.png b/modules/mogo-module-media/src/main/res/drawable/module_media_share_success.png
similarity index 100%
rename from modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_share_success.png
rename to modules/mogo-module-media/src/main/res/drawable/module_media_share_success.png
diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_suspend.png b/modules/mogo-module-media/src/main/res/drawable/module_media_suspend.png
similarity index 100%
rename from modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_suspend.png
rename to modules/mogo-module-media/src/main/res/drawable/module_media_suspend.png
diff --git a/modules/mogo-module-media/src/main/res/drawable/module_media_window_alert_bg.xml b/modules/mogo-module-media/src/main/res/drawable/module_media_window_alert_bg.xml
index 7a098d5118..372926f342 100644
--- a/modules/mogo-module-media/src/main/res/drawable/module_media_window_alert_bg.xml
+++ b/modules/mogo-module-media/src/main/res/drawable/module_media_window_alert_bg.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <gradient
-        android:angle="0"
+        android:angle="180"
         android:startColor="#5E6079"
         android:endColor="#3F4057"
         android:type="linear" />
diff --git a/modules/mogo-module-media/src/main/res/drawable/module_media_window_pop_pause.png b/modules/mogo-module-media/src/main/res/drawable/module_media_window_pop_pause.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d35054284be963cf7775466d87536c17f1801ff
GIT binary patch
literal 355
zcmV-p0i6DcP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003hNkl<ZSV!&F
zF-pZi6h`4Mh&ymMu0t&BtOP|6D=l4sRu<Ze;0AOD`dTdou~V$H5DUe~K+?#=%p@}}
z2yfb4=09_Dawk<?*Od`hH3#@F9azL?2~}boIKetDu#4xMATa>p<O@ycEB0`TItNG$
z!1t7(Yi!_dC`4a?kQ+L4hy#4|1sMX+W<FpGSA8II0EFD&Ly&YQRnlAl?ctLp%?;3k
zL`zx<AX?Ir08x_80-%+28^^!Dlvx3U+;gmr1#pWM+|L@|y_u9p_?kATO1^?iY~t~+
z30VT*shNmjGIp+<0O8gQ{|@_j>r8G6asdR%!u5O;8{F0n1?ZHl3up*Hlw>6Uk|fIk
z@PZ}uk}L<nGFEYhN!Ny{&tn`&-7~3v4lsHLegK9Ctl?k)O!xo*002ovPDHLkV1f<S
BjmQ81

literal 0
HcmV?d00001

diff --git a/modules/mogo-module-media/src/main/res/drawable/module_media_window_pop_play.png b/modules/mogo-module-media/src/main/res/drawable/module_media_window_pop_play.png
new file mode 100644
index 0000000000000000000000000000000000000000..61510381d0607855fc12c3a47f234aa1bcc82207
GIT binary patch
literal 181
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ8c!F;kO=p;(+_es7znVahbfAs
z%1%p>6;lmMbm@3--1?j1uN!}+%eK|Vc&**~;h{F$hQ=cYIL<iSFWbc^yn$u+RHK_5
z*Q0-4t#smHY?yMA;amG6J%$NJY#SJ*p{Vh`^n`P(%TzsQo@ppaFk{f1%(&-Yrf~zW
Z%yNV253^K6(tz$@@O1TaS?83{1OVwkK$ZXi

literal 0
HcmV?d00001

diff --git a/modules/mogo-module-media/src/main/res/layout/module_media_music_window_alert_layout.xml b/modules/mogo-module-media/src/main/res/layout/module_media_music_window_alert_layout.xml
index 3da345be7b..d23e6478eb 100644
--- a/modules/mogo-module-media/src/main/res/layout/module_media_music_window_alert_layout.xml
+++ b/modules/mogo-module-media/src/main/res/layout/module_media_music_window_alert_layout.xml
@@ -1,87 +1,97 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="@dimen/module_media_pop_window_width"
     android:layout_height="@dimen/module_media_pop_window_height"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
-    tools:layout_marginLeft="@dimen/module_media_music_state_location_x"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_marginTop="@dimen/module_media_music_state_location"
-    android:background="@drawable/module_media_window_alert_bg">
-    <LinearLayout
-        android:layout_width="@dimen/module_media_pop_window_width"
-        android:layout_height="@dimen/module_media_pop_window_inner_height"
-        android:orientation="horizontal"
-        android:gravity="center_vertical"
-        android:paddingLeft="@dimen/module_media_pop_window_inner_padding"
-        android:paddingRight="@dimen/module_media_pop_window_inner_padding">
+    android:background="@drawable/module_media_window_alert_bg"
+    tools:layout_marginLeft="@dimen/module_media_music_state_location_x">
 
-        <com.mogo.module.media.widget.AnimCircleImageView
-            android:id="@+id/window_circle_img"
-            android:layout_width="@dimen/module_media_pop_window_anim_img_size"
-            android:layout_height="@dimen/module_media_pop_window_anim_img_size"
-            android:src="@drawable/module_media_play"/>
+    <com.mogo.module.media.widget.AnimCircleImageView
+        android:id="@+id/window_circle_img"
+        android:layout_width="@dimen/module_media_pop_window_anim_img_size"
+        android:layout_height="@dimen/module_media_pop_window_anim_img_size"
+        android:src="@drawable/module_media_default_music_img"
+        android:layout_marginStart="@dimen/module_media_pop_window_inner_padding"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"/>
 
-        <LinearLayout
-            android:id="@+id/window_media_center"
-            android:layout_width="@dimen/module_media_pop_window_text_width"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/module_media_pop_window_text_margin"
-            android:layout_marginRight="@dimen/module_media_pop_window_text_margin"
-            android:orientation="vertical">
-            <com.mogo.module.media.widget.ScrollingTextView
-                android:id="@+id/window_scroll_txt"
-                android:layout_width="@dimen/module_media_pop_window_text_width"
-                android:layout_height="wrap_content"
-                android:text="is my life"
-                android:textColor="#ffffff"
-                android:textSize="@dimen/module_media_pop_window_text_top_size"
-                android:ellipsize="end"
-                android:focusable="true"
-                android:focusableInTouchMode="true"
-                android:marqueeRepeatLimit="marquee_forever"
-                android:scrollHorizontally="true"
-                android:singleLine="true"/>
+    <com.mogo.module.media.widget.ScrollingTextView
+        android:id="@+id/window_scroll_txt"
+        android:layout_width="@dimen/module_media_pop_window_text_width"
+        android:layout_height="wrap_content"
+        android:ellipsize="end"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:marqueeRepeatLimit="marquee_forever"
+        android:scrollHorizontally="true"
+        android:singleLine="true"
+        android:text="is my life"
+        android:textColor="#ffffff"
+        android:layout_marginStart="@dimen/module_media_pop_window_text_margin"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed"
+        app:layout_constraintBottom_toTopOf="@+id/window_current_time"
+        app:layout_constraintLeft_toRightOf="@+id/window_circle_img"
+        android:textSize="@dimen/module_media_pop_window_text_top_size" />
 
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content">
-                <TextView
-                    android:id="@+id/window_current_time"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textSize="@dimen/module_media_pop_window_text_bottom_size"
-                    android:textColor="#7aFFFFFF"/>
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textSize="@dimen/module_media_pop_window_text_bottom_size"
-                    android:textColor="#7aFFFFFF"
-                    android:text="/"/>
+    <TextView
+        android:id="@+id/window_current_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="#7aFFFFFF"
+        tools:text="00:00"
+        app:layout_constraintTop_toBottomOf="@+id/window_scroll_txt"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="@+id/window_scroll_txt"
+        android:textSize="@dimen/module_media_pop_window_text_bottom_size" />
+    <TextView
+        android:id="@+id/window_divide"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="/"
+        android:textColor="#7aFFFFFF"
+        app:layout_constraintTop_toTopOf="@+id/window_current_time"
+        app:layout_constraintLeft_toRightOf="@+id/window_current_time"
+        android:textSize="@dimen/module_media_pop_window_text_bottom_size" />
 
-                <TextView
-                    android:id="@+id/window_max_time"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textSize="@dimen/module_media_pop_window_text_bottom_size"
-                    android:textColor="#7aFFFFFF" />
-            </LinearLayout>
-        </LinearLayout>
+    <TextView
+        android:id="@+id/window_max_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="#7aFFFFFF"
+        tools:text = "06:50"
+        app:layout_constraintTop_toTopOf="@+id/window_divide"
+        app:layout_constraintLeft_toRightOf="@+id/window_divide"
+        android:textSize="@dimen/module_media_pop_window_text_bottom_size" />
 
-        <ImageView
-            android:id="@+id/window_play_pause"
-            android:layout_width="@dimen/module_media_pop_window_control_img_size"
-            android:layout_height="@dimen/module_media_pop_window_control_img_size"
-            android:layout_marginRight="@dimen/module_media_pop_window_control_margin_right"
-            android:scaleType="fitCenter"
-            android:src="@drawable/module_media_window_pop_play"/>
+    <ImageView
+        android:id="@+id/window_play_pause"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:scaleType="center"
+        app:layout_constraintLeft_toRightOf="@+id/window_scroll_txt"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintRight_toLeftOf="@+id/window_music_next"
+        android:background="@drawable/module_media_play_bg_selector"
+        android:src="@drawable/module_media_window_pop_play" />
+
+    <ImageView
+        android:id="@+id/window_music_next"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:scaleType="center"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toRightOf="@+id/window_play_pause"
+        android:background="@drawable/module_media_next_bg_selector"
+        android:src="@drawable/module_media_next_song" />
 
-        <ImageView
-            android:id="@+id/window_music_next"
-            android:layout_width="@dimen/module_media_pop_window_control_img_size"
-            android:layout_height="@dimen/module_media_pop_window_control_img_size"
-            android:scaleType="fitCenter"
-            android:src="@drawable/module_media_next_song"/>
-    </LinearLayout>
     <com.mogo.module.media.widget.NoScrollSeekBar
         android:id="@+id/window_progress_bar"
         android:layout_width="match_parent"
@@ -89,13 +99,14 @@
         android:layout_marginLeft="@dimen/module_media_pop_window_radius_margin"
         android:layout_marginRight="@dimen/module_media_pop_window_radius_margin"
         android:max="100"
+        android:paddingStart="0dp"
+        android:paddingLeft="0dp"
+        android:paddingEnd="0dp"
+        android:paddingRight="0dp"
         android:progress="50"
         android:progressDrawable="@drawable/module_media_window_progress_bar"
         android:splitTrack="false"
-        android:thumbOffset="0dp"
         android:thumb="@drawable/module_media_progress_pop_bg"
-        android:paddingLeft="0dp"
-        android:paddingRight="0dp"
-        android:paddingStart="0dp"
-        android:paddingEnd="0dp"/>
-</LinearLayout>
\ No newline at end of file
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:thumbOffset="0dp" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/modules/mogo-module-media/src/main/res/values-ldpi/colors.xml b/modules/mogo-module-media/src/main/res/values-ldpi/colors.xml
deleted file mode 100644
index 69b22338c6..0000000000
--- a/modules/mogo-module-media/src/main/res/values-ldpi/colors.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#008577</color>
-    <color name="colorPrimaryDark">#00574B</color>
-    <color name="colorAccent">#D81B60</color>
-</resources>
diff --git a/modules/mogo-module-media/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-media/src/main/res/values-ldpi/dimens.xml
deleted file mode 100644
index 6a2e0256b5..0000000000
--- a/modules/mogo-module-media/src/main/res/values-ldpi/dimens.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="module_media_music_state_location">483px</dimen>
-    <dimen name="module_media_music_state_location_x">573px</dimen>
-
-    <!-- lcc start-->
-    <dimen name="module_media_back_width">352px</dimen>
-    <dimen name="module_media_back_height">352px</dimen>
-    <dimen name="module_media_back_radius">10.67px</dimen>
-    <dimen name="module_media_share_full_screen_back_top">12px</dimen>
-    <dimen name="module_media_share_share_icon_width">36px</dimen>
-    <dimen name="module_media_share_full_screen_width">36px</dimen>
-    <dimen name="module_media_share_full_screen_height">36px</dimen>
-    <dimen name="module_media_share_full_screen_pading">5px</dimen>
-    <dimen name="module_media_share_full_screen_margin_left_right">12px</dimen>
-    <dimen name="module_media_share_back_top">62px</dimen>
-    <dimen name="module_media_share_user_back_margin_left_right">16px</dimen>
-    <dimen name="module_media_share_user_back_margin_height">78px</dimen>
-    <dimen name="module_media_share_user_back_radius">10.6px</dimen>
-    <dimen name="module_media_share_user_head_image_left">16px</dimen>
-    <dimen name="module_media_share_user_head_image_width">48px</dimen>
-    <dimen name="module_media_share_user_head_image_height">48px</dimen>
-    <dimen name="module_media_share_user_name_back_margin_left">11px</dimen>
-    <dimen name="module_media_share_user_name_back_margin_right">12px</dimen>
-    <dimen name="module_media_share_user_from_size">12px</dimen>
-    <dimen name="module_media_share_user_name_size">14px</dimen>
-    <dimen name="module_media_share_user_of_share_size">16px</dimen>
-    <dimen name="module_media_share_user_like_back_margin_right">8px</dimen>
-    <dimen name="module_media_share_user_like_width">36px</dimen>
-    <dimen name="module_media_share_user_like_height">36px</dimen>
-    <dimen name="module_media_share_user_like_size">12px</dimen>
-    <dimen name="module_media_share_media_back_top">18px</dimen>
-    <dimen name="module_media_share_media_back_margin_left">30px</dimen>
-    <dimen name="module_media_share_media_back_margin_right">30px</dimen>
-    <dimen name="module_media_share_media_back_height">67.2px</dimen>
-    <dimen name="module_media_share_media_image_radius">3px</dimen>
-    <dimen name="module_media_share_media_image_height">62px</dimen>
-    <dimen name="module_media_share_media_image_width">62px</dimen>
-    <dimen name="module_media_share_media_name_back_left">12px</dimen>
-    <dimen name="module_media_share_media_song_name_size">20px</dimen>
-    <dimen name="module_media_share_media_singer_name_size">15px</dimen>
-    <!-- lcc end-->
-
-   <!-- lidongxiu start-->
-    <dimen name="module_media_share_fragment_width">421px</dimen>
-    <dimen name="module_media_share_fragment_height">280px</dimen>
-    <dimen name="module_media_share_fragment_title_padding_top">28px</dimen>
-    <dimen name="module_media_share_fragment_title_padding_left">32.5px</dimen>
-    <dimen name="module_media_share_fragment_bg_radius">11.5px</dimen>
-    <dimen name="module_media_share_fragment_title_img_size">72.5px</dimen>
-    <dimen name="module_media_share_fragment_title_img_right">10.7px</dimen>
-    <dimen name="module_media_share_fragment_title_height">72.5px</dimen>
-    <dimen name="module_media_share_fragment_title_padding">10px</dimen>
-    <dimen name="module_media_share_fragment_title_scroll_tv1_size">22px</dimen>
-    <dimen name="module_media_share_fragment_title_scroll_tv2_size">16px</dimen>
-    <dimen name="module_media_share_fragment_center_text_size">18px</dimen>
-    <dimen name="module_media_share_fragment_btn_size">22px</dimen>
-    <dimen name="module_media_share_fragment_center_margin_top">32px</dimen>
-    <dimen name="module_media_share_fragment_center_margin_bottom">51px</dimen>
-    <dimen name="module_media_share_fragment_btn_height">68px</dimen>
-    <dimen name="module_media_share_fragment_tv2_margin_top">2px</dimen>
-    <dimen name="module_media_share_fragment_img_radius">3.2px</dimen>
-
-    <dimen name="module_media_pop_window_width">322px</dimen>
-    <dimen name="module_media_pop_window_height">66.7px</dimen>
-    <dimen name="module_media_pop_window_inner_height">60px</dimen>
-    <dimen name="module_media_pop_window_inner_padding">12px</dimen>
-    <dimen name="module_media_pop_window_anim_img_size">48px</dimen>
-    <dimen name="module_media_pop_window_text_width">123px</dimen>
-    <dimen name="module_media_pop_window_text_margin">13px</dimen>
-    <dimen name="module_media_pop_window_text_top_size">18px</dimen>
-    <dimen name="module_media_pop_window_text_bottom_size">14px</dimen>
-    <dimen name="module_media_pop_window_control_img_size">30px</dimen>
-    <dimen name="module_media_pop_window_control_margin_right">21px</dimen>
-    <dimen name="module_media_pop_window_progress_height">4px</dimen>
-    <dimen name="module_media_pop_window_radius">8px</dimen>
-    <dimen name="module_media_pop_window_radius_margin">7px</dimen>
-
-    <dimen name="module_media_toast_share_width">267px</dimen>
-    <dimen name="module_media_toast_share_height">187px</dimen>
-    <dimen name="module_media_toast_share_bg_radius">10px</dimen>
-    <dimen name="module_media_toast_share_img_size">64px</dimen>
-    <dimen name="module_media_toast_share_text_size">18px</dimen>
-    <dimen name="module_media_toast_share_margin_top">11px</dimen>
-
-    <dimen name="module_media_card_width">352px</dimen>
-    <dimen name="module_media_card_height">352px</dimen>
-    <dimen name="module_media_card_radius">10.5px</dimen>
-    <dimen name="module_media_card_radius_blur">11px</dimen>
-    <dimen name="module_media_card_share_full_margin_top">11.5px</dimen>
-    <dimen name="module_media_card_no_share_anim_width">175px</dimen>
-    <dimen name="module_media_card_no_share_anim_height">175px</dimen>
-    <dimen name="module_media_card_no_share_anim_img_width">114px</dimen>
-    <dimen name="module_media_card_no_share_anim_img_height">114px</dimen>
-    <dimen name="module_media_card_no_share_music_top_title_size">20px</dimen>
-    <dimen name="module_media_card_no_share_music_bottom_title_size">15px</dimen>
-    <dimen name="module_media_card_no_share_music_top_title_margin">4px</dimen>
-    <dimen name="module_media_card_no_share_music_bottom_title_margin">2px</dimen>
-    <dimen name="module_media_card_progress_height">6px</dimen>
-    <dimen name="module_media_card_progress_time_text_size">12px</dimen>
-    <dimen name="module_media_card_progress_time_text_margin_left">11px</dimen>
-    <dimen name="module_media_card_progress_time_text_margin_bottom">4px</dimen>
-    <dimen name="module_media_card_control_icon_margin_bottom">1px</dimen>
-
-    <dimen name="module_media_card_control_icon_left_padding">8px</dimen>
-    <dimen name="module_media_card_control_icon_size">44px</dimen>
-    <dimen name="module_media_card_control_play_icon_size">62px</dimen>
-    <dimen name="module_media_card_control_play_icon_margin">28px</dimen>
-    <dimen name="module_media_card_progress_margin">1px</dimen>
-    <dimen name="module_media_card_no_share_title_margin">35px</dimen>
-    <dimen name="module_media_card_progress_bg_drawable_width">3.2px</dimen>
-    <dimen name="module_media_card_progress_bg_drawable_height">6.4px</dimen>
-    <dimen name="module_media_card_progress_pop_bg_drawable_width">3px</dimen>
-    <dimen name="module_media_card_progress_pop_bg_drawable_height">4px</dimen>
-    <dimen name="module_media_card_share_user_text_width_max">96px</dimen>
-
-    <dimen name="module_media_draw_rect_map_bottom">32px</dimen>
-    <dimen name="module_media_draw_rect_map_left">400px</dimen>
-    <dimen name="module_media_draw_rect_map_right">80px</dimen>
-    <dimen name="module_media_draw_rect_map_top">150px</dimen>
-    <dimen name="module_media_window_corner">16px</dimen>
-    <!-- lidongxiu end-->
-</resources>
\ No newline at end of file
diff --git a/modules/mogo-module-media/src/main/res/values-ldpi/strings.xml b/modules/mogo-module-media/src/main/res/values-ldpi/strings.xml
deleted file mode 100644
index 952949198b..0000000000
--- a/modules/mogo-module-media/src/main/res/values-ldpi/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">mogo-module-media</string>
-</resources>
diff --git a/modules/mogo-module-media/src/main/res/values-ldpi/styles.xml b/modules/mogo-module-media/src/main/res/values-ldpi/styles.xml
deleted file mode 100644
index 5885930df6..0000000000
--- a/modules/mogo-module-media/src/main/res/values-ldpi/styles.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<resources>
-
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-    </style>
-
-</resources>
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 2ecf743e04..257216648f 100644
--- a/modules/mogo-module-media/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-media/src/main/res/values/dimens.xml
@@ -1,123 +1,123 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="module_media_music_state_location">881px</dimen>
-    <dimen name="module_media_music_state_location_x">1067px</dimen>
+    <dimen name="module_media_music_state_location">483px</dimen>
+    <dimen name="module_media_music_state_location_x">573px</dimen>
 
     <!-- lcc start-->
-    <dimen name="module_media_back_width">660px</dimen>
-    <dimen name="module_media_back_height">660px</dimen>
-    <dimen name="module_media_back_radius">20px</dimen>
-    <dimen name="module_media_share_full_screen_back_top">23px</dimen>
-    <dimen name="module_media_share_share_icon_width">67.5px</dimen>
-    <dimen name="module_media_share_full_screen_width">67.5px</dimen>
-    <dimen name="module_media_share_full_screen_height">67.5px</dimen>
-    <dimen name="module_media_share_full_screen_pading">10px</dimen>
-    <dimen name="module_media_share_full_screen_margin_left_right">23px</dimen>
-    <dimen name="module_media_share_back_top">116px</dimen>
-    <dimen name="module_media_share_user_back_margin_left_right">30px</dimen>
-    <dimen name="module_media_share_user_back_margin_height">145px</dimen>
-    <dimen name="module_media_share_user_back_radius">20px</dimen>
-    <dimen name="module_media_share_user_head_image_left">30px</dimen>
-    <dimen name="module_media_share_user_head_image_width">90px</dimen>
-    <dimen name="module_media_share_user_head_image_height">90px</dimen>
-    <dimen name="module_media_share_user_name_back_margin_left">21px</dimen>
-    <dimen name="module_media_share_user_name_back_margin_right">24px</dimen>
-    <dimen name="module_media_share_user_from_size">23px</dimen>
-    <dimen name="module_media_share_user_name_size">26px</dimen>
-    <dimen name="module_media_share_user_of_share_size">30px</dimen>
-    <dimen name="module_media_share_user_like_back_margin_right">16px</dimen>
-    <dimen name="module_media_share_user_like_width">68px</dimen>
-    <dimen name="module_media_share_user_like_height">68px</dimen>
-    <dimen name="module_media_share_user_like_size">23px</dimen>
-    <dimen name="module_media_share_media_back_top">35px</dimen>
-    <dimen name="module_media_share_media_back_margin_left">56px</dimen>
-    <dimen name="module_media_share_media_back_margin_right">56px</dimen>
-    <dimen name="module_media_share_media_back_height">126px</dimen>
+    <dimen name="module_media_back_width">352px</dimen>
+    <dimen name="module_media_back_height">352px</dimen>
+    <dimen name="module_media_back_radius">10.67px</dimen>
+    <dimen name="module_media_share_full_screen_back_top">12px</dimen>
+    <dimen name="module_media_share_share_icon_width">36px</dimen>
+    <dimen name="module_media_share_full_screen_width">36px</dimen>
+    <dimen name="module_media_share_full_screen_height">36px</dimen>
+    <dimen name="module_media_share_full_screen_pading">5px</dimen>
+    <dimen name="module_media_share_full_screen_margin_left_right">12px</dimen>
+    <dimen name="module_media_share_back_top">62px</dimen>
+    <dimen name="module_media_share_user_back_margin_left_right">16px</dimen>
+    <dimen name="module_media_share_user_back_margin_height">78px</dimen>
+    <dimen name="module_media_share_user_back_radius">10.6px</dimen>
+    <dimen name="module_media_share_user_head_image_left">16px</dimen>
+    <dimen name="module_media_share_user_head_image_width">48px</dimen>
+    <dimen name="module_media_share_user_head_image_height">48px</dimen>
+    <dimen name="module_media_share_user_name_back_margin_left">11px</dimen>
+    <dimen name="module_media_share_user_name_back_margin_right">12px</dimen>
+    <dimen name="module_media_share_user_from_size">12px</dimen>
+    <dimen name="module_media_share_user_name_size">14px</dimen>
+    <dimen name="module_media_share_user_of_share_size">16px</dimen>
+    <dimen name="module_media_share_user_like_back_margin_right">8px</dimen>
+    <dimen name="module_media_share_user_like_width">36px</dimen>
+    <dimen name="module_media_share_user_like_height">36px</dimen>
+    <dimen name="module_media_share_user_like_size">12px</dimen>
+    <dimen name="module_media_share_media_back_top">18px</dimen>
+    <dimen name="module_media_share_media_back_margin_left">30px</dimen>
+    <dimen name="module_media_share_media_back_margin_right">30px</dimen>
+    <dimen name="module_media_share_media_back_height">67.2px</dimen>
     <dimen name="module_media_share_media_image_radius">3px</dimen>
-    <dimen name="module_media_share_media_image_height">116px</dimen>
-    <dimen name="module_media_share_media_image_width">116px</dimen>
-    <dimen name="module_media_share_media_name_back_left">22px</dimen>
-    <dimen name="module_media_share_media_song_name_size">37.5px</dimen>
-    <dimen name="module_media_share_media_singer_name_size">28px</dimen>
+    <dimen name="module_media_share_media_image_height">62px</dimen>
+    <dimen name="module_media_share_media_image_width">62px</dimen>
+    <dimen name="module_media_share_media_name_back_left">12px</dimen>
+    <dimen name="module_media_share_media_song_name_size">20px</dimen>
+    <dimen name="module_media_share_media_singer_name_size">15px</dimen>
     <!-- lcc end-->
 
     <!-- lidongxiu start-->
-    <dimen name="module_media_share_fragment_width">790px</dimen>
-    <dimen name="module_media_share_fragment_height">525px</dimen>
-    <dimen name="module_media_share_fragment_title_padding_top">55px</dimen>
-    <dimen name="module_media_share_fragment_title_padding_left">61px</dimen>
-    <dimen name="module_media_share_fragment_bg_radius">20px</dimen>
-    <dimen name="module_media_share_fragment_title_img_size">136px</dimen>
-    <dimen name="module_media_share_fragment_title_img_right">20px</dimen>
-    <dimen name="module_media_share_fragment_title_height">136px</dimen>
-    <dimen name="module_media_share_fragment_title_padding">34px</dimen>
-    <dimen name="module_media_share_fragment_title_scroll_tv1_size">40px</dimen>
-    <dimen name="module_media_share_fragment_title_scroll_tv2_size">30px</dimen>
-    <dimen name="module_media_share_fragment_center_text_size">34px</dimen>
-    <dimen name="module_media_share_fragment_btn_size">40px</dimen>
-    <dimen name="module_media_share_fragment_center_margin_top">60px</dimen>
-    <dimen name="module_media_share_fragment_center_margin_bottom">96px</dimen>
-    <dimen name="module_media_share_fragment_btn_height">130px</dimen>
-    <dimen name="module_media_share_fragment_tv2_margin_top">4px</dimen>
-    <dimen name="module_media_share_fragment_img_radius">6px</dimen>
+    <dimen name="module_media_share_fragment_width">421px</dimen>
+    <dimen name="module_media_share_fragment_height">280px</dimen>
+    <dimen name="module_media_share_fragment_title_padding_top">28px</dimen>
+    <dimen name="module_media_share_fragment_title_padding_left">32.5px</dimen>
+    <dimen name="module_media_share_fragment_bg_radius">11.5px</dimen>
+    <dimen name="module_media_share_fragment_title_img_size">72.5px</dimen>
+    <dimen name="module_media_share_fragment_title_img_right">10.7px</dimen>
+    <dimen name="module_media_share_fragment_title_height">72.5px</dimen>
+    <dimen name="module_media_share_fragment_title_padding">10px</dimen>
+    <dimen name="module_media_share_fragment_title_scroll_tv1_size">22px</dimen>
+    <dimen name="module_media_share_fragment_title_scroll_tv2_size">16px</dimen>
+    <dimen name="module_media_share_fragment_center_text_size">18px</dimen>
+    <dimen name="module_media_share_fragment_btn_size">22px</dimen>
+    <dimen name="module_media_share_fragment_center_margin_top">32px</dimen>
+    <dimen name="module_media_share_fragment_center_margin_bottom">51px</dimen>
+    <dimen name="module_media_share_fragment_btn_height">68px</dimen>
+    <dimen name="module_media_share_fragment_tv2_margin_top">2px</dimen>
+    <dimen name="module_media_share_fragment_img_radius">3.2px</dimen>
 
-    <dimen name="module_media_pop_window_width">580px</dimen>
-    <dimen name="module_media_pop_window_height">120px</dimen>
-    <dimen name="module_media_pop_window_inner_height">112px</dimen>
-    <dimen name="module_media_pop_window_inner_padding">20px</dimen>
-    <dimen name="module_media_pop_window_anim_img_size">90px</dimen>
-    <dimen name="module_media_pop_window_text_width">230px</dimen>
-    <dimen name="module_media_pop_window_text_margin">20px</dimen>
-    <dimen name="module_media_pop_window_text_top_size">35px</dimen>
-    <dimen name="module_media_pop_window_text_bottom_size">24px</dimen>
-    <dimen name="module_media_pop_window_control_img_size">56px</dimen>
-    <dimen name="module_media_pop_window_control_margin_right">40px</dimen>
-    <dimen name="module_media_pop_window_progress_height">8px</dimen>
-    <dimen name="module_media_pop_window_radius">16px</dimen>
-    <dimen name="module_media_pop_window_radius_margin">16px</dimen>
-    <dimen name="module_media_toast_share_width">500px</dimen>
-    <dimen name="module_media_toast_share_height">350px</dimen>
-    <dimen name="module_media_toast_share_bg_radius">20px</dimen>
-    <dimen name="module_media_toast_share_img_size">120px</dimen>
-    <dimen name="module_media_toast_share_text_size">36px</dimen>
-    <dimen name="module_media_toast_share_margin_top">20px</dimen>
+    <dimen name="module_media_pop_window_width">322px</dimen>
+    <dimen name="module_media_pop_window_height">66.7px</dimen>
+    <dimen name="module_media_pop_window_inner_height">60px</dimen>
+    <dimen name="module_media_pop_window_inner_padding">12px</dimen>
+    <dimen name="module_media_pop_window_anim_img_size">48px</dimen>
+    <dimen name="module_media_pop_window_text_width">123px</dimen>
+    <dimen name="module_media_pop_window_text_margin">13px</dimen>
+    <dimen name="module_media_pop_window_text_top_size">18px</dimen>
+    <dimen name="module_media_pop_window_text_bottom_size">14px</dimen>
+    <dimen name="module_media_pop_window_control_img_size">30px</dimen>
+    <dimen name="module_media_pop_window_control_margin_right">21px</dimen>
+    <dimen name="module_media_pop_window_progress_height">4px</dimen>
+    <dimen name="module_media_pop_window_radius">8px</dimen>
+    <dimen name="module_media_pop_window_radius_margin">7px</dimen>
 
-    <dimen name="module_media_card_width">660px</dimen>
-    <dimen name="module_media_card_height">660px</dimen>
-    <dimen name="module_media_card_radius">20px</dimen>
-    <dimen name="module_media_card_radius_blur">22px</dimen>
-    <dimen name="module_media_card_share_full_margin_top">22px</dimen>
-    <dimen name="module_media_card_no_share_anim_width">348px</dimen>
-    <dimen name="module_media_card_no_share_anim_height">348px</dimen>
-    <dimen name="module_media_card_no_share_anim_img_width">226px</dimen>
-    <dimen name="module_media_card_no_share_anim_img_height">226px</dimen>
-    <dimen name="module_media_card_no_share_music_top_title_size">36px</dimen>
-    <dimen name="module_media_card_no_share_music_bottom_title_size">28px</dimen>
+    <dimen name="module_media_toast_share_width">267px</dimen>
+    <dimen name="module_media_toast_share_height">187px</dimen>
+    <dimen name="module_media_toast_share_bg_radius">10px</dimen>
+    <dimen name="module_media_toast_share_img_size">64px</dimen>
+    <dimen name="module_media_toast_share_text_size">18px</dimen>
+    <dimen name="module_media_toast_share_margin_top">11px</dimen>
+
+    <dimen name="module_media_card_width">352px</dimen>
+    <dimen name="module_media_card_height">352px</dimen>
+    <dimen name="module_media_card_radius">10.5px</dimen>
+    <dimen name="module_media_card_radius_blur">11px</dimen>
+    <dimen name="module_media_card_share_full_margin_top">11.5px</dimen>
+    <dimen name="module_media_card_no_share_anim_width">175px</dimen>
+    <dimen name="module_media_card_no_share_anim_height">175px</dimen>
+    <dimen name="module_media_card_no_share_anim_img_width">114px</dimen>
+    <dimen name="module_media_card_no_share_anim_img_height">114px</dimen>
+    <dimen name="module_media_card_no_share_music_top_title_size">20px</dimen>
+    <dimen name="module_media_card_no_share_music_bottom_title_size">15px</dimen>
     <dimen name="module_media_card_no_share_music_top_title_margin">4px</dimen>
     <dimen name="module_media_card_no_share_music_bottom_title_margin">2px</dimen>
-    <dimen name="module_media_card_progress_height">11px</dimen>
-    <dimen name="module_media_card_progress_time_text_size">22px</dimen>
-    <dimen name="module_media_card_progress_time_text_margin_left">21px</dimen>
-    <dimen name="module_media_card_progress_time_text_margin_right">4px</dimen>
-    <dimen name="module_media_card_progress_time_text_margin_bottom">6px</dimen>
-    <dimen name="module_media_card_control_icon_margin_bottom">2px</dimen>
+    <dimen name="module_media_card_progress_height">6px</dimen>
+    <dimen name="module_media_card_progress_time_text_size">12px</dimen>
+    <dimen name="module_media_card_progress_time_text_margin_left">11px</dimen>
+    <dimen name="module_media_card_progress_time_text_margin_bottom">4px</dimen>
+    <dimen name="module_media_card_control_icon_margin_bottom">1px</dimen>
 
-    <dimen name="module_media_card_control_icon_left_padding">15px</dimen>
-    <dimen name="module_media_card_control_icon_size">78px</dimen>
-    <dimen name="module_media_card_control_play_icon_size">107px</dimen>
-    <dimen name="module_media_card_control_play_icon_margin">53px</dimen>
-    <dimen name="module_media_card_progress_margin">2px</dimen>
-    <dimen name="module_media_card_no_share_title_margin">64px</dimen>
-    <dimen name="module_media_card_progress_bg_drawable_width">6px</dimen>
-    <dimen name="module_media_card_progress_bg_drawable_height">12px</dimen>
-    <dimen name="module_media_card_progress_pop_bg_drawable_width">6px</dimen>
-    <dimen name="module_media_card_progress_pop_bg_drawable_height">8px</dimen>
-    <dimen name="module_media_card_share_user_text_width_max">180px</dimen>
+    <dimen name="module_media_card_control_icon_left_padding">8px</dimen>
+    <dimen name="module_media_card_control_icon_size">44px</dimen>
+    <dimen name="module_media_card_control_play_icon_size">62px</dimen>
+    <dimen name="module_media_card_control_play_icon_margin">28px</dimen>
+    <dimen name="module_media_card_progress_margin">1px</dimen>
+    <dimen name="module_media_card_no_share_title_margin">35px</dimen>
+    <dimen name="module_media_card_progress_bg_drawable_width">3.2px</dimen>
+    <dimen name="module_media_card_progress_bg_drawable_height">6.4px</dimen>
+    <dimen name="module_media_card_progress_pop_bg_drawable_width">3px</dimen>
+    <dimen name="module_media_card_progress_pop_bg_drawable_height">4px</dimen>
+    <dimen name="module_media_card_share_user_text_width_max">96px</dimen>
 
-    <dimen name="module_media_draw_rect_map_bottom">60px</dimen>
-    <dimen name="module_media_draw_rect_map_left">750px</dimen>
-    <dimen name="module_media_draw_rect_map_right">120px</dimen>
-    <dimen name="module_media_draw_rect_map_top">270px</dimen>
-    <dimen name="module_media_window_corner">30px</dimen>
+    <dimen name="module_media_draw_rect_map_bottom">32px</dimen>
+    <dimen name="module_media_draw_rect_map_left">400px</dimen>
+    <dimen name="module_media_draw_rect_map_right">80px</dimen>
+    <dimen name="module_media_draw_rect_map_top">150px</dimen>
+    <dimen name="module_media_window_corner">16px</dimen>
     <!-- lidongxiu end-->
 </resources>
\ No newline at end of file