diff --git a/app/src/main/java/com/fongmi/android/tv/ui/custom/CustomScroller.java b/app/src/main/java/com/fongmi/android/tv/ui/custom/CustomScroller.java index 7e7edd106..2821964b5 100644 --- a/app/src/main/java/com/fongmi/android/tv/ui/custom/CustomScroller.java +++ b/app/src/main/java/com/fongmi/android/tv/ui/custom/CustomScroller.java @@ -7,7 +7,6 @@ public class CustomScroller extends RecyclerView.OnScrollListener { private final Callback callback; private boolean loading; - private boolean more; private int page; public CustomScroller(Callback callback) { @@ -22,18 +21,11 @@ public class CustomScroller extends RecyclerView.OnScrollListener { } public void reset() { - more = false; page = 1; } - public boolean addPage() { - if (more) return false; - page++; - return more = true; - } - - public int getPage() { - return page; + public int addPage() { + return ++page; } public boolean isLoading() { diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/child/TypeFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/child/TypeFragment.java index e0bcbadca..0429a8d57 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/child/TypeFragment.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/child/TypeFragment.java @@ -103,7 +103,7 @@ public class TypeFragment extends BaseFragment implements CustomScroller.Callbac mScroller.endLoading(result.getList().isEmpty()); mBinding.swipeLayout.setRefreshing(false); mVodAdapter.addAll(result.getList()); - checkPage(); + checkPage(result.getList().size()); }); } @@ -113,9 +113,9 @@ public class TypeFragment extends BaseFragment implements CustomScroller.Callbac getVideo(getTypeId(), "1"); } - private void checkPage() { - if (mScroller.getPage() != 1 || mVodAdapter.getItemCount() >= 40 || isFolder()) return; - if (mScroller.addPage()) getVideo(getTypeId(), "2"); + private void checkPage(int count) { + if (count == 0 || mVodAdapter.getItemCount() >= 40 || isFolder()) return; + getVideo(getTypeId(), String.valueOf(mScroller.addPage())); } private void getVideo(String typeId, String page) {