From 6e4fe74239bd0a7081be45006e3c10ff040c5a4e Mon Sep 17 00:00:00 2001
From: wushaocheng <15876365887@163.com>
Date: Fri, 16 Dec 2022 11:48:33 +0800
Subject: [PATCH] =?UTF-8?q?[Modify]=E4=BF=AE=E6=94=B9=E5=85=8D=E8=B4=B9?=
 =?UTF-8?q?=E7=A4=BC=E7=89=A9=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yizhuan/erban/avroom/fragment/BaseRoomFragment.kt | 8 +++++++-
 .../im/custom/bean/CustomAttachParser.java                | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

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 441308898..f472a7989 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
@@ -145,6 +145,8 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
     private var isCloseScreen = false
     private var isOpenRedPackage = false
 
+    private var roomFreeGiftDialog: RoomFreeGiftDialog? = null
+
     @JvmField
     protected var isDatingMode = false
 
@@ -1201,7 +1203,11 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onRoomFreeGiftEvent(event: RoomFreeGiftEvent) {
         event.giftFreeInfo?.let {
-            RoomFreeGiftDialog(context, it).show()
+            if (roomFreeGiftDialog?.isShowing == true) {
+                roomFreeGiftDialog?.dismiss()
+            }
+            roomFreeGiftDialog = RoomFreeGiftDialog(context, it)
+            roomFreeGiftDialog?.show()
         }
     }
 
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CustomAttachParser.java b/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CustomAttachParser.java
index 1726cb6b1..d33381531 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CustomAttachParser.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CustomAttachParser.java
@@ -628,6 +628,7 @@ public class CustomAttachParser implements MsgAttachmentParser {
                     if (second == ROOM_FREE_GIFT_REST) {
                         GiftModel.get().getFreeGift(true).subscribe();
                     }else if(second == ROOM_FREE_GIFT_CHANGE){
+                        GiftModel.get().getFreeGift(false).subscribe();
                         attachment = new RoomFreeGiftAttachment(first, second);
                     }
                     break;