From 2f084e78ceea95b751eae3e02436166efaa6abc8 Mon Sep 17 00:00:00 2001 From: okjack Date: Sat, 16 Mar 2024 17:26:18 +0800 Subject: [PATCH 1/4] update --- .../java/com/fongmi/android/tv/ui/fragment/HomeFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/HomeFragment.java b/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/HomeFragment.java index 325c0e6fc..b2cb369fb 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/HomeFragment.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/HomeFragment.java @@ -147,7 +147,7 @@ public class HomeFragment extends BaseFragment implements VodPresenter.OnClickLi private void refreshFuncRow() { if (homeUI == Setting.getHomeUI() && Setting.getHomeButtons(Button.getDefaultButtons()).equals(button)) return; - if (!TextUtils.isEmpty(button)) mAdapter.removeItems(0, 1); + mAdapter.removeItems(0, 1); homeUI = Setting.getHomeUI(); button = Setting.getHomeButtons(Button.getDefaultButtons()); ListRow funcRow = getFuncRow(); From 1b50912f37002c2e14a00a060d7ec133b6e00a30 Mon Sep 17 00:00:00 2001 From: okjack Date: Sat, 16 Mar 2024 23:08:23 +0800 Subject: [PATCH 2/4] update --- .../com/fongmi/android/tv/ui/activity/HomeActivity.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java index cebcb89cc..2cd3a33b2 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java @@ -82,6 +82,7 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen private View mOldView; private boolean confirm; private Clock mClock; + private View mFocus; private Site getHome() { return VodConfig.get().getHome(); @@ -197,6 +198,7 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen String title = getHome().getName(); mBinding.title.setText(title.isEmpty() ? ResUtil.getString(R.string.app_name) : title); if (getHome().getKey().isEmpty()) return; + mFocus = getCurrentFocus(); getHomeFragment().mBinding.progressLayout.showProgress(); mViewModel.homeContent(); } @@ -211,7 +213,7 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen mPageAdapter.notifyDataSetChanged(); getHomeFragment().addVideo(result); getHomeFragment().mBinding.progressLayout.showContent(); - setFocus(); + App.post(() -> setFocus(), 200); } private void setPager() { @@ -466,8 +468,8 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen private void setFocus() { setLoading(false); - App.post(() -> mBinding.title.setFocusable(true), 500); - if (!mBinding.title.hasFocus()) { + if (!mBinding.title.isFocusable()) App.post(() -> mBinding.title.setFocusable(true), 500); + if (mFocus != mBinding.title) { if (Setting.getHomeUI() == 0) getHomeFragment().mBinding.recycler.requestFocus(); else mBinding.recycler.requestFocus(); } From 3fea20369fad6d8ca944cfe4043166568bd14eaa Mon Sep 17 00:00:00 2001 From: okjack Date: Sun, 17 Mar 2024 00:27:38 +0800 Subject: [PATCH 3/4] build.gradle --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5e988bd9a..6cbcc19bb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.fongmi.android.tv" minSdk 21 targetSdk 28 - versionCode 230 - versionName "0315" + versionCode 231 + versionName "2.3.1" javaCompileOptions { annotationProcessorOptions { arguments = ["room.schemaLocation": "$projectDir/schemas".toString()] From 4277e62db68db0723d48ccfaac15a67f67b6f241 Mon Sep 17 00:00:00 2001 From: okjack Date: Sun, 17 Mar 2024 00:34:15 +0800 Subject: [PATCH 4/4] update --- .../java/com/fongmi/android/tv/ui/fragment/HomeFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/HomeFragment.java b/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/HomeFragment.java index b2cb369fb..325c0e6fc 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/HomeFragment.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/HomeFragment.java @@ -147,7 +147,7 @@ public class HomeFragment extends BaseFragment implements VodPresenter.OnClickLi private void refreshFuncRow() { if (homeUI == Setting.getHomeUI() && Setting.getHomeButtons(Button.getDefaultButtons()).equals(button)) return; - mAdapter.removeItems(0, 1); + if (!TextUtils.isEmpty(button)) mAdapter.removeItems(0, 1); homeUI = Setting.getHomeUI(); button = Setting.getHomeButtons(Button.getDefaultButtons()); ListRow funcRow = getFuncRow();