心愿单bugfix

app/src/main/java/com/mango/moshen/avroom/wishlist/WishListCreateActivity.kt

@@ -100,7 +100,7 @@ class WishListCreateActivity : BaseViewBindingActivity<ActivityWishListCreateBin
                 SingleToastUtil.showToast(tips)
                 return@setOnClickListener
             }
-            dialogManager.showOkCancelDialog("确认创建当前心愿？,创建后当日不可再编辑或删除") {
+            dialogManager.showOkCancelDialog("确认创建当前心愿？创建后当日不可再编辑或删除") {
                 viewModel.createWishList()
             }
         }

app/src/main/java/com/mango/moshen/avroom/wishlist/WishListCreateDialog.kt

@@ -64,7 +64,7 @@ class WishListCreateDialog : BaseDialog<DialogWishListCreateBinding>() {
             }
             currItem?.let {
                 viewModel.addWishItem(
-                    it.giftId,
+                    it.giftId.toString(),
                     editItemInfo?.id,
                     num
                 )

app/src/main/java/com/mango/moshen/avroom/wishlist/WishListPanelDialog.kt

@@ -101,7 +101,7 @@ class WishListPanelDialog : BaseDialog<DialogWishListPanelBinding>() {
 
         rvDelegateGift.adapter.setOnItemChildClickListener { _, _, position ->
             rvDelegateGift.adapter.getItem(position)?.let {
-                RxBus.get().post(ShowGiftDialogEvent(it.giftId.toIntOrDef(0)))
+                RxBus.get().post(ShowGiftDialogEvent(it.giftId))
                 dismissAllowingStateLoss()
             }
         }

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;

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);

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<WishItemInfo> 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<List<WishItemInfo>>() {

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,

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 = "",