[mobile] fix page

app/src/main/java/com/fongmi/android/tv/bean/Collect.java

@@ -11,6 +11,7 @@ public class Collect {
     private final Site site;
     private final List<Vod> list;
     private boolean activated;
+    private int page;
 
     public static Collect all() {
         Collect item = new Collect(Site.get("all", ResUtil.getString(R.string.all)), new ArrayList<>());
@@ -42,4 +43,12 @@ public class Collect {
     public void setActivated(boolean activated) {
         this.activated = activated;
     }
+
+    public int getPage() {
+        return Math.max(1, page);
+    }
+
+    public void setPage(int page) {
+        this.page = page;
+    }
 }

app/src/mobile/java/com/fongmi/android/tv/ui/activity/CollectActivity.java

@@ -268,7 +268,7 @@ public class CollectActivity extends BaseActivity implements CustomScroller.Call
         mBinding.recycler.scrollToPosition(0);
         mCollectAdapter.setActivated(position);
         mVodAdapter.clear().addAll(item.getList());
-        mScroller.setEnable(true);
+        mScroller.setPage(item.getPage());
     }
 
     @Override
@@ -284,8 +284,10 @@ public class CollectActivity extends BaseActivity implements CustomScroller.Call
 
     @Override
     public void onLoadMore(String page) {
-        if (mCollectAdapter.getPosition() == 0) return;
-        mViewModel.searchContent(mCollectAdapter.getActivated().getSite(), mBinding.keyword.getText().toString(), page);
+        Collect activated = mCollectAdapter.getActivated();
+        if (activated.getSite().getKey().equals("all")) return;
+        mViewModel.searchContent(activated.getSite(), mBinding.keyword.getText().toString(), page);
+        activated.setPage(Integer.parseInt(page));
         mScroller.setLoading(true);
     }
 

app/src/mobile/java/com/fongmi/android/tv/ui/custom/CustomScroller.java

@@ -20,7 +20,7 @@ public class CustomScroller extends RecyclerView.OnScrollListener {
 
     @Override
     public void onScrolled(@NonNull RecyclerView view, int dx, int dy) {
-        if (!isEnable() || isLoading() || view.getScrollState() == RecyclerView.SCROLL_STATE_IDLE || callback == null) return;
+        if (isDisable() || isLoading() || view.getScrollState() == RecyclerView.SCROLL_STATE_IDLE || callback == null) return;
         if (!view.canScrollVertically(1) && dy > 0) callback.onLoadMore(String.valueOf(++page));
     }
 
@@ -33,6 +33,10 @@ public class CustomScroller extends RecyclerView.OnScrollListener {
         return ++page;
     }
 
+    public void setPage(int page) {
+        this.page = page;
+    }
+
     public boolean isLoading() {
         return loading;
     }
@@ -41,12 +45,8 @@ public class CustomScroller extends RecyclerView.OnScrollListener {
         this.loading = loading;
     }
 
-    public boolean isEnable() {
-        return enable;
-    }
-
-    public void setEnable(boolean enable) {
-        this.enable = enable;
+    public boolean isDisable() {
+        return !enable;
     }
 
     public void setEnable(int pageCount) {

app/src/mobile/java/com/fongmi/android/tv/ui/fragment/TypeFragment.java

@@ -154,7 +154,7 @@ public class TypeFragment extends BaseFragment implements CustomScroller.Callbac
     }
 
     private void checkPage(int count) {
-        if (!mScroller.isEnable() || count == 0 || mAdapter.getItemCount() >= 40 || isFolder() || isHome()) return;
+        if (mScroller.isDisable() || count == 0 || mAdapter.getItemCount() >= 40 || isFolder() || isHome()) return;
         getVideo(getTypeId(), String.valueOf(mScroller.addPage()));
     }