diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/VodFragment.java b/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/VodFragment.java index 964cde373..d91f8ef3a 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/VodFragment.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/VodFragment.java @@ -151,7 +151,7 @@ public class VodFragment extends BaseFragment implements CustomScroller.Callback private void addVideo(List items) { if (items.isEmpty()) return; - boolean list = mPages.isEmpty() ? isFolder() : items.get(0).isList(); + boolean list = items.get(0).isList(isFolder()); if (list) mAdapter.addAll(mAdapter.size(), items); else addGrid(items); } @@ -240,7 +240,7 @@ public class VodFragment extends BaseFragment implements CustomScroller.Callback @Override public void onItemClick(Vod item) { - if (item.isFolder() || item.isCover()) { + if (item.isFolder()) { mPages.add(Page.get(item.getVodId(), mBinding.recycler.getSelectedPosition())); mBinding.recycler.setMoveTop(false); getVideo(item.getVodId(), "1"); diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Vod.java b/app/src/main/java/com/fongmi/android/tv/bean/Vod.java index deb62858b..94c5dc514 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Vod.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Vod.java @@ -196,20 +196,12 @@ public class Vod { return getVodRemarks().isEmpty() ? View.GONE : View.VISIBLE; } - public boolean isCover() { - return getVodTag().equals("cover"); - } - public boolean isFolder() { return getVodTag().equals("folder"); } - public boolean isFile() { - return getVodTag().equals("file"); - } - - public boolean isList() { - return getVodShow().isEmpty() ? (isFolder() || isFile()) : getVodShow().equals("list"); + public boolean isList(boolean folder) { + return getVodShow().isEmpty() ? folder : getVodShow().equals("list"); } public String getVodName(String name) { diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/TypeFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/TypeFragment.java index b988eafb1..06ac4d32e 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/TypeFragment.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/TypeFragment.java @@ -142,7 +142,7 @@ public class TypeFragment extends BaseFragment implements CustomScroller.Callbac private void addVideo(List items) { if (items.isEmpty()) return; - boolean list = mPages.isEmpty() ? isFolder() : items.get(0).isList(); + boolean list = items.get(0).isList(isFolder()); int viewType = list ? ViewType.FOLDER : ViewType.GRID; if (viewType != mAdapter.getViewType()) setViewType(list); mAdapter.addAll(items); @@ -196,7 +196,7 @@ public class TypeFragment extends BaseFragment implements CustomScroller.Callbac @Override public void onItemClick(Vod item) { - if (item.isFolder() || item.isCover()) { + if (item.isFolder()) { mPages.add(Page.get(item.getVodId(), findPosition())); getVideo(item.getVodId(), "1"); } else {