From 27bd65d3daaa243f109775ffb38021e05667cb99 Mon Sep 17 00:00:00 2001 From: zlzw <583819556@qq.com> Date: Sun, 8 Jan 2023 15:50:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=BF=9B=E7=9B=B4=E6=92=AD?= =?UTF-8?q?=E9=97=B4loading=E7=95=8C=E9=9D=A2=E4=B8=8E=E6=92=AD=E6=94=BE?= =?UTF-8?q?=E5=99=A8=E7=BB=91=E5=AE=9A=EF=BC=8C=E6=92=AD=E6=94=BE=E5=99=A8?= =?UTF-8?q?=E5=87=86=E5=A4=87=E5=AE=8C=E6=88=90=E5=90=8E=E5=86=8D=E9=9A=90?= =?UTF-8?q?=E8=97=8F=E3=80=82=20=E4=BC=98=E5=8C=96=E6=92=AD=E6=94=BE?= =?UTF-8?q?=E5=99=A8=E5=8A=A0=E8=BD=BD=E9=80=9F=E5=BA=A61?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yunbao/live/utils/LiveExoPlayerManager.java | 4 ++-- .../yunbao/live/views/LivePlayRyViewHolder.java | 14 +++++++++++++- .../yunbao/live/views/LiveRoomPlayViewHolder.java | 12 +++++++++++- .../com/yunbao/live/views/PortraitLiveManager.java | 10 ++++++++-- 4 files changed, 34 insertions(+), 6 deletions(-) diff --git a/live/src/main/java/com/yunbao/live/utils/LiveExoPlayerManager.java b/live/src/main/java/com/yunbao/live/utils/LiveExoPlayerManager.java index 4a810273e..76dd81632 100644 --- a/live/src/main/java/com/yunbao/live/utils/LiveExoPlayerManager.java +++ b/live/src/main/java/com/yunbao/live/utils/LiveExoPlayerManager.java @@ -106,7 +106,7 @@ public class LiveExoPlayerManager { Log.i(TAG, "onPlaybackStateChanged 1: " + playbackState); if (playbackState == Player.STATE_READY) { player2.stop(); - player2.setVideoSurface(null); + player2.clearVideoSurface(); player1.play(); Log.i(TAG, "切换播放器1"); handler.removeCallbacks(buffRunnable); @@ -159,7 +159,7 @@ public class LiveExoPlayerManager { Log.i(TAG, "onPlaybackStateChanged 2: " + playbackState); if (playbackState == Player.STATE_READY) { player1.stop(); - player1.setVideoSurface(null); + player1.clearVideoSurface(); player2.play(); Log.i(TAG, "切换播放器2 " + player2.isPlaying()); handler.removeCallbacks(buffRunnable); diff --git a/live/src/main/java/com/yunbao/live/views/LivePlayRyViewHolder.java b/live/src/main/java/com/yunbao/live/views/LivePlayRyViewHolder.java index 6ae0bb65a..6d1d43753 100644 --- a/live/src/main/java/com/yunbao/live/views/LivePlayRyViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LivePlayRyViewHolder.java @@ -196,7 +196,7 @@ public class LivePlayRyViewHolder extends LiveRoomPlayViewHolder { Log.i(TAG, "setLiveBeanLandscape: " + landscape); this.landscape = landscape; this.videoLandscape = landscape; - mPlayer.setViewResizeMode(landscape==VIDEO_VERTICAL); + mPlayer.setViewResizeMode(landscape == VIDEO_VERTICAL); if (landscape == 2) { Log.i("收到socket--->", "还原9：16"); RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) mVideoView.getLayoutParams(); @@ -1031,6 +1031,11 @@ public class LivePlayRyViewHolder extends LiveRoomPlayViewHolder { }); } + @Override + public void setLoadViewListener(LoadingListener listener) { + super.setLoadViewListener(listener); + } + private void showLoadingDialog() { if (PLAY_MODEL == PLAY_MODEL_480) return; @@ -1081,6 +1086,9 @@ public class LivePlayRyViewHolder extends LiveRoomPlayViewHolder { if (playbackState == Player.STATE_BUFFERING) { //showLoadingDialog(); OkDownload.getInstance().pauseAll(); + Log.i(TAG, "onPlaybackStateChanged: 缓存中"); + }else{ + Log.i(TAG, "onPlaybackStateChanged: 播放中"); } } @@ -1089,7 +1097,11 @@ public class LivePlayRyViewHolder extends LiveRoomPlayViewHolder { Player.Listener.super.onIsPlayingChanged(isPlaying); if (isPlaying) { hideCover(); + Log.i(TAG, "onIsPlayingChanged: 开始播放"); OkDownload.getInstance().startAll(); + if (loadingListener != null) { + loadingListener.onPlayer(); + } } } } diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomPlayViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomPlayViewHolder.java index a4dc4c9d2..3a6fa1bc9 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomPlayViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomPlayViewHolder.java @@ -25,6 +25,7 @@ public abstract class LiveRoomPlayViewHolder extends AbsViewHolder implements IL public static final String[] videoFps = new String[]{"_24", "_30"}; OnMicCallback onMicCallback;//连麦回调 public EnterRoomNewModel roomModel; + LoadingListener loadingListener; public LiveRoomPlayViewHolder(Context context, ViewGroup parentView) { super(context, parentView); @@ -62,7 +63,8 @@ public abstract class LiveRoomPlayViewHolder extends AbsViewHolder implements IL this.mLiveBean = data; } - public void setViewUP(int i){} + public void setViewUP(int i) { + } public OnMicCallback getOnMicCallback() { return onMicCallback; @@ -76,9 +78,17 @@ public abstract class LiveRoomPlayViewHolder extends AbsViewHolder implements IL this.roomModel = data; } + public void setLoadViewListener(LoadingListener listener) { + this.loadingListener = listener; + } + public interface OnMicCallback { void onMikUpdate(); } + + public interface LoadingListener { + void onPlayer(); + } } diff --git a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java index 8c6c80337..a973827e4 100644 --- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java +++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java @@ -276,6 +276,12 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe mLiveRyLinkMicPkPresenter = new LiveRyLinkMicPkPresenter(mContext, mLivePlayViewHolder, false, null); mLivePlayViewHolder.addToParent(); mLivePlayViewHolder.subscribeActivityLifeCycle(); + mLivePlayViewHolder.setLoadViewListener(new LiveRoomPlayViewHolder.LoadingListener() { + @Override + public void onPlayer() { + loading.setVisibility(View.GONE); + } + }); mLiveRoomViewHolder.subscribeActivityLifeCycle(); mLiveAudienceViewHolder.addToParent(); mLiveRoomViewHolder.addToParent(); @@ -358,7 +364,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe landscape = data.getLiveInfo().getLandscape(); mLivePlayViewHolder.setLiveBeanLandscape(landscape); mLivePlayViewHolder.setLiveEnterRoomNewModel(data); - mLivePlayViewHolder.switchStream(mLiveBean.getPull(), (data.getClarityType() - 1) == 2 ? 1 : (data.getClarityType() - 1)); + //mLivePlayViewHolder.switchStream(mLiveBean.getPull(), (data.getClarityType() - 1) == 2 ? 1 : (data.getClarityType() - 1)); //是否热度卡加成 liveHandler.postDelayed(() -> mLiveRoomViewHolder.getIsHot(data.getIsUseHotCard()), 700); @@ -580,7 +586,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe mLiveRoomViewHolder.showPrizePoolLevel(String.valueOf(giftPrizePoolLevel)); } } - liveHandler.postDelayed(() -> loading.setVisibility(View.GONE), 700); + //liveHandler.postDelayed(() -> loading.setVisibility(View.GONE), 700); }