From 1bbb464cf59488ec46c327edb46a03eb1a75e37f Mon Sep 17 00:00:00 2001
From: huangjian <huangjian@xuanyinyy.com>
Date: Tue, 19 Jan 2021 14:35:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=8ARoomQueueInfo=E4=B8=AD=E6=9C=AC?=
 =?UTF-8?q?=E5=B1=9E=E4=BA=8EMicMemberInfo=E7=9A=84=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=94=BE=E5=9B=9E=E5=8E=BB=E4=BA=86...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../avroom/adapter/BaseMicroViewAdapter.java  |  2 +-
 .../avroom/adapter/KtvMicroViewAdapter.java   | 11 ++++++----
 .../avroom/adapter/MicroViewAdapter.java      | 22 ++++++++++++-------
 .../avroom/dialog/PKSelectPeopleDialog.java   |  2 +-
 .../yizhuan/erban/ui/widget/GiftDialog.java   |  2 +-
 .../manager/IMNetEaseManager.java             | 10 +++------
 .../bean/RoomQueueInfo.java                   |  9 --------
 .../room/model/RoomBaseModel.java             | 22 ++++---------------
 .../room/pk/model/PkModel.java                | 12 +++++-----
 .../room/queue/bean/MicMemberInfo.java        |  6 +++++
 gradle.properties                             |  4 ++--
 11 files changed, 45 insertions(+), 57 deletions(-)

diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/BaseMicroViewAdapter.java b/app/src/main/java/com/yizhuan/erban/avroom/adapter/BaseMicroViewAdapter.java
index 9bdbc26ed..829fc4bf9 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/BaseMicroViewAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/adapter/BaseMicroViewAdapter.java
@@ -177,7 +177,7 @@ public abstract class BaseMicroViewAdapter extends RecyclerView.Adapter<Recycler
 //                                info.gender == 1 ? R.color.color_male_16AEFD : R.color.color_female_FE3F77);
 //                        ViewAdapter.setViewBackground(tvNick, nickBgColor, 50, 0, 0);
 //                    }
-                    setSelectText(position, chatRoomMember.getNick(), info.gender);
+                    setSelectText(position, chatRoomMember.getNick(), chatRoomMember.getGender());
                     ImageLoadUtils.loadAvatar(BasicConfig.INSTANCE.getAppContext(), chatRoomMember.getAvatar(), ivAvatar);
                     // 加载贵族
                     updateNobleView(chatRoomMember);
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/KtvMicroViewAdapter.java b/app/src/main/java/com/yizhuan/erban/avroom/adapter/KtvMicroViewAdapter.java
index 6841eed32..b43401275 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/KtvMicroViewAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/adapter/KtvMicroViewAdapter.java
@@ -1,9 +1,11 @@
 package com.yizhuan.erban.avroom.adapter;
 
 import android.content.Context;
+
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -98,6 +100,7 @@ public class KtvMicroViewAdapter extends BaseMicroViewAdapter {
         ImageView ivSinger;
         TextView tvPkMark;
         boolean mIsBoss;
+
         KtvMicroViewHolder(View itemView, boolean isBoss) {
             super(itemView);
             ivSinger = itemView.findViewById(R.id.iv_singer);
@@ -136,8 +139,8 @@ public class KtvMicroViewAdapter extends BaseMicroViewAdapter {
         @Override
         void bind(RoomQueueInfo info, int position) {
             super.bind(info, position);
-
-            if (info.groupType == PKTeamInfo.TEAM_RED) {
+            MicMemberInfo micMemberInfo = info.mChatRoomMember;
+            if (micMemberInfo != null && micMemberInfo.getGroupType() == PKTeamInfo.TEAM_RED) {
                 tvPkMark.setVisibility(View.VISIBLE);
                 tvPkMark.setBackgroundResource(R.drawable.shape_pk_mic_queue_mark_red);
                 tvPkMark.setText("红队");
@@ -147,7 +150,7 @@ public class KtvMicroViewAdapter extends BaseMicroViewAdapter {
                 } else {
                     tvPkMark.setCompoundDrawablesWithIntrinsicBounds(null, null, null, null);
                 }
-            } else if (info.groupType == PKTeamInfo.TEAM_BLUE) {
+            } else if (micMemberInfo != null && micMemberInfo.getGroupType() == PKTeamInfo.TEAM_BLUE) {
                 tvPkMark.setVisibility(View.VISIBLE);
                 tvPkMark.setBackgroundResource(R.drawable.shape_pk_mic_queue_mark_blue);
                 tvPkMark.setText("蓝队");
@@ -183,7 +186,7 @@ public class KtvMicroViewAdapter extends BaseMicroViewAdapter {
     }
 
     @Override
-    public void dispose(){
+    public void dispose() {
         disposables.dispose();
     }
 }
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/MicroViewAdapter.java b/app/src/main/java/com/yizhuan/erban/avroom/adapter/MicroViewAdapter.java
index 9016c186c..60c3bd928 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/MicroViewAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/adapter/MicroViewAdapter.java
@@ -452,17 +452,23 @@ public class MicroViewAdapter extends BaseMicroViewAdapter {
             if (tvPkMark == null) {
                 return;
             }
-            if (info.groupType == PKTeamInfo.TEAM_RED) {
-                tvPkMark.setVisibility(View.VISIBLE);
-                tvPkMark.setBackgroundResource(R.drawable.shape_pk_mic_queue_mark_red);
-                tvPkMark.setText("红队");
-            } else if (info.groupType == PKTeamInfo.TEAM_BLUE) {
-                tvPkMark.setVisibility(View.VISIBLE);
-                tvPkMark.setBackgroundResource(R.drawable.shape_pk_mic_queue_mark_blue);
-                tvPkMark.setText("蓝队");
+            MicMemberInfo micMemberInfo = info.mChatRoomMember;
+            if (micMemberInfo != null) {
+                if (micMemberInfo.getGroupType() == PKTeamInfo.TEAM_RED) {
+                    tvPkMark.setVisibility(View.VISIBLE);
+                    tvPkMark.setBackgroundResource(R.drawable.shape_pk_mic_queue_mark_red);
+                    tvPkMark.setText("红队");
+                } else if (micMemberInfo.getGroupType() == PKTeamInfo.TEAM_BLUE) {
+                    tvPkMark.setVisibility(View.VISIBLE);
+                    tvPkMark.setBackgroundResource(R.drawable.shape_pk_mic_queue_mark_blue);
+                    tvPkMark.setText("蓝队");
+                } else {
+                    tvPkMark.setVisibility(View.GONE);
+                }
             } else {
                 tvPkMark.setVisibility(View.GONE);
             }
+
         }
     }
 
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/dialog/PKSelectPeopleDialog.java b/app/src/main/java/com/yizhuan/erban/avroom/dialog/PKSelectPeopleDialog.java
index 49e8a413c..6f76f2495 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/PKSelectPeopleDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/dialog/PKSelectPeopleDialog.java
@@ -101,7 +101,7 @@ public class PKSelectPeopleDialog extends BaseDialog implements View.OnClickList
                 micEntityList.get(i).avatar = chatRoomMember.getAvatar();
                 micEntityList.get(i).nick = chatRoomMember.getNick();
                 micEntityList.get(i).uid = chatRoomMember.getAccount();
-                micEntityList.get(i).gender = roomQueueInfo.gender;
+                micEntityList.get(i).gender = chatRoomMember.getGender();
                 micEntityList.get(i).isSelect = false;
                 micEntityList.get(i).unSelectable = false;
                 //已经加入队伍的显示已经选择
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java
index f3361cbb1..b170c3b9a 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java
@@ -265,7 +265,7 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene
             micMemberInfo.setMicPosition(micMemberMap.keyAt(i));
             micMemberInfo.setAccount(mChatRoomMember.getAccount());
             //添加性别信息
-            micMemberInfo.setGender(roomQueueInfo.gender);
+            micMemberInfo.setGender(mChatRoomMember.getGender());
             micMemberInfos.add(micMemberInfo);
         }
 
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java
index fa94d69bb..66ab448da 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java
+++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java
@@ -1474,8 +1474,6 @@ public final class IMNetEaseManager {
                 if (roomQueueInfo.mChatRoomMember != null
                         && Objects.equals(roomQueueInfo.mChatRoomMember.getAccount(), account)) {
                     roomQueueInfo.mChatRoomMember = null;
-                    roomQueueInfo.gender = 0;
-                    roomQueueInfo.groupType = PKTeamInfo.TEAM_NONE;
                     noticeDownMic(String.valueOf(mMicQueueMemberMap.keyAt(i)), account);
                     break;
                 }
@@ -1860,7 +1858,7 @@ public final class IMNetEaseManager {
                     userInfo.setUid(Long.parseLong(chatRoomMember.getAccount()));
                     userInfo.setNick(chatRoomMember.getNick());
                     userInfo.setAvatar(chatRoomMember.getAvatar());
-                    userInfo.setGender(roomQueueInfo.gender);
+                    userInfo.setGender(chatRoomMember.getGender());
                     PkModel.get().syncPkList(userInfo, PKTeamInfo.TEAM_NONE);
                     noticePKInfo();
                 }
@@ -1873,8 +1871,6 @@ public final class IMNetEaseManager {
                     AvRoomDataManager.get().mIsNeedOpenMic = false;
                 }
                 roomQueueInfo.mChatRoomMember = null;
-                roomQueueInfo.groupType = 0;
-                roomQueueInfo.gender = 0;
                 // 通知界面更新麦序信息
                 noticeDownMic(key, account);
             }
@@ -1903,8 +1899,8 @@ public final class IMNetEaseManager {
                 userInfo.setUid(Long.parseLong(chatRoomMember.getAccount()));
                 userInfo.setNick(chatRoomMember.getNick());
                 userInfo.setAvatar(chatRoomMember.getAvatar());
-                userInfo.setGender(roomQueueInfo.gender);
-                PkModel.get().syncPkList(userInfo, roomQueueInfo.groupType);
+                userInfo.setGender(chatRoomMember.getGender());
+                PkModel.get().syncPkList(userInfo, chatRoomMember.getGroupType());
                 noticePKInfo();
 
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/RoomQueueInfo.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/RoomQueueInfo.java
index 731a75597..277250ca2 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/RoomQueueInfo.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/bean/RoomQueueInfo.java
@@ -14,14 +14,6 @@ public class RoomQueueInfo {
     public RoomMicInfo mRoomMicInfo;
     /** 坑上人员信息 */
     public MicMemberInfo mChatRoomMember;
-    /** 当前成员的性别，本属于ChatRoomMember的 */
-    public int gender;
-    /**
-     * GroupType_default = 0,//默认
-     * GroupTyp_red = 1, //蓝队
-     * GroupType_Blue = 2,//红队
-     */
-    public int groupType;
 
     public GiftValueData giftValueData = new GiftValueData();
 
@@ -35,7 +27,6 @@ public class RoomQueueInfo {
         return "RoomQueueInfo{" +
                 "mRoomMicInfo=" + mRoomMicInfo +
                 ", mChatRoomMember=" + mChatRoomMember +
-                ", gender=" + gender +
                 '}';
     }
 }
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomBaseModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomBaseModel.java
index 712ad58b5..7e0d33455 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomBaseModel.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomBaseModel.java
@@ -5,6 +5,7 @@ import android.text.TextUtils;
 import android.util.SparseArray;
 
 import com.alibaba.fastjson.JSONObject;
+import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
@@ -90,6 +91,8 @@ public class RoomBaseModel extends BaseModel implements IRoomBaseModel {
 
     protected final Api mRoomService;
 
+    private Gson gson = new Gson();
+
     public RoomBaseModel() {
         mRoomService = RxNet.create(Api.class);
     }
@@ -406,24 +409,7 @@ public class RoomBaseModel extends BaseModel implements IRoomBaseModel {
                 if (roomQueueInfo != null && roomQueueInfo.mChatRoomMember == null) {
                     JsonObject valueJsonObj = jsonParser.parse(entry.value).getAsJsonObject();
                     if (valueJsonObj != null) {
-                        chatRoomMember = new MicMemberInfo();
-                        if (valueJsonObj.has("uid")) {
-                            int uid = valueJsonObj.get("uid").getAsInt();
-                            accounts.add(String.valueOf(uid));
-                            chatRoomMember.setAccount(String.valueOf(uid));
-                        }
-                        if (valueJsonObj.has("nick")) {
-                            chatRoomMember.setNick(valueJsonObj.get("nick").getAsString());
-                        }
-                        if (valueJsonObj.has("avatar")) {
-                            chatRoomMember.setAvatar(valueJsonObj.get("avatar").getAsString());
-                        }
-                        if (valueJsonObj.has("gender")) {
-                            roomQueueInfo.gender = valueJsonObj.get("gender").getAsInt();
-                        }
-                        if (valueJsonObj.has("groupType")) {
-                            roomQueueInfo.groupType = valueJsonObj.get("groupType").getAsInt();
-                        }
+                        chatRoomMember = gson.fromJson(valueJsonObj,MicMemberInfo.class);
                         roomQueueInfo.mChatRoomMember = chatRoomMember;
                     }
                     AvRoomDataManager.get().mMicQueueMemberMap.put(Integer.parseInt(entry.key), roomQueueInfo);
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/PkModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/PkModel.java
index 21af3414e..0ea7dcda6 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/PkModel.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/PkModel.java
@@ -327,15 +327,15 @@ public class PkModel extends BaseModel implements IPkModel {
             for (int i = 0; i < micQueue.size(); i++) {
                 int key = micQueue.keyAt(i);
                 RoomQueueInfo roomQueueInfo = micQueue.get(key);
-                if (roomQueueInfo.groupType > 0 && roomQueueInfo.mChatRoomMember != null) {
+                if (roomQueueInfo.mChatRoomMember != null && roomQueueInfo.mChatRoomMember.getGroupType() > 0) {
                     PKMemberInfo pkMemberInfo = new PKMemberInfo();
-                    pkMemberInfo.setTeamId(roomQueueInfo.groupType);
+                    pkMemberInfo.setTeamId(roomQueueInfo.mChatRoomMember.getGroupType());
                     UserInfo userInfo = new UserInfo();
-                    userInfo.setGroupType(roomQueueInfo.groupType);
+                    userInfo.setGroupType(roomQueueInfo.mChatRoomMember.getGroupType());
                     userInfo.setUid(Long.parseLong(roomQueueInfo.mChatRoomMember.getAccount()));
                     userInfo.setNick(roomQueueInfo.mChatRoomMember.getNick());
                     userInfo.setAvatar(roomQueueInfo.mChatRoomMember.getAvatar());
-                    userInfo.setGender(roomQueueInfo.gender);
+                    userInfo.setGender(roomQueueInfo.mChatRoomMember.getGender());
                     pkMemberInfo.setUserInfo(userInfo);
                     pkMemberInfoList.add(pkMemberInfo);
                 }
@@ -705,8 +705,8 @@ public class PkModel extends BaseModel implements IPkModel {
             RoomQueueInfo roomQueueInfo = micQueue.get(key);
             if (null != roomQueueInfo.mChatRoomMember
                     && roomQueueInfo.mChatRoomMember.getAccount().equals(String.valueOf(pkMemberInfo.getUserInfo().getUid()))) {
-                roomQueueInfo.groupType = getTeamIdInPKMemberList(roomQueueInfo.mChatRoomMember.getAccount());
-                pkMemberInfo.getUserInfo().setGroupType(roomQueueInfo.groupType);
+                roomQueueInfo.mChatRoomMember.setGroupType(getTeamIdInPKMemberList(roomQueueInfo.mChatRoomMember.getAccount()));
+                pkMemberInfo.getUserInfo().setGroupType(roomQueueInfo.mChatRoomMember.getGroupType());
                 //改变麦状态
                 AvRoomModel.get().updateMyMicQueue(
                         key,
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/queue/bean/MicMemberInfo.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/queue/bean/MicMemberInfo.java
index 861cb7c0d..dcf7a6c53 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/queue/bean/MicMemberInfo.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/queue/bean/MicMemberInfo.java
@@ -27,6 +27,12 @@ public class MicMemberInfo {
     private int teamId = 0;
     private boolean isSelected = false;
     private Map<String, Object> extension;
+
+    /**
+     * GroupType_default = 0,//默认
+     * GroupTyp_red = 1, //蓝队
+     * GroupType_Blue = 2,//红队
+     */
     private int groupType;
 
 
diff --git a/gradle.properties b/gradle.properties
index 09a17100a..a0754c18e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,5 +20,5 @@ with_jenkins=false
 #\u6253\u652F\u6301x86\u7684\u6A21\u62DF\u5668\u5305\u4F7F\u7528
 ndk_abi_filters=arm
 
-version_name=2.1.1
-version_code=211
\ No newline at end of file
+version_name=5.1.1
+version_code=511
\ No newline at end of file