From 9f16296b0a9f0752b24f577593337887837fd8df Mon Sep 17 00:00:00 2001
From: guozhigq <guozhigq@outlook.com>
Date: Wed, 27 Nov 2024 23:55:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix=EF=BC=9AcurrentEpisodeIndex=20null?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/common/pages_bottom_sheet.dart                  | 3 +--
 lib/pages/video/detail/introduction/controller.dart | 3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/common/pages_bottom_sheet.dart b/lib/common/pages_bottom_sheet.dart
index fa6f61c7..434b73c4 100644
--- a/lib/common/pages_bottom_sheet.dart
+++ b/lib/common/pages_bottom_sheet.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/constants.dart';
@@ -183,7 +182,7 @@ class _PagesBottomSheetState extends State<PagesBottomSheet>
             isFixedHeight: true,
           );
         } else {
-          _listObserverControllerList![widget.currentEpisodeIndex!]
+          _listObserverControllerList![widget.currentEpisodeIndex ?? 0]
               .initialIndexModel = ObserverIndexPositionModel(
             index: currentIndex,
             isFixedHeight: true,
diff --git a/lib/pages/video/detail/introduction/controller.dart b/lib/pages/video/detail/introduction/controller.dart
index eafedd08..6578a882 100644
--- a/lib/pages/video/detail/introduction/controller.dart
+++ b/lib/pages/video/detail/introduction/controller.dart
@@ -608,6 +608,7 @@ class VideoIntroController extends GetxController {
   // 播放器底栏 选集 回调
   void showEposideHandler() {
     late List episodes;
+    int currentEpisodeIndex = 0;
     VideoEpidoesType dataType = VideoEpidoesType.videoEpisode;
     if (videoDetail.value.ugcSeason != null) {
       dataType = VideoEpidoesType.videoEpisode;
@@ -616,6 +617,7 @@ class VideoIntroController extends GetxController {
         final List<EpisodeItem> episodesList = sections[i].episodes!;
         for (int j = 0; j < episodesList.length; j++) {
           if (episodesList[j].cid == lastPlayCid.value) {
+            currentEpisodeIndex = i;
             episodes = episodesList;
             continue;
           }
@@ -635,6 +637,7 @@ class VideoIntroController extends GetxController {
         sheetHeight: Get.size.height,
         isFullScreen: true,
         ugcSeason: ugcSeason,
+        currentEpisodeIndex: currentEpisodeIndex,
         changeFucCall: (item, index) {
           if (dataType == VideoEpidoesType.videoEpisode) {
             changeSeasonOrbangu(

From 973a61c54a6a7e3b991aead0bc2dda27e29a1be4 Mon Sep 17 00:00:00 2001
From: guozhigq <guozhigq@outlook.com>
Date: Thu, 28 Nov 2024 00:07:18 +0800
Subject: [PATCH 2/2] refactor: currentEpisodeIndex calc

---
 .../introduction/widgets/season_panel.dart    | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/lib/pages/video/detail/introduction/widgets/season_panel.dart b/lib/pages/video/detail/introduction/widgets/season_panel.dart
index 291f1622..4a35f45b 100644
--- a/lib/pages/video/detail/introduction/widgets/season_panel.dart
+++ b/lib/pages/video/detail/introduction/widgets/season_panel.dart
@@ -42,23 +42,14 @@ class _SeasonPanelState extends State<SeasonPanel> {
     _videoDetailController = Get.find<VideoDetailController>(tag: heroTag);
 
     /// 根据 cid 找到对应集，找到对应 episodes
-    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;
-        }
-      }
-    }
+    getCurrentEpisodeIndex();
 
     /// 取对应 season_id 的 episodes
     getCurrentIndex();
     _videoDetailController.cid.listen((int p0) {
       cid = p0;
       getCurrentIndex();
+      getCurrentEpisodeIndex();
     });
   }
 
@@ -94,6 +85,21 @@ class _SeasonPanelState extends State<SeasonPanel> {
     }
   }
 
+  // 获取currentEpisodeIndex
+  void getCurrentEpisodeIndex() {
+    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;
+        }
+      }
+    }
+  }
+
   Widget buildEpisodeListItem(
     EpisodeItem episode,
     int index,