From 63a406ef03637b0dfbb1ee175dbb831ad281d70c Mon Sep 17 00:00:00 2001 From: FongMi Date: Tue, 27 Dec 2022 18:12:11 +0800 Subject: [PATCH] Update Site.java --- .../java/com/fongmi/android/tv/bean/Site.java | 25 +++++++------------ 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Site.java b/app/src/main/java/com/fongmi/android/tv/bean/Site.java index 3377d054b..c6c84cb27 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Site.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Site.java @@ -102,8 +102,12 @@ public class Site { return playUrl; } + public int getPlayerType() { + return playerType == null ? -1 : playerType; + } + public Integer getSearchable() { - return searchable; + return searchable == null ? 1 : searchable; } public void setSearchable(Integer searchable) { @@ -111,7 +115,7 @@ public class Site { } public Integer getFilterable() { - return filterable; + return filterable == null ? 1 : filterable; } public void setFilterable(Integer filterable) { @@ -151,21 +155,16 @@ public class Site { } public boolean isSearchable() { - return getSearchable() == null || getSearchable() == 1; - } - - public boolean unSearchable() { - return getSearchable() != null && getSearchable() == 0; + return getSearchable() == 1; } public Site setSearchable(boolean searchable) { - if (unSearchable()) return this; - setSearchable(searchable ? 1 : 2); + if (getSearchable() != 0) setSearchable(searchable ? 1 : 2); return this; } public boolean isFilterable() { - return getFilterable() == null || getFilterable() == 1; + return getFilterable() == 1; } public Site setFilterable(boolean filterable) { @@ -181,12 +180,6 @@ public class Site { return isFilterable() ? R.drawable.ic_filter_on : R.drawable.ic_filter_off; } - public int getPlayerType() { - if (playerType == null) return -1; - if (playerType == 1) return 1; - return 0; - } - public static Site find(String key) { return AppDatabase.get().getSiteDao().find(key); }