diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
index fc9bec91..89cc288c 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
@@ -1921,7 +1921,16 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
         if (roomMessageEvent.text.fromUserInfo != null && roomMessageEvent.text.fromUserInfo.enter_image?.isNotEmpty() == true) {
             showFloatingMessage(roomMessageEvent.text.fromUserInfo)
         }
-
+        if (roomId != roomMessageEvent.roomId) {
+            return
+        }
+        if (roomMessageEvent.text.jia_jia != null && roomMessageEvent.text.jia_jia.isNotEmpty()) {
+            val gift = GiftBean()
+            gift.gift_id = ""
+            gift.play_image = roomMessageEvent.text.jia_jia
+            QXGiftPlayerManager.getInstance(this)
+                .displayFullEffectView(roomMessageEvent.text.jia_jia)
+        }
         MvpPre?.getRoomOnline(roomId, "1", "10")
 
 //        number++
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java
index 552752b6..a62b1d42 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java
@@ -517,11 +517,11 @@ public class ChatRoomFragment extends BaseMvpFragment<ChatRoomPresenter, RoomFra
         LogUtils.e("消息类型：" + msgType);
         switch (msgType) {
             case 1001:
-                if (text != null) {
-                    RoomJoinMountModel roomJoinMountModel = new RoomJoinMountModel(
-                            message.getRoomId(), text.getJia_jia(), 2);
-                    EventBus.getDefault().post(roomJoinMountModel);
-                }
+//                if (text != null) {
+//                    RoomJoinMountModel roomJoinMountModel = new RoomJoinMountModel(
+//                            message.getRoomId(), text.getJia_jia(), 2);
+//                    EventBus.getDefault().post(roomJoinMountModel);
+//                }
                 postAndAddMessage(message);
                 break;
             case 123:
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RequestedSongsFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RequestedSongsFragment.java
index 554f3a19..56b96472 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RequestedSongsFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RequestedSongsFragment.java
@@ -41,7 +41,7 @@ public class RequestedSongsFragment extends BaseMvpFragment<RequestSongPresenter
     private List<SongPlaylist.SongPlaylistBean> songList = new ArrayList<>();
     private String zcUserId;
 
-    public RequestedSongsFragment(){
+    public RequestedSongsFragment() {
 
     }
 
@@ -57,7 +57,7 @@ public class RequestedSongsFragment extends BaseMvpFragment<RequestSongPresenter
     @Override
     public void onAttach(@NonNull Context context) {
         super.onAttach(context);
-        zcUserId= getArguments().getString("zcUserId");
+        zcUserId = getArguments().getString("zcUserId");
     }
 
     @Override
@@ -110,7 +110,7 @@ public class RequestedSongsFragment extends BaseMvpFragment<RequestSongPresenter
                 if (song != null) {
                     // 这里可以添加置顶逻辑
 //                    ToastUtil.showShort("已置顶: " + song.song_name);
-                    MvpPre.singerSongTop(song.getId()+"");
+                    MvpPre.singerSongTop(song.getId() + "");
                 }
             }
         });
@@ -169,35 +169,10 @@ public class RequestedSongsFragment extends BaseMvpFragment<RequestSongPresenter
             } else if (state == RefreshState.Loading) {
                 // 加载更多，过滤重复数据后添加到列表
                 if (s.getLists().size() > 0) {
-                    // 创建一个集合存储现有歌曲的ID，用于快速查找
-                    Set<Integer> existingSongIds = new HashSet<>();
-                    for (SongPlaylist.SongPlaylistBean song : songList) {
-                        if (song.getId() != 0) {
-                            existingSongIds.add(song.getId());
-                        }
-                    }
-
-                    // 过滤掉已存在的歌曲
-                    List<SongPlaylist.SongPlaylistBean> newSongs = new ArrayList<>();
-                    for (SongPlaylist.SongPlaylistBean song : s.getLists()) {
-                        if (song.getId() != 0 && !existingSongIds.contains(song.getId())) {
-                            newSongs.add(song);
-                            existingSongIds.add(song.getId()); // 添加到已存在集合中，防止本次加载的数据内部重复
-                        }
-                    }
-
-                    // 只有当有新数据时才更新
-                    if (!newSongs.isEmpty()) {
-                        songList.addAll(newSongs);
-                        adapter.addData(newSongs);
-                        mBinding.smartRefreshLayout.finishLoadMore(true);
-                    } else {
-                        // 没有新数据，但不算加载失败
-                        mBinding.smartRefreshLayout.finishLoadMore(true);
-                    }
+                    s.getLists().remove(0);
+                    adapter.addData(s.getLists());
+                    mBinding.smartRefreshLayout.finishLoadMore(true);
                 } else {
-                    // 没有更多数据
-//                    adapter.setShowFooter(false);
                     mBinding.smartRefreshLayout.finishLoadMoreWithNoMoreData();
                 }
             } else {