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 07e003339..8accd946a 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 @@ -207,8 +207,7 @@ public class Vod { if (getVodShow().equals("land")) return ViewType.LAND; if (getVodShow().equals("oval")) return ViewType.OVAL; if (getVodShow().equals("full")) return ViewType.FULL; - if (getVodShow().equals("list")) return ViewType.LIST; - if (getVodShow().equals("folder")) return ViewType.FOLDER; + if (getVodShow().equals("list")) return ViewType.FOLDER; return ViewType.GRID; } diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/base/ViewType.java b/app/src/mobile/java/com/fongmi/android/tv/ui/base/ViewType.java index a27e9e335..36de3f366 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/base/ViewType.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/base/ViewType.java @@ -6,8 +6,8 @@ public class ViewType { public static final int LAND = 1; public static final int OVAL = 2; public static final int FULL = 3; - public static final int LIST = 4; - public static final int FOLDER = 5; + public static final int LIST = 98; + public static final int FOLDER = 99; public static final int DARK = 0; public static final int LIGHT = 1; diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/holder/VodListHolder.java b/app/src/mobile/java/com/fongmi/android/tv/ui/holder/VodListHolder.java index c8ab94008..fcbc82f11 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/holder/VodListHolder.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/holder/VodListHolder.java @@ -22,11 +22,9 @@ public class VodListHolder extends BaseVodHolder { @Override public void initView(Vod item) { binding.name.setText(item.getVodName()); - binding.year.setText(item.getVodYear()); binding.site.setText(item.getSiteName()); binding.remark.setText(item.getVodRemarks()); binding.site.setVisibility(item.getSiteVisible()); - binding.year.setVisibility(item.getYearVisible()); binding.remark.setVisibility(item.getRemarkVisible()); binding.getRoot().setOnClickListener(v -> listener.onItemClick(item)); binding.getRoot().setOnLongClickListener(v -> listener.onLongClick(item)); diff --git a/app/src/mobile/res/layout/adapter_vod_full.xml b/app/src/mobile/res/layout/adapter_vod_full.xml index cec0e4a98..6e298e29f 100644 --- a/app/src/mobile/res/layout/adapter_vod_full.xml +++ b/app/src/mobile/res/layout/adapter_vod_full.xml @@ -1,5 +1,6 @@ \ No newline at end of file diff --git a/app/src/mobile/res/layout/adapter_vod_list.xml b/app/src/mobile/res/layout/adapter_vod_list.xml index 37ab395ab..b71c80e25 100644 --- a/app/src/mobile/res/layout/adapter_vod_list.xml +++ b/app/src/mobile/res/layout/adapter_vod_list.xml @@ -14,7 +14,7 @@ android:layout_height="match_parent" android:background="@color/black_10" android:scaleType="center" - app:shapeAppearanceOverlay="@style/Vod.List" + app:shapeAppearanceOverlay="@style/Vod.Grid" tools:src="@drawable/ic_img_loading" />