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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
common/src/main/java/com/yunbao/common/bean/LinkMicUserBean.java
View File

@ -1,29 +1,45 @@
package com.yunbao.common.bean;
import android.text.TextUtils;
import com.google.gson.annotations.SerializedName;
public class LinkMicUserBean extends BaseModel {
@SerializedName("user_nicename")
private String uname;
@SerializedName("id")
private String id;
@SerializedName("avatar")
private String avatar;
@SerializedName("dress_avatar")
private String dress_avatar;
private String uid = "";
private String action;
@SerializedName("id")
private String id;//连麦显示右侧头像时要用
@SerializedName("user_nicename")
private String userNicename;
@SerializedName("uname")
private String uname;
@SerializedName("level")
private int level;
@SerializedName("sex")
private int sex;
@SerializedName("dress_avatar")
private String dressAvatar;
public String getUname() {
return uname;
if (TextUtils.isEmpty(uname)){
return userNicename;
}else {
return uname;
}
}
public void setUname(String uname) {
public LinkMicUserBean setUname(String uname) {
this.uname = uname;
return this;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getAvatar() {
@ -34,28 +50,17 @@ public class LinkMicUserBean extends BaseModel {
this.avatar = avatar;
}
public String getUid() {
return uid;
public String getUserNicename() {
if (TextUtils.isEmpty(uname)){
return userNicename;
}else {
return uname;
}
}
public void setUid(String uid) {
this.uid = uid;
}
public String getAction() {
return action;
}
public void setAction(String action) {
this.action = action;
}
public String getDress_avatar() {
return dress_avatar;
}
public void setDress_avatar(String dress_avatar) {
this.dress_avatar = dress_avatar;
public void setUserNicename(String userNicename) {
this.userNicename = userNicename;
}
public int getLevel() {
@ -74,25 +79,11 @@ public class LinkMicUserBean extends BaseModel {
this.sex = sex;
}
public String getId() {
return id;
public String getDressAvatar() {
return dressAvatar;
}
public void setId(String id) {
this.id = id;
}
@Override
public String toString() {
return "LinkMicUserBean{" +
"uname='" + uname + '\'' +
", avatar='" + avatar + '\'' +
", dress_avatar='" + dress_avatar + '\'' +
", uid='" + uid + '\'' +
", action='" + action + '\'' +
", id='" + id + '\'' +
", level=" + level +
", sex=" + sex +
'}';
public void setDressAvatar(String dressAvatar) {
this.dressAvatar = dressAvatar;
}
}

6
common/src/main/java/com/yunbao/common/http/PDLiveApi.java
View File

@ -163,7 +163,7 @@ public interface PDLiveApi {
* @param num 请求数量
* @return
*/
@GET("/api/public/?service=Home.anchorRecommend ")
@GET("/api/public/?service=Home.anchorRecommend")
Observable<ResponseModel<AnchorRecommendModel>> anchorRecommend(
@Query("num") String num
);
@ -174,7 +174,7 @@ public interface PDLiveApi {
* @param num 请求数量
* @return
*/
@GET("/api/public/?service=Home.anchorRecommend ")
@GET("/api/public/?service=Home.anchorRecommend")
Observable<ResponseModel<AnchorRecommendModel>> anchorRecommend(
@Query("num") String num, @Query("type") String type
);
@ -187,7 +187,7 @@ public interface PDLiveApi {
*/
@GET("/api/public/?service=Live.getLiveInfo")
Observable<ResponseModel<List<LiveInfoModel>>> getLiveInfo(
@Query("liveuid") String liveuid
@Query("liveuid") String liveui
);
/**

7
common/src/main/java/com/yunbao/common/manager/MicedUserManager.java
View File

@ -35,6 +35,7 @@ public class MicedUserManager extends BaseCacheManager {
public void upDataMicUserList(List<LinkMicUserBean> list) {
micUsers.clear();
if (list == null || list.size() < 1) return;
for (LinkMicUserBean linkMicUserBean : list) {
if (!TextUtils.equals(linkMicUserBean.getId(),
@ -44,14 +45,14 @@ public class MicedUserManager extends BaseCacheManager {
UserBean userModel = new UserBean();
UserBean.DressBean dressAvatar = null;
if (!TextUtils.isEmpty(linkMicUserBean.getDress_avatar())) {
if (!TextUtils.isEmpty(linkMicUserBean.getDressAvatar())) {
dressAvatar = new UserBean.DressBean();
dressAvatar.setAvatar_frame(linkMicUserBean.getDress_avatar());
dressAvatar.setAvatar_frame(linkMicUserBean.getDressAvatar());
}
userModel.setAvatar(linkMicUserBean.getAvatar());
userModel.setId(linkMicUserBean.getId());
userModel.setUserNiceName(linkMicUserBean.getUname());
userModel.setUserNiceName(linkMicUserBean.getUserNicename());
userModel.setSex(linkMicUserBean.getSex());
userModel.setDress(dressAvatar);
userModel.setLevel(linkMicUserBean.getLevel());

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) {