From b23f82546f369c8e050f17d2300d69239f2eb717 Mon Sep 17 00:00:00 2001 From: FongMi Date: Tue, 26 Dec 2023 20:18:32 +0800 Subject: [PATCH 1/2] Update site changeable logic --- .../com/fongmi/android/tv/ui/adapter/SiteAdapter.java | 1 - app/src/main/java/com/fongmi/android/tv/bean/Site.java | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/SiteAdapter.java b/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/SiteAdapter.java index 3ef730a04..a7adb0e81 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/SiteAdapter.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/SiteAdapter.java @@ -62,7 +62,6 @@ public class SiteAdapter extends RecyclerView.Adapter { holder.binding.check.setChecked(getChecked(item)); holder.binding.text.setSelected(item.isActivated()); holder.binding.text.setActivated(item.isActivated()); - holder.binding.check.setEnabled(type != 1 || item.getSearchable() != 0); holder.binding.check.setVisibility(type == 0 ? View.GONE : View.VISIBLE); holder.binding.getRoot().setOnLongClickListener(v -> setLongListener(item)); holder.binding.getRoot().setOnClickListener(v -> setListener(item, position)); 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 18cf06fcb..87ff6ed79 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 @@ -213,7 +213,7 @@ public class Site implements Parcelable { } public Site setChangeable(boolean changeable) { - setChangeable(changeable ? 1 : 0); + if (getChangeable() != 0) setChangeable(changeable ? 1 : 2); return this; } @@ -222,7 +222,7 @@ public class Site implements Parcelable { } public Site setRecordable(boolean recordable) { - setRecordable(recordable ? 1 : 0); + if (getRecordable() != 0) setRecordable(recordable ? 1 : 2); return this; } @@ -237,8 +237,8 @@ public class Site implements Parcelable { public Site sync() { Site item = find(getKey()); if (item == null) return this; - setChangeable(item.getChangeable()); - setRecordable(item.getRecordable()); + if (getChangeable() != 0) setChangeable(Math.max(1, item.getChangeable())); + if (getRecordable() != 0) setRecordable(Math.max(1, item.getRecordable())); if (getSearchable() != 0) setSearchable(Math.max(1, item.getSearchable())); return this; } From db915bb7b824547f405f2e26164d18e4091a369c Mon Sep 17 00:00:00 2001 From: FongMi Date: Tue, 26 Dec 2023 20:23:33 +0800 Subject: [PATCH 2/2] Update build.gradle --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c529bcb90..07f50b6a9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.fongmi.android.tv" minSdk 21 targetSdk 28 - versionCode 213 - versionName "20231226#3" + versionCode 214 + versionName "2.1.4" javaCompileOptions { annotationProcessorOptions { arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]