修复切片后手动弹幕偏移未重置

MCDFsteve · MCDFsteve · commit 5e20f955c3ca · 2026-02-03T01:52:42.000+08:00
diff --git a/lib/providers/settings_provider.dart b/lib/providers/settings_provider.dart
@@ -17,17 +17,12 @@ class SettingsProvider with ChangeNotifier {
   // 哈希匹配失败后自动选择搜索第一个结果（避免弹窗）
   bool _autoMatchDanmakuFirstSearchResultOnHashFail = true; // 默认开启
   
-  // 弹幕时间偏移设置
-  double _danmakuTimeOffset = 0.0; // 默认无偏移，单位为秒
-  static const String _danmakuTimeOffsetKey = 'danmaku_time_offset';
-
   // --- Getters ---
   double get blurPower => _blurPower;
   bool get isBlurEnabled => _blurPower > 0;
   bool get danmakuConvertToSimplified => _danmakuConvertToSimplified;
   bool get autoMatchDanmakuFirstSearchResultOnHashFail =>
       _autoMatchDanmakuFirstSearchResultOnHashFail;
-  double get danmakuTimeOffset => _danmakuTimeOffset;
 
   SettingsProvider() {
     _loadSettings();
@@ -42,8 +37,6 @@ class SettingsProvider with ChangeNotifier {
     _autoMatchDanmakuFirstSearchResultOnHashFail =
         _prefs.getBool(SettingsKeys.autoMatchDanmakuFirstSearchResultOnHashFail) ??
             true;
-    // Load danmaku time offset setting, defaulting to 0.0 if not set
-    _danmakuTimeOffset = _prefs.getDouble(_danmakuTimeOffsetKey) ?? 0.0;
     notifyListeners();
   }
 
@@ -83,10 +76,4 @@ class SettingsProvider with ChangeNotifier {
     notifyListeners();
   }
 
-  /// Sets the danmaku time offset in seconds.
-  Future<void> setDanmakuTimeOffset(double offset) async {
-    _danmakuTimeOffset = offset;
-    await _prefs.setDouble(_danmakuTimeOffsetKey, _danmakuTimeOffset);
-    notifyListeners();
-  }
 }
diff --git a/lib/themes/cupertino/widgets/player_menu/cupertino_danmaku_offset_pane.dart b/lib/themes/cupertino/widgets/player_menu/cupertino_danmaku_offset_pane.dart
@@ -1,7 +1,7 @@
 import 'package:nipaplay/themes/cupertino/cupertino_imports.dart';
 import 'package:provider/provider.dart';
 
-import 'package:nipaplay/providers/settings_provider.dart';
+import 'package:nipaplay/utils/video_player_state.dart';
 import 'package:nipaplay/themes/cupertino/widgets/cupertino_bottom_sheet.dart';
 import 'package:nipaplay/themes/cupertino/widgets/player_menu/cupertino_pane_back_button.dart';
 import 'package:nipaplay/themes/nipaplay/widgets/blur_snackbar.dart';
@@ -45,24 +45,24 @@ class _CupertinoDanmakuOffsetPaneState
     return offset > 0 ? '+${offset}秒' : '${offset}秒';
   }
 
-  void _applyCustomOffset(SettingsProvider provider) {
+  void _applyCustomOffset(VideoPlayerState videoState) {
     final text = _controller.text.trim();
     if (text.isEmpty) return;
     final value = double.tryParse(text);
     if (value == null || value < -60 || value > 60) {
       BlurSnackBar.show(context, '请输入 -60 到 60 之间的数字');
       return;
     }
-    provider.setDanmakuTimeOffset(value);
+    videoState.setManualDanmakuOffset(value);
     _controller.clear();
     BlurSnackBar.show(context, '已设置弹幕偏移为 ${_formatOffset(value)}');
   }
 
   @override
   Widget build(BuildContext context) {
-    return Consumer<SettingsProvider>(
-      builder: (context, provider, _) {
-        final currentOffset = provider.danmakuTimeOffset;
+    return Consumer<VideoPlayerState>(
+      builder: (context, videoState, _) {
+        final currentOffset = videoState.manualDanmakuOffset;
         return CupertinoBottomSheetContentLayout(
           sliversBuilder: (context, topSpacing) => [
             SliverPadding(
@@ -129,7 +129,7 @@ class _CupertinoDanmakuOffsetPaneState
                                 ? CupertinoTheme.of(context).primaryColor
                                 : CupertinoColors.systemGrey5,
                             onPressed: () =>
-                                provider.setDanmakuTimeOffset(value),
+                                videoState.setManualDanmakuOffset(value),
                             child: Text(
                               _formatOffset(value),
                               style: TextStyle(
@@ -161,15 +161,15 @@ class _CupertinoDanmakuOffsetPaneState
                               signed: true,
                               decimal: true,
                             ),
-                            onSubmitted: (_) => _applyCustomOffset(provider),
+                            onSubmitted: (_) => _applyCustomOffset(videoState),
                           ),
                           const SizedBox(height: 8),
                           Align(
                             alignment: Alignment.centerRight,
                             child: CupertinoButton(
                               padding: const EdgeInsets.symmetric(
                                   horizontal: 20, vertical: 6),
-                              onPressed: () => _applyCustomOffset(provider),
+                              onPressed: () => _applyCustomOffset(videoState),
                               child: const Text('应用'),
                             ),
                           ),
@@ -187,7 +187,7 @@ class _CupertinoDanmakuOffsetPaneState
                       onTap: currentOffset == 0
                           ? null
                           : () {
-                              provider.setDanmakuTimeOffset(0);
+                              videoState.setManualDanmakuOffset(0);
                               BlurSnackBar.show(context, '已重置弹幕偏移');
                             },
                     ),
diff --git a/lib/themes/nipaplay/widgets/danmaku_offset_menu.dart b/lib/themes/nipaplay/widgets/danmaku_offset_menu.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import 'package:nipaplay/providers/settings_provider.dart';
+import 'package:nipaplay/utils/video_player_state.dart';
 import 'base_settings_menu.dart';
 import 'blur_button.dart';
 import 'blur_snackbar.dart';
@@ -65,7 +65,8 @@ class _DanmakuOffsetMenuState extends State<DanmakuOffsetMenu> {
       return;
     }
 
-    Provider.of<SettingsProvider>(context, listen: false).setDanmakuTimeOffset(offset);
+    Provider.of<VideoPlayerState>(context, listen: false)
+        .setManualDanmakuOffset(offset);
     FocusScope.of(context).unfocus();
     _customOffsetController.clear();
     setState(() {
@@ -85,8 +86,8 @@ class _DanmakuOffsetMenuState extends State<DanmakuOffsetMenu> {
         child: InkWell(
           borderRadius: BorderRadius.circular(8),
           onTap: () {
-            Provider.of<SettingsProvider>(context, listen: false)
-                .setDanmakuTimeOffset(offset);
+            Provider.of<VideoPlayerState>(context, listen: false)
+                .setManualDanmakuOffset(offset);
           },
           child: Container(
             padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
@@ -115,8 +116,8 @@ style: TextStyle(
 
   @override
   Widget build(BuildContext context) {
-    return Consumer<SettingsProvider>(
-      builder: (context, settingsProvider, child) {
+    return Consumer<VideoPlayerState>(
+      builder: (context, videoState, child) {
         return BaseSettingsMenu(
           title: '弹幕偏移',
           onClose: widget.onClose,
@@ -154,17 +155,17 @@ style: TextStyle(
                         mainAxisAlignment: MainAxisAlignment.center,
                         children: [
                           Icon(
-                            settingsProvider.danmakuTimeOffset > 0
+                            videoState.manualDanmakuOffset > 0
                                 ? Icons.fast_forward
-                                : settingsProvider.danmakuTimeOffset < 0
+                                : videoState.manualDanmakuOffset < 0
                                     ? Icons.fast_rewind
                                     : Icons.sync,
                             color: Colors.white,
                             size: 20,
                           ),
                           const SizedBox(width: 8),
                           Text(
-                            _formatOffset(settingsProvider.danmakuTimeOffset),
+                            _formatOffset(videoState.manualDanmakuOffset),
                             style: const TextStyle(
                               color: Colors.white,
                               fontSize: 18,
@@ -176,10 +177,10 @@ style: TextStyle(
                     ),
                     const SizedBox(height: 8),
                     SettingsHintText(
-                      settingsProvider.danmakuTimeOffset > 0
-                          ? '弹幕将提前${settingsProvider.danmakuTimeOffset}秒显示'
-                          : settingsProvider.danmakuTimeOffset < 0
-                              ? '弹幕将延后${(-settingsProvider.danmakuTimeOffset)}秒显示'
+                      videoState.manualDanmakuOffset > 0
+                          ? '弹幕将提前${videoState.manualDanmakuOffset}秒显示'
+                          : videoState.manualDanmakuOffset < 0
+                              ? '弹幕将延后${(-videoState.manualDanmakuOffset)}秒显示'
                               : '弹幕按原始时间显示',
                     ),
                   ],
@@ -216,7 +217,7 @@ style: TextStyle(
                       children: _offsetOptions
                           .where((offset) => offset < 0)
                           .map((offset) => _buildOffsetButton(
-                              offset, settingsProvider.danmakuTimeOffset))
+                              offset, videoState.manualDanmakuOffset))
                           .toList(),
                     ),
                     const SizedBox(height: 8),
@@ -231,7 +232,7 @@ style: TextStyle(
                       ),
                     ),
                     const SizedBox(height: 4),
-                    _buildOffsetButton(0, settingsProvider.danmakuTimeOffset),
+                    _buildOffsetButton(0, videoState.manualDanmakuOffset),
                     const SizedBox(height: 8),
                     
                     // 前进选项
@@ -248,7 +249,7 @@ style: TextStyle(
                       children: _offsetOptions
                           .where((offset) => offset > 0)
                           .map((offset) => _buildOffsetButton(
-                              offset, settingsProvider.danmakuTimeOffset))
+                              offset, videoState.manualDanmakuOffset))
                           .toList(),
                     ),
                   ],
diff --git a/lib/utils/player_kernel_manager.dart b/lib/utils/player_kernel_manager.dart
@@ -60,8 +60,11 @@ class PlayerKernelManager {
     await videoPlayerState.applyHardwareDecoderPreference();
 
     // 4. 重新初始化播放
-    await videoPlayerState.initializePlayer(currentPath,
-        historyItem: historyItem);
+    await videoPlayerState.initializePlayer(
+      currentPath,
+      historyItem: historyItem,
+      resetManualDanmakuOffset: false,
+    );
 
     // 5. 恢复播放状态
     if (videoPlayerState.hasVideo) {
diff --git a/lib/utils/video_player_state.dart b/lib/utils/video_player_state.dart
@@ -394,6 +394,7 @@ class VideoPlayerState extends ChangeNotifier implements WindowListener {
   final double _maxDanmakuSpeedMultiplier = 2.0;
   final double _baseDanmakuScrollDurationSeconds = 10.0;
   double _danmakuSpeedMultiplier = 1.0; // 默认标准速度
+  double _manualDanmakuOffset = 0.0; // 手动设置的弹幕偏移
   double _autoDanmakuOffset = 0.0; // 弹弹Play自动匹配的时间偏移
 
   // 添加播放速度相关状态
@@ -651,6 +652,7 @@ class VideoPlayerState extends ChangeNotifier implements WindowListener {
   double get danmakuScrollDurationSeconds =>
       _baseDanmakuScrollDurationSeconds / _danmakuSpeedMultiplier;
   bool get danmakuStacking => _danmakuStacking;
+  double get manualDanmakuOffset => _manualDanmakuOffset;
   double get autoDanmakuOffset => _autoDanmakuOffset;
   bool get pauseOnBackground => _pauseOnBackground;
   Anime4KProfile get anime4kProfile => _anime4kProfile;
@@ -721,6 +723,14 @@ class VideoPlayerState extends ChangeNotifier implements WindowListener {
   // Volume Getters
   double get currentSystemVolume => _currentVolume;
 
+  void setManualDanmakuOffset(double offset) {
+    if ((_manualDanmakuOffset - offset).abs() < 0.0001) {
+      return;
+    }
+    _manualDanmakuOffset = offset;
+    notifyListeners();
+  }
+
   void _setAutoDanmakuOffset(double offset) {
     if ((_autoDanmakuOffset - offset).abs() < 0.0001) {
       return;
diff --git a/lib/utils/video_player_state/video_player_state_player_setup.dart b/lib/utils/video_player_state/video_player_state_player_setup.dart
@@ -5,13 +5,17 @@ extension VideoPlayerStatePlayerSetup on VideoPlayerState {
       {WatchHistoryItem? historyItem,
       String? historyFilePath,
       String? actualPlayUrl,
-      PlaybackSession? playbackSession}) async {
+      PlaybackSession? playbackSession,
+      bool resetManualDanmakuOffset = true}) async {
     // 每次切换新视频时，重置自动连播倒计时状态，防止高强度测试下卡死
     try {
       AutoNextEpisodeService.instance.cancelAutoNext();
     } catch (e) {
       debugPrint('[自动连播] 重置AutoNextEpisodeService状态失败: $e');
     }
+    if (resetManualDanmakuOffset) {
+      setManualDanmakuOffset(0.0);
+    }
     if (_status == PlayerStatus.loading ||
         _status == PlayerStatus.recognizing) {
       _setStatus(PlayerStatus.idle,
diff --git a/lib/utils/video_player_state/video_player_state_preferences.dart b/lib/utils/video_player_state/video_player_state_preferences.dart
@@ -34,7 +34,11 @@ extension VideoPlayerStatePreferences on VideoPlayerState {
         _currentVideoPath = null; // 清空路径，避免重复初始化
         _danmakuOverlayKey = 'idle'; // 临时重置弹幕覆盖层key
         await Future.delayed(const Duration(seconds: 1)); // 等待一秒
-        await initializePlayer(path, actualPlayUrl: actualUrl);
+        await initializePlayer(
+          path,
+          actualPlayUrl: actualUrl,
+          resetManualDanmakuOffset: false,
+        );
       } else {
         _setStatus(PlayerStatus.idle, message: '请重新选择视频');
       }
diff --git a/lib/utils/video_player_state/video_player_state_streaming.dart b/lib/utils/video_player_state/video_player_state_streaming.dart
@@ -463,6 +463,7 @@ extension JellyfinQualitySwitch on VideoPlayerState {
         currentPath,
         historyItem: historyItem,
         playbackSession: newSession,
+        resetManualDanmakuOffset: false,
       );
 
       // 恢复播放状态（等待状态稳定后再操作）
@@ -544,6 +545,7 @@ extension EmbyQualitySwitch on VideoPlayerState {
         currentPath,
         historyItem: historyItem,
         playbackSession: newSession,
+        resetManualDanmakuOffset: false,
       );
 
       if (hasVideo) {
diff --git a/lib/widgets/danmaku_overlay.dart b/lib/widgets/danmaku_overlay.dart
@@ -6,7 +6,6 @@ import 'package:nipaplay/danmaku_gpu/lib/gpu_danmaku_config.dart';
 import 'package:danmaku_canvas/canvas_danmaku_renderer.dart';
 import 'package:provider/provider.dart';
 import 'package:nipaplay/utils/video_player_state.dart';
-import 'package:nipaplay/providers/settings_provider.dart';
 import '../danmaku_abstraction/danmaku_kernel_factory.dart';
 
 class DanmakuOverlay extends StatefulWidget {
@@ -40,11 +39,11 @@ class _DanmakuOverlayState extends State<DanmakuOverlay> {
       // 弹幕不可见时，彻底不构建，避免文本排版消耗
       return const SizedBox.shrink();
     }
-    return Consumer2<VideoPlayerState, SettingsProvider>(
-      builder: (context, videoState, settingsProvider, child) {
+    return Consumer<VideoPlayerState>(
+      builder: (context, videoState, child) {
         final kernelType = DanmakuKernelFactory.getKernelType();
         final combinedTimeOffset =
-            settingsProvider.danmakuTimeOffset + videoState.autoDanmakuOffset;
+            videoState.manualDanmakuOffset + videoState.autoDanmakuOffset;
 
         // 直接从videoState获取已处理好的弹幕列表
         final activeDanmakuList = videoState.danmakuList;
