Merge branch 'google' into qiye

room/src/main/java/com/swago/room/gift/GiftDialog.kt

@@ -305,8 +305,6 @@ class GiftDialog : BaseXDFragment<DialogGiftBinding>() {
                             hotData[GiftConfig.giftSelectedPageIndex * 8 + GiftConfig.giftSelectedPageSelectedPosition]
                         LogUtil.d("礼物id", "${gifModel.gift_name}")
                         sendGift(gifModel, 0)
-                        dismissAllowingStateLoss()
-
                     }
 
                     3 -> {
@@ -315,7 +313,6 @@ class GiftDialog : BaseXDFragment<DialogGiftBinding>() {
                             luxuryData[GiftConfig.giftSelectedPageIndex * 8 + GiftConfig.giftSelectedPageSelectedPosition]
                         LogUtil.d("礼物id", "${gifModel.gift_name}")
                         sendGift(gifModel, 0)
-                        dismissAllowingStateLoss()
                     }
 
                     4 -> {
@@ -409,6 +406,9 @@ class GiftDialog : BaseXDFragment<DialogGiftBinding>() {
                     binding.tvCoins.text = it.user_coins ?: "0"
                     returnGiftBatch = it.gift_batch
             }
+            if (type==2||type==3){
+                dismissAllowingStateLoss()
+            }
         }
 
         giftVm.sendGiftCodeLiveData.observe(this) {