diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/KwPresenter.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/KwPresenter.java index e496684269..f783c4d80c 100644 --- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/KwPresenter.java +++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/presenter/KwPresenter.java @@ -14,7 +14,6 @@ import com.mogo.service.IMogoServiceApis; import com.mogo.service.MogoServicePaths; import com.mogo.service.statusmanager.IMogoStatusChangedListener; import com.mogo.service.statusmanager.StatusDescriptor; -import com.mogo.utils.logger.Logger; import cn.kuwo.autosdk.api.KWAPI; import cn.kuwo.autosdk.api.OnGetSongImgUrlListener; @@ -43,14 +42,14 @@ public class KwPresenter extends BaseMediaPresenter { kwapi = KWAPI.createKWAPI(context, "auto"); kwapi.registerConnectedListener(b -> { - Logger.d(TAG, "onConnected: " + b); + Log.d(TAG, "onConnected: " + b); Log.d(TAG, "onConnected: " + b); isBind = b; if (!isBind) { mView.onMusicStopped(); }else{ PlayerStatus currentState = kwapi.getPlayerStatus(); - Logger.d(TAG, "check current status: " + currentState); + Log.d(TAG, "check current status: " + currentState); Log.d(TAG, "check current status: " + currentState); if(currentState == PlayerStatus.BUFFERING||currentState == PlayerStatus.PLAYING){ currentMedia.setPlayState(MusicConstant.PLAY_STATE_PLAYING); @@ -62,13 +61,13 @@ public class KwPresenter extends BaseMediaPresenter { }); kwapi.registerExitListener(() -> { - Logger.d(TAG, "onExit==="); + Log.d(TAG, "onExit==="); Log.d(TAG, "onExit==="); mView.onAppExit(); }); kwapi.registerPlayerStatusListener((playerStatus, music) -> { - Logger.d(TAG, "onPlayerStatusListener: " + playerStatus + " music: " + music.name); + Log.d(TAG, "onPlayerStatusListener: " + playerStatus + " music: " + music.name); switch (playerStatus) { case BUFFERING: if (currentMedia.getMediaName() == null || !currentMedia.getMediaName().equals(music.name)) { @@ -113,7 +112,7 @@ public class KwPresenter extends BaseMediaPresenter { @Override public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) { if (isTrue) { - Logger.d(TAG, "onResume, isBind: " + isBind); + Log.d(TAG, "onResume, isBind: " + isBind); Log.d(TAG, "onResume, isBind: " + isBind); // 需要在resume时候判断绑定关系是否正常 if (!isBind) { @@ -125,14 +124,14 @@ public class KwPresenter extends BaseMediaPresenter { // 当前处于绑定状态，且有音乐信息，需判断是否正在播放，进行界面刷新 Log.d(TAG, "step1==" + currentMusic.name); if (kwapi.getPlayerStatus() == PlayerStatus.BUFFERING || kwapi.getPlayerStatus() == PlayerStatus.PLAYING) { - Logger.d(TAG, "当前可能正在播放音乐，需要更新=1=" + currentMusic.name); + Log.d(TAG, "当前可能正在播放音乐，需要更新=1=" + currentMusic.name); currentMedia.setMediaName(currentMusic.name); currentMedia.setPlayState(MusicConstant.PLAY_STATE_PLAYING); mView.onMediaInfoChanged(currentMedia); mView.onMusicPlaying(); kwapi.getSongPicUrl(currentMusic, onGetSongImgUrlListener); } else if (kwapi.getPlayerStatus() == PlayerStatus.INIT) { - Logger.d(TAG, "当前可能正在播放音乐，需要更新=3=" + currentMusic.name); + Log.d(TAG, "当前可能正在播放音乐，需要更新=3=" + currentMusic.name); currentMedia.setMediaName(currentMusic.name); currentMedia.setPlayState(MusicConstant.PLAY_STATE_PAUSE_OR_STOP); mView.onMediaInfoChanged(currentMedia); @@ -142,14 +141,14 @@ public class KwPresenter extends BaseMediaPresenter { Log.d(TAG, "step2==media: " + currentMedia.getMediaName() + " " + "musicName: " + currentMusic.name + " status: " + kwapi.getPlayerStatus()); if (kwapi.getPlayerStatus() == PlayerStatus.BUFFERING || kwapi.getPlayerStatus() == PlayerStatus.PLAYING) { - Logger.d(TAG, "当前可能正在播放音乐，需要更新=2=" + currentMusic.name); + Log.d(TAG, "当前可能正在播放音乐，需要更新=2=" + currentMusic.name); currentMedia.setMediaName(currentMusic.name); currentMedia.setPlayState(MusicConstant.PLAY_STATE_PLAYING); mView.onMediaInfoChanged(currentMedia); mView.onMusicPlaying(); kwapi.getSongPicUrl(currentMusic, onGetSongImgUrlListener); }else if (kwapi.getPlayerStatus() == PlayerStatus.INIT) { - Logger.d(TAG, "当前可能正在播放音乐，需要更新=4=" + currentMusic.name); + Log.d(TAG, "当前可能正在播放音乐，需要更新=4=" + currentMusic.name); currentMedia.setMediaName(currentMusic.name); currentMedia.setPlayState(MusicConstant.PLAY_STATE_PAUSE_OR_STOP); mView.onMediaInfoChanged(currentMedia); @@ -240,7 +239,7 @@ public class KwPresenter extends BaseMediaPresenter { if(currentMedia.getPlayState() == MusicConstant.PLAY_STATE_PLAYING) { currentMedia.setMediaName(music.name); currentMedia.setMediaImg(s); - Logger.d(TAG, + Log.d(TAG, "onGetSongImgUrlSucessed: " + currentMedia); handler.post(() -> mView.onMediaInfoChanged(currentMedia)); } @@ -248,7 +247,7 @@ public class KwPresenter extends BaseMediaPresenter { @Override public void onGetSongImgUrlFailed(Music music, int i) { - Logger.e(TAG, "onGetSongImgUrlFailed: " + i); + Log.e(TAG, "onGetSongImgUrlFailed: " + i); } }; 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 cff61f0be8..6f4350f3da 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 @@ -1,6 +1,7 @@ package com.mogo.module.media.window; import android.content.Context; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.widget.FrameLayout; @@ -22,8 +23,6 @@ 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.WindowUtils; -import com.mogo.utils.glide.GlideApp; -import com.mogo.utils.logger.Logger; import com.tencent.wecarflow.flowoutside.sdk.FlowPlayControl; /** @@ -97,7 +96,7 @@ public class MediaWindow2 implements IMusicView { int xPos = getContext().getResources().getDimensionPixelOffset(R.dimen.module_media_music_state_location_x); int statusBarHeight = WindowUtils.getStatusBarHeight(mContext); - Logger.d(TAG, + Log.d(TAG, "yPos: " + yPos + " xPos: " + xPos + " statusBarHeight: " + statusBarHeight); 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)); @@ -201,7 +200,7 @@ public class MediaWindow2 implements IMusicView { @Override public void onMusicPlaying() { - Logger.d(TAG, "onMusicPlaying===" + mMediaInfoData); + Log.d(TAG, "onMusicPlaying===" + mMediaInfoData); isFirstPlay = false; updateWindowUI(false); if (mWindowPlayPause != null) { @@ -215,7 +214,7 @@ public class MediaWindow2 implements IMusicView { @Override public void onMusicPause() { - Logger.d(TAG, "onMusicPause: ===" + mMediaInfoData); + Log.d(TAG, "onMusicPause: ===" + mMediaInfoData); if (mWindowPlayPause != null) { mWindowPlayPause.setImageResource(R.drawable.module_media_window_pop_pause); } @@ -227,7 +226,7 @@ public class MediaWindow2 implements IMusicView { @Override public void onMusicStopped() { - Logger.d(TAG, "onMusicStopped===" + mMediaInfoData); + Log.d(TAG, "onMusicStopped===" + mMediaInfoData); if (mWindowPlayPause != null) { mWindowPlayPause.setImageResource(R.drawable.module_media_window_pop_pause); } @@ -241,7 +240,7 @@ public class MediaWindow2 implements IMusicView { @Override public void onMediaInfoChanged(MediaInfoData mediaInfoData) { - Logger.d(TAG, "onMediaInfoChanged: " + mediaInfoData); + Log.d(TAG, "onMediaInfoChanged: " + mediaInfoData); mMediaInfoData = mediaInfoData; addWindowView(); updateWindowUI(); @@ -249,7 +248,7 @@ public class MediaWindow2 implements IMusicView { @Override public void onMusicProgress(long current, long total) { -// Logger.d(TAG, "onMusicProgress==current: " + current + " total: " + total); +// Log.d(TAG, "onMusicProgress==current: " + current + " total: " + total); if (mMediaInfoData != null) { mMediaInfoData.setCurTime((int) current); mMediaInfoData.setMaxTime((int) total);