Merge branch 'main' into design

lib/pages/video/detail/introduction/widgets/fav_panel.dart

@@ -16,7 +16,7 @@ class FavPanel extends StatefulWidget {
 }
 
 class _FavPanelState extends State<FavPanel> {
-  final Box<dynamic> localCache = GStrorage.localCache;
+  final Box<dynamic> localCache = GStorage.localCache;
   late Future _futureBuilderFuture;
 
   @override

lib/pages/video/detail/introduction/widgets/group_panel.dart

@@ -18,7 +18,7 @@ class GroupPanel extends StatefulWidget {
 }
 
 class _GroupPanelState extends State<GroupPanel> {
-  final Box<dynamic> localCache = GStrorage.localCache;
+  final Box<dynamic> localCache = GStorage.localCache;
   late Future _futureBuilderFuture;
   late List<MemberTagItemModel> tagsList;
   bool showDefault = true;

lib/pages/video/detail/introduction/widgets/page_panel.dart

@@ -3,7 +3,6 @@ import 'dart:math';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/models/video_detail_res.dart';
-import 'package:pilipala/pages/video/detail/index.dart';
 import 'package:pilipala/pages/video/detail/introduction/index.dart';
 import '../../../../../common/pages_bottom_sheet.dart';
 import '../../../../../models/common/video_episode_type.dart';
@@ -32,25 +31,26 @@ class _PagesPanelState extends State<PagesPanel> {
   late int cid;
   late RxInt currentIndex = (-1).obs;
   final String heroTag = Get.arguments['heroTag'];
-  late VideoDetailController _videoDetailController;
   final ScrollController listViewScrollCtr = ScrollController();
-  late PersistentBottomSheetController? _bottomSheetController;
+  PersistentBottomSheetController? _bottomSheetController;
 
   @override
   void initState() {
     super.initState();
     cid = widget.cid;
     episodes = widget.pages;
-    _videoDetailController = Get.find<VideoDetailController>(tag: heroTag);
-    currentIndex.value = episodes.indexWhere((Part e) => e.cid == cid);
-    scrollToIndex();
-    _videoDetailController.cid.listen((int p0) {
+    updateCurrentIndexAndScroll();
+    widget.videoIntroCtr.lastPlayCid.listen((int p0) {
       cid = p0;
-      currentIndex.value = episodes.indexWhere((Part e) => e.cid == cid);
-      scrollToIndex();
+      updateCurrentIndexAndScroll();
     });
   }
 
+  void updateCurrentIndexAndScroll() {
+    currentIndex.value = widget.pages.indexWhere((Part e) => e.cid == cid);
+    scrollToIndex();
+  }
+
   @override
   void dispose() {
     listViewScrollCtr.dispose();
@@ -60,7 +60,10 @@ class _PagesPanelState extends State<PagesPanel> {
   void changeFucCall(item, i) async {
     widget.changeFuc?.call(item.cid, item.cover);
     currentIndex.value = i;
-    _bottomSheetController?.close();
+    cid = item.cid;
+    if (_bottomSheetController != null) {
+      _bottomSheetController?.close();
+    }
     scrollToIndex();
   }
 
@@ -112,7 +115,7 @@ class _PagesPanelState extends State<PagesPanel> {
                     widget.videoIntroCtr.bottomSheetController =
                         _bottomSheetController = EpisodeBottomSheet(
                       currentCid: cid,
-                      episodes: episodes,
+                      episodes: widget.pages,
                       changeFucCall: changeFucCall,
                       sheetHeight: widget.sheetHeight,
                       dataType: VideoEpidoesType.videoPart,

lib/pages/video/detail/introduction/widgets/season_panel.dart

@@ -33,6 +33,7 @@ class _SeasonPanelState extends State<SeasonPanel> {
   final String heroTag = Get.arguments['heroTag'];
   late VideoDetailController _videoDetailController;
   late PersistentBottomSheetController? _bottomSheetController;
+  int currentEpisodeIndex = -1;
 
   @override
   void initState() {
@@ -41,13 +42,12 @@ class _SeasonPanelState extends State<SeasonPanel> {
     _videoDetailController = Get.find<VideoDetailController>(tag: heroTag);
 
     /// 根据 cid 找到对应集，找到对应 episodes
-    /// 有多个episodes时，只显示其中一个
-    /// TODO 同时显示多个合集
     final List<SectionItem> sections = widget.ugcSeason.sections!;
     for (int i = 0; i < sections.length; i++) {
       final List<EpisodeItem> episodesList = sections[i].episodes!;
       for (int j = 0; j < episodesList.length; j++) {
         if (episodesList[j].cid == cid) {
+          currentEpisodeIndex = i;
           episodes = episodesList;
           continue;
         }
@@ -55,10 +55,10 @@ class _SeasonPanelState extends State<SeasonPanel> {
     }
 
     /// 取对应 season_id 的 episodes
-    currentIndex.value = episodes.indexWhere((EpisodeItem e) => e.cid == cid);
+    getCurrentIndex();
     _videoDetailController.cid.listen((int p0) {
       cid = p0;
-      currentIndex.value = episodes.indexWhere((EpisodeItem e) => e.cid == cid);
+      getCurrentIndex();
     });
   }
 
@@ -73,6 +73,23 @@ class _SeasonPanelState extends State<SeasonPanel> {
     _bottomSheetController?.close();
   }
 
+  // 获取currentIndex
+  void getCurrentIndex() {
+    currentIndex.value = episodes.indexWhere((EpisodeItem e) => e.cid == cid);
+    final List<SectionItem> sections = widget.ugcSeason.sections!;
+    if (sections.length == 1 && sections.first.type == 1) {
+      final List<EpisodeItem> episodesList = sections.first.episodes!;
+      for (int i = 0; i < episodesList.length; i++) {
+        for (int j = 0; j < episodesList[i].pages!.length; j++) {
+          if (episodesList[i].pages![j].cid == cid) {
+            currentIndex.value = i;
+            continue;
+          }
+        }
+      }
+    }
+  }
+
   Widget buildEpisodeListItem(
     EpisodeItem episode,
     int index,
@@ -125,6 +142,8 @@ class _SeasonPanelState extends State<SeasonPanel> {
                 sheetHeight: widget.sheetHeight,
                 dataType: VideoEpidoesType.videoEpisode,
                 ugcSeason: widget.ugcSeason,
+                currentEpisodeIndex: currentEpisodeIndex,
+                currentIndex: currentIndex.value,
               ).show(context);
             },
             child: Padding(