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 @@
-
+
\ 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
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
\ 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 0000000000..d8de3c1ef3
Binary files /dev/null and b/modules/mogo-module-media/src/main/res/drawable/module_media_default_music_img.png differ
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 0000000000..dcb18e202f
Binary files /dev/null and b/modules/mogo-module-media/src/main/res/drawable/module_media_next_song.png differ
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 @@
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+
\ 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 @@
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 0000000000..6d35054284
Binary files /dev/null and b/modules/mogo-module-media/src/main/res/drawable/module_media_window_pop_pause.png differ
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 0000000000..61510381d0
Binary files /dev/null and b/modules/mogo-module-media/src/main/res/drawable/module_media_window_pop_play.png differ
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 @@
-
-
+ android:background="@drawable/module_media_window_alert_bg"
+ tools:layout_marginLeft="@dimen/module_media_music_state_location_x">
-
+
-
-
+
-
-
-
+
+
-
-
-
+
-
+
+
+
-
-
-
\ No newline at end of file
+ app:layout_constraintBottom_toBottomOf="parent"
+ android:thumbOffset="0dp" />
+
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 @@
-
-
- #008577
- #00574B
- #D81B60
-
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 @@
-
-
- 483px
- 573px
-
-
- 352px
- 352px
- 10.67px
- 12px
- 36px
- 36px
- 36px
- 5px
- 12px
- 62px
- 16px
- 78px
- 10.6px
- 16px
- 48px
- 48px
- 11px
- 12px
- 12px
- 14px
- 16px
- 8px
- 36px
- 36px
- 12px
- 18px
- 30px
- 30px
- 67.2px
- 3px
- 62px
- 62px
- 12px
- 20px
- 15px
-
-
-
- 421px
- 280px
- 28px
- 32.5px
- 11.5px
- 72.5px
- 10.7px
- 72.5px
- 10px
- 22px
- 16px
- 18px
- 22px
- 32px
- 51px
- 68px
- 2px
- 3.2px
-
- 322px
- 66.7px
- 60px
- 12px
- 48px
- 123px
- 13px
- 18px
- 14px
- 30px
- 21px
- 4px
- 8px
- 7px
-
- 267px
- 187px
- 10px
- 64px
- 18px
- 11px
-
- 352px
- 352px
- 10.5px
- 11px
- 11.5px
- 175px
- 175px
- 114px
- 114px
- 20px
- 15px
- 4px
- 2px
- 6px
- 12px
- 11px
- 4px
- 1px
-
- 8px
- 44px
- 62px
- 28px
- 1px
- 35px
- 3.2px
- 6.4px
- 3px
- 4px
- 96px
-
- 32px
- 400px
- 80px
- 150px
- 16px
-
-
\ 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 @@
-
- mogo-module-media
-
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 @@
-
-
-
-
-
-
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 @@
- 881px
- 1067px
+ 483px
+ 573px
- 660px
- 660px
- 20px
- 23px
- 67.5px
- 67.5px
- 67.5px
- 10px
- 23px
- 116px
- 30px
- 145px
- 20px
- 30px
- 90px
- 90px
- 21px
- 24px
- 23px
- 26px
- 30px
- 16px
- 68px
- 68px
- 23px
- 35px
- 56px
- 56px
- 126px
+ 352px
+ 352px
+ 10.67px
+ 12px
+ 36px
+ 36px
+ 36px
+ 5px
+ 12px
+ 62px
+ 16px
+ 78px
+ 10.6px
+ 16px
+ 48px
+ 48px
+ 11px
+ 12px
+ 12px
+ 14px
+ 16px
+ 8px
+ 36px
+ 36px
+ 12px
+ 18px
+ 30px
+ 30px
+ 67.2px
3px
- 116px
- 116px
- 22px
- 37.5px
- 28px
+ 62px
+ 62px
+ 12px
+ 20px
+ 15px
- 790px
- 525px
- 55px
- 61px
- 20px
- 136px
- 20px
- 136px
- 34px
- 40px
- 30px
- 34px
- 40px
- 60px
- 96px
- 130px
- 4px
- 6px
+ 421px
+ 280px
+ 28px
+ 32.5px
+ 11.5px
+ 72.5px
+ 10.7px
+ 72.5px
+ 10px
+ 22px
+ 16px
+ 18px
+ 22px
+ 32px
+ 51px
+ 68px
+ 2px
+ 3.2px
- 580px
- 120px
- 112px
- 20px
- 90px
- 230px
- 20px
- 35px
- 24px
- 56px
- 40px
- 8px
- 16px
- 16px
- 500px
- 350px
- 20px
- 120px
- 36px
- 20px
+ 322px
+ 66.7px
+ 60px
+ 12px
+ 48px
+ 123px
+ 13px
+ 18px
+ 14px
+ 30px
+ 21px
+ 4px
+ 8px
+ 7px
- 660px
- 660px
- 20px
- 22px
- 22px
- 348px
- 348px
- 226px
- 226px
- 36px
- 28px
+ 267px
+ 187px
+ 10px
+ 64px
+ 18px
+ 11px
+
+ 352px
+ 352px
+ 10.5px
+ 11px
+ 11.5px
+ 175px
+ 175px
+ 114px
+ 114px
+ 20px
+ 15px
4px
2px
- 11px
- 22px
- 21px
- 4px
- 6px
- 2px
+ 6px
+ 12px
+ 11px
+ 4px
+ 1px
- 15px
- 78px
- 107px
- 53px
- 2px
- 64px
- 6px
- 12px
- 6px
- 8px
- 180px
+ 8px
+ 44px
+ 62px
+ 28px
+ 1px
+ 35px
+ 3.2px
+ 6.4px
+ 3px
+ 4px
+ 96px
- 60px
- 750px
- 120px
- 270px
- 30px
+ 32px
+ 400px
+ 80px
+ 150px
+ 16px
\ No newline at end of file