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>> songList(@Field("room_id") String room_id); + Call>> 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> observer) { - sApiServer.songList(room_id).enqueue(new Callback>>() { + public void songList(String room_id,String page, BaseObserver> observer) { + sApiServer.songList(room_id,page).enqueue(new Callback>>() { @Override public void onResponse(Call>> call, Response>> 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 { // 只有第三个及以后的项目(position > 1)才能点击tvRequestStatus @@ -68,4 +91,6 @@ public class RequestedSongsAdapter extends BaseQuickAdapter 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 implem @Override - public void songList(String roomId) { - api.songList(roomId, new BaseObserver>() { + public void songList(String roomId,String page) { + api.songList(roomId,page, new BaseObserver>() { @Override public void onSubscribe(Disposable d) { addDisposable(d);