From 6a0e3777848646de521d8e5fd01fd2b793732b5e Mon Sep 17 00:00:00 2001 From: FongMi Date: Mon, 7 Apr 2025 23:38:09 +0800 Subject: [PATCH] Fix crash --- .../com/fongmi/android/tv/ui/activity/CollectActivity.java | 3 +-- .../java/com/fongmi/android/tv/ui/activity/VideoActivity.java | 2 +- app/src/main/java/com/fongmi/android/tv/Constant.java | 2 +- .../com/fongmi/android/tv/ui/activity/CollectActivity.java | 3 +-- .../java/com/fongmi/android/tv/ui/activity/VideoActivity.java | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) 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 0dda4ddb6..afb302883 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 @@ -20,7 +20,6 @@ import androidx.viewbinding.ViewBinding; import androidx.viewpager.widget.ViewPager; import com.fongmi.android.tv.App; -import com.fongmi.android.tv.Constant; import com.fongmi.android.tv.R; import com.fongmi.android.tv.Setting; import com.fongmi.android.tv.api.config.VodConfig; @@ -133,7 +132,7 @@ public class CollectActivity extends BaseActivity { mAdapter.add(Collect.all()); if (mExecutor != null) stop(); mBinding.pager.getAdapter().notifyDataSetChanged(); - mExecutor = new PauseExecutor(Constant.THREAD_POOL); + mExecutor = new PauseExecutor(15); 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/VideoActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java index c5db317b1..8dd18dfdb 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java @@ -1172,7 +1172,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List private void startSearch(String keyword) { mQuickAdapter.clear(); List sites = new ArrayList<>(); - mExecutor = Executors.newFixedThreadPool(Constant.THREAD_POOL); + mExecutor = Executors.newFixedThreadPool(15); for (Site site : VodConfig.get().getSites()) if (isPass(site)) sites.add(site); for (Site site : sites) mExecutor.execute(() -> search(site, keyword)); } 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 18846895f..8bfdc8ff2 100644 --- a/app/src/main/java/com/fongmi/android/tv/Constant.java +++ b/app/src/main/java/com/fongmi/android/tv/Constant.java @@ -28,7 +28,7 @@ public class Constant { public static final int TIMEOUT_PARSE_LIVE = 10 * 1000; //同步超時時間 public static final int TIMEOUT_SYNC = 2 * 1000; - //搜尋線程數量 + //主要線程數量 public static final int THREAD_POOL = 10; } diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/CollectActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/CollectActivity.java index bc72f3250..c87bd1588 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/CollectActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/CollectActivity.java @@ -14,7 +14,6 @@ import androidx.recyclerview.widget.GridLayoutManager; import androidx.viewbinding.ViewBinding; import com.fongmi.android.tv.App; -import com.fongmi.android.tv.Constant; import com.fongmi.android.tv.Product; import com.fongmi.android.tv.R; import com.fongmi.android.tv.Setting; @@ -189,7 +188,7 @@ public class CollectActivity extends BaseActivity implements CustomScroller.Call mBinding.view.setVisibility(View.VISIBLE); mBinding.result.setVisibility(View.VISIBLE); if (mExecutor != null) mExecutor.shutdownNow(); - mExecutor = new PauseExecutor(Constant.THREAD_POOL * 2); + mExecutor = new PauseExecutor(20); String keyword = mBinding.keyword.getText().toString().trim(); for (Site site : mSites) mExecutor.execute(() -> search(site, keyword)); App.post(() -> mRecordAdapter.add(keyword), 250); diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java index a9b60f255..e0d322122 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java @@ -1246,7 +1246,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo private void startSearch(String keyword) { mQuickAdapter.clear(); List sites = new ArrayList<>(); - mExecutor = Executors.newFixedThreadPool(Constant.THREAD_POOL * 2); + mExecutor = Executors.newFixedThreadPool(20); for (Site item : VodConfig.get().getSites()) if (isPass(item)) sites.add(item); for (Site site : sites) mExecutor.execute(() -> search(site, keyword)); }