pull/143/head
于俊 1 year ago
parent 88397ae8fe
commit 6ddcd4e43c
  1. 19
      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("id", video.id);
bundle.putString("sourceKey", video.sourceKey); bundle.putString("sourceKey", video.sourceKey);
bundle.putString("title", video.name); 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; 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{ else{
if(video.id == null || video.id.isEmpty() || video.id.startsWith("msearch:")){ 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); gridAdapter.addData(absXml.movie.videoList);
} }
page++; page++;
gridAdapter.loadMoreComplete(); maxPage = absXml.movie.pagecount;
gridAdapter.setEnableLoadMore(true); 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 { } else {
if (page == 1) { if (page == 1) {
showEmpty(); showEmpty();

Loading…
Cancel
Save