diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppEnum.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppEnum.java index 8c545cc2dc..7eadd38ab6 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppEnum.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppEnum.java @@ -15,7 +15,7 @@ import com.mogo.module.apps.R; */ public enum AppEnum { // 爱趣听 - WeCarFlow("爱趣听","com.tencent.wecarflow", R.drawable.module_apps_ic_qq_music ), + WeCarFlow("爱趣听","com.tencent.wecarflow", R.drawable.module_apps_ic_we_car_flow ), //"QQ音乐", QQMusic( "QQ音乐", "com.pvetec.musics", R.drawable.module_apps_ic_qq_music ), diff --git a/modules/mogo-module-apps/src/main/res/drawable/module_apps_ic_we_car_flow.png b/modules/mogo-module-apps/src/main/res/drawable/module_apps_ic_we_car_flow.png new file mode 100644 index 0000000000..95734bb594 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable/module_apps_ic_we_car_flow.png differ 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 359302f586..2c89aead5d 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 @@ -33,7 +33,7 @@ public class MediaWindow2 implements IMusicView { private Context mContext; private WeCarFlowPresenter mPresenter; - private MediaInfoData mMediaInfoData = null; + private MediaInfoData mMediaInfoData = new MediaInfoData(); private View mWindowView; private AnimCircleImageView mCircleImg; @@ -97,11 +97,11 @@ public class MediaWindow2 implements IMusicView { if (mMediaInfoData != null) { if (mMediaInfoData.getPlayState() == MusicConstant.PLAY_STATE_PAUSE_OR_STOP) { mPresenter.play(mMediaInfoData); - }else{ + } else { // 没有做详细判断,不是暂停就是播放 mPresenter.pause(mMediaInfoData); } - }else{ + } else { openAqtApp(); } } @@ -127,7 +127,9 @@ public class MediaWindow2 implements IMusicView { return; } if (mMediaInfoData != null) { - if (mMediaInfoData.getType() == 1 || mMediaInfoData.getType() == 2 || mMediaInfoData.getType() == 3) { + if (mMediaInfoData.getType() == MusicConstant.PLAY_STATE_ERROR||isFirstPlay) { + mWindowView.setVisibility(View.GONE); + } else { mWindowView.setVisibility(View.VISIBLE); } } else { @@ -164,7 +166,9 @@ public class MediaWindow2 implements IMusicView { @Override public void onMusicPlaying() { - Logger.d(TAG, "onMusicPlaying"); + Logger.d(TAG, "onMusicPlaying===" + mMediaInfoData); + isFirstPlay = false; + updateWindowUI(false); if (mWindowPlayPause != null) { mWindowPlayPause.setImageResource(R.drawable.module_media_window_pop_play); } @@ -176,7 +180,7 @@ public class MediaWindow2 implements IMusicView { @Override public void onMusicPause() { - Logger.d(TAG, "onMusicPause: "); + Logger.d(TAG, "onMusicPause: ===" + mMediaInfoData); if (mWindowPlayPause != null) { mWindowPlayPause.setImageResource(R.drawable.module_media_window_pop_pause); } @@ -188,7 +192,7 @@ public class MediaWindow2 implements IMusicView { @Override public void onMusicStopped() { - Logger.d(TAG, "onMusicStopped"); + Logger.d(TAG, "onMusicStopped===" + mMediaInfoData); if (mWindowPlayPause != null) { mWindowPlayPause.setImageResource(R.drawable.module_media_window_pop_pause); } @@ -200,18 +204,16 @@ public class MediaWindow2 implements IMusicView { @Override public void onMediaInfoChanged(MediaInfoData mediaInfoData) { - if(!isFirstPlay) { - mMediaInfoData = mediaInfoData; - addWindowView(); - updateWindowUI(); - } - isFirstPlay = false; + Logger.d(TAG, "onMediaInfoChanged: " + mediaInfoData); + mMediaInfoData = mediaInfoData; + addWindowView(); + updateWindowUI(); } @Override public void onMusicProgress(long current, long total) { // Logger.d(TAG, "onMusicProgress==current: " + current + " total: " + total); - if(mMediaInfoData!=null) { + if (mMediaInfoData != null) { mMediaInfoData.setCurTime((int) current); mMediaInfoData.setMaxTime((int) total); } @@ -230,9 +232,9 @@ public class MediaWindow2 implements IMusicView { } } - private void openAqtApp(){ + private void openAqtApp() { try { - LaunchUtils.launchByPkg(mContext,"com.tencent.wecarflow"); + LaunchUtils.launchByPkg(mContext, "com.tencent.wecarflow"); } catch (Exception e) { e.printStackTrace(); } diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/MediaInfoData.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/MediaInfoData.java index 826e47ae51..a0ddf0f210 100644 --- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/MediaInfoData.java +++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/model/MediaInfoData.java @@ -1,5 +1,7 @@ package com.mogo.module.media.model; +import com.mogo.module.media.constants.MusicConstant; + import java.io.Serializable; public class MediaInfoData implements Serializable { diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/WeCarFlowPresenter.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/WeCarFlowPresenter.java index 3ebbc6e96f..66ab3efecc 100644 --- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/WeCarFlowPresenter.java +++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/WeCarFlowPresenter.java @@ -76,7 +76,6 @@ public class WeCarFlowPresenter extends BaseMediaPresenter { public void init(Context context) { this.context = context; currentMedia = new MediaInfoData(); - currentMedia.setPlayState(MusicConstant.PLAY_STATE_PAUSE_OR_STOP); serviceApis = (IMogoServiceApis) ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation(context);