From 6b659fafacdadbb4d71d5b6992ab51bb2ddbecb6 Mon Sep 17 00:00:00 2001 From: FongMi Date: Sun, 2 Oct 2022 01:39:19 +0800 Subject: [PATCH] Add keep - part 4 --- .../com/fongmi/android/tv/ui/activity/KeepActivity.java | 2 +- .../main/java/com/fongmi/android/tv/api/ApiConfig.java | 7 ++++++- app/src/main/java/com/fongmi/android/tv/bean/Config.java | 8 ++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/KeepActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/KeepActivity.java index 2b88cd966..93835e6d7 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/KeepActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/KeepActivity.java @@ -65,7 +65,7 @@ public class KeepActivity extends BaseActivity implements KeepPresenter.OnClickL private void loadConfig(Config config, Keep item) { Prefers.putUrl(config.getUrl()); ApiConfig.get().setCid(config.update().getId()); - ApiConfig.get().clear().loadConfig(new Callback() { + ApiConfig.get().clear().loadConfig(true, new Callback() { @Override public void success(String json) { DetailActivity.start(getActivity(), item.getSiteKey(), item.getVodId()); diff --git a/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java b/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java index afb5db3ac..b04fe6cf4 100644 --- a/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java +++ b/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java @@ -80,9 +80,14 @@ public class ApiConfig { } public void loadConfig(Callback callback) { + loadConfig(false, callback); + } + + public void loadConfig(boolean cache, Callback callback) { new Thread(() -> { String url = Prefers.getUrl(); - if (url.startsWith("http")) getWebConfig(url, callback); + if (cache) getCacheConfig(url, callback); + else if (url.startsWith("http")) getWebConfig(url, callback); else if (url.startsWith("file")) getFileConfig(url, callback); else handler.post(() -> callback.error(0)); }).start(); diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Config.java b/app/src/main/java/com/fongmi/android/tv/bean/Config.java index 0533472b8..6beab5daf 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Config.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Config.java @@ -73,7 +73,7 @@ public class Config { public static Config find(String url) { Config item = AppDatabase.get().getConfigDao().find(url); - return item == null ? Config.create() : item.newTime(); + return item == null ? Config.create() : item; } public static void save(String json) { @@ -81,11 +81,6 @@ public class Config { ApiConfig.get().setCid(item.update().getId()); } - public Config newTime() { - setTime(System.currentTimeMillis()); - return this; - } - public Config json(String json) { setJson(json); return this; @@ -96,6 +91,7 @@ public class Config { } public Config update() { + setTime(System.currentTimeMillis()); AppDatabase.get().getConfigDao().update(this); return this; }