1:添加签约房的按钮

2：我的家族和的身价页面完成
3：个性装扮降身卡完成

MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/SongRequestFragment.java

@@ -1,5 +1,6 @@
 package com.xscm.modulemain.activity.room.fragment;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -9,6 +10,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
+import com.blankj.utilcode.util.ActivityUtils;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
 import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
 import com.xscm.modulemain.R;
@@ -17,15 +19,23 @@ import com.xscm.modulemain.activity.room.contacts.RequestSongContacts;
 import com.xscm.modulemain.activity.room.presenter.RequestSongPresenter;
 import com.xscm.modulemain.activity.room.adapter.SongAdapter;
 import com.xscm.modulemain.activity.room.adapter.WheatPositionAdapter;
+import com.xscm.modulemain.activity.user.activity.HeartCpActivity;
 import com.xscm.modulemain.databinding.FragmentSongRequestBinding;
 import com.xscm.moduleutil.base.BaseMvpFragment;
+import com.xscm.moduleutil.bean.RoomGiftData;
 import com.xscm.moduleutil.bean.SingerSongCount;
 import com.xscm.moduleutil.bean.SongPlaylist;
 import com.xscm.moduleutil.bean.room.RoomPitBean;
+import com.xscm.moduleutil.dialog.ConfirmDialog;
+import com.xscm.moduleutil.http.BaseObserver;
+import com.xscm.moduleutil.http.RetrofitClient;
+import com.xscm.moduleutil.utils.SpUtil;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import io.reactivex.disposables.Disposable;
+
 /**
  * 点歌页面Fragment
  */
@@ -128,16 +138,37 @@ public class SongRequestFragment extends BaseMvpFragment<RequestSongPresenter, F
 
             @Override
             public void onSongClick(SongPlaylist.SongPlaylistBean song, int position) {
-                MvpPre.singerSong(song.getId() + "", roomId);
+                queren1(song);
             }
         });
 
     }
 
+    // TODO: 2025/11/25 点歌提示框
+    private void queren1(SongPlaylist.SongPlaylistBean song) {
+        // 创建并显示确认对话框
+        new ConfirmDialog(ActivityUtils.getTopActivity(),
+               "温馨提示",
+                "您是否确认点歌<"+song.getSong_name()+">\n 演唱者："+song.getSinger_nickname()+"\n 礼物价值："+Integer.valueOf(song.getGift_price())*Integer.valueOf(song.getGift_num())+"金币",
+               "确认",
+               "取消",
+                v -> {
+                    MvpPre.singerSong(song.getId() + "", roomId);
+                },
+                v -> {
+                    // 点击“取消”按钮时什么都不做
+
+                }, false,0).show();
+    }
+
     private void updateSongList(int wheatPosition) {
         // 根据选中的麦位更新歌曲列表
         // 可以在这里调用接口获取对应麦位的歌曲列表
-        MvpPre.getSong(wheatPosition + "", "", "1", "10");
+        if (wheatPosition==0){
+            MvpPre.getSong( "", roomId, "1", "10");
+        }else {
+            MvpPre.getSong(wheatPosition + "", "", "1", "10");
+        }
 
     }