From fac83d7c23a93d72e0cab7d03e6dc4d417aa4c79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com>
Date: Thu, 4 Dec 2025 23:56:19 +0800
Subject: [PATCH] =?UTF-8?q?1:=E4=BF=AE=E6=94=B9=E7=82=B9=E5=94=B1=E6=88=BF?=
 =?UTF-8?q?=E5=B7=B2=E7=82=B9=E6=AD=8C=E6=9B=B2=E5=B1=95=E7=A4=BA=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B6=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xscm/moduleutil/http/ApiServer.java   |  2 +-
 .../xscm/moduleutil/http/RetrofitClient.java  |  4 +--
 .../moduleutil/utils/roomview/RoomCPView.java |  4 +--
 .../room/adapter/RequestedSongsAdapter.java   | 25 +++++++++++++++++++
 .../room/contacts/RequestContacts.java        |  2 +-
 .../room/fragment/MusicSongListFragment.java  | 24 +++++++++---------
 .../room/fragment/RequestSongFragment.java    |  1 +
 .../room/presenter/RequestPresenter.java      |  4 +--
 8 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java b/BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java
index c4889239..3604e2dd 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java
@@ -595,7 +595,7 @@ public interface ApiServer {
 
     @FormUrlEncoded
     @POST(Constants.POST_SONG_LIST)
-    Call<BaseModel<List<MusicSongBean>>> songList(@Field("room_id") String room_id);
+    Call<BaseModel<List<MusicSongBean>>> songList(@Field("room_id") String room_id,@Field("page")String page);
 
     @FormUrlEncoded
     @POST(Constants.APPLY_PIT)
diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
index 39bb1a26..3e9c2ace 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
@@ -2587,8 +2587,8 @@ public class RetrofitClient {
         });
     }
 
-    public void songList(String room_id, BaseObserver<List<MusicSongBean>> observer) {
-        sApiServer.songList(room_id).enqueue(new Callback<BaseModel<List<MusicSongBean>>>() {
+    public void songList(String room_id,String page, BaseObserver<List<MusicSongBean>> observer) {
+        sApiServer.songList(room_id,page).enqueue(new Callback<BaseModel<List<MusicSongBean>>>() {
             @Override
             public void onResponse(Call<BaseModel<List<MusicSongBean>>> call, Response<BaseModel<List<MusicSongBean>>> response) {
                 if (response.code() == 200) {
diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/utils/roomview/RoomCPView.java b/BaseModule/src/main/java/com/xscm/moduleutil/utils/roomview/RoomCPView.java
index 80f1685d..ba0d1955 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/utils/roomview/RoomCPView.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/utils/roomview/RoomCPView.java
@@ -226,8 +226,8 @@ public class RoomCPView extends FrameLayout {
     }
 
     public void setCPTextData(String room_head1, String room_head2, String room_cp_name1, String room_cp_name2) {
-        ImageUtils.loadHead(room_head1, room_cp_head1);
-        ImageUtils.loadHead(room_head2, room_cp_head2);
+        ImageUtils.loadHeadCC(room_head1, room_cp_head1);
+        ImageUtils.loadHeadCC(room_head2, room_cp_head2);
         this.room_cp_name1.setText(room_cp_name1);
         this.room_cp_name2.setText(room_cp_name2);
     }
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/adapter/RequestedSongsAdapter.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/adapter/RequestedSongsAdapter.java
index 8f71ee25..fd3945c5 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/adapter/RequestedSongsAdapter.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/adapter/RequestedSongsAdapter.java
@@ -8,12 +8,16 @@ import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.blankj.utilcode.util.ActivityUtils;
+import com.blankj.utilcode.util.LogUtils;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.xscm.modulemain.R;
+import com.xscm.modulemain.activity.room.activity.RoomActivity;
 import com.xscm.modulemain.databinding.ItemRequestedSongBinding;
 import com.xscm.moduleutil.bean.SongPlaylist;
 import com.xscm.moduleutil.utils.ImageUtils;
+import com.xscm.moduleutil.utils.SpUtil;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -30,6 +34,12 @@ public class RequestedSongsAdapter extends BaseQuickAdapter<SongPlaylist.SongPla
         super(R.layout.item_requested_song);
     }
 
+    private String zcUserId="";
+
+    public void setZcUserId(String zcUserId) {
+        this.zcUserId=zcUserId;
+    }
+
     public interface OnItemClickListener {
         void onPlayClick(SongPlaylist.SongPlaylistBean song, int position);
 
@@ -60,6 +70,19 @@ public class RequestedSongsAdapter extends BaseQuickAdapter<SongPlaylist.SongPla
             helper.setBackgroundRes(R.id.tv_request_status, com.xscm.moduleutil.R.drawable.bg_r34_3abc6d);
         }
 
+        try {
+            if (((RoomActivity)ActivityUtils.getTopActivity()).getMRoomInfoResp().getRoom_info().getPit_list().get(8).getUser_id()
+                    .equals(SpUtil.getUserId()+"")){
+                helper.getView(R.id.tv_request_status).setVisibility(View.VISIBLE);
+            }else {
+                helper.getView(R.id.tv_request_status).setVisibility(View.GONE);
+            }
+        }catch (Exception e){
+            helper.getView(R.id.tv_request_status).setVisibility(View.GONE);
+            LogUtils.e("RequestedSongsAdapter",e.getMessage());
+        }
+
+
         // 设置tvRequestStatus的点击事件，只有置顶状态才能点击
         helper.getView(R.id.tv_request_status).setOnClickListener(v -> {
             // 只有第三个及以后的项目（position > 1）才能点击tvRequestStatus
@@ -68,4 +91,6 @@ public class RequestedSongsAdapter extends BaseQuickAdapter<SongPlaylist.SongPla
             }
         });
     }
+
+
 }
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/RequestContacts.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/RequestContacts.java
index 23d32ecd..fc00fc2f 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/RequestContacts.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/RequestContacts.java
@@ -19,7 +19,7 @@ public class RequestContacts {
 
     }
     public interface IRoomPre extends IPresenter {
-        void songList(String roomId);
+        void songList(String roomId,String page);
 
         void upSong(String did,String type);
 
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 57080ee0..983ec6c1 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
@@ -53,7 +53,8 @@ public class MusicSongListFragment extends BaseMvpFragment<RequestPresenter, Fra
 
     @Override
     public void songList(List<MusicSongBean> musicSongBeans) {
-
+        mBinding.smartRefreshLayout.finishRefresh();
+        mBinding.smartRefreshLayout.finishLoadMore();
 
         if (roomInfoResp.getUser_info().getUser_id() == SpUtil.getUserId() && roomInfoResp.getUser_info().getPit_number() == 9) {
             status = 1;
@@ -64,12 +65,11 @@ public class MusicSongListFragment extends BaseMvpFragment<RequestPresenter, Fra
             }
         }
 
-//        if (page==1){
-        adapter.setNewData(musicSongBeans);
-
-//        }else {
-//            adapter.addData(musicSongBeans);
-//        }
+        if (page == 1) {
+            adapter.setNewData(musicSongBeans);
+        } else {
+            adapter.addData(musicSongBeans);
+        }
 
     }
 
@@ -77,7 +77,7 @@ public class MusicSongListFragment extends BaseMvpFragment<RequestPresenter, Fra
     @Override
     public void upSong(String S) {
         ToastUtils.showShort(S);
-        MvpPre.songList(roomId);
+        MvpPre.songList(roomId, page + "");
     }
 
     @Override
@@ -148,7 +148,7 @@ public class MusicSongListFragment extends BaseMvpFragment<RequestPresenter, Fra
                 adapter.setNewData(musicSongBeans);
             }
         } else {
-            MvpPre.songList(roomId);
+            MvpPre.songList(roomId, page + "");
         }
     }
 
@@ -165,13 +165,13 @@ public class MusicSongListFragment extends BaseMvpFragment<RequestPresenter, Fra
             @Override
             public void onLoadMore(@NonNull RefreshLayout refreshLayout) {
                 page++;
-                MvpPre.songList(roomId);
+                MvpPre.songList(roomId, page + "");
             }
 
             @Override
             public void onRefresh(@NonNull RefreshLayout refreshLayout) {
                 page = 1;
-                MvpPre.songList(roomId);
+                MvpPre.songList(roomId, page + "");
             }
         });
 
@@ -237,7 +237,7 @@ public class MusicSongListFragment extends BaseMvpFragment<RequestPresenter, Fra
                     helper.setVisible(R.id.muis_price, false);
                 }
 
-                TextView muis_price=helper.getView(R.id.muis_price);
+                TextView muis_price = helper.getView(R.id.muis_price);
                 ThemeableDrawableUtils.setThemeableRoundedBackground(muis_price, ColorManager.getInstance().getPrimaryColorInt(), 34);
                 muis_price.setTextColor(ColorManager.getInstance().getButtonColorInt());
             }
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RequestSongFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RequestSongFragment.java
index b942b487..20194c78 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RequestSongFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RequestSongFragment.java
@@ -30,6 +30,7 @@ public class RequestSongFragment extends BaseMvpDialogFragment<RequestSongPresen
     private int historySongsCount = 0; // 历史记录数量
     private String roomId;
 
+
     public RequestSongFragment() {
         // Required empty public constructor
     }
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/presenter/RequestPresenter.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/presenter/RequestPresenter.java
index 3f686292..916687b3 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/presenter/RequestPresenter.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/presenter/RequestPresenter.java
@@ -19,8 +19,8 @@ public class RequestPresenter extends BasePresenter<RequestContacts.View> implem
 
 
     @Override
-    public void songList(String roomId) {
-        api.songList(roomId, new BaseObserver<List<MusicSongBean>>() {
+    public void songList(String roomId,String page) {
+        api.songList(roomId,page, new BaseObserver<List<MusicSongBean>>() {
             @Override
             public void onSubscribe(Disposable d) {
                 addDisposable(d);