From cdb5f9b794a3d68994850ae2a7918ab75fc703ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com>
Date: Wed, 14 Jan 2026 15:17:12 +0800
Subject: [PATCH] =?UTF-8?q?1:=E4=BF=AE=E6=94=B9=E6=88=BF=E9=97=B4=E9=80=81?=
 =?UTF-8?q?=E7=A4=BC=E5=BC=B9=E6=A1=86=EF=BC=8C=E8=AE=BE=E7=BD=AE=E4=BA=86?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E7=9A=84=E9=AB=98=E5=BA=A6=E6=98=AF=E8=87=AA?=
 =?UTF-8?q?=E9=80=82=E5=BA=94=202=EF=BC=9A=E4=BF=AE=E6=94=B9=E4=B8=80?=
 =?UTF-8?q?=E9=94=AE=E8=B5=A0=E9=80=81=E8=83=8C=E5=8C=85=E7=A4=BC=E7=89=A9?=
 =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E7=82=B9=E5=87=BB=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E5=87=BA=E7=8E=B0=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xscm/modulemain/dialog/RoomGiftDialogFragment.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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 e13d65bc..a03f6c35 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomGiftDialogFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomGiftDialogFragment.java
@@ -188,7 +188,8 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
             int height = displayMetrics.heightPixels;
 
             // 设置DialogFragment的高度为屏幕高度的70%
-            dialog.getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, (int) (height * 0.7));
+            dialog.getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+//            dialog.getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, (int) (height * 0.7));
         }
     }
 
@@ -472,7 +473,7 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
                 "确认",
                 "取消",
                 v -> {
-                    if (gifyuseradapter.getUserIdToString() != null) {
+                    if (gifyuseradapter != null && gifyuseradapter.getUserIdToString() != null) {
                         // 点击“确认”按钮时执行删除操作
                         MvpPre.getGiftPack(roomId, gifyuseradapter.getUserIdToString(), heart_id, auction_id);
                     }