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

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")
+    @SerializedName("user_nicename")
-    private String dress_avatar;
+    private String userNicename;
-    private String uid = "";
+    @SerializedName("uname")
-    private String action;
+    private String uname;
-    @SerializedName("id")
-    private String id;//连麦显示右侧头像时要用
     @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() {
+    public String getUserNicename() {
-        return uid;
+        if (TextUtils.isEmpty(uname)){
+            return userNicename;
+        }else {
+            return uname;
+        }
+
     }
 
-    public void setUid(String uid) {
+    public void setUserNicename(String userNicename) {
-        this.uid = uid;
+        this.userNicename = userNicename;
-    }
-
-    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 int getLevel() {
@@ -74,25 +79,11 @@ public class LinkMicUserBean extends BaseModel {
         this.sex = sex;
     }
 
-    public String getId() {
+    public String getDressAvatar() {
-        return id;
+        return dressAvatar;
     }
 
-    public void setId(String id) {
+    public void setDressAvatar(String dressAvatar) {
-        this.id = id;
+        this.dressAvatar = dressAvatar;
-    }
-
-    @Override
-    public String toString() {
-        return "LinkMicUserBean{" +
-                "uname='" + uname + '\'' +
-                ", avatar='" + avatar + '\'' +
-                ", dress_avatar='" + dress_avatar + '\'' +
-                ", uid='" + uid + '\'' +
-                ", action='" + action + '\'' +
-                ", id='" + id + '\'' +
-                ", level=" + level +
-                ", sex=" + sex +
-                '}';
     }
 }

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<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
     );
 
     /**

common/src/main/java/com/yunbao/common/manager/MicedUserManager.java

@@ -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());

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())) {
+                if (!StringUtil.isEmpty(((LinkMicUserBean) event.getObject()).getId())) {
-                    mMicQueueList.put(((LinkMicUserBean) event.getObject()).getUid(), (LinkMicUserBean) event.getObject());
+                    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())) {
+                    if (!StringUtil.isEmpty(bean.getId())) {
-                        mMicQueueList.put(bean.getUid(), bean);
+                        mMicQueueList.put(bean.getId(), bean);
                     }
                 }
                 if (micListener != null) {

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())) {
+                if (!StringUtil.isEmpty(((LinkMicUserBean) event.getObject()).getId())) {
-                    mMicQueueList.put(((LinkMicUserBean) event.getObject()).getUid(), (LinkMicUserBean) event.getObject());
+                    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())) {
+                    if (!StringUtil.isEmpty(bean.getId())) {
-                        mMicQueueList.put(bean.getUid(), bean);
+                        mMicQueueList.put(bean.getId(), bean);
                     }
                 }
                 if (micListener != null) {