From b384ef864f049ae1690f7d32ae3aa667b46a6256 Mon Sep 17 00:00:00 2001 From: FongMi Date: Mon, 2 Oct 2023 10:19:41 +0800 Subject: [PATCH] Clean code --- .../android/tv/ui/activity/CollectActivity.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 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 d66fbb29c..3937d0ae4 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 @@ -42,7 +42,6 @@ public class CollectActivity extends BaseActivity { private ActivityCollectBinding mBinding; private ArrayObjectAdapter mAdapter; private SiteViewModel mViewModel; - private PageAdapter mPageAdapter; private PauseExecutor mExecutor; private List mSites; private View mOldView; @@ -58,6 +57,10 @@ public class CollectActivity extends BaseActivity { activity.startActivityForResult(intent, 1000); } + private CollectFragment getFragment() { + return (CollectFragment) mBinding.pager.getAdapter().instantiateItem(mBinding.pager, 0); + } + private String getKeyword() { return getIntent().getStringExtra("keyword"); } @@ -101,14 +104,14 @@ public class CollectActivity extends BaseActivity { private void setViewModel() { mViewModel = new ViewModelProvider(this).get(SiteViewModel.class); mViewModel.search.observe(this, result -> { - mAdapter.add(Collect.create(result.getList())); getFragment().addVideo(result.getList()); - mPageAdapter.notifyDataSetChanged(); + mAdapter.add(Collect.create(result.getList())); + mBinding.pager.getAdapter().notifyDataSetChanged(); }); } private void setPager() { - mBinding.pager.setAdapter(mPageAdapter = new PageAdapter(getSupportFragmentManager())); + mBinding.pager.setAdapter(new PageAdapter(getSupportFragmentManager())); } private void setSite() { @@ -122,7 +125,7 @@ public class CollectActivity extends BaseActivity { private void search() { mAdapter.add(Collect.all()); - mPageAdapter.notifyDataSetChanged(); + mBinding.pager.getAdapter().notifyDataSetChanged(); mExecutor = new PauseExecutor(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)); @@ -156,10 +159,6 @@ public class CollectActivity extends BaseActivity { } }; - private CollectFragment getFragment() { - return (CollectFragment) mPageAdapter.instantiateItem(mBinding.pager, 0); - } - @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { super.onActivityResult(requestCode, resultCode, data);