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

修复【在连麦中可以通过全屏广播跳转】

Browse Source
This commit is contained in:
zlzw 2022-11-29 14:37:50 +08:00
parent afd4cb6e41
commit 030fdb6ad0
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
View File

@ -982,6 +982,10 @@ public class LiveAudienceActivity extends LiveActivity {
if (event.getMicIng() == 1) { if (event.getMicIng() == 1) {
manager.micIngTypeOne(event.getBean(), event.getLiveType(), event.getLiveTypeVal()); manager.micIngTypeOne(event.getBean(), event.getLiveType(), event.getLiveTypeVal());
} else if (event.getMicIng() == 2) { } else if (event.getMicIng() == 2) {
if (MicStatusManager.getInstance().getMicStatus() == MicStatusManager.MIC_TYPE_OPEN) {
MicStatusManager.getInstance().showDownMicDialog(mContext);
return;
}
manager.micIngTypeTwo(event.getBean(), event.getLiveType(), event.getLiveTypeVal()); manager.micIngTypeTwo(event.getBean(), event.getLiveType(), event.getLiveTypeVal());
} else { } else {
//获取房间连麦状态 //获取房间连麦状态

9
live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
View File

@ -268,8 +268,8 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
mLivePlayViewHolder.setOnMicCallback(new LiveRoomPlayViewHolder.OnMicCallback() { mLivePlayViewHolder.setOnMicCallback(new LiveRoomPlayViewHolder.OnMicCallback() {
@Override @Override
public void onMikUpdate() { public void onMikUpdate() {
if(mContext instanceof LiveActivity) { if (mContext instanceof LiveActivity) {
((LiveActivity) mContext).showMicList(mLiveBean.getUid(),mLiveRoomViewHolder); ((LiveActivity) mContext).showMicList(mLiveBean.getUid(), mLiveRoomViewHolder);
} }
} }
}); });
@ -520,13 +520,12 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
mLiveRoomViewHolder.showLiveRoomActivityBanner(); mLiveRoomViewHolder.showLiveRoomActivityBanner();
} }
}); });
if(mContext instanceof LiveActivity) { if (mContext instanceof LiveActivity) {
((LiveActivity) mContext).showMicList(mLiveBean.getUid(),mLiveRoomViewHolder); ((LiveActivity) mContext).showMicList(mLiveBean.getUid(), mLiveRoomViewHolder);
} }
} }
public void removeLiveEnd() { public void removeLiveEnd() {
if (mLiveAudienceViewHolder != null) { if (mLiveAudienceViewHolder != null) {