From 7768a8f70becfc67b86fa85b9a9fc0cd6cd9a79a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com>
Date: Mon, 15 Dec 2025 17:02:09 +0800
Subject: [PATCH] =?UTF-8?q?1:=E4=BF=AE=E6=94=B9=E7=A4=BC=E7=89=A9=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E9=80=89=E6=8B=A9=E5=90=8E=EF=BC=8C=E8=BF=98=E8=83=BD?=
 =?UTF-8?q?=E9=80=81=E5=87=BA=E7=9A=84=E9=97=AE=E9=A2=98=202=EF=BC=9A?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=83=8C=E5=8C=85=E7=A4=BC=E7=89=A9=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E9=80=89=E6=8B=A9=E5=90=8E=E8=BF=98=E8=83=BD=E9=80=81?=
 =?UTF-8?q?=E5=87=BA=E7=9A=84=E9=97=AE=E9=A2=98=203=EF=BC=9A=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=89=93=E8=B5=8F=E7=A4=BC=E7=89=A9=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=90=8E=E8=BF=98=E8=83=BD=E9=80=81=E5=87=BA?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adapter/GiftTwoDetailsFragment.java       | 19 ++++++++++++++++---
 .../dialog/RewardGiftDialogFragment.java      |  2 +-
 .../dialog/RoomGiftDialogFragment.java        |  2 +-
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftTwoDetailsFragment.java b/BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftTwoDetailsFragment.java
index 8b6e265e..77c6c65b 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftTwoDetailsFragment.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftTwoDetailsFragment.java
@@ -297,12 +297,18 @@ public class GiftTwoDetailsFragment extends BaseMvpFragment<RewardGiftPresenter,
                 roonGiftModel.setNum(giftModel.getNum());
                 if (giftModel.getGift_id().equals(id)) {
                     if (!giftModel.isChecked()) {
-                        EventBus.getDefault().post(new GiftUserRefreshEvent(true, event.type, roonGiftModel));
                         giftModel.setChecked(true);
+                        roonGiftModel.setChecked(giftModel.isChecked());
+                        EventBus.getDefault().post(new GiftUserRefreshEvent(true, event.type, roonGiftModel));
+                    }else {
+                        giftModel.setChecked(false);
+                        roonGiftModel.setChecked(giftModel.isChecked());
                     }
                 } else {
                     giftModel.setChecked(false);
+                    roonGiftModel.setChecked(giftModel.isChecked());
                 }
+
             }
             if (event.adapter != null && event.adapter.get() != null) {
                 event.adapter.get().notifyDataSetChanged();
@@ -321,13 +327,20 @@ public class GiftTwoDetailsFragment extends BaseMvpFragment<RewardGiftPresenter,
                 if (giftModel.getGift_id().equals(id)) {
                     selGift = giftModel;
                     if (!giftModel.isChecked()) {
-                        EventBus.getDefault().post(new GiftUserRefreshEvent(true, event.type, roonGiftModel));
                         giftModel.setChecked(true);
+                        roonGiftModel.setChecked(giftModel.isChecked());
+                        EventBus.getDefault().post(new GiftUserRefreshEvent(true, event.type, roonGiftModel));
+                    }else {
+                        giftModel.setChecked(false);
+                        roonGiftModel.setChecked(giftModel.isChecked());
+                        EventBus.getDefault().post(new GiftUserRefreshEvent(true, event.type, roonGiftModel));
                     }
                 } else {
                     giftModel.setChecked(false);
-                    EventBus.getDefault().post(new GiftUserRefreshEvent(false, event.type, null));
+                    roonGiftModel.setChecked(giftModel.isChecked());
+//                    EventBus.getDefault().post(new GiftUserRefreshEvent(false, event.type, roonGiftModel));
                 }
+
             }
             if (event.adapter != null && event.adapter.get() != null) {
                 event.adapter.get().notifyDataSetChanged();
diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/widget/dialog/RewardGiftDialogFragment.java b/BaseModule/src/main/java/com/xscm/moduleutil/widget/dialog/RewardGiftDialogFragment.java
index 9e6263b1..c22a5d2e 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/widget/dialog/RewardGiftDialogFragment.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/widget/dialog/RewardGiftDialogFragment.java
@@ -270,7 +270,7 @@ public class RewardGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPr
 
     private void giveGift(String num) {
         getSelectedGift();
-        if (roonGiftModel == null) {
+        if (roonGiftModel == null || !roonGiftModel.isChecked()) {
             ToastUtils.show("请选择礼物");
             return;
         }
diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomGiftDialogFragment.java b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomGiftDialogFragment.java
index bfb1334a..06f7992d 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomGiftDialogFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomGiftDialogFragment.java
@@ -622,7 +622,7 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
 //                return;
 //            }
 //        } else {
-        if (roonGiftModel == null|| roonGiftModel.getGift_id() == null ) {
+        if (roonGiftModel == null|| roonGiftModel.getGift_id() == null || !roonGiftModel.isChecked() ) {
             ToastUtils.show("请选择礼物");
             return;
         }