From 2b9dc6cff4e9675b130e1a5f4606155199dd2eed Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Tue, 5 Dec 2023 00:26:30 +0800
Subject: [PATCH] Clean code

---
 .../fongmi/android/tv/ui/activity/VodActivity.java  | 11 +++--------
 .../fongmi/android/tv/ui/fragment/VodFragment.java  | 13 +++++++------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VodActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VodActivity.java
index 852588832..16c55ab70 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VodActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VodActivity.java
@@ -161,13 +161,8 @@ public class VodActivity extends BaseActivity implements TypePresenter.OnClickLi
 
     @Override
     public boolean dispatchKeyEvent(KeyEvent event) {
-        if (event.getKeyCode() == KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent.ACTION_DOWN && event.getRepeatCount() > 0) {
-            getFragment().backRoot();
-            return true;
-        }
-        if (KeyUtil.isMenuKey(event)) {
-            updateFilter((Class) mAdapter.get(mBinding.pager.getCurrentItem()));
-        }
+        if (KeyUtil.isBackKey(event) && event.isLongPress()) getFragment().goRoot();
+        if (KeyUtil.isMenuKey(event)) updateFilter((Class) mAdapter.get(mBinding.pager.getCurrentItem()));
         return super.dispatchKeyEvent(event);
     }
 
@@ -175,7 +170,7 @@ public class VodActivity extends BaseActivity implements TypePresenter.OnClickLi
     public void onBackPressed() {
         Class item = (Class) mAdapter.get(mBinding.pager.getCurrentItem());
         if (item.getFilter() != null && item.getFilter()) updateFilter(item);
-        else if (getFragment().canGoBack()) getFragment().goBack();
+        else if (getFragment().canBack()) getFragment().goBack();
         else super.onBackPressed();
     }
 
diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/VodFragment.java b/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/VodFragment.java
index 1e56bb203..5226789c8 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/VodFragment.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/VodFragment.java
@@ -254,16 +254,11 @@ public class VodFragment extends BaseFragment implements CustomScroller.Callback
         mOpen = open;
     }
 
-     public void backRoot() {
-        mPages.clear();
-        getVideo(getTypeId(), "1");
-    }
-
     public void onRefresh() {
         getVideo();
     }
 
-    public boolean canGoBack() {
+    public boolean canBack() {
         return !mPages.isEmpty();
     }
 
@@ -273,6 +268,12 @@ public class VodFragment extends BaseFragment implements CustomScroller.Callback
         onRefresh();
     }
 
+    public void goRoot() {
+        if (mPages.isEmpty()) return;
+        mPages.clear();
+        getVideo();
+    }
+
     @Override
     public void onItemClick(Vod item) {
         if (item.isFolder()) {