From 97554e5f9dd735f8c4ff2efe822b05991fbd8200 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Sat, 4 Nov 2023 02:26:41 +0800
Subject: [PATCH] Fix bug

---
 .../java/com/fongmi/android/tv/ui/activity/HomeActivity.java  | 2 +-
 .../java/com/fongmi/android/tv/ui/custom/CustomTitleView.java | 4 +---
 2 files changed, 2 insertions(+), 4 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 84693422e..314cd82dd 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
@@ -205,8 +205,8 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
 
     private void setFocus() {
         setLoading(false);
-        mBinding.recycler.requestFocus();
         App.post(() -> mBinding.title.setFocusable(true), 500);
+        if (!mBinding.title.hasFocus()) mBinding.recycler.requestFocus();
     }
 
     private void getVideo() {
diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomTitleView.java b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomTitleView.java
index 293a10f42..14a7ee0f8 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomTitleView.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomTitleView.java
@@ -47,9 +47,7 @@ public class CustomTitleView extends AppCompatTextView {
     @Override
     protected void onFocusChanged(boolean focused, int direction, Rect previouslyFocusedRect) {
         super.onFocusChanged(focused, direction, previouslyFocusedRect);
-        App.post(() -> coolDown = false, 500);
         if (focused) startAnimation(flicker);
-        if (focused) coolDown = true;
         else clearAnimation();
     }
 
@@ -67,7 +65,7 @@ public class CustomTitleView extends AppCompatTextView {
             listener.setSite(getSite(true));
         } else if (event.getAction() == KeyEvent.ACTION_DOWN && KeyUtil.isRightKey(event)) {
             listener.setSite(getSite(false));
-        } else if (event.getAction() == KeyEvent.ACTION_UP && KeyUtil.isUpKey(event)) {
+        } else if (event.getAction() == KeyEvent.ACTION_DOWN && KeyUtil.isUpKey(event)) {
             onKeyUp();
         }
         return true;