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

1:修改点唱房已点歌曲展示置顶的问题

Browse Source
This commit is contained in:
梁小江
2025-12-04 23:56:19 +08:00
parent f985ea9aeb
commit fac83d7c23
8 changed files with 46 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BaseModule/src/main/java/com/xscm/moduleutil/http/ApiServer.java
View File

@@ -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)

4
BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
View File

@@ -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) {

4
BaseModule/src/main/java/com/xscm/moduleutil/utils/roomview/RoomCPView.java
View File

@@ -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);
}

25
MainModule/src/main/java/com/xscm/modulemain/activity/room/adapter/RequestedSongsAdapter.java
View File

@@ -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
}
});
}
}

2
MainModule/src/main/java/com/xscm/modulemain/activity/room/contacts/RequestContacts.java
View File

@@ -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);

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

@@ -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());
}

1
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RequestSongFragment.java
View File

@@ -30,6 +30,7 @@ public class RequestSongFragment extends BaseMvpDialogFragment<RequestSongPresen
private int historySongsCount = 0; // 历史记录数量
private String roomId;
public RequestSongFragment() {
// Required empty public constructor
}

4
MainModule/src/main/java/com/xscm/modulemain/activity/room/presenter/RequestPresenter.java
View File

@@ -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);