From a7a24b52f95a784b29d8fa692446dc1ec51c1dcc 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 18:20:05 +0800
Subject: [PATCH] =?UTF-8?q?1:=E4=BF=AE=E6=94=B9=E8=83=8C=E5=8C=85=E4=B8=8A?=
 =?UTF-8?q?=E6=8B=89=E5=8A=A0=E8=BD=BD=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=202=EF=BC=9A=E4=BF=AE=E6=94=B9=E7=A4=BC?=
 =?UTF-8?q?=E7=9B=92=E8=AE=B0=E5=BD=95=E6=A0=87=E9=A2=98=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xscm/moduleutil/http/RetrofitClient.java  |  8 +++--
 .../user/activity/GiftBoxRecordActivity.java  |  2 +-
 .../user/presenter/MyBagPresenter.java        |  1 +
 .../res/layout/activity_gift_box_record.xml   |  4 +--
 .../main/res/layout/fragment_my_bag_list.xml  | 35 +++++++++++--------
 5 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
index 06b259a6..ebacc958 100644
--- a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
+++ b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
@@ -921,6 +921,8 @@ public class RetrofitClient {
                     BaseModel<List<MyBagDataBean>> baseModel = response.body();
                     if (baseModel.getCode() == 1) {
                         observer.onNext(baseModel.getData());
+                    }else if (baseModel.getCode() == 0) {
+                        observer.onNext(new ArrayList<>());
                     }
                 }
             }
@@ -940,6 +942,8 @@ public class RetrofitClient {
                     BaseModel<List<MyBagDataBean>> baseModel = response.body();
                     if (baseModel.getCode() == 1) {
                         observer.onNext(baseModel.getData());
+                    }else if (baseModel.getCode() == 0) {
+                        observer.onNext(new ArrayList<>());
                     }
                 }
             }
@@ -961,7 +965,7 @@ public class RetrofitClient {
                     if (baseModel.getCode() == 1) {
                         observer.onNext(baseModel.getData());
                     } else {
-                        observer.onNext(null);
+//                        observer.onNext(null);
                     }
                 }
             }
@@ -982,7 +986,7 @@ public class RetrofitClient {
                     if (baseModel.getCode() == 1) {
                         observer.onNext(baseModel.getMsg());
                     } else {
-                        observer.onNext(null);
+//                        observer.onNext(null);
                     }
                 }
             }
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/GiftBoxRecordActivity.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/GiftBoxRecordActivity.java
index 7bf22747..fdeb9387 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/GiftBoxRecordActivity.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/GiftBoxRecordActivity.java
@@ -37,7 +37,7 @@ public class GiftBoxRecordActivity extends BaseMvpActivity<GiftBoxRecordPresente
     @Override
     protected void initData() {
         MvpPre.dailyTasksBoxRecord();
-        mBinding.topBar.setTitle("每日任务");
+        mBinding.topBar.setTitle("礼盒记录");
 
     }
 
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/presenter/MyBagPresenter.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/presenter/MyBagPresenter.java
index f73dc35a..5ca811a4 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/presenter/MyBagPresenter.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/presenter/MyBagPresenter.java
@@ -55,6 +55,7 @@ public class MyBagPresenter extends BasePresenter<MyBagConacts.View> implements
                     MvpRef=new WeakReference<>(mView);
                 }
                 MvpRef.get().packOutcome(myBagDataBeans);
+                MvpRef.get().finishRefreshLoadMore();
             }
         });
     }
diff --git a/MainModule/src/main/res/layout/activity_gift_box_record.xml b/MainModule/src/main/res/layout/activity_gift_box_record.xml
index c91edfec..402ebd1f 100644
--- a/MainModule/src/main/res/layout/activity_gift_box_record.xml
+++ b/MainModule/src/main/res/layout/activity_gift_box_record.xml
@@ -11,7 +11,7 @@
     <LinearLayout
         android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         >
 
         <com.xscm.moduleutil.widget.CustomTopBar
@@ -26,7 +26,7 @@
 
         <androidx.recyclerview.widget.RecyclerView
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:id="@+id/rv_gift_box_record"
             android:layout_marginTop="@dimen/dp_22"
             android:padding="@dimen/dp_16"
diff --git a/MainModule/src/main/res/layout/fragment_my_bag_list.xml b/MainModule/src/main/res/layout/fragment_my_bag_list.xml
index 5088afd5..e805903a 100644
--- a/MainModule/src/main/res/layout/fragment_my_bag_list.xml
+++ b/MainModule/src/main/res/layout/fragment_my_bag_list.xml
@@ -2,22 +2,29 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <com.scwang.smartrefresh.layout.SmartRefreshLayout
-        android:id="@+id/smart_refresh_layout"
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:srlEnableLoadMore="true"
-        app:srlEnableRefresh="true">
+        android:layout_height="match_parent">
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recyclerView"
+
+        <com.scwang.smartrefresh.layout.SmartRefreshLayout
+            android:id="@+id/smart_refresh_layout"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:layout_marginBottom="10dp"
-            android:background="@drawable/bg_r10_white"
-            android:overScrollMode="never"
-            android:scrollbars="none" />
-    </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+            android:layout_height="match_parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:srlEnableLoadMore="true"
+            app:srlEnableRefresh="true">
 
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="60dp"
+                android:background="@drawable/bg_r10_white"
+                android:overScrollMode="never"
+                android:paddingBottom="@dimen/dp_100"
+                android:scrollbars="none" />
+        </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file