From 6ddcd4e43c3845deb96b7c6caff7829fce9925bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E4=BF=8A?= <215613905@qq.com>
Date: Thu, 13 Mar 2025 09:39:30 +0800
Subject: [PATCH] fix bug

---
 .../tvbox/osc/ui/fragment/GridFragment.java   | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/github/tvbox/osc/ui/fragment/GridFragment.java b/app/src/main/java/com/github/tvbox/osc/ui/fragment/GridFragment.java
index 4959b239..91565045 100644
--- a/app/src/main/java/com/github/tvbox/osc/ui/fragment/GridFragment.java
+++ b/app/src/main/java/com/github/tvbox/osc/ui/fragment/GridFragment.java
@@ -215,9 +215,13 @@ public class GridFragment extends BaseLazyFragment {
                     bundle.putString("id", video.id);
                     bundle.putString("sourceKey", video.sourceKey);
                     bundle.putString("title", video.name);
-                    if (video.tag != null && (video.tag.equals("folder") || video.tag.equals("cover"))){
+                    if( video.tag !=null && (video.tag.equals("folder") || video.tag.equals("cover"))){
                         focusedView = view;
-                        changeView(video.id,video.tag.equals("cover"));
+                        if(("12".indexOf(getUITag()) != -1)){
+                            changeView(video.id,video.tag.equals("folder"));
+                        }else {
+                            changeView(video.id,false);
+                        }
                     }
                     else{
                         if(video.id == null || video.id.isEmpty() || video.id.startsWith("msearch:")){
@@ -268,8 +272,15 @@ public class GridFragment extends BaseLazyFragment {
                         gridAdapter.addData(absXml.movie.videoList);
                     }
                     page++;
-                    gridAdapter.loadMoreComplete();
-                    gridAdapter.setEnableLoadMore(true);
+                    maxPage = absXml.movie.pagecount;
+                    if (maxPage>0 && page > maxPage) {
+                        gridAdapter.loadMoreEnd();
+                        gridAdapter.setEnableLoadMore(false);
+                        if(page>2)Toast.makeText(getContext(), "没有更多了", Toast.LENGTH_SHORT).show();
+                    }else {
+                        gridAdapter.loadMoreComplete();
+                        gridAdapter.setEnableLoadMore(true);
+                    }
                 } else {
                     if (page == 1) {
                         showEmpty();