From ae4dc34da4701ab24c424d11d15c4eba18ecac02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com>
Date: Thu, 28 Aug 2025 23:17:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80=EF=BC=8C=E8=87=AA=E9=80=82=E5=BA=94=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../GiftLotteryDialogFragment.java            | 36 +++++++-
 .../layout/dialog_gift_lottery_fragment.xml   | 84 +++++++++----------
 2 files changed, 75 insertions(+), 45 deletions(-)

diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryDialogFragment.java b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryDialogFragment.java
index bceecbe..38e4f7f 100644
--- a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryDialogFragment.java
+++ b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryDialogFragment.java
@@ -1,11 +1,16 @@
 package com.xscm.moduleutil.dialog.giftLottery;
 
+import android.app.Dialog;
 import android.content.Context;
 import android.os.Bundle;
 import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.GridLayoutManager;
 
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
@@ -19,6 +24,7 @@ import com.xscm.moduleutil.bean.blindboxwheel.BlindReslutBean;
 import com.xscm.moduleutil.databinding.DialogGiftLotteryFragmentBinding;
 import com.xscm.moduleutil.widget.pagerecyclerview.PagerGridSnapHelper;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -32,6 +38,7 @@ public class GiftLotteryDialogFragment extends BaseMvpDialogFragment<GiftLottery
     private String giftBagId;
     private int type=1;
     private GiftLotteryAdapter adapter;
+    private List<GiftBean> data=new ArrayList<>();
 
     @Override
     protected GiftLotteryPresenter bindPresenter() {
@@ -45,7 +52,34 @@ public class GiftLotteryDialogFragment extends BaseMvpDialogFragment<GiftLottery
         fragment.setArguments(args);
         return fragment;
     }
+    @Nullable
+    @Override
+    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+        Dialog dialog = super.onCreateDialog(savedInstanceState);
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.setCancelable(true);
+        return dialog;
+    }
 
+    @Override
+    public void onStart() {
+        super.onStart();
+        Window window = getDialog().getWindow();
+        if (window != null) {
+            // 获取屏幕高度
+            android.util.DisplayMetrics displayMetrics = new android.util.DisplayMetrics();
+            requireActivity().getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
+            int screenHeight = displayMetrics.heightPixels;
+
+            // 设置高度为屏幕高度的100%（全屏）
+            int heightInPx = screenHeight;
+            window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, heightInPx);
+            window.setBackgroundDrawableResource(android.R.color.transparent);
+
+            // 可选：设置动画样式（从底部弹出）
+            window.setWindowAnimations(R.style.CommonShowDialogBottom);
+        }
+    }
     @Override
     public void onAttach(@NonNull Context context) {
         super.onAttach(context);
@@ -136,7 +170,7 @@ public class GiftLotteryDialogFragment extends BaseMvpDialogFragment<GiftLottery
             setTextViewStyle(mBinding.textView2, true);
             setTextViewStyle(mBinding.textView1, false);
         }
-
+        data.clear();
         MvpPre.getMyRecord(giftBagId, page+"", "20",type);
     }
 
diff --git a/moduleUtil/src/main/res/layout/dialog_gift_lottery_fragment.xml b/moduleUtil/src/main/res/layout/dialog_gift_lottery_fragment.xml
index 7ab083b..d4c3bc9 100644
--- a/moduleUtil/src/main/res/layout/dialog_gift_lottery_fragment.xml
+++ b/moduleUtil/src/main/res/layout/dialog_gift_lottery_fragment.xml
@@ -20,8 +20,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-
-        <androidx.constraintlayout.widget.ConstraintLayout
+        <LinearLayout
             android:id="@+id/custom_tab_layout"
             android:layout_width="match_parent"
             android:layout_height="0dp"
@@ -30,50 +29,55 @@
             android:layout_marginEnd="@dimen/dp_16"
             android:layout_marginBottom="@dimen/dp_30"
             android:background="#80000000"
+            android:orientation="vertical"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/im_jc">
 
-            <TextView
-                android:id="@+id/textView1"
-                android:layout_width="0dp"
-                android:layout_height="@dimen/dp_24"
-                android:background="@mipmap/tab_dy"
-                android:layout_marginTop="@dimen/dp_16"
-                android:gravity="center"
-                android:text="我的记录"
-                android:textColor="@color/white"
-                android:layout_marginStart="@dimen/sp_12"
-                android:textSize="@dimen/sp_16"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintWidth_default="percent"
-                app:layout_constraintWidth_percent="0.2" />
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/cl"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
-            <TextView
-                android:id="@+id/textView2"
-                android:layout_width="0dp"
-                android:layout_height="@dimen/dp_24"
-                android:layout_marginStart="@dimen/dp_16"
-                android:gravity="center"
-                android:text="全服记录"
-                android:textColor="#5B5B5B"
-                android:textSize="@dimen/sp_14"
-                app:layout_constraintStart_toEndOf="@+id/textView1"
-                app:layout_constraintTop_toTopOf="@+id/textView1"
-                app:layout_constraintWidth_default="percent"
-                app:layout_constraintWidth_percent="0.2" />
+                <TextView
+                    android:id="@+id/textView1"
+                    android:layout_width="0dp"
+                    android:layout_height="@dimen/dp_24"
+                    android:layout_marginStart="@dimen/sp_12"
+                    android:layout_marginTop="@dimen/dp_16"
+                    android:background="@mipmap/tab_dy"
+                    android:gravity="center"
+                    android:text="我的记录"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/sp_16"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintWidth_default="percent"
+                    app:layout_constraintWidth_percent="0.2" />
+
+                <TextView
+                    android:id="@+id/textView2"
+                    android:layout_width="0dp"
+                    android:layout_height="@dimen/dp_24"
+                    android:layout_marginStart="@dimen/dp_16"
+                    android:gravity="center"
+                    android:text="全服记录"
+                    android:textColor="#5B5B5B"
+                    android:textSize="@dimen/sp_14"
+                    app:layout_constraintStart_toEndOf="@+id/textView1"
+                    app:layout_constraintTop_toTopOf="@+id/textView1"
+                    app:layout_constraintWidth_default="percent"
+                    app:layout_constraintWidth_percent="0.2" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
 
             <com.scwang.smartrefresh.layout.SmartRefreshLayout
                 android:id="@+id/smart_refresh_layout"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="0dp"
+                android:layout_weight="1"
                 android:layout_marginTop="@dimen/dp_16"
                 android:layout_marginBottom="@dimen/dp_30"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/textView1"
                 app:srlEnableLoadMore="true"
                 app:srlEnableRefresh="true">
 
@@ -85,21 +89,13 @@
                     android:layout_marginEnd="@dimen/dp_10"
                     android:nestedScrollingEnabled="false"
                     app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-                    app:layout_constraintTop_toBottomOf="@+id/im_jc"
                     app:spanCount="3"
                     tools:listitem="@layout/item_prize_pool" />
 
             </com.scwang.smartrefresh.layout.SmartRefreshLayout>
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_60"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/smart_refresh_layout"/>
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
+        </LinearLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</layout>
\ No newline at end of file
+</layout>