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 acb9503e..a1b9d8f3 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java @@ -5569,7 +5569,7 @@ public class RetrofitClient { } else if (baseModel.getCode() == 301) { setCode301(baseModel.getMsg()); } else { -// observer.onNext(new ArrayList<>()); + observer.onNext(new ArrayList<>()); ToastUtils.showShort(baseModel.getMsg()); } diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/TourClubDialogFragment.java b/MainModule/src/main/java/com/xscm/modulemain/dialog/TourClubDialogFragment.java index e8b39ade..8ff91855 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/dialog/TourClubDialogFragment.java +++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/TourClubDialogFragment.java @@ -18,6 +18,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.blankj.utilcode.util.ActivityUtils; import com.blankj.utilcode.util.GsonUtils; import com.blankj.utilcode.util.LogUtils; +import com.blankj.utilcode.util.ThreadUtils; import com.xscm.moduleutil.R; import com.xscm.moduleutil.base.BaseMvpDialogFragment; import com.xscm.moduleutil.bean.GiftBean; @@ -636,7 +637,7 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment data) { - if (data != null) { + if (data != null && !data.isEmpty()) { if (vCheckbox){ showResultDialog(data); }else { @@ -686,7 +687,7 @@ public class TourClubDialogFragment extends BaseMvpDialogFragment { + ThreadUtils.runOnUiThread(() -> { scrollHelper = null; showResultDialog(data); // 抽奖结束后重新启动自动滚动