yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复多人连麦下麦后播放器横竖屏切换异常

Browse Source
This commit is contained in:
zlzw 2022-11-30 13:15:40 +08:00
parent f5bd17f832
commit f257c2b5a9
1 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
live/src/main/java/com/yunbao/live/views/LivePlayRyViewHolder.java
View File

@ -28,7 +28,6 @@ import com.tencent.live2.V2TXLivePlayer;
import com.tencent.live2.V2TXLivePlayerObserver; import com.tencent.live2.V2TXLivePlayerObserver;
import com.tencent.live2.impl.V2TXLivePlayerImpl; import com.tencent.live2.impl.V2TXLivePlayerImpl;
import com.tencent.rtmp.ui.TXCloudVideoView; import com.tencent.rtmp.ui.TXCloudVideoView;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.http.HttpCallback; import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.http.HttpClient; import com.yunbao.common.http.HttpClient;
import com.yunbao.common.utils.DialogUitl; import com.yunbao.common.utils.DialogUitl;
@ -80,7 +79,7 @@ public class LivePlayRyViewHolder extends LiveRoomPlayViewHolder {
private RelativeLayout mPkContainer; private RelativeLayout mPkContainer;
public static TXCloudVideoView mVideoView; public static TXCloudVideoView mVideoView;
private View mLoading,mLoading2; private View mLoading, mLoading2;
private ImageView mCover; private ImageView mCover;
private boolean mPaused;//是否切后台了 private boolean mPaused;//是否切后台了
private boolean mStarted;//是否开始了播放 private boolean mStarted;//是否开始了播放
@ -93,9 +92,9 @@ public class LivePlayRyViewHolder extends LiveRoomPlayViewHolder {
public V2TXLivePlayer mPlayer; public V2TXLivePlayer mPlayer;
public static FrameLayout ry_view; public static FrameLayout ry_view;
private static final int VIDEO_VERTICAL=1;
int screenWidth; // 屏幕宽（像素，如：480px） private static final int VIDEO_HORIZONTAL=2;
int screenHeight; // 屏幕高（像素，如：800p） int videoLandscape; // 视频方向，1=竖屏，2=横屏
static int vHeight;//视频高 static int vHeight;//视频高
@ -325,6 +324,11 @@ public class LivePlayRyViewHolder extends LiveRoomPlayViewHolder {
} }
hideCover(); hideCover();
Log.i(TAG, "onStatisticsUpdate: " + JSON.toJSONString(statistics) + " |当前下载数 : " + OkDownload.getInstance().getTaskMap().size() + buffer); Log.i(TAG, "onStatisticsUpdate: " + JSON.toJSONString(statistics) + " |当前下载数 : " + OkDownload.getInstance().getTaskMap().size() + buffer);
if (statistics.height > statistics.width) {
videoLandscape = VIDEO_VERTICAL;
} else {
videoLandscape = VIDEO_HORIZONTAL;
}
if (statistics.fps == 0) { if (statistics.fps == 0) {
OkDownload.getInstance().pauseAll(); OkDownload.getInstance().pauseAll();
} else { } else {
@ -408,36 +412,55 @@ public class LivePlayRyViewHolder extends LiveRoomPlayViewHolder {
release(); release();
return; return;
} }
int height;
if(videoLandscape==VIDEO_VERTICAL){
height= ViewGroup.LayoutParams.MATCH_PARENT;
}else{
height=DpUtil.dp2px(285);
}
if (landscape == 2) { if (landscape == 2) {
Log.i("收到socket--->", "还原9：16"); Log.i("收到socket--->", "还原9：16");
RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) mVideoView.getLayoutParams(); RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) mVideoView.getLayoutParams();
params.height = RelativeLayout.LayoutParams.MATCH_PARENT; params.height = height;
params.topMargin = 0; params.topMargin = 0;
params.topMargin = mContext.getResources().getDimensionPixelOffset(R.dimen.live_top);
params.addRule(RelativeLayout.ALIGN_TOP);
mVideoView.setLayoutParams(params);
mVideoView.requestLayout(); mVideoView.requestLayout();
RelativeLayout.LayoutParams params1 = (RelativeLayout.LayoutParams) ry_view.getLayoutParams(); RelativeLayout.LayoutParams params1 = (RelativeLayout.LayoutParams) ry_view.getLayoutParams();
params1.height = RelativeLayout.LayoutParams.MATCH_PARENT; params1.height = height;
params1.topMargin = 0; params1.topMargin = 0;
params1.topMargin = mContext.getResources().getDimensionPixelOffset(R.dimen.live_top);
ry_view.setLayoutParams(params1);
ry_view.requestLayout(); ry_view.requestLayout();
RelativeLayout.LayoutParams params2 = (RelativeLayout.LayoutParams) mCover.getLayoutParams(); RelativeLayout.LayoutParams params2 = (RelativeLayout.LayoutParams) mCover.getLayoutParams();
params2.height = RelativeLayout.LayoutParams.MATCH_PARENT; params2.height = height;
params2.topMargin = 0; params2.topMargin = 0;
mCover.setLayoutParams(params2); mCover.setLayoutParams(params2);
mCover.requestLayout(); mCover.requestLayout();
} else { } else {
RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) mVideoView.getLayoutParams(); RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) mVideoView.getLayoutParams();
params.height = vHeight; params.height = height;
params.topMargin = 0;
if(videoLandscape==VIDEO_HORIZONTAL){
params.topMargin = mContext.getResources().getDimensionPixelOffset(R.dimen.live_top); params.topMargin = mContext.getResources().getDimensionPixelOffset(R.dimen.live_top);
}
params.addRule(RelativeLayout.ALIGN_TOP); params.addRule(RelativeLayout.ALIGN_TOP);
mVideoView.setLayoutParams(params);
mVideoView.requestLayout(); mVideoView.requestLayout();
RelativeLayout.LayoutParams params1 = (RelativeLayout.LayoutParams) ry_view.getLayoutParams(); RelativeLayout.LayoutParams params1 = (RelativeLayout.LayoutParams) ry_view.getLayoutParams();
params1.height = vHeight; params1.height = height;
params1.topMargin = mContext.getResources().getDimensionPixelOffset(R.dimen.live_top); params1.topMargin = 0;
params1.addRule(RelativeLayout.ALIGN_TOP); params1.addRule(RelativeLayout.ALIGN_TOP);
if(videoLandscape==VIDEO_HORIZONTAL){
params1.topMargin = mContext.getResources().getDimensionPixelOffset(R.dimen.live_top);
}
ry_view.setLayoutParams(params1);
ry_view.requestLayout(); ry_view.requestLayout();
RelativeLayout.LayoutParams params2 = (RelativeLayout.LayoutParams) mCover.getLayoutParams(); RelativeLayout.LayoutParams params2 = (RelativeLayout.LayoutParams) mCover.getLayoutParams();
params2.height = DpUtil.dp2px(270); params2.height =height;
params2.topMargin = DpUtil.dp2px(120); params2.topMargin = DpUtil.dp2px(120);
mCover.setLayoutParams(params2); mCover.setLayoutParams(params2);
mCover.requestLayout(); mCover.requestLayout();