moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat : bug修复, 幸运礼物 数字改为 自动化大小

Browse Source
This commit is contained in:
eggmanQQQ
2024-12-27 17:56:54 +08:00
parent 2f9263f3c9
commit c90f3b648f
13 changed files with 117 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/com/chwl/core/manager/IMNetEaseManager.java
View File

@@ -2509,9 +2509,9 @@ public final class IMNetEaseManager {
*/
public void markManagerListBySdk(String roomId, final String account, final boolean mark, final CallBack<ChatRoomMember> callBack) {
OtherExtKt.doLog("开始设置管理员 - 请求接口");
AvRoomModel.get().getCheckManagerNum(AvRoomDataManager.get().getRoomUid())
AvRoomModel.get().getCheckManagerNum(AvRoomDataManager.get().getRoomUid(),mark)
.doOnSuccess(s -> {
OtherExtKt.doLog("开始设置管理员 - 请求接口 - 成功");
OtherExtKt.doLog("开始设置管理员 - 请求接口 - 成功 str = "+s);
NIMClient.getService(ChatRoomService.class)
.markChatRoomManager(mark, new MemberOption(roomId, account))
.setCallback(new RequestCallback<ChatRoomMember>() {

19
core/src/main/java/com/chwl/core/room/model/RoomBaseModel.java
View File

@@ -860,10 +860,16 @@ public class RoomBaseModel extends BaseModel implements IRoomBaseModel {
.compose(RxHelper.handleIgnoreData())
.compose(RxHelper.handleSchedulers());
}
public Single<String> getCheckManagerNum(long roomUid) {
return mRoomService.getCheckManagerNum(roomUid)
.compose(RxHelper.handleIgnoreData())
.compose(RxHelper.handleSchedulers());
public Single<String> getCheckManagerNum(long roomUid,boolean isMark) {
if (!isMark) {
return Single.just("取消管理员 不用请求");
} else {
return mRoomService.getCheckManagerNum(roomUid)
.compose(RxHelper.handleIgnoreData())
.compose(RxHelper.handleSchedulers());
}
}
public interface Api {
@@ -1308,8 +1314,9 @@ public class RoomBaseModel extends BaseModel implements IRoomBaseModel {
//是否还能设置房间管理员
@GET("/room/checkManagerNum")
Single<ServiceResult<JsonElement>> getCheckManagerNum(@Query("roomUid") long roomUid);
@FormUrlEncoded
@POST("/room/checkManageNum")
Single<ServiceResult<JsonElement>> getCheckManagerNum(@Field("roomUid") long roomUid);
}

37
core/src/main/java/com/chwl/core/room/model/RoomSettingModel.java
View File

@@ -139,21 +139,24 @@ public class RoomSettingModel extends BaseMvpModel {
});
}
public Single<RoomInfo> updateRoomInfoEx(RoomInfo roomInfo) {
return mRoomSettingService.updateRoomInfoEx(roomInfo.getType(), roomInfo.getUsedMicSkinId(), roomInfo.getUsedMicEffectId(),
roomInfo.getRoomId(),
return mRoomSettingService.updateRoomInfoEx(
roomInfo.getType(),
roomInfo.getUsedMicSkinId(),
roomInfo.getUsedMicEffectId(),
roomInfo.getRoomId(),
null,
roomInfo.getTitle(),
roomInfo.getAvatar(),
roomInfo.getRoomDesc(),
roomInfo.getIntroduction(),
roomInfo.roomPwd,
roomInfo.getRoomTag(),
roomInfo.tagId,
AuthModel.get().getCurrentUid(),
roomInfo.isHasAnimationEffect(),
roomInfo.getAudioQuality(),
roomInfo.getLimitType(),
roomInfo.isPureMode()
null,
null,
null,
null,
null,
null,
null,
roomInfo.getUid(),
null,
null,
null,
null
)
.subscribeOn(Schedulers.io())
.unsubscribeOn(Schedulers.io())
@@ -333,9 +336,9 @@ public class RoomSettingModel extends BaseMvpModel {
@Field("singleRoomSortId") Long singleRoomSortId);
@FormUrlEncoded
@POST("room/update")
Single<ServiceResult<RoomInfo>> updateRoomInfoEx(@Field("type") int type,
@Field("usedMicSkinId") int usedMicSkinId,
@Field("usedMicEffectId") int usedMicEffectId,
Single<ServiceResult<RoomInfo>> updateRoomInfoEx(@Field("type") Integer type,
@Field("usedMicSkinId") Integer usedMicSkinId,
@Field("usedMicEffectId") Integer usedMicEffectId,
@Field("mgId") Long gameId,
@Field("singleRoomSortId") Long singleRoomSortId,