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

77 签约房开始webp动画，练歌房右侧麦上用户刷新。

Browse Source
This commit is contained in:
骆召亮
2025-12-19 11:27:42 +08:00
parent 3fde4df00f
commit 552e238254
4 changed files with 177 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomKtvFragment.java
View File

@@ -48,6 +48,7 @@ import com.xscm.moduleutil.widget.RoomKtvWheatView;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
@@ -69,7 +70,7 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
private MusicSongBean musicSongBean;
RoomFragment parentFragment;
BaseQuickAdapter<RoomPitBean, BaseViewHolder> adapter;
private List<RoomPitBean> mSongPitList = new ArrayList<>();
VolumeManager volumeManager;
public RoomKtvFragment() {
@@ -172,7 +173,6 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
}
if (roomInfoResp.getSong_pit_list() != null && !roomInfoResp.getSong_pit_list().isEmpty()) {
adapter.setNewData(roomInfoResp.getSong_pit_list());
for (RoomPitBean roomPitBean : roomInfoResp.getSong_pit_list()) {
if (roomPitBean.getUser_id().equals(SpUtil.getUserId() + "")) {
@@ -182,6 +182,12 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
}
}
}
mSongPitList.clear();
if (roomInfoResp.getSong_pit_list() != null){
mSongPitList.addAll(roomInfoResp.getSong_pit_list());
}
adapter.notifyDataSetChanged();
sv();
tzblChanged();
@@ -308,6 +314,7 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
mBinding.llTiaoyt.setOnClickListener(this::onClick);
mBinding.llQg.setOnClickListener(this::onClick);
mBinding.llSz.setOnClickListener(this::onClick);
mSongPitList.clear();
adapter = new BaseQuickAdapter<RoomPitBean, BaseViewHolder>(R.layout.item_room_charm_rank) {
@Override
protected void convert(BaseViewHolder helper, RoomPitBean item) {
@@ -338,6 +345,7 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
});
}
};
adapter.setNewData(mSongPitList);
if (getActivity() != null && getActivity() instanceof RoomActivity) {
Objects.requireNonNull(((RoomActivity) getActivity()).getBinding()).recyclerView.setAdapter(adapter);
}
@@ -751,7 +759,12 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
AgoraManager.getInstance().muteLocalAudioStream(false);
}
}
adapter.setNewData(roomInfoResp.getSong_pit_list());
mSongPitList.clear();
if (roomInfoResp.getSong_pit_list() != null){
mSongPitList.addAll(roomInfoResp.getSong_pit_list());
}
adapter.notifyDataSetChanged();
sv();
}
@@ -771,7 +784,11 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
AgoraManager.getInstance().muteLocalAudioStream(true);
}
} else {
adapter.setNewData(roomInfoResp.getSong_pit_list());
mSongPitList.clear();
if (roomInfoResp.getSong_pit_list() != null){
mSongPitList.addAll(roomInfoResp.getSong_pit_list());
}
adapter.notifyDataSetChanged();
}
sv();
}
@@ -787,10 +804,15 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
pitBean.setCharm("0");
mBinding.muJb.setData(pitBean);
for (int i = 0; i < roomInfoResp.getSong_pit_list().size(); i++) {
roomInfoResp.getSong_pit_list().get(i).setCharm("0");
mSongPitList.clear();
if (roomInfoResp.getSong_pit_list() != null){
for (int i = 0; i < roomInfoResp.getSong_pit_list().size(); i++) {
roomInfoResp.getSong_pit_list().get(i).setCharm("0");
}
mSongPitList.addAll(roomInfoResp.getSong_pit_list());
}
adapter.setNewData(roomInfoResp.getSong_pit_list());
adapter.notifyDataSetChanged();
}
public void event1005(RoomMessageEvent messageEvent) {
@@ -812,7 +834,11 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
}
// 更新麦位列表数据
adapter.setNewData(roomInfoResp.getSong_pit_list());
mSongPitList.clear();
if (roomInfoResp.getSong_pit_list() != null){
mSongPitList.addAll(roomInfoResp.getSong_pit_list());
}
adapter.notifyDataSetChanged();
}
@@ -882,7 +908,11 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
break;
}
}
adapter.setNewData(roomInfoResp.getSong_pit_list());
mSongPitList.clear();
if (roomInfoResp.getSong_pit_list() != null){
mSongPitList.addAll(roomInfoResp.getSong_pit_list());
}
adapter.notifyDataSetChanged();
}
// TODO: 2025/9/12 在离线
@@ -912,7 +942,11 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
break;
}
}
adapter.setNewData(roomInfoResp.getSong_pit_list());
mSongPitList.clear();
if (roomInfoResp.getSong_pit_list() != null){
mSongPitList.addAll(roomInfoResp.getSong_pit_list());
}
adapter.notifyDataSetChanged();
}
public void event1035(RoomMessageEvent messageEvent) {
@@ -952,7 +986,11 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
roomInfoResp.getSong_pit_list().get(i).setDress(messageEvent.getText().getFromUserInfo().getDress());
}
}
adapter.setNewData(roomInfoResp.getSong_pit_list());
mSongPitList.clear();
if (roomInfoResp.getSong_pit_list() != null){
mSongPitList.addAll(roomInfoResp.getSong_pit_list());
}
adapter.notifyDataSetChanged();
}