From 1b06d5725fbeada0e6f2b317f04a5dca47b7f95a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com>
Date: Tue, 16 Dec 2025 17:10:04 +0800
Subject: [PATCH] =?UTF-8?q?1=EF=BC=9A=E4=BF=AE=E6=94=B9=E7=BB=83=E6=AD=8C?=
 =?UTF-8?q?=E6=88=BF=E4=BF=AE=E6=94=B9=E8=B0=83=E9=9F=B3=E5=8F=B0=E6=88=90?=
 =?UTF-8?q?0=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E6=9B=B4=E6=8D=A2?=
 =?UTF-8?q?=E6=BC=94=E5=94=B1=E8=80=85=E6=B2=A1=E6=9C=89=E5=A3=B0=E9=9F=B3?=
 =?UTF-8?q?=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xscm/moduleutil/widget/GiftAnimView.java   | 14 ++++++++------
 .../room/fragment/MusicSongListFragment.java       |  4 +++-
 .../activity/room/fragment/RoomKtvFragment.java    | 10 +++++-----
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/widget/GiftAnimView.java b/BaseModule/src/main/java/com/xscm/moduleutil/widget/GiftAnimView.java
index b4ab4536..be04d54b 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/widget/GiftAnimView.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/widget/GiftAnimView.java
@@ -225,17 +225,19 @@ public class GiftAnimView extends FrameLayout implements GiftSvgaView.OnAnimatio
     public void openOrCloseEffectViewWith(boolean isShow) {
         this.isShow = isShow;
         removeSvgaQueueData();
-
-        playerMp4View.stopPlay();
-        playerMp4View.setVisibility(View.GONE);
+        if(playerMp4View!=null) {
+            playerMp4View.stopPlay();
+            playerMp4View.setVisibility(View.GONE);
+        }
         setVisibility(isShow ? View.VISIBLE : View.GONE);
     }
 
     public void stopPlay() {
         removeSvgaQueueData();
-
-        playerMp4View.stopPlay();
-        playerMp4View.setVisibility(View.GONE);
+        if(playerMp4View!=null) {
+            playerMp4View.stopPlay();
+            playerMp4View.setVisibility(View.GONE);
+        }
     }
 
 
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/MusicSongListFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/MusicSongListFragment.java
index 983ec6c1..65882b86 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/MusicSongListFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/MusicSongListFragment.java
@@ -68,7 +68,9 @@ public class MusicSongListFragment extends BaseMvpFragment<RequestPresenter, Fra
         if (page == 1) {
             adapter.setNewData(musicSongBeans);
         } else {
-            adapter.addData(musicSongBeans);
+            if (musicSongBeans != null) {
+                musicSongBeans.size();
+            }
         }
 
     }
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomKtvFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomKtvFragment.java
index 41659499..defac724 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomKtvFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomKtvFragment.java
@@ -690,21 +690,20 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
                 pitBean.setDress(messageEvent.getText().getSongInfo().getDress());
                 roomDefaultWheatView.setData(pitBean);
                 roomInfoResp.setSong_user_info(musicSongBean);
-
+                AgoraManager.getInstance();
+                AgoraManager.stopMuisc();
                 if (messageEvent.getText().getSongInfo().getUser_id().equals(SpUtil.getUserId() + "")) {
-                    AgoraManager.getInstance();
-                    AgoraManager.stopMuisc();
                     LogUtils.e("推送过来的code", messageEvent.getText().getSongInfo().getSong_code());
                     AgoraManager.getInstance().isPreload(Long.parseLong(messageEvent.getText().getSongInfo().getSong_code()), 1);
-                    setAgorVolumes();
+
                 } else {
                     volumeManager.saveBz(SpUtil.getUserId() + "", true);
                     volumeManager.clearCurrentVolumes();
-
                     if (AgoraManager.getInstance().isOnJoin()) {
                         AgoraManager.getInstance().loadLrc(Long.parseLong(roomInfoResp.getSong_user_info().getSong_code()));
                     }
                 }
+
                 if (getActivity() instanceof RoomActivity) {
                     if (messageEvent.getText().getSongInfo().getUser_id().equals(SpUtil.getUserId() + "")) {
 
@@ -743,6 +742,7 @@ public class RoomKtvFragment extends BaseMvpFragment<RoomPresenter, FragmentRoom
                 mBinding.muXName.setText("无");
             }
         }
+        setAgorVolumes();
         sv();
     }