diff --git a/app/src/main/java/com/fongmi/android/tv/App.java b/app/src/main/java/com/fongmi/android/tv/App.java index 93bef9e26..44e2cdd81 100644 --- a/app/src/main/java/com/fongmi/android/tv/App.java +++ b/app/src/main/java/com/fongmi/android/tv/App.java @@ -40,7 +40,7 @@ public class App extends Application { public App() { instance = this; - executor = Executors.newFixedThreadPool(Constant.THREAD_POOL); + executor = Executors.newFixedThreadPool(Constant.THREAD_POOL * 2); handler = HandlerCompat.createAsync(Looper.getMainLooper()); gson = new Gson(); } diff --git a/app/src/mobile/java/com/fongmi/android/tv/cast/ScanTask.java b/app/src/mobile/java/com/fongmi/android/tv/cast/ScanTask.java index 23a2cb0d8..2401d3cc6 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/cast/ScanTask.java +++ b/app/src/mobile/java/com/fongmi/android/tv/cast/ScanTask.java @@ -48,7 +48,7 @@ public class ScanTask { private void getDevice(List urls) throws Exception { CountDownLatch cd = new CountDownLatch(urls.size()); - for (String url : urls) App.execute(() -> findDevice(cd, url)); + for (String url : urls) new Thread(() -> findDevice(cd, url)).start(); cd.await(); } diff --git a/pyramid/src/main/java/com/undcover/freedom/pyramid/Spider.java b/pyramid/src/main/java/com/undcover/freedom/pyramid/Spider.java index 939dc63ac..2acddaf2f 100644 --- a/pyramid/src/main/java/com/undcover/freedom/pyramid/Spider.java +++ b/pyramid/src/main/java/com/undcover/freedom/pyramid/Spider.java @@ -70,7 +70,7 @@ public class Spider extends com.github.catvod.crawler.Spider { @Override public String searchContent(String key, boolean quick, String pg) { - return app.callAttr("searchContent", obj, key, quick, pg).toString(); + return app.callAttr("searchContentPage", obj, key, quick, pg).toString(); } @Override diff --git a/pyramid/src/main/python/app.py b/pyramid/src/main/python/app.py index 2eb525a75..6f5d5f0b9 100644 --- a/pyramid/src/main/python/app.py +++ b/pyramid/src/main/python/app.py @@ -75,6 +75,12 @@ def searchContent(ru, key, quick): return formatJo +def searchContentPage(ru, key, quick, pg): + result = ru.searchContentPage(key, quick, pg) + formatJo = json.dumps(result, ensure_ascii=False) + return formatJo + + def localProxy(ru, param): result = ru.localProxy(str2json(param)) return result diff --git a/pyramid/src/main/python/base/spider.py b/pyramid/src/main/python/base/spider.py index d77b01d8d..c37d02b98 100644 --- a/pyramid/src/main/python/base/spider.py +++ b/pyramid/src/main/python/base/spider.py @@ -40,6 +40,10 @@ class Spider(metaclass=ABCMeta): def searchContent(self, key, quick): pass + @abstractmethod + def searchContentPage(self, key, quick, pg): + pass + @abstractmethod def playerContent(self, flag, id, vipFlags): pass diff --git a/pyramid/src/main/python/runner.py b/pyramid/src/main/python/runner.py index 203462740..8ad616f8d 100644 --- a/pyramid/src/main/python/runner.py +++ b/pyramid/src/main/python/runner.py @@ -26,6 +26,9 @@ class Runner(): def searchContent(self, key, quick): return self.spider.searchContent(key, quick) + def searchContentPage(self, key, quick, pg): + return self.spider.searchContentPage(key, quick, pg) + def playerContent(self, flag, id, vipFlags): return self.spider.playerContent(flag, id, vipFlags) diff --git a/pyramid/src/main/python/trigger.py b/pyramid/src/main/python/trigger.py index 8524930eb..5a1cec1b1 100644 --- a/pyramid/src/main/python/trigger.py +++ b/pyramid/src/main/python/trigger.py @@ -23,6 +23,10 @@ class Trigger(): def searchContent(sp_obj, key, quick): return sp_obj.searchContent(key, quick) + @staticmethod + def searchContentPage(sp_obj, key, quick, pg): + return sp_obj.searchContentPage(key, quick, pg) + @staticmethod def playerContent(sp_obj, flag, id, vipFlags): return sp_obj.playerContent(flag, id, vipFlags)