Merge branch 'feature-watchLater'

This commit is contained in:
guozhigq
2024-12-02 00:11:36 +08:00
3 changed files with 8 additions and 4 deletions

View File

@ -122,6 +122,7 @@ class LaterController extends GetxController {
'heroTag': heroTag, 'heroTag': heroTag,
'sourceType': 'watchLater', 'sourceType': 'watchLater',
'count': laterList.length, 'count': laterList.length,
'mediaId': userInfo!.mid,
}, },
); );
} }

View File

@ -523,7 +523,7 @@ class VideoIntroController extends GetxController {
Get.find<VideoDetailController>(tag: heroTag); Get.find<VideoDetailController>(tag: heroTag);
/// 优先稍后再看、收藏夹 /// 优先稍后再看、收藏夹
if (videoDetailCtr.isWatchLaterVisible.value) { if (videoDetailCtr.sourceType.value != 'normal') {
episodes.addAll(videoDetailCtr.mediaList); episodes.addAll(videoDetailCtr.mediaList);
} else if (videoDetail.value.ugcSeason != null) { } else if (videoDetail.value.ugcSeason != null) {
final UgcSeason ugcSeason = videoDetail.value.ugcSeason!; final UgcSeason ugcSeason = videoDetail.value.ugcSeason!;

View File

@ -85,9 +85,12 @@ class _MediaListPanelState extends State<MediaListPanel> {
AppBar( AppBar(
toolbarHeight: 45, toolbarHeight: 45,
automaticallyImplyLeading: false, automaticallyImplyLeading: false,
title: Text( title: Padding(
widget.panelTitle ?? '稍后再看', padding: const EdgeInsets.only(left: 12),
style: Theme.of(context).textTheme.titleSmall, child: Text(
widget.panelTitle ?? '稍后再看',
style: Theme.of(context).textTheme.titleSmall,
),
), ),
actions: [ actions: [
IconButton( IconButton(