fix: 收藏夹详情计数错误 issues #637

Feature update video detail structure

lib/models/common/dynamics_type.dart

@@ -7,5 +7,5 @@ enum DynamicsType {
 
 extension BusinessTypeExtension on DynamicsType {
   String get values => ['all', 'video', 'pgc', 'article'][index];
-  String get labels => ['全部', '视频', '追番', '专栏'][index];
+  String get labels => ['全部', '投稿', '番剧', '专栏'][index];
 }

lib/pages/bangumi/introduction/controller.dart

@@ -25,6 +25,13 @@ class BangumiIntroController extends GetxController {
       ? int.tryParse(Get.parameters['epId']!)
       : null;
 
+  // 是否预渲染 骨架屏
+  bool preRender = false;
+
+  // 视频详情 上个页面传入
+  Map? videoItem = {};
+  BangumiInfoModel? bangumiItem;
+
   // 请求状态
   RxBool isLoading = false.obs;
 
@@ -56,6 +63,27 @@ class BangumiIntroController extends GetxController {
   @override
   void onInit() {
     super.onInit();
+    if (Get.arguments.isNotEmpty as bool) {
+      if (Get.arguments.containsKey('bangumiItem') as bool) {
+        preRender = true;
+        bangumiItem = Get.arguments['bangumiItem'];
+        // bangumiItem!['pic'] = args.pic;
+        // if (args.title is String) {
+        //   videoItem!['title'] = args.title;
+        // } else {
+        //   String str = '';
+        //   for (Map map in args.title) {
+        //     str += map['text'];
+        //   }
+        //   videoItem!['title'] = str;
+        // }
+        // if (args.stat != null) {
+        //   videoItem!['stat'] = args.stat;
+        // }
+        // videoItem!['pubdate'] = args.pubdate;
+        // videoItem!['owner'] = args.owner;
+      }
+    }
     userInfo = userInfoCache.get('userInfoCache');
     userLogin = userInfo != null;
   }
@@ -155,21 +183,20 @@ class BangumiIntroController extends GetxController {
             actions: [
               TextButton(onPressed: () => Get.back(), child: const Text('取消')),
               TextButton(
-                onPressed: () async {
-                  var res = await VideoHttp.coinVideo(
-                      bvid: bvid, multiply: _tempThemeValue);
-                  if (res['status']) {
-                    SmartDialog.showToast('投币成功 👏');
-                    hasCoin.value = true;
-                    bangumiDetail.value.stat!['coins'] =
-                        bangumiDetail.value.stat!['coins'] + _tempThemeValue;
-                  } else {
-                    SmartDialog.showToast(res['msg']);
-                  }
-                  Get.back();
-                },
-                child: const Text('确定'),
-              )
+                  onPressed: () async {
+                    var res = await VideoHttp.coinVideo(
+                        bvid: bvid, multiply: _tempThemeValue);
+                    if (res['status']) {
+                      SmartDialog.showToast('投币成功 👏');
+                      hasCoin.value = true;
+                      bangumiDetail.value.stat!['coins'] =
+                          bangumiDetail.value.stat!['coins'] + _tempThemeValue;
+                    } else {
+                      SmartDialog.showToast(res['msg']);
+                    }
+                    Get.back();
+                  },
+                  child: const Text('确定'))
             ],
           );
         });

lib/pages/bangumi/introduction/view.dart

@@ -12,10 +12,11 @@ import 'package:pilipala/models/bangumi/info.dart';
 import 'package:pilipala/pages/bangumi/widgets/bangumi_panel.dart';
 import 'package:pilipala/pages/video/detail/index.dart';
 import 'package:pilipala/pages/video/detail/introduction/widgets/action_item.dart';
+import 'package:pilipala/pages/video/detail/introduction/widgets/action_row_item.dart';
 import 'package:pilipala/pages/video/detail/introduction/widgets/fav_panel.dart';
 import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/storage.dart';
-import '../../../common/widgets/http_error.dart';
+
 import 'controller.dart';
 import 'widgets/intro_detail.dart';
 
@@ -50,6 +51,9 @@ class _BangumiIntroPanelState extends State<BangumiIntroPanel>
     cid = widget.cid!;
     bangumiIntroController = Get.put(BangumiIntroController(), tag: heroTag);
     videoDetailCtr = Get.find<VideoDetailController>(tag: heroTag);
+    bangumiIntroController.bangumiDetail.listen((BangumiInfoModel value) {
+      bangumiDetail = value;
+    });
     _futureBuilderFuture = bangumiIntroController.queryBangumiIntro();
     videoDetailCtr.cid.listen((int p0) {
       cid = p0;
@@ -64,32 +68,27 @@ class _BangumiIntroPanelState extends State<BangumiIntroPanel>
       future: _futureBuilderFuture,
       builder: (BuildContext context, AsyncSnapshot snapshot) {
         if (snapshot.connectionState == ConnectionState.done) {
-          if (snapshot.data == null) {
-            return const SliverToBoxAdapter(child: SizedBox());
-          }
           if (snapshot.data['status']) {
             // 请求成功
-            return Obx(
-              () => BangumiInfo(
-                bangumiDetail: bangumiIntroController.bangumiDetail.value,
-                cid: cid,
-              ),
+
+            return BangumiInfo(
+              loadingStatus: false,
+              bangumiDetail: bangumiDetail,
+              cid: cid,
             );
           } else {
             // 请求错误
-            return HttpError(
-              errMsg: snapshot.data['msg'],
-              fn: () => Get.back(),
-            );
+            // return HttpError(
+            //   errMsg: snapshot.data['msg'],
+            //   fn: () => Get.back(),
+            // );
+            return const SizedBox();
           }
         } else {
-          return const SliverToBoxAdapter(
-            child: SizedBox(
-              height: 100,
-              child: Center(
-                child: CircularProgressIndicator(),
-              ),
-            ),
+          return BangumiInfo(
+            loadingStatus: true,
+            bangumiDetail: bangumiDetail,
+            cid: cid,
           );
         }
       },
@@ -100,10 +99,12 @@ class _BangumiIntroPanelState extends State<BangumiIntroPanel>
 class BangumiInfo extends StatefulWidget {
   const BangumiInfo({
     super.key,
+    this.loadingStatus = false,
     this.bangumiDetail,
     this.cid,
   });
 
+  final bool loadingStatus;
   final BangumiInfoModel? bangumiDetail;
   final int? cid;
 
@@ -116,6 +117,7 @@ class _BangumiInfoState extends State<BangumiInfo> {
   late final BangumiIntroController bangumiIntroController;
   late final VideoDetailController videoDetailCtr;
   Box localCache = GStrorage.localCache;
+  late final BangumiInfoModel? bangumiItem;
   late double sheetHeight;
   int? cid;
   bool isProcessing = false;
@@ -134,10 +136,13 @@ class _BangumiInfoState extends State<BangumiInfo> {
     super.initState();
     bangumiIntroController = Get.put(BangumiIntroController(), tag: heroTag);
     videoDetailCtr = Get.find<VideoDetailController>(tag: heroTag);
+    bangumiItem = bangumiIntroController.bangumiItem;
     sheetHeight = localCache.get('sheetHeight');
     cid = widget.cid!;
+    print('cid:  $cid');
     videoDetailCtr.cid.listen((p0) {
       cid = p0;
+      print('cid:  $cid');
       setState(() {});
     });
   }
@@ -177,154 +182,207 @@ class _BangumiInfoState extends State<BangumiInfo> {
       padding: const EdgeInsets.only(
           left: StyleString.safeSpace, right: StyleString.safeSpace, top: 20),
       sliver: SliverToBoxAdapter(
-          child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Row(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Stack(
+        child: !widget.loadingStatus || bangumiItem != null
+            ? Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
-                  NetworkImgLayer(
-                    width: 105,
-                    height: 160,
-                    src: widget.bangumiDetail!.cover!,
-                  ),
-                  PBadge(
-                    text: '评分 ${widget.bangumiDetail!.rating!['score']!}',
-                    top: null,
-                    right: 6,
-                    bottom: 6,
-                    left: null,
+                  Row(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Stack(
+                        children: [
+                          NetworkImgLayer(
+                            width: 105,
+                            height: 160,
+                            src: !widget.loadingStatus
+                                ? widget.bangumiDetail!.cover!
+                                : bangumiItem!.cover!,
+                          ),
+                          if (bangumiItem != null &&
+                              bangumiItem!.rating != null)
+                            PBadge(
+                              text:
+                                  '评分 ${!widget.loadingStatus ? widget.bangumiDetail!.rating!['score']! : bangumiItem!.rating!['score']!}',
+                              top: null,
+                              right: 6,
+                              bottom: 6,
+                              left: null,
+                            ),
+                        ],
+                      ),
+                      const SizedBox(width: 10),
+                      Expanded(
+                        child: InkWell(
+                          onTap: () => showIntroDetail(),
+                          child: SizedBox(
+                            height: 158,
+                            child: Column(
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              mainAxisSize: MainAxisSize.min,
+                              children: [
+                                Row(
+                                  children: [
+                                    Expanded(
+                                      child: Text(
+                                        !widget.loadingStatus
+                                            ? widget.bangumiDetail!.title!
+                                            : bangumiItem!.title!,
+                                        style: const TextStyle(
+                                          fontSize: 16,
+                                          fontWeight: FontWeight.w500,
+                                        ),
+                                        maxLines: 1,
+                                        overflow: TextOverflow.ellipsis,
+                                      ),
+                                    ),
+                                    const SizedBox(width: 20),
+                                    SizedBox(
+                                      width: 34,
+                                      height: 34,
+                                      child: IconButton(
+                                        style: ButtonStyle(
+                                          padding: MaterialStateProperty.all(
+                                              EdgeInsets.zero),
+                                          backgroundColor:
+                                              MaterialStateProperty.resolveWith(
+                                                  (Set<MaterialState> states) {
+                                            return t
+                                                .colorScheme.primaryContainer
+                                                .withOpacity(0.7);
+                                          }),
+                                        ),
+                                        onPressed: () =>
+                                            bangumiIntroController.bangumiAdd(),
+                                        icon: Icon(
+                                          Icons.favorite_border_rounded,
+                                          color: t.colorScheme.primary,
+                                          size: 22,
+                                        ),
+                                      ),
+                                    ),
+                                  ],
+                                ),
+                                Row(
+                                  children: [
+                                    StatView(
+                                      theme: 'gray',
+                                      view: !widget.loadingStatus
+                                          ? widget.bangumiDetail!.stat!['views']
+                                          : bangumiItem!.stat!['views'],
+                                      size: 'medium',
+                                    ),
+                                    const SizedBox(width: 6),
+                                    StatDanMu(
+                                      theme: 'gray',
+                                      danmu: !widget.loadingStatus
+                                          ? widget
+                                              .bangumiDetail!.stat!['danmakus']
+                                          : bangumiItem!.stat!['danmakus'],
+                                      size: 'medium',
+                                    ),
+                                  ],
+                                ),
+                                const SizedBox(height: 6),
+                                Row(
+                                  children: [
+                                    Text(
+                                      !widget.loadingStatus
+                                          ? (widget.bangumiDetail!.areas!
+                                                  .isNotEmpty
+                                              ? widget.bangumiDetail!.areas!
+                                                  .first['name']
+                                              : '')
+                                          : (bangumiItem!.areas!.isNotEmpty
+                                              ? bangumiItem!
+                                                  .areas!.first['name']
+                                              : ''),
+                                      style: TextStyle(
+                                        fontSize: 12,
+                                        color: t.colorScheme.outline,
+                                      ),
+                                    ),
+                                    const SizedBox(width: 6),
+                                    Text(
+                                      !widget.loadingStatus
+                                          ? widget.bangumiDetail!
+                                              .publish!['pub_time_show']
+                                          : bangumiItem!
+                                              .publish!['pub_time_show'],
+                                      style: TextStyle(
+                                        fontSize: 12,
+                                        color: t.colorScheme.outline,
+                                      ),
+                                    ),
+                                  ],
+                                ),
+                                // const SizedBox(height: 4),
+                                Text(
+                                  !widget.loadingStatus
+                                      ? widget.bangumiDetail!.newEp!['desc']
+                                      : bangumiItem!.newEp!['desc'],
+                                  style: TextStyle(
+                                    fontSize: 12,
+                                    color: t.colorScheme.outline,
+                                  ),
+                                ),
+                                // const SizedBox(height: 10),
+                                const Spacer(),
+                                Text(
+                                  '简介：${!widget.loadingStatus ? widget.bangumiDetail!.evaluate! : bangumiItem!.evaluate!}',
+                                  maxLines: 3,
+                                  overflow: TextOverflow.ellipsis,
+                                  style: TextStyle(
+                                    fontSize: 13,
+                                    color: t.colorScheme.outline,
+                                  ),
+                                ),
+                              ],
+                            ),
+                          ),
+                        ),
+                      ),
+                    ],
                   ),
+                  const SizedBox(height: 6),
+                  // 点赞收藏转发 布局样式1
+                  // SingleChildScrollView(
+                  //   padding: const EdgeInsets.only(top: 7, bottom: 7),
+                  //   scrollDirection: Axis.horizontal,
+                  //   child: actionRow(
+                  //     context,
+                  //     bangumiIntroController,
+                  //     videoDetailCtr,
+                  //   ),
+                  // ),
+                  // 点赞收藏转发 布局样式2
+                  actionGrid(context, bangumiIntroController),
+                  // 番剧分p
+                  if ((!widget.loadingStatus &&
+                          widget.bangumiDetail!.episodes!.isNotEmpty) ||
+                      bangumiItem != null &&
+                          bangumiItem!.episodes!.isNotEmpty) ...[
+                    BangumiPanel(
+                      pages: bangumiItem != null
+                          ? bangumiItem!.episodes!
+                          : widget.bangumiDetail!.episodes!,
+                      cid: cid ??
+                          (bangumiItem != null
+                              ? bangumiItem!.episodes!.first.cid
+                              : widget.bangumiDetail!.episodes!.first.cid),
+                      sheetHeight: sheetHeight,
+                      changeFuc: (bvid, cid, aid) => bangumiIntroController
+                          .changeSeasonOrbangu(bvid, cid, aid),
+                    )
+                  ],
                 ],
-              ),
-              const SizedBox(width: 10),
-              Expanded(
-                child: InkWell(
-                  onTap: () => showIntroDetail(),
-                  child: SizedBox(
-                    height: 158,
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      mainAxisSize: MainAxisSize.min,
-                      children: [
-                        Row(
-                          children: [
-                            Expanded(
-                              child: Text(
-                                widget.bangumiDetail!.title!,
-                                style: const TextStyle(
-                                  fontSize: 16,
-                                  fontWeight: FontWeight.w500,
-                                ),
-                                maxLines: 1,
-                                overflow: TextOverflow.ellipsis,
-                              ),
-                            ),
-                            const SizedBox(width: 20),
-                            SizedBox(
-                              width: 34,
-                              height: 34,
-                              child: IconButton(
-                                style: ButtonStyle(
-                                  padding: MaterialStateProperty.all(
-                                      EdgeInsets.zero),
-                                  backgroundColor:
-                                      MaterialStateProperty.resolveWith(
-                                          (Set<MaterialState> states) {
-                                    return t.colorScheme.primaryContainer
-                                        .withOpacity(0.7);
-                                  }),
-                                ),
-                                onPressed: () =>
-                                    bangumiIntroController.bangumiAdd(),
-                                icon: Icon(
-                                  Icons.favorite_border_rounded,
-                                  color: t.colorScheme.primary,
-                                  size: 22,
-                                ),
-                              ),
-                            ),
-                          ],
-                        ),
-                        Row(
-                          children: [
-                            StatView(
-                              theme: 'gray',
-                              view: widget.bangumiDetail!.stat!['views'],
-                              size: 'medium',
-                            ),
-                            const SizedBox(width: 6),
-                            StatDanMu(
-                              theme: 'gray',
-                              danmu: widget.bangumiDetail!.stat!['danmakus'],
-                              size: 'medium',
-                            ),
-                          ],
-                        ),
-                        const SizedBox(height: 6),
-                        Row(
-                          children: [
-                            Text(
-                              (widget.bangumiDetail!.areas!.isNotEmpty
-                                  ? widget.bangumiDetail!.areas!.first['name']
-                                  : ''),
-                              style: TextStyle(
-                                fontSize: 12,
-                                color: t.colorScheme.outline,
-                              ),
-                            ),
-                            const SizedBox(width: 6),
-                            Text(
-                              widget.bangumiDetail!.publish!['pub_time_show'],
-                              style: TextStyle(
-                                fontSize: 12,
-                                color: t.colorScheme.outline,
-                              ),
-                            ),
-                          ],
-                        ),
-                        Text(
-                          widget.bangumiDetail!.newEp!['desc'],
-                          style: TextStyle(
-                            fontSize: 12,
-                            color: t.colorScheme.outline,
-                          ),
-                        ),
-                        const Spacer(),
-                        Text(
-                          '简介：${widget.bangumiDetail!.evaluate!}',
-                          maxLines: 3,
-                          overflow: TextOverflow.ellipsis,
-                          style: TextStyle(
-                            fontSize: 13,
-                            color: t.colorScheme.outline,
-                          ),
-                        ),
-                      ],
-                    ),
-                  ),
+              )
+            : const SizedBox(
+                height: 100,
+                child: Center(
+                  child: CircularProgressIndicator(),
                 ),
               ),
-            ],
-          ),
-          const SizedBox(height: 6),
-
-          /// 点赞收藏转发
-          actionGrid(context, bangumiIntroController),
-          // 番剧分p
-          if (widget.bangumiDetail!.episodes!.isNotEmpty) ...[
-            BangumiPanel(
-              pages: widget.bangumiDetail!.episodes!,
-              cid: cid ?? widget.bangumiDetail!.episodes!.first.cid,
-              sheetHeight: sheetHeight,
-              changeFuc: (bvid, cid, aid) =>
-                  bangumiIntroController.changeSeasonOrbangu(bvid, cid, aid),
-            )
-          ],
-        ],
-      )),
+      ),
     );
   }
 
@@ -344,44 +402,57 @@ class _BangumiInfoState extends State<BangumiInfo> {
               children: <Widget>[
                 Obx(
                   () => ActionItem(
-                    icon: const Icon(FontAwesomeIcons.thumbsUp),
-                    selectIcon: const Icon(FontAwesomeIcons.solidThumbsUp),
-                    onTap: handleState(bangumiIntroController.actionLikeVideo),
-                    selectStatus: bangumiIntroController.hasLike.value,
-                    text: widget.bangumiDetail!.stat!['likes']!.toString(),
-                  ),
+                      icon: const Icon(FontAwesomeIcons.thumbsUp),
+                      selectIcon: const Icon(FontAwesomeIcons.solidThumbsUp),
+                      onTap:
+                          handleState(bangumiIntroController.actionLikeVideo),
+                      selectStatus: bangumiIntroController.hasLike.value,
+                      loadingStatus: false,
+                      text: !widget.loadingStatus
+                          ? widget.bangumiDetail!.stat!['likes']!.toString()
+                          : bangumiItem!.stat!['likes']!.toString()),
                 ),
                 Obx(
                   () => ActionItem(
-                    icon: const Icon(FontAwesomeIcons.b),
-                    selectIcon: const Icon(FontAwesomeIcons.b),
-                    onTap: handleState(bangumiIntroController.actionCoinVideo),
-                    selectStatus: bangumiIntroController.hasCoin.value,
-                    text: widget.bangumiDetail!.stat!['coins']!.toString(),
-                  ),
+                      icon: const Icon(FontAwesomeIcons.b),
+                      selectIcon: const Icon(FontAwesomeIcons.b),
+                      onTap:
+                          handleState(bangumiIntroController.actionCoinVideo),
+                      selectStatus: bangumiIntroController.hasCoin.value,
+                      loadingStatus: false,
+                      text: !widget.loadingStatus
+                          ? widget.bangumiDetail!.stat!['coins']!.toString()
+                          : bangumiItem!.stat!['coins']!.toString()),
                 ),
                 Obx(
                   () => ActionItem(
-                    icon: const Icon(FontAwesomeIcons.star),
-                    selectIcon: const Icon(FontAwesomeIcons.solidStar),
-                    onTap: () => showFavBottomSheet(),
-                    selectStatus: bangumiIntroController.hasFav.value,
-                    text: widget.bangumiDetail!.stat!['favorite']!.toString(),
-                  ),
+                      icon: const Icon(FontAwesomeIcons.star),
+                      selectIcon: const Icon(FontAwesomeIcons.solidStar),
+                      onTap: () => showFavBottomSheet(),
+                      selectStatus: bangumiIntroController.hasFav.value,
+                      loadingStatus: false,
+                      text: !widget.loadingStatus
+                          ? widget.bangumiDetail!.stat!['favorite']!.toString()
+                          : bangumiItem!.stat!['favorite']!.toString()),
                 ),
                 ActionItem(
                   icon: const Icon(FontAwesomeIcons.comment),
                   selectIcon: const Icon(FontAwesomeIcons.reply),
                   onTap: () => videoDetailCtr.tabCtr.animateTo(1),
                   selectStatus: false,
-                  text: widget.bangumiDetail!.stat!['reply']!.toString(),
+                  loadingStatus: false,
+                  text: !widget.loadingStatus
+                      ? widget.bangumiDetail!.stat!['reply']!.toString()
+                      : bangumiItem!.stat!['reply']!.toString(),
                 ),
                 ActionItem(
-                  icon: const Icon(FontAwesomeIcons.shareFromSquare),
-                  onTap: () => bangumiIntroController.actionShareVideo(),
-                  selectStatus: false,
-                  text: widget.bangumiDetail!.stat!['share']!.toString(),
-                ),
+                    icon: const Icon(FontAwesomeIcons.shareFromSquare),
+                    onTap: () => bangumiIntroController.actionShareVideo(),
+                    selectStatus: false,
+                    loadingStatus: false,
+                    text: !widget.loadingStatus
+                        ? widget.bangumiDetail!.stat!['share']!.toString()
+                        : bangumiItem!.stat!['share']!.toString()),
               ],
             ),
           ),
@@ -389,4 +460,63 @@ class _BangumiInfoState extends State<BangumiInfo> {
       );
     });
   }
+
+  Widget actionRow(BuildContext context, videoIntroController, videoDetailCtr) {
+    return Row(children: [
+      Obx(
+        () => ActionRowItem(
+          icon: const Icon(FontAwesomeIcons.thumbsUp),
+          onTap: handleState(videoIntroController.actionLikeVideo),
+          selectStatus: videoIntroController.hasLike.value,
+          loadingStatus: widget.loadingStatus,
+          text: !widget.loadingStatus
+              ? widget.bangumiDetail!.stat!['likes']!.toString()
+              : '-',
+        ),
+      ),
+      const SizedBox(width: 8),
+      Obx(
+        () => ActionRowItem(
+          icon: const Icon(FontAwesomeIcons.b),
+          onTap: handleState(videoIntroController.actionCoinVideo),
+          selectStatus: videoIntroController.hasCoin.value,
+          loadingStatus: widget.loadingStatus,
+          text: !widget.loadingStatus
+              ? widget.bangumiDetail!.stat!['coins']!.toString()
+              : '-',
+        ),
+      ),
+      const SizedBox(width: 8),
+      Obx(
+        () => ActionRowItem(
+          icon: const Icon(FontAwesomeIcons.heart),
+          onTap: () => showFavBottomSheet(),
+          selectStatus: videoIntroController.hasFav.value,
+          loadingStatus: widget.loadingStatus,
+          text: !widget.loadingStatus
+              ? widget.bangumiDetail!.stat!['favorite']!.toString()
+              : '-',
+        ),
+      ),
+      const SizedBox(width: 8),
+      ActionRowItem(
+        icon: const Icon(FontAwesomeIcons.comment),
+        onTap: () {
+          videoDetailCtr.tabCtr.animateTo(1);
+        },
+        selectStatus: false,
+        loadingStatus: widget.loadingStatus,
+        text: !widget.loadingStatus
+            ? widget.bangumiDetail!.stat!['reply']!.toString()
+            : '-',
+      ),
+      const SizedBox(width: 8),
+      ActionRowItem(
+          icon: const Icon(FontAwesomeIcons.share),
+          onTap: () => videoIntroController.actionShareVideo(),
+          selectStatus: false,
+          loadingStatus: widget.loadingStatus,
+          text: '转发'),
+    ]);
+  }
 }

lib/pages/fav_detail/controller.dart

@@ -16,7 +16,7 @@ class FavDetailController extends GetxController {
   RxMap favInfo = {}.obs;
   RxList favList = [].obs;
   RxString loadingText = '加载中...'.obs;
-  int mediaCount = 0;
+  RxInt mediaCount = 0.obs;
 
   @override
   void onInit() {
@@ -29,7 +29,7 @@ class FavDetailController extends GetxController {
   }
 
   Future<dynamic> queryUserFavFolderDetail({type = 'init'}) async {
-    if (type == 'onLoad' && favList.length >= mediaCount) {
+    if (type == 'onLoad' && favList.length >= mediaCount.value) {
       loadingText.value = '没有更多了';
       return;
     }
@@ -43,11 +43,11 @@ class FavDetailController extends GetxController {
       favInfo.value = res['data'].info;
       if (currentPage == 1 && type == 'init') {
         favList.value = res['data'].medias;
-        mediaCount = res['data'].info['media_count'];
+        mediaCount.value = res['data'].info['media_count'];
       } else if (type == 'onLoad') {
         favList.addAll(res['data'].medias);
       }
-      if (favList.length >= mediaCount) {
+      if (favList.length >= mediaCount.value) {
         loadingText.value = '没有更多了';
       }
     }

lib/pages/fav_detail/view.dart

@@ -84,7 +84,7 @@ class _FavDetailPageState extends State<FavDetailPage> {
                             style: Theme.of(context).textTheme.titleMedium,
                           ),
                           Text(
-                            '共${_favDetailController.item!.mediaCount!}条视频',
+                            '共${_favDetailController.mediaCount}条视频',
                             style: Theme.of(context).textTheme.labelMedium,
                           )
                         ],
@@ -175,7 +175,7 @@ class _FavDetailPageState extends State<FavDetailPage> {
               padding: const EdgeInsets.only(top: 15, bottom: 8, left: 14),
               child: Obx(
                 () => Text(
-                  '共${_favDetailController.favList.length}条视频',
+                  '共${_favDetailController.mediaCount}条视频',
                   style: TextStyle(
                       fontSize:
                           Theme.of(context).textTheme.labelMedium!.fontSize,

lib/pages/live_room/widgets/bottom_control.dart

@@ -29,7 +29,6 @@ class BottomControl extends StatefulWidget implements PreferredSizeWidget {
 
 class _BottomControlState extends State<BottomControl> {
   late PlayUrlModel videoInfo;
-  List<PlaySpeed> playSpeed = PlaySpeed.values;
   TextStyle subTitleStyle = const TextStyle(fontSize: 12);
   TextStyle titleStyle = const TextStyle(fontSize: 14);
   Size get preferredSize => const Size(double.infinity, kToolbarHeight);

lib/pages/search/controller.dart

@@ -115,7 +115,7 @@ class SSearchController extends GetxController {
 
   onLongSelect(word) {
     int index = historyList.indexOf(word);
-    historyList.value = historyList.removeAt(index);
+    historyList.removeAt(index);
     historyList.refresh();
     histiryWord.put('cacheList', historyList);
   }

lib/pages/setting/extra_setting.dart

@@ -173,6 +173,12 @@ class _ExtraSettingState extends State<ExtraSetting> {
             setKey: SettingBoxKey.enableAi,
             defaultVal: true,
           ),
+          const SetSwitchItem(
+            title: '相关视频推荐',
+            subTitle: '视频详情页推荐相关视频',
+            setKey: SettingBoxKey.enableRelatedVideo,
+            defaultVal: true,
+          ),
           ListTile(
             dense: false,
             title: Text('评论展示', style: titleStyle),

lib/pages/setting/pages/play_speed_set.dart

@@ -17,6 +17,7 @@ class _PlaySpeedPageState extends State<PlaySpeedPage> {
   Box videoStorage = GStrorage.video;
   Box settingStorage = GStrorage.setting;
   late double playSpeedDefault;
+  late List<double> playSpeedSystem;
   late double longPressSpeedDefault;
   late List customSpeedsList;
   late bool enableAutoLongPressSpeed;
@@ -53,6 +54,9 @@ class _PlaySpeedPageState extends State<PlaySpeedPage> {
   @override
   void initState() {
     super.initState();
+    // 系统预设倍速
+    playSpeedSystem =
+        videoStorage.get(VideoBoxKey.playSpeedSystem, defaultValue: playSpeed);
     // 默认倍速
     playSpeedDefault =
         videoStorage.get(VideoBoxKey.playSpeedDefault, defaultValue: 1.0);
@@ -64,6 +68,7 @@ class _PlaySpeedPageState extends State<PlaySpeedPage> {
         videoStorage.get(VideoBoxKey.customSpeedsList, defaultValue: []);
     enableAutoLongPressSpeed = settingStorage
         .get(SettingBoxKey.enableAutoLongPressSpeed, defaultValue: false);
+    // 开启动态长按倍速时不展示
     if (enableAutoLongPressSpeed) {
       Map newItem = sheetMenu[1];
       newItem['show'] = false;
@@ -123,7 +128,7 @@ class _PlaySpeedPageState extends State<PlaySpeedPage> {
   }
 
   // 设定倍速弹窗
-  void showBottomSheet(type, i) {
+  void showBottomSheet(String type, int i) {
     showModalBottomSheet<void>(
       context: context,
       isScrollControlled: true,
@@ -159,18 +164,11 @@ class _PlaySpeedPageState extends State<PlaySpeedPage> {
   }
 
   //
-  void menuAction(type, index, id) async {
+  void menuAction(type, int index, id) async {
     double chooseSpeed = 1.0;
-    if (type == 'system' && id == -1) {
-      SmartDialog.showToast('系统预设倍速不支持删除');
-      return;
-    }
     // 获取当前选中的倍速值
-    if (type == 'system') {
-      chooseSpeed = PlaySpeed.values[index].value;
-    } else {
-      chooseSpeed = customSpeedsList[index];
-    }
+    chooseSpeed =
+        type == 'system' ? playSpeedSystem[index] : customSpeedsList[index];
     // 设置
     if (id == 1) {
       // 设置默认倍速
@@ -182,17 +180,22 @@ class _PlaySpeedPageState extends State<PlaySpeedPage> {
       videoStorage.put(
           VideoBoxKey.longPressSpeedDefault, longPressSpeedDefault);
     } else if (id == -1) {
-      if (customSpeedsList[index] == playSpeedDefault) {
-        playSpeedDefault = 1.0;
-        videoStorage.put(VideoBoxKey.playSpeedDefault, playSpeedDefault);
+      late List speedsList =
+          type == 'system' ? playSpeedSystem : customSpeedsList;
+      if (speedsList[index] == playSpeedDefault) {
+        SmartDialog.showToast('默认倍速不可删除');
       }
-      if (customSpeedsList[index] == longPressSpeedDefault) {
+      if (speedsList[index] == longPressSpeedDefault) {
         longPressSpeedDefault = 2.0;
         videoStorage.put(
             VideoBoxKey.longPressSpeedDefault, longPressSpeedDefault);
       }
-      customSpeedsList.removeAt(index);
-      await videoStorage.put(VideoBoxKey.customSpeedsList, customSpeedsList);
+      speedsList.removeAt(index);
+      await videoStorage.put(
+          type == 'system'
+              ? VideoBoxKey.playSpeedSystem
+              : VideoBoxKey.customSpeedsList,
+          speedsList);
     }
     setState(() {});
     SmartDialog.showToast('操作成功');
@@ -249,38 +252,40 @@ class _PlaySpeedPageState extends State<PlaySpeedPage> {
                     subtitle: Text(longPressSpeedDefault.toString()),
                   )
                 : const SizedBox(),
-            Padding(
-              padding: const EdgeInsets.only(
-                left: 14,
-                right: 14,
-                bottom: 10,
-                top: 20,
+            if (playSpeedSystem.isNotEmpty) ...[
+              Padding(
+                padding: const EdgeInsets.only(
+                  left: 14,
+                  right: 14,
+                  bottom: 10,
+                  top: 20,
+                ),
+                child: Text(
+                  '系统预设倍速',
+                  style: Theme.of(context).textTheme.titleMedium,
+                ),
               ),
-              child: Text(
-                '系统预设倍速',
-                style: Theme.of(context).textTheme.titleMedium,
-              ),
-            ),
-            Padding(
-              padding: const EdgeInsets.only(
-                left: 18,
-                right: 18,
-                bottom: 30,
-              ),
-              child: Wrap(
-                alignment: WrapAlignment.start,
-                spacing: 8,
-                runSpacing: 2,
-                children: [
-                  for (var i in PlaySpeed.values) ...[
-                    FilledButton.tonal(
-                      onPressed: () => showBottomSheet('system', i.index),
-                      child: Text(i.description),
-                    ),
-                  ]
-                ],
-              ),
-            ),
+              Padding(
+                padding: const EdgeInsets.only(
+                  left: 18,
+                  right: 18,
+                  bottom: 30,
+                ),
+                child: Wrap(
+                  alignment: WrapAlignment.start,
+                  spacing: 8,
+                  runSpacing: 2,
+                  children: [
+                    for (int i = 0; i < playSpeedSystem.length; i++) ...[
+                      FilledButton.tonal(
+                        onPressed: () => showBottomSheet('system', i),
+                        child: Text(playSpeedSystem[i].toString()),
+                      ),
+                    ]
+                  ],
+                ),
+              )
+            ],
             Padding(
                 padding: const EdgeInsets.only(
                   left: 14,

lib/pages/video/detail/controller.dart

@@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
+import 'package:ns_danmaku/ns_danmaku.dart';
 import 'package:pilipala/http/constants.dart';
 import 'package:pilipala/http/video.dart';
 import 'package:pilipala/models/common/reply_type.dart';
@@ -19,6 +20,7 @@ import 'package:pilipala/utils/utils.dart';
 import 'package:pilipala/utils/video_utils.dart';
 import 'package:screen_brightness/screen_brightness.dart';
 
+import '../../../http/danmaku.dart';
 import '../../../utils/id_utils.dart';
 import 'widgets/header_control.dart';
 
@@ -91,6 +93,7 @@ class VideoDetailController extends GetxController
   late int cacheAudioQa;
 
   PersistentBottomSheetController? replyReplyBottomSheetCtr;
+  late bool enableRelatedVideo;
 
   @override
   void onInit() {
@@ -113,7 +116,8 @@ class VideoDetailController extends GetxController
     autoPlay.value =
         setting.get(SettingBoxKey.autoPlayEnable, defaultValue: true);
     enableHA.value = setting.get(SettingBoxKey.enableHA, defaultValue: true);
-
+    enableRelatedVideo =
+        setting.get(SettingBoxKey.enableRelatedVideo, defaultValue: true);
     if (userInfo == null ||
         localCache.get(LocalCacheKey.historyPause) == true) {
       enableHeart = false;
@@ -383,4 +387,86 @@ class VideoDetailController extends GetxController
         ? replyReplyBottomSheetCtr!.close()
         : print('replyReplyBottomSheetCtr is null');
   }
+
+  /// 发送弹幕
+  void showShootDanmakuSheet() {
+    final TextEditingController textController = TextEditingController();
+    bool isSending = false; // 追踪是否正在发送
+    showDialog(
+      context: Get.context!,
+      builder: (BuildContext context) {
+        // TODO: 支持更多类型和颜色的弹幕
+        return AlertDialog(
+          title: const Text('发送弹幕'),
+          content: StatefulBuilder(
+              builder: (BuildContext context, StateSetter setState) {
+            return TextField(
+              controller: textController,
+            );
+          }),
+          actions: [
+            TextButton(
+              onPressed: () => Get.back(),
+              child: Text(
+                '取消',
+                style: TextStyle(color: Theme.of(context).colorScheme.outline),
+              ),
+            ),
+            StatefulBuilder(
+                builder: (BuildContext context, StateSetter setState) {
+              return TextButton(
+                onPressed: isSending
+                    ? null
+                    : () async {
+                        final String msg = textController.text;
+                        if (msg.isEmpty) {
+                          SmartDialog.showToast('弹幕内容不能为空');
+                          return;
+                        } else if (msg.length > 100) {
+                          SmartDialog.showToast('弹幕内容不能超过100个字符');
+                          return;
+                        }
+                        setState(() {
+                          isSending = true; // 开始发送，更新状态
+                        });
+                        //修改按钮文字
+                        // SmartDialog.showToast('弹幕发送中,\n$msg');
+                        final dynamic res = await DanmakaHttp.shootDanmaku(
+                          oid: cid.value,
+                          msg: textController.text,
+                          bvid: bvid,
+                          progress:
+                              plPlayerController.position.value.inMilliseconds,
+                          type: 1,
+                        );
+                        setState(() {
+                          isSending = false; // 发送结束，更新状态
+                        });
+                        if (res['status']) {
+                          SmartDialog.showToast('发送成功');
+                          // 发送成功，自动预览该弹幕，避免重新请求
+                          // TODO: 暂停状态下预览弹幕仍会移动与计时，可考虑添加到dmSegList或其他方式实现
+                          plPlayerController.danmakuController?.addItems([
+                            DanmakuItem(
+                              msg,
+                              color: Colors.white,
+                              time: plPlayerController
+                                  .position.value.inMilliseconds,
+                              type: DanmakuItemType.scroll,
+                              isSend: true,
+                            )
+                          ]);
+                          Get.back();
+                        } else {
+                          SmartDialog.showToast('发送失败，错误信息为${res['msg']}');
+                        }
+                      },
+                child: Text(isSending ? '发送中...' : '发送'),
+              );
+            })
+          ],
+        );
+      },
+    );
+  }
 }

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

@@ -25,6 +25,13 @@ class VideoIntroController extends GetxController {
   VideoIntroController({required this.bvid});
   // 视频bvid
   String bvid;
+
+  // 是否预渲染 骨架屏
+  bool preRender = false;
+
+  // 视频详情 上个页面传入
+  Map? videoItem = {};
+
   // 请求状态
   RxBool isLoading = false.obs;
 
@@ -67,6 +74,26 @@ class VideoIntroController extends GetxController {
     try {
       heroTag = Get.arguments['heroTag'];
     } catch (_) {}
+    if (Get.arguments.isNotEmpty) {
+      if (Get.arguments.containsKey('videoItem')) {
+        preRender = true;
+        var args = Get.arguments['videoItem'];
+        var keys = Get.arguments.keys.toList();
+        videoItem!['pic'] = args.pic;
+        if (args.title is String) {
+          videoItem!['title'] = args.title;
+        } else {
+          String str = '';
+          for (Map map in args.title) {
+            str += map['text'];
+          }
+          videoItem!['title'] = str;
+        }
+        videoItem!['stat'] = keys.contains('stat') && args.stat;
+        videoItem!['pubdate'] = keys.contains('pubdate') && args.pubdate;
+        videoItem!['owner'] = keys.contains('owner') && args.owner;
+      }
+    }
     userLogin = userInfo != null;
     lastPlayCid.value = int.parse(Get.parameters['cid']!);
     isShowOnlineTotal =

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

@@ -15,7 +15,9 @@ import 'package:pilipala/pages/video/detail/widgets/ai_detail.dart';
 import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:pilipala/utils/utils.dart';
+
 import 'widgets/action_item.dart';
+import 'widgets/action_row_item.dart';
 import 'widgets/fav_panel.dart';
 import 'widgets/intro_detail.dart';
 import 'widgets/page.dart';
@@ -76,6 +78,7 @@ class _VideoIntroPanelState extends State<VideoIntroPanel>
             // 请求成功
             return Obx(
               () => VideoInfo(
+                loadingStatus: false,
                 videoDetail: videoIntroController.videoDetail.value,
                 heroTag: heroTag,
                 bvid: widget.bvid,
@@ -93,13 +96,11 @@ class _VideoIntroPanelState extends State<VideoIntroPanel>
             );
           }
         } else {
-          return const SliverToBoxAdapter(
-            child: SizedBox(
-              height: 100,
-              child: Center(
-                child: CircularProgressIndicator(),
-              ),
-            ),
+          return VideoInfo(
+            loadingStatus: true,
+            videoDetail: videoDetail,
+            heroTag: heroTag,
+            bvid: widget.bvid,
           );
         }
       },
@@ -108,12 +109,14 @@ class _VideoIntroPanelState extends State<VideoIntroPanel>
 }
 
 class VideoInfo extends StatefulWidget {
+  final bool loadingStatus;
   final VideoDetailData? videoDetail;
   final String? heroTag;
   final String bvid;
 
   const VideoInfo({
     Key? key,
+    this.loadingStatus = false,
     this.videoDetail,
     this.heroTag,
     required this.bvid,
@@ -124,12 +127,18 @@ class VideoInfo extends StatefulWidget {
 }
 
 class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
+  // final String heroTag = Get.arguments['heroTag'];
   late String heroTag;
   late final VideoIntroController videoIntroController;
   late final VideoDetailController videoDetailCtr;
+  late final Map<dynamic, dynamic> videoItem;
+
   final Box<dynamic> localCache = GStrorage.localCache;
   final Box<dynamic> setting = GStrorage.setting;
   late double sheetHeight;
+
+  late final bool loadingStatus; // 加载状态
+
   late final dynamic owner;
   late final dynamic follower;
   late final dynamic followStatus;
@@ -154,10 +163,14 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
     videoIntroController =
         Get.put(VideoIntroController(bvid: widget.bvid), tag: heroTag);
     videoDetailCtr = Get.find<VideoDetailController>(tag: heroTag);
+    videoItem = videoIntroController.videoItem!;
     sheetHeight = localCache.get('sheetHeight');
 
-    owner = widget.videoDetail!.owner;
-    follower = Utils.numFormat(videoIntroController.userStat['follower']);
+    loadingStatus = widget.loadingStatus;
+    owner = loadingStatus ? videoItem['owner'] : widget.videoDetail!.owner;
+    follower = loadingStatus
+        ? '-'
+        : Utils.numFormat(videoIntroController.userStat['follower']);
     followStatus = videoIntroController.followStatus;
     enableAi = setting.get(SettingBoxKey.enableAi, defaultValue: true);
   }
@@ -211,6 +224,9 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
 
   // 视频介绍
   showIntroDetail() {
+    if (loadingStatus) {
+      return;
+    }
     feedBack();
     showBottomSheet(
       context: context,
@@ -224,9 +240,13 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
   // 用户主页
   onPushMember() {
     feedBack();
-    mid = widget.videoDetail!.owner!.mid!;
+    mid = !loadingStatus
+        ? widget.videoDetail!.owner!.mid
+        : videoItem['owner'].mid;
     memberHeroTag = Utils.makeHeroTag(mid);
-    String face = widget.videoDetail!.owner!.face!;
+    String face = !loadingStatus
+        ? widget.videoDetail!.owner!.face
+        : videoItem['owner'].face;
     Get.toNamed('/member?mid=$mid',
         arguments: {'face': face, 'heroTag': memberHeroTag});
   }
@@ -248,183 +268,226 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
     final Color outline = t.colorScheme.outline;
     return SliverPadding(
       padding: const EdgeInsets.only(
-          left: StyleString.safeSpace, right: StyleString.safeSpace, top: 10),
+        left: StyleString.safeSpace,
+        right: StyleString.safeSpace,
+        top: 16,
+      ),
       sliver: SliverToBoxAdapter(
-          child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          GestureDetector(
-            behavior: HitTestBehavior.translucent,
-            onTap: () => showIntroDetail(),
-            child: Text(
-              widget.videoDetail!.title!,
-              style: const TextStyle(
-                fontSize: 18,
-                fontWeight: FontWeight.bold,
-              ),
-              maxLines: 2,
-              overflow: TextOverflow.ellipsis,
-            ),
-          ),
-          Stack(
-            children: [
-              GestureDetector(
-                behavior: HitTestBehavior.translucent,
-                onTap: () => showIntroDetail(),
-                child: Padding(
-                  padding: const EdgeInsets.only(top: 7, bottom: 6),
-                  child: Row(
-                    children: [
-                      StatView(
-                        theme: 'gray',
-                        view: widget.videoDetail!.stat!.view,
-                        size: 'medium',
-                      ),
-                      const SizedBox(width: 10),
-                      StatDanMu(
-                        theme: 'gray',
-                        danmu: widget.videoDetail!.stat!.danmaku,
-                        size: 'medium',
-                      ),
-                      const SizedBox(width: 10),
-                      Text(
-                        Utils.dateFormat(widget.videoDetail!.pubdate,
-                            formatType: 'detail'),
-                        style: TextStyle(
-                          fontSize: 12,
-                          color: t.colorScheme.outline,
-                        ),
-                      ),
-                      const SizedBox(width: 10),
-                      if (videoIntroController.isShowOnlineTotal)
-                        Obx(
-                          () => Text(
-                            '${videoIntroController.total.value}人在看',
-                            style: TextStyle(
-                              fontSize: 12,
-                              color: t.colorScheme.outline,
-                            ),
-                          ),
-                        ),
-                    ],
-                  ),
-                ),
-              ),
-              if (enableAi)
-                Positioned(
-                  right: 10,
-                  top: 6,
-                  child: GestureDetector(
-                    onTap: () async {
-                      final res = await videoIntroController.aiConclusion();
-                      if (res['status']) {
-                        showAiBottomSheet();
-                      }
-                    },
-                    child: Image.asset('assets/images/ai.png', height: 22),
-                  ),
-                )
-            ],
-          ),
-
-          /// 点赞收藏转发
-          actionGrid(context, videoIntroController),
-          // 合集
-          if (widget.videoDetail!.ugcSeason != null) ...[
-            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 (widget.videoDetail!.pages != null &&
-              widget.videoDetail!.pages!.length > 1) ...[
-            Obx(() => PagesPanel(
-                  pages: widget.videoDetail!.pages!,
-                  cid: videoIntroController.lastPlayCid.value,
-                  sheetHeight: sheetHeight,
-                  changeFuc: (cid) => videoIntroController.changeSeasonOrbangu(
-                      videoIntroController.bvid, cid, null),
-                ))
-          ],
-          GestureDetector(
-            onTap: onPushMember,
-            child: Container(
-              padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 4),
-              child: Row(
+        child: !loadingStatus
+            ? Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
-                  NetworkImgLayer(
-                    type: 'avatar',
-                    src: widget.videoDetail!.owner!.face,
-                    width: 34,
-                    height: 34,
-                    fadeInDuration: Duration.zero,
-                    fadeOutDuration: Duration.zero,
-                  ),
-                  const SizedBox(width: 10),
-                  Text(owner.name, style: const TextStyle(fontSize: 13)),
-                  const SizedBox(width: 6),
-                  Text(
-                    follower,
-                    style: TextStyle(
-                      fontSize: t.textTheme.labelSmall!.fontSize,
-                      color: outline,
+                  GestureDetector(
+                    behavior: HitTestBehavior.translucent,
+                    onTap: () => showIntroDetail(),
+                    child: Text(
+                      !loadingStatus
+                          ? widget.videoDetail!.title
+                          : videoItem['title'],
+                      style: const TextStyle(
+                        fontSize: 18,
+                        fontWeight: FontWeight.bold,
+                      ),
+                      maxLines: 2,
+                      overflow: TextOverflow.ellipsis,
                     ),
                   ),
-                  const Spacer(),
-                  Obx(() => AnimatedOpacity(
-                        opacity:
-                            videoIntroController.followStatus.isEmpty ? 0 : 1,
-                        duration: const Duration(milliseconds: 50),
-                        child: SizedBox(
-                          height: 32,
-                          child: Obx(
-                            () => videoIntroController.followStatus.isNotEmpty
-                                ? TextButton(
-                                    onPressed:
-                                        videoIntroController.actionRelationMod,
-                                    style: TextButton.styleFrom(
-                                      padding: const EdgeInsets.only(
-                                          left: 8, right: 8),
-                                      foregroundColor:
-                                          followStatus['attribute'] != 0
-                                              ? outline
-                                              : t.colorScheme.onPrimary,
-                                      backgroundColor:
-                                          followStatus['attribute'] != 0
-                                              ? t.colorScheme.onInverseSurface
-                                              : t.colorScheme
-                                                  .primary, // 设置按钮背景色
+                  Stack(
+                    children: [
+                      GestureDetector(
+                        behavior: HitTestBehavior.translucent,
+                        onTap: () => showIntroDetail(),
+                        child: Padding(
+                          padding: const EdgeInsets.only(top: 7, bottom: 6),
+                          child: Row(
+                            children: [
+                              StatView(
+                                theme: 'gray',
+                                view: !loadingStatus
+                                    ? widget.videoDetail!.stat!.view
+                                    : videoItem['stat'].view,
+                                size: 'medium',
+                              ),
+                              const SizedBox(width: 10),
+                              StatDanMu(
+                                theme: 'gray',
+                                danmu: !loadingStatus
+                                    ? widget.videoDetail!.stat!.danmaku
+                                    : videoItem['stat'].danmaku,
+                                size: 'medium',
+                              ),
+                              const SizedBox(width: 10),
+                              Text(
+                                Utils.dateFormat(
+                                    !loadingStatus
+                                        ? widget.videoDetail!.pubdate
+                                        : videoItem['pubdate'],
+                                    formatType: 'detail'),
+                                style: TextStyle(
+                                  fontSize: 12,
+                                  color: t.colorScheme.outline,
+                                ),
+                              ),
+                              const SizedBox(width: 10),
+                              if (videoIntroController.isShowOnlineTotal)
+                                Obx(
+                                  () => Text(
+                                    '${videoIntroController.total.value}人在看',
+                                    style: TextStyle(
+                                      fontSize: 12,
+                                      color: t.colorScheme.outline,
                                     ),
-                                    child: Text(
-                                      followStatus['attribute'] != 0
-                                          ? '已关注'
-                                          : '关注',
-                                      style: TextStyle(
-                                          fontSize: t
-                                              .textTheme.labelMedium!.fontSize),
-                                    ),
-                                  )
-                                : ElevatedButton(
-                                    onPressed:
-                                        videoIntroController.actionRelationMod,
-                                    child: const Text('关注'),
                                   ),
+                                ),
+                            ],
                           ),
                         ),
-                      )),
+                      ),
+                      if (enableAi)
+                        Positioned(
+                          right: 10,
+                          top: 6,
+                          child: GestureDetector(
+                            onTap: () async {
+                              final res =
+                                  await videoIntroController.aiConclusion();
+                              if (res['status']) {
+                                showAiBottomSheet();
+                              }
+                            },
+                            child:
+                                Image.asset('assets/images/ai.png', height: 22),
+                          ),
+                        )
+                    ],
+                  ),
+                  // 点赞收藏转发 布局样式1
+                  // SingleChildScrollView(
+                  //   padding: const EdgeInsets.only(top: 7, bottom: 7),
+                  //   scrollDirection: Axis.horizontal,
+                  //   child: actionRow(
+                  //     context,
+                  //     videoIntroController,
+                  //     videoDetailCtr,
+                  //   ),
+                  // ),
+                  // 点赞收藏转发 布局样式2
+                  actionGrid(context, videoIntroController),
+                  // 合集
+                  if (!loadingStatus &&
+                      widget.videoDetail!.ugcSeason != null) ...[
+                    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 &&
+                      widget.videoDetail!.pages != null &&
+                      widget.videoDetail!.pages!.length > 1) ...[
+                    Obx(() => PagesPanel(
+                          pages: widget.videoDetail!.pages!,
+                          cid: videoIntroController.lastPlayCid.value,
+                          sheetHeight: sheetHeight,
+                          changeFuc: (cid) =>
+                              videoIntroController.changeSeasonOrbangu(
+                                  videoIntroController.bvid, cid, null),
+                        ))
+                  ],
+                  GestureDetector(
+                    onTap: onPushMember,
+                    child: Container(
+                      padding: const EdgeInsets.symmetric(
+                          vertical: 12, horizontal: 4),
+                      child: Row(
+                        children: [
+                          NetworkImgLayer(
+                            type: 'avatar',
+                            src: loadingStatus
+                                ? owner.face
+                                : widget.videoDetail!.owner!.face,
+                            width: 34,
+                            height: 34,
+                            fadeInDuration: Duration.zero,
+                            fadeOutDuration: Duration.zero,
+                          ),
+                          const SizedBox(width: 10),
+                          Text(owner.name,
+                              style: const TextStyle(fontSize: 13)),
+                          const SizedBox(width: 6),
+                          Text(
+                            follower,
+                            style: TextStyle(
+                              fontSize: t.textTheme.labelSmall!.fontSize,
+                              color: outline,
+                            ),
+                          ),
+                          const Spacer(),
+                          Obx(() => AnimatedOpacity(
+                                opacity: loadingStatus ||
+                                        videoIntroController
+                                            .followStatus.isEmpty
+                                    ? 0
+                                    : 1,
+                                duration: const Duration(milliseconds: 50),
+                                child: SizedBox(
+                                  height: 32,
+                                  child: Obx(
+                                    () => videoIntroController
+                                            .followStatus.isNotEmpty
+                                        ? TextButton(
+                                            onPressed: videoIntroController
+                                                .actionRelationMod,
+                                            style: TextButton.styleFrom(
+                                              padding: const EdgeInsets.only(
+                                                  left: 8, right: 8),
+                                              foregroundColor:
+                                                  followStatus['attribute'] != 0
+                                                      ? outline
+                                                      : t.colorScheme.onPrimary,
+                                              backgroundColor:
+                                                  followStatus['attribute'] != 0
+                                                      ? t.colorScheme
+                                                          .onInverseSurface
+                                                      : t.colorScheme
+                                                          .primary, // 设置按钮背景色
+                                            ),
+                                            child: Text(
+                                              followStatus['attribute'] != 0
+                                                  ? '已关注'
+                                                  : '关注',
+                                              style: TextStyle(
+                                                  fontSize: t.textTheme
+                                                      .labelMedium!.fontSize),
+                                            ),
+                                          )
+                                        : ElevatedButton(
+                                            onPressed: videoIntroController
+                                                .actionRelationMod,
+                                            child: const Text('关注'),
+                                          ),
+                                  ),
+                                ),
+                              )),
+                        ],
+                      ),
+                    ),
+                  ),
                 ],
+              )
+            : const SizedBox(
+                height: 100,
+                child: Center(
+                  child: CircularProgressIndicator(),
+                ),
               ),
-            ),
-          ),
-        ],
-      )),
+      ),
     );
   }
 
@@ -446,7 +509,10 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
                   selectIcon: const Icon(FontAwesomeIcons.solidThumbsUp),
                   onTap: handleState(videoIntroController.actionLikeVideo),
                   selectStatus: videoIntroController.hasLike.value,
-                  text: widget.videoDetail!.stat!.like!.toString()),
+                  loadingStatus: loadingStatus,
+                  text: !loadingStatus
+                      ? widget.videoDetail!.stat!.like!.toString()
+                      : '-'),
             ),
             // ActionItem(
             //     icon: const Icon(FontAwesomeIcons.clock),
@@ -456,38 +522,104 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
             //     text: '稍后再看'),
             Obx(
               () => ActionItem(
-                icon: const Icon(FontAwesomeIcons.b),
-                selectIcon: const Icon(FontAwesomeIcons.b),
-                onTap: handleState(videoIntroController.actionCoinVideo),
-                selectStatus: videoIntroController.hasCoin.value,
-                text: widget.videoDetail!.stat!.coin!.toString(),
-              ),
+                  icon: const Icon(FontAwesomeIcons.b),
+                  selectIcon: const Icon(FontAwesomeIcons.b),
+                  onTap: handleState(videoIntroController.actionCoinVideo),
+                  selectStatus: videoIntroController.hasCoin.value,
+                  loadingStatus: loadingStatus,
+                  text: !loadingStatus
+                      ? widget.videoDetail!.stat!.coin!.toString()
+                      : '-'),
             ),
             Obx(
               () => ActionItem(
-                icon: const Icon(FontAwesomeIcons.star),
-                selectIcon: const Icon(FontAwesomeIcons.solidStar),
-                onTap: () => showFavBottomSheet(),
-                onLongPress: () => showFavBottomSheet(type: 'longPress'),
-                selectStatus: videoIntroController.hasFav.value,
-                text: widget.videoDetail!.stat!.favorite!.toString(),
-              ),
+                  icon: const Icon(FontAwesomeIcons.star),
+                  selectIcon: const Icon(FontAwesomeIcons.solidStar),
+                  onTap: () => showFavBottomSheet(),
+                  onLongPress: () => showFavBottomSheet(type: 'longPress'),
+                  selectStatus: videoIntroController.hasFav.value,
+                  loadingStatus: loadingStatus,
+                  text: !loadingStatus
+                      ? widget.videoDetail!.stat!.favorite!.toString()
+                      : '-'),
             ),
             ActionItem(
-              icon: const Icon(FontAwesomeIcons.comment),
-              onTap: () => videoDetailCtr.tabCtr.animateTo(1),
-              selectStatus: false,
-              text: widget.videoDetail!.stat!.reply!.toString(),
-            ),
+                icon: const Icon(FontAwesomeIcons.comment),
+                onTap: () => videoDetailCtr.tabCtr.animateTo(1),
+                selectStatus: false,
+                loadingStatus: loadingStatus,
+                text: !loadingStatus
+                    ? widget.videoDetail!.stat!.reply!.toString()
+                    : '评论'),
             ActionItem(
-              icon: const Icon(FontAwesomeIcons.shareFromSquare),
-              onTap: () => videoIntroController.actionShareVideo(),
-              selectStatus: false,
-              text: '分享',
-            ),
+                icon: const Icon(FontAwesomeIcons.shareFromSquare),
+                onTap: () => videoIntroController.actionShareVideo(),
+                selectStatus: false,
+                loadingStatus: loadingStatus,
+                text: '分享'),
           ],
         ),
       );
     });
   }
+
+  Widget actionRow(BuildContext context, videoIntroController, videoDetailCtr) {
+    return Row(children: <Widget>[
+      Obx(
+        () => ActionRowItem(
+          icon: const Icon(FontAwesomeIcons.thumbsUp),
+          onTap: handleState(videoIntroController.actionLikeVideo),
+          selectStatus: videoIntroController.hasLike.value,
+          loadingStatus: loadingStatus,
+          text:
+              !loadingStatus ? widget.videoDetail!.stat!.like!.toString() : '-',
+        ),
+      ),
+      const SizedBox(width: 8),
+      Obx(
+        () => ActionRowItem(
+          icon: const Icon(FontAwesomeIcons.b),
+          onTap: handleState(videoIntroController.actionCoinVideo),
+          selectStatus: videoIntroController.hasCoin.value,
+          loadingStatus: loadingStatus,
+          text:
+              !loadingStatus ? widget.videoDetail!.stat!.coin!.toString() : '-',
+        ),
+      ),
+      const SizedBox(width: 8),
+      Obx(
+        () => ActionRowItem(
+          icon: const Icon(FontAwesomeIcons.heart),
+          onTap: () => showFavBottomSheet(),
+          onLongPress: () => showFavBottomSheet(type: 'longPress'),
+          selectStatus: videoIntroController.hasFav.value,
+          loadingStatus: loadingStatus,
+          text: !loadingStatus
+              ? widget.videoDetail!.stat!.favorite!.toString()
+              : '-',
+        ),
+      ),
+      const SizedBox(width: 8),
+      ActionRowItem(
+        icon: const Icon(FontAwesomeIcons.comment),
+        onTap: () {
+          videoDetailCtr.tabCtr.animateTo(1);
+        },
+        selectStatus: false,
+        loadingStatus: loadingStatus,
+        text:
+            !loadingStatus ? widget.videoDetail!.stat!.reply!.toString() : '-',
+      ),
+      const SizedBox(width: 8),
+      ActionRowItem(
+          icon: const Icon(FontAwesomeIcons.share),
+          onTap: () => videoIntroController.actionShareVideo(),
+          selectStatus: false,
+          loadingStatus: loadingStatus,
+          // text: !loadingStatus
+          //     ? widget.videoDetail!.stat!.share!.toString()
+          //     : '-',
+          text: '转发'),
+    ]);
+  }
 }

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

@@ -7,6 +7,7 @@ class ActionItem extends StatelessWidget {
   final Icon? selectIcon;
   final Function? onTap;
   final Function? onLongPress;
+  final bool? loadingStatus;
   final String? text;
   final bool selectStatus;
 
@@ -16,6 +17,7 @@ class ActionItem extends StatelessWidget {
     this.selectIcon,
     this.onTap,
     this.onLongPress,
+    this.loadingStatus,
     this.text,
     this.selectStatus = false,
   }) : super(key: key);
@@ -41,15 +43,25 @@ class ActionItem extends StatelessWidget {
               : Icon(icon!.icon!,
                   size: 18, color: Theme.of(context).colorScheme.outline),
           const SizedBox(height: 6),
-          Text(
-            text ?? '',
-            style: TextStyle(
-              color: selectStatus
-                  ? Theme.of(context).colorScheme.primary
-                  : Theme.of(context).colorScheme.outline,
-              fontSize: Theme.of(context).textTheme.labelSmall!.fontSize,
+          AnimatedOpacity(
+            opacity: loadingStatus! ? 0 : 1,
+            duration: const Duration(milliseconds: 200),
+            child: AnimatedSwitcher(
+              duration: const Duration(milliseconds: 300),
+              transitionBuilder: (Widget child, Animation<double> animation) {
+                return ScaleTransition(scale: animation, child: child);
+              },
+              child: Text(
+                text ?? '',
+                key: ValueKey<String>(text ?? ''),
+                style: TextStyle(
+                    color: selectStatus
+                        ? Theme.of(context).colorScheme.primary
+                        : Theme.of(context).colorScheme.outline,
+                    fontSize: Theme.of(context).textTheme.labelSmall!.fontSize),
+              ),
             ),
-          )
+          ),
         ],
       ),
     );

lib/pages/video/detail/view.dart

@@ -9,7 +9,6 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:get/get.dart';
 import 'package:flutter/material.dart';
 import 'package:hive/hive.dart';
-import 'package:nil/nil.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
 import 'package:pilipala/http/user.dart';
 import 'package:pilipala/models/common/search_type.dart';
@@ -25,7 +24,7 @@ import 'package:pilipala/services/service_locator.dart';
 import 'package:pilipala/utils/storage.dart';
 
 import '../../../services/shutdown_timer_service.dart';
-import 'widgets/header_control.dart';
+import 'widgets/app_bar.dart';
 
 class VideoDetailPage extends StatefulWidget {
   const VideoDetailPage({Key? key}) : super(key: key);
@@ -38,7 +37,7 @@ class VideoDetailPage extends StatefulWidget {
 
 class _VideoDetailPageState extends State<VideoDetailPage>
     with TickerProviderStateMixin, RouteAware {
-  late VideoDetailController videoDetailController;
+  late VideoDetailController vdCtr;
   PlPlayerController? plPlayerController;
   final ScrollController _extendNestCtr = ScrollController();
   late StreamController<double> appbarStream;
@@ -65,20 +64,18 @@ class _VideoDetailPageState extends State<VideoDetailPage>
   void initState() {
     super.initState();
     heroTag = Get.arguments['heroTag'];
-    videoDetailController = Get.put(VideoDetailController(), tag: heroTag);
+    vdCtr = Get.put(VideoDetailController(), tag: heroTag);
     videoIntroController = Get.put(
         VideoIntroController(bvid: Get.parameters['bvid']!),
         tag: heroTag);
     videoIntroController.videoDetail.listen((value) {
-      videoPlayerServiceHandler.onVideoDetailChange(
-          value, videoDetailController.cid.value);
+      videoPlayerServiceHandler.onVideoDetailChange(value, vdCtr.cid.value);
     });
     bangumiIntroController = Get.put(BangumiIntroController(), tag: heroTag);
     bangumiIntroController.bangumiDetail.listen((value) {
-      videoPlayerServiceHandler.onVideoDetailChange(
-          value, videoDetailController.cid.value);
+      videoPlayerServiceHandler.onVideoDetailChange(value, vdCtr.cid.value);
     });
-    videoDetailController.cid.listen((p0) {
+    vdCtr.cid.listen((p0) {
       videoPlayerServiceHandler.onVideoDetailChange(
           bangumiIntroController.bangumiDetail.value, p0);
     });
@@ -93,16 +90,16 @@ class _VideoDetailPageState extends State<VideoDetailPage>
     appbarStreamListen();
     fullScreenStatusListener();
     if (Platform.isAndroid) {
-      floating = videoDetailController.floating!;
+      floating = vdCtr.floating!;
       autoEnterPip();
     }
   }
 
   // 获取视频资源，初始化播放器
   Future<void> videoSourceInit() async {
-    _futureBuilderFuture = videoDetailController.queryVideoUrl();
-    if (videoDetailController.autoPlay.value) {
-      plPlayerController = videoDetailController.plPlayerController;
+    _futureBuilderFuture = vdCtr.queryVideoUrl();
+    if (vdCtr.autoPlay.value) {
+      plPlayerController = vdCtr.plPlayerController;
       plPlayerController!.addStatusLister(playerListener);
     }
   }
@@ -131,10 +128,10 @@ class _VideoDetailPageState extends State<VideoDetailPage>
       /// 顺序播放 列表循环
       if (plPlayerController!.playRepeat != PlayRepeat.pause &&
           plPlayerController!.playRepeat != PlayRepeat.singleCycle) {
-        if (videoDetailController.videoType == SearchType.video) {
+        if (vdCtr.videoType == SearchType.video) {
           videoIntroController.nextPlay();
         }
-        if (videoDetailController.videoType == SearchType.media_bangumi) {
+        if (vdCtr.videoType == SearchType.media_bangumi) {
           bangumiIntroController.nextPlay();
         }
       }
@@ -146,8 +143,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
       }
       // 播放完展示控制栏
       try {
-        PiPStatus currentStatus =
-            await videoDetailController.floating!.pipStatus;
+        PiPStatus currentStatus = await vdCtr.floating!.pipStatus;
         if (currentStatus == PiPStatus.disabled) {
           plPlayerController!.onLockControl(false);
         }
@@ -168,17 +164,17 @@ class _VideoDetailPageState extends State<VideoDetailPage>
 
   /// 未开启自动播放时触发播放
   Future<void> handlePlay() async {
-    await videoDetailController.playerInit();
-    plPlayerController = videoDetailController.plPlayerController;
+    await vdCtr.playerInit();
+    plPlayerController = vdCtr.plPlayerController;
     plPlayerController!.addStatusLister(playerListener);
-    videoDetailController.autoPlay.value = true;
-    videoDetailController.isShowCover.value = false;
+    vdCtr.autoPlay.value = true;
+    vdCtr.isShowCover.value = false;
   }
 
   void fullScreenStatusListener() {
     plPlayerController?.isFullScreen.listen((bool isFullScreen) {
       if (isFullScreen) {
-        videoDetailController.hiddenReplyReplyPanel();
+        vdCtr.hiddenReplyReplyPanel();
       }
     });
   }
@@ -190,8 +186,8 @@ class _VideoDetailPageState extends State<VideoDetailPage>
       plPlayerController!.removeStatusLister(playerListener);
       plPlayerController!.dispose();
     }
-    if (videoDetailController.floating != null) {
-      videoDetailController.floating!.dispose();
+    if (vdCtr.floating != null) {
+      vdCtr.floating!.dispose();
     }
     videoPlayerServiceHandler.onVideoDetailDispose();
     if (Platform.isAndroid) {
@@ -207,10 +203,10 @@ class _VideoDetailPageState extends State<VideoDetailPage>
     /// 开启
     if (setting.get(SettingBoxKey.enableAutoBrightness, defaultValue: false)
         as bool) {
-      videoDetailController.brightness = plPlayerController!.brightness.value;
+      vdCtr.brightness = plPlayerController!.brightness.value;
     }
     if (plPlayerController != null) {
-      videoDetailController.defaultST = plPlayerController!.position.value;
+      vdCtr.defaultST = plPlayerController!.position.value;
       videoIntroController.isPaused = true;
       plPlayerController!.removeStatusLister(playerListener);
       plPlayerController!.pause();
@@ -226,17 +222,16 @@ class _VideoDetailPageState extends State<VideoDetailPage>
         plPlayerController!.videoPlayerController != null) {
       setState(() => isShowing = true);
     }
-    videoDetailController.isFirstTime = false;
+    vdCtr.isFirstTime = false;
     final bool autoplay = autoPlayEnable;
-    videoDetailController.playerInit(autoplay: autoplay);
+    vdCtr.playerInit(autoplay: autoplay);
 
     /// 未开启自动播放时，未播放跳转下一页返回/播放后跳转下一页返回
-    videoDetailController.autoPlay.value =
-        !videoDetailController.isShowCover.value;
+    vdCtr.autoPlay.value = !vdCtr.isShowCover.value;
     videoIntroController.isPaused = false;
     if (_extendNestCtr.position.pixels == 0 && autoplay) {
       await Future.delayed(const Duration(milliseconds: 300));
-      plPlayerController?.seekTo(videoDetailController.defaultST);
+      plPlayerController?.seekTo(vdCtr.defaultST);
       plPlayerController?.play();
     }
     plPlayerController?.addStatusLister(playerListener);
@@ -259,9 +254,166 @@ class _VideoDetailPageState extends State<VideoDetailPage>
 
   @override
   Widget build(BuildContext context) {
-    final double videoHeight = MediaQuery.sizeOf(context).width * 9 / 16;
+    // final double videoHeight = MediaQuery.sizeOf(context).width * 9 / 16;
+    final sizeContext = MediaQuery.sizeOf(context);
+    final _context = MediaQuery.of(context);
+    late double defaultVideoHeight = sizeContext.width * 9 / 16;
+    late RxDouble videoHeight = defaultVideoHeight.obs;
     final double pinnedHeaderHeight =
-        statusBarHeight + kToolbarHeight + videoHeight;
+        statusBarHeight + kToolbarHeight + videoHeight.value;
+    // ignore: no_leading_underscores_for_local_identifiers
+
+    // 竖屏
+    final bool isPortrait = _context.orientation == Orientation.portrait;
+    // 横屏
+    final bool isLandscape = _context.orientation == Orientation.landscape;
+    final Rx<bool> isFullScreen = plPlayerController?.isFullScreen ?? false.obs;
+    // 全屏时高度撑满
+    if (isLandscape || isFullScreen.value == true) {
+      videoHeight.value = Get.size.height;
+      enterFullScreen();
+    } else {
+      videoHeight.value = defaultVideoHeight;
+      exitFullScreen();
+    }
+
+    /// 播放器面板
+    Widget videoPlayerPanel = FutureBuilder(
+      future: _futureBuilderFuture,
+      builder: (BuildContext context, AsyncSnapshot snapshot) {
+        if (snapshot.hasData && snapshot.data['status']) {
+          return Obx(
+            () {
+              return !vdCtr.autoPlay.value
+                  ? const SizedBox()
+                  : PLVideoPlayer(
+                      controller: plPlayerController!,
+                      headerControl: vdCtr.headerControl,
+                      danmuWidget: Obx(
+                        () => PlDanmaku(
+                          key: Key(vdCtr.danmakuCid.value.toString()),
+                          cid: vdCtr.danmakuCid.value,
+                          playerController: plPlayerController!,
+                        ),
+                      ),
+                    );
+            },
+          );
+        } else {
+          // 加载失败异常处理
+          return const SizedBox();
+        }
+      },
+    );
+
+    /// tabbar
+    Widget tabbarBuild = Container(
+      width: double.infinity,
+      height: 45,
+      decoration: BoxDecoration(
+        border: Border(
+          bottom: BorderSide(
+            width: 1,
+            color: Theme.of(context).dividerColor.withOpacity(0.1),
+          ),
+        ),
+      ),
+      child: Row(
+        children: [
+          const SizedBox(width: 20),
+          Expanded(
+            child: TabBar(
+              controller: vdCtr.tabCtr,
+              dividerColor: Colors.transparent,
+              tabs: vdCtr.tabs.map((String name) => Tab(text: name)).toList(),
+            ),
+          ),
+          SizedBox(
+            width: 220,
+            child: Center(
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.end,
+                children: [
+                  SizedBox(
+                    height: 32,
+                    child: TextButton(
+                      style: ButtonStyle(
+                        padding: MaterialStateProperty.all(EdgeInsets.zero),
+                      ),
+                      onPressed: () => vdCtr.showShootDanmakuSheet(),
+                      child: const Text('发弹幕', style: TextStyle(fontSize: 12)),
+                    ),
+                  ),
+                  const SizedBox(width: 4),
+                  SizedBox(
+                    width: 34,
+                    height: 32,
+                    child: TextButton(
+                      style: ButtonStyle(
+                        padding: MaterialStateProperty.all(EdgeInsets.zero),
+                      ),
+                      onPressed: () {
+                        plPlayerController?.isOpenDanmu.value =
+                            !(plPlayerController?.isOpenDanmu.value ?? false);
+                      },
+                      child: Obx(() => Text(
+                            '弹',
+                            style: TextStyle(
+                              fontSize: 12,
+                              color: (plPlayerController?.isOpenDanmu.value ??
+                                      false)
+                                  ? Theme.of(context).colorScheme.primary
+                                  : Theme.of(context).colorScheme.outline,
+                            ),
+                          )),
+                    ),
+                  ),
+                  const SizedBox(width: 14),
+                ],
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+
+    /// 手动播放
+    Widget handlePlayPanel() {
+      return Stack(
+        children: [
+          GestureDetector(
+            onTap: () {
+              handlePlay();
+            },
+            child: NetworkImgLayer(
+              type: 'emote',
+              src: vdCtr.videoItem['pic'],
+              width: Get.width,
+              height: videoHeight.value,
+            ),
+          ),
+          Positioned(
+            top: 0,
+            left: 0,
+            right: 0,
+            child: buildCustomAppBar(),
+          ),
+          Positioned(
+            right: 12,
+            bottom: 10,
+            child: IconButton(
+                tooltip: '播放',
+                onPressed: () => handlePlay(),
+                icon: Image.asset(
+                  'assets/images/play.png',
+                  width: 60,
+                  height: 60,
+                )),
+          ),
+        ],
+      );
+    }
+
     Widget childWhenDisabled = SafeArea(
       top: MediaQuery.of(context).orientation == Orientation.portrait &&
           plPlayerController?.isFullScreen.value == true,
@@ -273,7 +425,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
         children: [
           Scaffold(
             resizeToAvoidBottomInset: false,
-            key: videoDetailController.scaffoldKey,
+            key: vdCtr.scaffoldKey,
             backgroundColor: Colors.black,
             appBar: PreferredSize(
               preferredSize: const Size.fromHeight(0),
@@ -299,21 +451,19 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                       return SliverAppBar(
                         automaticallyImplyLeading: false,
                         // 假装使用一个非空变量，避免Obx检测不到而罢工
-                        pinned: videoDetailController.autoPlay.value ^
-                            false ^
-                            videoDetailController.autoPlay.value,
+                        pinned: vdCtr.autoPlay.value,
                         elevation: 0,
                         scrolledUnderElevation: 0,
                         forceElevated: innerBoxIsScrolled,
                         expandedHeight: MediaQuery.of(context).orientation ==
                                     Orientation.landscape ||
                                 plPlayerController?.isFullScreen.value == true
-                            ? MediaQuery.sizeOf(context).height -
+                            ? (MediaQuery.sizeOf(context).height -
                                 (MediaQuery.of(context).orientation ==
                                         Orientation.landscape
                                     ? 0
-                                    : MediaQuery.of(context).padding.top)
-                            : videoHeight,
+                                    : MediaQuery.of(context).padding.top))
+                            : videoHeight.value,
                         backgroundColor: Colors.black,
                         flexibleSpace: FlexibleSpaceBar(
                           background: PopScope(
@@ -333,108 +483,27 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                               child: LayoutBuilder(
                                 builder: (BuildContext context,
                                     BoxConstraints boxConstraints) {
-                                  final double maxWidth =
-                                      boxConstraints.maxWidth;
-                                  final double maxHeight =
-                                      boxConstraints.maxHeight;
+                                  // final double maxWidth =
+                                  //     boxConstraints.maxWidth;
+                                  // final double maxHeight =
+                                  //     boxConstraints.maxHeight;
                                   return Stack(
                                     children: <Widget>[
-                                      if (isShowing)
-                                        FutureBuilder(
-                                          future: _futureBuilderFuture,
-                                          builder: (BuildContext context,
-                                              AsyncSnapshot snapshot) {
-                                            if (snapshot.hasData &&
-                                                snapshot.data['status']) {
-                                              return Obx(
-                                                () =>
-                                                    !videoDetailController
-                                                            .autoPlay.value
-                                                        ? nil
-                                                        : PLVideoPlayer(
-                                                            controller:
-                                                                plPlayerController!,
-                                                            headerControl:
-                                                                videoDetailController
-                                                                    .headerControl,
-                                                            danmuWidget: Obx(
-                                                              () => PlDanmaku(
-                                                                key: Key(videoDetailController
-                                                                    .danmakuCid
-                                                                    .value
-                                                                    .toString()),
-                                                                cid: videoDetailController
-                                                                    .danmakuCid
-                                                                    .value,
-                                                                playerController:
-                                                                    plPlayerController!,
-                                                              ),
-                                                            ),
-                                                          ),
-                                              );
-                                            } else {
-                                              return buildCustomAppBar();
-                                            }
-                                          },
-                                        ),
+                                      if (isShowing) videoPlayerPanel,
 
                                       /// 关闭自动播放时 手动播放
-                                      if (!videoDetailController
-                                          .autoPlay.value) ...<Widget>[
-                                        Obx(
-                                          () => Visibility(
-                                            visible: videoDetailController
-                                                .isShowCover.value,
-                                            child: Positioned(
-                                              top: 0,
-                                              left: 0,
-                                              right: 0,
-                                              child: GestureDetector(
-                                                onTap: () {
-                                                  handlePlay();
-                                                },
-                                                child: NetworkImgLayer(
-                                                  type: 'emote',
-                                                  src: videoDetailController
-                                                      .videoItem['pic'],
-                                                  width: maxWidth,
-                                                  height: maxHeight,
-                                                ),
-                                              ),
-                                            ),
+                                      Obx(
+                                        () => Visibility(
+                                          visible: !vdCtr.autoPlay.value &&
+                                              vdCtr.isShowCover.value,
+                                          child: Positioned(
+                                            top: 0,
+                                            left: 0,
+                                            right: 0,
+                                            child: handlePlayPanel(),
                                           ),
                                         ),
-                                        Obx(
-                                          () => Visibility(
-                                              visible: videoDetailController
-                                                      .isShowCover.value &&
-                                                  videoDetailController
-                                                      .isEffective.value,
-                                              child: Stack(
-                                                children: [
-                                                  Positioned(
-                                                    top: 0,
-                                                    left: 0,
-                                                    right: 0,
-                                                    child: buildCustomAppBar(),
-                                                  ),
-                                                  Positioned(
-                                                    right: 12,
-                                                    bottom: 10,
-                                                    child: IconButton(
-                                                        tooltip: '播放',
-                                                        onPressed: () =>
-                                                            handlePlay(),
-                                                        icon: Image.asset(
-                                                          'assets/images/play.png',
-                                                          width: 60,
-                                                          height: 60,
-                                                        )),
-                                                  ),
-                                                ],
-                                              )),
-                                        ),
-                                      ]
+                                      ),
                                     ],
                                   );
                                 },
@@ -445,18 +514,16 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                   ),
                 ];
               },
-              // pinnedHeaderSliverHeightBuilder: () {
-              //   return playerStatus != PlayerStatus.playing
-              //       ? statusBarHeight + kToolbarHeight
-              //       : pinnedHeaderHeight;
-              // },
+
               /// 不收回
               pinnedHeaderSliverHeightBuilder: () {
                 return MediaQuery.of(context).orientation ==
                             Orientation.landscape ||
                         plPlayerController?.isFullScreen.value == true
                     ? MediaQuery.sizeOf(context).height
-                    : pinnedHeaderHeight;
+                    : playerStatus != PlayerStatus.playing
+                        ? kToolbarHeight
+                        : pinnedHeaderHeight;
               },
               onlyOneScrollInBody: true,
               body: ColoredBox(
@@ -464,54 +531,23 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                 color: Theme.of(context).colorScheme.background,
                 child: Column(
                   children: [
-                    Opacity(
-                      opacity: 0,
-                      child: SizedBox(
-                        width: double.infinity,
-                        height: 0,
-                        child: Obx(
-                          () => TabBar(
-                            controller: videoDetailController.tabCtr,
-                            dividerColor: Colors.transparent,
-                            indicatorColor:
-                                Theme.of(context).colorScheme.background,
-                            tabs: videoDetailController.tabs
-                                .map((String name) => Tab(text: name))
-                                .toList(),
-                          ),
-                        ),
-                      ),
-                    ),
+                    tabbarBuild,
                     Expanded(
                       child: TabBarView(
-                        controller: videoDetailController.tabCtr,
+                        controller: vdCtr.tabCtr,
                         children: <Widget>[
                           Builder(
                             builder: (BuildContext context) {
                               return CustomScrollView(
                                 key: const PageStorageKey<String>('简介'),
                                 slivers: <Widget>[
-                                  if (videoDetailController.videoType ==
-                                      SearchType.video) ...[
-                                    VideoIntroPanel(
-                                        bvid: videoDetailController.bvid),
-                                  ] else if (videoDetailController.videoType ==
+                                  if (vdCtr.videoType == SearchType.video) ...[
+                                    VideoIntroPanel(bvid: vdCtr.bvid),
+                                  ] else if (vdCtr.videoType ==
                                       SearchType.media_bangumi) ...[
                                     Obx(() => BangumiIntroPanel(
-                                        cid: videoDetailController.cid.value)),
+                                        cid: vdCtr.cid.value)),
                                   ],
-                                  // if (videoDetailController.videoType ==
-                                  //     SearchType.video) ...[
-                                  //   SliverPersistentHeader(
-                                  //     floating: true,
-                                  //     pinned: true,
-                                  //     delegate: SliverHeaderDelegate(
-                                  //       height: 50,
-                                  //       child:
-                                  //           const MenuRow(loadingStatus: false),
-                                  //     ),
-                                  //   ),
-                                  // ],
                                   SliverToBoxAdapter(
                                     child: Divider(
                                       indent: 12,
@@ -521,15 +557,17 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                           .withOpacity(0.06),
                                     ),
                                   ),
-                                  const RelatedVideoPanel(),
+                                  if (vdCtr.videoType == SearchType.video &&
+                                      vdCtr.enableRelatedVideo)
+                                    const RelatedVideoPanel(),
                                 ],
                               );
                             },
                           ),
                           Obx(
                             () => VideoReplyPanel(
-                              bvid: videoDetailController.bvid,
-                              oid: videoDetailController.oid.value,
+                              bvid: vdCtr.bvid,
+                              oid: vdCtr.oid.value,
                             ),
                           )
                         ],
@@ -543,56 +581,26 @@ class _VideoDetailPageState extends State<VideoDetailPage>
 
           /// 重新进入会刷新
           // 播放完成/暂停播放
-          // StreamBuilder(
-          //   stream: appbarStream.stream,
-          //   initialData: 0,
-          //   builder: ((context, snapshot) {
-          //     return ScrollAppBar(
-          //       snapshot.data!.toDouble(),
-          //       () => continuePlay(),
-          //       playerStatus,
-          //       null,
-          //     );
-          //   }),
-          // )
+          StreamBuilder(
+            stream: appbarStream.stream,
+            initialData: 0,
+            builder: ((context, snapshot) {
+              return ScrollAppBar(
+                snapshot.data!.toDouble(),
+                () => continuePlay(),
+                playerStatus,
+                null,
+              );
+            }),
+          )
         ],
       ),
     );
-    Widget childWhenEnabled = FutureBuilder(
-      key: Key(heroTag),
-      future: _futureBuilderFuture,
-      builder: (BuildContext context, AsyncSnapshot snapshot) {
-        if (snapshot.hasData && snapshot.data['status']) {
-          return Obx(
-            () => !videoDetailController.autoPlay.value
-                ? const SizedBox()
-                : PLVideoPlayer(
-                    controller: plPlayerController!,
-                    headerControl: HeaderControl(
-                      controller: plPlayerController,
-                      videoDetailCtr: videoDetailController,
-                      bvid: videoDetailController.bvid,
-                      videoType: videoDetailController.videoType,
-                    ),
-                    danmuWidget: Obx(
-                      () => PlDanmaku(
-                        key: Key(
-                            videoDetailController.danmakuCid.value.toString()),
-                        cid: videoDetailController.danmakuCid.value,
-                        playerController: plPlayerController!,
-                      ),
-                    ),
-                  ),
-          );
-        } else {
-          return nil;
-        }
-      },
-    );
+
     if (Platform.isAndroid) {
       return PiPSwitcher(
         childWhenDisabled: childWhenDisabled,
-        childWhenEnabled: childWhenEnabled,
+        childWhenEnabled: videoPlayerPanel,
         floating: floating,
       );
     } else {
@@ -633,8 +641,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
             ComBtn(
               icon: const Icon(Icons.history_outlined, size: 22),
               fuc: () async {
-                var res = await UserHttp.toViewLater(
-                    bvid: videoDetailController.bvid);
+                var res = await UserHttp.toViewLater(bvid: vdCtr.bvid);
                 SmartDialog.showToast(res['msg']);
               },
             ),

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

@@ -1,5 +1,4 @@
 import 'dart:io';
-import 'dart:math';
 
 import 'package:floating/floating.dart';
 import 'package:flutter/material.dart';
@@ -17,7 +16,6 @@ import 'package:pilipala/pages/video/detail/introduction/widgets/menu_row.dart';
 import 'package:pilipala/plugin/pl_player/index.dart';
 import 'package:pilipala/plugin/pl_player/models/play_repeat.dart';
 import 'package:pilipala/utils/storage.dart';
-import 'package:pilipala/http/danmaku.dart';
 import 'package:pilipala/services/shutdown_timer_service.dart';
 import '../../../../models/common/search_type.dart';
 import '../../../../models/video_detail_res.dart';
@@ -47,7 +45,6 @@ class HeaderControl extends StatefulWidget implements PreferredSizeWidget {
 
 class _HeaderControlState extends State<HeaderControl> {
   late PlayUrlModel videoInfo;
-  List<PlaySpeed> playSpeed = PlaySpeed.values;
   static const TextStyle subTitleStyle = TextStyle(fontSize: 12);
   static const TextStyle titleStyle = TextStyle(fontSize: 14);
   Size get preferredSize => const Size(double.infinity, kToolbarHeight);
@@ -221,88 +218,6 @@ class _HeaderControlState extends State<HeaderControl> {
     );
   }
 
-  /// 发送弹幕
-  void showShootDanmakuSheet() {
-    final TextEditingController textController = TextEditingController();
-    bool isSending = false; // 追踪是否正在发送
-    showDialog(
-      context: Get.context!,
-      builder: (BuildContext context) {
-        // TODO: 支持更多类型和颜色的弹幕
-        return AlertDialog(
-          title: const Text('发送弹幕（测试）'),
-          content: StatefulBuilder(
-              builder: (BuildContext context, StateSetter setState) {
-            return TextField(
-              controller: textController,
-            );
-          }),
-          actions: [
-            TextButton(
-              onPressed: () => Get.back(),
-              child: Text(
-                '取消',
-                style: TextStyle(color: Theme.of(context).colorScheme.outline),
-              ),
-            ),
-            StatefulBuilder(
-                builder: (BuildContext context, StateSetter setState) {
-              return TextButton(
-                onPressed: isSending
-                    ? null
-                    : () async {
-                        final String msg = textController.text;
-                        if (msg.isEmpty) {
-                          SmartDialog.showToast('弹幕内容不能为空');
-                          return;
-                        } else if (msg.length > 100) {
-                          SmartDialog.showToast('弹幕内容不能超过100个字符');
-                          return;
-                        }
-                        setState(() {
-                          isSending = true; // 开始发送，更新状态
-                        });
-                        //修改按钮文字
-                        // SmartDialog.showToast('弹幕发送中,\n$msg');
-                        final dynamic res = await DanmakaHttp.shootDanmaku(
-                          oid: widget.videoDetailCtr!.cid.value,
-                          msg: textController.text,
-                          bvid: widget.videoDetailCtr!.bvid,
-                          progress:
-                              widget.controller!.position.value.inMilliseconds,
-                          type: 1,
-                        );
-                        setState(() {
-                          isSending = false; // 发送结束，更新状态
-                        });
-                        if (res['status']) {
-                          SmartDialog.showToast('发送成功');
-                          // 发送成功，自动预览该弹幕，避免重新请求
-                          // TODO: 暂停状态下预览弹幕仍会移动与计时，可考虑添加到dmSegList或其他方式实现
-                          widget.controller!.danmakuController!.addItems([
-                            DanmakuItem(
-                              msg,
-                              color: Colors.white,
-                              time: widget
-                                  .controller!.position.value.inMilliseconds,
-                              type: DanmakuItemType.scroll,
-                              isSend: true,
-                            )
-                          ]);
-                          Get.back();
-                        } else {
-                          SmartDialog.showToast('发送失败，错误信息为${res['msg']}');
-                        }
-                      },
-                child: Text(isSending ? '发送中...' : '发送'),
-              );
-            })
-          ],
-        );
-      },
-    );
-  }
-
   /// 定时关闭
   void scheduleExit() async {
     const List<int> scheduleTimeChoices = [
@@ -1166,41 +1081,6 @@ class _HeaderControlState extends State<HeaderControl> {
           //   ),
           //   fuc: () => _.screenshot(),
           // ),
-          SizedBox(
-            width: 56,
-            height: 34,
-            child: TextButton(
-              style: ButtonStyle(
-                padding: MaterialStateProperty.all(EdgeInsets.zero),
-              ),
-              onPressed: () => showShootDanmakuSheet(),
-              child: const Text(
-                '发弹幕',
-                style: textStyle,
-              ),
-            ),
-          ),
-          SizedBox(
-            width: 34,
-            height: 34,
-            child: Obx(
-              () => IconButton(
-                style: ButtonStyle(
-                  padding: MaterialStateProperty.all(EdgeInsets.zero),
-                ),
-                onPressed: () {
-                  _.isOpenDanmu.value = !_.isOpenDanmu.value;
-                },
-                icon: Icon(
-                  _.isOpenDanmu.value
-                      ? Icons.subtitles_outlined
-                      : Icons.subtitles_off_outlined,
-                  size: 19,
-                  color: Colors.white,
-                ),
-              ),
-            ),
-          ),
           SizedBox(width: buttonSpace),
           if (Platform.isAndroid) ...<Widget>[
             SizedBox(

lib/plugin/pl_player/controller.dart

@@ -292,11 +292,19 @@ class PlPlayerController {
       _longPressSpeed.value = videoStorage
           .get(VideoBoxKey.longPressSpeedDefault, defaultValue: 2.0);
     }
+    // 自定义倍速集合
     speedsList = List<double>.from(videoStorage
         .get(VideoBoxKey.customSpeedsList, defaultValue: <double>[]));
-    for (final PlaySpeed i in PlaySpeed.values) {
-      speedsList.add(i.value);
-    }
+    // 默认倍速
+    speedsList = List<double>.from(videoStorage
+        .get(VideoBoxKey.customSpeedsList, defaultValue: <double>[]));
+    //playSpeedSystem
+    final List<double> playSpeedSystem =
+        videoStorage.get(VideoBoxKey.playSpeedSystem, defaultValue: playSpeed);
+
+    // for (final PlaySpeed i in PlaySpeed.values) {
+    speedsList.addAll(playSpeedSystem);
+    // }
 
     // _playerEventSubs = onPlayerStatusChanged.listen((PlayerStatus status) {
     //   if (status == PlayerStatus.playing) {
@@ -676,18 +684,6 @@ class PlPlayerController {
     _playbackSpeed.value = speed;
   }
 
-  /// 设置倍速
-  // Future<void> togglePlaybackSpeed() async {
-  //   List<double> allowedSpeeds =
-  //       PlaySpeed.values.map<double>((e) => e.value).toList();
-  //   int index = allowedSpeeds.indexOf(_playbackSpeed.value);
-  //   if (index < allowedSpeeds.length - 1) {
-  //     setPlaybackSpeed(allowedSpeeds[index + 1]);
-  //   } else {
-  //     setPlaybackSpeed(allowedSpeeds[0]);
-  //   }
-  // }
-
   /// 播放视频
   /// TODO  _duration.value丢失
   Future<void> play(

lib/plugin/pl_player/models/play_speed.dart

@@ -1,39 +1,15 @@
-enum PlaySpeed {
-  pointTwoFive,
-  pointFive,
-  pointSevenFive,
+List<double> generatePlaySpeedList() {
+  List<double> playSpeed = [];
+  double startSpeed = 0.25;
+  double endSpeed = 2.0;
+  double increment = 0.25;
 
-  one,
-  onePointTwoFive,
-  onePointFive,
-  onePointSevenFive,
+  for (double speed = startSpeed; speed <= endSpeed; speed += increment) {
+    playSpeed.add(speed);
+  }
 
-  two,
+  return playSpeed;
 }
 
-extension PlaySpeedExtension on PlaySpeed {
-  static final List<String> _descList = [
-    '0.25',
-    '0.5',
-    '0.75',
-    '正常',
-    '1.25',
-    '1.5',
-    '1.75',
-    '2.0',
-  ];
-  String get description => _descList[index];
-
-  static final List<double> _valueList = [
-    0.25,
-    0.5,
-    0.75,
-    1.0,
-    1.25,
-    1.5,
-    1.75,
-    2.0,
-  ];
-  double get value => _valueList[index];
-  double get defaultValue => _valueList[3];
-}
+// 导出 playSpeed 列表
+List<double> playSpeed = generatePlaySpeedList();

lib/utils/storage.dart

@@ -131,7 +131,8 @@ class SettingBoxKey {
       enableSearchWord = 'enableSearchWord',
       enableSystemProxy = 'enableSystemProxy',
       enableAi = 'enableAi',
-      defaultHomePage = 'defaultHomePage';
+      defaultHomePage = 'defaultHomePage',
+      enableRelatedVideo = 'enableRelatedVideo';
 
   /// 外观
   static const String themeMode = 'themeMode',
@@ -181,6 +182,8 @@ class VideoBoxKey {
       videoSpeed = 'videoSpeed',
       // 播放顺序
       playRepeat = 'playRepeat',
+      // 系统预设倍速
+      playSpeedSystem = 'playSpeedSystem',
       // 默认倍速
       playSpeedDefault = 'playSpeedDefault',
       // 默认长按倍速