From 0520afd540087071b1663c7316b5610063aea6f4 Mon Sep 17 00:00:00 2001 From: jhengazuki Date: Wed, 5 Nov 2025 13:15:42 +0800 Subject: [PATCH] Fix focus bug --- .../java/com/fongmi/android/tv/ui/activity/LiveActivity.java | 4 ++-- .../java/com/fongmi/android/tv/ui/activity/VideoActivity.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java index 6fe33d6e1..caf84251d 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java @@ -199,7 +199,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick setScale(Setting.getLiveScale()); ExoUtil.setSubtitleView(mBinding.exo); mPlayers.setTag(tag = UUID.randomUUID().toString()); - findViewById(R.id.timeBar).setNextFocusUpId(R.id.home); + findViewById(R.id.timeBar).setNextFocusUpId(R.id.config); mBinding.control.invert.setActivated(Setting.isInvert()); mBinding.control.across.setActivated(Setting.isAcross()); mBinding.control.change.setActivated(Setting.isChange()); @@ -921,7 +921,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick } private View getFocus2() { - return mFocus2 == null ? mBinding.control.config : mFocus2; + return mFocus2 == null || mFocus2.getVisibility() != View.VISIBLE ? mBinding.control.config : mFocus2; } @Override 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 821e4daf2..88d60911d 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 @@ -1283,11 +1283,11 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List } private View getFocus1() { - return mFocus1 == null ? mBinding.video : mFocus1; + return mFocus1 == null || mFocus1.getVisibility() != View.VISIBLE ? mBinding.video : mFocus1; } private View getFocus2() { - return mFocus2 == null || mFocus2 == mBinding.control.opening || mFocus2 == mBinding.control.ending ? mBinding.control.next : mFocus2; + return mFocus2 == null || mFocus2.getVisibility() != View.VISIBLE || mFocus2 == mBinding.control.opening || mFocus2 == mBinding.control.ending ? mBinding.control.next : mFocus2; } @Override