From 592b32fc7a883a64cffe2c0bac9bf934ca18d302 Mon Sep 17 00:00:00 2001
From: guozhigq <guozhigq@outlook.com>
Date: Thu, 17 Aug 2023 16:00:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=86p=E5=88=87=E6=8D=A2cid=E6=9C=AA?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../video/detail/introduction/controller.dart    |  1 +
 lib/pages/video/detail/introduction/view.dart    | 16 ++++++++++------
 .../detail/introduction/widgets/season.dart      |  1 +
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/lib/pages/video/detail/introduction/controller.dart b/lib/pages/video/detail/introduction/controller.dart
index 55b63445..aa5d41c4 100644
--- a/lib/pages/video/detail/introduction/controller.dart
+++ b/lib/pages/video/detail/introduction/controller.dart
@@ -414,6 +414,7 @@ class VideoIntroController extends GetxController {
       videoReplyCtr.queryReplyList(type: 'init');
     } catch (_) {}
     this.bvid = bvid;
+    lastPlayCid.value = cid;
     await queryVideoIntro();
   }
 }
diff --git a/lib/pages/video/detail/introduction/view.dart b/lib/pages/video/detail/introduction/view.dart
index 04f8cbc0..2528ca18 100644
--- a/lib/pages/video/detail/introduction/view.dart
+++ b/lib/pages/video/detail/introduction/view.dart
@@ -270,12 +270,16 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
                   // 合集
                   if (!loadingStatus &&
                       widget.videoDetail!.ugcSeason != null) ...[
-                    SeasonPanel(
-                      ugcSeason: widget.videoDetail!.ugcSeason!,
-                      cid: widget.videoDetail!.pages!.first.cid,
-                      sheetHeight: sheetHeight,
-                      changeFuc: (bvid, cid, aid) => videoIntroController
-                          .changeSeasonOrbangu(bvid, cid, aid),
+                    Obx(
+                      () => SeasonPanel(
+                        ugcSeason: widget.videoDetail!.ugcSeason!,
+                        cid: videoIntroController.lastPlayCid.value != 0
+                            ? videoIntroController.lastPlayCid.value
+                            : widget.videoDetail!.pages!.first.cid,
+                        sheetHeight: sheetHeight,
+                        changeFuc: (bvid, cid, aid) => videoIntroController
+                            .changeSeasonOrbangu(bvid, cid, aid),
+                      ),
                     )
                   ],
                   if (!loadingStatus &&
diff --git a/lib/pages/video/detail/introduction/widgets/season.dart b/lib/pages/video/detail/introduction/widgets/season.dart
index dd478b83..876dac74 100644
--- a/lib/pages/video/detail/introduction/widgets/season.dart
+++ b/lib/pages/video/detail/introduction/widgets/season.dart
@@ -38,6 +38,7 @@ class _SeasonPanelState extends State<SeasonPanel> {
       item.cid,
       item.aid,
     );
+    currentIndex = i;
     Get.back();
   }