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

修改已经连麦列表无名称问题，修改连麦列表覆盖问题

Browse Source
This commit is contained in:
18401019693
2023-11-01 14:07:23 +08:00
parent f1a8cd3a68
commit 9bdee649d8
5 changed files with 64 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1363,13 +1363,13 @@ public class LiveAudienceActivity extends LiveActivity {
manager.lucky100(event.getMsgModel());
break;
case LINK_MIC:
if (!StringUtil.isEmpty(((LinkMicUserBean) event.getObject()).getUid())) {
mMicQueueList.put(((LinkMicUserBean) event.getObject()).getUid(), (LinkMicUserBean) event.getObject());
if (!StringUtil.isEmpty(((LinkMicUserBean) event.getObject()).getId())) {
mMicQueueList.put(((LinkMicUserBean) event.getObject()).getId(), (LinkMicUserBean) event.getObject());
}
if (micListener != null) {
micListener.updateMicList(mMicQueueList);
DialogUitl.showSimpleDialog(mContext,
String.format(mContext.getString(R.string.live_mic_user_apply), ((LinkMicUserBean) event.getObject()).getUname()),
String.format(mContext.getString(R.string.live_mic_user_apply), ((LinkMicUserBean) event.getObject()).getUserNicename()),
new DialogUitl.SimpleCallback() {
@Override
public void onConfirmClick(Dialog dialog, String content) {
@@ -1381,7 +1381,7 @@ public class LiveAudienceActivity extends LiveActivity {
}
break;
case LINK_MIC_CANCEL:
mMicQueueList.remove(((LinkMicUserBean) event.getObject()).getUid());
mMicQueueList.remove(((LinkMicUserBean) event.getObject()).getId());
if (micListener != null) {
micListener.updateMicList(mMicQueueList);
}
@@ -1390,8 +1390,8 @@ public class LiveAudienceActivity extends LiveActivity {
List<LinkMicUserBean> list = (List<LinkMicUserBean>) event.getObject();
mMicQueueList.clear();
for (LinkMicUserBean bean : list) {
if (!StringUtil.isEmpty(bean.getUid())) {
mMicQueueList.put(bean.getUid(), bean);
if (!StringUtil.isEmpty(bean.getId())) {
mMicQueueList.put(bean.getId(), bean);
}
}
if (micListener != null) {

18
live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java
View File

@@ -63,6 +63,8 @@ import com.yunbao.common.http.LiveHttpUtil;
import com.yunbao.common.http.live.LiveNetManager;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.manager.IMRTCManager;
import com.yunbao.common.manager.MicUserManager;
import com.yunbao.common.manager.MicedUserManager;
import com.yunbao.common.manager.RandomPkManager;
import com.yunbao.common.utils.BitmapUtil;
import com.yunbao.common.utils.Bus;
@@ -861,6 +863,8 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
mGameList = JSON.parseArray(obj.getString("game_switch"), Integer.class);
}
getAiRobotStatus();
MicedUserManager.get().removeAllMicUserList();
MicUserManager.get().removeAllMicUserList();
}
/**
@@ -870,6 +874,8 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
DialogUitl.showSimpleDialog(mContext, mContext.getString(R.string.live_end_live), new DialogUitl.SimpleCallback() {
@Override
public void onConfirmClick(Dialog dialog, String content) {
MicedUserManager.get().removeAllMicUserList();
MicUserManager.get().removeAllMicUserList();
PKing = false;
isDRPK = 0;
endLive();
@@ -1565,13 +1571,13 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
}
break;
case LINK_MIC:
if (!StringUtil.isEmpty(((LinkMicUserBean) event.getObject()).getUid())) {
mMicQueueList.put(((LinkMicUserBean) event.getObject()).getUid(), (LinkMicUserBean) event.getObject());
if (!StringUtil.isEmpty(((LinkMicUserBean) event.getObject()).getId())) {
mMicQueueList.put(((LinkMicUserBean) event.getObject()).getId(), (LinkMicUserBean) event.getObject());
}
if (micListener != null) {
micListener.updateMicList(mMicQueueList);
DialogUitl.showSimpleDialog(mContext,
String.format(mContext.getString(R.string.live_mic_user_apply), ((LinkMicUserBean) event.getObject()).getUname()),
String.format(mContext.getString(R.string.live_mic_user_apply), ((LinkMicUserBean) event.getObject()).getUserNicename()),
new DialogUitl.SimpleCallback() {
@Override
public void onConfirmClick(Dialog dialog, String content) {
@@ -1583,7 +1589,7 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
}
break;
case LINK_MIC_CANCEL:
mMicQueueList.remove(((LinkMicUserBean) event.getObject()).getUid());
mMicQueueList.remove(((LinkMicUserBean) event.getObject()).getId());
if (micListener != null) {
micListener.updateMicList(mMicQueueList);
}
@@ -1592,8 +1598,8 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
List<LinkMicUserBean> list = (List<LinkMicUserBean>) event.getObject();
mMicQueueList.clear();
for (LinkMicUserBean bean : list) {
if (!StringUtil.isEmpty(bean.getUid())) {
mMicQueueList.put(bean.getUid(), bean);
if (!StringUtil.isEmpty(bean.getId())) {
mMicQueueList.put(bean.getId(), bean);
}
}
if (micListener != null) {