From d8b5c4bdaf5d5dc4079345b4ab4bdd5138878937 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Thu, 9 Mar 2023 09:58:08 +0800
Subject: [PATCH] [leanback] update dev

---
 app/build.gradle                                              | 2 +-
 .../com/fongmi/android/tv/ui/activity/CollectActivity.java    | 4 +---
 .../com/fongmi/android/tv/ui/activity/DetailActivity.java     | 2 +-
 app/src/main/java/com/fongmi/android/tv/Constant.java         | 2 +-
 .../com/fongmi/android/tv/utils/PauseThreadPoolExecutor.java  | 4 ++--
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index f83ce2064..8845de415 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,7 +17,7 @@ android {
         leanback {
             dimension "mode"
             versionCode 69
-            versionName "20230309"
+            versionName "20230309#2"
         }
         mobile {
             dimension "mode"
diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CollectActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CollectActivity.java
index a18117f5a..6856d5353 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CollectActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CollectActivity.java
@@ -123,9 +123,7 @@ public class CollectActivity extends BaseActivity {
     private void search() {
         mAdapter.add(Collect.all());
         mPageAdapter.notifyDataSetChanged();
-        int core = Runtime.getRuntime().availableProcessors();
-        int corePoolSize = Math.max(Constant.THREAD_POOL, core);
-        mExecutor = new PauseThreadPoolExecutor(corePoolSize, corePoolSize, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>());
+        mExecutor = new PauseThreadPoolExecutor(Constant.THREAD_POOL, 0, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>());
         mBinding.result.setText(getString(R.string.collect_result, getKeyword()));
         for (Site site : mSites) mExecutor.execute(() -> search(site));
     }
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 9d539800a..9322e2fbb 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
@@ -854,7 +854,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
 
     private void startSearch(String keyword) {
         mSearchAdapter.clear();
-        mExecutor = Executors.newFixedThreadPool(Constant.THREAD_POOL * 2);
+        mExecutor = Executors.newFixedThreadPool(Constant.THREAD_POOL);
         for (Site site : ApiConfig.get().getSites()) {
             if (site.getKey().equals(getKey())) continue;
             if (isAutoMode() && !site.isChangeable()) continue;
diff --git a/app/src/main/java/com/fongmi/android/tv/Constant.java b/app/src/main/java/com/fongmi/android/tv/Constant.java
index b5b52ab98..1d8821fb3 100644
--- a/app/src/main/java/com/fongmi/android/tv/Constant.java
+++ b/app/src/main/java/com/fongmi/android/tv/Constant.java
@@ -22,5 +22,5 @@ public class Constant {
     //代理超時時間
     public static final int TIMEOUT_GITHUB = 5 * 1000;
     //搜尋線程數量
-    public static final int THREAD_POOL = 5;
+    public static final int THREAD_POOL = 7;
 }
diff --git a/app/src/main/java/com/fongmi/android/tv/utils/PauseThreadPoolExecutor.java b/app/src/main/java/com/fongmi/android/tv/utils/PauseThreadPoolExecutor.java
index aa30fb1fc..5f5e5147e 100644
--- a/app/src/main/java/com/fongmi/android/tv/utils/PauseThreadPoolExecutor.java
+++ b/app/src/main/java/com/fongmi/android/tv/utils/PauseThreadPoolExecutor.java
@@ -12,8 +12,8 @@ public class PauseThreadPoolExecutor extends ThreadPoolExecutor {
     private final Condition condition;
     private boolean isPaused;
 
-    public PauseThreadPoolExecutor(int corePoolSize, int maximumPoolSize, long keepAliveTime, TimeUnit unit, BlockingQueue<Runnable> workQueue) {
-        super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue);
+    public PauseThreadPoolExecutor(int corePoolSize, long keepAliveTime, TimeUnit unit, BlockingQueue<Runnable> workQueue) {
+        super(corePoolSize, corePoolSize, keepAliveTime, unit, workQueue);
         pauseLock = new ReentrantLock();
         condition = pauseLock.newCondition();
     }