diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java index 6acb0415ac..084475dd0d 100644 --- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java +++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java @@ -150,7 +150,7 @@ public class MediaWindow2 implements IMusicView , IMogoStatusChangedListener { mPauseImage = mWindowView.findViewById(R.id.window_play_pause_new); if (mPauseImage != null) { - mPauseImage.setImageResource(R.drawable.module_media_window_pop_pause); + mPauseImage.setImageResource(R.drawable.module_media_window_pop_pause_new); } int yPos = @@ -294,7 +294,7 @@ public class MediaWindow2 implements IMusicView , IMogoStatusChangedListener { if( mMediaInfoData.getPlayState() == MusicConstant.PLAY_STATE_PLAYING) { // kw音乐做的容错 if (mPauseImage != null) { - mPauseImage.setImageResource(R.drawable.module_media_window_pop_play); + mPauseImage.setImageResource(R.drawable.module_media_window_pop_play_new); } if (mAnimCircleImageView != null) { mAnimCircleImageView.startAnim(); @@ -314,7 +314,7 @@ public class MediaWindow2 implements IMusicView , IMogoStatusChangedListener { // GlideApp.with(mContext).applyDefaultRequestOptions(options).load(mMediaInfoData.getMediaImg()).into(new SkinAbleBitmapTarget(mCircleImg, options)); }else{ Logger.e(TAG, "mMediaInfoData == null "); - mAnimCircleImageView.setImageResource(R.drawable.module_media_default_music_img); + mAnimCircleImageView.setImageResource(R.drawable.module_media_default_music_img_new); } } } else { @@ -371,7 +371,7 @@ public class MediaWindow2 implements IMusicView , IMogoStatusChangedListener { updateWindowUI(false); if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) { if (mPauseImage != null) { - mPauseImage.setImageResource(R.drawable.module_media_window_pop_play); + mPauseImage.setImageResource(R.drawable.module_media_window_pop_play_new); } if (mAnimCircleImageView != null) { @@ -396,7 +396,7 @@ public class MediaWindow2 implements IMusicView , IMogoStatusChangedListener { Log.d(TAG, "onMusicPause: ===" + mMediaInfoData); if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) { if (mPauseImage != null) { - mPauseImage.setImageResource(R.drawable.module_media_window_pop_pause); + mPauseImage.setImageResource(R.drawable.module_media_window_pop_pause_new); } if (mAnimCircleImageView != null) { @@ -421,7 +421,7 @@ public class MediaWindow2 implements IMusicView , IMogoStatusChangedListener { Log.d(TAG, "onMusicStopped===" + mMediaInfoData); if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) { if (mPauseImage != null) { - mPauseImage.setImageResource(R.drawable.module_media_window_pop_pause); + mPauseImage.setImageResource(R.drawable.module_media_window_pop_pause_new); } if (mAnimCircleImageView != null) { diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_default_music_img_new.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_default_music_img_new.png new file mode 100644 index 0000000000..fcc9015490 Binary files /dev/null and b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_default_music_img_new.png differ diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_pause_new.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_pause_new.png new file mode 100644 index 0000000000..86f936f702 Binary files /dev/null and b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_pause_new.png differ diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_play_new.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_play_new.png new file mode 100644 index 0000000000..78e5680e91 Binary files /dev/null and b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_play_new.png differ diff --git a/modules/mogo-module-media/src/main/res/layout/module_media_music_window_alert_layout_new.xml b/modules/mogo-module-media/src/main/res/layout/module_media_music_window_alert_layout_new.xml index d36414c4b7..606fb00f07 100644 --- a/modules/mogo-module-media/src/main/res/layout/module_media_music_window_alert_layout_new.xml +++ b/modules/mogo-module-media/src/main/res/layout/module_media_music_window_alert_layout_new.xml @@ -32,7 +32,8 @@ android:id="@+id/window_circle_img_new" android:layout_width="@dimen/module_media_pop_window_anim_img_size_new" android:layout_height="@dimen/module_media_pop_window_anim_img_size_new" - android:src="@drawable/module_media_default_music_img" + android:src="@drawable/module_media_default_music_img_new" + android:scaleType="fitCenter" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" @@ -43,7 +44,7 @@ android:layout_width="@dimen/module_media_pop_window_pause" android:layout_height="@dimen/module_media_pop_window_pause" android:background="@drawable/module_media_play_bg_selector" - android:src="@drawable/module_media_window_pop_play" + android:src="@drawable/module_media_window_pop_play_new" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" diff --git a/modules/mogo-module-media/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-media/src/main/res/values-xhdpi/dimens.xml index f9fba40b16..75bfb5e9d1 100644 --- a/modules/mogo-module-media/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-media/src/main/res/values-xhdpi/dimens.xml @@ -71,7 +71,7 @@ 80px 101px 60px - 116px + 115px 230px 14px 35px diff --git a/modules/mogo-module-media/src/main/res/values/colors.xml b/modules/mogo-module-media/src/main/res/values/colors.xml index b6ca26aca2..7c39678a81 100644 --- a/modules/mogo-module-media/src/main/res/values/colors.xml +++ b/modules/mogo-module-media/src/main/res/values/colors.xml @@ -3,5 +3,7 @@ #fff #7affffff #444E6E - #80ffffff + #f6ffffff + #1Affffff + #ffffff