diff --git a/app/src/main/java/com/fongmi/android/tv/api/config/LiveConfig.java b/app/src/main/java/com/fongmi/android/tv/api/config/LiveConfig.java index 9bc7067fa..10802b8ef 100644 --- a/app/src/main/java/com/fongmi/android/tv/api/config/LiveConfig.java +++ b/app/src/main/java/com/fongmi/android/tv/api/config/LiveConfig.java @@ -201,7 +201,7 @@ public class LiveConfig { BaseLoader.get().parseJar(spider, false); setLives(Json.safeListElement(object, "lives").stream().map(element -> Live.objectFrom(element, spider)).distinct().collect(Collectors.toCollection(ArrayList::new))); Map items = Live.findAll().stream().collect(Collectors.toMap(Live::getName, Function.identity())); - if (!getLives().isEmpty()) setHome(config, getLives().get(0), false); + if (!getLives().contains(Live.get(config.getHome()))) setHome(config, getLives().get(0), false); for (Live live : getLives()) { Live item = items.get(live.getName()); if (item != null) live.sync(item); diff --git a/app/src/main/java/com/fongmi/android/tv/api/config/VodConfig.java b/app/src/main/java/com/fongmi/android/tv/api/config/VodConfig.java index d7d5df475..fa9258d65 100644 --- a/app/src/main/java/com/fongmi/android/tv/api/config/VodConfig.java +++ b/app/src/main/java/com/fongmi/android/tv/api/config/VodConfig.java @@ -193,7 +193,7 @@ public class VodConfig { BaseLoader.get().parseJar(spider, true); setSites(Json.safeListElement(object, "sites").stream().map(element -> Site.objectFrom(element, spider)).distinct().collect(Collectors.toCollection(ArrayList::new))); Map items = Site.findAll().stream().collect(Collectors.toMap(Site::getKey, Function.identity())); - if (!getSites().isEmpty()) setHome(config, getSites().get(0), false); + if (!getSites().contains(Site.get(config.getHome()))) setHome(config, getSites().get(0), false); for (Site site : getSites()) { Site item = items.get(site.getKey()); if (item != null) site.sync(item); @@ -203,9 +203,9 @@ public class VodConfig { private void initParse(Config config, JsonObject object) { setParses(Json.safeListElement(object, "parses").stream().map(Parse::objectFrom).distinct().collect(Collectors.toCollection(ArrayList::new))); - if (!getParses().isEmpty()) setParse(config, getParses().get(0), false); + if (!getParses().contains(Parse.get(config.getParse()))) setParse(config, getParses().get(0), false); for (Parse parse : getParses()) { - if (parse.getName().equals(config.getParse()) && parse.getType() > 1) { + if (parse.getName().equals(config.getParse())) { setParse(config, parse, false); break; }