From b75ba89d756b3a6aef71b26fd98ec3a9f25e0c48 Mon Sep 17 00:00:00 2001 From: wzq Date: Wed, 18 Oct 2023 13:14:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E9=97=B4=E7=9B=B8=E5=86=8C=20?= =?UTF-8?q?=E5=85=AC=E5=B1=8F=E6=B6=88=E6=81=AF=20=E8=A7=A3=E9=94=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erban/avroom/fragment/BaseRoomFragment.kt | 11 +++ .../erban/avroom/room_album/RoomAlbumModel.kt | 34 +++++++- .../room_album/UnlockRoomAlbumPhotoDialog.kt | 12 +-- .../erban/avroom/widget/MessageView.java | 84 ++++++++++++++----- app/src/main/res/drawable/bg_9e9ea8_6.xml | 8 ++ .../main/res/drawable/bg_white_round_20.xml | 8 ++ .../layout/dialog_lock_room_album_photo.xml | 2 +- app/src/main/res/values/colors.xml | 1 + .../manager/IMNetEaseManager.java | 29 +++++-- .../gift/bean/GiftReceiveInfo.java | 2 + .../im/custom/bean/GiftAttachment.java | 2 + .../xchat_android_core/im/custom/bean/User.kt | 2 +- .../manager/AvRoomDataManager.java | 14 ++++ .../room/model/RoomBaseModel.java | 10 --- .../room/model/inteface/IRoomBaseModel.java | 1 - 15 files changed, 171 insertions(+), 49 deletions(-) create mode 100644 app/src/main/res/drawable/bg_9e9ea8_6.xml create mode 100644 app/src/main/res/drawable/bg_white_round_20.xml diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/BaseRoomFragment.kt b/app/src/main/java/com/yizhuan/erban/avroom/fragment/BaseRoomFragment.kt index f88de5e69..49951dc4e 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/BaseRoomFragment.kt +++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/BaseRoomFragment.kt @@ -47,6 +47,7 @@ import com.yizhuan.erban.avroom.dialog.RoomOperationDialog import com.yizhuan.erban.avroom.firstcharge.FirstChargeDialog import com.yizhuan.erban.avroom.presenter.BaseRoomPresenter import com.yizhuan.erban.avroom.redpackage.RedPackageSendDialog +import com.yizhuan.erban.avroom.room_album.RoomAlbumModel import com.yizhuan.erban.avroom.view.IBaseRoomView import com.yizhuan.erban.avroom.widget.BottomView import com.yizhuan.erban.avroom.widget.MessageView @@ -284,6 +285,16 @@ open class BaseRoomFragment?> : //获取免费礼物详情 mvpPresenter?.queryFreeFlower() + initRoomAlbum() + } + + @SuppressLint("CheckResult") + private fun initRoomAlbum() { + RoomAlbumModel.listUnlockRoomPhoto(AvRoomDataManager.get().roomUid) + .compose(bindToLifecycle()) + .subscribe({ + AvRoomDataManager.get().unlockedRoomAlbumPhotos = it + }, { toast(it.message) }) } @CallSuper diff --git a/app/src/main/java/com/yizhuan/erban/avroom/room_album/RoomAlbumModel.kt b/app/src/main/java/com/yizhuan/erban/avroom/room_album/RoomAlbumModel.kt index 5d92b26af..9defc11dd 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/room_album/RoomAlbumModel.kt +++ b/app/src/main/java/com/yizhuan/erban/avroom/room_album/RoomAlbumModel.kt @@ -3,15 +3,18 @@ package com.yizhuan.erban.avroom.room_album import com.yizhuan.erban.avroom.bean.RoomAlbumPhotoInfo import com.yizhuan.xchat_android_core.Constants import com.yizhuan.xchat_android_core.bean.response.ServiceResult +import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo +import com.yizhuan.xchat_android_core.utils.net.RxHelper import com.yizhuan.xchat_android_core.utils.net.launchRequest import com.yizhuan.xchat_android_library.net.rxnet.RxNet +import io.reactivex.Single import retrofit2.http.Field import retrofit2.http.FormUrlEncoded import retrofit2.http.GET import retrofit2.http.POST import retrofit2.http.Query -object RoomAlbumModel { +object RoomAlbumModel { private val api = RxNet.create(Api::class.java) suspend fun loadPhotos(roomUid: Long, type: Int, page: Int): List? { @@ -20,24 +23,35 @@ object RoomAlbumModel { } } - suspend fun uploadPhotos(roomUid: Long, type: Int, photoUrls: String, giftId: Int?) : String? { + suspend fun uploadPhotos(roomUid: Long, type: Int, photoUrls: String, giftId: Int?): String? { return launchRequest { api.uploadPhotos(roomUid, type, photoUrls, giftId) } } - suspend fun sendPhoto(roomUid: Long, photoId: Int) : String? { + suspend fun sendPhoto(roomUid: Long, photoId: Int): String? { return launchRequest { api.sendPhoto(roomUid, photoId) } } - suspend fun deletePhoto(photoId: Int) : String? { + suspend fun deletePhoto(photoId: Int): String? { return launchRequest { api.deletePhoto(photoId) } } + fun unlockRoomPhoto(roomUid: Long, photoId: Int): Single { + return api.unlockRoomPhoto(roomUid, photoId) + .compose(RxHelper.handleCommon()) + .compose(RxHelper.handleSchAndExce()) + } + + fun listUnlockRoomPhoto(roomUid: Long): Single> { + return api.listUnlockRoomPhoto(roomUid) + .compose(RxHelper.handleCommon()) + .compose(RxHelper.handleSchAndExce()) + } private interface Api { @@ -70,5 +84,17 @@ object RoomAlbumModel { suspend fun deletePhoto( @Field("id") photoId: Int, ): ServiceResult + + @FormUrlEncoded + @POST("roomAlbum/unlockPhoto") + fun unlockRoomPhoto( + @Field("roomUid") roomUid: Long, + @Field("id") photoId: Int + ): Single> + + @GET("roomAlbum/listUnlockPhoto") + fun listUnlockRoomPhoto( + @Query("roomUid") roomUid: Long, + ): Single>> } } \ No newline at end of file diff --git a/app/src/main/java/com/yizhuan/erban/avroom/room_album/UnlockRoomAlbumPhotoDialog.kt b/app/src/main/java/com/yizhuan/erban/avroom/room_album/UnlockRoomAlbumPhotoDialog.kt index dd731d9ec..d2c48fdf2 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/room_album/UnlockRoomAlbumPhotoDialog.kt +++ b/app/src/main/java/com/yizhuan/erban/avroom/room_album/UnlockRoomAlbumPhotoDialog.kt @@ -6,8 +6,8 @@ import com.hjq.toast.ToastUtils import com.yizhuan.erban.base.BaseDialog import com.yizhuan.erban.databinding.DialogLockRoomAlbumPhotoBinding import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2 +import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.room.model.AvRoomModel class UnlockRoomAlbumPhotoDialog : BaseDialog(){ @@ -26,18 +26,20 @@ class UnlockRoomAlbumPhotoDialog : BaseDialog() binding.tvValue.text = price.toString() binding.tvAction.setOnClickListener { - AvRoomModel.get().unlockRoomPhoto(AvRoomDataManager.get().roomUid, photoId) + RoomAlbumModel.unlockRoomPhoto(AvRoomDataManager.get().roomUid, photoId) .subscribe({ - onUnlockRoomPhotoListener?.onUnlockRoomPhoto() + onUnlockRoomPhotoListener?.onUnlockRoomPhoto(it) dismiss() }, { ToastUtils.show(it.message) }) } + + binding.ivClose.setOnClickListener { dismiss() } } companion object{ - fun newInstance(photoId:Int, giftUrl: String, giftName:String, price:Int): UnlockRoomAlbumPhotoDialog { + fun newInstance(photoId:Int, giftUrl: String?, giftName:String, price:Int): UnlockRoomAlbumPhotoDialog { val args = Bundle() args.putInt("photoId", photoId) args.putString("giftUrl", giftUrl) @@ -50,6 +52,6 @@ class UnlockRoomAlbumPhotoDialog : BaseDialog() } fun interface OnUnlockRoomPhotoListener{ - fun onUnlockRoomPhoto() + fun onUnlockRoomPhoto(unlockRoomAlbumPhotoInfo: GiftReceiveInfo) } } \ No newline at end of file diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java index ed890de31..17336e6d3 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java @@ -98,6 +98,7 @@ import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo; import com.yizhuan.xchat_android_core.gift.bean.GiftReceiver; import com.yizhuan.xchat_android_core.gift.bean.LuckyBagGifts; import com.yizhuan.xchat_android_core.gift.bean.LuckyBagNoticeInfo; +import com.yizhuan.xchat_android_core.gift.toolbox.GiftToolbox; import com.yizhuan.xchat_android_core.helper.ImHelperUtils; import com.yizhuan.xchat_android_core.home.event.FollowRoomEvent; import com.yizhuan.xchat_android_core.home.model.CollectionRoomModel; @@ -137,6 +138,7 @@ import com.yizhuan.xchat_android_core.im.custom.bean.RoomReceivedLuckyGiftAttach import com.yizhuan.xchat_android_core.im.custom.bean.RoomTipAttachment; import com.yizhuan.xchat_android_core.im.custom.bean.TarotAttachment; import com.yizhuan.xchat_android_core.im.custom.bean.TarotMsgBean; +import com.yizhuan.xchat_android_core.im.custom.bean.User; import com.yizhuan.xchat_android_core.im.custom.bean.VipMessageAttachment; import com.yizhuan.xchat_android_core.im.custom.bean.WelcomeAttachment; import com.yizhuan.xchat_android_core.level.UserLevelResourceType; @@ -1039,43 +1041,81 @@ public class MessageView extends FrameLayout { } private void setRoomAlbumMsg(ChatRoomMessage chatRoomMessage, MessageViewHolder baseViewHolder) { - ImageView ivUserLevel = baseViewHolder.itemView.findViewById(R.id.iv_user_level); - ImageView ivUserCharm = baseViewHolder.itemView.findViewById(R.id.iv_user_charm); - ImageView ivPhoto = baseViewHolder.itemView.findViewById(R.id.iv_photo); - ImageView ivGift = baseViewHolder.itemView.findViewById(R.id.iv_gift); - TextView tvNick = baseViewHolder.itemView.findViewById(R.id.tv_nick); - TextView tvValue = baseViewHolder.itemView.findViewById(R.id.tv_value); - TextView tvUnlock = baseViewHolder.itemView.findViewById(R.id.tv_unlock); - RoomAlbumAttachment attachment = (RoomAlbumAttachment) chatRoomMessage.getAttachment(); RoomAlbumMsgInfo mRoomAlbumMsgInfo = attachment.getMRoomAlbumMsgInfo(); + if (mRoomAlbumMsgInfo == null) { return; } + RoomPhoto roomPhoto = mRoomAlbumMsgInfo.getRoomPhoto(); + User user = mRoomAlbumMsgInfo.getUser(); + + ImageView ivUserLevel = baseViewHolder.itemView.findViewById(R.id.iv_user_level); + ImageView ivUserCharm = baseViewHolder.itemView.findViewById(R.id.iv_user_charm); + ImageView ivPhoto = baseViewHolder.itemView.findViewById(R.id.iv_photo); + ImageView ivGift = baseViewHolder.itemView.findViewById(R.id.iv_gift); + ImageView ivDiamond = baseViewHolder.itemView.findViewById(R.id.iv_diamond); + TextView tvNick = baseViewHolder.itemView.findViewById(R.id.tv_nick); + TextView tvValue = baseViewHolder.itemView.findViewById(R.id.tv_value); + TextView tvUnlock = baseViewHolder.itemView.findViewById(R.id.tv_unlock); + View vBottomMask = baseViewHolder.itemView.findViewById(R.id.v_bottom_mask); + ImageLoadUtilsV2.loadImage(ivUserLevel, mRoomAlbumMsgInfo.getUserLevel().getExperUrl()); ImageLoadUtilsV2.loadImage(ivUserCharm, mRoomAlbumMsgInfo.getUserLevel().getCharmUrl()); - RoomPhoto roomPhoto = mRoomAlbumMsgInfo.getRoomPhoto(); - ImageLoadUtilsV2.loadImage(ivPhoto, roomPhoto.getPhotoUrl()); - ImageLoadUtilsV2.loadImage(ivGift, roomPhoto.getGiftUrl()); - tvNick.setText(mRoomAlbumMsgInfo.getUser().getNick()); - tvValue.setText(String.valueOf(roomPhoto.getTotalGoldPrice())); + tvNick.setText(user.getNick()); + tvUnlock.setText("解鎖"); + tvUnlock.setBackgroundResource(R.drawable.bg_9168fa_6); + + if (roomPhoto.getType() == 1) { + vBottomMask.setVisibility(View.INVISIBLE); + ivGift.setVisibility(View.INVISIBLE); + ivDiamond.setVisibility(View.INVISIBLE); + tvValue.setVisibility(View.INVISIBLE); + tvUnlock.setVisibility(View.INVISIBLE); + } else { + vBottomMask.setVisibility(View.VISIBLE); + ivGift.setVisibility(View.VISIBLE); + ivDiamond.setVisibility(View.VISIBLE); + tvValue.setVisibility(View.VISIBLE); + tvUnlock.setVisibility(View.VISIBLE); + + boolean isMyself = UserModel.get().isMyseft(user.getUid()); + if (isMyself) { + tvUnlock.setVisibility(View.INVISIBLE); + } + + List unlockedIds= AvRoomDataManager.get().getUnlockedRoomAlbumPhotos(); + if (isMyself || unlockedIds.contains(roomPhoto.getId())) { + ImageLoadUtilsV2.loadImage(ivPhoto, roomPhoto.getPhotoUrl()); + tvUnlock.setText("已解鎖"); + tvUnlock.setBackgroundResource(R.drawable.bg_9e9ea8_6); + vBottomMask.setVisibility(View.INVISIBLE); + ivGift.setVisibility(View.INVISIBLE); + ivDiamond.setVisibility(View.INVISIBLE); + tvValue.setVisibility(View.INVISIBLE); + } else { + ImageLoadUtils.loadImageWithBlur(mContext, roomPhoto.getPhotoUrl(), ivPhoto, 25, 4); + } + + ImageLoadUtilsV2.loadImage(ivGift, roomPhoto.getGiftUrl()); + tvValue.setText(String.valueOf(roomPhoto.getTotalGoldPrice())); + } + + tvUnlock.setOnClickListener(v -> { UnlockRoomAlbumPhotoDialog unlockRoomAlbumPhotoDialog = UnlockRoomAlbumPhotoDialog.Companion .newInstance(roomPhoto.getId(), roomPhoto.getGiftUrl(), roomPhoto.getGiftName(), roomPhoto.getTotalGoldPrice()); - unlockRoomAlbumPhotoDialog.setOnUnlockRoomPhotoListener(() -> { + unlockRoomAlbumPhotoDialog.setOnUnlockRoomPhotoListener(giftReceiveInfo -> { + giftReceiveInfo.setRoomAlbum(true); + GiftToolbox.sendGiftRoomMessage(giftReceiveInfo); + int position = baseViewHolder.getAbsoluteAdapterPosition(); + AvRoomDataManager.get().addUnlockedRoomAlbumPhoto(roomPhoto.getId()); + notifyItemChanged(position); }); unlockRoomAlbumPhotoDialog.show(mContext); - //new DialogManager(mContext).showOkDialog("是否解锁", () -> { - // AvRoomModel.get().unlockRoomPhoto(AvRoomDataManager.get().getRoomUid(), mRoomAlbumMsgInfo.getRoomPhoto().getId()) - // .subscribe(data -> { - // ToastUtils.show("成功"); - // }, e -> {}); - //}); - }); - } private void setFairyMsg(ChatRoomMessage chatRoomMessage, TextView tvContent) { diff --git a/app/src/main/res/drawable/bg_9e9ea8_6.xml b/app/src/main/res/drawable/bg_9e9ea8_6.xml new file mode 100644 index 000000000..ebb63e696 --- /dev/null +++ b/app/src/main/res/drawable/bg_9e9ea8_6.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_white_round_20.xml b/app/src/main/res/drawable/bg_white_round_20.xml new file mode 100644 index 000000000..cc993e36c --- /dev/null +++ b/app/src/main/res/drawable/bg_white_round_20.xml @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_lock_room_album_photo.xml b/app/src/main/res/layout/dialog_lock_room_album_photo.xml index 7266009e4..1c224f427 100644 --- a/app/src/main/res/layout/dialog_lock_room_album_photo.xml +++ b/app/src/main/res/layout/dialog_lock_room_album_photo.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/bg_white_cornor_8"> + android:background="@drawable/bg_white_round_20"> #C2A66FFF #306065 #1E686868 + #9E9EA8 diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java index 02e68b4f0..fe9dd00ca 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java @@ -74,6 +74,7 @@ import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; import com.yizhuan.xchat_android_core.family.event.FamilyMineEvent; import com.yizhuan.xchat_android_core.gift.GiftModel; import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; +import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo; import com.yizhuan.xchat_android_core.gift.event.UpdateKnapFreeGiftDataEvent; import com.yizhuan.xchat_android_core.helper.AtProxy; import com.yizhuan.xchat_android_core.im.custom.bean.ActivityTimerAttachment; @@ -663,7 +664,6 @@ public final class IMNetEaseManager { //自定義消息 CustomAttachment customAttachment = (CustomAttachment) msg.getAttachment(); if (customAttachment.getFirst() == CUSTOM_MSG_HEADER_TYPE_AUCTION - || customAttachment.getFirst() == CustomAttachment.CUSTOM_MSG_HEADER_TYPE_GIFT || customAttachment.getFirst() == CustomAttachment.CUSTOM_MSG_HEADER_TYPE_ROOM_TIP || customAttachment.getFirst() == CustomAttachment.CUSTOM_MSG_HEADER_TYPE_FOLLOW_ROOM || customAttachment.getFirst() == CustomAttachment.CUSTOM_MSG_HEADER_TYPE_SEND_MAGIC @@ -761,17 +761,24 @@ public final class IMNetEaseManager { case CUSTOM_MSG_HEADER_TYPE_GIFT: if (customAttachment.getSecond() == CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_GIFT) { GiftAttachment giftAttachment = (GiftAttachment) attachment; - GiftInfo giftInfo = giftAttachment.getGiftReceiveInfo().getGift(); + GiftReceiveInfo giftReceiveInfo = giftAttachment.getGiftReceiveInfo(); + GiftInfo giftInfo = giftReceiveInfo.getGift(); // 兼容舊版發過來的giftAttachment沒有發送giftInfo的問題 giftInfo = giftInfo == null ? - GiftModel.get().findGiftInfoById(giftAttachment.getGiftReceiveInfo().getGiftId()) : giftInfo; - giftAttachment.getGiftReceiveInfo().setGift(giftInfo); + GiftModel.get().findGiftInfoById(giftReceiveInfo.getGiftId()) : giftInfo; + giftReceiveInfo.setGift(giftInfo); GiftModel.get().addNewGift(giftInfo); messages.add(msg); gift = true; + if (!giftReceiveInfo.isRoomAlbum()) { + addMessages(msg); + } } else if (customAttachment.getSecond() == CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_LUCKY_GIFT) { messages.add(msg); gift = true; + addMessages(msg); + } else { + addMessages(msg); } break; case CUSTOM_MSG_HEADER_TYPE_MULTI_GIFT: @@ -1823,7 +1830,19 @@ public final class IMNetEaseManager { public void addMessagesImmediately(ChatRoomMessage msg) { if (AvRoomDataManager.get().mCurrentRoomInfo != null && AvRoomDataManager.get().mCurrentRoomInfo.isCloseScreen()) return; - if (msg != null && !checkNoNeedMsg(msg)) { + + if (msg == null) { + return; + } + + if (msg.getAttachment() != null && msg.getAttachment() instanceof GiftAttachment) { + GiftAttachment attachment = (GiftAttachment) msg.getAttachment(); + if (attachment.getGiftReceiveInfo().isRoomAlbum()) { + return; + } + } + + if (!checkNoNeedMsg(msg)) { noticeReceiverMessageImmediately(msg); } } diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftReceiveInfo.java b/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftReceiveInfo.java index 2912063af..0a2f5d61f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftReceiveInfo.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftReceiveInfo.java @@ -27,4 +27,6 @@ public class GiftReceiveInfo implements Serializable { //礼物值 private List giftValueVos; private long currentTime; + + private boolean isRoomAlbum; } diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/GiftAttachment.java b/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/GiftAttachment.java index 29c7c7528..36c7d54aa 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/GiftAttachment.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/GiftAttachment.java @@ -52,6 +52,7 @@ public class GiftAttachment extends CustomAttachment { giftReceiveInfo.setGiftNum(data.getIntValue("giftNum")); giftReceiveInfo.setTargetNick(data.getString("targetNick")); giftReceiveInfo.setTargetAvatar(data.getString("targetAvatar")); + giftReceiveInfo.setRoomAlbum(data.getBoolean("isRoomAlbum")); JSONObject giftJson = null; if (data.containsKey("gift")) { giftJson = data.getJSONObject("gift"); @@ -92,6 +93,7 @@ public class GiftAttachment extends CustomAttachment { object.put("targetNick", giftReceiveInfo.getTargetNick()); object.put("targetAvatar", giftReceiveInfo.getTargetAvatar()); object.put("giftInfo", giftReceiveInfo.getGift()); + object.put("isRoomAlbum", giftReceiveInfo.isRoomAlbum()); if (giftReceiveInfo.getGiftValueVos() != null) { object.put("giftValueVos", giftReceiveInfo.getGiftValueVos()); } diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/User.kt b/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/User.kt index f18a0cebc..efa29bd9a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/User.kt +++ b/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/User.kt @@ -27,7 +27,7 @@ data class User( val phone: String, val phoneAreaCode: String, val platformRole: Int, - val uid: Int, + val uid: Long, val updateTime: String, val useStatus: Int ) \ No newline at end of file diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/manager/AvRoomDataManager.java b/core/src/main/java/com/yizhuan/xchat_android_core/manager/AvRoomDataManager.java index fb00e41f6..164e4be89 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/manager/AvRoomDataManager.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/manager/AvRoomDataManager.java @@ -227,6 +227,8 @@ public final class AvRoomDataManager { @Getter private boolean hasRoomAlbum; + private List unlockedRoomAlbumPhotos = new ArrayList<>(); + private AvRoomDataManager() { mRoomManagerList = new ArrayList<>(); mRoomFixedMemberList = new ArrayList<>(); @@ -1324,6 +1326,18 @@ public final class AvRoomDataManager { } } + public void setUnlockedRoomAlbumPhotos(List unlockedRoomAlbumPhotos) { + this.unlockedRoomAlbumPhotos = unlockedRoomAlbumPhotos; + } + + public List getUnlockedRoomAlbumPhotos() { + return unlockedRoomAlbumPhotos; + } + + public void addUnlockedRoomAlbumPhoto(int photoId) { + unlockedRoomAlbumPhotos.add(photoId); + } + private static final class Helper { private static final AvRoomDataManager INSTANCE = new AvRoomDataManager(); } diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomBaseModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomBaseModel.java index 75f437153..b9ee98d46 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomBaseModel.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomBaseModel.java @@ -775,13 +775,6 @@ public class RoomBaseModel extends BaseModel implements IRoomBaseModel { .compose(RxHelper.handleSchedulers()); } - @Override - public Single unlockRoomPhoto(long roomUid, int photoId) { - return mRoomService.unlockRoomPhoto(roomUid, photoId) - .compose(RxHelper.handleStringData()) - .compose(RxHelper.handleSchAndExce()); - } - public Single addIsomerism() { return mRoomService.addIsomerism(AuthModel.get().getCurrentUid(), AvRoomDataManager.get().getRoomId()) .compose(RxHelper.singleMainResult()); @@ -1195,9 +1188,6 @@ public class RoomBaseModel extends BaseModel implements IRoomBaseModel { @POST("/roomFirstChargeWindow/update") Single> postFirstCharge(@Field("roomUid") long roomUid); - @FormUrlEncoded - @POST("roomAlbum/unlockPhoto") - Single> unlockRoomPhoto(@Field("roomUid") long roomUid, @Field("id") int photoId); } } diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomBaseModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomBaseModel.java index 822f26102..d0de1fe68 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomBaseModel.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomBaseModel.java @@ -179,5 +179,4 @@ public interface IRoomBaseModel extends IModel { */ Single closeScreen(long roomId, boolean isCloseScreen); - Single unlockRoomPhoto(long roomUid, int photoId); }