From 368e4a6cacc876b3d1ba75acc0b025555e85143f Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 17 Aug 2023 21:54:00 +0800 Subject: [PATCH] Fix bug --- .../java/com/fongmi/android/tv/api/LiveConfig.java | 12 ++++++------ .../main/java/com/fongmi/android/tv/bean/Live.java | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/fongmi/android/tv/api/LiveConfig.java b/app/src/main/java/com/fongmi/android/tv/api/LiveConfig.java index 5098b05b4..f0a8778d6 100644 --- a/app/src/main/java/com/fongmi/android/tv/api/LiveConfig.java +++ b/app/src/main/java/com/fongmi/android/tv/api/LiveConfig.java @@ -139,12 +139,17 @@ public class LiveConfig { public void parseConfig(JsonObject object, Callback callback) { if (!object.has("lives")) return; - for (JsonElement element : Json.safeListElement(object, "lives")) parse(Live.objectFrom(element).check()); + for (JsonElement element : Json.safeListElement(object, "lives")) add(Live.objectFrom(element).check()); + for (Live live : lives) if (live.getName().equals(config.getHome())) setHome(live); if (home == null) setHome(lives.isEmpty() ? new Live() : lives.get(0)); if (home.isBoot() || Setting.isBootLive()) App.post(this::bootLive); if (callback != null) App.post(callback::success); } + private void add(Live live) { + if (!lives.contains(live)) lives.add(live); + } + private void bootLive() { LiveActivity.start(App.activity()); Setting.putBootLive(false); @@ -154,11 +159,6 @@ public class LiveConfig { parseConfig(object, null); } - private void parse(Live live) { - if (live.getName().equals(config.getHome())) setHome(live); - if (!lives.contains(live)) lives.add(live); - } - private void setKeep(List items) { List key = new ArrayList<>(); for (Keep keep : Keep.getLive()) key.add(keep.getKey()); diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Live.java b/app/src/main/java/com/fongmi/android/tv/bean/Live.java index f2b8070e9..0aa427f4c 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Live.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Live.java @@ -174,6 +174,6 @@ public class Live { if (this == obj) return true; if (!(obj instanceof Live)) return false; Live it = (Live) obj; - return getName().equals(it.getName()) && getUrl().equals(it.getUrl()); + return getName().equals(it.getName()); } }