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