diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java index d34ad5387..9ec1c3240 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java @@ -996,19 +996,16 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis mBinding.part.setTag(keyword); } - private boolean isPass(Site item, boolean searchOnly) { - if (isAutoMode() && !item.isChangeable() && !searchOnly) return false; - if (isAutoMode() && item.getKey().equals(getKey())) return false; + private boolean isPass(Site item) { + if (isAutoMode() && !item.isChangeable()) return false; return item.isSearchable(); } private void startSearch(String keyword) { mSearchAdapter.clear(); - mExecutor = Executors.newFixedThreadPool(Constant.THREAD_POOL); List sites = new ArrayList<>(); - List items = ApiConfig.get().getSites(); - for (Site item : items) if (isPass(item, false)) sites.add(item); - if (sites.isEmpty()) for (Site item : items) if (isPass(item, true)) sites.add(item); + mExecutor = Executors.newFixedThreadPool(Constant.THREAD_POOL); + for (Site site : ApiConfig.get().getSites()) if (isPass(site)) sites.add(site); for (Site site : sites) mExecutor.execute(() -> search(site, keyword)); } diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java index f3dbdfcac..0a9575702 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java @@ -1048,19 +1048,16 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust startSearch(keyword); } - private boolean isPass(Site item, boolean searchOnly) { - if (isAutoMode() && !item.isChangeable() && !searchOnly) return false; - if (isAutoMode() && item.getKey().equals(getKey())) return false; + private boolean isPass(Site item) { + if (isAutoMode() && !item.isChangeable()) return false; return item.isSearchable(); } private void startSearch(String keyword) { mSearchAdapter.clear(); - mExecutor = Executors.newCachedThreadPool(); List sites = new ArrayList<>(); - List items = ApiConfig.get().getSites(); - for (Site item : items) if (isPass(item, false)) sites.add(item); - if (sites.isEmpty()) for (Site item : items) if (isPass(item, true)) sites.add(item); + mExecutor = Executors.newCachedThreadPool(); + for (Site item : ApiConfig.get().getSites()) if (isPass(item)) sites.add(item); for (Site site : sites) mExecutor.execute(() -> search(site, keyword)); }