YUSHENG/yusheng-android
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1:修改背包上拉加载不显示的问题

Browse Source 
2：修改礼盒记录标题显示
This commit is contained in:
梁小江
2025-12-15 18:20:05 +08:00
parent c2f5376ec8
commit a7a24b52f9
5 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java
View File

@@ -921,6 +921,8 @@ public class RetrofitClient {
BaseModel<List<MyBagDataBean>> baseModel = response.body(); BaseModel<List<MyBagDataBean>> baseModel = response.body();
if (baseModel.getCode() == 1) { if (baseModel.getCode() == 1) {
observer.onNext(baseModel.getData()); 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(); BaseModel<List<MyBagDataBean>> baseModel = response.body();
if (baseModel.getCode() == 1) { if (baseModel.getCode() == 1) {
observer.onNext(baseModel.getData()); observer.onNext(baseModel.getData());
}else if (baseModel.getCode() == 0) {
observer.onNext(new ArrayList<>());
} }
} }
} }
@@ -961,7 +965,7 @@ public class RetrofitClient {
if (baseModel.getCode() == 1) { if (baseModel.getCode() == 1) {
observer.onNext(baseModel.getData()); observer.onNext(baseModel.getData());
} else { } else {
observer.onNext(null); // observer.onNext(null);
} }
} }
} }
@@ -982,7 +986,7 @@ public class RetrofitClient {
if (baseModel.getCode() == 1) { if (baseModel.getCode() == 1) {
observer.onNext(baseModel.getMsg()); observer.onNext(baseModel.getMsg());
} else { } else {
observer.onNext(null); // observer.onNext(null);
} }
} }
} }

2
MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/GiftBoxRecordActivity.java
View File

@@ -37,7 +37,7 @@ public class GiftBoxRecordActivity extends BaseMvpActivity<GiftBoxRecordPresente
@Override @Override
protected void initData() { protected void initData() {
MvpPre.dailyTasksBoxRecord(); MvpPre.dailyTasksBoxRecord();
mBinding.topBar.setTitle("每日任务"); mBinding.topBar.setTitle("礼盒记录");
} }

1
MainModule/src/main/java/com/xscm/modulemain/activity/user/presenter/MyBagPresenter.java
View File

@@ -55,6 +55,7 @@ public class MyBagPresenter extends BasePresenter<MyBagConacts.View> implements
MvpRef=new WeakReference<>(mView); MvpRef=new WeakReference<>(mView);
} }
MvpRef.get().packOutcome(myBagDataBeans); MvpRef.get().packOutcome(myBagDataBeans);
MvpRef.get().finishRefreshLoadMore();
} }
}); });
} }

4
MainModule/src/main/res/layout/activity_gift_box_record.xml
View File

@@ -11,7 +11,7 @@
<LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
> >
<com.xscm.moduleutil.widget.CustomTopBar <com.xscm.moduleutil.widget.CustomTopBar
@@ -26,7 +26,7 @@
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:id="@+id/rv_gift_box_record" android:id="@+id/rv_gift_box_record"
android:layout_marginTop="@dimen/dp_22" android:layout_marginTop="@dimen/dp_22"
android:padding="@dimen/dp_16" android:padding="@dimen/dp_16"

35
MainModule/src/main/res/layout/fragment_my_bag_list.xml
View File

@@ -2,22 +2,29 @@
<layout xmlns:android="http://schemas.android.com/apk/res/android" <layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"> xmlns:app="http://schemas.android.com/apk/res-auto">
<com.scwang.smartrefresh.layout.SmartRefreshLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/smart_refresh_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
app:srlEnableLoadMore="true"
app:srlEnableRefresh="true">
<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_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_marginTop="10dp" app:layout_constraintTop_toTopOf="parent"
android:layout_marginBottom="10dp" app:srlEnableLoadMore="true"
android:background="@drawable/bg_r10_white" app:srlEnableRefresh="true">
android:overScrollMode="never"
android:scrollbars="none" />
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
<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> </layout>