chore(client): 归档原型阶段未提交改动（binding/logic/view 分层与各页迭代）

为什么：客户端原型在 14d7bd3 之后又做了一轮（页面分层、发现页、分类滑动、播放器控件等），一直留在工作区没入库。下一批账号链路要改其中的 app.dart / home_view / player_view / mine_view，先归档这批既存改动，本批的实际 diff 才说得清边界。只归档，不改行为：当前工作区 flutter analyze 0 问题、flutter test 148 全过。
2026-10-15 17:53:27 +08:00
1 parent 14d7bd39c7
commit 77d5748dbb
@@ -2,11 +2,13 @@ import 'dart:async';

 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:provider/provider.dart';

 import '../../core/data/models/drama.dart';
 import '../../core/data/models/player_port.dart';
 import '../../core/data/repositories/watch_history_repository.dart';
 import '../../core/data/services/android_picture_in_picture.dart';
+import '../../core/data/services/catalog_controller.dart';
 import '../../core/data/services/platform_share_service.dart';
 import '../../core/data/services/playback_queue.dart';
 import '../../core/data/services/playback_session.dart';
@@ -16,7 +18,6 @@ import '../../l10n/app_localizations.dart';
 import '../discover/discover_logic.dart';
 import '../discover/discover_view.dart';
 import '../drama_detail/drama_detail_view.dart';
-import '../home/home_feed_sections.dart';
 import '../mine/mine_logic.dart';
 import '../mine/mine_view.dart';
 import 'player_view.dart';
@@ -30,10 +31,7 @@ class PlayerLogic extends ChangeNotifier {

  late PageController pages;
  late PlaybackQueue queue;
-  late HomeFeedSections homeSections;
  late List<int> visibleIndices;
-  HomeFeedCategory category = HomeFeedCategory.recommended;
-  int categoryRequest = 0;
  late PlaybackSession session;
  VideoPlayerPort? trackedPlayer;
  Episode? trackedEpisode;
@@ -47,6 +45,8 @@ class PlayerLogic extends ChangeNotifier {
  bool fullscreen = false;
  bool pip = false;
  bool pipPreparing = false;
+  bool screenCleared = false;
+  final Map<String, int> pickedEpisode = {};

  bool Function() isMounted = () => false;
  bool homeMode = false;
@@ -67,6 +67,24 @@ class PlayerLogic extends ChangeNotifier {

  bool get immersive => fullscreen || pip || pipPreparing;

+  bool get chromeHidden => immersive || screenCleared;
+
+  Episode displayEpisode(Drama drama, Episode fallback) {
+    final number = pickedEpisode[drama.id];
+    if (number == null) return fallback;
+    for (final episode in drama.episodes) {
+      if (episode.number == number) return episode;
+    }
+    return fallback;
+  }
+
+  void setScreenCleared(bool value) {
+    if (screenCleared == value) return;
+    screenCleared = value;
+    notify();
+    notifyImmersive();
+  }
+
  void notify() {
    if (!_disposed) notifyListeners();
  }
@@ -97,17 +115,13 @@ class PlayerLogic extends ChangeNotifier {
    queue = feedDramas == null
        ? PlaybackQueue.series(pageDrama)
        : PlaybackQueue.home(feedDramas!);
-    homeSections = HomeFeedSections([
-      for (final entry in queue.entries) entry.drama,
-    ]);
-    visibleIndices = homeMode
-        ? homeSections.indicesFor(category)
-        : List<int>.generate(queue.length, (index) => index);
+    visibleIndices = List<int>.generate(queue.length, (index) => index);
    pages = PageController(initialPage: initialIndex);
    session = PlaybackSession(
      episodes: [for (final entry in queue.entries) entry.episode],
      factory: factory,
-      canPlay: (episode) => episode.isFree,
+      // 后端只在可播放时才下发地址（免费集或已解锁），拿不到地址即视为锁定
+      canPlay: (episode) => episode.videoUrl.isNotEmpty,
      prepare: preparePlayer,
      activate: activatePlayer,
      coordinator: coordinator,
@@ -135,8 +149,10 @@ class PlayerLogic extends ChangeNotifier {
        if (isMounted() && backRequest == request) {
          if (fullscreen) {
            unawaited(setFullscreen(false));
+          } else if (screenCleared) {
+            setScreenCleared(false);
          } else {
-            shiftCategory(-1);
+            onMenu?.call();
          }
        }
      });
@@ -170,7 +186,7 @@ class PlayerLogic extends ChangeNotifier {
    super.dispose();
  }

-  void notifyImmersive() => onImmersiveChanged?.call(immersive);
+  void notifyImmersive() => onImmersiveChanged?.call(chromeHidden);

  Future<void> setFullscreen(bool value) async {
    if (fullscreen == value || !isMounted()) return;
@@ -192,7 +208,7 @@ class PlayerLogic extends ChangeNotifier {
    } catch (_) {
      if (value && isMounted()) {
        fullscreen = false;
-    notify();
+        notify();
        notifyImmersive();
      }
    }
@@ -226,7 +242,7 @@ class PlayerLogic extends ChangeNotifier {
      session.setAppResumed(true);
    } else {
      pipPreparing = false;
-    notify();
+      notify();
      notifyImmersive();
      ScaffoldMessenger.of(context).showSnackBar(
        SnackBar(content: Text(AppLocalizations.of(context)!.pipUnavailable)),
@@ -327,7 +343,7 @@ class PlayerLogic extends ChangeNotifier {
        curve: Curves.easeOutCubic,
      );
    } catch (_) {
-      // A category change can detach the old page controller mid-animation.
+      // The page can leave the tree before the animation finishes.
    }
  }

@@ -371,49 +387,6 @@ class PlayerLogic extends ChangeNotifier {
        : null;
  }

-  void shiftCategory(int offset) {
-    if (!homeMode) return;
-    final next = category.index + offset;
-    if (next < 0) {
-      onMenu?.call();
-      return;
-    }
-    if (next >= HomeFeedCategory.values.length) return;
-    unawaited(selectCategory(HomeFeedCategory.values[next]));
-  }
-
-  Future<void> selectCategory(HomeFeedCategory next) async {
-    if (!homeMode || next == category) return;
-    final request = ++categoryRequest;
-    ++pageRequest;
-    session.setRouteVisible(false);
-    cancelScrub();
-    await saveCurrentProgress();
-    if (!isMounted() || request != categoryRequest) return;
-
-    final oldPages = pages;
-    final indices = homeSections.indicesFor(next);
-    category = next;
-    visibleIndices = indices;
-    pages = PageController();
-    notify();
-    WidgetsBinding.instance.addPostFrameCallback((_) => oldPages.dispose());
-
-    if (indices.isEmpty) return;
-    onDramaChanged?.call(queue.entryAt(indices.first).drama);
-    await session.select(
-      indices.first,
-      preloadIndex: nextVisibleIndex(indices.first),
-    );
-    if (isMounted() && request == categoryRequest) {
-      if (stoppedAtFeedEnd) {
-        stoppedAtFeedEnd = false;
-        session.setUserWantsPlay(true);
-      }
-      session.setRouteVisible(active);
-    }
-  }
-
  void beginScrub(VideoPlayerPort player) {
    if (session.active != player) return;
    scrubbingPlayer = player;
@@ -426,7 +399,11 @@ class PlayerLogic extends ChangeNotifier {
    session.setOverlayOpen(false);
  }

-  Future<void> seekTo(BuildContext context, VideoPlayerPort player, Duration position) async {
+  Future<void> seekTo(
+    BuildContext context,
+    VideoPlayerPort player,
+    Duration position,
+  ) async {
    if (scrubbingPlayer != player || session.active != player) return;
    try {
      await session.playbackSettled;
@@ -464,12 +441,31 @@ class PlayerLogic extends ChangeNotifier {
    if (isMounted()) session.setRouteVisible(active);
  }

+  Future<void> openSeriesAt(
+    BuildContext context,
+    Drama drama,
+    int index,
+  ) async {
+    session.setRouteVisible(false);
+    await session.playbackSettled;
+    await saveCurrentProgress();
+    if (!context.mounted) return;
+    await Navigator.of(context).push(
+      MaterialPageRoute<void>(
+        builder: (_) => PlayerPage(drama: drama, initialIndex: index),
+      ),
+    );
+    if (isMounted()) session.setRouteVisible(active);
+  }
+
  Future<void> showEpisodes(BuildContext context) async {
-    if (feedDramas != null) {
-      await openDetail(context);
-      return;
-    }
    final l10n = AppLocalizations.of(context)!;
+    final entry = queue.entryAt(session.currentIndex);
+    final drama = await _withFullEpisodes(context, entry.drama);
+    if (!context.mounted) return;
+    final homeFeed = feedDramas != null;
+    final episodes = drama.episodes;
+    final currentNumber = entry.episode.number;
    session.setOverlayOpen(true);
    await session.playbackSettled;
    if (!context.mounted) {
@@ -479,49 +475,57 @@ class PlayerLogic extends ChangeNotifier {
    try {
      await showModalBottomSheet<void>(
        context: context,
-        backgroundColor: const Color(0xFF202024),
+        backgroundColor: const Color(0xFF16171C),
        showDragHandle: true,
        builder: (sheetContext) => SafeArea(
          child: SizedBox(
-            height: MediaQuery.sizeOf(context).height * 0.6,
+            height: MediaQuery.sizeOf(sheetContext).height * 0.46,
            child: Column(
              crossAxisAlignment: CrossAxisAlignment.start,
              children: [
                Padding(
-                  padding: const EdgeInsets.fromLTRB(20, 4, 20, 12),
+                  padding: const EdgeInsets.fromLTRB(20, 0, 20, 4),
                  child: Text(
                    l10n.episodes,
                    style: const TextStyle(
-                      fontSize: 22,
-                      fontWeight: FontWeight.bold,
+                      fontSize: 18,
+                      fontWeight: FontWeight.w600,
+                    ),
+                  ),
+                ),
+                Padding(
+                  padding: const EdgeInsets.fromLTRB(20, 0, 20, 16),
+                  child: Text(
+                    localizedDramaTitle(l10n, drama),
+                    maxLines: 1,
+                    overflow: TextOverflow.ellipsis,
+                    style: const TextStyle(
+                      color: Color(0xFFB7B3B8),
+                      fontSize: 14,
+                      fontWeight: FontWeight.w400,
                    ),
                  ),
                ),
                Expanded(
-                  child: ListView.builder(
-                    itemCount: queue.length,
-                    itemBuilder: (context, index) {
-                      final episode = queue.entryAt(index).episode;
-                      return ListTile(
-                        leading: CircleAvatar(
-                          backgroundColor: const Color(0xFF3A3030),
-                          child: Text('${episode.number}'),
+                  child: GridView.builder(
+                    padding: const EdgeInsets.fromLTRB(16, 0, 16, 16),
+                    gridDelegate:
+                        const SliverGridDelegateWithFixedCrossAxisCount(
+                          crossAxisCount: 6,
+                          mainAxisSpacing: 10,
+                          crossAxisSpacing: 10,
+                          childAspectRatio: 1.45,
                        ),
-                        title: Text(l10n.episodeLabel(episode.number)),
-                        subtitle: Text(l10n.freeTestMedia),
-                        trailing: const Icon(Icons.play_arrow_rounded),
-                        onTap: () {
-                          Navigator.of(sheetContext).pop();
-                          unawaited(
-                            pages.animateToPage(
-                              index,
-                              duration: const Duration(milliseconds: 260),
-                              curve: Curves.easeOutCubic,
-                            ),
-                          );
-                        },
-                      );
-                    },
+                    itemCount: episodes.length,
+                    itemBuilder: (_, index) => _episodeCell(
+                      context,
+                      sheetContext,
+                      drama,
+                      episodes[index],
+                      index,
+                      homeFeed,
+                      currentNumber,
+                    ),
                  ),
                ),
              ],
@@ -534,6 +538,68 @@ class PlayerLogic extends ChangeNotifier {
    }
  }

+  /// 列表卡片只带一集可播预览，需要完整剧集时补一次详情；
+  /// 取不到（或页面外没有目录来源）就退回卡片本身。
+  Future<Drama> _withFullEpisodes(BuildContext context, Drama drama) async {
+    if (drama.detailLoaded) return drama;
+    final CatalogController catalog;
+    try {
+      catalog = context.read<CatalogController>();
+    } catch (_) {
+      return drama;
+    }
+    try {
+      return await catalog.requireDetail(drama);
+    } catch (_) {
+      return drama;
+    }
+  }
+
+  Widget _episodeCell(
+    BuildContext pageContext,
+    BuildContext sheetContext,
+    Drama drama,
+    Episode episode,
+    int index,
+    bool homeFeed,
+    int currentNumber,
+  ) {
+    final selected = episode.number == currentNumber;
+    return Material(
+      color: selected ? const Color(0xFF2F7BFF) : const Color(0xFF2A2C33),
+      borderRadius: BorderRadius.circular(8),
+      child: InkWell(
+        borderRadius: BorderRadius.circular(8),
+        onTap: () {
+          Navigator.of(sheetContext).pop();
+          if (homeFeed) {
+            if (episode.number == currentNumber) return;
+            unawaited(openSeriesAt(pageContext, drama, index));
+            return;
+          }
+          if (index == session.currentIndex) return;
+          unawaited(
+            pages.animateToPage(
+              index,
+              duration: const Duration(milliseconds: 260),
+              curve: Curves.easeOutCubic,
+            ),
+          );
+        },
+        child: Center(
+          child: Text(
+            '${episode.number}',
+            style: const TextStyle(
+              color: Colors.white,
+              fontSize: 15,
+              fontWeight: FontWeight.w600,
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
  Future<void> showMy(BuildContext context, {int initialSection = 0}) async {
    if (embedded) {
      onMy?.call();
@@ -574,7 +640,10 @@ class PlayerLogic extends ChangeNotifier {
    await showDiscover(context, focusSearch: true);
  }

-  Future<void> showDiscover(BuildContext context, {bool focusSearch = false}) async {
+  Future<void> showDiscover(
+    BuildContext context, {
+    bool focusSearch = false,
+  }) async {
    if (embedded) {
      onDiscover?.call();
      return;
@@ -601,7 +670,8 @@ class PlayerLogic extends ChangeNotifier {
      await openDetail(context);
    } else if (action == DiscoverPageAction.my ||
        action == DiscoverPageAction.watchlist) {
-      await showMy(context, 
+      await showMy(
+        context,
        initialSection: action == DiscoverPageAction.watchlist ? 1 : 0,
      );
    } else {
@@ -661,5 +731,4 @@ class PlayerLogic extends ChangeNotifier {
      session.setOverlayOpen(false);
    }
  }
-
 }
@@ -22,7 +22,6 @@ class SeekProgressBar extends StatefulWidget {
    this.onScrubStart,
    this.onSeek,
    this.showTimes = true,
-    this.compactIdle = false,
  });

  final ValueListenable<VideoPlayerValue>? valueListenable;
@@ -30,7 +29,6 @@ class SeekProgressBar extends StatefulWidget {
  final VoidCallback? onScrubStart;
  final Future<void> Function(Duration)? onSeek;
  final bool showTimes;
-  final bool compactIdle;

  @override
  State<SeekProgressBar> createState() => _SeekProgressBarState();
@@ -99,20 +97,32 @@ class _SeekProgressBarState extends State<SeekProgressBar> {
    return Column(
      mainAxisSize: MainAxisSize.min,
      children: [
+        if (widget.showTimes && scrubbing)
+          Padding(
+            padding: const EdgeInsets.only(bottom: 2),
+            child: Text(
+              '${_format(previewPosition)} / ${_format(video.duration)}',
+              textAlign: TextAlign.center,
+              style: const TextStyle(
+                color: Colors.white,
+                fontSize: 14,
+                fontWeight: FontWeight.w600,
+                height: 1.2,
+              ),
+            ),
+          ),
        SizedBox(
-          height: widget.compactIdle && !scrubbing ? 20 : 36,
+          height: scrubbing ? 48 : 44,
          child: SliderTheme(
            data: SliderTheme.of(context).copyWith(
-              trackHeight: widget.compactIdle && !scrubbing ? 2 : 3,
-              activeTrackColor: const Color(0xFFFF5C37),
+              trackHeight: scrubbing ? 4 : 3,
+              activeTrackColor: const Color(0xFF2F7BFF),
              inactiveTrackColor: Colors.white30,
              thumbColor: Colors.white,
              thumbShape: RoundSliderThumbShape(
-                enabledThumbRadius: widget.compactIdle && !scrubbing ? 0 : 6,
-              ),
-              overlayShape: RoundSliderOverlayShape(
-                overlayRadius: widget.compactIdle && !scrubbing ? 0 : 11,
+                enabledThumbRadius: scrubbing ? 8 : 6,
              ),
+              overlayShape: const RoundSliderOverlayShape(overlayRadius: 18),
            ),
            child: Semantics(
              label: widget.semanticsLabel,
@@ -134,20 +144,6 @@ class _SeekProgressBarState extends State<SeekProgressBar> {
            ),
          ),
        ),
-        if (widget.showTimes && (!widget.compactIdle || scrubbing))
-          Row(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            children: [
-              Text(
-                _format(previewPosition),
-                style: const TextStyle(fontSize: 12, color: Colors.white),
-              ),
-              Text(
-                _format(video.duration),
-                style: const TextStyle(fontSize: 12, color: Colors.white),
-              ),
-            ],
-          ),
      ],
    );
  }