From 8d712afa0dcfa0038e386e1d585272e2dd0a5260 Mon Sep 17 00:00:00 2001
From: mtvpls <mtvpls@redaaa.ip-ddns.com>
Date: Sun, 31 May 2026 21:43:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=B0=E5=8F=B7=E6=B5=AE?=
 =?UTF-8?q?=E5=B1=82=E4=BC=98=E5=85=88=E7=BA=A7=EF=BC=8C=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E9=9F=B3=E9=87=8F=E4=B8=BA0=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9B=B4=E5=A4=9A=E8=8F=9C=E5=8D=95=E9=94=AE?=
 =?UTF-8?q?=E6=98=A0=E5=B0=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/tv/live/play/page.tsx | 11 ++++++-----
 src/app/tv/play/page.tsx      | 36 +++++++++++++++++++++++++++++++----
 2 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/src/app/tv/live/play/page.tsx b/src/app/tv/live/play/page.tsx
index 7754f7e..2f2fb15 100644
--- a/src/app/tv/live/play/page.tsx
+++ b/src/app/tv/live/play/page.tsx
@@ -22,9 +22,10 @@ const REMOTE_KEY_DEDUPE_MS = 350;
 function loadTVVolumeState() {
   if (typeof window === 'undefined') return { volume: 1, muted: false };
 
-  const savedVolume = Number(localStorage.getItem(TV_VOLUME_KEY));
-  const volume = Number.isFinite(savedVolume)
-    ? Math.max(0, Math.min(1, savedVolume))
+  const savedVolume = localStorage.getItem(TV_VOLUME_KEY);
+  const parsedVolume = savedVolume === null ? NaN : Number(savedVolume);
+  const volume = Number.isFinite(parsedVolume)
+    ? Math.max(0, Math.min(1, parsedVolume))
     : 1;
   const savedMuted = localStorage.getItem(TV_MUTED_KEY);
 
@@ -586,9 +587,9 @@ function TVLivePlayClient() {
           </div>
         </aside>
       )}
-      {digitBuffer && <div className='absolute right-10 top-32 rounded-3xl bg-black/75 px-7 py-5 text-5xl font-black text-white shadow-2xl'>频道 {digitBuffer}</div>}
+      {digitBuffer && <div className='absolute right-10 top-32 z-[90] rounded-3xl bg-black/75 px-7 py-5 text-5xl font-black text-white shadow-2xl'>频道 {digitBuffer}</div>}
       {channelHint && (
-        <div className='absolute right-20 top-24 max-w-[520px] rounded-3xl bg-black/80 px-7 py-5 text-right text-white shadow-2xl backdrop-blur'>
+        <div className='absolute right-20 top-24 z-[70] max-w-[520px] rounded-3xl bg-black/80 px-7 py-5 text-right text-white shadow-2xl backdrop-blur'>
           <div className='text-2xl font-black text-rose-200'>#{channelHint.number}</div>
           <div className='mt-1 line-clamp-1 text-4xl font-black'>{channelHint.name}</div>
         </div>
diff --git a/src/app/tv/play/page.tsx b/src/app/tv/play/page.tsx
index 416e6a1..3906d8d 100644
--- a/src/app/tv/play/page.tsx
+++ b/src/app/tv/play/page.tsx
@@ -69,6 +69,7 @@ const TV_DANMAKU_MAX_ITEMS = 3000;
 const TV_DANMAKU_SETTINGS_KEY = 'tv_danmaku_settings';
 const TV_VOLUME_KEY = 'tv_player_volume';
 const TV_MUTED_KEY = 'tv_player_muted';
+const REMOTE_KEY_DEDUPE_MS = 350;
 
 type TVDanmakuSettings = {
   fontSize: number;
@@ -85,9 +86,10 @@ const DEFAULT_TV_DANMAKU_SETTINGS: TVDanmakuSettings = {
 function loadTVVolumeState() {
   if (typeof window === 'undefined') return { volume: 1, muted: false };
 
-  const savedVolume = Number(localStorage.getItem(TV_VOLUME_KEY));
-  const volume = Number.isFinite(savedVolume)
-    ? Math.max(0, Math.min(1, savedVolume))
+  const savedVolume = localStorage.getItem(TV_VOLUME_KEY);
+  const parsedVolume = savedVolume === null ? NaN : Number(savedVolume);
+  const volume = Number.isFinite(parsedVolume)
+    ? Math.max(0, Math.min(1, parsedVolume))
     : 1;
   const savedMuted = localStorage.getItem(TV_MUTED_KEY);
 
@@ -292,6 +294,7 @@ function TVPlayClient() {
   const idleTimerRef = useRef<number | null>(null);
   const volumeHintTimerRef = useRef<number | null>(null);
   const seekHintTimerRef = useRef<number | null>(null);
+  const menuKeyTimeRef = useRef(0);
   const spawnedDanmakuRef = useRef<Set<string>>(new Set());
   const lastDanmakuTimeRef = useRef(0);
   const skippedIntroRef = useRef('');
@@ -846,9 +849,19 @@ function TVPlayClient() {
       const isMenuKey =
         event.key === 'ContextMenu' ||
         event.key === 'Menu' ||
-        event.keyCode === 93;
+        event.key === 'BrowserContextMenu' ||
+        event.code === 'ContextMenu' ||
+        event.code === 'Menu' ||
+        event.keyCode === 93 ||
+        event.keyCode === 82 ||
+        event.which === 93 ||
+        event.which === 82;
       if (isMenuKey) {
         event.preventDefault();
+        event.stopImmediatePropagation();
+        const now = Date.now();
+        if (now - menuKeyTimeRef.current < REMOTE_KEY_DEDUPE_MS) return;
+        menuKeyTimeRef.current = now;
         if (showPanel || showEpisodes || showDanmakuSettings) {
           setShowPanel(false);
           setShowEpisodes(false);
@@ -1026,6 +1039,21 @@ function TVPlayClient() {
           ? 'true'
           : 'false'
       }
+      onContextMenu={(event) => {
+        event.preventDefault();
+        event.stopPropagation();
+        const now = Date.now();
+        if (now - menuKeyTimeRef.current < REMOTE_KEY_DEDUPE_MS) return;
+        menuKeyTimeRef.current = now;
+        if (showPanel || showEpisodes || showDanmakuSettings) {
+          setShowPanel(false);
+          setShowEpisodes(false);
+          setShowDanmakuSettings(false);
+          blurTVPlayerControl();
+        } else {
+          revealPanel();
+        }
+      }}
       className='fixed inset-0 overflow-hidden bg-black text-white'
     >
       {videoUrl ? (