From 9bdee649d846a41089cc0fa6eef33ac4b515fc2e Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Wed, 1 Nov 2023 14:07:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=BB=8F=E8=BF=9E?= =?UTF-8?q?=E9=BA=A6=E5=88=97=E8=A1=A8=E6=97=A0=E5=90=8D=E7=A7=B0=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=BF=9E=E9=BA=A6=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E8=A6=86=E7=9B=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yunbao/common/bean/LinkMicUserBean.java | 87 +++++++++---------- .../com/yunbao/common/http/PDLiveApi.java | 6 +- .../common/manager/MicedUserManager.java | 7 +- .../live/activity/LiveAudienceActivity.java | 12 +-- .../live/activity/LiveRyAnchorActivity.java | 18 ++-- 5 files changed, 64 insertions(+), 66 deletions(-) diff --git a/common/src/main/java/com/yunbao/common/bean/LinkMicUserBean.java b/common/src/main/java/com/yunbao/common/bean/LinkMicUserBean.java index 820dc6062..cf00fc1f9 100644 --- a/common/src/main/java/com/yunbao/common/bean/LinkMicUserBean.java +++ b/common/src/main/java/com/yunbao/common/bean/LinkMicUserBean.java @@ -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; } } diff --git a/common/src/main/java/com/yunbao/common/http/PDLiveApi.java b/common/src/main/java/com/yunbao/common/http/PDLiveApi.java index 3becaf66b..bc5956876 100644 --- a/common/src/main/java/com/yunbao/common/http/PDLiveApi.java +++ b/common/src/main/java/com/yunbao/common/http/PDLiveApi.java @@ -163,7 +163,7 @@ public interface PDLiveApi { * @param num 请求数量 * @return */ - @GET("/api/public/?service=Home.anchorRecommend ") + @GET("/api/public/?service=Home.anchorRecommend") Observable> 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> anchorRecommend( @Query("num") String num, @Query("type") String type ); @@ -187,7 +187,7 @@ public interface PDLiveApi { */ @GET("/api/public/?service=Live.getLiveInfo") Observable>> getLiveInfo( - @Query("liveuid") String liveuid + @Query("liveuid") String liveui ); /** diff --git a/common/src/main/java/com/yunbao/common/manager/MicedUserManager.java b/common/src/main/java/com/yunbao/common/manager/MicedUserManager.java index fa885e2da..989e179ee 100644 --- a/common/src/main/java/com/yunbao/common/manager/MicedUserManager.java +++ b/common/src/main/java/com/yunbao/common/manager/MicedUserManager.java @@ -35,6 +35,7 @@ public class MicedUserManager extends BaseCacheManager { public void upDataMicUserList(List 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()); diff --git a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java index 092d9c4e6..e8938f074 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java @@ -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 list = (List) 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) { diff --git a/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java index a85fad741..b626f6e85 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java @@ -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 list = (List) 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) {