feat: 顺序播放

lib/models/video/later.dart

@@ -1,6 +1,7 @@
 class MediaVideoItemModel {
   MediaVideoItemModel({
     this.id,
+    this.aid,
     this.offset,
     this.index,
     this.intro,
@@ -14,12 +15,13 @@ class MediaVideoItemModel {
     this.likeState,
     this.favState,
     this.page,
+    this.cid,
     this.pages,
     this.title,
     this.type,
     this.upper,
     this.link,
-    this.bvId,
+    this.bvid,
     this.shortLink,
     this.rights,
     this.elecInfo,
@@ -32,6 +34,7 @@ class MediaVideoItemModel {
   });
 
   int? id;
+  int? aid;
   int? offset;
   int? index;
   String? intro;
@@ -45,12 +48,13 @@ class MediaVideoItemModel {
   int? likeState;
   int? favState;
   int? page;
+  int? cid;
   List<Page>? pages;
   String? title;
   int? type;
   Upper? upper;
   String? link;
-  String? bvId;
+  String? bvid;
   String? shortLink;
   Rights? rights;
   dynamic elecInfo;
@@ -64,6 +68,7 @@ class MediaVideoItemModel {
   factory MediaVideoItemModel.fromJson(Map<String, dynamic> json) =>
       MediaVideoItemModel(
         id: json["id"],
+        aid: json["id"],
         offset: json["offset"],
         index: json["index"],
         intro: json["intro"],
@@ -77,6 +82,7 @@ class MediaVideoItemModel {
         likeState: json["like_state"],
         favState: json["fav_state"],
         page: json["page"],
+        cid: json["pages"] == null ? -1 : json["pages"].first['id'],
         // json["pages"] 可能为null
         pages: json["pages"] == null
             ? []
@@ -85,7 +91,7 @@ class MediaVideoItemModel {
         type: json["type"],
         upper: Upper.fromJson(json["upper"]),
         link: json["link"],
-        bvId: json["bv_id"],
+        bvid: json["bv_id"],
         shortLink: json["short_link"],
         rights: Rights.fromJson(json["rights"]),
         elecInfo: json["elec_info"],

lib/pages/video/detail/introduction/controller.dart

@@ -411,7 +411,12 @@ class VideoIntroController extends GetxController {
   }
 
   // 修改分P或番剧分集
-  Future changeSeasonOrbangu(bvid, cid, aid, cover) async {
+  Future changeSeasonOrbangu(
+    String bvid,
+    int cid,
+    int? aid,
+    String? cover,
+  ) async {
     // 重新获取视频资源
     final VideoDetailController videoDetailCtr =
         Get.find<VideoDetailController>(tag: heroTag);
@@ -422,13 +427,14 @@ class VideoIntroController extends GetxController {
       releatedCtr.queryRelatedVideo();
     }
 
-    videoDetailCtr.bvid = bvid;
-    videoDetailCtr.oid.value = aid ?? IdUtils.bv2av(bvid);
-    videoDetailCtr.cid.value = cid;
-    videoDetailCtr.danmakuCid.value = cid;
-    videoDetailCtr.cover.value = cover;
-    videoDetailCtr.queryVideoUrl();
-    videoDetailCtr.clearSubtitleContent();
+    videoDetailCtr
+      ..bvid = bvid
+      ..oid.value = aid ?? IdUtils.bv2av(bvid)
+      ..cid.value = cid
+      ..danmakuCid.value = cid
+      ..cover.value = cover ?? ''
+      ..queryVideoUrl()
+      ..clearSubtitleContent();
     await videoDetailCtr.getSubtitle();
     videoDetailCtr.setSubtitleContent();
     // 重新请求评论
@@ -478,7 +484,13 @@ class VideoIntroController extends GetxController {
     final List episodes = [];
     bool isPages = false;
     late String cover;
-    if (videoDetail.value.ugcSeason != null) {
+    final VideoDetailController videoDetailCtr =
+        Get.find<VideoDetailController>(tag: heroTag);
+
+    /// 优先稍后再看、收藏夹
+    if (videoDetailCtr.isWatchLaterVisible.value) {
+      episodes.addAll(videoDetailCtr.mediaList);
+    } else if (videoDetail.value.ugcSeason != null) {
       final UgcSeason ugcSeason = videoDetail.value.ugcSeason!;
       final List<SectionItem> sections = ugcSeason.sections!;
       for (int i = 0; i < sections.length; i++) {
@@ -495,10 +507,15 @@ class VideoIntroController extends GetxController {
         episodes.indexWhere((e) => e.cid == lastPlayCid.value);
     int nextIndex = currentIndex + 1;
     cover = episodes[nextIndex].cover;
-    final VideoDetailController videoDetailCtr =
-        Get.find<VideoDetailController>(tag: heroTag);
     final PlayRepeat platRepeat = videoDetailCtr.plPlayerController.playRepeat;
 
+    int cid = episodes[nextIndex].cid!;
+    while (cid == -1) {
+      nextIndex += 1;
+      SmartDialog.showToast('当前视频暂不支持播放，自动跳过');
+      cid = episodes[nextIndex].cid!;
+    }
+
     // 列表循环
     if (nextIndex >= episodes.length) {
       if (platRepeat == PlayRepeat.listCycle) {
@@ -508,7 +525,6 @@ class VideoIntroController extends GetxController {
         return;
       }
     }
-    final int cid = episodes[nextIndex].cid!;
     final String rBvid = isPages ? bvid : episodes[nextIndex].bvid;
     final int rAid = isPages ? IdUtils.bv2av(bvid) : episodes[nextIndex].aid!;
     changeSeasonOrbangu(rBvid, cid, rAid, cover);

lib/pages/video/detail/widgets/watch_later_list.dart

@@ -109,7 +109,7 @@ class _MediaListPanelState extends State<MediaListPanel> {
                     var item = mediaList[index];
                     return InkWell(
                       onTap: () async {
-                        String bvid = item.bvId!;
+                        String bvid = item.bvid!;
                         int? aid = item.id;
                         String cover = item.cover ?? '';
                         final int cid =
@@ -173,7 +173,7 @@ class _MediaListPanelState extends State<MediaListPanel> {
                                             overflow: TextOverflow.ellipsis,
                                             style: TextStyle(
                                               fontWeight: FontWeight.w500,
-                                              color: item.bvId == widget.bvid
+                                              color: item.bvid == widget.bvid
                                                   ? Theme.of(context)
                                                       .colorScheme
                                                       .primary