[mobile] update dev

pull/137/head
FongMi 2 years ago
parent 926739035e
commit 1cf886a472
  1. 2
      app/build.gradle
  2. 22
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/CollectActivity.java
  3. 2
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java

@ -26,7 +26,7 @@ android {
mobile { mobile {
dimension "mode" dimension "mode"
versionCode 202 versionCode 202
versionName "20230714#2" versionName "20230714#3"
} }
java { java {
dimension "api" dimension "api"

@ -15,7 +15,6 @@ import androidx.recyclerview.widget.GridLayoutManager;
import androidx.viewbinding.ViewBinding; import androidx.viewbinding.ViewBinding;
import com.fongmi.android.tv.App; import com.fongmi.android.tv.App;
import com.fongmi.android.tv.Constant;
import com.fongmi.android.tv.Product; import com.fongmi.android.tv.Product;
import com.fongmi.android.tv.R; import com.fongmi.android.tv.R;
import com.fongmi.android.tv.api.ApiConfig; 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.base.ViewType;
import com.fongmi.android.tv.ui.custom.CustomTextListener; import com.fongmi.android.tv.ui.custom.CustomTextListener;
import com.fongmi.android.tv.ui.custom.dialog.SiteDialog; 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.Prefers;
import com.fongmi.android.tv.utils.ResUtil; import com.fongmi.android.tv.utils.ResUtil;
import com.fongmi.android.tv.utils.Utils; import com.fongmi.android.tv.utils.Utils;
@ -46,18 +44,18 @@ import com.github.catvod.net.OkHttp;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ExecutorService;
import java.util.concurrent.TimeUnit; import java.util.concurrent.Executors;
import okhttp3.Call; import okhttp3.Call;
import okhttp3.Response; import okhttp3.Response;
public class CollectActivity extends BaseActivity implements SiteCallback, WordAdapter.OnClickListener, RecordAdapter.OnClickListener, CollectAdapter.OnClickListener, VodAdapter.OnClickListener { public class CollectActivity extends BaseActivity implements SiteCallback, WordAdapter.OnClickListener, RecordAdapter.OnClickListener, CollectAdapter.OnClickListener, VodAdapter.OnClickListener {
private PauseThreadPoolExecutor mExecutor;
private ActivityCollectBinding mBinding; private ActivityCollectBinding mBinding;
private CollectAdapter mCollectAdapter; private CollectAdapter mCollectAdapter;
private RecordAdapter mRecordAdapter; private RecordAdapter mRecordAdapter;
private ExecutorService mExecutor;
private WordAdapter mWordAdapter; private WordAdapter mWordAdapter;
private SiteViewModel mViewModel; private SiteViewModel mViewModel;
private VodAdapter mVodAdapter; private VodAdapter mVodAdapter;
@ -180,7 +178,7 @@ public class CollectActivity extends BaseActivity implements SiteCallback, WordA
mBinding.view.setVisibility(View.VISIBLE); mBinding.view.setVisibility(View.VISIBLE);
mBinding.result.setVisibility(View.VISIBLE); mBinding.result.setVisibility(View.VISIBLE);
if (mExecutor != null) mExecutor.shutdownNow(); 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(); String keyword = mBinding.keyword.getText().toString().trim();
for (Site site : mSites) mExecutor.execute(() -> search(site, keyword)); for (Site site : mSites) mExecutor.execute(() -> search(site, keyword));
App.post(() -> mRecordAdapter.add(keyword), 250); App.post(() -> mRecordAdapter.add(keyword), 250);
@ -271,18 +269,6 @@ public class CollectActivity extends BaseActivity implements SiteCallback, WordA
return false; 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 @Override
public void onBackPressed() { public void onBackPressed() {
if (isVisible(mBinding.result)) { if (isVisible(mBinding.result)) {

@ -1046,7 +1046,7 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust
private void startSearch(String keyword) { private void startSearch(String keyword) {
mSearchAdapter.clear(); mSearchAdapter.clear();
mExecutor = Executors.newFixedThreadPool(Constant.THREAD_POOL * 2); mExecutor = Executors.newCachedThreadPool();
List<Site> sites = new ArrayList<>(); List<Site> sites = new ArrayList<>();
List<Site> items = ApiConfig.get().getSites(); List<Site> items = ApiConfig.get().getSites();
for (Site item : items) if (isPass(item, false)) sites.add(item); for (Site item : items) if (isPass(item, false)) sites.add(item);

Loading…
Cancel
Save