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

1:修改时间选择框，根据需要，展示时分秒和不显示时分秒

Browse Source 
2:修改展示设备id，在头部信息中，使用第三方的获取设备唯一id
3：优化群聊成员列表展示
4：修改房间封面，上传图片的时候，需要裁剪
5：添加营业时间展示
6:pk修改开始的时候，选择时间去掉1分钟
7：修改声网，添加声卡开关
This commit is contained in:
梁小江
2026-01-20 19:20:06 +08:00
parent bf609a3964
commit 163340a691
41 changed files with 919 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -360,7 +360,7 @@ public interface ApiServer {
@GET(Constants.GET_CUSTOM_GIFT_LIST)
Call<BaseModel<List<RoonGiftModel>>> getCustomGiftList(@Query("user_id") String user_id);
@GET(Constants.GET_NEW_GIFT_LIST)
@GET(Constants.GET_NEW_GIFT_LIST) //拍卖位选择拍卖礼物，type=3 label =99
Call<BaseModel<List<RoonGiftModel>>> getNewGiftList(@Query("label") int label, @Query("type") String type );
@GET(Constants.SET_CUSTOM_GIFT)
@@ -528,6 +528,10 @@ public interface ApiServer {
@POST(Constants.postRoomSwToken)
Call<BaseModel<PkSwTokenBean>> postRoomSwToken(@Field("room_id") String roomId);
@FormUrlEncoded
@POST(Constants.POST_CLOSE_PK_MIC)
Call<BaseModel<String>> closePkMic(@Field("pk_id") String pk_id,@Field("type") String type,@Field("user_id") String user_id);
@FormUrlEncoded
@POST(Constants.SET_USER_DECORATE)
Call<BaseModel<String>> setUserDecorate(@Field("udid") String udid);
@@ -749,6 +753,10 @@ public interface ApiServer {
@GET(Constants.GET_BLIND_BOX_STATUS)
Call<BaseModel<List<BlindBoxStatus>>> blindBoxStatus();
@FormUrlEncoded
@POST(Constants.SET_ROOM_BUSINESS_TIME)
Call<BaseModel<String>> setRoomBusinessTime(@Field("room_id") String roomId,@Field("start_time") String startTime,@Field("end_time") String endTime);
@FormUrlEncoded
@POST(Constants.POST_END_SONG)
Call<BaseModel<String>> endSong(@Field("room_id") String roomId);
@@ -770,7 +778,7 @@ public interface ApiServer {
Call<BaseModel<List<RoomCharmRankBean>>> getCharmRank(@Field("room_id") String roomId);
@FormUrlEncoded
@POST(Constants.POST_ROOM_RELATION_LIST)
@POST(Constants.POST_ROOM_RELATION_LIST) //1：真爱拍 2：亲密拍 3：星球（互娱）
Call<BaseModel<List<RoomRelationBean>>> roomRelationList(@Field("type") String type);
@FormUrlEncoded

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

@@ -749,7 +749,7 @@ public class RetrofitClient {
@Override
public void onResponse(Call<BaseModel<GroupUserListBean>> call, Response<BaseModel<GroupUserListBean>> response) {
if (response.code() == 200) {
if (response.code() == 200) {
BaseModel<GroupUserListBean> baseModel = response.body();
if (baseModel.getCode() == 1)
observer.onNext(baseModel.getData());
@@ -3363,7 +3363,6 @@ public class RetrofitClient {
setCode301(indexRecommendRoomBaseModel.getMsg());
}
} else {
ToastUtils.showLong("首页房间推荐异常", response.code());
LogUtils.e("首页房间推荐", response.message());
}
}
@@ -4654,6 +4653,33 @@ public class RetrofitClient {
});
}
public void setRoomBusinessTime(String roomId,String start_time,String end_time, BaseObserver<String> observer) {
sApiServer.setRoomBusinessTime(roomId,start_time,end_time).enqueue(new Callback<BaseModel<String>>() {
@Override
public void onResponse(Call<BaseModel<String>> call, Response<BaseModel<String>> response) {
if (response.code() == 200) {
BaseModel<String> baseModel = response.body();
if (baseModel.getCode() == 1)
ToastUtils.showLong(baseModel.getMsg());
else if (baseModel.getCode() == 301) {
setCode301(baseModel.getMsg());
}else if (baseModel.getCode() == 0) {
ToastUtils.showLong(baseModel.getMsg());
}
}else {
ToastUtils.showLong("设置营业时间失败，", response.code());
LogUtils.e("setRoomBusinessTime", response.message());
}
}
@Override
public void onFailure(Call<BaseModel<String>> call, Throwable t) {
LogUtils.e("setRoomBusinessTime", t.fillInStackTrace());
}
});
}
public void endSong(String room_id, BaseObserver<String> observer) {
sApiServer.endSong(room_id).enqueue(new Callback<BaseModel<String>>() {
@Override
@@ -5343,6 +5369,33 @@ public class RetrofitClient {
});
}
public void closePkMic(String pk_id ,String type ,String user_id,BaseObserver<String> observer) {
sApiServer.closePkMic(pk_id,type,user_id).enqueue(new Callback<BaseModel<String>>() {
@Override
public void onResponse(Call<BaseModel<String>> call, Response<BaseModel<String>> response) {
if (response.code() == 200) {
BaseModel<String> baseModel = response.body();
if (baseModel.getCode() == 1) {
observer.onNext(baseModel.getMsg());
} else if (baseModel.getCode() == 301) {
setCode301(baseModel.getMsg());
} else if (baseModel.getCode() == 0) {
ToastUtils.showShort(baseModel.getMsg());
}
} else {
ToastUtils.showLong("数据错误", response.code());
LogUtils.e("closePkMic", response.message());
}
}
@Override
public void onFailure(Call<BaseModel<String>> call, Throwable t) {
LogUtils.e("closePkMic", t.fillInStackTrace());
}
});
}
public void removeBlackList(String user_id, BaseObserver<String> observer) {
sApiServer.removeBlackList(user_id).enqueue(new Callback<BaseModel<String>>() {
@Override