diff --git a/app/src/main/java/com/mango/moshen/avroom/wishlist/WishListCreateActivity.kt b/app/src/main/java/com/mango/moshen/avroom/wishlist/WishListCreateActivity.kt index 815b2cd41..7af064d71 100644 --- a/app/src/main/java/com/mango/moshen/avroom/wishlist/WishListCreateActivity.kt +++ b/app/src/main/java/com/mango/moshen/avroom/wishlist/WishListCreateActivity.kt @@ -100,7 +100,7 @@ class WishListCreateActivity : BaseViewBindingActivity() { } currItem?.let { viewModel.addWishItem( - it.giftId, + it.giftId.toString(), editItemInfo?.id, num ) diff --git a/app/src/main/java/com/mango/moshen/avroom/wishlist/WishListPanelDialog.kt b/app/src/main/java/com/mango/moshen/avroom/wishlist/WishListPanelDialog.kt index 504932d33..3781741a2 100644 --- a/app/src/main/java/com/mango/moshen/avroom/wishlist/WishListPanelDialog.kt +++ b/app/src/main/java/com/mango/moshen/avroom/wishlist/WishListPanelDialog.kt @@ -101,7 +101,7 @@ class WishListPanelDialog : BaseDialog() { rvDelegateGift.adapter.setOnItemChildClickListener { _, _, position -> rvDelegateGift.adapter.getItem(position)?.let { - RxBus.get().post(ShowGiftDialogEvent(it.giftId.toIntOrDef(0))) + RxBus.get().post(ShowGiftDialogEvent(it.giftId)) dismissAllowingStateLoss() } } diff --git a/app/src/main/java/com/mango/moshen/ui/widget/GiftDialog.java b/app/src/main/java/com/mango/moshen/ui/widget/GiftDialog.java index 10944b372..8c1581649 100644 --- a/app/src/main/java/com/mango/moshen/ui/widget/GiftDialog.java +++ b/app/src/main/java/com/mango/moshen/ui/widget/GiftDialog.java @@ -60,6 +60,7 @@ import com.mango.core.pay.event.UpdateWalletInfoEvent; import com.mango.core.room.anotherroompk.ShowUserInfoDialogEvent; import com.mango.core.room.pk.model.PkModel; import com.mango.core.room.queue.bean.MicMemberInfo; +import com.mango.core.room.wishlist.WishItemInfo; import com.mango.core.statistic.StatisticManager; import com.mango.core.statistic.protocol.StatisticsProtocol; import com.mango.core.user.UserModel; diff --git a/core/src/diff_src_erban/java/com/mango/core/manager/IMNetEaseManager.java b/core/src/diff_src_erban/java/com/mango/core/manager/IMNetEaseManager.java index dadbce7ce..626426324 100644 --- a/core/src/diff_src_erban/java/com/mango/core/manager/IMNetEaseManager.java +++ b/core/src/diff_src_erban/java/com/mango/core/manager/IMNetEaseManager.java @@ -1373,6 +1373,9 @@ public final class IMNetEaseManager { AvRoomDataManager.get().setHasOpenWishGift(true); case CUSTOM_MSG_WISH_LIST_UPDATE: AvRoomDataManager.get().wishGiftLiveData.setValue(wishListAttachment.getGifts()); + if (AuthModel.get().getCurrentUid() == wishListAttachment.getSenderUid()) { + SingleToastUtil.showToast("助力成功"); + } break; case CUSTOM_MSG_WISH_LIST_FINISH: addMessages(msg); diff --git a/core/src/main/java/com/mango/core/im/custom/bean/WishListAttachment.java b/core/src/main/java/com/mango/core/im/custom/bean/WishListAttachment.java index 91f71d740..7987f7539 100644 --- a/core/src/main/java/com/mango/core/im/custom/bean/WishListAttachment.java +++ b/core/src/main/java/com/mango/core/im/custom/bean/WishListAttachment.java @@ -15,6 +15,7 @@ import java.util.List; public class WishListAttachment extends CustomAttachment { private long roomUid; private List gifts; + private long senderUid; public WishListAttachment(int first, int second) { @@ -37,9 +38,18 @@ public class WishListAttachment extends CustomAttachment { this.gifts = gifts; } + public long getSenderUid() { + return senderUid; + } + + public void setSenderUid(long senderUid) { + this.senderUid = senderUid; + } + @Override protected void parseData(JSONObject data) { roomUid = data.getLongValue("roomUid"); + senderUid = data.getLongValue("senderUid"); gifts = new Gson().fromJson( data.getJSONArray("gifts").toJSONString(), new TypeReference>() { diff --git a/core/src/main/java/com/mango/core/room/wishlist/WishCreateItemInfo.kt b/core/src/main/java/com/mango/core/room/wishlist/WishCreateItemInfo.kt index d541e6018..0c1cc71a0 100644 --- a/core/src/main/java/com/mango/core/room/wishlist/WishCreateItemInfo.kt +++ b/core/src/main/java/com/mango/core/room/wishlist/WishCreateItemInfo.kt @@ -3,7 +3,7 @@ package com.mango.core.room.wishlist import java.io.Serializable data class WishCreateItemInfo( - val giftId: String = "", + val giftId: Int = 0, val giftName: String = "", val id: String? = null, val level: String? = null, diff --git a/core/src/main/java/com/mango/core/room/wishlist/WishItemInfo.kt b/core/src/main/java/com/mango/core/room/wishlist/WishItemInfo.kt index 5d506e77a..33b7c033b 100644 --- a/core/src/main/java/com/mango/core/room/wishlist/WishItemInfo.kt +++ b/core/src/main/java/com/mango/core/room/wishlist/WishItemInfo.kt @@ -1,7 +1,7 @@ package com.mango.core.room.wishlist data class WishItemInfo( - val giftId: String = "", + val giftId: Int = 0, val actualNum: Int = 0, val targetNum: Int = 0, val giftName: String = "",