fix(player): 重构单层过渡并阻止锁定集串播

This commit is contained in:
Zhou Weidong committed 2026-10-26 14:41:18 +08:00
1 parent 70d8e0f982
commit 0cb0ab0613
8 files changed
+657 -335

No files matched your search

+29 -2
View File
@@ -100,6 +100,7 @@ class PlayerLogic extends ChangeNotifier {
bool pip = false;
bool pipPreparing = false;
final Map<String, int> pickedEpisode = {};
final Set<String> _unlockedEpisodeIds = {};
/// 解锁中的集 id 与失败文案;空表示没有进行中的解锁。
String? unlockingEpisodeId;
@@ -238,7 +239,8 @@ 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,
@@ -428,6 +430,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,6 +455,7 @@ 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,
@@ -467,7 +471,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;
}
@@ -566,6 +570,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);
@@ -962,6 +967,22 @@ 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;
}
}
// 起播前先要票据:拿不到就不起播,交给三态 UI 提示(失败可重试)
final ready = await ensureTicket(index);
if (request != pageRequest ||
@@ -973,6 +994,12 @@ class PlayerLogic extends ChangeNotifier {
await _selectVisible(index);
}
/// 收费集只有在本会话确认可播或解锁成功后才解除门禁。
bool isEpisodeLocked(Episode episode) {
return (episode.locked || !episode.isFree) &&
!_unlockedEpisodeIds.contains(episode.id);
}
/// 按可见队列选择一集,并预热上一集与下一集。
Future<void> _selectVisible(int index) {
return session.select(