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 c3bc3ca24..f5ad68694 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 @@ -105,7 +105,7 @@ public class VodConfig { this.flags.clear(); this.parses.clear(); this.loadLive = true; - BaseLoader.get().clear(); + App.execute(() -> BaseLoader.get().clear()); return this; } diff --git a/app/src/main/java/com/fongmi/android/tv/api/loader/JarLoader.java b/app/src/main/java/com/fongmi/android/tv/api/loader/JarLoader.java index e5d0bcde2..564abd6af 100644 --- a/app/src/main/java/com/fongmi/android/tv/api/loader/JarLoader.java +++ b/app/src/main/java/com/fongmi/android/tv/api/loader/JarLoader.java @@ -36,7 +36,7 @@ public class JarLoader { } public void clear() { - for (Spider spider : spiders.values()) App.execute(spider::destroy); + spiders.values().forEach(Spider::destroy); loaders.clear(); methods.clear(); spiders.clear(); diff --git a/app/src/main/java/com/fongmi/android/tv/api/loader/JsLoader.java b/app/src/main/java/com/fongmi/android/tv/api/loader/JsLoader.java index de503a8c4..3d69259c7 100644 --- a/app/src/main/java/com/fongmi/android/tv/api/loader/JsLoader.java +++ b/app/src/main/java/com/fongmi/android/tv/api/loader/JsLoader.java @@ -17,7 +17,7 @@ public class JsLoader { } public void clear() { - for (Spider spider : spiders.values()) App.execute(spider::destroy); + spiders.values().forEach(Spider::destroy); spiders.clear(); } diff --git a/app/src/main/java/com/fongmi/android/tv/api/loader/PyLoader.java b/app/src/main/java/com/fongmi/android/tv/api/loader/PyLoader.java index 9c9807e9d..2bb6314ef 100644 --- a/app/src/main/java/com/fongmi/android/tv/api/loader/PyLoader.java +++ b/app/src/main/java/com/fongmi/android/tv/api/loader/PyLoader.java @@ -20,7 +20,7 @@ public class PyLoader { } public void clear() { - for (Spider spider : spiders.values()) App.execute(spider::destroy); + spiders.values().forEach(Spider::destroy); spiders.clear(); } diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/CastDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/CastDialog.java index e34236c59..baf6fd133 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/CastDialog.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/CastDialog.java @@ -145,9 +145,9 @@ public class CastDialog extends BaseDialog implements DeviceAdapter.OnClickListe private void onRefresh() { adapter.clear(() -> { Device.delete(); + if (fm) scanTask.start(); DLNADevice.get().disconnect(); DLNACastManager.INSTANCE.search(null); - if (fm) scanTask.start(adapter.getIps()); }); } diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/SyncDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/SyncDialog.java index 19e61613c..7e316d1f7 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/SyncDialog.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/SyncDialog.java @@ -143,7 +143,7 @@ public class SyncDialog extends BaseDialog implements DeviceAdapter.OnClickListe private void onRefresh() { adapter.clear(() -> { Device.delete(); - scanTask.start(adapter.getIps()); + scanTask.start(); }); } diff --git a/app/src/mobile/java/com/fongmi/android/tv/utils/ScanTask.java b/app/src/mobile/java/com/fongmi/android/tv/utils/ScanTask.java index 155ad6195..1d4527749 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/utils/ScanTask.java +++ b/app/src/mobile/java/com/fongmi/android/tv/utils/ScanTask.java @@ -27,8 +27,8 @@ public class ScanTask { this.listener = listener; } - public void start(List ips) { - App.execute(() -> run(getUrl(ips))); + public void start() { + App.execute(() -> run(getUrl())); } public void start(String url) { @@ -61,8 +61,8 @@ public class ScanTask { for (String url : urls) executor.execute(() -> findDevice(url)); } - private List getUrl(List ips) { - Set urls = new HashSet<>(ips); + private List getUrl() { + Set urls = new HashSet<>(); String local = Server.get().getAddress(); String base = local.substring(0, local.lastIndexOf(".") + 1); for (int i = 1; i < 256; i++) urls.add(base + i + ":9978");