From a3a9bdc76299f8cdf47e4dfebf5fd7785271d1d7 Mon Sep 17 00:00:00 2001
From: Li ZongYing <lizongying@msn.com>
Date: Wed, 3 Apr 2024 08:50:00 +0800
Subject: [PATCH] dpad-right to enter the menu & dpad-left for channel list

---
 HISTORY.md                                    |  1 +
 .../java/com/lizongying/mytv/MainActivity.kt  | 24 ++++++++++---------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index db568ec..0e27576 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -6,6 +6,7 @@
 
 ### v1.7.3（安卓5及以上专用）
 
+* 遥控器左键进入节目列表
 * 遥控器右键进入菜单
 
 ### v1.7.2（通用）
diff --git a/app/src/main/java/com/lizongying/mytv/MainActivity.kt b/app/src/main/java/com/lizongying/mytv/MainActivity.kt
index 6dd131e..d59b95c 100644
--- a/app/src/main/java/com/lizongying/mytv/MainActivity.kt
+++ b/app/src/main/java/com/lizongying/mytv/MainActivity.kt
@@ -172,6 +172,11 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
         handler.postDelayed(hideSetting, delayHideSetting)
     }
 
+    fun settingHideNow() {
+        handler.removeCallbacks(hideSetting)
+        handler.postDelayed(hideSetting, 0)
+    }
+
     fun settingNeverHide() {
         handler.removeCallbacks(hideSetting)
     }
@@ -448,20 +453,17 @@ class MainActivity : FragmentActivity(), Request.RequestListener {
             }
 
             KeyEvent.KEYCODE_DPAD_LEFT -> {
-//                if (mainFragment.isHidden) {
-//                    prevSource()
-//                } else {
-////                    if (mainFragment.tvListViewModel.getTVViewModelCurrent()
-////                            ?.getItemPosition() == 0
-////                    ) {
-//////                        mainFragment.toLastPosition()
-////                        hideMainFragment()
-////                    }
-//                }
+                if (!mainFragment.isVisible && !settingFragment.isVisible) {
+                    switchMainFragment()
+                    return true
+                }
             }
 
             KeyEvent.KEYCODE_DPAD_RIGHT -> {
-                switchMainFragment()
+                if (!mainFragment.isVisible && !settingFragment.isVisible) {
+                    showSetting()
+                    return true
+                }
             }
         }