YUSHENG/yusheng-android
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

点唱修改。

Browse Source
This commit is contained in:
骆召亮
2025-12-04 23:47:51 +08:00
parent a808da0df5
commit f985ea9aeb
1 changed files with 41 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomJukeboxFragment.java
View File

@@ -465,8 +465,9 @@ public class RoomJukeboxFragment extends BaseMvpFragment<JukeboxPresenter, Fragm
private void setMike(){
try {
for (int i=0;i<adapter.getData().size();i++){
if (adapter.getData().get(i).getUser_id().equals(SpUtil.getUserId()+"") || roomInfoResp.getSinger_info().getSong_info().getSinger_user_id()==SpUtil.getUserId()){
for (int i=0;i<roomPitBeans.size();i++){
if (roomPitBeans.get(i).getUser_id().equals(SpUtil.getUserId()+"")
|| roomInfoResp.getSinger_info().getSong_info().getSinger_user_id()==SpUtil.getUserId()){
if (getActivity()!=null){
if (getActivity() instanceof RoomActivity) {
((RoomActivity) getActivity()).setrlMic(true);
@@ -492,10 +493,9 @@ public class RoomJukeboxFragment extends BaseMvpFragment<JukeboxPresenter, Fragm
int userId = fromUserInfo.getUser_id();
// 获取适配器数据
List<RoomPitBean> dataList = adapter.getData();
int position = Integer.parseInt(pitNumber) - 1;
// 确保位置有效
if (position < 0 || (position >= dataList.size() && !pitNumber.equals("9"))) {
if (position < 0 || (position >= roomPitBeans.size() && !pitNumber.equals("9"))) {
return;
}
@@ -517,8 +517,9 @@ public class RoomJukeboxFragment extends BaseMvpFragment<JukeboxPresenter, Fragm
} else {
// 获取对应位置的bean并更新
RoomPitBean pitBean = dataList.get(position);
RoomPitBean pitBean = roomPitBeans.get(position);
pitBean.setUser_id(userId + "");
pitBean.setPit_number(pitNumber);
pitBean.setAvatar(fromUserInfo.getAvatar());
pitBean.setNickname(fromUserInfo.getNickname());
pitBean.setSex(fromUserInfo.getSex() + "");
@@ -537,7 +538,7 @@ public class RoomJukeboxFragment extends BaseMvpFragment<JukeboxPresenter, Fragm
}
// 使用set方法更新数据，然后通知适配器
dataList.set(position, pitBean);
roomPitBeans.set(position, pitBean);
adapter.notifyItemChanged(position);
}
@@ -591,17 +592,17 @@ public class RoomJukeboxFragment extends BaseMvpFragment<JukeboxPresenter, Fragm
}
} else {
// 获取适配器数据
List<RoomPitBean> dataList = adapter.getData();
int position = Integer.parseInt(pitNumber) - 1;
// 确保位置有效
if (position < 0 || position >= dataList.size()) {
if (position < 0 || position >= roomPitBeans.size()) {
return;
}
// 获取对应位置的bean并更新
RoomPitBean pitBean = dataList.get(position);
RoomPitBean pitBean = roomPitBeans.get(position);
pitBean.setUser_id("");
pitBean.setPit_number(pitNumber);
pitBean.setAvatar("");
pitBean.setNickname("");
pitBean.setSex("");
@@ -609,8 +610,8 @@ public class RoomJukeboxFragment extends BaseMvpFragment<JukeboxPresenter, Fragm
pitBean.setDress("");
pitBean.setImageType(false);
// 使用set方法更新数据，然后通知适配器
dataList.set(position, pitBean);
adapter.setNewData(dataList);
roomPitBeans.set(position, pitBean);
adapter.setNewData(roomPitBeans);
adapter.notifyItemChanged(position);
}
if (userId == SpUtil.getUserId()) {
@@ -652,7 +653,7 @@ public class RoomJukeboxFragment extends BaseMvpFragment<JukeboxPresenter, Fragm
temp.setImageType(false);
roomInfoResp.getRoom_info().getPit_list().set(fromIndex, temp);
adapter.getData().set(fromIndex, temp);
roomPitBeans.set(fromIndex, temp);
adapter.notifyItemChanged(fromIndex);
} else {
RoomPitBean fromBean = adapter.getData().get(fromIndex);
@@ -718,7 +719,7 @@ public class RoomJukeboxFragment extends BaseMvpFragment<JukeboxPresenter, Fragm
mBinding.wvZc.pitBean.setImageType(false);
mBinding.wvZc.setData(mBinding.wvZc.pitBean);
} else {
for (RoomPitBean roomPitBean : adapter.getData()) {
for (RoomPitBean roomPitBean : roomPitBeans) {
if (roomPitBean.getUser_id().equals(userId)) {
roomPitBean.setImageType(true);
} else {
@@ -756,7 +757,6 @@ public class RoomJukeboxFragment extends BaseMvpFragment<JukeboxPresenter, Fragm
}
public void event1035(RoomMessageEvent message) {
List<RoomPitBean> dataList = adapter.getData();
if (mBinding.wvZc.getUserId().equals(message.getText().getFromUserInfo().getUser_id() + "")) {
RoomPitBean roomPitBean = mBinding.wvZc.pitBean;
@@ -766,10 +766,12 @@ public class RoomJukeboxFragment extends BaseMvpFragment<JukeboxPresenter, Fragm
mBinding.wvZc.setData(roomPitBean);
}
for (int i = 0; i < dataList.size(); i++) {
RoomPitBean roomPitBean2 = dataList.get(i);
for (int i = 0; i < roomPitBeans.size(); i++) {
RoomPitBean roomPitBean2 = roomPitBeans.get(i);
if (roomPitBean2.getUser_id().equals(message.getText().getFromUserInfo().getUser_id() + "")) {
dataList.set(i, roomPitBean);
roomPitBean2.setNickname(message.getText().getFromUserInfo().getNickname());
roomPitBean2.setDress(message.getText().getFromUserInfo().getDress());
roomPitBean2.setAvatar(message.getText().getFromUserInfo().getAvatar());
adapter.notifyItemChanged(i);
}
}
@@ -781,11 +783,10 @@ public class RoomJukeboxFragment extends BaseMvpFragment<JukeboxPresenter, Fragm
mBinding.wvZc.setCharm("0");
}
List<RoomPitBean> dataList = adapter.getData();
for (int i = 0; i < dataList.size(); i++) {
RoomPitBean roomPitBean2 = dataList.get(i);
for (int i = 0; i < roomPitBeans.size(); i++) {
RoomPitBean roomPitBean2 = roomPitBeans.get(i);
roomPitBean2.setCharm("0");
adapter.notifyItemChanged(adapter.getData().indexOf(roomPitBean2));
adapter.notifyItemChanged(i);
}
}
@@ -818,11 +819,14 @@ public class RoomJukeboxFragment extends BaseMvpFragment<JukeboxPresenter, Fragm
mBinding.wvZc.setCharm(charm);
}
// 更新麦位列表中的魅力值
for (RoomPitBean pitBean : adapter.getData()) {
if (pitBean.getUser_id().equals(userId))
for (int i = 0; i < roomPitBeans.size(); i++) {
RoomPitBean pitBean = roomPitBeans.get(i);
if (pitBean.getUser_id().equals(userId)){
pitBean.setCharm(charm);
adapter.notifyItemChanged(adapter.getData().indexOf(pitBean));
adapter.notifyItemChanged(i);
}
}
}
// TODO: 2025/11/22 清除个人魅力
@@ -832,12 +836,13 @@ public class RoomJukeboxFragment extends BaseMvpFragment<JukeboxPresenter, Fragm
if (mBinding.wvZc.getUserId() != null && mBinding.wvZc.getUserId().equals(userId)) {
mBinding.wvZc.setCharm("0");
}
List<RoomPitBean> dataList = adapter.getData();
for (int i = 0; i < dataList.size(); i++) {
RoomPitBean roomPitBean2 = dataList.get(i);
if (roomPitBean2.getUser_id().equals(userId))
for (int i = 0; i < roomPitBeans.size(); i++) {
RoomPitBean roomPitBean2 = roomPitBeans.get(i);
if (roomPitBean2.getUser_id().equals(userId)){
roomPitBean2.setCharm("0");
adapter.notifyItemChanged(adapter.getData().indexOf(roomPitBean2));
adapter.notifyItemChanged(i);
}
}
}
@@ -850,12 +855,13 @@ public class RoomJukeboxFragment extends BaseMvpFragment<JukeboxPresenter, Fragm
return;
}
List<RoomPitBean> dataList = adapter.getData();
for (int i = 0; i < dataList.size(); i++) {
RoomPitBean roomPitBean2 = dataList.get(i);
if (roomPitBean2.getUser_id().equals(messageEvent.getText().getUser_id()))
pitBean.setIs_online(type == 1 ? 1 : 2);
adapter.notifyItemChanged(adapter.getData().indexOf(roomPitBean2));
for (int i = 0; i < roomPitBeans.size(); i++) {
RoomPitBean roomPitBean2 = roomPitBeans.get(i);
if (roomPitBean2.getUser_id().equals(messageEvent.getText().getUser_id())){
roomPitBean2.setIs_online(type == 1 ? 1 : 2);
adapter.notifyItemChanged(i);
}
}
}
}