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> 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> 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 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 @@ - + android:layout_height="match_parent"> - - + android:layout_height="match_parent" + app:layout_constraintTop_toTopOf="parent" + app:srlEnableLoadMore="true" + app:srlEnableRefresh="true"> + + + \ No newline at end of file