FEAT: 完善精听手动模式控制

Author: echo-loop

TASKS.md

@@ -4,6 +4,8 @@
 
 ## 本次完成
 
+- [x] 精听讲解页按模式显示“继续”或“下一句”（2026-10-18）：自动模式保留“继续”重播与自动推进；手动模式使用共享页脚现有下一句导航，推进时沿用原切句动画和手动播放设置。新增精听页交互回归测试，并将 Provider 测试更新为覆盖手动从讲解页切句。播放器 Provider 与页面定向测试共 106 项通过；3 个相关 Dart 文件定向分析无问题，格式检查与 `git diff --check` 通过。未运行 `scripts/check.sh`：改动限于精听讲解页控件选择和现有导航复用。未运行 Maestro：Android ADB server 启动被 `Operation not permitted` 阻止。**完成时间**: 2026-10-18 18:30
+- [x] 精听手动模式支持循环次数和停顿设置（2026-10-18）：设置面板在手动模式下继续复用现有循环、停顿控件与偏好；精听沿用 `BlindPracticeFlowEngine`，按所选次数循环并在循环间停顿，结束后停在当前句等待用户切句，重听从第一遍开始，无限循环可由用户切句打断。共享遍数提示统一显示手动/自动模式与当前遍数，本地化说明同步更新。新增设置面板、播放器流程、遍数提示及精听页回归测试。4 个定向测试文件共 86 项通过，精听页测试 51 项通过，13 个相关 Dart 文件 `flutter analyze --no-pub` 无问题，`flutter gen-l10n` 与 `git diff --check` 通过。未运行 `scripts/check.sh`：改动范围局限于精听设置和共享循环/提示组件，定向检查已覆盖。未运行 Maestro：Android ADB 服务启动被 `Operation not permitted` 阻止；iOS Maestro CLI 初始化因无法修改工作区外依赖权限而失败，且现有 Flow 会清理应用状态。**完成时间**: 2026-10-18 17:51
 - [x] 修复逐句播放中调整速度未即时生效（2026-10-18）：`MediaSentencePlaybackDriver.setSpeed` 更新保存速度的同时调用 MediaEngine，使当前播放立即采用新速度，后续句子继续沿用该速度。新增回归测试覆盖播放中变速和下一句速度继承。`test/providers/media_engine/media_engine_provider_test.dart` 25 项通过，两个相关 Dart 文件定向分析无问题，格式与 `git diff --check` 通过。未运行 `scripts/check.sh`：改动局限于播放速度驱动与对应回归测试，已完成定向验证。
 - [x] 社区合集按地区使用中国镜像 URL（2026-10-18）：App 解析并缓存 API 返回的 `coverUrlChina` / `mediaUrlChina`；中国用户在镜像 URL 可用时使用中国地址，否则使用全球地址，其他地区继续使用全球地址。已加入合集持久化中国封面 URL，数据库升级至 v59；媒体下载按地区选地址，失败时不跨区重试。社区合集 API、DTO、缓存、封面、下载、同步和 v58→v59 迁移相关测试通过（首次 71 项；后续 UI 回归 40 项），23 个相关 Dart 文件定向分析通过，`git diff --check` 通过。未运行 `scripts/check.sh`：改动局限于社区合集 URL 与封面数据链路，定向测试和分析已覆盖。未运行 Maestro：当前环境 `adb` server 启动被 `Operation not permitted` 阻止；现有 Flow 会清理 App 状态。**完成时间**: 2026-10-18
   - 审查修复（2026-10-18）：SharedPreferences 迁移解析 `coverUrlChina` 改用字符串模式匹配，畸形非字符串值安全回退为 null；新增回归测试。`test/models/collection_test.dart` 16 项通过，相关 Dart 分析无问题。

lib/l10n/app_en.arb

@@ -804,7 +804,7 @@
   "intensiveListenSettingsTemporaryHint": "Settings are remembered for next time",
   "intensiveListenPauseSmartDesc": "Auto-adjusted based on difficulty, sentence length, and learning stage",
   "intensiveListenControlModeAutoDesc": "Auto-loop, auto-pause, auto-next",
-  "intensiveListenControlModeManualDesc": "Tap to replay, tap next",
+  "intensiveListenControlModeManualDesc": "Repeat as configured, tap next",
   "intensiveListenPauseFixedUnit": "{seconds}s",
   "@intensiveListenPauseFixedUnit": {
     "placeholders": {

lib/l10n/app_localizations.dart

@@ -2675,7 +2675,7 @@ abstract class AppLocalizations {
   /// No description provided for @intensiveListenControlModeManualDesc.
   ///
   /// In en, this message translates to:
-  /// **'Tap to replay, tap next'**
+  /// **'Repeat as configured, tap next'**
   String get intensiveListenControlModeManualDesc;
 
   /// No description provided for @intensiveListenPauseFixedUnit.

lib/l10n/app_localizations_en.dart

@@ -1477,7 +1477,8 @@ class AppLocalizationsEn extends AppLocalizations {
       'Auto-loop, auto-pause, auto-next';
 
   @override
-  String get intensiveListenControlModeManualDesc => 'Tap to replay, tap next';
+  String get intensiveListenControlModeManualDesc =>
+      'Repeat as configured, tap next';
 
   @override
   String intensiveListenPauseFixedUnit(int seconds) {

lib/l10n/app_localizations_zh.dart

@@ -1427,7 +1427,7 @@ class AppLocalizationsZh extends AppLocalizations {
   String get intensiveListenControlModeAutoDesc => '自动循环、自动停顿、自动下一句';
 
   @override
-  String get intensiveListenControlModeManualDesc => '手动重听、手动下一句';
+  String get intensiveListenControlModeManualDesc => '按设置循环，手动下一句';
 
   @override
   String intensiveListenPauseFixedUnit(int seconds) {

lib/l10n/app_zh.arb

@@ -597,7 +597,7 @@
   "intensiveListenSettingsTemporaryHint": "设置会被记住，下次自动沿用",
   "intensiveListenPauseSmartDesc": "根据难度、句子长度和学习阶段自动调整",
   "intensiveListenControlModeAutoDesc": "自动循环、自动停顿、自动下一句",
-  "intensiveListenControlModeManualDesc": "手动重听、手动下一句",
+  "intensiveListenControlModeManualDesc": "按设置循环，手动下一句",
   "intensiveListenPauseFixedUnit": "{seconds}秒",
   "@intensiveListenPauseFixedUnit": {
     "placeholders": {

lib/providers/blind_flow/blind_practice_flow_engine.dart

@@ -29,7 +29,7 @@ class BlindPracticeFlowConfig {
   /// 每成功播放一遍后的回调
   final void Function(Sentence sentence)? onSentencePlayed;
 
-  /// 是否为手动模式。手动模式下当前句播完后直接进入等待态。
+  /// 是否为手动模式。手动模式完成设置的循环后等待用户切句。
   final bool Function() isManualMode;
 
   const BlindPracticeFlowConfig({
@@ -149,13 +149,19 @@ class BlindPracticeFlowEngine {
     AppLogger.log(logTag, '-> WaitingForUser (from ${phase.runtimeType})');
   }
 
+  /// 重播当前句；手动模式从本轮第一遍重新开始。
   Future<void> replayCurrentSentence() async {
     if (_disposed) return;
+    final sentence = currentSentence;
     _waitAfterCurrentPrompt = false;
     _stopActiveResources();
     _updateState(
       _state.copyWith(
         phase: const BlindIdle(),
+        repeatIndex: _config.isManualMode() ? 0 : _state.repeatIndex,
+        totalRepeats: sentence == null
+            ? _state.totalRepeats
+            : _config.getRepeatCount(sentence),
         flowToken: _state.flowToken + 1,
       ),
     );
@@ -364,18 +370,18 @@ class BlindPracticeFlowEngine {
       return;
     }
 
-    if (_config.isManualMode()) {
-      _updateState(
-        _state.copyWith(
-          repeatIndex: 0,
-          totalRepeats: _config.getRepeatCount(sentence),
-          phase: const BlindWaitingForUser(BlindWaitingReason.userInteraction),
-        ),
-      );
-      return;
-    }
-
     if (_state.isLastRepeat) {
+      if (_config.isManualMode()) {
+        // 手动模式完成所有循环后停在当前句，不触发句间倒计时或自动推进。
+        _updateState(
+          _state.copyWith(
+            phase: const BlindWaitingForUser(
+              BlindWaitingReason.userInteraction,
+            ),
+          ),
+        );
+        return;
+      }
       unawaited(_startSentenceInterval(sentence));
       return;
     }

lib/providers/learning_session/intensive_listen_player_provider.dart

@@ -868,8 +868,7 @@ class IntensiveListenPlayer extends _$IntensiveListenPlayer {
       sentences: _sentences,
       startIndex: startIndex ?? state.currentSentenceIndex,
       config: BlindPracticeFlowConfig(
-        getRepeatCount: (_) =>
-            state.settings.isManualMode ? 1 : state.settings.repeatCount,
+        getRepeatCount: (_) => state.settings.repeatCount,
         getRepeatIntervalDuration: (sentence) =>
             calculatePauseDuration(sentence.duration, state.settings),
         getSentenceIntervalDuration: (sentence) =>

lib/screens/intensive_listen_player_screen.dart

@@ -1057,9 +1057,7 @@ class _IntensiveListenPlayerScreenState
                                         currentCount:
                                             playerState.currentPlayCount,
                                         totalCount:
-                                            playerState.settings.isManualMode
-                                            ? 1
-                                            : playerState.settings.repeatCount,
+                                            playerState.settings.repeatCount,
                                       ),
                                       statusSuffixText: _formatSpeed(
                                         playerState.settings.playbackSpeed,
@@ -1099,8 +1097,10 @@ class _AnnotationContent extends StatelessWidget {
   }
 }
 
+/// 自动模式在讲解页显示“继续”；手动模式沿用页脚的下一句导航。
 bool _showContinueButton(IntensiveListenState playerState) {
   return playerState.isAnnotationMode &&
+      !playerState.settings.isManualMode &&
       !playerState.isAnnotationReplay &&
       !playerState.isPauseBetweenSentences &&
       playerState.annotationState?.phase is! WaitingAnnotationPageTransition;

lib/widgets/intensive_listen/intensive_listen_settings_sheet.dart

@@ -54,47 +54,40 @@ class _IntensiveListenSettingsSheet extends ConsumerWidget {
           // 播放速度（手动/自动模式下都生效）
           _buildPlaybackSpeedSection(l10n, theme, settings, ref),
 
-          // 循环次数和停顿设置仅在自动模式下显示
-          if (!settings.isManualMode) ...[
-            const SizedBox(height: AppSpacing.l),
+          const SizedBox(height: AppSpacing.l),
 
-            // 每句循环次数
-            _buildRepeatCountRow(l10n, theme, settings, ref),
-            if (settings.repeatCount != 1)
-              SwitchListTile(
-                contentPadding: EdgeInsets.zero,
-                title: Text(
-                  l10n.intensiveListenAnnotationReplayUsesRepeatCount,
-                ),
-                value: settings.annotationReplayUsesRepeatCount,
-                onChanged: (value) {
-                  ref
-                      .read(intensiveListenPlayerProvider.notifier)
-                      .updateSettings(
-                        settings.copyWith(
-                          annotationReplayUsesRepeatCount: value,
-                        ),
-                      );
-                },
-              ),
-            const SizedBox(height: AppSpacing.l),
+          // 两种控制模式共用循环次数与停顿设置。
+          _buildRepeatCountRow(l10n, theme, settings, ref),
+          if (settings.repeatCount != 1)
+            SwitchListTile(
+              contentPadding: EdgeInsets.zero,
+              title: Text(l10n.intensiveListenAnnotationReplayUsesRepeatCount),
+              value: settings.annotationReplayUsesRepeatCount,
+              onChanged: (value) {
+                ref
+                    .read(intensiveListenPlayerProvider.notifier)
+                    .updateSettings(
+                      settings.copyWith(annotationReplayUsesRepeatCount: value),
+                    );
+              },
+            ),
+          const SizedBox(height: AppSpacing.l),
 
-            // 句间停顿
-            Text(
-              l10n.intensiveListenPauseLabel,
-              style: theme.textTheme.titleSmall?.copyWith(
-                fontWeight: FontWeight.w600,
-              ),
+          // 句间停顿
+          Text(
+            l10n.intensiveListenPauseLabel,
+            style: theme.textTheme.titleSmall?.copyWith(
+              fontWeight: FontWeight.w600,
             ),
-            const SizedBox(height: AppSpacing.s),
+          ),
+          const SizedBox(height: AppSpacing.s),
 
-            // 模式切换
-            _buildPauseModeSelector(l10n, settings, ref),
-            const SizedBox(height: AppSpacing.m),
+          // 模式切换
+          _buildPauseModeSelector(l10n, settings, ref),
+          const SizedBox(height: AppSpacing.m),
 
-            // 模式详情
-            _buildPauseModeDetail(l10n, theme, settings, ref),
-          ],
+          // 模式详情
+          _buildPauseModeDetail(l10n, theme, settings, ref),
         ],
       ),
     );