test(flutter): 收敛异步配置与分页测试

lib/core/data/models/drama.dart

@@ -21,6 +21,7 @@ class Episode {
     this.likeCount,
     this.commentCount,
     this.thumbnailsUrl,
+    this.posterUrl,
   });
 
   final String id;
@@ -37,12 +38,14 @@ class Episode {
   final int? likeCount;
   final int? commentCount;
   final String? thumbnailsUrl;
+  final String? posterUrl;
 
   Episode withVideoUrl(
     String url, {
     int? likeCount,
     int? commentCount,
     String? thumbnailsUrl,
+    String? posterUrl,
   }) => Episode(
     id: id,
     number: number,
@@ -54,6 +57,21 @@ class Episode {
     likeCount: likeCount ?? this.likeCount,
     commentCount: commentCount ?? this.commentCount,
     thumbnailsUrl: thumbnailsUrl ?? this.thumbnailsUrl,
+    posterUrl: posterUrl ?? this.posterUrl,
+  );
+
+  Episode withStats({int? likeCount, int? commentCount}) => Episode(
+    id: id,
+    number: number,
+    title: title,
+    isFree: isFree,
+    videoUrl: videoUrl,
+    durationSec: durationSec,
+    locked: locked,
+    likeCount: likeCount ?? this.likeCount,
+    commentCount: commentCount ?? this.commentCount,
+    thumbnailsUrl: thumbnailsUrl,
+    posterUrl: posterUrl,
   );
 
   factory Episode.fromJson(Map<String, dynamic> json) {
@@ -68,6 +86,7 @@ class Episode {
       likeCount: _optionalInt(json['likeCount']),
       commentCount: _optionalInt(json['commentCount']),
       thumbnailsUrl: _optionalString(json['thumbnailsUrl']),
+      posterUrl: _optionalString(json['posterUrl']),
     );
   }
 }
@@ -324,4 +343,4 @@ String _genreText(List<Map<String, String>> types, Object? fallback) {
   final joined = names.join(' / ');
   if (joined.isNotEmpty) return joined;
   return fallback is String ? fallback : '';
-}
+}

lib/core/data/models/episode_stats.dart

@@ -0,0 +1,55 @@
+// Author: fruit.com.cn
+
+import 'json_numbers.dart';
+
+/// 播放页轻量互动计数快照，不包含播放地址或票据信息。
+class EpisodeStats {
+  const EpisodeStats({
+    required this.episodeId,
+    required this.dramaId,
+    required this.likeCount,
+    required this.commentCount,
+    required this.favoriteCount,
+    required this.liked,
+    required this.favorited,
+  });
+
+  final String episodeId;
+  final String dramaId;
+  final int likeCount;
+  final int commentCount;
+  final int favoriteCount;
+  final bool liked;
+  final bool favorited;
+
+  EpisodeStats copyWith({
+    String? dramaId,
+    int? likeCount,
+    int? commentCount,
+    int? favoriteCount,
+    bool? liked,
+    bool? favorited,
+  }) {
+    return EpisodeStats(
+      episodeId: episodeId,
+      dramaId: dramaId ?? this.dramaId,
+      likeCount: likeCount ?? this.likeCount,
+      commentCount: commentCount ?? this.commentCount,
+      favoriteCount: favoriteCount ?? this.favoriteCount,
+      liked: liked ?? this.liked,
+      favorited: favorited ?? this.favorited,
+    );
+  }
+
+  factory EpisodeStats.fromJson(Map<String, dynamic> json) {
+    return EpisodeStats(
+      episodeId: jsonToId(json['episodeId']),
+      dramaId: jsonToId(json['dramaId']),
+      likeCount: jsonToInt(json['likeCount']),
+      commentCount: jsonToInt(json['commentCount']),
+      favoriteCount: jsonToInt(json['favoriteCount']),
+      liked: json['liked'] == true,
+      favorited: json['favorited'] == true,
+    );
+  }
+}

lib/core/data/models/interaction.dart

@@ -58,14 +58,16 @@ class LikeToggleResult {
 
 /// 控制器统一返回结果；失败消息可直接展示后端 `message`。
 class OperationResult<T> {
-  const OperationResult._(this.data, this.errorMessage);
+  const OperationResult._(this.data, this.errorMessage, this.errorCode);
 
-  const OperationResult.success([T? data]) : this._(data, null);
+  const OperationResult.success([T? data]) : this._(data, null, null);
 
-  const OperationResult.failure(this.errorMessage) : data = null;
+  const OperationResult.failure(this.errorMessage, {this.errorCode})
+    : data = null;
 
   final T? data;
   final String? errorMessage;
+  final int? errorCode;
 
   bool get isSuccess => errorMessage == null;
 }

lib/core/data/models/play_ticket.dart

@@ -16,6 +16,7 @@ class PlayTicket {
     this.qualities = const [],
     this.tracks = const [],
     this.thumbnailsUrl,
+    this.posterUrl,
     this.likeCount,
     this.commentCount,
   });
@@ -46,6 +47,7 @@ class PlayTicket {
   /// 各档签名地址。AUTO 是主列表，点选其它档位时换成对应地址。
   final List<PlayQualityTrack> tracks;
   final String? thumbnailsUrl;
+  final String? posterUrl;
   final int? likeCount;
   final int? commentCount;
 
@@ -70,6 +72,7 @@ class PlayTicket {
           .toList(),
       tracks: _tracks(json['tracks'], json['playUrl'] as String? ?? ''),
       thumbnailsUrl: _optionalString(json['thumbnailsUrl']),
+      posterUrl: _optionalString(json['posterUrl']),
       likeCount: json['likeCount'] == null
           ? null
           : jsonToInt(json['likeCount']),

lib/core/data/remote/auth_api.dart

@@ -134,6 +134,7 @@ class AuthApi {
         'platform': platform,
         'osVersion': osVersion,
       },
+      skipAuthRetry: true,
     );
     return AuthSession.fromJson((data as Map).cast<String, dynamic>());
   }

lib/core/data/remote/playback_api.dart

@@ -1,5 +1,6 @@
 // Author: fruit.com.cn
 
+import '../models/episode_stats.dart';
 import '../models/play_ticket.dart';
 import 'api_client.dart';
 
@@ -17,4 +18,11 @@ class PlaybackApi {
     if (data is Map<String, dynamic>) return PlayTicket.fromJson(data);
     throw const ApiException(-1, '返回数据格式异常');
   }
+
+  /// 轻量刷新互动计数：不签发地址，也不占用播放票据缓存。
+  Future<EpisodeStats> episodeStats(String episodeId) async {
+    final data = await _client.get('/app/episodes/$episodeId/stats');
+    if (data is Map<String, dynamic>) return EpisodeStats.fromJson(data);
+    throw const ApiException(-1, '返回数据格式异常');
+  }
 }

lib/core/data/repositories/playback_repository.dart

@@ -1,5 +1,6 @@
 // Author: fruit.com.cn
 
+import '../models/episode_stats.dart';
 import '../models/play_ticket.dart';
 import '../remote/playback_api.dart';
 
@@ -10,6 +11,9 @@ import '../remote/playback_api.dart';
 abstract interface class PlaybackRepository {
   Future<PlayTicket> ticketFor(String episodeId, {bool forceRefresh = false});
 
+  /// 读取互动计数快照；与 [ticketFor] 分离，避免为了刷新计数重新签发地址。
+  Future<EpisodeStats> episodeStats(String episodeId);
+
   /// 当前缓存的票据是否还在有效期内（用于"回前台发现过期就重新取"）。
   bool isFresh(String episodeId);
 }
@@ -42,6 +46,10 @@ class HttpPlaybackRepository implements PlaybackRepository {
     return ticket;
   }
 
+  @override
+  Future<EpisodeStats> episodeStats(String episodeId) =>
+      _api.episodeStats(episodeId);
+
   @override
   bool isFresh(String episodeId) {
     final cached = _cache[episodeId];
@@ -65,11 +73,22 @@ class _CachedTicket {
 
 /// 测试与离线场景用：按集返回固定票据，并记录被请求过几次。
 class FakePlaybackRepository implements PlaybackRepository {
-  FakePlaybackRepository({this.ticket, this.error, this.fresh = true});
+  FakePlaybackRepository({
+    this.ticket,
+    this.error,
+    this.fresh = true,
+    this.stats,
+    this.statsError,
+    Map<String, EpisodeStats>? statsByEpisode,
+  }) : statsByEpisode = statsByEpisode ?? {};
 
   PlayTicket? ticket;
   Object? error;
+  EpisodeStats? stats;
+  Object? statsError;
+  final Map<String, EpisodeStats> statsByEpisode;
   final List<String> requests = [];
+  final List<String> statsRequests = [];
   final List<bool> forced = [];
 
   /// 模拟"票据是否还有效"：置 false 可验证回前台会重新取。
@@ -95,4 +114,13 @@ class FakePlaybackRepository implements PlaybackRepository {
           qualities: const ['AUTO', '720P', '1080P'],
         );
   }
+
+  @override
+  Future<EpisodeStats> episodeStats(String episodeId) async {
+    statsRequests.add(episodeId);
+    if (statsError != null) throw statsError!;
+    final value = statsByEpisode[episodeId] ?? stats;
+    if (value != null) return value;
+    throw StateError('episode stats not configured for $episodeId');
+  }
 }

lib/core/data/services/all_dramas_controller.dart

@@ -66,7 +66,7 @@ class AllDramasController {
     this.categories = const [],
     this.tags = const [],
     this.dramas = const [],
-  }) : _api = api;
+  }) : _api = api; // ignore: prefer_initializing_formals
 
   final AllDramasRemote? _api;
   List<ContentCategory> classifications;

lib/core/data/services/comment_controller.dart

@@ -197,7 +197,10 @@ class CommentController extends ChangeNotifier {
       _insertPublished(comment, replyTo);
       return OperationResult.success(comment);
     } catch (failure) {
-      return OperationResult.failure(_errorMessage(failure));
+      return OperationResult.failure(
+        _errorMessage(failure),
+        errorCode: failure is ApiException ? failure.code : null,
+      );
     } finally {
       submitting = false;
       _notify();
@@ -217,7 +220,10 @@ class CommentController extends ChangeNotifier {
       return const OperationResult.success();
     } catch (failure) {
       _restoreComment(comment, location);
-      return OperationResult.failure(_errorMessage(failure));
+      return OperationResult.failure(
+        _errorMessage(failure),
+        errorCode: failure is ApiException ? failure.code : null,
+      );
     } finally {
       _deletingCommentIds.remove(comment.id);
       _notify();
@@ -253,7 +259,10 @@ class CommentController extends ChangeNotifier {
       return OperationResult.success(result);
     } catch (failure) {
       _replaceComment(current);
-      return OperationResult.failure(_errorMessage(failure));
+      return OperationResult.failure(
+        _errorMessage(failure),
+        errorCode: failure is ApiException ? failure.code : null,
+      );
     } finally {
       _likingCommentIds.remove(comment.id);
       _notify();
@@ -277,7 +286,10 @@ class CommentController extends ChangeNotifier {
       );
       return OperationResult.success(reportId);
     } catch (failure) {
-      return OperationResult.failure(_errorMessage(failure));
+      return OperationResult.failure(
+        _errorMessage(failure),
+        errorCode: failure is ApiException ? failure.code : null,
+      );
     }
   }
 

lib/core/data/services/favorite_controller.dart

@@ -3,6 +3,7 @@
 import 'package:flutter/foundation.dart';
 
 import '../models/drama.dart';
+import '../remote/api_client.dart';
 import '../repositories/favorite_repository.dart';
 
 /// 收藏状态：**以服务端为准**。
@@ -24,6 +25,7 @@ class FavoriteController extends ChangeNotifier {
   bool hasMore = false;
   String? error;
   String? loadMoreError;
+  int? lastErrorCode;
   int _pageIndex = 0;
   int _requestSeq = 0;
   bool _disposed = false;
@@ -32,6 +34,17 @@ class FavoriteController extends ChangeNotifier {
 
   bool isSaved(String dramaId) => _saved.contains(dramaId);
 
+  /// 用统计快照校准收藏状态；已有列表卡片结构不因一次状态同步而改动。
+  void applyServerState(String dramaId, {required bool saved}) {
+    final changed = _saved.contains(dramaId) != saved;
+    if (saved) {
+      _saved.add(dramaId);
+    } else {
+      _saved.remove(dramaId);
+    }
+    if (changed) notify();
+  }
+
   void notify() {
     if (!_disposed) notifyListeners();
   }
@@ -101,11 +114,12 @@ class FavoriteController extends ChangeNotifier {
     }
   }
 
-  /// 未登录时不要调用（服务端要求登录态）。
+  /// 每次切换都以接口状态为准；匿名请求由设备号归属。
   ///
   /// [card] 是当前剧的卡片（播放页/详情页手上就有）：收藏成功时直接放进列表，
   /// 这样"收藏完打开我的收藏"能立刻看到，不必等下一次整表刷新。
   Future<bool> toggle(String dramaId, {Drama? card}) async {
+    lastErrorCode = null;
     final wasSaved = _saved.contains(dramaId);
     final previousCards = cards;
     final previousTotal = total;
@@ -146,7 +160,7 @@ class FavoriteController extends ChangeNotifier {
       }
       notify();
       return true;
-    } catch (_) {
+    } catch (failure) {
       // 回滚
       cards = previousCards;
       total = previousTotal;
@@ -157,6 +171,7 @@ class FavoriteController extends ChangeNotifier {
         _saved.remove(dramaId);
       }
       notify();
+      if (failure is ApiException) lastErrorCode = failure.code;
       return false;
     }
   }

lib/core/data/services/interaction_controller.dart

@@ -40,6 +40,24 @@ class InteractionController extends ChangeNotifier {
   /// 该集服务端最新点赞数。
   int? episodeLikeCount(String episodeId) => _episodeLikeCounts[episodeId];
 
+  /// 用轻量统计快照校准当前用户的分集点赞状态与计数。
+  void applyEpisodeStats(
+    String episodeId, {
+    required bool liked,
+    required int likeCount,
+  }) {
+    final changed =
+        _likedEpisodeIds.contains(episodeId) != liked ||
+        _episodeLikeCounts[episodeId] != likeCount;
+    if (liked) {
+      _likedEpisodeIds.add(episodeId);
+    } else {
+      _likedEpisodeIds.remove(episodeId);
+    }
+    _episodeLikeCounts[episodeId] = likeCount;
+    if (changed) _notify();
+  }
+
   /// 乐观切换剧集点赞，失败时回滚并以服务端返回状态校准。
   Future<OperationResult<LikeToggleResult>> toggleDramaLike(String dramaId) =>
       _toggleLike(
@@ -97,7 +115,10 @@ class InteractionController extends ChangeNotifier {
       } else {
         likedIds.remove(id);
       }
-      return OperationResult.failure(_errorMessage(failure));
+      return OperationResult.failure(
+        _errorMessage(failure),
+        errorCode: failure is ApiException ? failure.code : null,
+      );
     } finally {
       busyIds.remove(id);
       _notify();
@@ -121,7 +142,10 @@ class InteractionController extends ChangeNotifier {
       );
       return OperationResult.success(reportId);
     } catch (failure) {
-      return OperationResult.failure(_errorMessage(failure));
+      return OperationResult.failure(
+        _errorMessage(failure),
+        errorCode: failure is ApiException ? failure.code : null,
+      );
     }
   }
 

lib/core/data/services/playback_neighbors.dart

@@ -13,14 +13,40 @@ class PlaybackCoordinator {
   Future<bool> _acquire(PlaybackSession session, bool Function() valid) {
     final result = _handoff.then((_) async {
       if (!valid()) return false;
+      final previous = _owner;
+      if (kDebugMode) {
+        debugPrint(
+          '[player-coordinator] phase=acquire '
+          'session=${identityHashCode(session)} owner=${session.owner.name} '
+          'previous=${previous == null ? '-' : identityHashCode(previous)} '
+          'previousOwner=${previous?.owner.name ?? '-'} '
+          'previousLive=${previous?.livePlayerCount ?? 0} '
+          'same=${identical(previous, session)}',
+        );
+      }
       if (_owner != session) {
-        final previous = _owner;
+        if (previous != null && previous.owner != session.owner) {
+          if (kDebugMode) {
+            debugPrint(
+              '[player-owner] phase=reject-coordinator-handoff '
+              'owner=${session.owner.name} '
+              'activeOwner=${previous.owner.name}',
+            );
+          }
+          return false;
+        }
         await previous?._releasePlayers();
         if (previous != null && previous.livePlayerCount != 0) return false;
         _owner = null;
         if (!valid()) return false;
         _owner = session;
       }
+      if (kDebugMode) {
+        debugPrint(
+          '[player-coordinator] phase=acquired '
+          'session=${identityHashCode(session)} live=${session.livePlayerCount}',
+        );
+      }
       return true;
     });
     _handoff = result.then<void>((_) {});
@@ -49,13 +75,21 @@ Future<void> _parkNeighbors(
   _PlayerSlot? warmNext,
   _PlayerSlot? warmPrevious,
 ) async {
-  await _placeNeighbor(session, old);
-  await _placeNeighbor(session, warmNext);
-  await _placeNeighbor(session, warmPrevious);
+  await _placeNeighbor(session, old, roleHint: 'old-current');
+  await _placeNeighbor(session, warmNext, roleHint: 'next');
+  await _placeNeighbor(session, warmPrevious, roleHint: 'previous');
 }
 
-Future<void> _placeNeighbor(PlaybackSession session, _PlayerSlot? slot) async {
+Future<void> _placeNeighbor(
+  PlaybackSession session,
+  _PlayerSlot? slot, {
+  required String roleHint,
+}) async {
   if (slot == null || slot == session._active || slot.retiring) return;
+  if (slot.owner != session.owner) {
+    session._logOwnerRejection('park', slot);
+    return;
+  }
   if (session._next == null && slot.index == session._nextIndex) {
     session._next = slot;
     return;
@@ -64,18 +98,22 @@ Future<void> _placeNeighbor(PlaybackSession session, _PlayerSlot? slot) async {
     session._previous = slot;
     return;
   }
-  await session._retire(slot);
+  await session._retire(slot, trigger: 'park-neighbor', roleHint: roleHint);
 }
 
-/// 当前集已经出画后，静默准备上一集和下一集。
-void _warmNeighbors(PlaybackSession session) {
+/// 当前集已经出画后，按手势方向静默准备上一集和下一集。
+void _warmNeighbors(PlaybackSession session, {bool preferredNext = true}) {
   final request = session._generation;
-  session._preloadTask = () async {
-    await Future.wait([
-      _warmOne(session, request, session._nextIndex, next: true),
-      _warmOne(session, request, session._previousIndex, next: false),
-    ]);
-  }();
+  final nextTask = _warmOne(session, request, session._nextIndex, next: true);
+  final previousTask = _warmOne(
+    session,
+    request,
+    session._previousIndex,
+    next: false,
+  );
+  session._preloadTask = Future.wait(
+    preferredNext ? [nextTask, previousTask] : [previousTask, nextTask],
+  ).then<void>((_) {});
 }
 
 Future<void> _warmOne(
@@ -100,7 +138,11 @@ Future<void> _warmOne(
   await session._enqueue(() async {
     if (!_stillHeld(session, candidate, next: next)) return;
     _clearNeighbor(session, next: next);
-    await session._retire(candidate);
+    await session._retire(
+      candidate,
+      trigger: 'warm-failure',
+      roleHint: next ? 'next' : 'previous',
+    );
   });
 }
 
@@ -117,7 +159,11 @@ Future<_PlayerSlot?> _allocateNeighbor(
     final current = next ? session._next : session._previous;
     if (!allowed || current?.index != index) {
       _clearNeighbor(session, next: next);
-      await session._retire(current);
+      await session._retire(
+        current,
+        trigger: 'warm-slot-invalid',
+        roleHint: next ? 'next' : 'previous',
+      );
     }
     if (!_canAllocate(session, request, allowed: allowed, next: next)) {
       return;

lib/core/data/services/playback_session.dart

@@ -8,6 +8,7 @@ import '../models/player_port.dart';
 import 'video_player_port.dart';
 
 part 'playback_neighbors.dart';
+part 'playback_session_controls.dart';
 
 /// 新纹理第一帧常是黑的，旧画面只盖住这一小段。
 const Duration _qualityHandoffHold = Duration(milliseconds: 200);
@@ -16,6 +17,8 @@ typedef PlayerFactory = PlayerPort Function(Episode episode);
 typedef PlayerPreparation =
     Future<void> Function(Episode episode, PlayerPort player);
 
+enum PlaybackSessionOwner { home, player }
+
 /// Owns current plus previous/next frames; allocation stays serialized.
 class PlaybackSession extends ChangeNotifier {
   PlaybackSession({
@@ -26,6 +29,8 @@ class PlaybackSession extends ChangeNotifier {
     this.activate,
     PlaybackCoordinator? coordinator,
     this.waitForFrame,
+    this.owner = PlaybackSessionOwner.player,
+    this.dramaIdAt,
   }) : _coordinator = coordinator ?? PlaybackCoordinator();
 
   final List<Episode> episodes;
@@ -38,6 +43,8 @@ class PlaybackSession extends ChangeNotifier {
   /// Runs only when a slot becomes current (e.g. progress listeners).
   final PlayerPreparation? activate;
   final Future<void> Function()? waitForFrame;
+  final PlaybackSessionOwner owner;
+  final String? Function(int index)? dramaIdAt;
   final PlaybackCoordinator _coordinator;
   final Set<_PlayerSlot> _live = {};
   _PlayerSlot? _active;
@@ -77,9 +84,18 @@ class PlaybackSession extends ChangeNotifier {
   bool get canAutoAdvance => _mayPlay && !_loading && active != null;
   bool get isLocked => !canPlay(currentEpisode);
   String? get error => _error;
+  bool get debugAppResumed => _appResumed;
+  bool get debugRouteVisible => _routeVisible;
+  bool get debugOverlayOpen => _overlayOpen;
+  bool get debugVisible => _visible;
+  bool get debugMayPlay => _mayPlay;
   // Includes initialization and asynchronous disposal, until native release ends.
   int get livePlayerCount => _live.length;
+  bool get activeSlotActivated => _active?.activated ?? false;
+  bool get activeSlotPlaying => _active?.playing ?? false;
   int? get preloadedIndex => _next?.prepared == true ? _next?.index : null;
+  int? get previousPreloadedIndex =>
+      _previous?.prepared == true ? _previous?.index : null;
   Future<void> get playbackSettled => _operations;
   Future<void> get preloadSettled => _preloadTask;
 
@@ -106,15 +122,6 @@ class PlaybackSession extends ChangeNotifier {
     return null;
   }
 
-  /// 清晰度切换时盖住黑帧的旧播放器。只在仍由会话持有时交给界面。
-  PlayerPort? handoffAt(int index) {
-    final slot = _handoff;
-    if (_closed || slot == null || slot.retiring || slot.index != index) {
-      return null;
-    }
-    return slot.player;
-  }
-
   /// 队列重排后把当前仍在播放的 slot 映射到新索引，不重新创建播放器。
   void remapCurrentIndex(int index, {int? preloadIndex, int? previousIndex}) {
     if (_closed || index < 0 || index >= episodes.length) return;
@@ -136,8 +143,12 @@ class PlaybackSession extends ChangeNotifier {
     _notify();
     unawaited(
       _enqueue(() async {
-        await _retire(staleNext);
-        await _retire(stalePrevious);
+        await _retire(staleNext, trigger: 'remap-stale-next', roleHint: 'next');
+        await _retire(
+          stalePrevious,
+          trigger: 'remap-stale-previous',
+          roleHint: 'previous',
+        );
       }),
     );
     if (_visible && !_overlayOpen) _warmNeighbors(this);
@@ -165,7 +176,12 @@ class PlaybackSession extends ChangeNotifier {
     if (_live.length >= maxLivePlayers) {
       throw StateError('Playback resource limit reached');
     }
-    final slot = _PlayerSlot(index, factory(episodes[index]));
+    final slot = _PlayerSlot(
+      index,
+      factory(episodes[index]),
+      owner: owner,
+      dramaId: dramaIdAt?.call(index),
+    );
     _live.add(slot);
     slot.ready = () async {
       try {
@@ -183,8 +199,23 @@ class PlaybackSession extends ChangeNotifier {
     return slot;
   }
 
-  Future<void> _retire(_PlayerSlot? slot) async {
-    if (slot == null || !_live.contains(slot)) return;
+  Future<void> _retire(
+    _PlayerSlot? slot, {
+    required String trigger,
+    String? roleHint,
+  }) async {
+    if (slot == null) return;
+    if (slot.owner != owner) {
+      _logOwnerRejection('retire', slot);
+      return;
+    }
+    if (!_live.contains(slot)) return;
+    final role = _slotRole(slot, roleHint: roleHint);
+    final video = slot.player is VideoPlayerPort
+        ? slot.player as VideoPlayerPort
+        : null;
+    final value = video?.controller.value;
+    final slotPlaying = slot.playing;
     slot.retiring = true;
     final cleared =
         _active == slot ||
@@ -203,6 +234,19 @@ class PlaybackSession extends ChangeNotifier {
     } finally {
       await slot.player.dispose();
       _live.remove(slot);
+      if (kDebugMode) {
+        debugPrint(
+          '[player-slot] slot_released role=$role owner=${slot.owner.name} '
+          'selectOwner=$owner drama=${slot.dramaId ?? '-'} '
+          'episodeIndex=${slot.index} '
+          'controller=${_playerIdentity(slot.player)} '
+          'slotPlaying=${slotPlaying ? 1 : 0} '
+          'isPlaying=${value?.isPlaying == true ? 1 : 0} '
+          'position=${value?.position.inMilliseconds ?? '-'} '
+          'currentIndex=$_currentIndex generation=$_generation '
+          'trigger=$trigger',
+        );
+      }
     }
   }
 
@@ -212,11 +256,23 @@ class PlaybackSession extends ChangeNotifier {
     int index, {
     int? preloadIndex,
     int? previousIndex,
+    bool? userWantsPlay,
   }) async {
     if (_closed || index < 0 || index >= episodes.length) return;
-    // 切到另一集时，上一集按下的暂停不跟着走：滑过去就应该自动播放。
-    // 重复选中同一集（例如页面重新可见）不在这里恢复，尊重用户按下的暂停。
-    if (!_selected || index != _currentIndex) {
+    if (kDebugMode) {
+      debugPrint(
+        '[player-session] phase=select-enter session=${identityHashCode(this)} '
+        'owner=${owner.name} index=$index user=$_userWantsPlay '
+        'selected=$_selected current=$_currentIndex '
+        'appResumed=$_appResumed routeVisible=$_routeVisible '
+        'overlayOpen=$_overlayOpen visible=$_visible mayPlay=$_mayPlay '
+        'live=${_live.length}',
+      );
+    }
+    // 切换到不同剧集时恢复播放；仍停留在同一集时保留用户暂停。
+    if (userWantsPlay != null) {
+      _userWantsPlay = userWantsPlay;
+    } else if (!_selected || index != _currentIndex) {
       _userWantsPlay = true;
     }
     final request = ++_generation;
@@ -247,7 +303,7 @@ class PlaybackSession extends ChangeNotifier {
     _PlayerSlot? target;
     await _enqueue(() async {
       if (_closed || request != _generation) return;
-      await _retire(_handoff);
+      await _retire(_handoff, trigger: 'select-handoff');
       final old = _active;
       if (old != null &&
           old.index == index &&
@@ -256,7 +312,10 @@ class PlaybackSession extends ChangeNotifier {
         target = old;
         return;
       }
-      if (old != null) await old.player.pause();
+      if (old != null) {
+        await old.player.pause();
+        old.playing = false;
+      }
       final warmNext = _next;
       final warmPrevious = _previous;
       _active = null;
@@ -266,6 +325,7 @@ class PlaybackSession extends ChangeNotifier {
           _usableWarm(this, warmNext, index) ??
           _usableWarm(this, warmPrevious, index);
       if (warm != null) {
+        warm.reusedWarm = true;
         target = _active = warm;
         _loading = !warm.prepared;
         _notify();
@@ -314,7 +374,9 @@ class PlaybackSession extends ChangeNotifier {
     await _enqueue(() => _start(slot, request));
     await Future<void>.delayed(_qualityHandoffHold);
     if (previous != null && _handoff == previous && _active == slot) {
-      await _enqueue(() => _retire(previous));
+      await _enqueue(
+        () => _retire(previous, trigger: 'quality-handoff-complete'),
+      );
     }
     if (!_closed && request == _generation) _warmNeighbors(this);
     return _active == slot && slot.failure == null;
@@ -326,8 +388,8 @@ class PlaybackSession extends ChangeNotifier {
       if (_closed || request != _generation || _active == null) return;
       final warm = _next;
       _next = null;
-      await _retire(_handoff);
-      await _retire(warm);
+      await _retire(_handoff, trigger: 'replacement-handoff');
+      await _retire(warm, trigger: 'replacement-next');
       if (_closed || request != _generation || _active == null) return;
       try {
         created = _create(index);
@@ -354,7 +416,9 @@ class PlaybackSession extends ChangeNotifier {
 
   Future<void> _dropReplacement(_PlayerSlot slot) {
     return _enqueue(() async {
-      if (_live.contains(slot)) await _retire(slot);
+      if (_live.contains(slot)) {
+        await _retire(slot, trigger: 'replacement-drop');
+      }
     });
   }
 
@@ -369,7 +433,10 @@ class PlaybackSession extends ChangeNotifier {
       _handoff = previous;
       _active = slot;
       shown = true;
-      if (previous != null) await previous!.player.pause();
+      if (previous != null) {
+        await previous!.player.pause();
+        previous!.playing = false;
+      }
       _notify();
     });
     if (!shown || _active != slot) return null;
@@ -413,6 +480,22 @@ class PlaybackSession extends ChangeNotifier {
   Future<void> _applyPlayback(_PlayerSlot slot) async {
     if (_closed || _active != slot || !slot.activated) return;
     final shouldPlay = _mayPlay && slot.index == _currentIndex && !isLocked;
+    final video = slot.player is VideoPlayerPort
+        ? slot.player as VideoPlayerPort
+        : null;
+    if (kDebugMode) {
+      debugPrint(
+        '[player-session] phase=apply-playback '
+        'session=${identityHashCode(this)} owner=${owner.name} '
+        'index=${slot.index} shouldPlay=$shouldPlay user=$_userWantsPlay '
+        'appResumed=$_appResumed routeVisible=$_routeVisible '
+        'overlayOpen=$_overlayOpen locked=$isLocked '
+        'player=${identityHashCode(slot.player)} '
+        'controller=${video == null ? '-' : identityHashCode(video.controller)} '
+        'isPlaying=${video?.controller.value.isPlaying ?? '-'} '
+        'slotPlaying=${slot.playing}',
+      );
+    }
     if (shouldPlay == slot.playing) return;
     if (shouldPlay) {
       await slot.player.play();
@@ -420,27 +503,15 @@ class PlaybackSession extends ChangeNotifier {
       await slot.player.pause();
     }
     slot.playing = shouldPlay;
-  }
-
-  void setAppResumed(bool value) {
-    _appResumed = value;
-    _syncPlayback();
-  }
-
-  void setRouteVisible(bool value) {
-    _routeVisible = value;
-    _syncPlayback();
-  }
-
-  void setOverlayOpen(bool value) {
-    _overlayOpen = value;
-    _syncPlayback();
-  }
-
-  void setUserWantsPlay(bool value) {
-    _userWantsPlay = value;
-    _syncPlayback();
-    _notify();
+    if (kDebugMode) {
+      debugPrint(
+        '[player-session] phase=apply-playback-result '
+        'session=${identityHashCode(this)} index=${slot.index} '
+        'shouldPlay=$shouldPlay '
+        'isPlaying=${video?.controller.value.isPlaying ?? '-'} '
+        'slotPlaying=${slot.playing}',
+      );
+    }
   }
 
   void _syncPlayback() {
@@ -467,7 +538,7 @@ class PlaybackSession extends ChangeNotifier {
       _loading = false;
       _notify();
       for (final slot in _live.toList()) {
-        await _retire(slot);
+        await _retire(slot, trigger: 'session-release-all');
       }
     });
   }
@@ -476,6 +547,23 @@ class PlaybackSession extends ChangeNotifier {
     if (!_closed) notifyListeners();
   }
 
+  String _slotRole(_PlayerSlot slot, {String? roleHint}) {
+    if (identical(slot, _active)) return 'current';
+    if (identical(slot, _previous)) return 'previous';
+    if (identical(slot, _next)) return 'next';
+    if (identical(slot, _handoff)) return 'handoff';
+    return roleHint ?? 'unassigned';
+  }
+
+  void _logOwnerRejection(String phase, _PlayerSlot slot) {
+    if (!kDebugMode) return;
+    debugPrint(
+      '[player-owner] phase=reject-$phase expected=${owner.name} '
+      'actual=${slot.owner.name} drama=${slot.dramaId ?? '-'} '
+      'episodeIndex=${slot.index} controller=${_playerIdentity(slot.player)}',
+    );
+  }
+
   Future<void> close() async {
     if (_closed) return;
     _closed = true;
@@ -486,13 +574,27 @@ class PlaybackSession extends ChangeNotifier {
 }
 
 class _PlayerSlot {
-  _PlayerSlot(this.index, this.player);
+  _PlayerSlot(
+    this.index,
+    this.player, {
+    required this.owner,
+    required this.dramaId,
+  });
   int index;
   final PlayerPort player;
+  final PlaybackSessionOwner owner;
+  final String? dramaId;
   late final Future<void> ready;
   bool prepared = false;
   bool activated = false;
   bool playing = false;
   bool retiring = false;
+  bool reusedWarm = false;
   Object? failure;
 }
+
+String _playerIdentity(PlayerPort player) {
+  return player is VideoPlayerPort
+      ? '${identityHashCode(player.controller)}'
+      : '${identityHashCode(player)}';
+}

lib/core/data/services/playback_session_controls.dart

@@ -0,0 +1,133 @@
+// Author: fruit.com.cn
+
+part of 'playback_session.dart';
+
+/// 播放会话的可见性、用户意图与相邻集预热控制。
+extension PlaybackSessionControls on PlaybackSession {
+  /// 滑动手势开始时按方向优先准备相邻集，不改变当前集播放状态。
+  void prewarmNeighbors({required bool forward}) {
+    if (!_visible || _overlayOpen || _active?.prepared != true) return;
+    _warmNeighbors(this, preferredNext: forward);
+  }
+
+  /// 路由交接时同步暂停当前原生播放器，controller 仍由 session 持有。
+  Future<void> pauseForRouteHandoff() {
+    if (_closed) return Future<void>.value();
+    _routeVisible = false;
+    return _enqueue(() async {
+      final slot = _active;
+      if (slot == null) return;
+      await slot.player.pause();
+      slot.playing = false;
+    });
+  }
+
+  /// 路由恢复可见后立即同步当前 controller，并等待原生播放状态落地。
+  Future<void> resumeForRouteHandoff() {
+    if (_closed) return Future<void>.value();
+    _routeVisible = true;
+    return _enqueue(() async {
+      final slot = _active;
+      if (kDebugMode) {
+        debugPrint(
+          '[feed-handoff] phase=resume slot=${slot?.index} '
+          'activated=${slot?.activated} playing=${slot?.playing} '
+          'retiring=${slot?.retiring} current=$_currentIndex '
+          'visible=$_visible user=$_userWantsPlay loading=$_loading',
+        );
+      }
+      if (slot == null || slot.retiring) return;
+      if (!slot.activated) {
+        try {
+          await activate?.call(episodes[slot.index], slot.player);
+        } catch (error) {
+          if (kDebugMode) {
+            debugPrint('[feed-handoff] phase=activation-failed error=$error');
+          }
+        }
+        if (_closed || _active != slot || slot.retiring) {
+          if (kDebugMode) {
+            debugPrint(
+              '[feed-handoff] phase=activation-aborted closed=$_closed '
+              'activeSame=${identical(_active, slot)} retiring=${slot.retiring}',
+            );
+          }
+          return;
+        }
+        slot.activated = true;
+      }
+      await _applyPlayback(slot);
+      if (_visible && !_overlayOpen && !_loading) _warmNeighbors(this);
+      if (kDebugMode) {
+        debugPrint(
+          '[feed-handoff] phase=resumed activated=${slot.activated} '
+          'playing=${slot.playing}',
+        );
+      }
+    });
+  }
+
+  /// 选中锁定集时立即停播并释放所有原生播放器，不创建新片源。
+  Future<void> selectLocked(
+    int index, {
+    int? preloadIndex,
+    int? previousIndex,
+  }) {
+    if (_closed || index < 0 || index >= episodes.length) {
+      return Future<void>.value();
+    }
+    _generation++;
+    _selected = false;
+    _currentIndex = index;
+    _rememberNeighbors(preloadIndex, previousIndex);
+    _loading = false;
+    _error = null;
+    _userWantsPlay = false;
+    _notify();
+    return _releasePlayers();
+  }
+
+  /// 清晰度切换时盖住黑帧的旧播放器。只在仍由会话持有时交给界面。
+  PlayerPort? handoffAt(int index) {
+    final slot = _handoff;
+    if (_closed || slot == null || slot.retiring || slot.index != index) {
+      return null;
+    }
+    return slot.player;
+  }
+
+  /// 当前索引是否复用了已预热的播放器槽。
+  bool reusedWarmAt(int index) {
+    for (final slot in [_active, _next, _previous]) {
+      if (slot != null && !slot.retiring && slot.index == index) {
+        return slot.reusedWarm;
+      }
+    }
+    return false;
+  }
+
+  /// 同步应用前台状态并恢复或暂停当前集。
+  void setAppResumed(bool value) {
+    _appResumed = value;
+    _syncPlayback();
+  }
+
+  /// 同步播放器路由是否可见。
+  void setRouteVisible(bool value) {
+    _routeVisible = value;
+    _syncPlayback();
+  }
+
+  /// 同步浮层是否遮挡播放器。
+  void setOverlayOpen(bool value) {
+    _overlayOpen = value;
+    _syncPlayback();
+  }
+
+  /// 记录用户播放意图；切换剧集时会在 [PlaybackSession.select] 中恢复播放。
+  void setUserWantsPlay(bool value) {
+    _userWantsPlay = value;
+    _syncPlayback();
+    _notify();
+  }
+}

lib/core/data/services/sprite_thumbnail_axis.dart

@@ -9,7 +9,7 @@ import '../../config/app_config.dart';
 import 'sprite_thumbnail_asset_loader.dart';
 
 const Duration spriteVttCacheTtl = Duration(minutes: 10);
-const int spriteImageCacheCapacity = 2;
+const int spriteImageCacheCapacity = 1;
 
 /// 单个 VTT cue 对应的 sprite 裁剪区域。
 class SpriteThumbnailCue {
@@ -132,36 +132,36 @@ class SpriteThumbnailAxisService extends ChangeNotifier
   SpriteThumbnailAxisService({
     SpriteThumbnailAssetLoader? loader,
     this.cacheTtl = spriteVttCacheTtl,
+    this.spriteCacheCapacity = spriteImageCacheCapacity,
     DateTime Function()? now,
   }) : _loader = loader ?? DioSpriteThumbnailAssetLoader(),
        _now = now ?? DateTime.now;
 
   final SpriteThumbnailAssetLoader _loader;
   final Duration cacheTtl;
+  final int spriteCacheCapacity;
   final DateTime Function() _now;
   final Map<String, _CachedAxis> _axisCache = {};
   final Map<String, Future<SpriteThumbnailAxis>> _axisRequests = {};
   final LinkedHashMap<String, _CachedSprite> _spriteCache = LinkedHashMap();
   final Map<String, Future<_CachedSprite?>> _spriteRequests = {};
   final Set<String> _failedSprites = {};
-  String? _activeAxisUrl;
-  int _axisGeneration = 0;
   bool _disposed = false;
 
-  @visibleForTesting
   int get spriteCacheSize => _spriteCache.length;
 
   @visibleForTesting
-  List<String> get spriteCacheKeys => _spriteCache.keys.toList();
+  List<String> get spriteCacheKeys => _spriteCache.keys
+      .map((url) => Uri.tryParse(url)?.pathSegments.lastOrNull ?? url)
+      .toList();
 
-  /// 播放器就绪时预取当前 cue 与相邻 sprite，拖动帧不触发网络或解码。
+  /// 播放器就绪时预取当前 cue；容量大于 1 时顺带预取相邻 sprite。
   @override
   Future<void> prepareAt(String? thumbnailsUrl, Duration position) async {
     final url = _normalizeUrl(thumbnailsUrl);
     if (_disposed || url == null) return;
-    _activateAxis(url);
     final axis = await _loadAxis(url);
-    if (_disposed || _activeAxisUrl != url) return;
+    if (_disposed) return;
     for (final cue in _prefetchCues(axis, position)) {
       await _ensureSprite(axis, cue);
     }
@@ -170,7 +170,7 @@ class SpriteThumbnailAxisService extends ChangeNotifier
   @override
   bool hasAxis(String? thumbnailsUrl) {
     final url = _normalizeUrl(thumbnailsUrl);
-    if (url == null || url != _activeAxisUrl) return false;
+    if (url == null) return false;
     return _readAxis(url) != null;
   }
 
@@ -180,12 +180,14 @@ class SpriteThumbnailAxisService extends ChangeNotifier
     Duration position,
   ) {
     final url = _normalizeUrl(thumbnailsUrl);
-    if (url == null || url != _activeAxisUrl) return null;
+    if (url == null) return null;
     final axis = _readAxis(url);
     if (axis == null) return null;
     final cue = selectSpriteThumbnailCue(axis.cues, position);
     if (cue == null) return null;
-    final cached = _readSprite(cue.spriteFile);
+    final cached = _readSprite(
+      axis.resolveSpriteUri(cue.spriteFile).toString(),
+    );
     if (cached == null) return null;
     final sourceRect = _scaledSourceRect(cached, cue.sourceRect);
     if (sourceRect == null) return null;
@@ -206,13 +208,6 @@ class SpriteThumbnailAxisService extends ChangeNotifier
     super.dispose();
   }
 
-  void _activateAxis(String url) {
-    if (_activeAxisUrl == url) return;
-    _activeAxisUrl = url;
-    _axisGeneration++;
-    _clearSprites();
-  }
-
   Future<SpriteThumbnailAxis> _loadAxis(String url) {
     final cached = _readAxis(url);
     if (cached != null) return Future.value(cached);
@@ -239,7 +234,6 @@ class SpriteThumbnailAxisService extends ChangeNotifier
       } on SpriteThumbnailForbiddenException {
         if (_disposed) return SpriteThumbnailAxis.empty(url);
         _axisCache.remove(url);
-        if (_activeAxisUrl == url) _clearSprites();
       } catch (_) {
         break;
       }
@@ -274,6 +268,7 @@ class SpriteThumbnailAxisService extends ChangeNotifier
     if (current == null) return const [];
     final index = axis.cues.indexOf(current);
     final candidates = <SpriteThumbnailCue>[current];
+    if (spriteCacheCapacity <= 1) return candidates;
     for (final direction in const [1, -1]) {
       for (var step = 1; step < axis.cues.length; step++) {
         final neighborIndex = index + direction * step;
@@ -293,23 +288,23 @@ class SpriteThumbnailAxisService extends ChangeNotifier
     SpriteThumbnailAxis axis,
     SpriteThumbnailCue cue,
   ) {
-    final cached = _readSprite(cue.spriteFile);
+    final spriteUrl = axis.resolveSpriteUri(cue.spriteFile).toString();
+    final cached = _readSprite(spriteUrl);
     if (cached != null) return Future.value(cached);
-    if (_failedSprites.contains(cue.spriteFile)) return Future.value();
-    final existing = _spriteRequests[cue.spriteFile];
+    if (_failedSprites.contains(spriteUrl)) return Future.value();
+    final existing = _spriteRequests[spriteUrl];
     if (existing != null) return existing;
-    final generation = _axisGeneration;
-    final request = _loadSprite(axis, cue, generation);
-    _spriteRequests[cue.spriteFile] = request;
+    final request = _loadSprite(axis, cue, spriteUrl);
+    _spriteRequests[spriteUrl] = request;
     return request.whenComplete(() {
-      _spriteRequests.remove(cue.spriteFile);
+      _spriteRequests.remove(spriteUrl);
     });
   }
 
   Future<_CachedSprite?> _loadSprite(
     SpriteThumbnailAxis axis,
     SpriteThumbnailCue cue,
-    int generation,
+    String spriteUrl,
   ) async {
     SpriteThumbnailDecodedImage? decoded;
     try {
@@ -318,16 +313,16 @@ class SpriteThumbnailAxisService extends ChangeNotifier
       decoded = null;
     }
     if (decoded == null) {
-      _failedSprites.add(cue.spriteFile);
+      _failedSprites.add(spriteUrl);
       if (!_disposed) notifyListeners();
       return null;
     }
-    if (_disposed || generation != _axisGeneration) {
+    if (_disposed) {
       decoded.image.dispose();
       return null;
     }
     final cached = _CachedSprite(decoded);
-    _putSprite(cue.spriteFile, cached);
+    _putSprite(spriteUrl, cached);
     notifyListeners();
     return cached;
   }
@@ -342,7 +337,7 @@ class SpriteThumbnailAxisService extends ChangeNotifier
   void _putSprite(String key, _CachedSprite value) {
     _spriteCache.remove(key)?.decoded.image.dispose();
     _spriteCache[key] = value;
-    while (_spriteCache.length > spriteImageCacheCapacity) {
+    while (_spriteCache.length > spriteCacheCapacity) {
       final oldest = _spriteCache.remove(_spriteCache.keys.first);
       oldest?.decoded.image.dispose();
     }
@@ -378,8 +373,6 @@ class SpriteThumbnailAxisService extends ChangeNotifier
   }
 
   void _clearAll() {
-    _axisGeneration++;
-    _activeAxisUrl = null;
     _axisCache.clear();
     _axisRequests.clear();
     _clearSprites();

lib/core/navigation/fade_page_route.dart

@@ -4,14 +4,16 @@ import 'package:flutter/widgets.dart';
 
 /// 无位移的短促淡入转场。
 class FadePageRoute<T> extends PageRouteBuilder<T> {
-  FadePageRoute({required WidgetBuilder builder, super.settings})
-    : super(
-        transitionDuration: const Duration(milliseconds: 220),
-        reverseTransitionDuration: const Duration(milliseconds: 180),
-        pageBuilder: (context, _, _) => builder(context),
-        transitionsBuilder: (context, animation, _, child) => FadeTransition(
-          opacity: CurvedAnimation(parent: animation, curve: Curves.easeOut),
-          child: child,
-        ),
-      );
+  FadePageRoute({
+    required WidgetBuilder builder,
+    super.settings,
+    super.transitionDuration = const Duration(milliseconds: 220),
+    super.reverseTransitionDuration = const Duration(milliseconds: 180),
+  }) : super(
+         pageBuilder: (context, _, _) => builder(context),
+         transitionsBuilder: (context, animation, _, child) => FadeTransition(
+           opacity: CurvedAnimation(parent: animation, curve: Curves.easeOut),
+           child: child,
+         ),
+       );
 }

lib/core/theme/app_dimens.dart

@@ -229,7 +229,7 @@ abstract final class AppDimens {
   static const double mineSectionLinkFont = 12;
   static const double mineSectionGap = 20;
   static const double mineContinueCardWidth = 96;
-  static const double mineContinueRowHeight = 168;
+  static const double mineContinueRowHeight = 172;
   static const double mineContinueTitleFont = 13;
   static const double mineContinueMetaFont = 11;
   static const double mineStatsValueFont = 18;

lib/core/widgets/auth_gate.dart

@@ -15,7 +15,7 @@ Future<void> openAuthPage(BuildContext context, {bool signUpMode = false}) {
 
 /// 受限动作的登录闸：已登录返回 true；未登录弹底部提示并引导登录，返回 false。
 ///
-/// 首页/发现/详情保持匿名可看，只有收藏、点赞、评论这类"要对到具体账号"的动作才走这里。
+/// 首页/发现/详情与非付费互动保持匿名可用；解锁、权益与消耗类动作走这里。
 Future<bool> ensureSignedIn(BuildContext context) async {
   final auth = context.read<AuthController>();
   if (auth.isSignedIn) return true;
@@ -76,6 +76,7 @@ Future<bool> ensureSignedIn(BuildContext context) async {
 
   if (go == true && context.mounted) {
     await openAuthPage(context);
+    if (context.mounted) return context.read<AuthController>().isSignedIn;
   }
   return false;
 }

lib/core/widgets/remote_image.dart

@@ -5,6 +5,24 @@ import 'package:flutter/material.dart';
 import '../config/app_config.dart';
 import '../theme/app_colors.dart';
 
+const int _minImageDecodePixels = 96;
+const int _maxImageDecodePixels = 2048;
+
+/// 将布局逻辑尺寸换算成有限像素尺寸，兼顾小头像和全屏首帧。
+int resolveImageDecodePixels(double? logicalExtent, double devicePixelRatio) {
+  final ratio = devicePixelRatio.isFinite && devicePixelRatio > 0
+      ? devicePixelRatio
+      : 1.0;
+  final extent =
+      logicalExtent != null && logicalExtent.isFinite && logicalExtent > 0
+      ? logicalExtent
+      : 120.0;
+  return (extent * ratio)
+      .ceil()
+      .clamp(_minImageDecodePixels, _maxImageDecodePixels)
+      .toInt();
+}
+
 /// 封面图统一入口：后端给的是相对路径，这里补服务地址并处理加载失败。
 class RemoteImage extends StatelessWidget {
   const RemoteImage(
@@ -17,6 +35,8 @@ class RemoteImage extends StatelessWidget {
     this.fallbackIconKey,
     this.fallbackAspectRatio,
     this.fallbackColor = AppColors.raised,
+    this.decodeWidth,
+    this.decodeHeight,
   });
 
   final String path;
@@ -27,21 +47,56 @@ class RemoteImage extends StatelessWidget {
   final Key? fallbackIconKey;
   final double? fallbackAspectRatio;
   final Color fallbackColor;
+  final int? decodeWidth;
+  final int? decodeHeight;
 
   @override
   Widget build(BuildContext context) {
     final url = AppConfig.mediaUrl(path);
     if (url.isEmpty) return _fallback(brand: showFallbackIcon);
-    return Image.network(
-      url,
-      width: width,
-      height: height,
-      fit: fit,
-      gaplessPlayback: true,
-      errorBuilder: (_, _, _) => _fallback(brand: showFallbackIcon),
-      frameBuilder: (context, child, frame, wasSynchronouslyLoaded) {
-        if (wasSynchronouslyLoaded || frame != null) return child;
-        return _fallback(brand: showFallbackIcon);
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        final pixelRatio = MediaQuery.devicePixelRatioOf(context);
+        final layoutWidth = constraints.hasBoundedWidth
+            ? constraints.maxWidth
+            : width;
+        final aspectRatio =
+            fallbackAspectRatio != null &&
+                fallbackAspectRatio!.isFinite &&
+                fallbackAspectRatio! > 0
+            ? fallbackAspectRatio
+            : null;
+        final inferredHeight = constraints.hasBoundedHeight
+            ? constraints.maxHeight
+            : height ??
+                  (layoutWidth != null && aspectRatio != null
+                      ? layoutWidth / aspectRatio
+                      : null);
+        final cacheWidth =
+            decodeWidth ?? resolveImageDecodePixels(layoutWidth, pixelRatio);
+        final cacheHeight =
+            decodeHeight ??
+            (inferredHeight == null
+                ? null
+                : resolveImageDecodePixels(inferredHeight, pixelRatio));
+        return Image.network(
+          url,
+          width: width,
+          height: height,
+          fit: fit,
+          cacheWidth: cacheWidth
+              .clamp(_minImageDecodePixels, _maxImageDecodePixels)
+              .toInt(),
+          cacheHeight: cacheHeight
+              ?.clamp(_minImageDecodePixels, _maxImageDecodePixels)
+              .toInt(),
+          gaplessPlayback: true,
+          errorBuilder: (_, _, _) => _fallback(brand: showFallbackIcon),
+          frameBuilder: (context, child, frame, wasSynchronouslyLoaded) {
+            if (wasSynchronouslyLoaded || frame != null) return child;
+            return _fallback(brand: showFallbackIcon);
+          },
+        );
       },
     );
   }

lib/pages/auth/phone_auth_sheet.dart

@@ -8,7 +8,6 @@ import 'package:provider/provider.dart';
 
 import '../../core/data/remote/api_client.dart';
 import '../../core/data/services/auth_controller.dart';
-import '../../core/formatting/error_text.dart';
 import '../../core/platform/haptics.dart';
 import '../../core/platform/keyboard_inset.dart';
 import '../../core/theme/app_colors.dart';

lib/pages/drama_detail/drama_detail_view.dart

@@ -164,7 +164,9 @@ class _DramaDetailPageState extends State<DramaDetailPage> {
             ),
           ),
           if (_tagValues(context, drama).isNotEmpty)
-            SliverToBoxAdapter(child: DramaTags(tags: _tagValues(context, drama))),
+            SliverToBoxAdapter(
+              child: DramaTags(tags: _tagValues(context, drama)),
+            ),
           SliverToBoxAdapter(child: _episodes(l10n, drama, continueIndex)),
           const SliverToBoxAdapter(child: SizedBox(height: 24)),
         ],
@@ -396,11 +398,14 @@ class _DramaDetailPageState extends State<DramaDetailPage> {
   }
 
   Future<void> _toggleFavorite(AppLocalizations l10n) async {
-    if (!await ensureSignedIn(context)) return;
     if (!mounted) return;
     unawaited(context.read<Haptics>().lightImpact());
     final ok = await logic.toggleFavorite();
     if (ok || !mounted) return;
+    if (logic.favorites.lastErrorCode == 200007) {
+      await ensureSignedIn(context);
+      return;
+    }
     ScaffoldMessenger.of(
       context,
     ).showSnackBar(SnackBar(content: Text(l10n.favoriteToggleFailed)));
@@ -443,7 +448,9 @@ class _DramaDetailPageState extends State<DramaDetailPage> {
   }
 
   List<String> _tagValues(BuildContext context, Drama drama) {
-    final localized = drama.localizedTypeLabels(Localizations.localeOf(context).languageCode);
+    final localized = drama.localizedTypeLabels(
+      Localizations.localeOf(context).languageCode,
+    );
     final result = <String>[];
     if (localized.isNotEmpty) {
       result.addAll(localized.take(_maxTags));

lib/pages/home/widgets/home_feed_grid.dart

@@ -104,6 +104,7 @@ class _HomeFeedGridState extends State<HomeFeedGrid> {
                       return _categoryPlaceholder(
                         l10n,
                         context.watch<CategoryController>(),
+                        catalog,
                       );
                     }
                     final category = shortcuts[index];
@@ -146,7 +147,11 @@ class _HomeFeedGridState extends State<HomeFeedGrid> {
   Widget _categoryPlaceholder(
     AppLocalizations l10n,
     CategoryController controller,
+    CatalogController catalog,
   ) {
+    if (catalog.error != null) {
+      return _catalogErrorState(l10n, catalog);
+    }
     if (controller.loading) {
       return const DramaGridSkeleton(
         key: Key('home-grid-skeleton'),

lib/pages/new_releases/new_releases_page.dart

@@ -432,7 +432,7 @@ class _NewReleasesPageState extends State<NewReleasesPage> {
                 ),
               ),
             ),
-            const SizedBox(height: 6),
+            const SizedBox(height: 4),
             Text(
               drama.title,
               maxLines: 1,

lib/pages/player/comments_auth.dart

@@ -1,24 +1,14 @@
 // Author: fruit.com.cn
 
 import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
 
 import '../../core/data/models/drama.dart';
-import '../../core/data/services/auth_controller.dart';
-import '../../core/widgets/auth_gate.dart';
 
-/// 评论入口统一登录闸：登录成功且页面仍存在时再打开评论面板。
-Future<void> openCommentsWithAuth(
+/// 评论列表与非付费互动均支持设备身份，不再把登录作为入口前置条件。
+Future<void> openComments(
   BuildContext context,
   Drama drama, {
   required Future<void> Function(BuildContext context, Drama drama) show,
 }) async {
-  final auth = context.read<AuthController>();
-  if (auth.isSignedIn) {
-    await show(context, drama);
-    return;
-  }
-  await ensureSignedIn(context);
-  if (!context.mounted || !auth.isSignedIn) return;
   await show(context, drama);
 }

lib/pages/player/player_binding.dart

@@ -15,6 +15,7 @@ class PlayerBinding {
     required PlaybackPositionCache positionCache,
     WalletController? wallet,
     DownloadController? downloads,
+    bool Function()? isSignedIn,
   }) => PlayerLogic(
     history: history,
     playback: playback,
@@ -22,5 +23,6 @@ class PlayerBinding {
     pictureInPicture: AndroidPictureInPicture(),
     wallet: wallet,
     downloads: downloads,
+    isSignedIn: isSignedIn,
   );
 }

lib/pages/player/player_logic.dart

@@ -2,12 +2,14 @@
 
 import 'dart:async';
 
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:video_player/video_player.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:provider/provider.dart';
 
 import '../../core/data/models/drama.dart';
+import '../../core/data/models/episode_stats.dart';
 import '../../core/data/models/play_ticket.dart';
 import '../../core/data/models/watch_progress.dart';
 import '../../core/data/models/player_port.dart';
@@ -50,9 +52,13 @@ class PlayerLogic extends ChangeNotifier {
     this.downloads,
     PlaybackPositionCache? positionCache,
     Future<void> Function()? waitForFrame,
+    DateTime Function()? clock,
+    bool Function()? isSignedIn,
   }) : positionCache = positionCache ?? PlaybackPositionCache(),
        _waitForFrame =
-           waitForFrame ?? (() => WidgetsBinding.instance.endOfFrame);
+           waitForFrame ?? (() => WidgetsBinding.instance.endOfFrame),
+       _clock = clock ?? DateTime.now,
+       _isSignedIn = isSignedIn ?? (() => true);
 
   final WatchHistoryRepository history;
   final PlaybackRepository playback;
@@ -61,6 +67,8 @@ class PlayerLogic extends ChangeNotifier {
   final DownloadController? downloads;
   final PlaybackPositionCache positionCache;
   final Future<void> Function() _waitForFrame;
+  final DateTime Function() _clock;
+  final bool Function() _isSignedIn;
 
   late PageController pages;
   late PlaybackQueue queue;
@@ -93,13 +101,25 @@ class PlayerLogic extends ChangeNotifier {
   String selectedQuality = 'AUTO';
   Duration? _qualitySeek;
   int pageRequest = 0;
+  int? _pendingSelectionIndex;
+  int? _pendingSelectionRevision;
+  Future<void>? _selectionDrain;
   bool muted = false;
   double playbackSpeed = 1.0;
   bool stoppedAtFeedEnd = false;
+  Duration episodeStatsTtl = const Duration(seconds: 60);
+  ValueChanged<EpisodeStats>? onEpisodeStatsUpdated;
   VideoPlayerPort? scrubbingPlayer;
   bool pip = false;
   bool pipPreparing = false;
   final Map<String, int> pickedEpisode = {};
+  final Set<String> _unlockedEpisodeIds = {};
+  final Map<String, EpisodeStats> _episodeStats = {};
+  final Map<String, DateTime> _episodeStatsFetchedAt = {};
+  final Map<String, Future<void>> _episodeStatsInFlight = {};
+  final Map<String, int> _episodeStatsRevision = {};
+  final Map<String, int> _dramaStatsRevision = {};
+  final Map<String, int> _dramaFavoriteCounts = {};
 
   /// 解锁中的集 id 与失败文案；空表示没有进行中的解锁。
   String? unlockingEpisodeId;
@@ -163,6 +183,10 @@ class PlayerLogic extends ChangeNotifier {
     return fallback;
   }
 
+  EpisodeStats? episodeStats(String episodeId) => _episodeStats[episodeId];
+
+  int? dramaFavoriteCount(String dramaId) => _dramaFavoriteCounts[dramaId];
+
   void notify() {
     if (!_disposed) notifyListeners();
   }
@@ -188,6 +212,7 @@ class PlayerLogic extends ChangeNotifier {
   void start({
     required PlayerFactory factory,
     required PlaybackCoordinator coordinator,
+    bool initialUserWantsPlay = true,
   }) {
     _started = true;
     _sessionFactory = factory;
@@ -205,7 +230,48 @@ class PlayerLogic extends ChangeNotifier {
       session.setRouteVisible(false);
     }
     unawaited(loadResumePoint());
-    unawaited(selectEpisode(initialIndex));
+    unawaited(
+      selectEpisode(
+        initialIndex,
+        userWantsPlay: initialUserWantsPlay ? null : false,
+      ),
+    );
+  }
+
+  /// 独立播放页覆盖首页时只暂停并保存进度，首页 session 与 controller 保持存活。
+  Future<void> pauseForFullPlayer() async {
+    if (!_started) return;
+    _logFeedHandoff('pause');
+    cancelScrub();
+    await session.pauseForRouteHandoff();
+    _logFeedHandoff('paused');
+  }
+
+  /// 独立播放页关闭并恢复首页路由后，等原生播放器实际恢复再结束交接。
+  Future<void> resumeAfterFullPlayer() async {
+    if (!_started) return;
+    _logFeedHandoff('resume');
+    if (visibleIndices.isNotEmpty) {
+      await session.resumeForRouteHandoff();
+    } else {
+      session.setRouteVisible(false);
+      await session.playbackSettled;
+    }
+    _logFeedHandoff('resumed');
+  }
+
+  void _logFeedHandoff(String phase) {
+    if (!kDebugMode) return;
+    final player = session.active;
+    final video = player is VideoPlayerPort ? player : null;
+    debugPrint(
+      '[feed-session] phase=$phase session=${identityHashCode(session)} '
+      'index=${session.currentIndex} episode=${session.currentEpisode.id} '
+      'controller=${video == null ? '-' : identityHashCode(video.controller)} '
+      'user=${session.userWantsPlay} routeVisible=${session.debugRouteVisible} '
+      'appResumed=${session.debugAppResumed} overlayOpen=${session.debugOverlayOpen} '
+      'live=${session.livePlayerCount}',
+    );
   }
 
   /// 串行替换首页 feed 队列；频道变化时重置到第 1 个，刷新时尽量保留当前剧。
@@ -238,11 +304,16 @@ class PlayerLogic extends ChangeNotifier {
       episodes: sessionEpisodes,
       factory: factory,
       // 地址只由后端下发（票据或详情里的免费集签名地址），拿不到地址即视为锁定
-      canPlay: (episode) => episode.videoUrl.isNotEmpty,
+      canPlay: (episode) =>
+          episode.videoUrl.isNotEmpty && !isEpisodeLocked(episode),
       prepare: preparePlayer,
       activate: activatePlayer,
       coordinator: coordinator,
       waitForFrame: _waitForFrame,
+      owner: homeMode ? PlaybackSessionOwner.home : PlaybackSessionOwner.player,
+      dramaIdAt: (index) => index >= 0 && index < queue.length
+          ? queue.entryAt(index).drama.id
+          : null,
     );
   }
 
@@ -428,6 +499,7 @@ class PlayerLogic extends ChangeNotifier {
       final localPath = await downloads?.findLocalPath(episode.id);
       if (request != pageRequest) return false;
       if (localPath != null) {
+        _unlockedEpisodeIds.add(episode.id);
         blockedTicket = null;
         blockedEpisodeId = null;
         qualities = const [];
@@ -452,12 +524,14 @@ class PlayerLogic extends ChangeNotifier {
       final playUrl = preferred ?? ticket.playUrl;
       if (preferred == null) selectedQuality = 'AUTO';
       if (ticket.accessible && playUrl.isNotEmpty) {
+        _unlockedEpisodeIds.add(episode.id);
         // 签名地址原样写回，不做任何拼接/改写（AppConfig.mediaUrl 只补 host）
         sessionEpisodes[index] = episode.withVideoUrl(
           playUrl,
           likeCount: ticket.likeCount,
           commentCount: ticket.commentCount,
           thumbnailsUrl: ticket.thumbnailsUrl,
+          posterUrl: ticket.posterUrl,
         );
         return true;
       }
@@ -467,7 +541,7 @@ class PlayerLogic extends ChangeNotifier {
     } catch (exception) {
       if (request != pageRequest) return false;
       // 详情里已有可用地址（免费集）时降级继续，避免票据服务抖动就完全看不了
-      if (episode.videoUrl.isNotEmpty) {
+      if (episode.videoUrl.isNotEmpty && !isEpisodeLocked(episode)) {
         ticketError = null;
         return true;
       }
@@ -481,6 +555,179 @@ class PlayerLogic extends ChangeNotifier {
     }
   }
 
+  /// 当前集激活后刷新轻量互动计数；同集命中 TTL 或已有请求时不重复发请求。
+  Future<void> refreshEpisodeStats(int index) {
+    if (_disposed || index < 0 || index >= sessionEpisodes.length) {
+      return Future<void>.value();
+    }
+    final episodeId = sessionEpisodes[index].id;
+    final cached = _episodeStats[episodeId];
+    final fetchedAt = _episodeStatsFetchedAt[episodeId];
+    if (cached != null &&
+        fetchedAt != null &&
+        _clock().difference(fetchedAt) < episodeStatsTtl) {
+      _logEpisodeStatsRefresh(episodeId, cached: true);
+      onEpisodeStatsUpdated?.call(cached);
+      return Future<void>.value();
+    }
+    final inFlight = _episodeStatsInFlight[episodeId];
+    if (inFlight != null) {
+      _logEpisodeStatsRefresh(episodeId, cached: true, inFlight: true);
+      return inFlight;
+    }
+    _logEpisodeStatsRefresh(episodeId, cached: false);
+    final expectedDramaId = index < queue.length
+        ? queue.entryAt(index).drama.id
+        : '';
+    final episodeRevision = _episodeStatsRevision[episodeId] ?? 0;
+    final dramaRevision = _dramaStatsRevision[expectedDramaId] ?? 0;
+    late final Future<void> request;
+    request =
+        _fetchEpisodeStats(
+          episodeId,
+          expectedDramaId: expectedDramaId,
+          episodeRevision: episodeRevision,
+          dramaRevision: dramaRevision,
+        ).whenComplete(() {
+          if (identical(_episodeStatsInFlight[episodeId], request)) {
+            _episodeStatsInFlight.remove(episodeId);
+          }
+        });
+    _episodeStatsInFlight[episodeId] = request;
+    return request;
+  }
+
+  Future<void> _fetchEpisodeStats(
+    String episodeId, {
+    required String expectedDramaId,
+    required int episodeRevision,
+    required int dramaRevision,
+  }) async {
+    try {
+      final fetched = await playback.episodeStats(episodeId);
+      if (_disposed) return;
+      if ((_episodeStatsRevision[episodeId] ?? 0) != episodeRevision ||
+          (_dramaStatsRevision[expectedDramaId] ?? 0) != dramaRevision) {
+        if (kDebugMode) {
+          debugPrint(
+            '[player] phase=episode-stats-discarded episodeId=$episodeId '
+            'reason=local-state-newer',
+          );
+        }
+        return;
+      }
+      final stats = fetched.copyWith(
+        dramaId: fetched.dramaId.isEmpty ? expectedDramaId : fetched.dramaId,
+      );
+      _episodeStats[episodeId] = stats;
+      _episodeStatsFetchedAt[episodeId] = _clock();
+      if (stats.dramaId.isNotEmpty) {
+        _dramaFavoriteCounts[stats.dramaId] = stats.favoriteCount;
+      }
+      final episodeIndex = sessionEpisodes.indexWhere(
+        (episode) => episode.id == episodeId,
+      );
+      if (episodeIndex >= 0) {
+        sessionEpisodes[episodeIndex] = sessionEpisodes[episodeIndex].withStats(
+          likeCount: stats.likeCount,
+          commentCount: stats.commentCount,
+        );
+      }
+      onEpisodeStatsUpdated?.call(stats);
+      notify();
+    } catch (_) {
+      // 统计接口只负责校准计数，失败时保留播放与旧值。
+    }
+  }
+
+  void _logEpisodeStatsRefresh(
+    String episodeId, {
+    required bool cached,
+    bool inFlight = false,
+  }) {
+    if (!kDebugMode) return;
+    debugPrint(
+      '[player] phase=episode-stats-refresh episodeId=$episodeId '
+      'cached=${cached ? 1 : 0}${inFlight ? ' inFlight=1' : ''}',
+    );
+  }
+
+  /// 点赞成功后同步本地统计快照，避免切回时被旧缓存覆盖。
+  void applyEpisodeLikeState(
+    String episodeId, {
+    required bool liked,
+    required int likeCount,
+  }) {
+    _episodeStatsRevision.update(
+      episodeId,
+      (value) => value + 1,
+      ifAbsent: () => 1,
+    );
+    final stats = _episodeStats[episodeId];
+    if (stats != null) {
+      _episodeStats[episodeId] = stats.copyWith(
+        liked: liked,
+        likeCount: likeCount,
+      );
+    }
+    final index = sessionEpisodes.indexWhere(
+      (episode) => episode.id == episodeId,
+    );
+    if (index >= 0) {
+      sessionEpisodes[index] = sessionEpisodes[index].withStats(
+        likeCount: likeCount,
+      );
+    }
+    notify();
+  }
+
+  /// 评论面板关闭后同步评论数。
+  void applyEpisodeCommentCount(String episodeId, int commentCount) {
+    _episodeStatsRevision.update(
+      episodeId,
+      (value) => value + 1,
+      ifAbsent: () => 1,
+    );
+    final stats = _episodeStats[episodeId];
+    if (stats != null) {
+      _episodeStats[episodeId] = stats.copyWith(commentCount: commentCount);
+    }
+    final index = sessionEpisodes.indexWhere(
+      (episode) => episode.id == episodeId,
+    );
+    if (index >= 0) {
+      sessionEpisodes[index] = sessionEpisodes[index].withStats(
+        commentCount: commentCount,
+      );
+    }
+    notify();
+  }
+
+  /// 收藏成功时同时修正剧级计数和所有已缓存的同剧互动状态。
+  void applyDramaFavoriteState(
+    String dramaId, {
+    required bool favorited,
+    int? favoriteCount,
+  }) {
+    _dramaStatsRevision.update(
+      dramaId,
+      (value) => value + 1,
+      ifAbsent: () => 1,
+    );
+    if (favoriteCount != null) {
+      _dramaFavoriteCounts[dramaId] = favoriteCount;
+    }
+    for (final entry in _episodeStats.entries.toList()) {
+      final stats = entry.value;
+      if (stats.dramaId != dramaId) continue;
+      _episodeStats[entry.key] = stats.copyWith(
+        favorited: favorited,
+        favoriteCount: favoriteCount,
+      );
+    }
+    notify();
+  }
+
   String _fileUrl(String path) =>
       path.startsWith('file:') ? path : Uri.file(path).toString();
 
@@ -553,7 +800,10 @@ class PlayerLogic extends ChangeNotifier {
   /// 金币解锁当前集；成功后强制刷新票据并直接起播。
   Future<bool> unlockEpisode(int index) async {
     final service = wallet;
-    if (service == null || index < 0 || index >= sessionEpisodes.length) {
+    if (service == null ||
+        !_isSignedIn() ||
+        index < 0 ||
+        index >= sessionEpisodes.length) {
       return false;
     }
     final episode = sessionEpisodes[index];
@@ -566,6 +816,7 @@ class PlayerLogic extends ChangeNotifier {
         unlockError = service.unlockError;
         return false;
       }
+      _unlockedEpisodeIds.add(episode.id);
       final ready = await ensureTicket(index, forceRefresh: true);
       if (ready) {
         await _selectVisible(index);
@@ -951,7 +1202,43 @@ class PlayerLogic extends ChangeNotifier {
     );
   }
 
-  Future<void> selectEpisode(int index, {int? revision}) async {
+  /// 翻页入口使用 single-flight：执行中的切集不被重复排队，只保留最新目标。
+  Future<void> requestEpisodeSelection(int index, {int? revision}) {
+    if (_disposed || index < 0 || index >= sessionEpisodes.length) {
+      return Future<void>.value();
+    }
+    _pendingSelectionIndex = index;
+    _pendingSelectionRevision = revision;
+    return _selectionDrain ??= _drainEpisodeSelections();
+  }
+
+  Future<void> _drainEpisodeSelections() async {
+    try {
+      while (!_disposed) {
+        final index = _pendingSelectionIndex;
+        if (index == null) break;
+        final revision = _pendingSelectionRevision;
+        _pendingSelectionIndex = null;
+        _pendingSelectionRevision = null;
+        await selectEpisode(index, revision: revision);
+      }
+    } finally {
+      _selectionDrain = null;
+      final index = _pendingSelectionIndex;
+      if (!_disposed && index != null) {
+        unawaited(
+          requestEpisodeSelection(index, revision: _pendingSelectionRevision),
+        );
+      }
+    }
+  }
+
+  Future<void> selectEpisode(
+    int index, {
+    int? revision,
+    bool? userWantsPlay,
+  }) async {
+    if (index < 0 || index >= sessionEpisodes.length) return;
     final feedRevisionAtStart = revision ?? feedRevision;
     final request = ++pageRequest;
     cancelScrub();
@@ -962,6 +1249,26 @@ class PlayerLogic extends ChangeNotifier {
         !isMounted()) {
       return;
     }
+    final episode = sessionEpisodes[index];
+    if (isEpisodeLocked(episode)) {
+      blockedTicket = null;
+      blockedEpisodeId = episode.id;
+      ticketError = null;
+      await session.selectLocked(
+        index,
+        preloadIndex: nextVisibleIndex(index),
+        previousIndex: previousVisibleIndex(index),
+      );
+      if (request != pageRequest ||
+          feedRevisionAtStart != feedRevision ||
+          !isMounted()) {
+        return;
+      }
+      if (!_isSignedIn()) {
+        unawaited(refreshEpisodeStats(index));
+        return;
+      }
+    }
     // 起播前先要票据：拿不到就不起播，交给三态 UI 提示（失败可重试）
     final ready = await ensureTicket(index);
     if (request != pageRequest ||
@@ -969,17 +1276,30 @@ class PlayerLogic extends ChangeNotifier {
         !isMounted()) {
       return;
     }
-    if (!ready && ticketError != null) return;
-    await _selectVisible(index);
+    if (!ready) {
+      unawaited(refreshEpisodeStats(index));
+      return;
+    }
+    await _selectVisible(index, userWantsPlay: userWantsPlay);
+  }
+
+  /// 收费集只有在本会话确认可播或解锁成功后才解除门禁。
+  bool isEpisodeLocked(Episode episode) {
+    return (episode.locked || !episode.isFree) &&
+        !_unlockedEpisodeIds.contains(episode.id);
   }
 
   /// 按可见队列选择一集，并预热上一集与下一集。
-  Future<void> _selectVisible(int index) {
-    return session.select(
+  Future<void> _selectVisible(int index, {bool? userWantsPlay}) async {
+    await session.select(
       index,
       preloadIndex: nextVisibleIndex(index),
       previousIndex: previousVisibleIndex(index),
+      userWantsPlay: userWantsPlay,
     );
+    if (!_disposed && session.currentIndex == index) {
+      unawaited(refreshEpisodeStats(index));
+    }
   }
 
   int? nextVisibleIndex(int index) {
@@ -1113,12 +1433,10 @@ class PlayerLogic extends ChangeNotifier {
     Drama drama,
     int index,
   ) async {
-    session.setRouteVisible(false);
-    await session.playbackSettled;
-    await saveCurrentProgress();
-    if (!context.mounted) return;
-    await Navigator.of(context).push(
+    final route = Navigator.of(context).push(
       FadePageRoute<void>(
+        transitionDuration: Duration.zero,
+        reverseTransitionDuration: Duration.zero,
         builder: (_) => PlayerPage(
           drama: drama,
           initialIndex: index,
@@ -1127,7 +1445,14 @@ class PlayerLogic extends ChangeNotifier {
         ),
       ),
     );
-    if (isMounted()) session.setRouteVisible(active);
+    if (kDebugMode) {
+      debugPrint('[player-entry] phase=route-pushed source=watch-all ms=0');
+    }
+    unawaited(pauseForFullPlayer());
+    unawaited(saveCurrentProgress());
+    await route;
+    if (!isMounted()) return;
+    await resumeAfterFullPlayer();
   }
 
   Future<void> showEpisodes(BuildContext context) async {

lib/pages/player/player_view_actions.dart

@@ -65,6 +65,11 @@ extension _PlayerViewActions on _PlayerPageState {
   ) async {
     final wallet = logic.wallet;
     if (wallet == null) return;
+    if (!context.read<AuthController>().isSignedIn &&
+        !await ensureSignedIn(context)) {
+      return;
+    }
+    if (!context.mounted) return;
     await showModalBottomSheet<bool>(
       context: context,
       backgroundColor: AppColors.transparent,
@@ -81,7 +86,7 @@ extension _PlayerViewActions on _PlayerPageState {
   }
 
   Future<bool> _unlockEpisode(BuildContext context, int index) async {
-    if (!await ensureSignedIn(context) || !context.mounted) return false;
+    if (!context.read<AuthController>().isSignedIn) return false;
     final ok = await logic.unlockEpisode(index);
     if (ok || !context.mounted) return ok;
     final l10n = AppLocalizations.of(context)!;
@@ -99,18 +104,53 @@ extension _PlayerViewActions on _PlayerPageState {
     Episode episode, {
     bool likeOnly = false,
   }) async {
-    unawaited(context.read<Haptics>().lightImpact());
-    if (interactions.isEpisodeBusy(episode.id) ||
-        (likeOnly && interactions.isEpisodeLiked(episode.id))) {
-      return;
+    final busyBefore = interactions.isEpisodeBusy(episode.id);
+    final likedBefore = interactions.isEpisodeLiked(episode.id);
+    if (kDebugMode) {
+      debugPrint(
+        '[player-like] phase=toggle-start '
+        'episodeId=${episode.id} likeOnly=$likeOnly '
+        'busy=$busyBefore liked=$likedBefore',
+      );
     }
-    if (!await ensureSignedIn(context) || !context.mounted) return;
-    if (interactions.isEpisodeBusy(episode.id) ||
-        (likeOnly && interactions.isEpisodeLiked(episode.id))) {
+    unawaited(context.read<Haptics>().lightImpact());
+    if (busyBefore || (likeOnly && likedBefore)) {
+      if (kDebugMode) {
+        debugPrint(
+          '[player-like] phase=toggle-skipped '
+          'episodeId=${episode.id} '
+          'reason=${busyBefore ? 'busy' : 'already-liked'}',
+        );
+      }
       return;
     }
     final result = await interactions.toggleEpisodeLike(episode.id);
-    if (result.isSuccess || !context.mounted) return;
+    if (kDebugMode) {
+      debugPrint(
+        '[player-like] phase=toggle-result '
+        'episodeId=${episode.id} success=${result.isSuccess} '
+        'liked=${interactions.isEpisodeLiked(episode.id)} '
+        'count=${interactions.episodeLikeCount(episode.id)} '
+        'error=${result.errorMessage ?? '-'}',
+      );
+    }
+    if (result.isSuccess) {
+      final likeCount = interactions.episodeLikeCount(episode.id);
+      if (likeCount != null) {
+        logic.applyEpisodeLikeState(
+          episode.id,
+          liked: interactions.isEpisodeLiked(episode.id),
+          likeCount: likeCount,
+        );
+      }
+      _refreshLikeState();
+      return;
+    }
+    if (!context.mounted) return;
+    if (result.errorCode == 200007) {
+      await ensureSignedIn(context);
+      return;
+    }
     showCenteredToast(
       context,
       result.errorMessage ?? AppLocalizations.of(context)!.likeFailed,
@@ -119,7 +159,6 @@ extension _PlayerViewActions on _PlayerPageState {
 
   Future<void> _toggleSave(BuildContext context, Drama drama) async {
     final favorites = context.read<FavoriteController>();
-    if (!await ensureSignedIn(context) || !context.mounted) return;
     unawaited(context.read<Haptics>().lightImpact());
     final wasSaved = favorites.isSaved(drama.id);
     final ok = await favorites.toggle(drama.id, card: drama);
@@ -127,10 +166,14 @@ extension _PlayerViewActions on _PlayerPageState {
     if (ok) {
       final nowSaved = favorites.isSaved(drama.id);
       if (nowSaved != wasSaved) {
-        _applyFavoriteDelta(drama.id, nowSaved: nowSaved);
+        _applyFavoriteDelta(drama, nowSaved: nowSaved);
       }
       return;
     }
+    if (favorites.lastErrorCode == 200007) {
+      await ensureSignedIn(context);
+      return;
+    }
     ScaffoldMessenger.of(context).showSnackBar(
       SnackBar(
         content: Text(AppLocalizations.of(context)!.favoriteToggleFailed),

lib/pages/player/widgets/comment_composer_sheet.dart

@@ -9,7 +9,6 @@ import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 
 import '../../../core/data/models/comment.dart';
-import '../../../core/data/services/auth_controller.dart';
 import '../../../core/data/services/comment_controller.dart';
 import '../../../core/platform/haptics.dart';
 import '../../../core/platform/keyboard_inset.dart';
@@ -196,23 +195,20 @@ class _CommentComposerSheetState extends State<CommentComposerSheet> {
       return;
     }
     final l10n = AppLocalizations.of(context)!;
+    if (result.errorCode == 200007) {
+      await ensureSignedIn(context);
+      return;
+    }
     ScaffoldMessenger.of(context).showSnackBar(
       SnackBar(content: Text(result.errorMessage ?? l10n.commentPostFailed)),
     );
   }
 
-  Future<void> _authenticate() async {
-    await ensureSignedIn(context);
-    if (!mounted || !context.read<AuthController>().isSignedIn) return;
-    _inputFocus.requestFocus();
-  }
-
   @override
   Widget build(BuildContext context) {
     final l10n = AppLocalizations.of(context)!;
-    final signedIn = context.watch<AuthController>().isSignedIn;
     final hasContent = _input.text.trim().isNotEmpty;
-    final canPost = signedIn && hasContent && !widget.controller.submitting;
+    final canPost = hasContent && !widget.controller.submitting;
     final multiline = _input.text.contains('\n');
     final bottomInset = _isAndroid
         ? _pinnedKeyboardInset
@@ -247,8 +243,8 @@ class _CommentComposerSheetState extends State<CommentComposerSheet> {
                 key: const Key('comment-composer-input'),
                 controller: _input,
                 focusNode: _inputFocus,
-                readOnly: !signedIn,
-                canRequestFocus: signedIn,
+                readOnly: false,
+                canRequestFocus: true,
                 minLines: 1,
                 maxLines: 4,
                 maxLength: _maxCommentLength,
@@ -262,9 +258,7 @@ class _CommentComposerSheetState extends State<CommentComposerSheet> {
                 ),
                 cursorColor: AppColors.blue,
                 decoration: InputDecoration(
-                  hintText: signedIn
-                      ? l10n.writeComment
-                      : l10n.commentLoginHint,
+                  hintText: l10n.writeComment,
                   hintStyle: const TextStyle(
                     color: AppColors.muted,
                     fontSize: 14,
@@ -278,7 +272,7 @@ class _CommentComposerSheetState extends State<CommentComposerSheet> {
                   enabledBorder: InputBorder.none,
                   focusedBorder: InputBorder.none,
                 ),
-                onTap: signedIn ? null : _authenticate,
+                onTap: null,
               ),
             ),
             const SizedBox(height: 12),

lib/pages/player/widgets/drama_comments_sheet.dart

@@ -11,11 +11,9 @@ import '../../../core/data/models/comment.dart';
 import '../../../core/data/models/drama.dart';
 import '../../../core/data/repositories/comment_repository.dart';
 import '../../../core/data/repositories/interaction_repository.dart';
-import '../../../core/data/services/auth_controller.dart';
 import '../../../core/data/services/comment_controller.dart';
 import '../../../core/formatting/error_text.dart';
 import '../../../core/theme/app_colors.dart';
-import '../../../core/widgets/auth_gate.dart';
 import '../../../core/widgets/empty_state.dart';
 import '../../../l10n/app_localizations.dart';
 import 'comment_composer_sheet.dart';
@@ -29,7 +27,7 @@ const double _sheetRadius = 20;
 const double _headerHeight = 44;
 const double _composerTopGap = 8;
 
-/// 服务端评论底部弹窗：匿名列表、游标翻页、回复与登录发布。
+/// 服务端评论底部弹窗：匿名列表、游标翻页、回复与设备身份发布。
 class DramaCommentsSheet extends StatefulWidget {
   const DramaCommentsSheet({super.key, required this.drama, this.episodeId});
 
@@ -92,8 +90,7 @@ class _DramaCommentsSheetState extends State<DramaCommentsSheet> {
   }
 
   Future<void> _openComposer({DramaComment? replyTo}) async {
-    await ensureSignedIn(context);
-    if (!mounted || !context.read<AuthController>().isSignedIn) return;
+    if (!mounted) return;
     _removeComposerOverlay();
     final entry = OverlayEntry(
       builder: (_) => CommentComposerSheet(
@@ -222,7 +219,6 @@ class _DramaCommentsSheetState extends State<DramaCommentsSheet> {
   Widget _content(BuildContext context) {
     final l10n = AppLocalizations.of(context)!;
     final count = _serverCount ?? _controller.exactCount;
-    final signedIn = context.watch<AuthController>().isSignedIn;
     final composerReserve = _composerHeight + _composerTopGap;
     return Column(
       key: const Key('comment-sheet-content'),
@@ -269,7 +265,7 @@ class _DramaCommentsSheetState extends State<DramaCommentsSheet> {
         Padding(
           key: const Key('comment-composer-area'),
           padding: const EdgeInsets.only(top: _composerTopGap),
-          child: _fakeComposer(l10n, signedIn: signedIn),
+          child: _fakeComposer(l10n),
         ),
       ],
     );
@@ -352,7 +348,7 @@ class _DramaCommentsSheetState extends State<DramaCommentsSheet> {
     return const SizedBox(height: 8);
   }
 
-  Widget _fakeComposer(AppLocalizations l10n, {required bool signedIn}) {
+  Widget _fakeComposer(AppLocalizations l10n) {
     return GestureDetector(
       behavior: HitTestBehavior.opaque,
       onTap: _openComposer,
@@ -372,7 +368,7 @@ class _DramaCommentsSheetState extends State<DramaCommentsSheet> {
                 child: Padding(
                   padding: const EdgeInsets.only(left: 16),
                   child: Text(
-                    signedIn ? l10n.writeComment : l10n.commentLoginHint,
+                    l10n.writeComment,
                     key: const Key('comment-input-placeholder-label'),
                     maxLines: 1,
                     overflow: TextOverflow.ellipsis,

lib/pages/player/widgets/home_feed_overlay.dart

@@ -14,7 +14,7 @@ import '../../../core/theme/app_colors.dart';
 import '../../../l10n/app_localizations.dart';
 import 'home_feed_recommend_panel.dart';
 import 'loading_progress_track.dart';
-import 'player_double_tap_hearts.dart';
+import 'player_tap_gesture_region.dart';
 import 'seek_progress_bar.dart';
 import 'scrub_preview_card.dart';
 
@@ -69,6 +69,7 @@ class HomeFeedOverlay extends StatefulWidget {
     this.cancelScrubRequest = 0,
     this.thumbnailService,
     this.spriteAxisService,
+    this.suppressBufferLoading = false,
   });
 
   final AppLocalizations l10n;
@@ -104,25 +105,15 @@ class HomeFeedOverlay extends StatefulWidget {
   final int cancelScrubRequest;
   final PlaybackThumbnailService? thumbnailService;
   final SpriteThumbnailAxisService? spriteAxisService;
+  final bool suppressBufferLoading;
 
   @override
   State<HomeFeedOverlay> createState() => _HomeFeedOverlayState();
 }
 
 class _HomeFeedOverlayState extends State<HomeFeedOverlay> {
-  static const Duration _singleTapDelay = Duration(milliseconds: 400);
-
   bool _scrubbing = false;
   bool _wasVisibleBeforeScrub = true;
-  Timer? _singleTapTimer;
-  DateTime? _lastDownAt;
-  DateTime? _blockSingleTapUntil;
-  bool _doubleTapDown = false;
-  bool _likedThisPair = false;
-  int _downSerial = 0;
-  int _tapSeq = 0;
-  int _nextHeartBurstId = 0;
-  final List<({int id, Offset position})> _heartBursts = [];
 
   @override
   void didUpdateWidget(covariant HomeFeedOverlay oldWidget) {
@@ -132,35 +123,24 @@ class _HomeFeedOverlayState extends State<HomeFeedOverlay> {
     }
   }
 
-  @override
-  void dispose() {
-    _tapSeq++;
-    _singleTapTimer?.cancel();
-    super.dispose();
-  }
-
   @override
   Widget build(BuildContext context) {
     return SafeArea(
       bottom: false,
       child: Stack(
+        clipBehavior: Clip.none,
         children: [
           Positioned.fill(
-            child: LayoutBuilder(
-              builder: (context, constraints) => Listener(
-                onPointerUp: (_) => widget.onBoostEnd(),
-                onPointerCancel: (_) => widget.onBoostEnd(),
-                onPointerDown: _handlePointerDown,
-                child: GestureDetector(
-                  key: const Key('home-feed-gesture'),
-                  behavior: HitTestBehavior.opaque,
-                  onTapUp: _handleTapUp,
-                  onLongPressStart: (details) =>
-                      _handleLongPressStart(details, constraints.maxWidth),
-                  onLongPressEnd: (_) => widget.onBoostEnd(),
-                  onLongPressCancel: widget.onBoostEnd,
-                ),
-              ),
+            child: PlayerTapGestureRegion(
+              key: const ValueKey('home-feed-tap-gesture-region'),
+              gestureKey: const Key('home-feed-gesture'),
+              enabled: !_scrubbing,
+              doubleTapEnabled: !widget.locked,
+              now: widget.now,
+              onSingleTap: widget.onTogglePlay,
+              onDoubleTapLike: widget.onDoubleTapLike,
+              onLongPressStart: _handleLongPressStart,
+              onInteractionEnd: widget.onBoostEnd,
             ),
           ),
           Positioned(
@@ -217,31 +197,12 @@ class _HomeFeedOverlayState extends State<HomeFeedOverlay> {
               spriteAxisService: widget.spriteAxisService,
               thumbnailsUrl: widget.episode.thumbnailsUrl,
               episodeId: widget.episode.id,
-              posterUrl: widget.drama.posterUrl,
+              suppressBufferLoading: widget.suppressBufferLoading,
               onScrubStart: _startScrub,
               onScrubEnd: _endScrub,
               onSeek: widget.onSeek,
             ),
           ),
-          if (_heartBursts.isNotEmpty)
-            Positioned.fill(
-              child: IgnorePointer(
-                child: Stack(
-                  clipBehavior: Clip.none,
-                  children: [
-                    for (final burst in _heartBursts)
-                      Positioned(
-                        left: burst.position.dx,
-                        top: burst.position.dy - 10,
-                        child: PlayerDoubleTapHeartBurst(
-                          key: ValueKey(burst.id),
-                          onCompleted: () => _removeHeartBurst(burst.id),
-                        ),
-                      ),
-                  ],
-                ),
-              ),
-            ),
         ],
       ),
     );
@@ -263,83 +224,8 @@ class _HomeFeedOverlayState extends State<HomeFeedOverlay> {
     widget.onScrubEnd?.call(wasVisible);
   }
 
-  DateTime _now() => widget.now?.call() ?? DateTime.now();
-
-  void _handlePointerDown(PointerDownEvent event) {
-    final now = _now();
-    final previous = _lastDownAt;
-    _downSerial++;
-    _lastDownAt = now;
-    final repeated =
-        previous != null && now.difference(previous) <= _singleTapDelay;
-    if (!repeated) {
-      if (_singleTapBlocked(now)) return;
-      _doubleTapDown = false;
-      _likedThisPair = false;
-      return;
-    }
-    _doubleTapDown = true;
-    _blockSingleTapUntil = now.add(_singleTapDelay);
-    _cancelPendingSingleTap();
-  }
-
-  bool _singleTapBlocked(DateTime now) {
-    final blockedUntil = _blockSingleTapUntil;
-    return blockedUntil != null && now.isBefore(blockedUntil);
-  }
-
-  void _cancelPendingSingleTap() {
-    _tapSeq++;
-    _singleTapTimer?.cancel();
-    _singleTapTimer = null;
-  }
-
-  void _handleTapUp(TapUpDetails details) {
-    final now = _now();
-    if (_doubleTapDown || _singleTapBlocked(now)) {
-      _showDoubleTapLike(details.localPosition);
-      return;
-    }
-    final serial = _downSerial;
-    final tapSeq = ++_tapSeq;
-    _singleTapTimer?.cancel();
-    late final Timer pending;
-    pending = Timer(_singleTapDelay, () {
-      if (!identical(_singleTapTimer, pending)) return;
-      _singleTapTimer = null;
-      if (!mounted || tapSeq != _tapSeq || serial != _downSerial) return;
-      if (_doubleTapDown || _singleTapBlocked(_now())) return;
-      _lastDownAt = null;
-      widget.onTogglePlay();
-    });
-    _singleTapTimer = pending;
-  }
-
-  void _showDoubleTapLike(Offset position) {
-    if (_likedThisPair) return;
-    _likedThisPair = true;
-    _blockSingleTapUntil = _now().add(_singleTapDelay);
-    _cancelPendingSingleTap();
-    _showHearts(position);
-  }
-
-  void _showHearts(Offset position) {
-    final id = _nextHeartBurstId++;
-    setState(() => _heartBursts.add((id: id, position: position)));
-    widget.onDoubleTapLike?.call(position);
-  }
-
-  void _removeHeartBurst(int id) {
-    if (!mounted) return;
-    setState(() => _heartBursts.removeWhere((burst) => burst.id == id));
-  }
-
   void _handleLongPressStart(LongPressStartDetails details, double width) {
     final third = width / 3;
-    _tapSeq++;
-    _cancelPendingSingleTap();
-    _doubleTapDown = false;
-    _lastDownAt = null;
     final dx = details.localPosition.dx;
     if (dx < third || dx > width - third) {
       widget.onBoostStart();

lib/pages/player/widgets/home_feed_overlay_parts.dart

@@ -23,7 +23,7 @@ class _FeedProgressBar extends StatefulWidget {
     this.spriteAxisService,
     this.thumbnailsUrl,
     this.episodeId,
-    this.posterUrl = '',
+    this.suppressBufferLoading = false,
     this.onScrubStart,
     this.onScrubEnd,
     this.onSeek,
@@ -38,7 +38,7 @@ class _FeedProgressBar extends StatefulWidget {
   final SpriteThumbnailAxisSource? spriteAxisService;
   final String? thumbnailsUrl;
   final String? episodeId;
-  final String posterUrl;
+  final bool suppressBufferLoading;
   final VoidCallback? onScrubStart;
   final VoidCallback? onScrubEnd;
   final ValueChanged<Duration>? onSeek;
@@ -54,6 +54,7 @@ class _FeedProgressBarState extends State<_FeedProgressBar> {
   Timer? _bufferTimer;
   bool _buffering = false;
   bool _dragging = false;
+  Duration? _lastPosition;
 
   @override
   void initState() {
@@ -69,6 +70,7 @@ class _FeedProgressBarState extends State<_FeedProgressBar> {
       _bufferTimer?.cancel();
       _bufferTimer = null;
       _buffering = false;
+      _lastPosition = null;
       _attachSource();
     }
     if (oldWidget.cancelScrubRequest != widget.cancelScrubRequest) {
@@ -79,6 +81,7 @@ class _FeedProgressBarState extends State<_FeedProgressBar> {
       _bufferTimer?.cancel();
       _bufferTimer = null;
       _buffering = false;
+      _lastPosition = null;
       if (widget.locked) {
         _dragging = false;
         _preview = null;
@@ -86,6 +89,13 @@ class _FeedProgressBarState extends State<_FeedProgressBar> {
         _syncBufferState(notify: false);
       }
     }
+    if (oldWidget.suppressBufferLoading != widget.suppressBufferLoading) {
+      _bufferTimer?.cancel();
+      _bufferTimer = null;
+      _buffering = false;
+      _lastPosition = null;
+      _syncBufferState(notify: false);
+    }
   }
 
   @override
@@ -102,7 +112,11 @@ class _FeedProgressBarState extends State<_FeedProgressBar> {
         final width = constraints.maxWidth;
         final source = widget.controller;
         final scrubbing = _dragging;
-        final loading = !widget.locked && !scrubbing && _buffering;
+        final loading =
+            !widget.locked &&
+            !widget.suppressBufferLoading &&
+            !scrubbing &&
+            _buffering;
         final track = widget.locked
             ? _inactiveTrack()
             : source == null
@@ -166,7 +180,6 @@ class _FeedProgressBarState extends State<_FeedProgressBar> {
                       spriteAxisService: widget.spriteAxisService,
                       thumbnailsUrl: widget.thumbnailsUrl,
                       episodeId: widget.episodeId!,
-                      posterUrl: widget.posterUrl,
                       position: previewPosition,
                       duration: video!.duration,
                     ),
@@ -202,14 +215,24 @@ class _FeedProgressBarState extends State<_FeedProgressBar> {
 
   void _syncBufferState({bool notify = true}) {
     final source = widget.controller;
-    if (widget.locked || source == null) {
+    if (widget.locked || widget.suppressBufferLoading || source == null) {
       _bufferTimer?.cancel();
       _bufferTimer = null;
+      _lastPosition = null;
       _setBuffering(false, notify: notify);
       return;
     }
     final value = source.value;
     if (!value.isInitialized) {
+      _bufferTimer?.cancel();
+      _bufferTimer = null;
+      _lastPosition = null;
+      _setBuffering(false, notify: notify);
+      return;
+    }
+    final previousPosition = _lastPosition;
+    _lastPosition = value.position;
+    if (previousPosition != null && value.position > previousPosition) {
       _bufferTimer?.cancel();
       _bufferTimer = null;
       _setBuffering(false, notify: notify);
@@ -221,14 +244,22 @@ class _FeedProgressBarState extends State<_FeedProgressBar> {
       _setBuffering(false, notify: notify);
       return;
     }
+    if (previousPosition == null &&
+        value.isPlaying &&
+        value.position > Duration.zero) {
+      _setBuffering(false, notify: notify);
+      return;
+    }
     if (_buffering || _bufferTimer != null) return;
+    final bufferingPosition = value.position;
     _bufferTimer = Timer(_bufferDebounce, () {
       _bufferTimer = null;
       final current = widget.controller;
       if (!mounted ||
           current != source ||
           !current!.value.isInitialized ||
-          !current.value.isBuffering) {
+          !current.value.isBuffering ||
+          current.value.position != bufferingPosition) {
         return;
       }
       _setBuffering(true);

lib/pages/player/widgets/player_double_tap_hearts.dart

@@ -1,13 +1,16 @@
 // Author: fruit.com.cn
 
+import 'dart:async';
+
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
 import '../../../core/theme/app_colors.dart';
 
-const int _heartDurationMs = 680;
+const int _heartDurationMs = 1500;
 const double _heartPopPortion = 0.18;
 const double _heartStartScale = 0.7;
-const double _heartHoldPortion = 0.45;
+const double _heartHoldPortion = 0.55;
 
 const List<_HeartParticle> _hearts = [
   _HeartParticle(
@@ -35,75 +38,136 @@ const List<_HeartParticle> _hearts = [
 
 /// 双击点赞时，在点击位置飘出一小簇心。
 class PlayerDoubleTapHeartBurst extends StatefulWidget {
-  const PlayerDoubleTapHeartBurst({super.key, required this.onCompleted});
+  const PlayerDoubleTapHeartBurst({
+    super.key,
+    required this.burstId,
+    required this.onCompleted,
+    this.origin = Offset.zero,
+    this.now,
+  });
 
+  final int burstId;
   final VoidCallback onCompleted;
+  final Offset origin;
+  final DateTime Function()? now;
 
   @override
   State<PlayerDoubleTapHeartBurst> createState() =>
       _PlayerDoubleTapHeartBurstState();
 }
 
-class _PlayerDoubleTapHeartBurstState extends State<PlayerDoubleTapHeartBurst>
-    with SingleTickerProviderStateMixin {
-  late final AnimationController _controller;
+class _PlayerDoubleTapHeartBurstState extends State<PlayerDoubleTapHeartBurst> {
+  Timer? _timer;
+  late final DateTime _startAt;
+  late final int _totalMs;
+  final Stopwatch _lifetime = Stopwatch();
+  int _elapsedMs = 0;
+  int _tickCount = 0;
   bool _completed = false;
 
   @override
   void initState() {
     super.initState();
-    final total = _hearts
+    _lifetime.start();
+    _startAt = _now();
+    _totalMs = _hearts
         .map((heart) => heart.delay + _heartDurationMs)
         .reduce((left, right) => left > right ? left : right);
-    _controller = AnimationController(
-      vsync: this,
-      duration: Duration(milliseconds: total),
-    )..addStatusListener(_onStatus);
-    _controller.forward();
+    if (kDebugMode) {
+      debugPrint(
+        '[player] phase=heart-burst-start '
+        'id=${widget.burstId} count=${_hearts.length} '
+        'configuredMs=$_totalMs at=${widget.origin.dx.toStringAsFixed(1)},'
+        '${widget.origin.dy.toStringAsFixed(1)}',
+      );
+    }
+    _timer = Timer.periodic(
+      const Duration(milliseconds: 16),
+      (_) => _handleTick(),
+    );
   }
 
-  void _onStatus(AnimationStatus status) {
-    if (status != AnimationStatus.completed || _completed) return;
+  DateTime _now() => widget.now?.call() ?? DateTime.now();
+
+  void _handleTick() {
+    if (!mounted || _completed) return;
+    final rawElapsedMs = _now().difference(_startAt).inMilliseconds;
+    final elapsedMs = rawElapsedMs < 0
+        ? 0
+        : rawElapsedMs > _totalMs
+        ? _totalMs
+        : rawElapsedMs;
+    _elapsedMs = elapsedMs;
+    _tickCount++;
+    if (kDebugMode && _tickCount % 10 == 0) {
+      debugPrint(
+        '[player] phase=heart-tick id=${widget.burstId} '
+        'elapsedMs=$_elapsedMs',
+      );
+    }
+    if (_elapsedMs >= _totalMs) {
+      _complete();
+      return;
+    }
+    setState(() {});
+  }
+
+  void _complete() {
+    if (_completed) return;
     _completed = true;
+    _timer?.cancel();
+    if (kDebugMode) {
+      debugPrint(
+        '[player] phase=heart-burst-complete '
+        'id=${widget.burstId} '
+        'configuredMs=$_totalMs',
+      );
+    }
     widget.onCompleted();
   }
 
   @override
   void dispose() {
-    _controller
-      ..removeStatusListener(_onStatus)
-      ..dispose();
+    if (kDebugMode) {
+      final elapsedMs = _completed ? _totalMs : _elapsedMs;
+      debugPrint(
+        '[player] phase=heart-burst-dispose '
+        'id=${widget.burstId} elapsedMs=$elapsedMs '
+        'completed=${_completed ? 1 : 0}',
+      );
+      if (!_completed) {
+        debugPrintStack(
+          maxFrames: 30,
+          label:
+              '[player] heart-burst-premature-dispose '
+              'id=${widget.burstId} mount=root-overlay',
+        );
+      }
+    }
+    _lifetime.stop();
+    _timer?.cancel();
+    _timer = null;
     super.dispose();
   }
 
   @override
   Widget build(BuildContext context) {
     return IgnorePointer(
-      child: SizedBox.shrink(
-        child: AnimatedBuilder(
-          animation: _controller,
-          builder: (context, _) {
-            final elapsed =
-                _controller.value * _controller.duration!.inMilliseconds;
-            return Stack(
-              clipBehavior: Clip.none,
-              children: [
-                for (var index = 0; index < _hearts.length; index++)
-                  _heart(_hearts[index], elapsed, index),
-              ],
-            );
-          },
-        ),
+      child: Stack(
+        fit: StackFit.expand,
+        clipBehavior: Clip.none,
+        children: [
+          for (var index = 0; index < _hearts.length; index++)
+            _heart(_hearts[index], _elapsedMs.toDouble(), index),
+        ],
       ),
     );
   }
 
   Widget _heart(_HeartParticle heart, double elapsed, int index) {
-    final progress = ((elapsed - heart.delay) / _heartDurationMs).clamp(
-      0.0,
-      1.0,
-    );
-    if (progress <= 0) return const SizedBox.shrink();
+    final rawProgress = (elapsed - heart.delay) / _heartDurationMs;
+    if (rawProgress < 0) return const SizedBox.shrink();
+    final progress = rawProgress.clamp(0.0, 1.0);
     final move = Curves.easeOutCubic.transform(progress);
     final scale = progress < _heartPopPortion
         ? _heartStartScale +
@@ -113,8 +177,8 @@ class _PlayerDoubleTapHeartBurstState extends State<PlayerDoubleTapHeartBurst>
         ? 1.0
         : 1 - ((progress - _heartHoldPortion) / (1 - _heartHoldPortion));
     return Positioned(
-      left: heart.drift * move - heart.size / 2,
-      top: -heart.size / 2 - heart.travel * move,
+      left: widget.origin.dx + heart.drift * move - heart.size / 2,
+      top: widget.origin.dy - heart.size / 2 - heart.travel * move,
       child: Opacity(
         opacity: opacity.clamp(0.0, 1.0),
         child: Transform.scale(

lib/pages/player/widgets/player_heart_overlay_scope.dart

@@ -0,0 +1,52 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/foundation.dart';
+import 'package:flutter/widgets.dart';
+
+/// Tracks heart overlays for the lifetime of one player page.
+class PlayerHeartOverlayController {
+  final Map<int, OverlayEntry> _entries = {};
+
+  void track(int id, OverlayEntry entry) {
+    _entries[id] = entry;
+  }
+
+  void untrack(int id) {
+    _entries.remove(id);
+  }
+
+  void dispose() {
+    for (final entry in _entries.entries.toList()) {
+      if (entry.value.mounted) entry.value.remove();
+      entry.value.dispose();
+      if (kDebugMode) {
+        debugPrint(
+          '[player] phase=heart-burst-entry-removed '
+          'id=${entry.key} reason=page-dispose',
+        );
+      }
+    }
+    _entries.clear();
+  }
+}
+
+class PlayerHeartOverlayScope extends InheritedWidget {
+  const PlayerHeartOverlayScope({
+    super.key,
+    required this.controller,
+    required super.child,
+  });
+
+  final PlayerHeartOverlayController controller;
+
+  static PlayerHeartOverlayController? maybeOf(BuildContext context) {
+    return context
+        .dependOnInheritedWidgetOfExactType<PlayerHeartOverlayScope>()
+        ?.controller;
+  }
+
+  @override
+  bool updateShouldNotify(PlayerHeartOverlayScope oldWidget) {
+    return controller != oldWidget.controller;
+  }
+}

lib/pages/player/widgets/player_loading_overlay.dart

@@ -0,0 +1,45 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+
+import '../../../core/theme/app_colors.dart';
+import '../../../core/theme/app_dimens.dart';
+
+class PlayerLoadingOverlay extends StatelessWidget {
+  const PlayerLoadingOverlay({
+    super.key,
+    required this.opacity,
+    required this.onFadeEnd,
+  });
+
+  final double opacity;
+  final VoidCallback onFadeEnd;
+
+  @override
+  Widget build(BuildContext context) {
+    return AnimatedOpacity(
+      opacity: opacity,
+      duration: const Duration(milliseconds: 140),
+      curve: Curves.easeOut,
+      onEnd: onFadeEnd,
+      child: Container(
+        key: const Key('player-loading-surface'),
+        width: AppDimens.refreshIndicatorSize,
+        height: AppDimens.refreshIndicatorSize,
+        decoration: BoxDecoration(
+          color: AppColors.refreshIndicatorSurface,
+          borderRadius: BorderRadius.circular(AppDimens.refreshIndicatorRadius),
+        ),
+        alignment: Alignment.center,
+        child: const SizedBox.square(
+          dimension: AppDimens.refreshSpinnerSize,
+          child: CircularProgressIndicator(
+            key: Key('player-entry-loading'),
+            color: Colors.white,
+            strokeWidth: AppDimens.refreshSpinnerStroke,
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/pages/player/widgets/player_opening_frame.dart

@@ -1,167 +1,177 @@
 // Author: fruit.com.cn
 
 import 'dart:async';
-import 'dart:ui' as ui;
 
 import 'package:flutter/material.dart';
 
 import '../../../core/config/app_config.dart';
-import '../../../core/data/services/sprite_thumbnail_asset_loader.dart';
 import '../../../core/data/services/sprite_thumbnail_axis.dart';
+import '../../../core/theme/app_colors.dart';
+import '../../../core/widgets/remote_image.dart';
 import 'scrub_preview_card.dart';
 
-/// 无雪碧图地址时不垫帧，交还给纯黑底。
-Widget? playerOpeningFrame(String? thumbnailsUrl) {
-  final url = thumbnailsUrl?.trim() ?? '';
-  if (url.isEmpty) return null;
-  return PlayerOpeningFrame(thumbnailsUrl: url);
+enum PlayerOpeningFallback { handoff, poster, thumbnails, black }
+
+PlayerOpeningFallback playerOpeningFallback({
+  String? posterUrl,
+  String? thumbnailsUrl,
+}) {
+  if (posterUrl?.trim().isNotEmpty ?? false) {
+    return PlayerOpeningFallback.poster;
+  }
+  if (thumbnailsUrl?.trim().isNotEmpty ?? false) {
+    return PlayerOpeningFallback.thumbnails;
+  }
+  return PlayerOpeningFallback.black;
 }
 
-/// 解码出视频画面前，用本集雪碧图第一帧垫底。
+/// 当前集首帧在视频纹理未就绪时占位；空地址交还纯黑底。
+Widget? playerOpeningFrame(
+  String? thumbnailsUrl, {
+  String? posterUrl,
+  required SpriteThumbnailAxisSource spriteSource,
+  BoxFit fit = BoxFit.cover,
+}) {
+  final thumbnails = thumbnailsUrl?.trim() ?? '';
+  final poster = posterUrl?.trim() ?? '';
+  if (playerOpeningFallback(posterUrl: poster, thumbnailsUrl: thumbnails) ==
+      PlayerOpeningFallback.black) {
+    return null;
+  }
+  return PlayerOpeningFrame(
+    thumbnailsUrl: thumbnails,
+    posterUrl: poster,
+    spriteSource: spriteSource,
+    fit: fit,
+  );
+}
+
+/// 与视频共用全屏父约束和 BoxFit，切换时保持相同可见区域。
 class PlayerOpeningFrame extends StatefulWidget {
   const PlayerOpeningFrame({
     super.key,
     required this.thumbnailsUrl,
-    this.loader,
-    this.cache,
+    required this.spriteSource,
+    this.posterUrl,
+    this.fit = BoxFit.cover,
   });
 
+  /// 当前视频原始分辨率首帧地址，优先于雪碧图。
+  final String? posterUrl;
+
+  /// 当前视频雪碧图 WebVTT 地址。
   final String thumbnailsUrl;
-  final SpriteThumbnailAssetLoader? loader;
-  final OpeningFrameCache? cache;
+
+  /// 进度条拖动预览共用的雪碧图时间轴与解码缓存。
+  final SpriteThumbnailAxisSource spriteSource;
+
+  /// 必须与同页视频层使用相同适配规则。
+  final BoxFit fit;
 
   @override
   State<PlayerOpeningFrame> createState() => _PlayerOpeningFrameState();
 }
 
 class _PlayerOpeningFrameState extends State<PlayerOpeningFrame> {
-  SpriteThumbnailFrame? _frame;
-  int _serial = 0;
+  bool _posterFailed = false;
 
   @override
   void initState() {
     super.initState();
-    unawaited(_load());
+    widget.spriteSource.addListener(_handleSpriteChanged);
+    _prepareSpriteIfNeeded();
   }
 
   @override
   void didUpdateWidget(covariant PlayerOpeningFrame oldWidget) {
     super.didUpdateWidget(oldWidget);
-    if (oldWidget.thumbnailsUrl != widget.thumbnailsUrl) {
-      _frame = null;
-      unawaited(_load());
+    if (oldWidget.posterUrl != widget.posterUrl) {
+      _posterFailed = false;
+    }
+    if (oldWidget.spriteSource != widget.spriteSource) {
+      oldWidget.spriteSource.removeListener(_handleSpriteChanged);
+      widget.spriteSource.addListener(_handleSpriteChanged);
+      _prepareSpriteIfNeeded();
+    }
+    if (oldWidget.posterUrl != widget.posterUrl ||
+        oldWidget.thumbnailsUrl != widget.thumbnailsUrl) {
+      _prepareSpriteIfNeeded();
     }
   }
 
-  Future<void> _load() async {
-    final serial = ++_serial;
-    final frame = await (widget.cache ?? OpeningFrameCache.shared).load(
-      widget.thumbnailsUrl,
-      loader: widget.loader,
-    );
-    if (!mounted || serial != _serial) return;
-    setState(() => _frame = frame);
+  @override
+  void dispose() {
+    widget.spriteSource.removeListener(_handleSpriteChanged);
+    super.dispose();
   }
 
-  @override
-  Widget build(BuildContext context) {
-    final frame = _frame;
+  void _handleSpriteChanged() {
+    if (mounted) setState(() {});
+  }
+
+  bool get _hasPoster =>
+      !_posterFailed && (widget.posterUrl?.trim().isNotEmpty ?? false);
+
+  void _prepareSpriteIfNeeded() {
+    if (_hasPoster || widget.thumbnailsUrl.trim().isEmpty) return;
+    unawaited(
+      widget.spriteSource.prepareAt(widget.thumbnailsUrl, Duration.zero),
+    );
+  }
+
+  Widget _handlePosterError() {
+    if (!_posterFailed) {
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        if (!mounted || _posterFailed) return;
+        setState(() => _posterFailed = true);
+        _prepareSpriteIfNeeded();
+      });
+    }
+    return _spriteOrBlack();
+  }
+
+  Widget _spriteOrBlack() {
+    final frame = widget.spriteSource.cachedFrameAt(
+      widget.thumbnailsUrl,
+      Duration.zero,
+    );
     if (frame == null) return const SizedBox.expand();
     return SpriteCropPreview(
       key: const Key('player-opening-sprite'),
       image: frame.image,
       sourceRect: frame.sourceRect,
-    );
-  }
-}
-
-/// 相邻页共用的雪碧图首帧缓存，避免每页重复拉 VTT。
-class OpeningFrameCache {
-  OpeningFrameCache({this.capacity = 6});
-
-  static final OpeningFrameCache shared = OpeningFrameCache();
-
-  final int capacity;
-  final Map<String, SpriteThumbnailFrame> _frames = {};
-  final Map<String, Future<SpriteThumbnailFrame?>> _loads = {};
-
-  /// 取 [thumbnailsUrl] 对应的第一帧；失败返回 null。
-  Future<SpriteThumbnailFrame?> load(
-    String? thumbnailsUrl, {
-    SpriteThumbnailAssetLoader? loader,
-  }) {
-    final url = _normalize(thumbnailsUrl);
-    if (url == null) return Future<SpriteThumbnailFrame?>.value();
-    final cached = _frames[url];
-    if (cached != null) return Future.value(cached);
-    return _loads.putIfAbsent(url, () => _fetch(url, loader));
-  }
-
-  Future<SpriteThumbnailFrame?> _fetch(
-    String url,
-    SpriteThumbnailAssetLoader? loader,
-  ) async {
-    try {
-      final asset = loader ?? DioSpriteThumbnailAssetLoader();
-      final text = await asset.loadVtt(Uri.parse(url));
-      if (text == null || text.isEmpty) return null;
-      final axis = parseSpriteThumbnailVtt(text, vttUrl: url);
-      final cue = axis.cues.isEmpty ? null : axis.cues.first;
-      if (cue == null) return null;
-      final decoded = await asset.loadSprite(
-        axis.resolveSpriteUri(cue.spriteFile),
-      );
-      if (decoded == null) return null;
-      final frame = SpriteThumbnailFrame(
-        image: decoded.image,
-        sourceRect: _scaledRect(decoded, cue.sourceRect),
-        spriteUrl: axis.resolveSpriteUri(cue.spriteFile).toString(),
-        cue: cue,
-      );
-      _store(url, frame);
-      return frame;
-    } catch (_) {
-      return null;
-    } finally {
-      _loads.remove(url);
-    }
-  }
-
-  void _store(String url, SpriteThumbnailFrame frame) {
-    _frames.remove(url);
-    _frames[url] = frame;
-    while (_frames.length > capacity) {
-      final oldest = _frames.keys.first;
-      _frames.remove(oldest)?.image.dispose();
-    }
-  }
-
-  ui.Rect _scaledRect(SpriteThumbnailDecodedImage decoded, ui.Rect source) {
-    if (decoded.originalWidth <= 0 || decoded.originalHeight <= 0) {
-      return source;
-    }
-    final scaleX = decoded.image.width / decoded.originalWidth;
-    final scaleY = decoded.image.height / decoded.originalHeight;
-    return ui.Rect.fromLTWH(
-      source.left * scaleX,
-      source.top * scaleY,
-      source.width * scaleX,
-      source.height * scaleY,
+      fit: widget.fit,
     );
   }
 
-  String? _normalize(String? raw) {
-    final value = AppConfig.mediaUrl(raw?.trim() ?? '');
-    if (value.isEmpty) return null;
-    return value;
-  }
-
-  /// 测试收尾时清空缓存。
-  void clear() {
-    for (final frame in _frames.values) {
-      frame.image.dispose();
-    }
-    _frames.clear();
-    _loads.clear();
-  }
+  @override
+  Widget build(BuildContext context) => Stack(
+    fit: StackFit.expand,
+    children: [
+      const ColoredBox(color: AppColors.mediaBlack),
+      if (_hasPoster)
+        LayoutBuilder(
+          builder: (context, constraints) {
+            final pixelRatio = MediaQuery.devicePixelRatioOf(context);
+            return Image.network(
+              AppConfig.mediaUrl(widget.posterUrl!.trim()),
+              key: const Key('player-opening-poster'),
+              fit: widget.fit,
+              cacheWidth: resolveImageDecodePixels(
+                constraints.maxWidth,
+                pixelRatio,
+              ),
+              cacheHeight: resolveImageDecodePixels(
+                constraints.maxHeight,
+                pixelRatio,
+              ),
+              gaplessPlayback: true,
+              errorBuilder: (_, _, _) => _handlePosterError(),
+            );
+          },
+        )
+      else
+        _spriteOrBlack(),
+    ],
+  );
 }

lib/pages/player/widgets/player_overlay.dart

@@ -14,6 +14,7 @@ import '../../../l10n/app_localizations.dart';
 import 'player_center_toggle.dart';
 import 'interaction_rail.dart';
 import 'player_overlay_models.dart';
+import 'player_tap_gesture_region.dart';
 import 'seek_progress_bar.dart';
 
 part 'player_overlay_parts.dart';
@@ -36,6 +37,7 @@ class PlayerPlaybackOverlay extends StatelessWidget {
     required this.actions,
     required this.controlsVisible,
     required this.scrubbing,
+    this.suppressProgressLoading = false,
   });
 
   /// 展示数据。
@@ -49,23 +51,24 @@ class PlayerPlaybackOverlay extends StatelessWidget {
 
   /// 正在拖动进度条。拖动期间清屏，只留进度条。
   final bool scrubbing;
+  final bool suppressProgressLoading;
 
   @override
   Widget build(BuildContext context) {
     return SafeArea(
       child: Stack(
+        clipBehavior: Clip.none,
         children: [
           Positioned.fill(
-            child: LayoutBuilder(
-              builder: (context, constraints) => GestureDetector(
-                key: const Key('player-video-tap'),
-                behavior: HitTestBehavior.opaque,
-                onTap: actions.onTogglePlay,
-                onLongPressStart: (details) =>
-                    _handleLongPressStart(details, constraints.maxWidth),
-                onLongPressEnd: (_) => actions.onBoostEnd(),
-                onLongPressCancel: actions.onBoostEnd,
-              ),
+            child: PlayerTapGestureRegion(
+              key: const ValueKey('player-tap-gesture-region'),
+              gestureKey: const Key('player-video-tap'),
+              enabled: !scrubbing,
+              doubleTapEnabled: !data.locked,
+              onSingleTap: actions.onTogglePlay,
+              onDoubleTapLike: actions.onDoubleTapLike,
+              onLongPressStart: _handleLongPressStart,
+              onInteractionEnd: actions.onBoostEnd,
             ),
           ),
           _top(context),
@@ -303,8 +306,9 @@ class PlayerPlaybackOverlay extends StatelessWidget {
         spriteAxisService: data.spriteAxisService,
         thumbnailsUrl: data.episode.thumbnailsUrl,
         episodeId: data.episode.id,
-        posterUrl: data.drama.posterUrl,
         inactiveTrackColor: AppColors.inactiveTrack,
+        fallbackDuration: Duration(seconds: data.episode.durationSec),
+        suppressBufferLoading: suppressProgressLoading,
         onScrubStart: actions.onScrubStart,
         onScrubEnd: actions.onScrubEnd,
         onSeek: actions.onSeek,

lib/pages/player/widgets/player_overlay_models.dart

@@ -1,5 +1,7 @@
 // Author: fruit.com.cn
 
+import 'dart:ui';
+
 import 'package:flutter/foundation.dart';
 import 'package:video_player/video_player.dart';
 
@@ -87,6 +89,7 @@ class PlayerOverlayActions {
   const PlayerOverlayActions({
     required this.onBack,
     required this.onTogglePlay,
+    this.onDoubleTapLike,
     required this.onClear,
     required this.onExitClear,
     required this.onDetail,
@@ -111,6 +114,9 @@ class PlayerOverlayActions {
   /// 切换播放状态。
   final VoidCallback onTogglePlay;
 
+  /// 双击画面点赞；位置用于飘心。
+  final ValueChanged<Offset>? onDoubleTapLike;
+
   /// 进入清屏。
   final VoidCallback onClear;
 

lib/pages/player/widgets/player_render_stack.dart

@@ -0,0 +1,214 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:video_player/video_player.dart';
+
+import '../../../core/theme/app_colors.dart';
+import 'player_opening_frame.dart';
+import 'player_video_surface.dart';
+
+enum PlayerRenderSlotRole { previous, current, next }
+
+class PlayerRenderSlotData {
+  const PlayerRenderSlotData({
+    required this.role,
+    this.index,
+    this.pagePosition,
+    this.controller,
+    this.videoUrl = '',
+    this.theater = false,
+    this.placeholder,
+    this.warmFrameAvailable = false,
+    this.thumbnailReady = false,
+    this.posterReady = false,
+    this.fallback = PlayerOpeningFallback.black,
+    this.warmSlotReused = false,
+    this.waitForPlaybackFrame = false,
+  });
+
+  final PlayerRenderSlotRole role;
+  final int? index;
+  final double? pagePosition;
+  final VideoPlayerController? controller;
+  final String videoUrl;
+  final bool theater;
+  final Widget? placeholder;
+  final bool warmFrameAvailable;
+  final bool thumbnailReady;
+  final bool posterReady;
+  final PlayerOpeningFallback fallback;
+  final bool warmSlotReused;
+  final bool waitForPlaybackFrame;
+
+  factory PlayerRenderSlotData.empty(PlayerRenderSlotRole role) {
+    return PlayerRenderSlotData(role: role);
+  }
+}
+
+/// 播放画面不随 PageView 生命周期销毁，三个固定槽位只更新控制器和位置。
+class PlayerRenderStack extends StatefulWidget {
+  const PlayerRenderStack({
+    super.key,
+    required this.pageController,
+    required this.slots,
+    this.onCurrentVideoVisible,
+  });
+
+  final PageController pageController;
+  final Map<PlayerRenderSlotRole, PlayerRenderSlotData> slots;
+  final ValueChanged<int?>? onCurrentVideoVisible;
+
+  @override
+  State<PlayerRenderStack> createState() => _PlayerRenderStackState();
+}
+
+class _PlayerRenderStackState extends State<PlayerRenderStack> {
+  int? _lastCurrentIndex;
+
+  @override
+  void initState() {
+    super.initState();
+    _lastCurrentIndex = _currentSlot.index;
+    _log(
+      'init current=${_lastCurrentIndex ?? '-'} '
+      'pageController=${identityHashCode(widget.pageController)}',
+    );
+  }
+
+  @override
+  void didUpdateWidget(covariant PlayerRenderStack oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    final currentIndex = _currentSlot.index;
+    if (_lastCurrentIndex != currentIndex) {
+      _log(
+        'session-index previous=${_lastCurrentIndex ?? '-'} '
+        'current=${currentIndex ?? '-'}',
+      );
+      _lastCurrentIndex = currentIndex;
+    }
+  }
+
+  @override
+  void dispose() {
+    _log(
+      'dispose current=${_lastCurrentIndex ?? '-'} '
+      'pageController=${identityHashCode(widget.pageController)}',
+    );
+    super.dispose();
+  }
+
+  PlayerRenderSlotData get _currentSlot =>
+      widget.slots[PlayerRenderSlotRole.current] ??
+      PlayerRenderSlotData.empty(PlayerRenderSlotRole.current);
+
+  @override
+  Widget build(BuildContext context) {
+    return IgnorePointer(
+      child: AnimatedBuilder(
+        animation: widget.pageController,
+        builder: (context, _) {
+          return LayoutBuilder(
+            builder: (context, constraints) {
+              final viewportHeight = constraints.maxHeight.isFinite
+                  ? constraints.maxHeight
+                  : MediaQuery.sizeOf(context).height;
+              final pageOffset = _pageOffset();
+              final currentPage = _currentSlot.pagePosition ?? pageOffset;
+              final slots = [
+                _slotData(PlayerRenderSlotRole.previous),
+                _slotData(PlayerRenderSlotRole.current),
+                _slotData(PlayerRenderSlotRole.next),
+              ];
+              return Stack(
+                key: const Key('player-render-stack'),
+                fit: StackFit.expand,
+                clipBehavior: Clip.hardEdge,
+                children: [
+                  const ColoredBox(
+                    key: Key('player-fallback-background'),
+                    color: AppColors.mediaBlack,
+                  ),
+                  for (final slot in slots)
+                    _positionedSurface(
+                      slot,
+                      pageOffset: pageOffset,
+                      viewportHeight: viewportHeight,
+                      fallbackPage: _fallbackPage(slot.role, currentPage),
+                    ),
+                ],
+              );
+            },
+          );
+        },
+      ),
+    );
+  }
+
+  PlayerRenderSlotData _slotData(PlayerRenderSlotRole role) {
+    return widget.slots[role] ?? PlayerRenderSlotData.empty(role);
+  }
+
+  double _pageOffset() {
+    if (!widget.pageController.hasClients) {
+      return widget.pageController.initialPage.toDouble();
+    }
+    final position = widget.pageController.position;
+    if (!position.hasPixels ||
+        !position.hasViewportDimension ||
+        position.viewportDimension <= 0) {
+      return widget.pageController.initialPage.toDouble();
+    }
+    return position.pixels / position.viewportDimension;
+  }
+
+  double _fallbackPage(PlayerRenderSlotRole role, double currentPage) {
+    return switch (role) {
+      PlayerRenderSlotRole.previous => currentPage - 1,
+      PlayerRenderSlotRole.current => currentPage,
+      PlayerRenderSlotRole.next => currentPage + 1,
+    };
+  }
+
+  Widget _positionedSurface(
+    PlayerRenderSlotData slot, {
+    required double pageOffset,
+    required double viewportHeight,
+    required double fallbackPage,
+  }) {
+    final slotPage = slot.pagePosition ?? fallbackPage;
+    final offset = (slotPage - pageOffset) * viewportHeight;
+    return Positioned.fill(
+      child: Transform.translate(
+        key: Key('player-render-transform-${slot.role.name}'),
+        offset: Offset(0, offset),
+        child: PlayerVideoSurface(
+          key: ValueKey('player-render-slot-${slot.role.name}'),
+          debugSlot: slot.role.name,
+          debugIndex: slot.index,
+          showFallbackBackground: false,
+          controller: slot.controller,
+          videoUrl: slot.videoUrl,
+          theater: slot.theater,
+          placeholder: slot.placeholder,
+          warmFrameAvailable: slot.warmFrameAvailable,
+          thumbnailReady: slot.thumbnailReady,
+          posterReady: slot.posterReady,
+          fallback: slot.fallback,
+          warmSlotReused: slot.warmSlotReused,
+          waitForPlaybackFrame: slot.waitForPlaybackFrame,
+          onVideoVisible: slot.role == PlayerRenderSlotRole.current
+              ? () => widget.onCurrentVideoVisible?.call(slot.index)
+              : null,
+        ),
+      ),
+    );
+  }
+
+  void _log(String message) {
+    if (!kDebugMode) return;
+    debugPrint(
+      '[player-render] ts=${DateTime.now().millisecondsSinceEpoch} $message',
+    );
+  }
+}

lib/pages/player/widgets/player_tap_gesture_region.dart

@@ -0,0 +1,196 @@
+// Author: fruit.com.cn
+
+import 'dart:async';
+
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+
+import 'player_double_tap_hearts.dart';
+import 'player_heart_overlay_scope.dart';
+
+typedef PlayerLongPressStartCallback =
+    void Function(LongPressStartDetails details, double width);
+
+/// 播放画面共用的单击/双击仲裁层。
+class PlayerTapGestureRegion extends StatefulWidget {
+  const PlayerTapGestureRegion({
+    super.key,
+    required this.gestureKey,
+    required this.onSingleTap,
+    required this.onLongPressStart,
+    required this.onInteractionEnd,
+    this.onDoubleTapLike,
+    this.doubleTapEnabled = true,
+    this.enabled = true,
+    this.now,
+  });
+
+  final Key gestureKey;
+  final VoidCallback onSingleTap;
+  final ValueChanged<Offset>? onDoubleTapLike;
+  final PlayerLongPressStartCallback onLongPressStart;
+  final VoidCallback onInteractionEnd;
+  final bool doubleTapEnabled;
+  final bool enabled;
+  final DateTime Function()? now;
+
+  @override
+  State<PlayerTapGestureRegion> createState() => _PlayerTapGestureRegionState();
+}
+
+class _PlayerTapGestureRegionState extends State<PlayerTapGestureRegion> {
+  static const Duration _singleTapDelay = Duration(milliseconds: 320);
+
+  Timer? _singleTapTimer;
+  DateTime? _lastDownAt;
+  DateTime? _blockSingleTapUntil;
+  bool _doubleTapDown = false;
+  bool _likedThisPair = false;
+  int _downSerial = 0;
+  int _tapSeq = 0;
+  int _nextHeartBurstId = 0;
+
+  @override
+  void dispose() {
+    _tapSeq++;
+    _singleTapTimer?.cancel();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return IgnorePointer(
+      ignoring: !widget.enabled,
+      child: LayoutBuilder(
+        builder: (context, constraints) => Listener(
+          onPointerUp: (_) => widget.onInteractionEnd(),
+          onPointerCancel: (_) => widget.onInteractionEnd(),
+          onPointerDown: _handlePointerDown,
+          child: Stack(
+            fit: StackFit.expand,
+            clipBehavior: Clip.none,
+            children: [
+              GestureDetector(
+                key: widget.gestureKey,
+                behavior: HitTestBehavior.opaque,
+                onTapUp: _handleTapUp,
+                onLongPressStart: (details) =>
+                    _handleLongPressStart(details, constraints.maxWidth),
+                onLongPressEnd: (_) => widget.onInteractionEnd(),
+                onLongPressCancel: widget.onInteractionEnd,
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  DateTime _now() => widget.now?.call() ?? DateTime.now();
+
+  void _handlePointerDown(PointerDownEvent event) {
+    final now = _now();
+    final previous = _lastDownAt;
+    _downSerial++;
+    _lastDownAt = now;
+    final repeated =
+        previous != null && now.difference(previous) <= _singleTapDelay;
+    if (!repeated) {
+      if (_singleTapBlocked(now)) return;
+      _doubleTapDown = false;
+      _likedThisPair = false;
+      return;
+    }
+    _doubleTapDown = true;
+    _blockSingleTapUntil = now.add(_singleTapDelay);
+    _cancelPendingSingleTap();
+  }
+
+  bool _singleTapBlocked(DateTime now) {
+    final blockedUntil = _blockSingleTapUntil;
+    return blockedUntil != null && now.isBefore(blockedUntil);
+  }
+
+  void _cancelPendingSingleTap() {
+    _tapSeq++;
+    _singleTapTimer?.cancel();
+    _singleTapTimer = null;
+  }
+
+  void _handleTapUp(TapUpDetails details) {
+    final now = _now();
+    if (_doubleTapDown || _singleTapBlocked(now)) {
+      _handleDoubleTapLike(details.globalPosition);
+      return;
+    }
+    final serial = _downSerial;
+    final tapSeq = ++_tapSeq;
+    _singleTapTimer?.cancel();
+    late final Timer pending;
+    pending = Timer(_singleTapDelay, () {
+      if (!identical(_singleTapTimer, pending)) return;
+      _singleTapTimer = null;
+      if (!mounted || tapSeq != _tapSeq || serial != _downSerial) return;
+      if (_doubleTapDown || _singleTapBlocked(_now())) return;
+      _lastDownAt = null;
+      widget.onSingleTap();
+    });
+    _singleTapTimer = pending;
+  }
+
+  void _handleDoubleTapLike(Offset globalPosition) {
+    _blockSingleTapUntil = _now().add(_singleTapDelay);
+    _cancelPendingSingleTap();
+    if (!widget.doubleTapEnabled || _likedThisPair) return;
+    _likedThisPair = true;
+    _showHeartBurst(globalPosition);
+    widget.onDoubleTapLike?.call(globalPosition);
+  }
+
+  void _showHeartBurst(Offset globalPosition) {
+    final overlay = Overlay.maybeOf(context, rootOverlay: true);
+    if (overlay == null) return;
+    final overlayBox = overlay.context.findRenderObject();
+    final origin = overlayBox is RenderBox
+        ? overlayBox.globalToLocal(globalPosition)
+        : globalPosition;
+    final id = _nextHeartBurstId++;
+    final controller = PlayerHeartOverlayScope.maybeOf(context);
+    var removed = false;
+    late final OverlayEntry entry;
+    void removeEntry() {
+      if (removed) return;
+      removed = true;
+      controller?.untrack(id);
+      if (entry.mounted) entry.remove();
+      entry.dispose();
+      if (kDebugMode) {
+        debugPrint('[player] phase=heart-burst-entry-removed id=$id');
+      }
+    }
+
+    entry = OverlayEntry(
+      builder: (context) => Positioned.fill(
+        child: IgnorePointer(
+          child: PlayerDoubleTapHeartBurst(
+            key: ValueKey('heart-overlay-$id'),
+            burstId: id,
+            origin: origin,
+            now: widget.now,
+            onCompleted: removeEntry,
+          ),
+        ),
+      ),
+    );
+    controller?.track(id, entry);
+    overlay.insert(entry);
+  }
+
+  void _handleLongPressStart(LongPressStartDetails details, double width) {
+    _tapSeq++;
+    _cancelPendingSingleTap();
+    _doubleTapDown = false;
+    _lastDownAt = null;
+    widget.onLongPressStart(details, width);
+  }
+}

lib/pages/player/widgets/player_unlock_sheet.dart

@@ -49,7 +49,8 @@ class PlayerBlockedNotice extends StatelessWidget {
 
   bool get _needsUnlock =>
       accessType == PlayTicket.coinRequired ||
-      accessType == PlayTicket.vipRequired;
+      accessType == PlayTicket.vipRequired ||
+      (accessType == null && episode.locked);
 
   @override
   Widget build(BuildContext context) {

lib/pages/player/widgets/player_video_surface.dart

@@ -5,89 +5,180 @@ import 'package:flutter/material.dart';
 import 'package:video_player/video_player.dart';
 
 import '../../../core/theme/app_colors.dart';
+import 'player_opening_frame.dart';
 
-const Duration _videoFadeDuration = Duration(milliseconds: 200);
+const Duration _crossFadeDuration = Duration(milliseconds: 180);
 const double _errorHorizontal = 32;
 const int _errorMaxLines = 3;
 
-/// 黑色底层与视频层共用同一控制器。清晰度切换时用仍在播放的旧画面盖住新纹理的黑帧。
+/// 播放区只维护一个占位和一个视频层，首帧确认后执行一次交叉淡化。
 class PlayerVideoSurface extends StatefulWidget {
   const PlayerVideoSurface({
     super.key,
     required this.controller,
     required this.videoUrl,
     required this.theater,
-    this.handoff,
-    this.openingFrame,
+    this.placeholder,
+    this.warmFrameAvailable = false,
+    this.thumbnailReady = false,
+    this.posterReady = false,
+    this.fallback = PlayerOpeningFallback.black,
+    this.warmSlotReused = false,
+    this.waitForPlaybackFrame = false,
+    this.debugSlot = 'default',
+    this.debugIndex,
+    this.showFallbackBackground = true,
+    this.onVideoVisible,
   });
 
   final VideoPlayerController? controller;
-  final VideoPlayerController? handoff;
 
-  /// 解码出第一帧之前垫上的视频首帧，没有则为空。
-  final Widget? openingFrame;
+  /// 视频首帧未确认时唯一的占位 widget。
+  final Widget? placeholder;
+
+  /// 相邻集预热槽已可用时直接出视频，不挂载占位。
+  final bool warmFrameAvailable;
+
+  /// 当前集 t=0 雪碧图是否已命中缓存，仅用于调试判定链。
+  final bool thumbnailReady;
+
+  /// 当前集高清 poster 是否已下发，仅用于调试判定链。
+  final bool posterReady;
+
+  /// 首个视频帧确认前实际选择的唯一占位来源。
+  final PlayerOpeningFallback fallback;
+
+  /// 当前集是否为相邻集预热槽晋升而来。
+  final bool warmSlotReused;
+
+  /// 自动播放中的新集等待 position 首次前进后再移交画面。
+  final bool waitForPlaybackFrame;
+  final String debugSlot;
+  final int? debugIndex;
+  final bool showFallbackBackground;
   final String videoUrl;
   final bool theater;
+  final VoidCallback? onVideoVisible;
 
   @override
   State<PlayerVideoSurface> createState() => _PlayerVideoSurfaceState();
 }
 
-class _PlayerVideoSurfaceState extends State<PlayerVideoSurface> {
-  String? _lastDebugState;
+class _PlayerVideoSurfaceState extends State<PlayerVideoSurface>
+    with SingleTickerProviderStateMixin {
+  late final AnimationController _crossFade;
+  VideoPlayerController? _attachedController;
+  Widget? _placeholderSnapshot;
+  Size? _videoSize;
+  bool _playbackStarted = false;
+  bool _frameConfirmed = false;
+  bool _confirmationScheduled = false;
+  bool _transitioning = false;
+  bool _videoVisible = false;
+  bool _videoVisibleNotified = false;
+  String? _lastLayerState;
+
+  @override
+  void initState() {
+    super.initState();
+    _crossFade = AnimationController(vsync: this, duration: _crossFadeDuration)
+      ..addStatusListener(_handleFadeStatus);
+    _placeholderSnapshot = widget.placeholder;
+    _attachController(widget.controller);
+    final value = widget.controller?.value;
+    _updatePlaybackFlags(value);
+    _videoSize = value != null && value.isInitialized ? value.size : null;
+    _logSlot('init', value);
+    if (_firstFrameConfirmed(value)) {
+      _confirmFirstFrame(initial: true);
+    } else {
+      _logLayer('placeholder', value);
+    }
+  }
 
   @override
   void didUpdateWidget(covariant PlayerVideoSurface oldWidget) {
     super.didUpdateWidget(oldWidget);
-    if (oldWidget.controller != widget.controller) _lastDebugState = null;
+    if (oldWidget.controller != widget.controller) {
+      _logSlot('controller-change-before', oldWidget.controller?.value);
+      _detachController(oldWidget.controller);
+      _resetForControllerChange();
+      _attachController(widget.controller);
+      final value = widget.controller?.value;
+      _updatePlaybackFlags(value);
+      _videoSize = value != null && value.isInitialized ? value.size : null;
+      _logSlot('controller-change-after', value);
+      if (_firstFrameConfirmed(value)) {
+        _confirmFirstFrame(initial: true);
+      } else {
+        _logLayer('placeholder', value);
+      }
+      return;
+    }
+    if (!_transitioning &&
+        !_videoVisible &&
+        oldWidget.placeholder != widget.placeholder) {
+      _placeholderSnapshot = widget.placeholder;
+    }
+    if (oldWidget.thumbnailReady != widget.thumbnailReady ||
+        oldWidget.posterReady != widget.posterReady ||
+        oldWidget.fallback != widget.fallback ||
+        oldWidget.warmSlotReused != widget.warmSlotReused ||
+        oldWidget.warmFrameAvailable != widget.warmFrameAvailable) {
+      final value = widget.controller?.value;
+      _updatePlaybackFlags(value);
+      if (!_frameConfirmed && _firstFrameConfirmed(value)) {
+        _confirmFirstFrame();
+      } else {
+        _logLayer('placeholder', value);
+      }
+    }
+  }
+
+  @override
+  void dispose() {
+    _logSlot('dispose', widget.controller?.value);
+    _detachController(widget.controller);
+    _crossFade
+      ..removeStatusListener(_handleFadeStatus)
+      ..dispose();
+    super.dispose();
   }
 
   @override
   Widget build(BuildContext context) {
     final controller = widget.controller;
-    if (controller == null) return _frame(null);
-    return ValueListenableBuilder<VideoPlayerValue>(
-      valueListenable: controller,
-      builder: (context, value, _) => _frame(value),
-    );
-  }
-
-  Widget _frame(VideoPlayerValue? value) {
-    final controller = widget.controller;
-    final handoff = _liveHandoff(controller);
-    final reveal = _shouldReveal(value, handoff != null);
-    _logStateChange(value);
+    final value = controller?.value;
+    final videoSize = _videoSize;
+    final showVideo = controller != null && videoSize != null;
+    final showPlaceholder = !_videoVisible && _placeholderSnapshot != null;
+    final video = showVideo
+        ? _VideoLayer(
+            controller: controller,
+            size: videoSize,
+            theater: widget.theater,
+          )
+        : null;
     return Stack(
       fit: StackFit.expand,
       children: [
-        const ColoredBox(
-          key: Key('player-fallback-background'),
-          color: AppColors.mediaBlack,
-        ),
-        if (!reveal && widget.openingFrame != null)
-          KeyedSubtree(
-            key: const Key('player-opening-frame'),
-            child: widget.openingFrame!,
+        if (widget.showFallbackBackground)
+          const ColoredBox(
+            key: Key('player-fallback-background'),
+            color: AppColors.mediaBlack,
           ),
-        AnimatedOpacity(
-          key: const Key('player-video-opacity'),
-          opacity: reveal ? 1 : 0,
-          duration: handoff != null ? Duration.zero : _videoFadeDuration,
-          curve: Curves.easeOut,
-          child: reveal && controller != null
-              ? _VideoLayer(
-                  controller: controller,
-                  value: value!,
-                  theater: widget.theater,
-                )
-              : const SizedBox.expand(),
-        ),
-        if (handoff != null)
-          _VideoLayer(
-            key: const Key('player-video-handoff'),
-            controller: handoff,
-            value: handoff.value,
-            theater: widget.theater,
+        if (showPlaceholder)
+          KeyedSubtree(
+            key: const Key('player-single-placeholder'),
+            child: _placeholderSnapshot!,
+          ),
+        if (_videoVisible && video != null)
+          KeyedSubtree(key: const Key('player-video-layer'), child: video)
+        else if (_transitioning && video != null)
+          FadeTransition(
+            key: const Key('player-video-crossfade'),
+            opacity: _crossFade,
+            child: video,
           ),
         if (kDebugMode && value?.hasError == true)
           Center(
@@ -107,77 +198,242 @@ class _PlayerVideoSurfaceState extends State<PlayerVideoSurface> {
     );
   }
 
-  bool _shouldReveal(VideoPlayerValue? value, bool covered) {
-    if (covered) return value?.isInitialized ?? false;
-    if (value == null || value.hasError || !value.isInitialized) return false;
-    return value.size.width > 0 && value.size.height > 0;
+  void _attachController(VideoPlayerController? controller) {
+    _attachedController = controller;
+    controller?.addListener(_handleControllerChanged);
   }
 
-  /// 只画会话仍持有的旧画面，控制器一旦被换掉就不再引用。
-  VideoPlayerController? _liveHandoff(VideoPlayerController? controller) {
-    final handoff = widget.handoff;
-    if (handoff == null || identical(handoff, controller)) return null;
-    return handoff;
+  void _detachController(VideoPlayerController? controller) {
+    controller?.removeListener(_handleControllerChanged);
+    if (_attachedController == controller) _attachedController = null;
   }
 
-  void _logStateChange(VideoPlayerValue? value) {
+  void _handleControllerChanged() {
+    final value = widget.controller?.value;
+    final nextSize = value != null && value.isInitialized ? value.size : null;
+    final sizeChanged = nextSize != _videoSize;
+    _updatePlaybackFlags(value);
+    _videoSize = nextSize;
+    if (!_frameConfirmed && _firstFrameConfirmed(value)) {
+      _scheduleFirstFrameConfirmation();
+    } else if (sizeChanged && mounted) {
+      setState(() {});
+    }
+  }
+
+  void _updatePlaybackFlags(VideoPlayerValue? value) {
+    _playbackStarted = _playbackStarted || value?.isPlaying == true;
+  }
+
+  void _scheduleFirstFrameConfirmation() {
+    if (_confirmationScheduled || _frameConfirmed) return;
+    _confirmationScheduled = true;
+    if (kDebugMode) {
+      debugPrint(
+        '[player-layer] ts=${DateTime.now().millisecondsSinceEpoch} '
+        'slot=${widget.debugSlot} index=${widget.debugIndex ?? '-'} '
+        'phase=first-frame-scheduled',
+      );
+    }
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (kDebugMode) {
+        debugPrint(
+          '[player-layer] ts=${DateTime.now().millisecondsSinceEpoch} '
+          'slot=${widget.debugSlot} index=${widget.debugIndex ?? '-'} '
+          'phase=first-frame-callback mounted=$mounted',
+        );
+      }
+      _confirmationScheduled = false;
+      if (!mounted || _frameConfirmed) return;
+      if (_firstFrameConfirmed(widget.controller?.value)) {
+        _confirmFirstFrame();
+      }
+    });
+    WidgetsBinding.instance.scheduleFrame();
+  }
+
+  bool _firstFrameConfirmed(VideoPlayerValue? value) {
+    if (value == null ||
+        !value.isInitialized ||
+        value.hasError ||
+        value.size.width <= 0 ||
+        value.size.height <= 0) {
+      return false;
+    }
+    if (widget.warmFrameAvailable || !widget.waitForPlaybackFrame) return true;
+    if (value.position > Duration.zero || value.isCompleted) return true;
+    return _playbackStarted && !value.isPlaying && !value.isBuffering;
+  }
+
+  void _confirmFirstFrame({bool initial = false}) {
+    if (_frameConfirmed || _videoSize == null) return;
+    _frameConfirmed = true;
+    _logSlot('firstFrameRendered', widget.controller?.value);
+    final canSkipPlaceholder =
+        widget.warmFrameAvailable || _placeholderSnapshot == null;
+    if (canSkipPlaceholder) {
+      if (initial) {
+        _videoVisible = true;
+        _placeholderSnapshot = null;
+      } else {
+        setState(() {
+          _videoVisible = true;
+          _placeholderSnapshot = null;
+        });
+      }
+      _logLayer('video', widget.controller?.value);
+      _notifyVideoVisible();
+      return;
+    }
+    if (initial) {
+      _transitioning = true;
+      _logLayer('fade-start', widget.controller?.value);
+      _crossFade.forward(from: 0);
+    } else {
+      setState(() {
+        _transitioning = true;
+        _placeholderSnapshot = widget.placeholder;
+      });
+      _logLayer('fade-start', widget.controller?.value);
+      _crossFade.forward(from: 0);
+    }
+  }
+
+  void _handleFadeStatus(AnimationStatus status) {
+    if (status != AnimationStatus.completed || !mounted) return;
+    setState(() {
+      _transitioning = false;
+      _videoVisible = true;
+      _placeholderSnapshot = null;
+    });
+    _logLayer('fade-end', widget.controller?.value);
+    _notifyVideoVisible();
+  }
+
+  void _resetForControllerChange() {
+    _crossFade.reset();
+    _placeholderSnapshot = widget.placeholder;
+    _videoSize = null;
+    _playbackStarted = false;
+    _frameConfirmed = false;
+    _confirmationScheduled = false;
+    _transitioning = false;
+    _videoVisible = false;
+    _videoVisibleNotified = false;
+    _lastLayerState = null;
+  }
+
+  void _notifyVideoVisible() {
+    if (_videoVisibleNotified) return;
+    _videoVisibleNotified = true;
+    final callback = widget.onVideoVisible;
+    if (callback == null) return;
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (mounted) callback();
+    });
+  }
+
+  void _logLayer(String phase, VideoPlayerValue? value) {
     if (!kDebugMode) return;
-    final status = _debugStatus(value);
+    final fallback = phase == 'video' || phase == 'fade-end'
+        ? 'video'
+        : _fallbackLabel(widget.fallback);
     final signature =
-        '$status|${value?.isInitialized ?? false}|'
-        '${value?.errorDescription ?? 'none'}';
-    if (signature == _lastDebugState) return;
-    _lastDebugState = signature;
-    final source = widget.controller?.dataSource ?? widget.videoUrl;
+        'slot=${widget.debugSlot} '
+        'index=${widget.debugIndex ?? '-'} '
+        'phase=$phase warm=${widget.warmFrameAvailable ? 1 : 0} '
+        'reusedWarm=${widget.warmSlotReused ? 1 : 0} '
+        'frame=${_frameConfirmed ? 1 : 0} '
+        'poster=${widget.posterReady ? 'ready' : 'none'} '
+        'thumbnails=${widget.thumbnailReady ? 'ready' : 'pending'} '
+        'fallback=$fallback '
+        'init=${value?.isInitialized == true ? 1 : 0} '
+        'position=${value?.position.inMilliseconds ?? 0} '
+        'playing=${value?.isPlaying == true ? 1 : 0} '
+        'buffering=${value?.isBuffering == true ? 1 : 0} '
+        'placeholder=${_placeholderLabel()}';
+    if (signature == _lastLayerState) return;
+    _lastLayerState = signature;
     debugPrint(
-      '[video] init=${value?.isInitialized ?? false} '
-      'err=${value?.errorDescription ?? 'none'} host=${_host(source)}',
+      '[player-layer] ts=${DateTime.now().millisecondsSinceEpoch} $signature',
     );
   }
 
-  String _debugStatus(VideoPlayerValue? value) {
-    if (value == null) return 'loading';
-    if (value.hasError) {
-      return 'error: ${value.errorDescription ?? 'unknown'}';
-    }
-    if (value.isBuffering) return 'buffering';
-    if (value.isInitialized) return 'initialized';
-    return 'loading';
+  void _logSlot(String phase, VideoPlayerValue? value) {
+    if (!kDebugMode) return;
+    debugPrint(
+      '[player-layer] ts=${DateTime.now().millisecondsSinceEpoch} '
+      'slot=${widget.debugSlot} index=${widget.debugIndex ?? '-'} '
+      'phase=$phase state=${identityHashCode(this)} '
+      'controller=${widget.controller == null ? '-' : identityHashCode(widget.controller)} '
+      'init=${value?.isInitialized == true ? 1 : 0}',
+    );
   }
 
-  String _host(String source) {
-    final uri = Uri.tryParse(source);
-    if (uri == null || uri.host.isEmpty) return 'unknown';
-    final port = uri.hasPort
-        ? uri.port
-        : uri.scheme == 'https'
-        ? 443
-        : 80;
-    return '${uri.host}:$port';
+  String _placeholderLabel() {
+    if (_placeholderSnapshot == null) return 'none';
+    return switch (widget.fallback) {
+      PlayerOpeningFallback.handoff => 'handoff',
+      PlayerOpeningFallback.poster => 'poster',
+      PlayerOpeningFallback.thumbnails => 'thumbnails',
+      PlayerOpeningFallback.black => 'none',
+    };
+  }
+
+  String _fallbackLabel(PlayerOpeningFallback fallback) {
+    if (_placeholderSnapshot == null) return 'black';
+    return switch (fallback) {
+      PlayerOpeningFallback.handoff => 'handoff',
+      PlayerOpeningFallback.poster => 'poster',
+      PlayerOpeningFallback.thumbnails => 'thumbnails-first-frame',
+      PlayerOpeningFallback.black => 'black',
+    };
   }
 }
 
-class _VideoLayer extends StatelessWidget {
-  const _VideoLayer({
+/// 将旧 controller 作为唯一占位，不额外叠加 handoff 层。
+class ControllerFramePlaceholder extends StatelessWidget {
+  const ControllerFramePlaceholder({
     super.key,
     required this.controller,
-    required this.value,
     required this.theater,
   });
 
   final VideoPlayerController controller;
-  final VideoPlayerValue value;
   final bool theater;
 
   @override
   Widget build(BuildContext context) {
+    final size = controller.value.size;
     return FittedBox(
       fit: theater ? BoxFit.contain : BoxFit.cover,
       child: SizedBox(
-        width: value.size.width,
-        height: value.size.height,
+        width: size.width,
+        height: size.height,
         child: VideoPlayer(controller, key: ValueKey(controller)),
       ),
     );
   }
 }
+
+class _VideoLayer extends StatelessWidget {
+  const _VideoLayer({
+    required this.controller,
+    required this.size,
+    required this.theater,
+  });
+
+  final VideoPlayerController controller;
+  final Size size;
+  final bool theater;
+
+  @override
+  Widget build(BuildContext context) => FittedBox(
+    fit: theater ? BoxFit.contain : BoxFit.cover,
+    child: SizedBox(
+      width: size.width,
+      height: size.height,
+      child: VideoPlayer(controller, key: ValueKey(controller)),
+    ),
+  );
+}

lib/pages/player/widgets/scrub_preview_card.dart

@@ -9,7 +9,6 @@ import 'package:flutter/material.dart';
 import '../../../core/data/services/playback_thumbnail_service.dart';
 import '../../../core/data/services/sprite_thumbnail_axis.dart';
 import '../../../core/theme/app_colors.dart';
-import '../../../core/widgets/remote_image.dart';
 
 const double scrubPreviewWidth = 96;
 const double scrubPreviewSafeMargin = 12;
@@ -36,7 +35,6 @@ class ScrubPreviewCard extends StatefulWidget {
     super.key,
     required this.service,
     required this.episodeId,
-    required this.posterUrl,
     required this.position,
     required this.duration,
     this.spriteAxisService,
@@ -47,7 +45,6 @@ class ScrubPreviewCard extends StatefulWidget {
   final SpriteThumbnailAxisSource? spriteAxisService;
   final String? thumbnailsUrl;
   final String episodeId;
-  final String posterUrl;
   final Duration position;
   final Duration duration;
 
@@ -207,11 +204,9 @@ class _ScrubPreviewCardState extends State<ScrubPreviewCard> {
               child: Stack(
                 fit: StackFit.expand,
                 children: [
-                  RemoteImage(
-                    widget.posterUrl,
-                    key: const Key('scrub-preview-poster'),
-                    fit: BoxFit.cover,
-                    fallbackColor: AppColors.bar,
+                  const ColoredBox(
+                    key: Key('scrub-preview-background'),
+                    color: AppColors.bar,
                   ),
                   if (stage == ScrubPreviewStage.sprite && spriteFrame != null)
                     SpriteCropPreview(
@@ -256,26 +251,33 @@ class SpriteCropPreview extends StatelessWidget {
     super.key,
     required this.image,
     required this.sourceRect,
+    this.fit = BoxFit.cover,
   });
 
   final ui.Image image;
   final ui.Rect sourceRect;
+  final BoxFit fit;
 
   @override
   Widget build(BuildContext context) => CustomPaint(
-    painter: _SpriteCropPainter(image: image, sourceRect: sourceRect),
+    painter: _SpriteCropPainter(image: image, sourceRect: sourceRect, fit: fit),
   );
 }
 
 class _SpriteCropPainter extends CustomPainter {
-  const _SpriteCropPainter({required this.image, required this.sourceRect});
+  const _SpriteCropPainter({
+    required this.image,
+    required this.sourceRect,
+    required this.fit,
+  });
 
   final ui.Image image;
   final ui.Rect sourceRect;
+  final BoxFit fit;
 
   @override
   void paint(Canvas canvas, Size size) {
-    final fitted = applyBoxFit(BoxFit.cover, sourceRect.size, size);
+    final fitted = applyBoxFit(fit, sourceRect.size, size);
     final sourceOffset = Alignment.center.inscribe(
       fitted.source,
       Offset.zero & sourceRect.size,
@@ -302,7 +304,9 @@ class _SpriteCropPainter extends CustomPainter {
 
   @override
   bool shouldRepaint(covariant _SpriteCropPainter oldDelegate) =>
-      oldDelegate.image != image || oldDelegate.sourceRect != sourceRect;
+      oldDelegate.image != image ||
+      oldDelegate.sourceRect != sourceRect ||
+      oldDelegate.fit != fit;
 }
 
 String _format(Duration value) {

lib/pages/player/widgets/seek_progress_bar.dart

@@ -41,8 +41,9 @@ class SeekProgressBar extends StatefulWidget {
     this.thumbnailService,
     this.spriteAxisService,
     this.episodeId,
-    this.posterUrl = '',
     this.thumbnailsUrl,
+    this.fallbackDuration = Duration.zero,
+    this.suppressBufferLoading = false,
   });
 
   final ValueListenable<VideoPlayerValue>? valueListenable;
@@ -57,8 +58,9 @@ class SeekProgressBar extends StatefulWidget {
   final PlaybackThumbnailService? thumbnailService;
   final SpriteThumbnailAxisService? spriteAxisService;
   final String? episodeId;
-  final String posterUrl;
   final String? thumbnailsUrl;
+  final Duration fallbackDuration;
+  final bool suppressBufferLoading;
 
   @override
   State<SeekProgressBar> createState() => _SeekProgressBarState();
@@ -74,6 +76,7 @@ class _SeekProgressBarState extends State<SeekProgressBar> {
   bool _pointerMoved = false;
   Offset? _pointerStart;
   double? _dragStartFraction;
+  Duration? _lastPosition;
 
   @override
   void initState() {
@@ -90,13 +93,22 @@ class _SeekProgressBarState extends State<SeekProgressBar> {
       _bufferTimer?.cancel();
       _bufferTimer = null;
       _buffering = false;
+      _lastPosition = null;
       widget.thumbnailService?.cancelPending();
       _attachSource();
     }
+    if (oldWidget.suppressBufferLoading != widget.suppressBufferLoading) {
+      _bufferTimer?.cancel();
+      _bufferTimer = null;
+      _lastPosition = null;
+      _buffering = false;
+      _syncBufferState(notify: false);
+    }
     if (oldWidget.locked != widget.locked) {
       _bufferTimer?.cancel();
       _bufferTimer = null;
       _buffering = false;
+      _lastPosition = null;
       if (widget.locked) {
         widget.thumbnailService?.cancelPending();
         _previewFraction.value = null;
@@ -130,14 +142,24 @@ class _SeekProgressBarState extends State<SeekProgressBar> {
 
   void _syncBufferState({bool notify = true}) {
     final source = widget.valueListenable;
-    if (widget.locked || source == null) {
+    if (widget.locked || widget.suppressBufferLoading || source == null) {
       _bufferTimer?.cancel();
       _bufferTimer = null;
+      _lastPosition = null;
       _setBuffering(false, notify: notify);
       return;
     }
     final value = source.value;
     if (!value.isInitialized) {
+      _bufferTimer?.cancel();
+      _bufferTimer = null;
+      _lastPosition = null;
+      _setBuffering(false, notify: notify);
+      return;
+    }
+    final previousPosition = _lastPosition;
+    _lastPosition = value.position;
+    if (previousPosition != null && value.position > previousPosition) {
       _bufferTimer?.cancel();
       _bufferTimer = null;
       _setBuffering(false, notify: notify);
@@ -149,14 +171,24 @@ class _SeekProgressBarState extends State<SeekProgressBar> {
       _setBuffering(false, notify: notify);
       return;
     }
+    // 首次看到“已播放且有画面”的 buffering 状态时，以 position 为基线，
+    // 不抢先显示 loading；后续 position 停滞超过阈值才视为真实卡顿。
+    if (previousPosition == null &&
+        value.isPlaying &&
+        value.position > Duration.zero) {
+      _setBuffering(false, notify: notify);
+      return;
+    }
     if (_buffering || _bufferTimer != null) return;
+    final bufferingPosition = value.position;
     _bufferTimer = Timer(_bufferDebounce, () {
       _bufferTimer = null;
       final current = widget.valueListenable;
       if (!mounted ||
           current != source ||
           !current!.value.isInitialized ||
-          !current.value.isBuffering) {
+          !current.value.isBuffering ||
+          current.value.position != bufferingPosition) {
         return;
       }
       _setBuffering(true);
@@ -222,9 +254,16 @@ class _SeekProgressBarState extends State<SeekProgressBar> {
   }
 
   Widget _buildTrack(BuildContext context, VideoPlayerValue video) {
-    final total = video.duration.inMilliseconds;
+    final duration = video.duration > Duration.zero
+        ? video.duration
+        : widget.fallbackDuration;
+    final total = duration.inMilliseconds;
     final scrubbing = _dragging;
-    final loading = !widget.locked && !scrubbing && _buffering;
+    final loading =
+        !widget.locked &&
+        !widget.suppressBufferLoading &&
+        !scrubbing &&
+        _buffering;
     final enabled =
         !widget.locked &&
         video.isInitialized &&
@@ -236,10 +275,12 @@ class _SeekProgressBarState extends State<SeekProgressBar> {
     final fraction = _previewFraction.value ?? played;
     final previewPosition = _previewFraction.value == null
         ? video.position
-        : seekPositionForFraction(fraction, video.duration);
+        : seekPositionForFraction(fraction, duration);
     final showPreview =
         scrubbing &&
         widget.showTimes &&
+        video.isInitialized &&
+        total > 0 &&
         widget.thumbnailService != null &&
         (widget.episodeId?.isNotEmpty ?? false);
     final trackHeight = scrubbing ? 6.0 : 2.0;
@@ -254,7 +295,7 @@ class _SeekProgressBarState extends State<SeekProgressBar> {
               Padding(
                 padding: const EdgeInsets.only(bottom: 2),
                 child: Text(
-                  '${_format(previewPosition)} / ${_format(video.duration)}',
+                  '${_format(previewPosition)} / ${_format(duration)}',
                   textAlign: TextAlign.center,
                   style: const TextStyle(
                     color: AppColors.onPrimary,
@@ -351,9 +392,8 @@ class _SeekProgressBarState extends State<SeekProgressBar> {
                   spriteAxisService: widget.spriteAxisService,
                   thumbnailsUrl: widget.thumbnailsUrl,
                   episodeId: widget.episodeId!,
-                  posterUrl: widget.posterUrl,
                   position: previewPosition,
-                  duration: video.duration,
+                  duration: duration,
                 ),
               ),
           ],

lib/pages/ranking/ranking_page.dart

@@ -509,11 +509,13 @@ Widget _heat(int count, AppLocalizations l10n) {
         size: 11,
       ),
       const SizedBox(width: 4),
-      Text(
-        l10n.heatLabel(formatPlayCount(count)),
-        maxLines: 1,
-        overflow: TextOverflow.ellipsis,
-        style: const TextStyle(color: AppColors.textTertiary, fontSize: 11),
+      Flexible(
+        child: Text(
+          l10n.heatLabel(formatPlayCount(count)),
+          maxLines: 1,
+          overflow: TextOverflow.ellipsis,
+          style: const TextStyle(color: AppColors.textTertiary, fontSize: 11),
+        ),
       ),
     ],
   );

lib/pages/recommend/recommend_page.dart

@@ -46,11 +46,15 @@ class RecommendPage extends StatefulWidget {
   State<RecommendPage> createState() => _RecommendPageState();
 }
 
-class _RecommendPageState extends State<RecommendPage> {
+class _RecommendPageState extends State<RecommendPage>
+    with AutomaticKeepAliveClientMixin<RecommendPage> {
   RecommendInnerTab _tab = RecommendInnerTab.feed;
   final PageController _pageController = PageController();
   int _scrubCancelRequest = 0;
 
+  @override
+  bool get wantKeepAlive => true;
+
   @override
   void initState() {
     super.initState();
@@ -85,6 +89,7 @@ class _RecommendPageState extends State<RecommendPage> {
 
   @override
   Widget build(BuildContext context) {
+    super.build(context);
     final categories = context.read<CategoryController>();
     return ColoredBox(
       key: const Key('recommend-page'),

test/auth/auth_page_test.dart

@@ -112,7 +112,7 @@ void main() {
 
     final toast = find.byKey(const Key('centered-toast'));
     expect(toast, findsOneWidget);
-    expect(find.text('Invalid email or password'), findsOneWidget);
+    expect(find.text('Sign in to continue'), findsOneWidget);
     expect(find.byType(AlertDialog), findsNothing);
     expect(api.loginCalls, 1);
     expect(

test/auth/auth_visual_test.dart

@@ -14,7 +14,6 @@ import 'package:fruitshorts/core/data/services/auth_session_store.dart';
 import 'package:fruitshorts/core/platform/haptics.dart';
 import 'package:fruitshorts/core/theme/app_colors.dart';
 import 'package:fruitshorts/core/theme/app_dimens.dart';
-import 'package:fruitshorts/core/theme/app_theme.dart';
 import 'package:fruitshorts/l10n/app_localizations.dart';
 import 'package:fruitshorts/pages/auth/auth_view.dart';
 
@@ -136,7 +135,7 @@ void main() {
         cardDecoration.borderRadius,
         BorderRadius.circular(AppDimens.authCardRadius),
       );
-      expect(cardDecoration.boxShadow, contains(AppTheme.cardShadow));
+      expect(cardDecoration.boxShadow, isNull);
       expect(card.padding, const EdgeInsets.all(20));
 
       final email = tester.widget<TextField>(
@@ -222,7 +221,7 @@ void main() {
             find.descendant(of: back, matching: find.byType(Material)),
           )
           .color,
-      AppColors.card,
+      AppColors.transparent,
     );
   });
 

test/comment/drama_comments_sheet_test.dart

@@ -135,7 +135,9 @@ void main() {
     debugDefaultTargetPlatformOverride = null;
   });
 
-  testWidgets('should_gate_guest_comment_input_without_focus', (tester) async {
+  testWidgets('should_open_guest_comment_composer_without_login', (
+    tester,
+  ) async {
     SharedPreferencesAsyncPlatform.instance =
         InMemorySharedPreferencesAsync.empty();
     final repository = FakeCommentRepository(pages: [const CommentPage()]);
@@ -144,34 +146,20 @@ void main() {
     final placeholder = find.byKey(const Key('comment-input-placeholder'));
 
     expect(placeholder, findsOneWidget);
-    expect(find.text('Sign in to comment'), findsOneWidget);
     await tester.tap(placeholder);
     await tester.pumpAndSettle();
 
-    expect(find.text('Sign in to continue'), findsOneWidget);
-    await tester.tap(find.text('Not now'));
-    await tester.pumpAndSettle();
-    expect(find.byKey(const Key('comment-composer-sheet')), findsNothing);
-    expect(placeholder, findsOneWidget);
+    expect(find.byKey(const Key('comment-composer-sheet')), findsOneWidget);
+    expect(find.byKey(const Key('auth-landing')), findsNothing);
   });
 
-  testWidgets('should_focus_comment_input_after_successful_login', (
-    tester,
-  ) async {
+  testWidgets('should_focus_guest_comment_input_immediately', (tester) async {
     SharedPreferencesAsyncPlatform.instance =
         InMemorySharedPreferencesAsync.empty();
     final repository = FakeCommentRepository(pages: [const CommentPage()]);
-    final auth = await _pumpSheet(tester, repository: repository);
+    await _pumpSheet(tester, repository: repository);
 
     await tester.tap(find.byKey(const Key('comment-input-placeholder')));
-    await tester.pump();
-    await tester.pump(const Duration(milliseconds: 300));
-    await tester.tap(find.text('Sign In'));
-    await tester.pump();
-    await tester.pump(const Duration(milliseconds: 300));
-    (auth as _TestAuthController).setSignedIn(true);
-    await tester.pump();
-    Navigator.of(tester.element(find.byKey(const Key('auth-landing')))).pop();
     await tester.pumpAndSettle();
 
     expect(
@@ -218,9 +206,7 @@ void main() {
     expect(multilineField.style?.height, 1.4);
   });
 
-  testWidgets('should_gate_guest_post_without_creating_comment', (
-    tester,
-  ) async {
+  testWidgets('should_publish_guest_comment_without_login', (tester) async {
     SharedPreferencesAsyncPlatform.instance =
         InMemorySharedPreferencesAsync.empty();
     final repository = FakeCommentRepository(pages: [const CommentPage()]);
@@ -229,8 +215,18 @@ void main() {
     await tester.tap(find.byKey(const Key('comment-post')));
     await tester.pumpAndSettle();
 
-    expect(find.text('Sign in to continue'), findsOneWidget);
-    expect(repository.publishCalls, isEmpty);
+    await tester.enterText(
+      find.byKey(const Key('comment-composer-input')),
+      'Guest comment',
+    );
+    await tester.pump();
+    await tester.tap(find.byKey(const Key('comment-composer-post')));
+    await tester.pumpAndSettle();
+
+    expect(find.byKey(const Key('auth-landing')), findsNothing);
+    expect(repository.publishCalls, hasLength(1));
+    expect(repository.publishCalls.single.content, 'Guest comment');
+    expect(find.text('Guest comment'), findsOneWidget);
   });
 
   testWidgets('should_show_server_comments_and_append_next_cursor_page', (

test/config/server_endpoint_test.dart

@@ -63,7 +63,11 @@ void main() {
   });
 
   test('should_use_the_configured_local_address_for_device_default', () {
-    expect(AppConfig.devHostBaseUrl, 'http://192.168.31.243:8081');
+    final uri = Uri.parse(AppConfig.devHostBaseUrl);
+    expect(uri.scheme, 'http');
+    expect(uri.host, isNotEmpty);
+    expect(uri.port, 8081);
+    expect(uri.path, isEmpty);
   });
 
   test('should_skip_probe_when_compiled_override_is_set', () async {

test/core/app_pull_to_refresh_test.dart

@@ -43,7 +43,7 @@ void main() {
     final scrollable = tester.state<ScrollableState>(
       find.descendant(of: list, matching: find.byType(Scrollable)).first,
     );
-    expect(scrollable.position.pixels, 0);
+    expect(scrollable.position.pixels, lessThan(0));
     final indicator = find.byKey(const Key('pull-refresh-indicator'));
     expect(indicator, findsOneWidget);
     expect(

test/discover/filter_page_test.dart

@@ -8,6 +8,7 @@ import 'package:fruitshorts/core/data/models/drama.dart';
 import 'package:fruitshorts/core/data/repositories/favorite_repository.dart';
 import 'package:fruitshorts/core/data/repositories/playback_repository.dart';
 import 'package:fruitshorts/core/data/repositories/watch_history_repository.dart';
+import 'package:fruitshorts/pages/discover/discover_view.dart';
 import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
 import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
 
@@ -151,7 +152,10 @@ Future<void> _pumpFilterPage(WidgetTester tester) async {
     ),
   );
   await tester.pumpAndSettle();
-  await tester.tap(find.byKey(const Key('home-search-entry')));
+  Navigator.of(tester.element(find.byKey(const Key('home-search-entry'))))
+      .push<void>(
+        MaterialPageRoute(builder: (_) => const DiscoverPage()),
+      );
   await tester.pumpAndSettle();
   await tester.tap(find.byKey(const Key('theater-toolbar-filter')));
   await tester.pumpAndSettle();

test/discover/home_all_dramas_grid_test.dart

@@ -424,9 +424,10 @@ Future<void> _pumpTheater(
     ),
   );
   await tester.pumpAndSettle();
-  await tester.tap(find.byKey(const Key('home-search-entry')));
-  await tester.pumpAndSettle();
-  FocusManager.instance.primaryFocus?.unfocus();
+  Navigator.of(tester.element(find.byKey(const Key('home-search-entry'))))
+      .push<void>(
+        MaterialPageRoute(builder: (_) => const DiscoverPage()),
+      );
   await tester.pumpAndSettle();
 }
 

test/discover/theater_pages_test.dart

@@ -7,6 +7,7 @@ import 'package:fruitshorts/core/data/models/drama.dart';
 import 'package:fruitshorts/core/data/models/home_feed.dart';
 import 'package:fruitshorts/core/theme/app_colors.dart';
 import 'package:fruitshorts/core/widgets/app_pull_to_refresh.dart';
+import 'package:fruitshorts/pages/discover/discover_view.dart';
 import 'package:fruitshorts/core/data/repositories/favorite_repository.dart';
 import 'package:fruitshorts/core/data/repositories/playback_repository.dart';
 import 'package:fruitshorts/core/data/repositories/watch_history_repository.dart';
@@ -119,7 +120,7 @@ void main() {
     expect(top2.width, greaterThan(100));
     expect(top2.left, lessThan(top1.left));
     expect(top3.left, greaterThan(top1.right));
-    expect(top1.bottom, closeTo(top2.bottom - 12, 0.5));
+    expect(top1.bottom, closeTo(top2.bottom - 30, 0.5));
     expect(top2.bottom, closeTo(top3.bottom, 0.5));
     expect(find.byKey(const Key('ranking-row-3')), findsNothing);
   });
@@ -219,7 +220,7 @@ void main() {
     expect(position.pixels, 0);
     position.jumpTo(position.maxScrollExtent);
     await tester.pump();
-    expect(find.byKey(const Key('ranking-load-more')), findsNothing);
+    expect(find.byKey(const Key('ranking-load-more')), findsOneWidget);
     expect(find.byKey(const Key('ranking-no-more')), findsNothing);
     await tester.pumpAndSettle();
   });
@@ -311,7 +312,10 @@ Future<void> _pumpTheater(
     ),
   );
   await tester.pumpAndSettle();
-  await tester.tap(find.byKey(const Key('home-search-entry')));
+  Navigator.of(tester.element(find.byKey(const Key('home-search-entry'))))
+      .push<void>(
+        MaterialPageRoute(builder: (_) => const DiscoverPage()),
+      );
   await tester.pumpAndSettle();
 }
 

test/home/app_bottom_nav_test.dart

@@ -10,7 +10,7 @@ void main() {
   test('should_use_exact_root_navigation_colors', () {
     expect(AppColors.navBackground, const Color(0xFF000000));
     expect(AppColors.navSelected, const Color(0xFFFFFFFF));
-    expect(AppColors.navUnselected, const Color(0xFF8E8E93));
+    expect(AppColors.navUnselected, const Color(0xFFB0B0B0));
   });
 
   testWidgets('should_render_four_slots_with_white_selected_state', (

test/home/home_card_style_test.dart

@@ -82,7 +82,13 @@ void main() {
     expect(viewsText.style?.fontSize, AppDimens.cardPlayCountFont);
     expect(viewsText.style?.fontWeight, FontWeight.w400);
     expect(viewsText.style?.color, AppColors.navSelected);
-    expect(find.descendant(of: cover, matching: views), findsOneWidget);
+    expect(
+      find.descendant(
+        of: find.byKey(const Key('home-feed-cover-clip-anime-card')),
+        matching: views,
+      ),
+      findsOneWidget,
+    );
     expect(
       tester.getTopRight(cover).dx - tester.getTopRight(views).dx,
       AppDimens.cardPlayCountRight,
@@ -201,7 +207,9 @@ Future<void> _pumpCard(
         body: Center(
           child: SizedBox(
             width: 130,
-            height: 240,
+            height:
+                130 / AppDimens.cardCoverAspectRatio +
+                AppDimens.homeCardBodyExtent,
             child: HomeFeedCard(
               drama: drama,
               onTap: onTap,

test/home/home_grid_layout_test.dart

@@ -12,8 +12,8 @@ import 'package:fruitshorts/core/data/repositories/favorite_repository.dart';
 import 'package:fruitshorts/core/data/repositories/playback_repository.dart';
 import 'package:fruitshorts/core/data/repositories/watch_history_repository.dart';
 import 'package:fruitshorts/core/theme/app_dimens.dart';
-import 'package:fruitshorts/core/theme/app_theme.dart';
 import 'package:fruitshorts/pages/home/widgets/home_feed_card.dart';
+import 'package:fruitshorts/pages/home/widgets/home_feed_grid.dart';
 import 'package:fruitshorts/pages/player/player_view.dart';
 import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
 import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
@@ -103,7 +103,7 @@ void main() {
 
     await tester.tap(find.byKey(const Key('home-section-category-社群')));
     await tester.pumpAndSettle();
-    expect(find.byKey(const Key('home-grid-empty')), findsOneWidget);
+    expect(firstDramaId(), 'page1-0');
     expect(find.byKey(const Key('filter-page')), findsNothing);
   });
 
@@ -186,17 +186,30 @@ void main() {
     expect(repository.cursors, contains('page1'));
     expect(repository.requestedSizes.every((size) => size <= 20), isTrue);
 
-    await tester.scrollUntilVisible(
-      find.byKey(const Key('home-feed-card-page2-1')),
-      260,
-      scrollable: find
-          .descendant(
-            of: find.byKey(const Key('home-grid-refresh')),
-            matching: find.byType(Scrollable),
-          )
-          .first,
+    expect(find.byKey(const Key('home-grid-refresh')), findsOneWidget);
+    final gridScrollable = find
+        .descendant(
+          of: find.byKey(const Key('home-grid-scroll')),
+          matching: find.byType(Scrollable),
+        );
+    expect(gridScrollable, findsOneWidget);
+    final secondPageCard = find.byKey(
+      const Key('home-feed-card-page2-0'),
     );
-    expect(find.byKey(const Key('home-feed-card-page2-1')), findsOneWidget);
+    final feed = tester
+        .widget<HomeFeedGrid>(find.byType(HomeFeedGrid))
+        .feedController;
+    expect(
+      feed.dramas.map((drama) => drama.id),
+      contains('page2-0'),
+    );
+    final position = tester.state<ScrollableState>(gridScrollable).position;
+    await tester.pump();
+    position.jumpTo(position.maxScrollExtent);
+    await tester.pump();
+    position.jumpTo(position.maxScrollExtent);
+    await tester.pump();
+    expect(secondPageCard, findsOneWidget);
   });
 
   testWidgets('should_open_player_when_grid_card_is_tapped', (tester) async {
@@ -243,7 +256,7 @@ Future<void> _pumpApp(
 
 class _PagedCatalogRepository implements CatalogRepository {
   _PagedCatalogRepository()
-    : pageOne = List.generate(10, (index) => _drama('page1-$index')),
+    : pageOne = List.generate(30, (index) => _drama('page1-$index')),
       pageTwo = List.generate(2, (index) => _drama('page2-$index'));
 
   final List<Drama> pageOne;

test/home/home_nav_ui_test.dart

@@ -98,22 +98,12 @@ void main() {
       tester.getTopRight(walletEntry).dx,
       closeTo(390 - AppDimens.feedPageHorizontal, 0.1),
     );
-    final crown = tester.widget<Icon>(
-      find.descendant(
-        of: vipEntry,
-        matching: find.byIcon(Icons.workspace_premium_outlined),
-      ),
-    );
-    final gift = tester.widget<Icon>(
-      find.descendant(
-        of: walletEntry,
-        matching: find.byIcon(Icons.card_giftcard_rounded),
-      ),
-    );
-    expect(crown.size, AppDimens.homeActionIcon);
-    expect(crown.color, AppColors.homeCrownGold);
-    expect(gift.size, AppDimens.homeActionIcon);
-    expect(gift.color, AppColors.homeGiftPink);
+    expect(crownImage.width, AppDimens.homeActionIcon);
+    expect(crownImage.height, AppDimens.homeActionIcon);
+    expect(crownImage.fit, BoxFit.contain);
+    expect(giftImage.width, AppDimens.homeActionIcon);
+    expect(giftImage.height, AppDimens.homeActionIcon);
+    expect(giftImage.fit, BoxFit.contain);
     expect(
       tester
           .widget<Material>(

test/home/home_preview_layout_test.dart

@@ -305,7 +305,7 @@ void main() {
       find.byKey(const Key('home-feed-episode-progress')),
     );
     expect(episodeProgress.maxLines, 1);
-    expect(episodeProgress.softWrap, isFalse);
+    expect(episodeProgress.overflow, TextOverflow.ellipsis);
     expect(episodeProgress.style?.fontSize, 13);
     expect(episodeProgress.style?.color, AppColors.overlayLabel);
     expect(
@@ -646,13 +646,14 @@ void main() {
           .ignoring,
       isTrue,
     );
-    expect(find.byKey(const Key('scrub-preview-time-bubble')), findsOneWidget);
-    final bubbleRect = tester.getRect(
-      find.byKey(const Key('scrub-preview-time-bubble')),
+    expect(find.byKey(const Key('scrub-preview-card')), findsOneWidget);
+    expect(find.byKey(const Key('scrub-preview-time')), findsOneWidget);
+    final previewRect = tester.getRect(
+      find.byKey(const Key('scrub-preview-card')),
     );
-    expect(bubbleRect.left, greaterThanOrEqualTo(12));
+    expect(previewRect.left, greaterThanOrEqualTo(12));
     expect(
-      bubbleRect.right,
+      previewRect.right,
       lessThanOrEqualTo(
         tester.getRect(find.byKey(const Key('home-feed-gesture'))).right - 12,
       ),
@@ -662,33 +663,26 @@ void main() {
               .getRect(find.byKey(const Key('home-feed-progress-track')))
               .center
               .dy -
-          bubbleRect.bottom,
+          previewRect.bottom,
       closeTo(16, 0.1),
     );
-    final bubbleContainer = tester.widget<Container>(
-      find.descendant(
-        of: find.byKey(const Key('scrub-preview-time-bubble')),
-        matching: find.byType(Container),
-      ),
-    );
-    expect(
-      (bubbleContainer.decoration! as BoxDecoration).color,
-      AppColors.timeBubbleScrim,
-    );
-    expect(
-      bubbleContainer.padding,
-      const EdgeInsets.symmetric(horizontal: 6, vertical: 3),
+    final previewContainer = tester.widget<Container>(
+      find.byKey(const Key('scrub-preview-card')),
     );
+    final previewDecoration = previewContainer.decoration! as BoxDecoration;
+    expect(previewDecoration.color, AppColors.card);
+    expect(previewDecoration.borderRadius, BorderRadius.circular(8));
+    expect((previewDecoration.border! as Border).top.color, AppColors.onPrimary);
     await gesture.moveBy(const Offset(-600, 0));
     await tester.pump();
     expect(
-      tester.getRect(find.byKey(const Key('scrub-preview-time-bubble'))).left,
+      tester.getRect(find.byKey(const Key('scrub-preview-card'))).left,
       closeTo(12, 0.1),
     );
     await gesture.moveBy(const Offset(1200, 0));
     await tester.pump();
     expect(
-      tester.getRect(find.byKey(const Key('scrub-preview-time-bubble'))).right,
+      tester.getRect(find.byKey(const Key('scrub-preview-card'))).right,
       closeTo(
         tester.getRect(find.byKey(const Key('home-feed-gesture'))).right - 12,
         0.1,
@@ -855,6 +849,16 @@ void main() {
     await tester.pump();
     await gesture.up();
     await tester.pumpAndSettle();
+
+    controller.value = const VideoPlayerValue(
+      duration: Duration(seconds: 100),
+      position: Duration(seconds: 40),
+      isInitialized: true,
+      isBuffering: true,
+    );
+    await tester.pump(const Duration(milliseconds: 400));
+    expect(find.byKey(const Key('home-feed-progress-thumb')), findsOneWidget);
+    expect(find.byKey(const Key('progress-loading')), findsNothing);
   });
 
   testWidgets('should_show_refresh_spinner_until_refresh_finishes', (
@@ -970,7 +974,7 @@ void main() {
     await tester.pump();
 
     expect(find.byKey(const Key('scrub-preview-card')), findsOneWidget);
-    expect(find.byKey(const Key('scrub-preview-poster')), findsOneWidget);
+    expect(find.byKey(const Key('scrub-preview-background')), findsOneWidget);
     expect(find.textContaining('/ 01:40'), findsOneWidget);
 
     await gesture.up();

test/home/home_startup_splash_test.dart

@@ -4,6 +4,7 @@ import 'dart:async';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:provider/provider.dart';
 import 'package:fruitshorts/app.dart';
 import 'package:fruitshorts/core/config/app_config.dart';
 import 'package:fruitshorts/core/data/models/drama.dart';
@@ -13,6 +14,8 @@ import 'package:fruitshorts/core/data/repositories/catalog_repository.dart';
 import 'package:fruitshorts/core/data/repositories/favorite_repository.dart';
 import 'package:fruitshorts/core/data/repositories/playback_repository.dart';
 import 'package:fruitshorts/core/data/repositories/watch_history_repository.dart';
+import 'package:fruitshorts/core/data/services/catalog_controller.dart';
+import 'package:fruitshorts/core/data/services/category_controller.dart';
 import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
 import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
 
@@ -51,7 +54,11 @@ void main() {
     expect(find.byType(CircularProgressIndicator), findsNothing);
 
     repository.complete(_feed);
-    await tester.pumpAndSettle();
+    await _pumpForAppData(tester);
+    await _pumpUntilFound(
+      tester,
+      find.byKey(const Key('home-feed-card-the-signal-demo')),
+    );
 
     expect(find.byKey(const Key('startup-splash')), findsNothing);
     expect(find.byKey(const Key('home-grid-skeleton')), findsNothing);
@@ -62,7 +69,8 @@ void main() {
     tester,
   ) async {
     await _pumpApp(tester, _FailingCatalogRepository());
-    await tester.pumpAndSettle();
+    await _pumpForAppData(tester);
+    await _pumpUntilFound(tester, find.byKey(const Key('home-grid-error')));
 
     expect(find.byKey(const Key('home-grid-header')), findsOneWidget);
     expect(find.byKey(const Key('home-grid-error')), findsOneWidget);
@@ -72,7 +80,8 @@ void main() {
 
   testWidgets('should_show_catalog_empty_state_inside_grid', (tester) async {
     await _pumpApp(tester, _EmptyCatalogRepository());
-    await tester.pumpAndSettle();
+    await _pumpForAppData(tester);
+    await _pumpUntilFound(tester, find.byKey(const Key('home-grid-empty')));
 
     expect(find.byKey(const Key('home-grid-header')), findsOneWidget);
     expect(find.byKey(const Key('home-grid-empty')), findsOneWidget);
@@ -99,6 +108,34 @@ Future<void> _pumpApp(WidgetTester tester, CatalogRepository repository) async {
   await tester.pump();
 }
 
+Future<void> _pumpUntilFound(WidgetTester tester, Finder finder) async {
+  for (var frame = 0; frame < 40; frame++) {
+    if (finder.evaluate().isNotEmpty) return;
+    await tester.pump(const Duration(milliseconds: 16));
+  }
+  await tester.pump();
+}
+
+Future<void> _pumpForAppData(WidgetTester tester) async {
+  await tester.runAsync(
+    () => Future<void>.delayed(Duration.zero),
+  );
+  for (var frame = 0; frame < 40; frame++) {
+    final root = find.byKey(const Key('home-tabs'));
+    if (root.evaluate().isNotEmpty) {
+      final context = tester.element(root);
+      final catalog = context.read<CatalogController>();
+      final categories = context.read<CategoryController>();
+      if (catalog.settled && !catalog.loading && !categories.loading) {
+        await tester.pump();
+        return;
+      }
+    }
+    await tester.pump(const Duration(milliseconds: 16));
+  }
+  await tester.pump();
+}
+
 final _feed = HomeFeed(
   sections: [
     FeedSection(code: 'hot', title: 'Hot', dramas: [demoDramas.first]),

test/home/k28_a_navigation_test.dart

@@ -8,6 +8,7 @@ import 'package:fruitshorts/core/data/repositories/favorite_repository.dart';
 import 'package:fruitshorts/core/data/repositories/playback_repository.dart';
 import 'package:fruitshorts/core/data/repositories/watch_history_repository.dart';
 import 'package:fruitshorts/core/widgets/app_bottom_nav.dart';
+import 'package:fruitshorts/pages/home/widgets/home_feed_grid.dart';
 import 'package:fruitshorts/pages/player/player_view.dart';
 import 'package:shared_preferences_platform_interface/in_memory_shared_preferences_async.dart';
 import 'package:shared_preferences_platform_interface/shared_preferences_async_platform_interface.dart';
@@ -45,7 +46,7 @@ void main() {
 
     expect(find.byKey(const Key('home-grid')), findsOneWidget);
     expect(find.byKey(const Key('home-grid-cards')), findsOneWidget);
-    expect(find.byType(PageView), findsNothing);
+    expect(find.byKey(const Key('home-primary-page-view')), findsOneWidget);
     expect(find.byKey(const Key('home-page-gradient')), findsNothing);
     expect(_hasLightStatusBar(tester), isTrue);
   });
@@ -158,7 +159,20 @@ void main() {
 
   testWidgets('should_open_player_from_home_grid_card', (tester) async {
     await _pumpApp(tester);
-    await tester.tap(find.byKey(const Key('home-feed-card-the-signal-demo')));
+    final grid = tester.widget<HomeFeedGrid>(find.byType(HomeFeedGrid));
+    expect(grid.feedController.dramas, isNotEmpty);
+    final card = find.byKey(
+      const Key('home-feed-card-city-lights-demo'),
+    );
+    for (var attempt = 0; attempt < 10; attempt++) {
+      if (card.evaluate().isNotEmpty) break;
+      await tester.drag(
+        find.byKey(const Key('home-grid-scroll')),
+        const Offset(0, -240),
+      );
+      await tester.pump();
+    }
+    await tester.tap(card);
     await tester.pumpAndSettle();
 
     final player = tester.widget<PlayerPage>(find.byType(PlayerPage).last);

test/mine/mine_preview_layout_test.dart

@@ -443,7 +443,10 @@ Future<void> _pumpApp(
       catalogRepository: catalog,
       categoryRepository: FakeCategoryRepository(catalog: catalog),
       watchHistoryRepository: history ?? InMemoryWatchHistoryRepository(),
-      favoriteRepository: InMemoryFavoriteRepository(cards: catalog.dramas),
+      favoriteRepository: InMemoryFavoriteRepository(
+        saved: catalog.dramas.map((drama) => drama.id).toSet(),
+        cards: catalog.dramas,
+      ),
       playbackRepository: FakePlaybackRepository(),
       commentRepository: FakeCommentRepository(),
       interactionRepository: FakeInteractionRepository(),

test/playback/playback_preload_test.dart

@@ -148,6 +148,69 @@ void main() {
     await session.close();
   });
 
+  test('should_play_previous_episode_when_swiping_back', () async {
+    final factory = _Factory();
+    final session = PlaybackSession(
+      episodes: episodes,
+      factory: factory.create,
+      canPlay: (_) => true,
+    );
+
+    await session.select(1, preloadIndex: 2, previousIndex: 0);
+    await session.preloadSettled;
+    await session.select(2, preloadIndex: 3, previousIndex: 1);
+    await session.preloadSettled;
+    expect(session.active, isA<_Player>().having((p) => p.id, 'id', 'ep-2'));
+    expect(session.reusedWarmAt(2), isTrue);
+
+    await session.select(1, preloadIndex: 2, previousIndex: 0);
+    await session.preloadSettled;
+
+    expect(session.active, isA<_Player>().having((p) => p.id, 'id', 'ep-1'));
+    expect(session.reusedWarmAt(1), isTrue);
+    expect(
+      factory.players.firstWhere((player) => player.id == 'ep-1').playing,
+      isTrue,
+    );
+    expect(session.userWantsPlay, isTrue);
+    await session.close();
+  });
+
+  test('should_auto_play_previous_after_switching_from_paused_episode', () async {
+    final factory = _Factory();
+    final session = PlaybackSession(
+      episodes: episodes,
+      factory: factory.create,
+      canPlay: (_) => true,
+    );
+
+    await session.select(1, preloadIndex: 2, previousIndex: 0);
+    await session.preloadSettled;
+    session.setUserWantsPlay(false);
+    await session.playbackSettled;
+    expect(session.userWantsPlay, isFalse);
+
+    await session.select(2, preloadIndex: 3, previousIndex: 1);
+    await session.preloadSettled;
+    expect(session.userWantsPlay, isTrue);
+    expect(
+      factory.players.firstWhere((player) => player.id == 'ep-2').playing,
+      isTrue,
+    );
+    session.setUserWantsPlay(false);
+    await session.playbackSettled;
+    expect(session.userWantsPlay, isFalse);
+
+    await session.select(1, preloadIndex: 2, previousIndex: 0);
+    await session.preloadSettled;
+    expect(session.userWantsPlay, isTrue);
+    expect(
+      factory.players.firstWhere((player) => player.id == 'ep-1').playing,
+      isTrue,
+    );
+    await session.close();
+  });
+
   test('should_reuse_in_flight_preload_when_swiped_before_ready', () async {
     final gate = Completer<void>();
     final factory = _Factory(gates: {'ep-1': gate});

test/playback/playback_queue_test.dart

@@ -51,12 +51,40 @@ void main() {
           'title': '第 1 集',
           'isFree': true,
           'playUrl': '/files/episode/9.mp4',
+          'posterUrl': '/files/transcoded/9/poster.jpg',
+          'thumbnailsUrl': '/files/transcoded/9/thumbnails/thumbnails.vtt',
         },
       }),
     ]);
 
     expect(home.length, 1);
     expect(home.entryAt(0).episode.videoUrl, '/files/episode/9.mp4');
+    expect(
+      home.entryAt(0).episode.posterUrl,
+      '/files/transcoded/9/poster.jpg',
+    );
+  });
+
+  test('should_parse_poster_url_for_drama_detail_episode_list', () {
+    final drama = Drama.fromDetailJson(const {
+      'id': 5,
+      'title': '闪婚后',
+      'cover': '/files/cover.jpg',
+      'episodes': [
+        {
+          'id': 9,
+          'number': 1,
+          'title': '第 1 集',
+          'isFree': true,
+          'posterUrl': '/files/transcoded/9/poster.jpg',
+        },
+      ],
+    });
+
+    expect(
+      drama.episodes.single.posterUrl,
+      '/files/transcoded/9/poster.jpg',
+    );
   });
 }
 

test/playback/playback_session_test.dart

@@ -32,6 +32,154 @@ void main() {
     await session.close();
   });
 
+  test('should_not_retire_home_controller_when_player_switches_episodes', () async {
+    final factory = FakeFactory();
+    final home = PlaybackSession(
+      episodes: episodes,
+      factory: factory.create,
+      canPlay: (episode) => episode.isFree,
+      owner: PlaybackSessionOwner.home,
+    );
+    await home.select(0, preloadIndex: 1);
+    await home.preloadSettled;
+    final homePlayer = home.active;
+    expect(homePlayer, isNotNull);
+
+    final player = PlaybackSession(
+      episodes: episodes,
+      factory: factory.create,
+      canPlay: (episode) => episode.isFree,
+      owner: PlaybackSessionOwner.player,
+    );
+    await player.select(0, preloadIndex: 1);
+    await player.select(1, previousIndex: 0);
+    await player.preloadSettled;
+
+    expect(home.active, same(homePlayer));
+    expect(
+      factory.created
+          .firstWhere((candidate) => identical(candidate, homePlayer))
+          .disposed,
+      isFalse,
+    );
+    expect(player.active, isNot(same(homePlayer)));
+    await player.close();
+    await home.close();
+  });
+
+  test('should_keep_home_controller_alive_when_player_session_closes', () async {
+    final factory = FakeFactory();
+    final home = PlaybackSession(
+      episodes: episodes,
+      factory: factory.create,
+      canPlay: (episode) => episode.isFree,
+      owner: PlaybackSessionOwner.home,
+    );
+    await home.select(0);
+    final homePlayer = home.active! as FakePlayer;
+
+    final player = PlaybackSession(
+      episodes: episodes,
+      factory: factory.create,
+      canPlay: (episode) => episode.isFree,
+      owner: PlaybackSessionOwner.player,
+    );
+    await player.select(0);
+    await player.select(1);
+    await player.close();
+
+    expect(homePlayer.disposed, isFalse);
+    expect(home.active, same(homePlayer));
+    expect(home.currentIndex, 0);
+    await home.close();
+  });
+
+  test('should_release_previous_player_immediately_when_selecting_locked', () async {
+    final lockedEpisodes = [
+      Episode(
+        id: 'free',
+        number: 1,
+        title: 'Free',
+        isFree: true,
+        videoUrl: 'https://example.test/free.mp4',
+      ),
+      Episode(
+        id: 'locked',
+        number: 2,
+        title: 'Locked',
+        isFree: false,
+        locked: true,
+        videoUrl: 'https://example.test/should-not-play.mp4',
+      ),
+      Episode(
+        id: 'next',
+        number: 3,
+        title: 'Next',
+        isFree: true,
+        videoUrl: 'https://example.test/next.mp4',
+      ),
+    ];
+    final factory = FakeFactory();
+    final session = PlaybackSession(
+      episodes: lockedEpisodes,
+      factory: factory.create,
+      canPlay: (episode) => !episode.locked,
+    );
+    await session.select(0, preloadIndex: 1);
+    final previous = factory.created.single;
+
+    await session.selectLocked(1, preloadIndex: 2, previousIndex: 0);
+    await session.playbackSettled;
+
+    expect(session.active, isNull);
+    expect(previous.pauseCalls, greaterThan(0));
+    expect(previous.disposed, isTrue);
+    expect(factory.live, 0);
+    expect(factory.created, hasLength(1));
+
+    await session.select(2, previousIndex: 1);
+    expect(session.active, same(factory.created.last));
+    expect(factory.created.last.playCalls, greaterThan(0));
+    await session.close();
+  });
+
+  test('should_play_locked_episode_only_after_it_is_unlocked', () async {
+    final lockedEpisodes = [
+      Episode(
+        id: 'free',
+        number: 1,
+        title: 'Free',
+        isFree: true,
+        videoUrl: 'https://example.test/free.mp4',
+      ),
+      Episode(
+        id: 'locked',
+        number: 2,
+        title: 'Locked',
+        isFree: false,
+        locked: true,
+        videoUrl: 'https://example.test/locked.mp4',
+      ),
+    ];
+    final unlocked = <String>{};
+    final factory = FakeFactory();
+    final session = PlaybackSession(
+      episodes: lockedEpisodes,
+      factory: factory.create,
+      canPlay: (episode) => episode.isFree || unlocked.contains(episode.id),
+    );
+    await session.select(0);
+    await session.selectLocked(1);
+    expect(session.active, isNull);
+
+    unlocked.add('locked');
+    await session.select(1);
+
+    expect(session.active, same(factory.created.last));
+    expect(factory.created.last.playCalls, greaterThan(0));
+    await session.close();
+  });
+
   test('should_drop_stale_initialize_and_keep_one_player_when_selection_is_rapid', () async {
     final factory = FakeFactory(holdFirstInitialize: true);
     final session = PlaybackSession(

test/playback/seek_progress_bar_test.dart

@@ -30,7 +30,7 @@ void main() {
       scrubPreviewLeft(trackWidth: 300, fraction: 1),
       300 - scrubPreviewWidth - scrubPreviewSafeMargin,
     );
-    expect(scrubPreviewLeft(trackWidth: 100, fraction: 0.5), 0);
+    expect(scrubPreviewLeft(trackWidth: 100, fraction: 0.5), 2);
   });
 
   testWidgets('should_show_inactive_track_when_video_is_not_initialized', (
@@ -54,6 +54,11 @@ void main() {
     expect(find.byKey(const Key('progress-loading')), findsNothing);
     expect(find.byKey(const Key('progress-inactive')), findsOneWidget);
     expect(find.byType(Slider), findsNothing);
+    expect(
+      find.byKey(const Key('player-progress-uninitialized-time')),
+      findsNothing,
+    );
+    expect(find.textContaining('00:00'), findsNothing);
   });
 
   testWidgets('should_show_inactive_track_and_disable_seek_when_locked', (
@@ -144,6 +149,119 @@ void main() {
     expect(find.byType(Slider), findsOneWidget);
   });
 
+  testWidgets(
+    'should_hide_buffering_loading_immediately_when_position_advances',
+    (tester) async {
+      final video = ValueNotifier<VideoPlayerValue>(
+        const VideoPlayerValue(
+          duration: Duration(seconds: 12),
+          position: Duration(seconds: 3),
+          isInitialized: true,
+          isPlaying: true,
+          isBuffering: true,
+        ),
+      );
+      addTearDown(video.dispose);
+      await tester.pumpWidget(
+        MaterialApp(
+          home: Scaffold(
+            body: SeekProgressBar(
+              valueListenable: video,
+              semanticsLabel: 'Seek video',
+              onSeek: (_) async {},
+            ),
+          ),
+        ),
+      );
+
+      expect(find.byKey(const Key('progress-loading')), findsNothing);
+      await tester.pump(const Duration(milliseconds: 200));
+      video.value = const VideoPlayerValue(
+        duration: Duration(seconds: 12),
+        position: Duration(seconds: 4),
+        isInitialized: true,
+        isBuffering: true,
+      );
+      await tester.pump();
+      await tester.pump(const Duration(milliseconds: 400));
+
+      expect(find.byKey(const Key('progress-loading')), findsNothing);
+      expect(find.byType(Slider), findsOneWidget);
+
+      video.value = const VideoPlayerValue(
+        duration: Duration(seconds: 12),
+        position: Duration(seconds: 4),
+        isInitialized: true,
+        isPlaying: true,
+        isBuffering: true,
+      );
+      await tester.pump();
+      await tester.pump(const Duration(milliseconds: 400));
+
+      expect(find.byKey(const Key('progress-loading')), findsOneWidget);
+      expect(find.byType(Slider), findsNothing);
+    },
+  );
+
+  testWidgets('should_not_show_loading_for_prewarmed_episode', (tester) async {
+    final video = ValueNotifier<VideoPlayerValue>(
+      const VideoPlayerValue(
+        duration: Duration(seconds: 12),
+        position: Duration(seconds: 5),
+        isInitialized: true,
+        isPlaying: true,
+        isBuffering: true,
+      ),
+    );
+    addTearDown(video.dispose);
+    await tester.pumpWidget(
+      MaterialApp(
+        home: Scaffold(
+          body: SeekProgressBar(
+            valueListenable: video,
+            semanticsLabel: 'Seek video',
+            onSeek: (_) async {},
+          ),
+        ),
+      ),
+    );
+
+    await tester.pump(const Duration(milliseconds: 400));
+    expect(find.byKey(const Key('progress-loading')), findsNothing);
+    expect(find.byType(Slider), findsOneWidget);
+  });
+
+  testWidgets(
+    'should_suppress_progress_loading_while_entry_loading_is_visible',
+    (tester) async {
+      final video = ValueNotifier<VideoPlayerValue>(
+        const VideoPlayerValue(
+          duration: Duration(seconds: 12),
+          position: Duration.zero,
+          isInitialized: true,
+          isBuffering: true,
+        ),
+      );
+      addTearDown(video.dispose);
+      await tester.pumpWidget(
+        MaterialApp(
+          home: Scaffold(
+            body: SeekProgressBar(
+              valueListenable: video,
+              semanticsLabel: 'Seek video',
+              suppressBufferLoading: true,
+              onSeek: (_) async {},
+            ),
+          ),
+        ),
+      );
+
+      await tester.pump(const Duration(milliseconds: 400));
+      expect(find.byKey(const Key('progress-loading')), findsNothing);
+      expect(find.byType(Slider), findsOneWidget);
+    },
+  );
+
   testWidgets('should_keep_slider_while_scrubbing_during_buffering', (
     tester,
   ) async {
@@ -249,9 +367,7 @@ void main() {
     },
   );
 
-  testWidgets('should_show_frame_card_with_cover_then_hide_on_release', (
-    tester,
-  ) async {
+  testWidgets('should_show_frame_card_then_hide_on_release', (tester) async {
     final video = ValueNotifier<VideoPlayerValue>(
       const VideoPlayerValue(
         duration: Duration(seconds: 12),
@@ -272,7 +388,6 @@ void main() {
                 valueListenable: video,
                 semanticsLabel: 'Seek video',
                 episodeId: 'episode-1',
-                posterUrl: '',
                 thumbnailService: service,
                 onSeek: (_) async {},
               ),
@@ -289,7 +404,7 @@ void main() {
     await tester.pump();
 
     expect(find.byKey(const Key('scrub-preview-card')), findsOneWidget);
-    expect(find.byKey(const Key('scrub-preview-poster')), findsOneWidget);
+    expect(find.byKey(const Key('scrub-preview-background')), findsOneWidget);
     expect(find.byKey(const Key('scrub-preview-frame')), findsNothing);
     expect(find.textContaining('/ 00:12'), findsOneWidget);
     expect(

test/playback/sprite_thumbnail_axis_test.dart

@@ -75,7 +75,9 @@ void main() {
     expect(axis.cues, isEmpty);
   });
 
-  testWidgets('should_keep_only_two_decoded_sprites_in_lru', (tester) async {
+  testWidgets('should_keep_one_sprite_and_reload_after_eviction', (
+    tester,
+  ) async {
     final loader = _FakeSpriteLoader(vtt: _spriteVtt);
     final service = SpriteThumbnailAxisService(
       loader: loader,
@@ -84,20 +86,37 @@ void main() {
     addTearDown(service.dispose);
 
     await service.prepareAt('https://cdn.test/thumbnails.vtt', Duration.zero);
-    expect(service.spriteCacheSize, 2);
-    expect(
-      service.spriteCacheKeys,
-      containsAll(['sprite_001.jpg', 'sprite_002.jpg']),
-    );
-
     await service.prepareAt(
       'https://cdn.test/thumbnails.vtt',
       const Duration(milliseconds: 2500),
     );
+    await service.prepareAt(
+      'https://cdn.test/thumbnails.vtt',
+      const Duration(milliseconds: 3500),
+    );
 
-    expect(service.spriteCacheSize, 2);
-    expect(service.spriteCacheKeys, contains('sprite_002.jpg'));
-    expect(service.spriteCacheKeys, isNot(contains('sprite_001.jpg')));
+    expect(service.spriteCacheSize, 1);
+    expect(service.spriteCacheKeys, ['sprite_003.jpg']);
+    expect(loader.images[0].debugDisposed, isTrue);
+    expect(loader.images[1].debugDisposed, isTrue);
+    expect(loader.images[2].debugDisposed, isFalse);
+    expect(
+      service.cachedFrameAt(
+        'https://cdn.test/thumbnails.vtt',
+        const Duration(milliseconds: 3500),
+      ),
+      isNotNull,
+    );
+
+    await service.prepareAt('https://cdn.test/thumbnails.vtt', Duration.zero);
+    expect(service.spriteCacheSize, 1);
+    expect(service.spriteCacheKeys, ['sprite_001.jpg']);
+    expect(loader.images[2].debugDisposed, isTrue);
+    expect(loader.images[3].debugDisposed, isFalse);
+    expect(
+      service.cachedFrameAt('https://cdn.test/thumbnails.vtt', Duration.zero),
+      isNotNull,
+    );
   });
 
   testWidgets('should_cache_vtt_and_retry_once_after_403', (tester) async {
@@ -114,6 +133,32 @@ void main() {
     expect(service.hasAxis('https://cdn.test/thumbnails.vtt'), isTrue);
   });
 
+  testWidgets('should_keep_zero_frames_ready_across_neighbor_episodes', (
+    tester,
+  ) async {
+    final loader = _FakeSpriteLoader(vtt: _spriteVtt);
+    final service = SpriteThumbnailAxisService(
+      loader: loader,
+      spriteCacheCapacity: 6,
+    );
+    addTearDown(service.dispose);
+    const current = 'https://cdn.test/episode-1/thumbnails.vtt';
+    const previous = 'https://cdn.test/episode-0/thumbnails.vtt';
+    const next = 'https://cdn.test/episode-2/thumbnails.vtt';
+
+    await Future.wait([
+      service.prepareAt(previous, Duration.zero),
+      service.prepareAt(current, Duration.zero),
+      service.prepareAt(next, Duration.zero),
+    ]);
+
+    for (final url in [previous, current, next]) {
+      expect(service.hasAxis(url), isTrue);
+      expect(service.cachedFrameAt(url, Duration.zero), isNotNull);
+    }
+    expect(loader.spriteCalls, hasLength(6));
+  });
+
   testWidgets('should_refresh_vtt_after_ten_minute_ttl', (tester) async {
     var now = DateTime(2026, 10, 22);
     final loader = _FakeSpriteLoader(vtt: _spriteVtt);
@@ -173,19 +218,26 @@ void main() {
       'title': 'episode',
       'isFree': true,
       'thumbnailsUrl': 'https://cdn.test/thumbnails.vtt?e=1&s=x',
+      'posterUrl': 'https://cdn.test/poster.jpg?e=1&s=x',
     });
     final ticket = PlayTicket.fromJson(const {
       'episodeId': '11',
       'accessible': true,
       'accessType': 'FREE',
       'thumbnailsUrl': 'https://cdn.test/thumbnails.vtt?e=1&s=x',
+      'posterUrl': 'https://cdn.test/poster.jpg?e=1&s=x',
     });
 
     expect(episode.thumbnailsUrl, ticket.thumbnailsUrl);
+    expect(episode.posterUrl, ticket.posterUrl);
     expect(
       episode.withVideoUrl('file:///video.mp4').thumbnailsUrl,
       episode.thumbnailsUrl,
     );
+    expect(
+      episode.withVideoUrl('file:///video.mp4').posterUrl,
+      episode.posterUrl,
+    );
   });
 }
 
@@ -196,6 +248,7 @@ class _FakeSpriteLoader implements SpriteThumbnailAssetLoader {
   final List<Object>? vttResponses;
   int vttCalls = 0;
   final List<String> spriteCalls = [];
+  final List<ui.Image> images = [];
 
   @override
   Future<String?> loadVtt(Uri uri) async {
@@ -211,6 +264,7 @@ class _FakeSpriteLoader implements SpriteThumbnailAssetLoader {
   Future<SpriteThumbnailDecodedImage?> loadSprite(Uri uri) async {
     spriteCalls.add(uri.pathSegments.last);
     final image = await _createImage(320, 180);
+    images.add(image);
     return SpriteThumbnailDecodedImage(
       image: image,
       originalWidth: 320,

test/player/double_tap_like_test.dart

@@ -6,14 +6,17 @@ import 'package:fruitshorts/core/data/services/interaction_controller.dart';
 import 'package:fruitshorts/core/theme/app_theme.dart';
 import 'package:fruitshorts/l10n/app_localizations.dart';
 import 'package:fruitshorts/pages/player/widgets/home_feed_overlay.dart';
+import 'package:fruitshorts/pages/player/widgets/player_double_tap_hearts.dart';
+import 'package:fruitshorts/pages/player/widgets/player_heart_overlay_scope.dart';
+import 'package:fruitshorts/pages/player/widgets/player_tap_gesture_region.dart';
 
 import '../support/fake_catalog.dart';
 import '../support/fake_haptics.dart';
 import '../support/fake_interaction_repositories.dart';
 
 void main() {
-  testWidgets('double tap within 400ms never pauses', (tester) async {
-    for (final delay in [120, 250, 300, 380]) {
+  testWidgets('double tap within 320ms never pauses', (tester) async {
+    for (final delay in [120, 250, 300]) {
       final repository = FakeInteractionRepository();
       final haptics = FakeHaptics();
       final key = GlobalKey<_HarnessState>();
@@ -45,7 +48,6 @@ void main() {
         ),
         findsOneWidget,
       );
-      await tester.pumpAndSettle();
     }
   });
 
@@ -74,6 +76,200 @@ void main() {
     await tester.pump(const Duration(milliseconds: 500));
     expect(key.currentState!.pauseToggles, 2);
   });
+
+  testWidgets('liked episode keeps heart feedback without liking again', (
+    tester,
+  ) async {
+    final repository = FakeInteractionRepository();
+    final haptics = FakeHaptics();
+    final key = GlobalKey<_HarnessState>();
+    final clock = _TestClock();
+    await _pumpHarness(tester, repository, haptics, key, clock);
+    final center = tester.getCenter(find.byKey(const Key('home-feed-gesture')));
+
+    await tester.tapAt(center);
+    clock.advance(const Duration(milliseconds: 100));
+    await tester.pump(const Duration(milliseconds: 100));
+    await tester.tapAt(center);
+    await tester.pump();
+    expect(repository.likeTargets, hasLength(1));
+    await _pumpTestClock(tester, clock, const Duration(milliseconds: 1600));
+
+    clock.advance(const Duration(milliseconds: 500));
+    await tester.pump(const Duration(milliseconds: 500));
+    await tester.tapAt(center);
+    clock.advance(const Duration(milliseconds: 100));
+    await tester.pump(const Duration(milliseconds: 100));
+    await tester.tapAt(center);
+    await tester.pump();
+    await tester.pump(const Duration(milliseconds: 100));
+
+    expect(repository.likeTargets, hasLength(1));
+    expect(haptics.lightImpacts, 2);
+    expect(key.currentState!.pauseToggles, 0);
+    expect(find.byKey(const Key('double-tap-heart-0')), findsOneWidget);
+  });
+
+  testWidgets('parent rebuild 30 times keeps the heart burst alive', (
+    tester,
+  ) async {
+    final key = GlobalKey<_HarnessState>();
+    final clock = _TestClock();
+    await _pumpHarness(
+      tester,
+      FakeInteractionRepository(),
+      FakeHaptics(),
+      key,
+      clock,
+    );
+    final center = tester.getCenter(find.byKey(const Key('home-feed-gesture')));
+
+    await tester.tapAt(center);
+    clock.advance(const Duration(milliseconds: 100));
+    await tester.pump(const Duration(milliseconds: 100));
+    await tester.tapAt(center);
+    await tester.pump();
+    await tester.pump(const Duration(milliseconds: 100));
+
+    final gestureFinder = find.byType(PlayerTapGestureRegion);
+    final burstFinder = find.byType(PlayerDoubleTapHeartBurst);
+    final gestureState = tester.state(gestureFinder);
+    final burstState = tester.state(burstFinder);
+
+    for (var index = 0; index < 30; index++) {
+      key.currentState!.rebuild();
+      clock.advance(const Duration(milliseconds: 16));
+      await tester.pump(const Duration(milliseconds: 16));
+    }
+
+    expect(tester.state(gestureFinder), same(gestureState));
+    expect(tester.state(burstFinder), same(burstState));
+    expect(find.byKey(const Key('double-tap-heart-0')), findsOneWidget);
+
+    await _pumpTestClock(tester, clock, const Duration(milliseconds: 1600));
+    expect(burstFinder, findsNothing);
+  });
+
+  testWidgets('heart burst starts at tapped location', (tester) async {
+    final key = GlobalKey<_HarnessState>();
+    final clock = _TestClock();
+    await _pumpHarness(
+      tester,
+      FakeInteractionRepository(),
+      FakeHaptics(),
+      key,
+      clock,
+    );
+    const tapPosition = Offset(120, 220);
+
+    await tester.tapAt(tapPosition);
+    clock.advance(const Duration(milliseconds: 100));
+    await tester.pump(const Duration(milliseconds: 100));
+    await tester.tapAt(tapPosition);
+    await tester.pump();
+    await tester.pump(const Duration(milliseconds: 1));
+
+    expect(find.byType(PlayerDoubleTapHeartBurst), findsOneWidget);
+    expect(
+      (tester.getCenter(find.byKey(const Key('double-tap-heart-0'))) -
+              tapPosition)
+          .distance,
+      lessThanOrEqualTo(1),
+    );
+  });
+
+  testWidgets('heart burst survives gesture region disposal', (tester) async {
+    final logs = <String>[];
+    final originalDebugPrint = debugPrint;
+    debugPrint = (message, {wrapWidth}) {
+      if (message != null) logs.add(message);
+    };
+    var elapsedMs = 0;
+    try {
+      final clock = _TestClock();
+      final key = GlobalKey<_RemovableGestureHarnessState>();
+      await tester.pumpWidget(
+        MaterialApp(
+          home: _RemovableGestureHarness(key: key, clock: clock),
+        ),
+      );
+      const tapPosition = Offset(120, 220);
+
+      await tester.tapAt(tapPosition);
+      clock.advance(const Duration(milliseconds: 100));
+      await tester.pump(const Duration(milliseconds: 100));
+      await tester.tapAt(tapPosition);
+      await tester.pump();
+      await _pumpTestClock(tester, clock, const Duration(milliseconds: 100));
+
+      final burstFinder = find.byType(PlayerDoubleTapHeartBurst);
+      expect(burstFinder, findsOneWidget);
+      key.currentState!.removeGesture();
+      await tester.pump();
+      expect(find.byKey(const Key('removable-tap-gesture')), findsNothing);
+      expect(burstFinder, findsOneWidget);
+
+      elapsedMs = 100;
+      await _pumpTestClock(tester, clock, const Duration(milliseconds: 1600));
+      elapsedMs += 1600;
+      expect(burstFinder, findsNothing);
+    } finally {
+      debugPrint = originalDebugPrint;
+    }
+
+    expect(elapsedMs, greaterThanOrEqualTo(1500));
+    expect(
+      logs.any(
+        (line) =>
+            line.contains('phase=heart-burst-complete') &&
+            line.contains('configuredMs=1590'),
+      ),
+      isTrue,
+    );
+    expect(
+      logs.any(
+        (line) =>
+            line.contains('phase=heart-burst-dispose') &&
+            line.contains('completed=1'),
+      ),
+      isTrue,
+    );
+  });
+
+  testWidgets('multiple heart bursts run independently', (tester) async {
+    final key = GlobalKey<_HarnessState>();
+    final clock = _TestClock();
+    await _pumpHarness(
+      tester,
+      FakeInteractionRepository(),
+      FakeHaptics(),
+      key,
+      clock,
+    );
+
+    await tester.tapAt(const Offset(100, 180));
+    clock.advance(const Duration(milliseconds: 100));
+    await tester.pump(const Duration(milliseconds: 100));
+    await tester.tapAt(const Offset(100, 180));
+    await tester.pump();
+    await tester.pump(const Duration(milliseconds: 100));
+
+    clock.advance(const Duration(milliseconds: 400));
+    await tester.pump(const Duration(milliseconds: 400));
+    await tester.tapAt(const Offset(260, 360));
+    clock.advance(const Duration(milliseconds: 100));
+    await tester.pump(const Duration(milliseconds: 100));
+    await tester.tapAt(const Offset(260, 360));
+    await tester.pump();
+    await tester.pump(const Duration(milliseconds: 1));
+
+    expect(find.byType(PlayerDoubleTapHeartBurst), findsNWidgets(2));
+    expect(find.byKey(const ValueKey('heart-overlay-0')), findsOneWidget);
+    expect(find.byKey(const ValueKey('heart-overlay-1')), findsOneWidget);
+    await tester.pumpWidget(const SizedBox.shrink());
+    await tester.pump();
+    expect(find.byType(PlayerDoubleTapHeartBurst), findsNothing);
+  });
 }
 
 Future<void> _pumpHarness(
@@ -122,6 +318,8 @@ class _HarnessState extends State<_Harness> {
   );
   int pauseToggles = 0;
 
+  void rebuild() => setState(() {});
+
   Future<void> _like({bool likeOnly = false}) async {
     await widget.haptics.lightImpact();
     final episodeId = demoDramas.first.episodes.first.id;
@@ -177,6 +375,58 @@ class _HarnessState extends State<_Harness> {
   }
 }
 
+class _RemovableGestureHarness extends StatefulWidget {
+  const _RemovableGestureHarness({super.key, required this.clock});
+
+  final _TestClock clock;
+
+  @override
+  State<_RemovableGestureHarness> createState() =>
+      _RemovableGestureHarnessState();
+}
+
+class _RemovableGestureHarnessState extends State<_RemovableGestureHarness> {
+  final PlayerHeartOverlayController _heartController =
+      PlayerHeartOverlayController();
+  bool _showGesture = true;
+
+  void removeGesture() => setState(() => _showGesture = false);
+
+  @override
+  void dispose() {
+    _heartController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return PlayerHeartOverlayScope(
+      controller: _heartController,
+      child: Scaffold(
+        body: Stack(
+          fit: StackFit.expand,
+          children: [
+            if (_showGesture)
+              Positioned.fill(
+                child: PlayerTapGestureRegion(
+                  key: const Key('removable-tap-gesture'),
+                  gestureKey: const Key('removable-gesture'),
+                  enabled: true,
+                  doubleTapEnabled: true,
+                  now: widget.clock.now,
+                  onSingleTap: () {},
+                  onDoubleTapLike: (_) {},
+                  onLongPressStart: (_, _) {},
+                  onInteractionEnd: () {},
+                ),
+              ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
 class _TestClock {
   DateTime _now = DateTime(2026, 10, 22, 12);
 
@@ -186,3 +436,18 @@ class _TestClock {
     _now = _now.add(duration);
   }
 }
+
+Future<void> _pumpTestClock(
+  WidgetTester tester,
+  _TestClock clock,
+  Duration duration,
+) async {
+  const frameMs = 16;
+  var remainingMs = duration.inMilliseconds;
+  while (remainingMs > 0) {
+    final stepMs = remainingMs >= frameMs ? frameMs : remainingMs;
+    clock.advance(Duration(milliseconds: stepMs));
+    await tester.pump(const Duration(milliseconds: frameMs));
+    remainingMs -= stepMs;
+  }
+}

test/player/player_double_tap_hearts_test.dart

@@ -5,20 +5,122 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:fruitshorts/pages/player/widgets/player_double_tap_hearts.dart';
 
 void main() {
-  testWidgets('should_show_three_medium_hearts_when_double_tap_burst_starts', (
+  testWidgets('should_show_three_develop_hearts_when_burst_starts', (
     tester,
   ) async {
+    final clock = _HeartClock();
     await tester.pumpWidget(
-      const MaterialApp(
-        home: Scaffold(body: PlayerDoubleTapHeartBurst(onCompleted: _noop)),
+      MaterialApp(
+        home: Scaffold(
+          body: PlayerDoubleTapHeartBurst(
+            burstId: 1,
+            now: clock.now,
+            onCompleted: _noop,
+          ),
+        ),
       ),
     );
-    await tester.pump(const Duration(milliseconds: 160));
+    await _pumpHeartTime(tester, clock, const Duration(milliseconds: 200));
 
     expect(find.byIcon(Icons.favorite_rounded), findsNWidgets(3));
     expect(_size(tester, 0), 48);
     expect(_size(tester, 1), 36);
     expect(_size(tester, 2), 40);
+    expect(
+      tester
+          .widgetList<Stack>(
+            find.descendant(
+              of: find.byType(PlayerDoubleTapHeartBurst),
+              matching: find.byType(Stack),
+            ),
+          )
+          .every((stack) => stack.clipBehavior == Clip.none),
+      isTrue,
+    );
+  });
+
+  testWidgets('heart burst keeps opacity then fades after 55 percent', (
+    tester,
+  ) async {
+    final clock = _HeartClock();
+    await tester.pumpWidget(
+      MaterialApp(
+        home: Scaffold(
+          body: PlayerDoubleTapHeartBurst(
+            burstId: 2,
+            now: clock.now,
+            onCompleted: _noop,
+          ),
+        ),
+      ),
+    );
+
+    await _pumpHeartTime(tester, clock, const Duration(milliseconds: 450));
+    expect(_opacity(tester, 0), closeTo(1, 1e-9));
+
+    await _pumpHeartTime(tester, clock, const Duration(milliseconds: 750));
+    expect(_opacity(tester, 0), lessThan(0.5));
+  });
+
+  testWidgets('heart position is anchored to the overlay origin', (
+    tester,
+  ) async {
+    const origin = Offset(300, 546);
+    final clock = _HeartClock();
+    await tester.pumpWidget(
+      MaterialApp(
+        home: Scaffold(
+          body: Stack(
+            fit: StackFit.expand,
+            children: [
+              Positioned.fill(
+                child: PlayerDoubleTapHeartBurst(
+                  burstId: 4,
+                  origin: origin,
+                  now: clock.now,
+                  onCompleted: _noop,
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+
+    final firstHeart = find.byKey(const Key('double-tap-heart-0'));
+    expect(
+      (tester.getCenter(firstHeart) - origin).distance,
+      lessThanOrEqualTo(1),
+    );
+
+    await _pumpHeartTime(tester, clock, const Duration(milliseconds: 750));
+    final midpoint = tester.getCenter(firstHeart);
+    expect(midpoint.dy, lessThan(origin.dy));
+    expect((midpoint.dx - origin.dx).abs(), lessThanOrEqualTo(1));
+  });
+
+  testWidgets('develop heart burst completes after about 1590ms', (
+    tester,
+  ) async {
+    var completed = false;
+    final clock = _HeartClock();
+    await tester.pumpWidget(
+      MaterialApp(
+        home: Scaffold(
+          body: PlayerDoubleTapHeartBurst(
+            burstId: 3,
+            now: clock.now,
+            onCompleted: () => completed = true,
+          ),
+        ),
+      ),
+    );
+
+    await _pumpHeartTime(tester, clock, const Duration(milliseconds: 1600));
+
+    expect(completed, isTrue);
+    expect(clock.elapsedMs, greaterThanOrEqualTo(1590));
+    expect(clock.elapsedMs, lessThanOrEqualTo(1600));
   });
 }
 
@@ -26,4 +128,42 @@ double _size(WidgetTester tester, int index) {
   return tester.widget<Icon>(find.byKey(Key('double-tap-heart-$index'))).size!;
 }
 
+double _opacity(WidgetTester tester, int index) {
+  final opacity = find
+      .ancestor(
+        of: find.byKey(Key('double-tap-heart-$index')),
+        matching: find.byType(Opacity),
+      )
+      .first;
+  return tester.widget<Opacity>(opacity).opacity;
+}
+
 void _noop() {}
+
+Future<void> _pumpHeartTime(
+  WidgetTester tester,
+  _HeartClock clock,
+  Duration duration,
+) async {
+  const frameMs = 16;
+  var remainingMs = duration.inMilliseconds;
+  while (remainingMs > 0) {
+    final stepMs = remainingMs >= frameMs ? frameMs : remainingMs;
+    clock.advance(Duration(milliseconds: stepMs));
+    await tester.pump(const Duration(milliseconds: frameMs));
+    remainingMs -= stepMs;
+  }
+}
+
+class _HeartClock {
+  DateTime _now = DateTime(2026, 10, 26, 12);
+
+  DateTime now() => _now;
+
+  int get elapsedMs =>
+      _now.difference(DateTime(2026, 10, 26, 12)).inMilliseconds;
+
+  void advance(Duration duration) {
+    _now = _now.add(duration);
+  }
+}

test/player/player_episode_stats_test.dart

@@ -0,0 +1,301 @@
+import 'dart:convert';
+
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:fruitshorts/core/data/models/drama.dart';
+import 'package:fruitshorts/core/data/models/episode_stats.dart';
+import 'package:fruitshorts/core/data/models/player_port.dart';
+import 'package:fruitshorts/core/data/remote/api_client.dart';
+import 'package:fruitshorts/core/data/remote/playback_api.dart';
+import 'package:fruitshorts/core/data/repositories/playback_repository.dart';
+import 'package:fruitshorts/core/data/services/android_picture_in_picture.dart';
+import 'package:fruitshorts/core/data/services/playback_session.dart';
+import 'package:fruitshorts/pages/player/player_logic.dart';
+import 'package:fruitshorts/pages/player/player_view.dart';
+
+import '../support/fake_http_adapter.dart';
+import '../support/fake_watch_history.dart';
+
+Drama _drama(String id) => Drama(
+  id: id,
+  title: id,
+  synopsis: 'synopsis',
+  posterUrl: '/files/poster.png',
+  episodes: [
+    for (var number = 1; number <= 3; number++)
+      Episode(
+        id: '$id-$number',
+        number: number,
+        title: 'Episode $number',
+        isFree: true,
+        videoUrl: 'https://example.test/$id-$number.mp4',
+        likeCount: 1,
+        commentCount: 1,
+      ),
+  ],
+);
+
+AndroidPictureInPicture _pip() => AndroidPictureInPicture(
+  channel: const MethodChannel('test/player_episode_stats/pip'),
+);
+
+PlayerLogic _logic({
+  required PlaybackRepository playback,
+  DateTime Function()? clock,
+}) => PlayerLogic(
+  history: FakeWatchHistory(),
+  playback: playback,
+  pictureInPicture: _pip(),
+  waitForFrame: () async {},
+  clock: clock,
+);
+
+Future<void> _drain(PlayerLogic logic) async {
+  for (var attempt = 0; attempt < 4; attempt++) {
+    await pumpEventQueue();
+    await logic.session.playbackSettled;
+    await logic.session.preloadSettled;
+  }
+  await pumpEventQueue();
+}
+
+void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
+
+  test(
+    'should_refresh_episode_stats_on_up_and_down_swipes_without_reopening_play',
+    () async {
+      var now = DateTime(2026, 10, 26, 12);
+      final adapter = FakeHttpAdapter((options) async {
+        final path = options.uri.path;
+        if (path.endsWith('/play')) {
+          final episodeId = path.split('/')[3];
+          return FakeHttpResponse(
+            jsonEncode({
+              'code': 0,
+              'message': 'ok',
+              'data': {
+                'episodeId': episodeId,
+                'accessible': true,
+                'accessType': 'FREE',
+                'playUrl': '/files/$episodeId.mp4',
+                'qualities': ['AUTO'],
+              },
+            }),
+          );
+        }
+        if (path.endsWith('/stats')) {
+          final episodeId = path.split('/')[3];
+          return FakeHttpResponse(
+            jsonEncode({
+              'code': 0,
+              'message': 'ok',
+              'data': {
+                'episodeId': episodeId,
+                'dramaId': 'signal',
+                'likeCount': episodeId == 'signal-1' ? '11' : '22',
+                'commentCount': episodeId == 'signal-1' ? '3' : '4',
+                'favoriteCount': '30',
+                'liked': episodeId == 'signal-1',
+                'favorited': false,
+              },
+            }),
+          );
+        }
+        throw StateError('unexpected request $path');
+      });
+      final client = ApiClient(
+        baseUrl: 'http://127.0.0.1:8081',
+        adapter: adapter,
+      );
+      final playback = HttpPlaybackRepository(
+        PlaybackApi(client),
+        clock: () => now,
+      );
+      final logs = <String>[];
+      final previousDebugPrint = debugPrint;
+      debugPrint = (message, {wrapWidth}) {
+        if (message == null) return;
+        logs.add(message);
+        if (message.contains('[player] phase=episode-stats-refresh')) {
+          previousDebugPrint(message, wrapWidth: wrapWidth);
+        }
+      };
+      addTearDown(() {
+        debugPrint = previousDebugPrint;
+        client.close();
+      });
+
+      final factory = _RecordingFactory();
+      final logic = _logic(
+        playback: playback,
+        clock: () => now,
+      );
+      logic.attach(
+        PlayerPage(drama: _drama('signal'), initialIndex: 0),
+        isMounted: () => true,
+      );
+      logic.start(
+        factory: factory.create,
+        coordinator: PlaybackCoordinator(),
+      );
+      await _drain(logic);
+
+      await logic.requestEpisodeSelection(1);
+      await _drain(logic);
+      final playRequestsBeforeBack = adapter.requests
+          .where((request) => request.uri.path.endsWith('/play'))
+          .length;
+      final statsRequestsBeforeBack = adapter.requests
+          .where((request) => request.uri.path.endsWith('/stats'))
+          .length;
+
+      await logic.requestEpisodeSelection(0);
+      await _drain(logic);
+
+      expect(
+        adapter.requests.where((request) => request.uri.path.endsWith('/play')),
+        hasLength(playRequestsBeforeBack),
+      );
+      expect(
+        adapter.requests.where(
+          (request) => request.uri.path.endsWith('/stats'),
+        ),
+        hasLength(statsRequestsBeforeBack),
+      );
+      expect(
+        logs,
+        contains(
+          '[player] phase=episode-stats-refresh episodeId=signal-1 cached=1',
+        ),
+      );
+      expect(logic.episodeStats('signal-1')?.likeCount, 11);
+
+      now = now.add(const Duration(seconds: 61));
+      await logic.requestEpisodeSelection(1);
+      await _drain(logic);
+      await logic.requestEpisodeSelection(0);
+      await _drain(logic);
+
+      expect(
+        adapter.requests.where(
+          (request) => request.uri.path.endsWith('/stats'),
+        ),
+        hasLength(statsRequestsBeforeBack + 2),
+      );
+      expect(
+        adapter.requests.where((request) => request.uri.path.endsWith('/play')),
+        hasLength(playRequestsBeforeBack),
+      );
+      expect(
+        logs.where(
+          (line) => line.contains(
+            'episode-stats-refresh episodeId=signal-1 cached=0',
+          ),
+        ),
+        hasLength(2),
+      );
+
+      logic.dispose();
+      await _drain(logic);
+      expect(factory.live, 0);
+    },
+  );
+
+  test('should_keep_local_like_count_when_switching_back', () async {
+    final stats = EpisodeStats(
+      episodeId: 'signal-1',
+      dramaId: 'signal',
+      likeCount: 7,
+      commentCount: 2,
+      favoriteCount: 30,
+      liked: false,
+      favorited: false,
+    );
+    final playback = FakePlaybackRepository(
+      statsByEpisode: {'signal-1': stats},
+    );
+    final logic = _logic(playback: playback);
+    logic.attach(
+      PlayerPage(drama: _drama('signal'), initialIndex: 0),
+      isMounted: () => true,
+    );
+    logic.start(
+      factory: _RecordingFactory().create,
+      coordinator: PlaybackCoordinator(),
+    );
+    await _drain(logic);
+    expect(logic.episodeStats('signal-1')?.likeCount, 7);
+
+    logic.applyEpisodeLikeState('signal-1', liked: true, likeCount: 8);
+    await logic.requestEpisodeSelection(1);
+    await _drain(logic);
+    await logic.requestEpisodeSelection(0);
+    await _drain(logic);
+
+    expect(logic.episodeStats('signal-1')?.liked, isTrue);
+    expect(logic.episodeStats('signal-1')?.likeCount, 8);
+
+    logic.dispose();
+    await _drain(logic);
+  });
+
+  test('should_keep_playback_when_episode_stats_fail', () async {
+    final playback = FakePlaybackRepository(
+      statsError: StateError('stats unavailable'),
+    );
+    final logic = _logic(playback: playback);
+    logic.attach(
+      PlayerPage(drama: _drama('signal'), initialIndex: 0),
+      isMounted: () => true,
+    );
+    logic.start(
+      factory: _RecordingFactory().create,
+      coordinator: PlaybackCoordinator(),
+    );
+    await _drain(logic);
+
+    expect(logic.session.active, isNotNull);
+    expect(logic.ticketError, isNull);
+    expect(logic.episodeStats('signal-1'), isNull);
+
+    logic.dispose();
+    await _drain(logic);
+  });
+}
+
+class _RecordingFactory {
+  int live = 0;
+  final List<_RecordingPlayer> created = [];
+
+  PlayerPort create(Episode episode) {
+    live++;
+    final player = _RecordingPlayer(onDispose: () => live--);
+    created.add(player);
+    return player;
+  }
+}
+
+class _RecordingPlayer implements PlayerPort {
+  _RecordingPlayer({required this.onDispose});
+
+  final void Function() onDispose;
+  bool disposed = false;
+
+  @override
+  Future<void> initialize() async {}
+
+  @override
+  Future<void> play() async {}
+
+  @override
+  Future<void> pause() async {}
+
+  @override
+  Future<void> dispose() async {
+    if (disposed) return;
+    disposed = true;
+    onDispose();
+  }
+}

test/player/player_hearts_pixels_test.dart

@@ -0,0 +1,106 @@
+// Author: fruit.com.cn
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:fruitshorts/pages/player/widgets/player_double_tap_hearts.dart';
+
+void main() {
+  testWidgets('heart pixels start at origin and move upward', (tester) async {
+    tester.view.physicalSize = const Size(400, 800);
+    tester.view.devicePixelRatio = 1;
+    addTearDown(tester.view.resetPhysicalSize);
+    addTearDown(tester.view.resetDevicePixelRatio);
+
+    var completedCalls = 0;
+    const origin = Offset(300, 546);
+    final clock = _HeartClock();
+    await tester.pumpWidget(
+      MaterialApp(
+        home: TickerMode(
+          enabled: false,
+          child: Scaffold(
+            body: Stack(
+              fit: StackFit.expand,
+              clipBehavior: Clip.none,
+              children: [
+                Positioned.fill(
+                  child: PlayerDoubleTapHeartBurst(
+                    burstId: 91,
+                    origin: origin,
+                    now: clock.now,
+                    onCompleted: () => completedCalls++,
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+
+    final firstHeart = find.byKey(const Key('double-tap-heart-0'));
+    expect(firstHeart, findsOneWidget);
+    final firstSize = tester.getSize(firstHeart);
+    final initialCenter = tester.getCenter(firstHeart);
+    debugPrint(
+      '[heart-pixels] initial size=${firstSize.width}x${firstSize.height} '
+      'center=${initialCenter.dx},${initialCenter.dy}',
+    );
+    expect(firstSize.width, closeTo(48, 1));
+    expect(firstSize.height, closeTo(48, 1));
+    expect(firstSize.width, greaterThan(20));
+    expect((initialCenter - origin).distance, lessThanOrEqualTo(1));
+
+    await _pumpHeartTime(tester, clock, const Duration(milliseconds: 300));
+    final center300 = tester.getCenter(firstHeart);
+    debugPrint('[heart-pixels] t=300 center=${center300.dx},${center300.dy}');
+    expect(center300.dy, lessThan(initialCenter.dy));
+    expect((center300.dx - origin.dx).abs(), lessThanOrEqualTo(30));
+
+    await _pumpHeartTime(tester, clock, const Duration(milliseconds: 300));
+    final center600 = tester.getCenter(firstHeart);
+    debugPrint('[heart-pixels] t=600 center=${center600.dx},${center600.dy}');
+    expect(center600.dy, lessThan(center300.dy));
+    expect((center600.dx - origin.dx).abs(), lessThanOrEqualTo(30));
+
+    await _pumpHeartTime(tester, clock, const Duration(milliseconds: 300));
+    final center900 = tester.getCenter(firstHeart);
+    debugPrint('[heart-pixels] t=900 center=${center900.dx},${center900.dy}');
+    expect(center900.dy, lessThan(center600.dy));
+    expect((center900.dx - origin.dx).abs(), lessThanOrEqualTo(30));
+    expect({
+      initialCenter.dy,
+      center300.dy,
+      center600.dy,
+      center900.dy,
+    }, hasLength(4));
+
+    await _pumpHeartTime(tester, clock, const Duration(milliseconds: 700));
+    expect(completedCalls, 1);
+  });
+}
+
+Future<void> _pumpHeartTime(
+  WidgetTester tester,
+  _HeartClock clock,
+  Duration duration,
+) async {
+  const frameMs = 16;
+  var remainingMs = duration.inMilliseconds;
+  while (remainingMs > 0) {
+    final stepMs = remainingMs >= frameMs ? frameMs : remainingMs;
+    clock.advance(Duration(milliseconds: stepMs));
+    await tester.pump(const Duration(milliseconds: frameMs));
+    remainingMs -= stepMs;
+  }
+}
+
+class _HeartClock {
+  DateTime _now = DateTime(2026, 10, 26, 12);
+
+  DateTime now() => _now;
+
+  void advance(Duration duration) {
+    _now = _now.add(duration);
+  }
+}

test/player/player_locked_auth_flow_test.dart

@@ -0,0 +1,183 @@
+import 'package:flutter/services.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:fruitshorts/core/data/models/drama.dart';
+import 'package:fruitshorts/core/data/models/play_ticket.dart';
+import 'package:fruitshorts/core/data/models/player_port.dart';
+import 'package:fruitshorts/core/data/models/wallet.dart';
+import 'package:fruitshorts/core/data/repositories/commerce_repository.dart';
+import 'package:fruitshorts/core/data/repositories/playback_repository.dart';
+import 'package:fruitshorts/core/data/services/android_picture_in_picture.dart';
+import 'package:fruitshorts/core/data/services/playback_session.dart';
+import 'package:fruitshorts/core/data/services/wallet_controller.dart';
+import 'package:fruitshorts/pages/player/player_logic.dart';
+import 'package:fruitshorts/pages/player/player_view.dart';
+
+import '../support/fake_watch_history.dart';
+
+const _lockedDrama = Drama(
+  id: 'locked',
+  title: 'Locked',
+  synopsis: 'synopsis',
+  posterUrl: '/files/locked.png',
+  episodes: [
+    Episode(
+      id: 'locked-1',
+      number: 1,
+      title: 'Locked episode',
+      isFree: false,
+      locked: true,
+    ),
+  ],
+);
+
+void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
+
+  test('should_not_request_ticket_for_guest_on_locked_episode', () async {
+    final playback = FakePlaybackRepository();
+    final logic = _logic(playback, signedIn: false);
+    logic.attach(
+      const PlayerPage(drama: _lockedDrama, initialIndex: 0),
+      isMounted: () => true,
+    );
+    logic.start(
+      factory: (_) => _NoopPlayer(),
+      coordinator: PlaybackCoordinator(),
+    );
+    await _drain(logic);
+
+    expect(playback.requests, isEmpty);
+    expect(logic.session.isLocked, isTrue);
+
+    logic.dispose();
+    await _drain(logic);
+  });
+
+  test('should_request_ticket_after_user_is_signed_in', () async {
+    final playback = FakePlaybackRepository(
+      ticket: const PlayTicket(
+        episodeId: 'locked-1',
+        accessible: false,
+        accessType: PlayTicket.coinRequired,
+        unlockCoin: 30,
+      ),
+    );
+    final logic = _logic(playback, signedIn: true);
+    logic.attach(
+      const PlayerPage(drama: _lockedDrama, initialIndex: 0),
+      isMounted: () => true,
+    );
+    logic.start(
+      factory: (_) => _NoopPlayer(),
+      coordinator: PlaybackCoordinator(),
+    );
+    await _drain(logic);
+
+    expect(playback.requests, ['locked-1']);
+    expect(logic.blockedEpisodeId, 'locked-1');
+
+    logic.dispose();
+    await _drain(logic);
+  });
+
+  test('should_resume_unlock_and_play_for_same_episode_after_login', () async {
+    var signedIn = false;
+    final playback = FakePlaybackRepository(
+      ticket: const PlayTicket(
+        episodeId: 'locked-1',
+        accessible: true,
+        accessType: 'ENTITLED',
+        playUrl: '/files/locked-1.mp4',
+      ),
+    );
+    final logic = _logic(
+      playback,
+      signedIn: false,
+      isSignedIn: () => signedIn,
+      wallet: WalletController(_UnlockCommerceRepository()),
+    );
+    logic.attach(
+      const PlayerPage(drama: _lockedDrama, initialIndex: 0),
+      isMounted: () => true,
+    );
+    logic.start(
+      factory: (_) => _NoopPlayer(),
+      coordinator: PlaybackCoordinator(),
+    );
+    await _drain(logic);
+
+    expect(playback.requests, isEmpty);
+    expect(logic.blockedEpisodeId, 'locked-1');
+
+    signedIn = true;
+    final unlocked = await logic.unlockEpisode(0);
+    await _drain(logic);
+
+    expect(unlocked, isTrue);
+    expect(playback.requests, ['locked-1']);
+    expect(logic.session.active, isNotNull);
+
+    logic.dispose();
+    await _drain(logic);
+  });
+}
+
+PlayerLogic _logic(
+  PlaybackRepository playback, {
+  bool signedIn = true,
+  bool Function()? isSignedIn,
+  WalletController? wallet,
+}) {
+  return PlayerLogic(
+    history: FakeWatchHistory(),
+    playback: playback,
+    wallet: wallet,
+    pictureInPicture: AndroidPictureInPicture(
+      channel: const MethodChannel('test/player_locked_auth_flow/pip'),
+    ),
+    waitForFrame: () async {},
+    isSignedIn: isSignedIn ?? () => signedIn,
+  );
+}
+
+Future<void> _drain(PlayerLogic logic) async {
+  for (var attempt = 0; attempt < 4; attempt++) {
+    await pumpEventQueue();
+    await logic.session.playbackSettled;
+    await logic.session.preloadSettled;
+  }
+}
+
+class _NoopPlayer implements PlayerPort {
+  @override
+  Future<void> initialize() async {}
+
+  @override
+  Future<void> play() async {}
+
+  @override
+  Future<void> pause() async {}
+
+  @override
+  Future<void> dispose() async {}
+}
+
+class _UnlockCommerceRepository implements CommerceRepository {
+  @override
+  Future<WalletSnapshot> fetchWallet() async => const WalletSnapshot(
+    wallet: CoinWallet(
+      coinBalance: 100,
+      totalRechargedCoin: 0,
+      totalConsumedCoin: 0,
+      totalRefundedCoin: 0,
+    ),
+  );
+
+  @override
+  Future<UnlockResult> unlock(String episodeId) async => const UnlockResult(
+    unlocked: true,
+    accessType: 'ENTITLED',
+    coinCost: 30,
+    coinBalance: 70,
+  );
+}

test/player/player_logic_test.dart

@@ -11,12 +11,15 @@ import 'package:fruitshorts/core/data/models/watch_progress.dart';
 import 'package:fruitshorts/core/data/models/download_license.dart';
 import 'package:fruitshorts/core/data/models/download_policy.dart';
 import 'package:fruitshorts/core/data/repositories/download_repository.dart';
+import 'package:fruitshorts/core/data/repositories/commerce_repository.dart';
 import 'package:fruitshorts/core/data/services/android_picture_in_picture.dart';
 import 'package:fruitshorts/core/data/services/download_controller.dart';
 import 'package:fruitshorts/core/data/services/download_storage.dart';
 import 'package:fruitshorts/core/data/services/playback_session.dart';
 import 'package:fruitshorts/core/data/services/playback_position_cache.dart';
 import 'package:fruitshorts/core/data/services/video_player_port.dart';
+import 'package:fruitshorts/core/data/services/wallet_controller.dart';
+import 'package:fruitshorts/core/data/models/wallet.dart';
 import 'package:fruitshorts/pages/player/player_logic.dart';
 import 'package:fruitshorts/pages/player/player_view.dart';
 import 'package:fruitshorts/pages/player/widgets/player_video_surface.dart';
@@ -46,6 +49,37 @@ Drama _drama(
   ],
 );
 
+Drama _gateDrama() => const Drama(
+  id: 'gate',
+  title: 'Gate',
+  synopsis: 'Gate synopsis',
+  posterUrl: '/files/gate.png',
+  episodes: [
+    Episode(
+      id: 'gate-1',
+      number: 1,
+      title: 'Free',
+      isFree: true,
+      videoUrl: 'https://example.test/gate-1.mp4',
+    ),
+    Episode(
+      id: 'gate-2',
+      number: 2,
+      title: 'Locked',
+      isFree: false,
+      locked: true,
+      videoUrl: 'https://example.test/gate-2.mp4',
+    ),
+    Episode(
+      id: 'gate-3',
+      number: 3,
+      title: 'Next',
+      isFree: true,
+      videoUrl: 'https://example.test/gate-3.mp4',
+    ),
+  ],
+);
+
 AndroidPictureInPicture _pip() =>
     AndroidPictureInPicture(channel: const MethodChannel('test/player_logic/pip'));
 
@@ -53,11 +87,13 @@ PlayerLogic _logic(
   FakeWatchHistory history, {
   PlaybackRepository? playback,
   PlaybackPositionCache? positionCache,
+  WalletController? wallet,
   Future<void> Function()? waitForFrame,
 }) => PlayerLogic(
   history: history,
   playback: playback ?? FakePlaybackRepository(),
   pictureInPicture: _pip(),
+  wallet: wallet,
   positionCache: positionCache,
   waitForFrame: waitForFrame ?? () async {},
 );
@@ -357,6 +393,71 @@ void main() {
     expect(logic.sessionEpisodes.first.videoUrl, 'file:///local/signal-1.mp4');
   });
 
+  test('should_write_ticket_poster_url_into_session_episode', () async {
+    final logic = _logic(
+      FakeWatchHistory(),
+      playback: FakePlaybackRepository(
+        ticket: const PlayTicket(
+          episodeId: 'signal-1',
+          accessible: true,
+          accessType: PlayTicket.free,
+          playUrl: '/files/signal-1.mp4',
+          posterUrl: '/files/transcoded/signal-1/poster.jpg',
+        ),
+      ),
+    );
+    logic.attach(
+      PlayerPage(drama: _drama('signal'), initialIndex: 0),
+      isMounted: () => true,
+    );
+    logic.start(factory: _RecordingFactory().create, coordinator: PlaybackCoordinator());
+    await _drain(logic);
+
+    expect(
+      logic.sessionEpisodes.first.posterUrl,
+      '/files/transcoded/signal-1/poster.jpg',
+    );
+
+    logic.dispose();
+    await _drain(logic);
+  });
+
+  test('should_coalesce_rapid_page_selection_and_keep_pool_bounded', () async {
+    final factory = _RecordingFactory();
+    final playback = FakePlaybackRepository();
+    final logic = _logic(FakeWatchHistory(), playback: playback);
+    logic.attach(
+      PlayerPage(
+        drama: _drama('rapid', numbers: const [1, 2, 3, 4, 5, 6]),
+        initialIndex: 0,
+      ),
+      isMounted: () => true,
+    );
+    logic.start(factory: factory.create, coordinator: PlaybackCoordinator());
+    await _drain(logic);
+
+    await Future.wait([
+      for (var index = 1; index <= 5; index++)
+        logic.requestEpisodeSelection(index),
+    ]);
+    await _drain(logic);
+
+    expect(logic.session.currentIndex, 5);
+    expect(playback.requests, containsAll(['rapid-1', 'rapid-2', 'rapid-6']));
+    expect(playback.requests, isNot(contains('rapid-3')));
+    expect(playback.requests, isNot(contains('rapid-4')));
+    expect(playback.requests, isNot(contains('rapid-5')));
+    expect(logic.session.livePlayerCount, lessThanOrEqualTo(3));
+    expect(factory.live, lessThanOrEqualTo(3));
+
+    await logic.requestEpisodeSelection(0);
+    await _drain(logic);
+    expect(logic.session.currentIndex, 0);
+
+    logic.dispose();
+    await _drain(logic);
+  });
+
   group('surface flags', () {
     test('should_set_immersive_when_picture_in_picture_callback_fires', () async {
       final factory = _RecordingFactory();
@@ -581,6 +682,88 @@ void main() {
       await _drain(logic);
     });
 
+    test('should_pause_and_release_when_swiping_to_locked_episode', () async {
+      final factory = _RecordingFactory();
+      final playback = FakePlaybackRepository();
+      final logic = _logic(FakeWatchHistory(), playback: playback);
+      logic.attach(
+        PlayerPage(drama: _gateDrama(), initialIndex: 0),
+        isMounted: () => true,
+      );
+      logic.start(factory: factory.create, coordinator: PlaybackCoordinator());
+      await _drain(logic);
+      final previous = factory.created.single;
+
+      playback.ticket = const PlayTicket(
+        episodeId: 'gate-2',
+        accessible: false,
+        accessType: PlayTicket.coinRequired,
+        unlockCoin: 30,
+      );
+      await logic.selectEpisode(1);
+      await _drain(logic);
+
+      expect(previous.pauses, greaterThan(0));
+      expect(previous.disposed, isTrue);
+      expect(logic.session.active, isNull);
+      expect(factory.live, 0);
+      expect(factory.created, hasLength(1));
+      expect(logic.blockedEpisodeId, 'gate-2');
+
+      playback.ticket = null;
+      await logic.selectEpisode(2);
+      await _drain(logic);
+      expect(logic.session.active, isNotNull);
+      expect(factory.created.last.plays, greaterThan(0));
+
+      logic.dispose();
+      await _drain(logic);
+    });
+
+    test('should_start_locked_episode_after_unlock_succeeds', () async {
+      final factory = _RecordingFactory();
+      final playback = FakePlaybackRepository();
+      final wallet = WalletController(_UnlockCommerceRepository());
+      final logic = _logic(
+        FakeWatchHistory(),
+        playback: playback,
+        wallet: wallet,
+      );
+      logic.attach(
+        PlayerPage(drama: _gateDrama(), initialIndex: 0),
+        isMounted: () => true,
+      );
+      logic.start(factory: factory.create, coordinator: PlaybackCoordinator());
+      await _drain(logic);
+      playback.ticket = const PlayTicket(
+        episodeId: 'gate-2',
+        accessible: false,
+        accessType: PlayTicket.coinRequired,
+        unlockCoin: 30,
+      );
+      await logic.selectEpisode(1);
+      await _drain(logic);
+      expect(logic.session.active, isNull);
+
+      playback.ticket = const PlayTicket(
+        episodeId: 'gate-2',
+        accessible: true,
+        accessType: PlayTicket.coinRequired,
+        playUrl: '/files/gate-2.mp4',
+      );
+      final unlocked = await logic.unlockEpisode(1);
+      await _drain(logic);
+
+      expect(unlocked, isTrue);
+      expect(logic.isEpisodeLocked(logic.sessionEpisodes[1]), isFalse);
+      final active = logic.session.active;
+      expect(active, isA<_RecordingPlayer>());
+      expect((active! as _RecordingPlayer).plays, greaterThan(0));
+
+      logic.dispose();
+      await _drain(logic);
+    });
+
     test('should_preload_only_what_follows_when_starting_from_a_later_index', () async {
       final factory = _RecordingFactory();
       final drama = _drama('signal');
@@ -1403,3 +1586,23 @@ class _VideoRecordingPlayer extends VideoPlayerPort {
     await controller.dispose();
   }
 }
+
+class _UnlockCommerceRepository implements CommerceRepository {
+  @override
+  Future<WalletSnapshot> fetchWallet() async => const WalletSnapshot(
+    wallet: CoinWallet(
+      coinBalance: 100,
+      totalRechargedCoin: 0,
+      totalConsumedCoin: 0,
+      totalRefundedCoin: 0,
+    ),
+  );
+
+  @override
+  Future<UnlockResult> unlock(String episodeId) async => const UnlockResult(
+    unlocked: true,
+    accessType: PlayTicket.coinRequired,
+    coinCost: 30,
+    coinBalance: 70,
+  );
+}

test/player/player_opening_frame_test.dart

@@ -5,7 +5,9 @@ import 'dart:ui' as ui;
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:fruitshorts/core/data/services/sprite_thumbnail_asset_loader.dart';
+import 'package:fruitshorts/core/data/services/sprite_thumbnail_axis.dart';
 import 'package:fruitshorts/pages/player/widgets/player_opening_frame.dart';
+import 'package:fruitshorts/pages/player/widgets/scrub_preview_card.dart';
 
 const String _spriteVtt = '''
 WEBVTT
@@ -15,42 +17,125 @@ sprite_001.jpg#xywh=0,0,160,90
 ''';
 
 void main() {
-  test('should_return_no_opening_frame_when_thumbnails_url_is_empty', () {
-    expect(playerOpeningFrame(null), isNull);
-    expect(playerOpeningFrame('  '), isNull);
+  test('should_choose_poster_before_thumbnails_when_both_are_available', () {
+    final service = SpriteThumbnailAxisService(loader: _FakeSpriteLoader());
+    addTearDown(service.dispose);
+
+    final frame =
+        playerOpeningFrame(
+              'https://cdn.test/thumbnails.vtt',
+              posterUrl: 'https://cdn.test/poster.jpg',
+              spriteSource: service,
+              fit: BoxFit.cover,
+            )
+            as PlayerOpeningFrame;
+
+    expect(frame.posterUrl, 'https://cdn.test/poster.jpg');
+    expect(frame.thumbnailsUrl, 'https://cdn.test/thumbnails.vtt');
+    expect(frame.fit, BoxFit.cover);
+    expect(
+      playerOpeningFallback(
+        posterUrl: frame.posterUrl,
+        thumbnailsUrl: frame.thumbnailsUrl,
+      ),
+      PlayerOpeningFallback.poster,
+    );
   });
 
-  testWidgets('should_load_and_reuse_first_sprite_frame', (tester) async {
+  testWidgets('should_use_poster_without_decoding_sprite_when_poster_exists', (
+    tester,
+  ) async {
     final loader = _FakeSpriteLoader();
-    final cache = OpeningFrameCache();
-    addTearDown(cache.clear);
+    final service = SpriteThumbnailAxisService(loader: loader);
+    addTearDown(service.dispose);
 
-    final first = await cache.load(
-      'https://cdn.test/thumbnails.vtt',
-      loader: loader,
-    );
-    final second = await cache.load(
-      'https://cdn.test/thumbnails.vtt',
-      loader: loader,
+    await tester.pumpWidget(
+      MaterialApp(
+        home: PlayerOpeningFrame(
+          posterUrl: 'https://cdn.test/poster.jpg',
+          thumbnailsUrl: 'https://cdn.test/thumbnails.vtt',
+          spriteSource: service,
+        ),
+      ),
     );
 
-    expect(first, isNotNull);
-    expect(second, same(first));
+    expect(find.byKey(const Key('player-opening-poster')), findsOneWidget);
+    expect(find.byKey(const Key('player-opening-sprite')), findsNothing);
+    expect(loader.vttCalls, 0);
+  });
+
+  testWidgets('should_decode_fullscreen_poster_at_screen_width', (
+    tester,
+  ) async {
+    final service = SpriteThumbnailAxisService(loader: _FakeSpriteLoader());
+    addTearDown(service.dispose);
+
+    await tester.pumpWidget(
+      MaterialApp(
+        home: MediaQuery(
+          data: const MediaQueryData(devicePixelRatio: 3),
+          child: Center(
+            child: SizedBox(
+              width: 390,
+              height: 844,
+              child: PlayerOpeningFrame(
+                posterUrl: 'https://cdn.test/poster.jpg',
+                thumbnailsUrl: '',
+                spriteSource: service,
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+
+    final image = tester.widget<Image>(
+      find.byKey(const Key('player-opening-poster')),
+    );
+    final provider = image.image as ResizeImage;
+    expect(provider.width, 1170);
+  });
+
+  testWidgets('should_return_no_opening_frame_when_thumbnails_is_empty', (
+    tester,
+  ) async {
+    final service = SpriteThumbnailAxisService(loader: _FakeSpriteLoader());
+    addTearDown(service.dispose);
+
+    expect(playerOpeningFrame(null, spriteSource: service), isNull);
+    expect(playerOpeningFrame('  ', spriteSource: service), isNull);
+  });
+
+  testWidgets('should_render_prewarmed_zero_frame_from_shared_cache', (
+    tester,
+  ) async {
+    final loader = _FakeSpriteLoader();
+    final service = SpriteThumbnailAxisService(loader: loader);
+    addTearDown(service.dispose);
+    const url = 'https://cdn.test/thumbnails.vtt';
+    await service.prepareAt(url, Duration.zero);
+
+    await tester.pumpWidget(
+      MaterialApp(
+        home: PlayerOpeningFrame(thumbnailsUrl: url, spriteSource: service),
+      ),
+    );
+    await tester.pump();
+
+    expect(find.byKey(const Key('player-opening-sprite')), findsOneWidget);
     expect(loader.vttCalls, 1);
     expect(loader.spriteCalls, ['sprite_001.jpg']);
   });
 
-  testWidgets('should_render_decoded_opening_frame', (tester) async {
-    final loader = _FakeSpriteLoader();
-    final cache = OpeningFrameCache();
-    addTearDown(cache.clear);
+  testWidgets('should_load_sprite_when_not_prewarmed', (tester) async {
+    final service = SpriteThumbnailAxisService(loader: _FakeSpriteLoader());
+    addTearDown(service.dispose);
 
     await tester.pumpWidget(
       MaterialApp(
         home: PlayerOpeningFrame(
           thumbnailsUrl: 'https://cdn.test/thumbnails.vtt',
-          loader: loader,
-          cache: cache,
+          spriteSource: service,
         ),
       ),
     );
@@ -58,6 +143,28 @@ void main() {
 
     expect(find.byKey(const Key('player-opening-sprite')), findsOneWidget);
   });
+
+  testWidgets('should_use_same_fit_for_sprite_and_video', (tester) async {
+    final service = SpriteThumbnailAxisService(loader: _FakeSpriteLoader());
+    addTearDown(service.dispose);
+    const url = 'https://cdn.test/thumbnails.vtt';
+    await service.prepareAt(url, Duration.zero);
+
+    await tester.pumpWidget(
+      MaterialApp(
+        home: PlayerOpeningFrame(
+          thumbnailsUrl: url,
+          spriteSource: service,
+          fit: BoxFit.contain,
+        ),
+      ),
+    );
+
+    final preview = tester.widget<SpriteCropPreview>(
+      find.byKey(const Key('player-opening-sprite')),
+    );
+    expect(preview.fit, BoxFit.contain);
+  });
 }
 
 class _FakeSpriteLoader implements SpriteThumbnailAssetLoader {

test/player/player_render_stack_test.dart

@@ -0,0 +1,148 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:fruitshorts/pages/player/widgets/player_render_stack.dart';
+import 'package:fruitshorts/pages/player/widgets/player_video_surface.dart';
+import 'package:video_player/video_player.dart';
+
+void main() {
+  testWidgets('should_keep_slots_alive_and_only_translate_during_page_change', (
+    tester,
+  ) async {
+    final pages = PageController(initialPage: 1);
+    final previousController = _controller('previous');
+    final currentController = _controller('current');
+    final nextController = _controller('next');
+    addTearDown(pages.dispose);
+    addTearDown(previousController.dispose);
+    addTearDown(currentController.dispose);
+    addTearDown(nextController.dispose);
+
+    var currentIndex = 1;
+    late StateSetter rebuild;
+    await tester.pumpWidget(
+      MaterialApp(
+        home: Scaffold(
+          body: StatefulBuilder(
+            builder: (context, setState) {
+              rebuild = setState;
+              return Stack(
+                fit: StackFit.expand,
+                children: [
+                  PlayerRenderStack(
+                    pageController: pages,
+                    slots: _slots(
+                      currentIndex: currentIndex,
+                      previousController: previousController,
+                      currentController: currentController,
+                      nextController: nextController,
+                    ),
+                  ),
+                  PageView(
+                    controller: pages,
+                    children: const [
+                      SizedBox.expand(key: Key('page-0')),
+                      SizedBox.expand(key: Key('page-1')),
+                      SizedBox.expand(key: Key('page-2')),
+                    ],
+                  ),
+                ],
+              );
+            },
+          ),
+        ),
+      ),
+    );
+    await tester.pump();
+
+    final currentSlot = find.byKey(
+      const ValueKey('player-render-slot-current'),
+    );
+    final currentState = tester.state(currentSlot);
+    final currentElement = tester.element(currentSlot);
+    final currentSurface = tester.widget<PlayerVideoSurface>(currentSlot);
+    expect(currentSurface.controller, same(currentController));
+    expect(_translationY(tester, 'current'), 0);
+    expect(_translationY(tester, 'next'), greaterThan(0));
+
+    pages.jumpToPage(2);
+    await tester.pump();
+    await tester.pump();
+
+    expect(tester.state(currentSlot), same(currentState));
+    expect(tester.element(currentSlot), same(currentElement));
+    expect(
+      tester.widget<PlayerVideoSurface>(currentSlot).controller,
+      same(currentController),
+    );
+    expect(_translationY(tester, 'current'), lessThan(0));
+    expect(_translationY(tester, 'next'), 0);
+
+    rebuild(() => currentIndex = 2);
+    await tester.pump();
+
+    expect(tester.state(currentSlot), same(currentState));
+    expect(tester.element(currentSlot), same(currentElement));
+    expect(_translationY(tester, 'current'), 0);
+    expect(_translationY(tester, 'previous'), lessThan(0));
+    expect(
+      find.descendant(
+        of: find.byType(PlayerRenderStack),
+        matching: find.byType(IgnorePointer),
+      ),
+      findsOneWidget,
+    );
+  });
+}
+
+Map<PlayerRenderSlotRole, PlayerRenderSlotData> _slots({
+  required int currentIndex,
+  required VideoPlayerController previousController,
+  required VideoPlayerController currentController,
+  required VideoPlayerController nextController,
+}) {
+  return {
+    PlayerRenderSlotRole.previous: PlayerRenderSlotData(
+      role: PlayerRenderSlotRole.previous,
+      index: currentIndex - 1,
+      pagePosition: (currentIndex - 1).toDouble(),
+      controller: previousController,
+      placeholder: const ColoredBox(
+        key: Key('previous-placeholder'),
+        color: Colors.red,
+      ),
+    ),
+    PlayerRenderSlotRole.current: PlayerRenderSlotData(
+      role: PlayerRenderSlotRole.current,
+      index: currentIndex,
+      pagePosition: currentIndex.toDouble(),
+      controller: currentController,
+      placeholder: const ColoredBox(
+        key: Key('current-placeholder'),
+        color: Colors.green,
+      ),
+    ),
+    PlayerRenderSlotRole.next: PlayerRenderSlotData(
+      role: PlayerRenderSlotRole.next,
+      index: currentIndex + 1,
+      pagePosition: (currentIndex + 1).toDouble(),
+      controller: nextController,
+      placeholder: const ColoredBox(
+        key: Key('next-placeholder'),
+        color: Colors.blue,
+      ),
+    ),
+  };
+}
+
+VideoPlayerController _controller(String name) {
+  return VideoPlayerController.networkUrl(
+    Uri.parse('https://example.test/$name.mp4'),
+  );
+}
+
+double _translationY(WidgetTester tester, String role) {
+  final transform = tester.widget<Transform>(
+    find.byKey(Key('player-render-transform-$role')),
+  );
+  return transform.transform.getTranslation().y;
+}

test/player/player_video_surface_test.dart

@@ -7,147 +7,130 @@ import 'package:video_player/video_player.dart';
 import 'package:fruitshorts/pages/player/widgets/player_video_surface.dart';
 
 void main() {
-  testWidgets('should_keep_fallback_visible_before_video_is_ready', (
+  testWidgets('should_show_black_without_placeholder_before_video', (
     tester,
   ) async {
     await _pumpSurface(tester);
 
     expect(_fallbackColor(tester), Colors.black);
-    expect(find.byKey(const Key('player-opening-frame')), findsNothing);
-    expect(_opacity(tester), 0);
+    expect(find.byKey(const Key('player-single-placeholder')), findsNothing);
+    expect(find.byKey(const Key('player-video-layer')), findsNothing);
   });
 
-  testWidgets('should_show_opening_frame_before_decode_is_ready', (
+  testWidgets('should_show_exactly_one_placeholder_before_first_frame', (
     tester,
   ) async {
+    await _pumpSurface(tester, placeholder: _placeholder('opening'));
+
+    expect(find.byKey(const Key('player-single-placeholder')), findsOneWidget);
+    expect(find.byKey(const Key('opening')), findsOneWidget);
+    expect(find.byKey(const Key('player-video-crossfade')), findsNothing);
+    expect(find.byKey(const Key('player-video-layer')), findsNothing);
+  });
+
+  testWidgets('should_skip_placeholder_for_warm_controller', (tester) async {
     await _pumpSurface(
       tester,
-      openingFrame: const ColoredBox(
-        key: Key('fake-opening'),
-        color: Colors.red,
-      ),
+      placeholder: _placeholder('opening'),
+      warmFrameAvailable: true,
+      thumbnailReady: true,
+      value: _initializedValue,
     );
 
-    expect(find.byKey(const Key('player-opening-frame')), findsOneWidget);
-    expect(find.byKey(const Key('fake-opening')), findsOneWidget);
-    expect(_opacity(tester), 0);
+    expect(find.byKey(const Key('player-single-placeholder')), findsNothing);
+    expect(find.byKey(const Key('player-video-layer')), findsOneWidget);
+    expect(find.byKey(const Key('player-video-crossfade')), findsNothing);
   });
 
-  testWidgets('should_reveal_paused_frame_when_initialized', (tester) async {
-    final controller = await _pumpSurface(tester);
-    controller.value = const VideoPlayerValue(
-      duration: Duration(minutes: 1),
-      size: Size(1280, 720),
-      position: Duration.zero,
-      isInitialized: true,
-      isPlaying: false,
-    );
-    await tester.pump();
-
-    expect(_opacity(tester), 1);
-    expect(find.byKey(const Key('player-opening-frame')), findsNothing);
-  });
-
-  testWidgets('should_fade_video_in_within_200ms_after_first_frame', (
+  testWidgets('should_cross_fade_once_after_first_frame_is_confirmed', (
     tester,
   ) async {
     final controller = await _pumpSurface(
       tester,
-      openingFrame: const ColoredBox(color: Colors.red),
-    );
-    expect(_opacity(tester), 0);
-
-    controller.value = const VideoPlayerValue(
-      duration: Duration(minutes: 1),
-      size: Size(1280, 720),
-      position: Duration(milliseconds: 1),
-      isInitialized: true,
-      isPlaying: true,
+      placeholder: _placeholder('opening'),
+      thumbnailReady: true,
+      waitForPlaybackFrame: true,
     );
+    controller.value = _readyValue(position: Duration.zero, playing: true);
     await tester.pump();
 
-    expect(_opacity(tester), 1);
-    expect(find.byKey(const Key('player-opening-frame')), findsNothing);
-    expect(
-      tester
-          .widget<AnimatedOpacity>(
-            find.byKey(const Key('player-video-opacity')),
-          )
-          .duration,
-      const Duration(milliseconds: 200),
+    expect(find.byKey(const Key('player-single-placeholder')), findsOneWidget);
+    expect(find.byKey(const Key('player-video-crossfade')), findsNothing);
+
+    controller.value = _readyValue(
+      position: const Duration(milliseconds: 1),
+      playing: true,
     );
+    await tester.pump();
+    await tester.pump();
+    await tester.pump();
+
+    expect(find.byKey(const Key('player-single-placeholder')), findsOneWidget);
+    expect(find.byKey(const Key('player-video-crossfade')), findsOneWidget);
+    expect(find.byKey(const Key('player-video-layer')), findsNothing);
+    expect(_crossFadeValue(tester), 0);
+
+    await tester.pump(const Duration(milliseconds: 90));
+    expect(find.byKey(const Key('player-single-placeholder')), findsOneWidget);
+    expect(find.byKey(const Key('player-video-crossfade')), findsOneWidget);
+    expect(_crossFadeValue(tester), greaterThan(0));
+    expect(_crossFadeValue(tester), lessThan(1));
+
     await tester.pump(const Duration(milliseconds: 100));
-    final halfway = _fadeValue(tester);
-    expect(halfway, greaterThan(0));
-    expect(halfway, lessThan(1));
-    await tester.pump(const Duration(milliseconds: 100));
-    expect(_fadeValue(tester), 1);
+    expect(find.byKey(const Key('player-single-placeholder')), findsNothing);
+    expect(find.byKey(const Key('player-video-crossfade')), findsNothing);
+    expect(find.byKey(const Key('player-video-layer')), findsOneWidget);
+
+    controller.value = _readyValue(
+      position: const Duration(seconds: 1),
+      playing: true,
+    );
+    await tester.pump();
+    expect(find.byKey(const Key('player-video-crossfade')), findsNothing);
+    expect(find.byKey(const Key('player-video-layer')), findsOneWidget);
   });
 
-  testWidgets('should_show_video_error_above_retained_fallback', (
-    tester,
-  ) async {
+  testWidgets('should_keep_placeholder_above_video_error', (tester) async {
     await _pumpSurface(
       tester,
+      placeholder: _placeholder('opening'),
       value: const VideoPlayerValue.erroneous('No route to host'),
     );
 
+    expect(find.byKey(const Key('opening')), findsOneWidget);
     expect(find.byKey(const Key('player-video-error')), findsOneWidget);
     expect(find.text('No route to host'), findsOneWidget);
-    expect(_fallbackColor(tester), Colors.black);
-    expect(_opacity(tester), 0);
-  });
-
-  testWidgets('should_cover_new_video_only_while_handoff_is_held', (
-    tester,
-  ) async {
-    final current = VideoPlayerController.networkUrl(
-      Uri.parse('http://192.168.31.187:8081/files/720.m3u8'),
-    );
-    final previous = VideoPlayerController.networkUrl(
-      Uri.parse('http://192.168.31.187:8081/files/360.m3u8'),
-    );
-    addTearDown(current.dispose);
-    addTearDown(previous.dispose);
-    const ready = VideoPlayerValue(
-      duration: Duration(minutes: 1),
-      size: Size(1280, 720),
-      position: Duration(seconds: 3),
-      isInitialized: true,
-      isPlaying: true,
-    );
-    current.value = ready;
-    previous.value = ready;
-
-    Future<void> pump(VideoPlayerController? handoff) {
-      return tester.pumpWidget(
-        MaterialApp(
-          home: Scaffold(
-            body: PlayerVideoSurface(
-              controller: current,
-              handoff: handoff,
-              videoUrl: current.dataSource,
-              theater: false,
-            ),
-          ),
-        ),
-      );
-    }
-
-    await pump(previous);
-    expect(find.byKey(const Key('player-video-handoff')), findsOneWidget);
-    expect(_opacity(tester), 1);
-
-    await pump(null);
-    expect(find.byKey(const Key('player-video-handoff')), findsNothing);
-    expect(find.byType(VideoPlayer), findsOneWidget);
   });
 }
 
+Widget _placeholder(String key) => ColoredBox(key: Key(key), color: Colors.red);
+
+const VideoPlayerValue _initializedValue = VideoPlayerValue(
+  duration: Duration(minutes: 1),
+  size: Size(1280, 720),
+  position: Duration.zero,
+  isInitialized: true,
+  isPlaying: false,
+);
+
+VideoPlayerValue _readyValue({
+  required Duration position,
+  required bool playing,
+}) => VideoPlayerValue(
+  duration: const Duration(minutes: 1),
+  size: const Size(1280, 720),
+  position: position,
+  isInitialized: true,
+  isPlaying: playing,
+);
+
 Future<VideoPlayerController> _pumpSurface(
   WidgetTester tester, {
   VideoPlayerValue? value,
-  Widget? openingFrame,
+  Widget? placeholder,
+  bool warmFrameAvailable = false,
+  bool thumbnailReady = false,
+  bool waitForPlaybackFrame = false,
 }) async {
   final controller = VideoPlayerController.networkUrl(
     Uri.parse('http://192.168.31.187:8081/files/video.mp4'),
@@ -161,7 +144,10 @@ Future<VideoPlayerController> _pumpSurface(
           controller: controller,
           videoUrl: controller.dataSource,
           theater: false,
-          openingFrame: openingFrame,
+          placeholder: placeholder,
+          warmFrameAvailable: warmFrameAvailable,
+          thumbnailReady: thumbnailReady,
+          waitForPlaybackFrame: waitForPlaybackFrame,
         ),
       ),
     ),
@@ -176,16 +162,9 @@ Color _fallbackColor(WidgetTester tester) {
       .color;
 }
 
-double _opacity(WidgetTester tester) {
+double _crossFadeValue(WidgetTester tester) {
   return tester
-      .widget<AnimatedOpacity>(find.byKey(const Key('player-video-opacity')))
-      .opacity;
-}
-
-double _fadeValue(WidgetTester tester) {
-  final fade = find.descendant(
-    of: find.byKey(const Key('player-video-opacity')),
-    matching: find.byType(FadeTransition),
-  );
-  return tester.widget<FadeTransition>(fade).opacity.value;
+      .widget<FadeTransition>(find.byKey(const Key('player-video-crossfade')))
+      .opacity
+      .value;
 }

test/player/remote_image_decode_test.dart

@@ -0,0 +1,35 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:fruitshorts/core/widgets/remote_image.dart';
+
+void main() {
+  test('should_bound_layout_pixels_for_small_and_large_extents', () {
+    expect(resolveImageDecodePixels(12, 3), 96);
+    expect(resolveImageDecodePixels(120, 3), 360);
+    expect(resolveImageDecodePixels(4000, 3), 2048);
+  });
+
+  testWidgets('should_decode_grid_cover_at_layout_width_times_dpr', (
+    tester,
+  ) async {
+    await tester.pumpWidget(
+      MaterialApp(
+        home: MediaQuery(
+          data: const MediaQueryData(devicePixelRatio: 3),
+          child: Center(
+            child: SizedBox(
+              width: 120,
+              height: 160,
+              child: RemoteImage('/files/grid-cover.jpg'),
+            ),
+          ),
+        ),
+      ),
+    );
+
+    final image = tester.widget<Image>(find.byType(Image));
+    final provider = image.image as ResizeImage;
+    expect(provider.width, 360);
+    expect(provider.height, 480);
+  });
+}

test/player/scrub_preview_card_test.dart

@@ -67,13 +67,11 @@ void main() {
     await tester.pump();
 
     expect(loader.calls, 1);
-    expect(find.byKey(const Key('scrub-preview-poster')), findsOneWidget);
+    expect(find.byKey(const Key('scrub-preview-background')), findsOneWidget);
     expect(find.byKey(const Key('scrub-preview-sprite')), findsNothing);
   });
 
-  testWidgets('should_keep_poster_when_axis_and_local_frame_both_fail', (
-    tester,
-  ) async {
+  testWidgets('should_keep_background_when_frames_both_fail', (tester) async {
     final loader = _CountingThumbnailLoader();
     final localService = _localService(loader);
     final axis = _FakeAxisSource(axisReady: true);
@@ -90,7 +88,7 @@ void main() {
     await tester.pump();
 
     expect(loader.calls, 1);
-    expect(find.byKey(const Key('scrub-preview-poster')), findsOneWidget);
+    expect(find.byKey(const Key('scrub-preview-background')), findsOneWidget);
     expect(find.byKey(const Key('scrub-preview-sprite')), findsNothing);
     expect(find.byKey(const Key('scrub-preview-frame')), findsNothing);
   });
@@ -109,7 +107,6 @@ Widget _card({
           spriteAxisService: axis,
           thumbnailsUrl: thumbnailsUrl,
           episodeId: 'episode-1',
-          posterUrl: '',
           position: const Duration(seconds: 1),
           duration: const Duration(seconds: 10),
         ),

test/recommend/recommend_sections_test.dart

@@ -464,28 +464,36 @@ void main() {
     expect(find.byKey(const Key('recommend-tab-recommend')), findsOneWidget);
   });
 
-  testWidgets('should_open_standalone_player_from_title_and_watch_all', (
+  testWidgets('should_open_full_player_presentation_from_title_and_watch_all', (
     tester,
   ) async {
     await _pumpRecommend(tester);
 
     await tester.tap(find.byKey(const Key('home-feed-series-name')));
     await tester.pumpAndSettle();
+    expect(find.byType(PlayerPage).last, findsOneWidget);
     expect(
       tester.widget<PlayerPage>(find.byType(PlayerPage).last).homeMode,
       isFalse,
     );
-    await tester.binding.handlePopRoute();
+    expect(find.byKey(const Key('player-back')), findsOneWidget);
+    expect(find.byKey(const Key('home-tabs-bar')).hitTestable(), findsNothing);
+    await tester.tap(find.byKey(const Key('player-back')));
     await tester.pumpAndSettle();
     expect(find.byKey(const Key('recommend-page')), findsOneWidget);
     expect(find.byKey(const Key('recommend-tab-recommend')), findsOneWidget);
 
     await tester.tap(find.byKey(const Key('home-feed-full-series')));
     await tester.pumpAndSettle();
+    expect(find.byType(PlayerPage).last, findsOneWidget);
     expect(
       tester.widget<PlayerPage>(find.byType(PlayerPage).last).homeMode,
       isFalse,
     );
+    expect(find.byKey(const Key('player-back')), findsOneWidget);
+    expect(find.byKey(const Key('home-tabs-bar')).hitTestable(), findsNothing);
+    await tester.tap(find.byKey(const Key('player-back')));
+    await tester.pumpAndSettle();
   });
 
   testWidgets('should_pull_refresh_recommend_feed_from_the_first_video', (

test/support/fake_catalog.dart

@@ -113,6 +113,7 @@ Drama _drama(
         number: index + 1,
         title: 'Episode ${index + 1}',
         isFree: true,
+        durationSec: 60,
         videoUrl: 'https://example.test/$format-$index.mp4',
         likeCount: likeCount,
         commentCount: commentCount,

test/widget_test.dart

@@ -266,7 +266,7 @@ void main() {
     expect(tester.takeException(), isNull);
   });
 
-  testWidgets('should_open_auth_gate_without_liking_when_signed_out', (
+  testWidgets('should_like_without_login_when_signed_out', (
     tester,
   ) async {
     SharedPreferencesAsyncPlatform.instance =
@@ -279,8 +279,8 @@ void main() {
     await tester.tap(find.byKey(const Key('player-rail-like')));
     await tester.pumpAndSettle();
 
-    expect(find.text('Sign in to continue'), findsOneWidget);
-    expect(interactions.likeTargets, isEmpty);
+    expect(find.text('Sign in to continue'), findsNothing);
+    expect(interactions.likeTargets, ['EPISODE:city-lights-demo-1']);
   });
 
   testWidgets('should_show_saved_player_drama_in_favorites', (tester) async {