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 0609a283d..964cde373 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,8 +151,8 @@ public class VodFragment extends BaseFragment implements CustomScroller.Callback private void addVideo(List items) { if (items.isEmpty()) return; - boolean folder = mPages.isEmpty() ? isFolder() : items.get(0).isList(); - if (folder) mAdapter.addAll(mAdapter.size(), items); + boolean list = mPages.isEmpty() ? isFolder() : items.get(0).isList(); + if (list) mAdapter.addAll(mAdapter.size(), items); else addGrid(items); } 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 2b45e7db2..deb62858b 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 @@ -77,6 +77,9 @@ public class Vod { @SerializedName("vod_tag") private String vodTag; + @SerializedName("vod_show") + private String vodShow; + @Path("dl") @ElementList(entry = "dd", required = false, inline = true) private List vodFlags; @@ -153,6 +156,10 @@ public class Vod { return TextUtils.isEmpty(vodTag) ? "" : vodTag; } + public String getVodShow() { + return TextUtils.isEmpty(vodShow) ? "" : vodShow; + } + public List getVodFlags() { return vodFlags = vodFlags == null ? new ArrayList<>() : vodFlags; } @@ -202,7 +209,7 @@ public class Vod { } public boolean isList() { - return isFolder() || isFile(); + return getVodShow().isEmpty() ? (isFolder() || isFile()) : 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 166752f46..b988eafb1 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,9 +142,9 @@ public class TypeFragment extends BaseFragment implements CustomScroller.Callbac private void addVideo(List items) { if (items.isEmpty()) return; - boolean folder = mPages.isEmpty() ? isFolder() : items.get(0).isList(); - int viewType = folder ? ViewType.FOLDER : ViewType.GRID; - if (viewType != mAdapter.getViewType()) setViewType(folder); + boolean list = mPages.isEmpty() ? isFolder() : items.get(0).isList(); + int viewType = list ? ViewType.FOLDER : ViewType.GRID; + if (viewType != mAdapter.getViewType()) setViewType(list); mAdapter.addAll(items); }