From 207811c41d00437ea64859556bc648bd58cbde70 Mon Sep 17 00:00:00 2001 From: zlzw <583819556@qq.com> Date: Mon, 9 Jan 2023 14:47:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=BE=A9=E5=9C=A8=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E7=9B=B4=E6=92=AD=E7=9A=84=E7=9B=B4=E6=92=AD=E9=97=B4PK?= =?UTF-8?q?=E6=97=B6=E5=88=87=E6=8D=A2=E5=88=86=E8=BE=A8=E7=8E=87=E4=BC=9A?= =?UTF-8?q?=E6=8B=89=E5=8D=87=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../live/activity/LiveAudienceActivity.java | 4 ++++ .../live/views/LivePlayRyViewHolder.java | 22 ++++++++++++++----- .../live/views/LiveRoomPlayViewHolder.java | 3 +++ .../live/views/PortraitLiveManager.java | 6 ++++- 4 files changed, 28 insertions(+), 7 deletions(-) diff --git a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java index 037ff8093..a769238ee 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java @@ -684,6 +684,10 @@ public class LiveAudienceActivity extends LiveActivity { } } + public boolean isPkStatus() { + return isPk; + } + @Subscribe(threadMode = ThreadMode.MAIN) public void onLiveRoomChangeEvent(LiveRoomChangeEvent e) { if (verticalViewPager.ismEnableScroll()) { 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 ddb682e61..204664df1 100644 --- a/live/src/main/java/com/yunbao/live/views/LivePlayRyViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LivePlayRyViewHolder.java @@ -278,15 +278,15 @@ public class LivePlayRyViewHolder extends LiveRoomPlayViewHolder { public void play(String url, int playModel) { srcUrl = url; PLAY_MODEL = playModel; - Log.i(TAG, "play" + " url:" + url + " playModel: " + playModel + " landscape: " + videoLandscape); - if (playModel != PLAY_MODEL_DEF) { + Log.i(TAG, "play" + " url:" + url + " playModel: " + playModel + " landscape: " + landscape + " videoLandscape" + videoLandscape); + if (playModel != PLAY_MODEL_DEF && !url.contains(videoFps[0] + ".flv")) { mPlayer.setViewResizeMode(landscape == VIDEO_VERTICAL); if (landscape == VIDEO_VERTICAL) { url = url.replace(".flv", videoRatioVertical[playModel] + videoFps[0] + ".flv"); } else if (landscape == VIDEO_HORIZONTAL) { url = url.replace(".flv", videoRatioHorizontal[playModel] + videoFps[0] + ".flv"); } - } else { + } else if(!url.contains(videoFps[0] + ".flv")){ mPlayer.setViewResizeMode(false); } Log.e("purl121", url); @@ -311,14 +311,14 @@ public class LivePlayRyViewHolder extends LiveRoomPlayViewHolder { srcUrl = url; PLAY_MODEL = playModel; Log.i(TAG, "switchStream: " + " url:" + url + " playModel: " + playModel + " landscape: " + landscape + " videoLandscape = " + videoLandscape); - if (playModel != PLAY_MODEL_DEF) { + if (playModel != PLAY_MODEL_DEF && !url.contains(videoFps[0] + ".flv")) { mPlayer.setViewResizeMode(landscape == VIDEO_VERTICAL); if (landscape == VIDEO_VERTICAL) { url = url.replace(".flv", videoRatioVertical[playModel] + videoFps[0] + ".flv"); } else if (landscape == VIDEO_HORIZONTAL) { url = url.replace(".flv", videoRatioHorizontal[playModel] + videoFps[0] + ".flv"); } - } else { + } else if(!url.contains(videoFps[0] + ".flv")){ mPlayer.setViewResizeMode(false); } Log.e("purl121", url); @@ -335,6 +335,16 @@ public class LivePlayRyViewHolder extends LiveRoomPlayViewHolder { purl = url; } + @Override + public void switchStreamPk(boolean isPk) { + super.switchStreamPk(isPk); + if (isPk && !srcUrl.contains(videoFps[0] + ".flv")) { + mPlayer.setViewResizeMode(false); + String url = srcUrl.replace(".flv", videoRatioHorizontal[PLAY_MODEL] + videoFps[0] + ".flv"); + switchStream(url,PLAY_MODEL); + } + } + @Override public void release() { mEnd = true; @@ -1111,7 +1121,7 @@ public class LivePlayRyViewHolder extends LiveRoomPlayViewHolder { public void onVideoSizeChanged(VideoSize videoSize) { Player.Listener.super.onVideoSizeChanged(videoSize); Log.i(TAG, "onVideoSizeChanged: width = " + videoSize.width + " height = " + videoSize.height); - // ToastUtil.show("分辨率: 宽 = " + videoSize.width + " 高 = " + videoSize.height); + // ToastUtil.show("分辨率: 宽 = " + videoSize.width + " 高 = " + videoSize.height); if (videoSize.height > videoSize.width) { videoLandscape = VIDEO_VERTICAL; } else { 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 6aab89439..a663763dd 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomPlayViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomPlayViewHolder.java @@ -94,6 +94,9 @@ public abstract class LiveRoomPlayViewHolder extends AbsViewHolder implements IL this.loadingListener = listener; } + public void switchStreamPk(boolean isPk) { + } + public interface OnMicCallback { void onMikUpdate(); 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 395524312..aed314f70 100644 --- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java +++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java @@ -1302,8 +1302,12 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe * @param isPk */ public void setPkStatus(boolean isPk) { - if (mLiveRoomViewHolder != null) + if (mLiveRoomViewHolder != null) { mLiveRoomViewHolder.hotAddVisibility(isPk); + } + if(mLivePlayViewHolder!=null){ + mLivePlayViewHolder.switchStreamPk(isPk); + } } @Override