From b0e4d3c6242e5f3417acc62e5fb10119b0bc5552 Mon Sep 17 00:00:00 2001
From: mtvpls <mtvpls@redaaa.ip-ddns.com>
Date: Wed, 7 Jan 2026 00:29:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=B9=E5=B9=95=E4=BA=8C?=
 =?UTF-8?q?=E6=AC=A1=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/play/page.tsx       | 55 ++++++++++++++++++-------------------
 src/components/UserMenu.tsx |  3 +-
 2 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/src/app/play/page.tsx b/src/app/play/page.tsx
index f16435f..e09626a 100644
--- a/src/app/play/page.tsx
+++ b/src/app/play/page.tsx
@@ -677,8 +677,10 @@ function PlayPageClient() {
       const manualEpisodeId = getManualDanmakuSelection(title, episodeIndex);
       if (manualEpisodeId) {
         console.log(`[弹幕记忆] 使用手动选择的剧集 ID: ${manualEpisodeId}`);
-        setDanmakuLoading(true);
         try {
+          // 需要获取完整的 selection 信息来调用 handleDanmakuSelect
+          // 但这里只有 episodeId，所以保持直接调用 loadDanmaku
+          setDanmakuLoading(true);
           await loadDanmaku(manualEpisodeId);
           console.log('[弹幕记忆] 使用手动选择的弹幕成功');
           return; // 使用手动选择成功，直接返回
@@ -703,8 +705,18 @@ function PlayPageClient() {
 
             if (episode) {
               console.log(`[弹幕记忆] 使用保存的动漫ID匹配成功: ${episode.episodeTitle}`);
-              await loadDanmaku(episode.episodeId);
+
+              const selection: DanmakuSelection = {
+                animeId: savedAnimeId,
+                episodeId: episode.episodeId,
+                animeTitle: episodesResult.bangumi.animeTitle,
+                episodeTitle: episode.episodeTitle,
+              };
+
               setDanmakuEpisodesList(episodesResult.bangumi.episodes);
+
+              // 通过统一的 handleDanmakuSelect 处理弹幕加载
+              await handleDanmakuSelect(selection);
               return; // 匹配成功，直接返回
             } else {
               console.log('[弹幕记忆] 使用保存的动漫ID匹配失败，降级到关键词搜索');
@@ -766,16 +778,13 @@ function PlayPageClient() {
                     episodeTitle: episode.episodeTitle,
                   };
 
-                  // 设置选择记录
-                  setCurrentDanmakuSelection(selection);
-
-                  // 加载弹幕
-                  await loadDanmaku(episode.episodeId);
-
                   // 设置剧集列表
                   setDanmakuEpisodesList(episodesResult.bangumi.episodes);
 
                   console.log('使用记忆的弹幕源成功:', selection);
+
+                  // 通过统一的 handleDanmakuSelect 处理弹幕加载
+                  await handleDanmakuSelect(selection);
                   setDanmakuLoading(false);
                   return;
                 }
@@ -817,16 +826,13 @@ function PlayPageClient() {
                 episodeTitle: episode.episodeTitle,
               };
 
-              // 设置选择记录
-              setCurrentDanmakuSelection(selection);
-
-              // 加载弹幕
-              await loadDanmaku(episode.episodeId);
-
               // 设置剧集列表
               setDanmakuEpisodesList(episodesResult.bangumi.episodes);
 
               console.log('自动搜索弹幕成功:', selection);
+
+              // 通过统一的 handleDanmakuSelect 处理弹幕加载
+              await handleDanmakuSelect(selection);
             }
           } else {
             console.warn('未找到剧集信息');
@@ -3184,7 +3190,6 @@ function PlayPageClient() {
   // 处理用户选择弹幕源
   const handleDanmakuSourceSelect = async (selectedAnime: DanmakuAnime, selectedIndex?: number) => {
     setShowDanmakuSourceSelector(false);
-    setDanmakuLoading(true);
 
     try {
       const title = videoTitleRef.current;
@@ -3215,24 +3220,19 @@ function PlayPageClient() {
             episodeTitle: episode.episodeTitle,
           };
 
-          // 先设置选择记录
-          setCurrentDanmakuSelection(selection);
-
-          // 加载弹幕
-          await loadDanmaku(episode.episodeId);
-
           // 设置剧集列表
           setDanmakuEpisodesList(episodesResult.bangumi.episodes);
 
           console.log('用户选择弹幕源:', selection);
+
+          // 通过统一的 handleDanmakuSelect 处理弹幕加载
+          await handleDanmakuSelect(selection);
         }
       } else {
         console.warn('未找到剧集信息');
       }
     } catch (error) {
       console.error('加载弹幕失败:', error);
-    } finally {
-      setDanmakuLoading(false);
     }
   };
 
@@ -3432,16 +3432,13 @@ function PlayPageClient() {
               episodeTitle: episode.episodeTitle,
             };
 
-            // 先设置选择记录
-            setCurrentDanmakuSelection(selection);
-
-            // 加载弹幕
-            await loadDanmaku(episode.episodeId);
-
             // 设置剧集列表
             setDanmakuEpisodesList(episodesResult.bangumi.episodes);
 
             console.log('自动搜索弹幕成功:', selection);
+
+            // 通过统一的 handleDanmakuSelect 处理弹幕加载
+            await handleDanmakuSelect(selection);
           }
         } else {
           console.warn('未找到剧集信息');
diff --git a/src/components/UserMenu.tsx b/src/components/UserMenu.tsx
index e60fbbf..7aca564 100644
--- a/src/components/UserMenu.tsx
+++ b/src/components/UserMenu.tsx
@@ -1264,14 +1264,13 @@ export const UserMenu: React.FC = () => {
               )}
             </div>
 
-            {/* 使用设置 */}
             <div className='border border-gray-200 dark:border-gray-700 rounded-lg overflow-visible'>
               <button
                 onClick={() => setIsUsageSectionOpen(!isUsageSectionOpen)}
                 className='w-full px-3 py-2.5 md:px-4 md:py-3 bg-gray-50 dark:bg-gray-800 hover:bg-gray-100 dark:hover:bg-gray-750 transition-colors flex items-center justify-between'
               >
                 <h3 className='text-base font-semibold text-gray-800 dark:text-gray-200'>
-                  使用设置
+                  通用设置
                 </h3>
                 {isUsageSectionOpen ? (
                   <ChevronUp className='w-5 h-5 text-gray-600 dark:text-gray-400' />