moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

把RoomQueueInfo中本属于MicMemberInfo的字段放回去了...

Browse Source
This commit is contained in:
huangjian
2021-01-19 14:35:06 +08:00
parent 348c216dad
commit 1bbb464cf5
11 changed files with 45 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/yizhuan/erban/avroom/adapter/BaseMicroViewAdapter.java
View File

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

11
app/src/main/java/com/yizhuan/erban/avroom/adapter/KtvMicroViewAdapter.java
View File

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

22
app/src/main/java/com/yizhuan/erban/avroom/adapter/MicroViewAdapter.java
View File

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

2
app/src/main/java/com/yizhuan/erban/avroom/dialog/PKSelectPeopleDialog.java
View File

@@ -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;
//已经加入队伍的显示已经选择

2
app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java
View File

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

10
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java
View File

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

9
core/src/main/java/com/yizhuan/xchat_android_core/bean/RoomQueueInfo.java
View File

@@ -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 +
'}';
}
}

22
core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomBaseModel.java
View File

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

12
core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/PkModel.java
View File

@@ -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,

6
core/src/main/java/com/yizhuan/xchat_android_core/room/queue/bean/MicMemberInfo.java
View File

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

4
gradle.properties
View File

@@ -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
version_name=5.1.1
version_code=511