From 1cf886a472f41aa766ebf08922e7f68e72f0e1be Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Fri, 14 Jul 2023 22:35:56 +0800
Subject: [PATCH] [mobile] update dev

---
 app/build.gradle                              |  2 +-
 .../tv/ui/activity/CollectActivity.java       | 22 ++++---------------
 .../tv/ui/activity/DetailActivity.java        |  2 +-
 3 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3d31127aa..9753a229c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,7 +26,7 @@ android {
         mobile {
             dimension "mode"
             versionCode 202
-            versionName "20230714#2"
+            versionName "20230714#3"
         }
         java {
             dimension "api"
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 6aa9c9dad..5f575f4ea 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
@@ -15,7 +15,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.api.ApiConfig;
@@ -37,7 +36,6 @@ import com.fongmi.android.tv.ui.base.BaseActivity;
 import com.fongmi.android.tv.ui.base.ViewType;
 import com.fongmi.android.tv.ui.custom.CustomTextListener;
 import com.fongmi.android.tv.ui.custom.dialog.SiteDialog;
-import com.fongmi.android.tv.utils.PauseThreadPoolExecutor;
 import com.fongmi.android.tv.utils.Prefers;
 import com.fongmi.android.tv.utils.ResUtil;
 import com.fongmi.android.tv.utils.Utils;
@@ -46,18 +44,18 @@ import com.github.catvod.net.OkHttp;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 import okhttp3.Call;
 import okhttp3.Response;
 
 public class CollectActivity extends BaseActivity implements SiteCallback, WordAdapter.OnClickListener, RecordAdapter.OnClickListener, CollectAdapter.OnClickListener, VodAdapter.OnClickListener {
 
-    private PauseThreadPoolExecutor mExecutor;
     private ActivityCollectBinding mBinding;
     private CollectAdapter mCollectAdapter;
     private RecordAdapter mRecordAdapter;
+    private ExecutorService mExecutor;
     private WordAdapter mWordAdapter;
     private SiteViewModel mViewModel;
     private VodAdapter mVodAdapter;
@@ -180,7 +178,7 @@ public class CollectActivity extends BaseActivity implements SiteCallback, WordA
         mBinding.view.setVisibility(View.VISIBLE);
         mBinding.result.setVisibility(View.VISIBLE);
         if (mExecutor != null) mExecutor.shutdownNow();
-        mExecutor = new PauseThreadPoolExecutor(Constant.THREAD_POOL * 2, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>());
+        mExecutor = Executors.newCachedThreadPool();
         String keyword = mBinding.keyword.getText().toString().trim();
         for (Site site : mSites) mExecutor.execute(() -> search(site, keyword));
         App.post(() -> mRecordAdapter.add(keyword), 250);
@@ -271,18 +269,6 @@ public class CollectActivity extends BaseActivity implements SiteCallback, WordA
         return false;
     }
 
-    @Override
-    protected void onResume() {
-        super.onResume();
-        if (mExecutor != null) mExecutor.resume();
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        if (mExecutor != null) mExecutor.pause();
-    }
-
     @Override
     public void onBackPressed() {
         if (isVisible(mBinding.result)) {
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 3c763078b..d4b16bb72 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
@@ -1046,7 +1046,7 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust
 
     private void startSearch(String keyword) {
         mSearchAdapter.clear();
-        mExecutor = Executors.newFixedThreadPool(Constant.THREAD_POOL * 2);
+        mExecutor = Executors.newCachedThreadPool();
         List<Site> sites = new ArrayList<>();
         List<Site> items = ApiConfig.get().getSites();
         for (Site item : items) if (isPass(item, false)) sites.add(item);