Merge remote-tracking branch 'origin/branch_new' into branch_new

This commit is contained in:
2025-12-04 23:11:17 +08:00
10 changed files with 73 additions and 28 deletions

View File

@@ -863,7 +863,7 @@ public interface ApiServer {
Call<BaseModel<String>> roomUserReconnect(@Field("room_id") String room_id);
@GET(Constants.GET_CP_ZONE)
Call<BaseModel<HeartCpBean>> getCpRoom(@Query("user_id") String userId);
Call<BaseModel<HeartCpBean>> getCpRoom(@Query("user_id") String userId,@Query("page")String page);
@GET(Constants.POST_MY_FAMILY)

View File

@@ -4607,8 +4607,8 @@ public class RetrofitClient {
}
public void getCpRoom(String userId, BaseObserver<HeartCpBean> observer) {
sApiServer.getCpRoom(userId).enqueue(new Callback<BaseModel<HeartCpBean>>() {
public void getCpRoom(String userId,int page, BaseObserver<HeartCpBean> observer) {
sApiServer.getCpRoom(userId,page+"").enqueue(new Callback<BaseModel<HeartCpBean>>() {
@Override
public void onResponse(Call<BaseModel<HeartCpBean>> call, Response<BaseModel<HeartCpBean>> response) {
if (response.code() == 200) {