视频流相关横屏修改

This commit is contained in:
ningwenqiang 2024-08-22 13:52:00 +08:00
parent 6e7d27cbc3
commit 1df8d443f7
9 changed files with 208 additions and 86 deletions

View File

@ -43,6 +43,11 @@ public abstract class AbsViewHolder implements LifeCycleListener {
} }
public void onConfigureChange() {
//如果 mParentView
}
protected abstract int getLayoutId(); protected abstract int getLayoutId();
public abstract void init(); public abstract void init();

View File

@ -24,6 +24,6 @@ android.nonTransitiveRClass=false
systemProp.http.proxyHost=127.0.0.1 systemProp.http.proxyHost=127.0.0.1
systemProp.https.proxyHost=127.0.0.1 systemProp.https.proxyHost=127.0.0.1
systemProp.https.proxyPort=7890 systemProp.https.proxyPort=9098
systemProp.http.proxyPort=7890 systemProp.http.proxyPort=9098
#android.enableR8.fullMode=true #android.enableR8.fullMode=true

View File

@ -188,7 +188,7 @@ public class SWAuManager extends BaseCacheManager {
// 创建一个 TextureView 对象并将其作为 FrameLayout 的子对象 // 创建一个 TextureView 对象并将其作为 FrameLayout 的子对象
TextureView surfaceView = new TextureView(mContext); TextureView surfaceView = new TextureView(mContext);
audienceContainer.addView(surfaceView); audienceContainer.addView(surfaceView);
Log.i("nwq"," audienceContainer.getChildCount()"+ audienceContainer.getChildCount());
// 启用视频模块 // 启用视频模块
mRtcEngine.enableVideo(); mRtcEngine.enableVideo();

View File

@ -291,9 +291,6 @@ public class LiveAudienceActivity extends LiveActivity {
}; };
/** /**
* 初始化界面 * 初始化界面
*/ */
@ -911,11 +908,21 @@ public class LiveAudienceActivity extends LiveActivity {
@Override @Override
public void onConfigurationChanged(@NonNull Configuration newConfig) { public void onConfigurationChanged(@NonNull Configuration newConfig) {
super.onConfigurationChanged(newConfig); super.onConfigurationChanged(newConfig);
Log.i(TAG,"onConfigurationChanged"); Log.i(TAG, "onConfigurationChanged");
adjustFullScreen(newConfig); adjustFullScreen(newConfig);
liveHandler.post(liveRunnable);
onConfigurationChangedView(newConfig);
} }
public void onConfigurationChangedView( Configuration newConfig) {
if (manager != null && manager.getRootView() != null && mLiveBean != null && mViewGroup != null) {
manager.onConfigurationChanged(newConfig);
manager.onAdd(mLiveBean, mLiveType, mLiveTypeVal, mLiveSDK, isSw);
}
}
private void adjustFullScreen(Configuration config) { private void adjustFullScreen(Configuration config) {
final WindowInsetsControllerCompat insetsController = ViewCompat.getWindowInsetsController(getWindow().getDecorView()); final WindowInsetsControllerCompat insetsController = ViewCompat.getWindowInsetsController(getWindow().getDecorView());
if (insetsController == null) return; if (insetsController == null) return;
@ -1897,9 +1904,9 @@ public class LiveAudienceActivity extends LiveActivity {
if (manager == null || manager.mLiveAudienceViewHolder == null || manager.mLiveAudienceViewHolder.mRedPoint == null) { if (manager == null || manager.mLiveAudienceViewHolder == null || manager.mLiveAudienceViewHolder.mRedPoint == null) {
return; return;
} }
if(event.getNumber()>0){ if (event.getNumber() > 0) {
manager.mLiveAudienceViewHolder.mRedPoint.setVisibility(View.VISIBLE); manager.mLiveAudienceViewHolder.mRedPoint.setVisibility(View.VISIBLE);
}else{ } else {
manager.mLiveAudienceViewHolder.mRedPoint.setVisibility(View.GONE); manager.mLiveAudienceViewHolder.mRedPoint.setVisibility(View.GONE);
} }

View File

@ -5,6 +5,7 @@ import android.Manifest;
import android.app.Activity; import android.app.Activity;
import android.app.Dialog; import android.app.Dialog;
import android.content.Context; import android.content.Context;
import android.content.res.Configuration;
import android.graphics.Color; import android.graphics.Color;
import android.media.AudioManager; import android.media.AudioManager;
import android.os.Build; import android.os.Build;
@ -135,6 +136,10 @@ public class LivePlaySwViewHolder extends LiveRoomPlayViewHolder {
return landscape; return landscape;
} }
private boolean isPhysicalScreenVertical() {
return contexts.getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT;
}
public LivePlaySwViewHolder(Context context, ViewGroup parentView, int landscapes) { public LivePlaySwViewHolder(Context context, ViewGroup parentView, int landscapes) {
super(context, parentView); super(context, parentView);
contexts = context; contexts = context;
@ -183,6 +188,54 @@ public class LivePlaySwViewHolder extends LiveRoomPlayViewHolder {
dr_pk_view.setVisibility(View.GONE); dr_pk_view.setVisibility(View.GONE);
} }
public void onConfigureChange() {
if (contexts == null) {
return;
}
//如果mContentView有父类则移除
if (mContentView != null && mContentView.getParent() != null) {
((ViewGroup) mContentView.getParent()).removeView(mContentView);
}
//这里考虑只通过修改参数的方式实现
if (isPhysicalScreenVertical()) {
RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) mPkContainer.getLayoutParams();
params.height = DpUtil.dp2px(280);
params.topMargin = DpUtil.dp2px(130);
mPkContainer.setLayoutParams(params);
if (mPkContainer.getVisibility() == View.VISIBLE) {
mPkContainer.requestLayout();
}
params = (RelativeLayout.LayoutParams) dr_pk_view.getLayoutParams();
params.height = DpUtil.dp2px(280);
params.topMargin = DpUtil.dp2px(130);
dr_pk_view.setLayoutParams(params);
if (dr_pk_view.getVisibility() == View.VISIBLE) {
dr_pk_view.requestLayout();
}
} else {
RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) mPkContainer.getLayoutParams();
params.height = ViewGroup.LayoutParams.MATCH_PARENT;
params.topMargin = 0;
mPkContainer.setLayoutParams(params);
if (mPkContainer.getVisibility() == View.VISIBLE) {
mPkContainer.requestLayout();
}
params = (RelativeLayout.LayoutParams) dr_pk_view.getLayoutParams();
params.height = ViewGroup.LayoutParams.MATCH_PARENT;
params.topMargin = 0;
dr_pk_view.setLayoutParams(params);
if (dr_pk_view.getVisibility() == View.VISIBLE) {
dr_pk_view.requestLayout();
}
}
}
public void initSwEngine(String liveUid) { public void initSwEngine(String liveUid) {
dr_pk_view.setVisibility(View.GONE); dr_pk_view.setVisibility(View.GONE);
this.liveUid = liveUid; this.liveUid = liveUid;
@ -224,7 +277,6 @@ public class LivePlaySwViewHolder extends LiveRoomPlayViewHolder {
@Override @Override
public void onSuccess(io.rong.imlib.model.Message message) { public void onSuccess(io.rong.imlib.model.Message message) {
Log.e("ry", "发送成功"); Log.e("ry", "发送成功");
IMCenter.getInstance().deleteRemoteMessages(Conversation.ConversationType.PRIVATE, message.getTargetId(), new Message[]{message}, null); IMCenter.getInstance().deleteRemoteMessages(Conversation.ConversationType.PRIVATE, message.getTargetId(), new Message[]{message}, null);
IMCenter.getInstance().clearMessagesUnreadStatus(Conversation.ConversationType.PRIVATE, message.getTargetId(), null); IMCenter.getInstance().clearMessagesUnreadStatus(Conversation.ConversationType.PRIVATE, message.getTargetId(), null);
MicedUserManager.get().removeMiscUser(CommonAppConfig.getInstance().getUid()); MicedUserManager.get().removeMiscUser(CommonAppConfig.getInstance().getUid());
@ -464,8 +516,49 @@ public class LivePlaySwViewHolder extends LiveRoomPlayViewHolder {
Log.i(TAG, "setLiveBeanLandscape: " + landscape + " isPk: " + isPk); Log.i(TAG, "setLiveBeanLandscape: " + landscape + " isPk: " + isPk);
this.landscape = landscape; this.landscape = landscape;
this.videoLandscape = landscape; this.videoLandscape = landscape;
if (landscape == 2) { if (isPhysicalScreenVertical()) {
Log.i(TAG, "还原916"); if (landscape == 2) {
Log.i(TAG, "还原916");
RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) ry_view.getLayoutParams();
params.height = RelativeLayout.LayoutParams.MATCH_PARENT;
params.topMargin = 0;
ry_view.setLayoutParams(params);
ry_view.requestLayout();
/* RelativeLayout.LayoutParams params1 = (RelativeLayout.LayoutParams) ry_view.getLayoutParams();
params1.height = RelativeLayout.LayoutParams.MATCH_PARENT;
params1.topMargin = 0;
ry_view.setLayoutParams(params1);
ry_view.requestLayout();*/
RelativeLayout.LayoutParams params2 = (RelativeLayout.LayoutParams) mCover.getLayoutParams();
params2.height = RelativeLayout.LayoutParams.MATCH_PARENT;
params2.topMargin = 0;
mCover.setLayoutParams(params2);
mCover.requestLayout();
} else {
Log.i(TAG, "还原16:9");
RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) ry_view.getLayoutParams();
params.height = vHeight;
params.topMargin = mContext.getResources().getDimensionPixelOffset(R.dimen.live_top);
params.addRule(RelativeLayout.ALIGN_TOP);
ry_view.setLayoutParams(params);
ry_view.requestLayout();
/*RelativeLayout.LayoutParams params1 = (RelativeLayout.LayoutParams) ry_view.getLayoutParams();
params1.height = vHeight;
params1.topMargin = mContext.getResources().getDimensionPixelOffset(R.dimen.live_top);
params1.addRule(RelativeLayout.ALIGN_TOP);
ry_view.setLayoutParams(params1);
ry_view.requestLayout();*/
RelativeLayout.LayoutParams params2 = (RelativeLayout.LayoutParams) mCover.getLayoutParams();
params2.height = DpUtil.dp2px(270);
params2.topMargin = DpUtil.dp2px(120);
mCover.setLayoutParams(params2);
mCover.requestLayout();
}
} else {
Log.i(TAG, "还原横屏 169");
RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) ry_view.getLayoutParams(); RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) ry_view.getLayoutParams();
params.height = RelativeLayout.LayoutParams.MATCH_PARENT; params.height = RelativeLayout.LayoutParams.MATCH_PARENT;
params.topMargin = 0; params.topMargin = 0;
@ -482,27 +575,6 @@ public class LivePlaySwViewHolder extends LiveRoomPlayViewHolder {
params2.topMargin = 0; params2.topMargin = 0;
mCover.setLayoutParams(params2); mCover.setLayoutParams(params2);
mCover.requestLayout(); mCover.requestLayout();
} else {
Log.i(TAG, "还原16:9");
RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) ry_view.getLayoutParams();
params.height = vHeight;
params.topMargin = mContext.getResources().getDimensionPixelOffset(R.dimen.live_top);
params.addRule(RelativeLayout.ALIGN_TOP);
ry_view.setLayoutParams(params);
ry_view.requestLayout();
/*RelativeLayout.LayoutParams params1 = (RelativeLayout.LayoutParams) ry_view.getLayoutParams();
params1.height = vHeight;
params1.topMargin = mContext.getResources().getDimensionPixelOffset(R.dimen.live_top);
params1.addRule(RelativeLayout.ALIGN_TOP);
ry_view.setLayoutParams(params1);
ry_view.requestLayout();*/
RelativeLayout.LayoutParams params2 = (RelativeLayout.LayoutParams) mCover.getLayoutParams();
params2.height = DpUtil.dp2px(270);
params2.topMargin = DpUtil.dp2px(120);
mCover.setLayoutParams(params2);
mCover.requestLayout();
} }
} }
@ -618,7 +690,7 @@ public class LivePlaySwViewHolder extends LiveRoomPlayViewHolder {
params1.topMargin = mContext.getResources().getDimensionPixelOffset(R.dimen.live_top); params1.topMargin = mContext.getResources().getDimensionPixelOffset(R.dimen.live_top);
params1.addRule(RelativeLayout.ALIGN_TOP); params1.addRule(RelativeLayout.ALIGN_TOP);
ry_view.setLayoutParams(params1); 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 = DpUtil.dp2px(270);
params2.topMargin = DpUtil.dp2px(120); params2.topMargin = DpUtil.dp2px(120);
@ -664,11 +736,12 @@ public class LivePlaySwViewHolder extends LiveRoomPlayViewHolder {
Log.e("PK状态", "" + i); Log.e("PK状态", "" + i);
/*RelativeLayout.LayoutParams params1 = (RelativeLayout.LayoutParams) ry_view.getLayoutParams(); /*
RelativeLayout.LayoutParams params1 = (RelativeLayout.LayoutParams) ry_view.getLayoutParams();
params1.height = vHeight; params1.height = vHeight;
params1.topMargin = contexts.getResources().getDimensionPixelOffset(R.dimen.live_top); params1.topMargin = contexts.getResources().getDimensionPixelOffset(R.dimen.live_top);
params1.addRule(RelativeLayout.ALIGN_TOP); params1.addRule(RelativeLayout.ALIGN_TOP);
ry_view.requestLayout();*/ ry_view.requestLayout(); */
isPk = true; isPk = true;
} }
@ -682,41 +755,42 @@ public class LivePlaySwViewHolder extends LiveRoomPlayViewHolder {
return; return;
} }
int height; int height;
if (videoLandscape == VIDEO_VERTICAL) { if (isPhysicalScreenVertical()) {
height = ViewGroup.LayoutParams.MATCH_PARENT; if (videoLandscape == VIDEO_VERTICAL) {
} else { height = ViewGroup.LayoutParams.MATCH_PARENT;
height = ViewGroup.LayoutParams.WRAP_CONTENT; } else {
} height = ViewGroup.LayoutParams.WRAP_CONTENT;
if (landscape == 2) { }
Log.i(TAG, "onPrepared:还原916 land=" + videoLandscape); if (landscape == 2) {
RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) mVideoView.getLayoutParams(); Log.i(TAG, "onPrepared:还原916 land=" + videoLandscape);
params.height = height; RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) mVideoView.getLayoutParams();
params.topMargin = 0; params.height = height;
params.addRule(RelativeLayout.ALIGN_TOP); params.topMargin = 0;
mVideoView.setLayoutParams(params); params.addRule(RelativeLayout.ALIGN_TOP);
mVideoView.requestLayout(); mVideoView.setLayoutParams(params);
mVideoView.requestLayout();
/*RelativeLayout.LayoutParams params1 = (RelativeLayout.LayoutParams) ry_view.getLayoutParams(); /*RelativeLayout.LayoutParams params1 = (RelativeLayout.LayoutParams) ry_view.getLayoutParams();
params1.height = height; params1.height = height;
params1.topMargin = 0; params1.topMargin = 0;
ry_view.setLayoutParams(params1); 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 = height; params2.height = height;
params2.topMargin = 0; params2.topMargin = 0;
mCover.setLayoutParams(params2); mCover.setLayoutParams(params2);
mCover.requestLayout(); mCover.requestLayout();
} else { } else {
Log.i(TAG, "onPrepared:还原169"); Log.i(TAG, "onPrepared:还原169");
RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) mVideoView.getLayoutParams(); RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) mVideoView.getLayoutParams();
params.height = height; params.height = height;
params.topMargin = 0; params.topMargin = 0;
if (videoLandscape == VIDEO_HORIZONTAL) { 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.setLayoutParams(params);
mVideoView.requestLayout(); mVideoView.requestLayout();
/*RelativeLayout.LayoutParams params1 = (RelativeLayout.LayoutParams) ry_view.getLayoutParams(); /*RelativeLayout.LayoutParams params1 = (RelativeLayout.LayoutParams) ry_view.getLayoutParams();
params1.height = height; params1.height = height;
@ -727,9 +801,24 @@ public class LivePlaySwViewHolder extends LiveRoomPlayViewHolder {
} }
ry_view.setLayoutParams(params1); ry_view.setLayoutParams(params1);
ry_view.requestLayout();*/ ry_view.requestLayout();*/
RelativeLayout.LayoutParams params2 = (RelativeLayout.LayoutParams) mCover.getLayoutParams();
params2.height = height;
params2.topMargin = DpUtil.dp2px(120);
mCover.setLayoutParams(params2);
mCover.requestLayout();
}
} else {
Log.i(TAG, " onPrepared:还原横屏169 land=" + videoLandscape);
RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) mVideoView.getLayoutParams();
params.height = ViewGroup.LayoutParams.MATCH_PARENT;
params.topMargin = 0;
params.addRule(RelativeLayout.ALIGN_TOP);
mVideoView.setLayoutParams(params);
mVideoView.requestLayout();
RelativeLayout.LayoutParams params2 = (RelativeLayout.LayoutParams) mCover.getLayoutParams(); RelativeLayout.LayoutParams params2 = (RelativeLayout.LayoutParams) mCover.getLayoutParams();
params2.height = height; params2.height = ViewGroup.LayoutParams.MATCH_PARENT;
params2.topMargin = DpUtil.dp2px(120); params2.topMargin = 0;
mCover.setLayoutParams(params2); mCover.setLayoutParams(params2);
mCover.requestLayout(); mCover.requestLayout();
} }
@ -802,7 +891,6 @@ public class LivePlaySwViewHolder extends LiveRoomPlayViewHolder {
@Override @Override
public void changeToLeft() { public void changeToLeft() {
if (mVideoView != null) { if (mVideoView != null) {
RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) mVideoView.getLayoutParams(); RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) mVideoView.getLayoutParams();
params.height = vHeight; params.height = vHeight;
// params.height = mContext.getResources().getDimensionPixelOffset(R.dimen.live_view); // params.height = mContext.getResources().getDimensionPixelOffset(R.dimen.live_view);

View File

@ -5,6 +5,7 @@ import static com.yunbao.live.bean.LiveChatBean.RECOMMEND_CARD_NOTIFY;
import android.app.Activity; import android.app.Activity;
import android.app.Dialog; import android.app.Dialog;
import android.content.Context; import android.content.Context;
import android.content.res.Configuration;
import android.graphics.Outline; import android.graphics.Outline;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Bundle; import android.os.Bundle;
@ -1000,8 +1001,10 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
} }
}).into(dr_pk_end_gif); }).into(dr_pk_end_gif);
} }
}
private boolean isPorit(){
return true;
} }
public static void UpPkBar(JSONArray obj, String uid, int time) { public static void UpPkBar(JSONArray obj, String uid, int time) {
@ -1175,6 +1178,10 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
} }
private boolean isPortrait(Context context){
return context.getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT;
}
@Override @Override
public void init() { public void init() {
@ -1412,17 +1419,27 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
gif_view = (LinearLayout) findViewById(R.id.gif_view); gif_view = (LinearLayout) findViewById(R.id.gif_view);
chat_view = (RelativeLayout) findViewById(R.id.chat_view); chat_view = (RelativeLayout) findViewById(R.id.chat_view);
int topMargin = mScreenWdith * 720 / 960 + 210; if(isPortrait(mContentView.getContext())){
RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) chat_view.getLayoutParams(); int topMargin = mScreenWdith * 720 / 960 + 210;
params.topMargin = topMargin; RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) chat_view.getLayoutParams();
chat_view.setLayoutParams(params); params.topMargin = topMargin;
chat_view.setLayoutParams(params);
RelativeLayout.LayoutParams msgLayoutLayoutParams = (RelativeLayout.LayoutParams) msgLayout.getLayoutParams();
msgLayoutLayoutParams.topMargin = topMargin + DpUtil.dp2px(50);
msgLayout.setLayoutParams(msgLayoutLayoutParams);
voteManager.setMarginPosition(topMargin + DpUtil.dp2px(50));
}else {
int topMargin = mScreenWdith * 190 / 960 ;
RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) chat_view.getLayoutParams();
params.topMargin = topMargin;
chat_view.setLayoutParams(params);
RelativeLayout.LayoutParams msgLayoutLayoutParams = (RelativeLayout.LayoutParams) msgLayout.getLayoutParams();
msgLayoutLayoutParams.topMargin = topMargin + DpUtil.dp2px(50);
msgLayout.setLayoutParams(msgLayoutLayoutParams);
voteManager.setMarginPosition(topMargin + DpUtil.dp2px(50));
}
RelativeLayout.LayoutParams msgLayoutLayoutParams = (RelativeLayout.LayoutParams) msgLayout.getLayoutParams();
msgLayoutLayoutParams.topMargin = topMargin + DpUtil.dp2px(50);
msgLayout.setLayoutParams(msgLayoutLayoutParams);
voteManager.setMarginPosition(topMargin + DpUtil.dp2px(50));
RelativeLayout.LayoutParams params1 = (RelativeLayout.LayoutParams) mChatRecyclerView.getLayoutParams(); RelativeLayout.LayoutParams params1 = (RelativeLayout.LayoutParams) mChatRecyclerView.getLayoutParams();
params1.topMargin = DpUtil.dp2px(65); params1.topMargin = DpUtil.dp2px(65);
mChatRecyclerView.setLayoutParams(params1); mChatRecyclerView.setLayoutParams(params1);

View File

@ -520,6 +520,11 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
} }
}; };
//屏幕方向改变
public void onConfigureChange() {
}
/** /**
* 新进入房间接口 * 新进入房间接口
*/ */
@ -1125,7 +1130,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
@Override @Override
public void onConfigurationChanged(Configuration newConfig) { public void onConfigurationChanged(Configuration newConfig) {
mLivePlayViewHolder.onConfigureChange();
} }
@Override @Override

View File

@ -18,7 +18,7 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="300dp" android:layout_height="match_parent"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:orientation="horizontal"> android:orientation="horizontal">
@ -31,7 +31,6 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" /> android:layout_weight="1" />
</LinearLayout> </LinearLayout>
@ -47,8 +46,7 @@
<FrameLayout <FrameLayout
android:id="@+id/pk_container" android:id="@+id/pk_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="280dp" android:layout_height="match_parent">
android:layout_marginTop="130dp">
<com.yunbao.live.custom.MyFrameLayout4 <com.yunbao.live.custom.MyFrameLayout4
android:id="@+id/left_container" android:id="@+id/left_container"
@ -64,12 +62,13 @@
android:layout_marginBottom="20dp" /> android:layout_marginBottom="20dp" />
</FrameLayout> </FrameLayout>
<LinearLayout <LinearLayout
android:id="@+id/dr_pk_view" android:id="@+id/dr_pk_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="280dp" android:layout_height="match_parent"
android:layout_marginTop="130dp"
android:orientation="horizontal" android:orientation="horizontal"
tools:visibility="visible"
android:visibility="gone"> android:visibility="gone">
<LinearLayout <LinearLayout

View File

@ -194,6 +194,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_marginTop="170dp" android:layout_marginTop="170dp"
android:layout_marginEnd="380dp"
android:overScrollMode="never" android:overScrollMode="never"
android:scrollbars="none" /> android:scrollbars="none" />