From 0cf5e8c7e05281bc1f7a0f722ddc49f10b94ab4e Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Sat, 5 Aug 2023 21:57:16 +0800
Subject: [PATCH] Clean code

---
 .../main/java/com/fongmi/android/tv/bean/Vod.java  |  3 ++-
 .../mobile/java/com/fongmi/android/tv/Product.java | 14 ++++++++++----
 .../com/fongmi/android/tv/ui/base/ViewType.java    |  5 ++---
 .../android/tv/ui/fragment/TypeFragment.java       |  2 +-
 4 files changed, 15 insertions(+), 9 deletions(-)

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 8accd946a..07e003339 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,7 +207,8 @@ 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.FOLDER;
+        if (getVodShow().equals("list")) return ViewType.LIST;
+        if (getVodShow().equals("folder")) return ViewType.FOLDER;
         return ViewType.GRID;
     }
 
diff --git a/app/src/mobile/java/com/fongmi/android/tv/Product.java b/app/src/mobile/java/com/fongmi/android/tv/Product.java
index e4d62e376..069a4b265 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/Product.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/Product.java
@@ -15,6 +15,10 @@ public class Product {
         return Math.abs(Setting.getSize() - 5);
     }
 
+    public static int getColumn(int viewType) {
+        return viewType == ViewType.LAND ? getColumn() - 1 : getColumn();
+    }
+
     public static void bootLive() {
     }
 
@@ -23,22 +27,24 @@ public class Product {
     }
 
     public static int[] getSpec(Context context, int viewType) {
-        return getSpec(context, ResUtil.dp2px(32) + ResUtil.dp2px(16 * (getColumn() - 1)), getColumn(), viewType);
+        int column = getColumn(viewType);
+        int space = ResUtil.dp2px(32) + ResUtil.dp2px(16 * (column - 1));
+        return getSpec(context, space, column, viewType);
     }
 
     public static int[] getSpec(Context context, int space, int column) {
         return getSpec(context, space, column, ViewType.GRID);
     }
 
-    public static int[] getSpec(Context context, int space, int column, int viewType) {
+    private static int[] getSpec(Context context, int space, int column, int viewType) {
         int base = ResUtil.getScreenWidth(context) - space;
         int width = base / column;
         return new int[]{width, getHeight(viewType, width)};
     }
 
     private static int getHeight(int viewType, int value) {
-        if (viewType == ViewType.GRID) return (int) (value / 0.75f);
         if (viewType == ViewType.LAND) return (int) (value * 0.75f);
-        return value;
+        if (viewType == ViewType.OVAL) return value;
+        return (int) (value / 0.75f);
     }
 }
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 a453a4d55..a27e9e335 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,9 +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 = 98;
-    public static final int FOLDER = 99;
+    public static final int LIST = 4;
+    public static final int FOLDER = 5;
 
     public static final int DARK = 0;
     public static final int LIGHT = 1;
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 0bbce2cba..a8689e9e1 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
@@ -119,7 +119,7 @@ public class TypeFragment extends BaseFragment implements CustomScroller.Callbac
     private void setViewType(int viewType) {
         mAdapter.setViewType(viewType);
         mAdapter.setSize(Product.getSpec(getActivity(), viewType));
-        mBinding.recycler.setLayoutManager(mAdapter.isList() ? new LinearLayoutManager(getActivity()) : new GridLayoutManager(getContext(), Product.getColumn()));
+        mBinding.recycler.setLayoutManager(mAdapter.isList() ? new LinearLayoutManager(getActivity()) : new GridLayoutManager(getContext(), Product.getColumn(viewType)));
     }
 
     private void setViewModel() {