diff --git a/app/src/main/java/com/github/tvbox/osc/js/ES6Module.java b/app/src/main/java/com/github/tvbox/osc/js/ES6Module.java index a661a97d..8aca3a6d 100644 --- a/app/src/main/java/com/github/tvbox/osc/js/ES6Module.java +++ b/app/src/main/java/com/github/tvbox/osc/js/ES6Module.java @@ -3,7 +3,6 @@ package com.github.tvbox.osc.js; import android.net.Uri; import android.text.TextUtils; -import com.github.tvbox.osc.api.ApiConfig; import com.github.tvbox.osc.util.FileUtils; import com.github.tvbox.osc.util.OkGoHelper; import com.quickjs.QuickJS; @@ -26,7 +25,6 @@ public class ES6Module extends com.quickjs.ES6Module { } public void setModuleUrl(String url) { - if (url.startsWith("clan://")) url = ApiConfig.get().clanToAddress(url); moduleUrl = url; } diff --git a/app/src/main/java/com/github/tvbox/osc/js/HtmlParser.java b/app/src/main/java/com/github/tvbox/osc/js/HtmlParser.java index 2cc453fd..46f569ff 100644 --- a/app/src/main/java/com/github/tvbox/osc/js/HtmlParser.java +++ b/app/src/main/java/com/github/tvbox/osc/js/HtmlParser.java @@ -70,6 +70,7 @@ public class HtmlParser { painfo.excludes.remove(0); painfo.nparse_rule = split3[0]; } + if (painfo.nparse_index < 0) painfo.nparse_index = 0; return painfo; } diff --git a/app/src/main/java/com/github/tvbox/osc/ui/activity/FastSearchActivity.java b/app/src/main/java/com/github/tvbox/osc/ui/activity/FastSearchActivity.java index 5eff6d00..4dae0c12 100644 --- a/app/src/main/java/com/github/tvbox/osc/ui/activity/FastSearchActivity.java +++ b/app/src/main/java/com/github/tvbox/osc/ui/activity/FastSearchActivity.java @@ -194,7 +194,6 @@ public class FastSearchActivity extends BaseActivity { try { if (searchExecutorService != null) { pauseRunnable = searchExecutorService.shutdownNow(); - JSEngine.getInstance().stopAll(); searchExecutorService = null; } } catch (Throwable th) { @@ -221,7 +220,6 @@ public class FastSearchActivity extends BaseActivity { try { if (searchExecutorService != null) { pauseRunnable = searchExecutorService.shutdownNow(); - JSEngine.getInstance().stopAll(); searchExecutorService = null; } } catch (Throwable th) { @@ -380,7 +378,6 @@ public class FastSearchActivity extends BaseActivity { try { if (searchExecutorService != null) { searchExecutorService.shutdownNow(); - JSEngine.getInstance().stopAll(); searchExecutorService = null; } } catch (Throwable th) { @@ -502,7 +499,6 @@ public class FastSearchActivity extends BaseActivity { try { if (searchExecutorService != null) { searchExecutorService.shutdownNow(); - JSEngine.getInstance().stopAll(); searchExecutorService = null; } } catch (Throwable th) { diff --git a/app/src/main/java/com/github/tvbox/osc/ui/activity/SearchActivity.java b/app/src/main/java/com/github/tvbox/osc/ui/activity/SearchActivity.java index 1de05eb5..092874b9 100644 --- a/app/src/main/java/com/github/tvbox/osc/ui/activity/SearchActivity.java +++ b/app/src/main/java/com/github/tvbox/osc/ui/activity/SearchActivity.java @@ -192,8 +192,8 @@ public class SearchActivity extends BaseActivity { if (video != null) { try { if (searchExecutorService != null) { - pauseRunnable = searchExecutorService.shutdownNow(); JSEngine.getInstance().stopAll(); + pauseRunnable = searchExecutorService.shutdownNow(); searchExecutorService = null; } } catch (Throwable th) { @@ -443,7 +443,6 @@ public class SearchActivity extends BaseActivity { try { if (searchExecutorService != null) { searchExecutorService.shutdownNow(); - JSEngine.getInstance().stopAll(); searchExecutorService = null; } } catch (Throwable th) { @@ -522,7 +521,6 @@ public class SearchActivity extends BaseActivity { try { if (searchExecutorService != null) { searchExecutorService.shutdownNow(); - JSEngine.getInstance().stopAll(); searchExecutorService = null; } } catch (Throwable th) { diff --git a/app/src/main/java/com/github/tvbox/osc/viewmodel/SourceViewModel.java b/app/src/main/java/com/github/tvbox/osc/viewmodel/SourceViewModel.java index bd4253e9..b5f83a6e 100644 --- a/app/src/main/java/com/github/tvbox/osc/viewmodel/SourceViewModel.java +++ b/app/src/main/java/com/github/tvbox/osc/viewmodel/SourceViewModel.java @@ -255,6 +255,7 @@ public class SourceViewModel extends ViewModel { .params("t", sortData.id) .params("pg", page) .params(sortData.filterSelect) + .params("f", (sortData.filterSelect == null || sortData.filterSelect.size() <= 0) ? "" : new JSONObject(sortData.filterSelect).toString()) .execute(new AbsCallback() { @Override @@ -482,7 +483,7 @@ public class SourceViewModel extends ViewModel { try { Spider sp = ApiConfig.get().getCSP(sourceBean); String search = sp.searchContent(wd, false); - if(!search.isEmpty()){ + if(!TextUtils.isEmpty(search)){ json(searchResult, search, sourceBean.getKey()); } } catch (Throwable th) {