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

1：修改练歌房修改调音台成0的时候，更换演唱者没有声音了

Browse Source
This commit is contained in:
梁小江
2025-12-16 17:10:04 +08:00
parent 0874998249
commit 1b06d5725f
3 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
BaseModule/src/main/java/com/xscm/moduleutil/widget/GiftAnimView.java
View File

@@ -225,17 +225,19 @@ public class GiftAnimView extends FrameLayout implements GiftSvgaView.OnAnimatio
public void openOrCloseEffectViewWith(boolean isShow) { public void openOrCloseEffectViewWith(boolean isShow) {
this.isShow = isShow; this.isShow = isShow;
removeSvgaQueueData(); removeSvgaQueueData();
if(playerMp4View!=null) {
playerMp4View.stopPlay(); playerMp4View.stopPlay();
playerMp4View.setVisibility(View.GONE); playerMp4View.setVisibility(View.GONE);
}
setVisibility(isShow ? View.VISIBLE : View.GONE); setVisibility(isShow ? View.VISIBLE : View.GONE);
} }
public void stopPlay() { public void stopPlay() {
removeSvgaQueueData(); removeSvgaQueueData();
if(playerMp4View!=null) {
playerMp4View.stopPlay(); playerMp4View.stopPlay();
playerMp4View.setVisibility(View.GONE); playerMp4View.setVisibility(View.GONE);
}
} }

4
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/MusicSongListFragment.java
View File

@@ -68,7 +68,9 @@ public class MusicSongListFragment extends BaseMvpFragment<RequestPresenter, Fra
if (page == 1) { if (page == 1) {
adapter.setNewData(musicSongBeans); adapter.setNewData(musicSongBeans);
} else { } else {
adapter.addData(musicSongBeans); if (musicSongBeans != null) {
musicSongBeans.size();
}
} }
} }

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

@@ -690,21 +690,20 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
pitBean.setDress(messageEvent.getText().getSongInfo().getDress()); pitBean.setDress(messageEvent.getText().getSongInfo().getDress());
roomDefaultWheatView.setData(pitBean); roomDefaultWheatView.setData(pitBean);
roomInfoResp.setSong_user_info(musicSongBean); roomInfoResp.setSong_user_info(musicSongBean);
AgoraManager.getInstance();
AgoraManager.stopMuisc();
if (messageEvent.getText().getSongInfo().getUser_id().equals(SpUtil.getUserId() + "")) { if (messageEvent.getText().getSongInfo().getUser_id().equals(SpUtil.getUserId() + "")) {
AgoraManager.getInstance();
AgoraManager.stopMuisc();
LogUtils.e("推送过来的code", messageEvent.getText().getSongInfo().getSong_code()); LogUtils.e("推送过来的code", messageEvent.getText().getSongInfo().getSong_code());
AgoraManager.getInstance().isPreload(Long.parseLong(messageEvent.getText().getSongInfo().getSong_code()), 1); AgoraManager.getInstance().isPreload(Long.parseLong(messageEvent.getText().getSongInfo().getSong_code()), 1);
setAgorVolumes();
} else { } else {
volumeManager.saveBz(SpUtil.getUserId() + "", true); volumeManager.saveBz(SpUtil.getUserId() + "", true);
volumeManager.clearCurrentVolumes(); volumeManager.clearCurrentVolumes();
if (AgoraManager.getInstance().isOnJoin()) { if (AgoraManager.getInstance().isOnJoin()) {
AgoraManager.getInstance().loadLrc(Long.parseLong(roomInfoResp.getSong_user_info().getSong_code())); AgoraManager.getInstance().loadLrc(Long.parseLong(roomInfoResp.getSong_user_info().getSong_code()));
} }
} }
if (getActivity() instanceof RoomActivity) { if (getActivity() instanceof RoomActivity) {
if (messageEvent.getText().getSongInfo().getUser_id().equals(SpUtil.getUserId() + "")) { if (messageEvent.getText().getSongInfo().getUser_id().equals(SpUtil.getUserId() + "")) {
@@ -743,6 +742,7 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
mBinding.muXName.setText("无"); mBinding.muXName.setText("无");
} }
} }
setAgorVolumes();
sv(); sv();
} }