feat: 相关视频推荐开关 issues #585

lib/http/api.dart

@@ -499,8 +499,4 @@ class Api {
 
   /// 发送私信
   static const String sendMsg = '${HttpString.tUrl}/web_im/v1/web_im/send_msg';
-
-  /// 排行榜
-  static const String getRankApi = "/x/web-interface/ranking/v2";
-
 }

lib/http/video.dart

@@ -475,27 +475,4 @@ class VideoHttp {
       return {'status': false, 'data': []};
     }
   }
-
-  // 视频排行
-  static Future getRankVideoList(int rid) async {
-    try {
-      var rankApi = "${Api.getRankApi}?rid=$rid&type=all";
-      var res = await Request().get(rankApi);
-      if (res.data['code'] == 0) {
-        List<HotVideoItemModel> list = [];
-        List<int> blackMidsList =
-            setting.get(SettingBoxKey.blackMidsList, defaultValue: [-1]);
-        for (var i in res.data['data']['list']) {
-          if (!blackMidsList.contains(i['owner']['mid'])) {
-            list.add(HotVideoItemModel.fromJson(i));
-          }
-        }
-        return {'status': true, 'data': list};
-      } else {
-        return {'status': false, 'data': [], 'msg': res.data['message']};
-      }
-    } catch (err) {
-      return {'status': false, 'data': [], 'msg': err};
-    }
-  }
 }

lib/models/common/nav_bar_config.dart

@@ -16,19 +16,6 @@ List defaultNavigationBars = [
   },
   {
     'id': 1,
-    'icon': const Icon(
-      Icons.trending_up,
-      size: 21,
-    ),
-    'selectIcon': const Icon(
-      Icons.trending_up_outlined,
-      size: 21,
-    ),
-    'label': "排行榜",
-    'count': 0,
-  },
-  {
-    'id': 2,
     'icon': const Icon(
       Icons.motion_photos_on_outlined,
       size: 21,
@@ -41,7 +28,7 @@ List defaultNavigationBars = [
     'count': 0,
   },
   {
-    'id': 3,
+    'id': 2,
     'icon': const Icon(
       Icons.video_collection_outlined,
       size: 20,

lib/models/common/rank_type.dart

@@ -1,240 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:pilipala/pages/rank/zone/index.dart';
-
-enum RandType {
-  all,
-  creation,
-  animation,
-  music,
-  dance,
-  game,
-  knowledge,
-  technology,
-  sport,
-  car,
-  life,
-  food,
-  animal,
-  madness,
-  fashion,
-  entertainment,
-  film,
-  origin,
-  rookie
-}
-
-extension RankTypeDesc on RandType {
-  String get description => [
-        '全站',
-        '国创相关',
-        '动画',
-        '音乐',
-        '舞蹈',
-        '游戏',
-        '知识',
-        '科技',
-        '运动',
-        '汽车',
-        '生活',
-        '美食',
-        '动物圈',
-        '鬼畜',
-        '时尚',
-        '娱乐',
-        '影视'
-      ][index];
-
-  String get id => [
-        'all',
-        'creation',
-        'animation',
-        'music',
-        'dance',
-        'game',
-        'knowledge',
-        'technology',
-        'sport',
-        'car',
-        'life',
-        'food',
-        'animal',
-        'madness',
-        'fashion',
-        'entertainment',
-        'film'
-      ][index];
-}
-
-List tabsConfig = [
-  {
-    'icon': const Icon(
-      Icons.live_tv_outlined,
-      size: 15,
-    ),
-    'label': '全站',
-    'type': RandType.all,
-    'ctr': Get.put<ZoneController>,
-    'page': const ZonePage(rid: 0),
-  },
-  {
-    'icon': const Icon(
-      Icons.live_tv_outlined,
-      size: 15,
-    ),
-    'label': '国创相关',
-    'type': RandType.creation,
-    'ctr': Get.put<ZoneController>,
-    'page': const ZonePage(rid: 168),
-  },
-  {
-    'icon': const Icon(
-      Icons.live_tv_outlined,
-      size: 15,
-    ),
-    'label': '动画',
-    'type': RandType.animation,
-    'ctr': Get.put<ZoneController>,
-    'page': const ZonePage(rid: 1),
-  },
-  {
-    'icon': const Icon(
-      Icons.live_tv_outlined,
-      size: 15,
-    ),
-    'label': '音乐',
-    'type': RandType.music,
-    'ctr': Get.put<ZoneController>,
-    'page': const ZonePage(rid: 3),
-  },
-  {
-    'icon': const Icon(
-      Icons.live_tv_outlined,
-      size: 15,
-    ),
-    'label': '舞蹈',
-    'type': RandType.dance,
-    'ctr': Get.put<ZoneController>,
-    'page': const ZonePage(rid: 129),
-  },
-  {
-    'icon': const Icon(
-      Icons.live_tv_outlined,
-      size: 15,
-    ),
-    'label': '游戏',
-    'type': RandType.game,
-    'ctr': Get.put<ZoneController>,
-    'page': const ZonePage(rid: 4),
-  },
-  {
-    'icon': const Icon(
-      Icons.live_tv_outlined,
-      size: 15,
-    ),
-    'label': '知识',
-    'type': RandType.knowledge,
-    'ctr': Get.put<ZoneController>,
-    'page': const ZonePage(rid: 36),
-  },
-  {
-    'icon': const Icon(
-      Icons.live_tv_outlined,
-      size: 15,
-    ),
-    'label': '科技',
-    'type': RandType.technology,
-    'ctr': Get.put<ZoneController>,
-    'page': const ZonePage(rid: 188),
-  },
-  {
-    'icon': const Icon(
-      Icons.live_tv_outlined,
-      size: 15,
-    ),
-    'label': '运动',
-    'type': RandType.sport,
-    'ctr': Get.put<ZoneController>,
-    'page': const ZonePage(rid: 234),
-  },
-  {
-    'icon': const Icon(
-      Icons.live_tv_outlined,
-      size: 15,
-    ),
-    'label': '汽车',
-    'type': RandType.car,
-    'ctr': Get.put<ZoneController>,
-    'page': const ZonePage(rid: 223),
-  },
-  {
-    'icon': const Icon(
-      Icons.live_tv_outlined,
-      size: 15,
-    ),
-    'label': '生活',
-    'type': RandType.life,
-    'ctr': Get.put<ZoneController>,
-    'page': const ZonePage(rid: 160),
-  },
-  {
-    'icon': const Icon(
-      Icons.live_tv_outlined,
-      size: 15,
-    ),
-    'label': '美食',
-    'type': RandType.food,
-    'ctr': Get.put<ZoneController>,
-    'page': const ZonePage(rid: 211),
-  },
-  {
-    'icon': const Icon(
-      Icons.live_tv_outlined,
-      size: 15,
-    ),
-    'label': '动物圈',
-    'type': RandType.animal,
-    'ctr': Get.put<ZoneController>,
-    'page': const ZonePage(rid: 217),
-  },
-  {
-    'icon': const Icon(
-      Icons.live_tv_outlined,
-      size: 15,
-    ),
-    'label': '鬼畜',
-    'type': RandType.madness,
-    'ctr': Get.put<ZoneController>,
-    'page': const ZonePage(rid: 119),
-  },
-  {
-    'icon': const Icon(
-      Icons.live_tv_outlined,
-      size: 15,
-    ),
-    'label': '时尚',
-    'type': RandType.fashion,
-    'ctr': Get.put<ZoneController>,
-    'page': const ZonePage(rid: 155),
-  },
-  {
-    'icon': const Icon(
-      Icons.live_tv_outlined,
-      size: 15,
-    ),
-    'label': '娱乐',
-    'type': RandType.entertainment,
-    'ctr': Get.put<ZoneController>,
-    'page': const ZonePage(rid: 5),
-  },
-  {
-    'icon': const Icon(
-      Icons.live_tv_outlined,
-      size: 15,
-    ),
-    'label': '影视',
-    'type': RandType.film,
-    'ctr': Get.put<ZoneController>,
-    'page': const ZonePage(rid: 181),
-  }
-];

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;
   }
@@ -168,8 +196,7 @@ class BangumiIntroController extends GetxController {
                     }
                     Get.back();
                   },
-                child: const Text('确定'),
+                  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(
+            return BangumiInfo(
-                bangumiDetail: bangumiIntroController.bangumiDetail.value,
+              loadingStatus: false,
+              bangumiDetail: bangumiDetail,
               cid: cid,
-              ),
             );
           } else {
             // 请求错误
-            return HttpError(
+            // return HttpError(
-              errMsg: snapshot.data['msg'],
+            //   errMsg: snapshot.data['msg'],
-              fn: () => Get.back(),
+            //   fn: () => Get.back(),
-            );
+            // );
+            return const SizedBox();
           }
         } else {
-          return const SliverToBoxAdapter(
+          return BangumiInfo(
-            child: SizedBox(
+            loadingStatus: true,
-              height: 100,
+            bangumiDetail: bangumiDetail,
-              child: Center(
+            cid: cid,
-                child: CircularProgressIndicator(),
-              ),
-            ),
           );
         }
       },
@@ -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,7 +182,8 @@ class _BangumiInfoState extends State<BangumiInfo> {
       padding: const EdgeInsets.only(
           left: StyleString.safeSpace, right: StyleString.safeSpace, top: 20),
       sliver: SliverToBoxAdapter(
-          child: Column(
+        child: !widget.loadingStatus || bangumiItem != null
+            ? Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
                   Row(
@@ -188,10 +194,15 @@ class _BangumiInfoState extends State<BangumiInfo> {
                           NetworkImgLayer(
                             width: 105,
                             height: 160,
-                    src: widget.bangumiDetail!.cover!,
+                            src: !widget.loadingStatus
+                                ? widget.bangumiDetail!.cover!
+                                : bangumiItem!.cover!,
                           ),
+                          if (bangumiItem != null &&
+                              bangumiItem!.rating != null)
                             PBadge(
-                    text: '评分 ${widget.bangumiDetail!.rating!['score']!}',
+                              text:
+                                  '评分 ${!widget.loadingStatus ? widget.bangumiDetail!.rating!['score']! : bangumiItem!.rating!['score']!}',
                               top: null,
                               right: 6,
                               bottom: 6,
@@ -213,7 +224,9 @@ class _BangumiInfoState extends State<BangumiInfo> {
                                   children: [
                                     Expanded(
                                       child: Text(
-                                widget.bangumiDetail!.title!,
+                                        !widget.loadingStatus
+                                            ? widget.bangumiDetail!.title!
+                                            : bangumiItem!.title!,
                                         style: const TextStyle(
                                           fontSize: 16,
                                           fontWeight: FontWeight.w500,
@@ -233,7 +246,8 @@ class _BangumiInfoState extends State<BangumiInfo> {
                                           backgroundColor:
                                               MaterialStateProperty.resolveWith(
                                                   (Set<MaterialState> states) {
-                                    return t.colorScheme.primaryContainer
+                                            return t
+                                                .colorScheme.primaryContainer
                                                 .withOpacity(0.7);
                                           }),
                                         ),
@@ -252,13 +266,18 @@ class _BangumiInfoState extends State<BangumiInfo> {
                                   children: [
                                     StatView(
                                       theme: 'gray',
-                              view: widget.bangumiDetail!.stat!['views'],
+                                      view: !widget.loadingStatus
+                                          ? widget.bangumiDetail!.stat!['views']
+                                          : bangumiItem!.stat!['views'],
                                       size: 'medium',
                                     ),
                                     const SizedBox(width: 6),
                                     StatDanMu(
                                       theme: 'gray',
-                              danmu: widget.bangumiDetail!.stat!['danmakus'],
+                                      danmu: !widget.loadingStatus
+                                          ? widget
+                                              .bangumiDetail!.stat!['danmakus']
+                                          : bangumiItem!.stat!['danmakus'],
                                       size: 'medium',
                                     ),
                                   ],
@@ -267,8 +286,15 @@ class _BangumiInfoState extends State<BangumiInfo> {
                                 Row(
                                   children: [
                                     Text(
-                              (widget.bangumiDetail!.areas!.isNotEmpty
+                                      !widget.loadingStatus
-                                  ? widget.bangumiDetail!.areas!.first['name']
+                                          ? (widget.bangumiDetail!.areas!
+                                                  .isNotEmpty
+                                              ? widget.bangumiDetail!.areas!
+                                                  .first['name']
+                                              : '')
+                                          : (bangumiItem!.areas!.isNotEmpty
+                                              ? bangumiItem!
+                                                  .areas!.first['name']
                                               : ''),
                                       style: TextStyle(
                                         fontSize: 12,
@@ -277,7 +303,11 @@ class _BangumiInfoState extends State<BangumiInfo> {
                                     ),
                                     const SizedBox(width: 6),
                                     Text(
-                              widget.bangumiDetail!.publish!['pub_time_show'],
+                                      !widget.loadingStatus
+                                          ? widget.bangumiDetail!
+                                              .publish!['pub_time_show']
+                                          : bangumiItem!
+                                              .publish!['pub_time_show'],
                                       style: TextStyle(
                                         fontSize: 12,
                                         color: t.colorScheme.outline,
@@ -285,16 +315,20 @@ class _BangumiInfoState extends State<BangumiInfo> {
                                     ),
                                   ],
                                 ),
+                                // const SizedBox(height: 4),
                                 Text(
-                          widget.bangumiDetail!.newEp!['desc'],
+                                  !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.bangumiDetail!.evaluate!}',
+                                  '简介：${!widget.loadingStatus ? widget.bangumiDetail!.evaluate! : bangumiItem!.evaluate!}',
                                   maxLines: 3,
                                   overflow: TextOverflow.ellipsis,
                                   style: TextStyle(
@@ -310,21 +344,45 @@ class _BangumiInfoState extends State<BangumiInfo> {
                     ],
                   ),
                   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.bangumiDetail!.episodes!.isNotEmpty) ...[
+                  if ((!widget.loadingStatus &&
+                          widget.bangumiDetail!.episodes!.isNotEmpty) ||
+                      bangumiItem != null &&
+                          bangumiItem!.episodes!.isNotEmpty) ...[
                     BangumiPanel(
-              pages: widget.bangumiDetail!.episodes!,
+                      pages: bangumiItem != null
-              cid: cid ?? widget.bangumiDetail!.episodes!.first.cid,
+                          ? bangumiItem!.episodes!
+                          : widget.bangumiDetail!.episodes!,
+                      cid: cid ??
+                          (bangumiItem != null
+                              ? bangumiItem!.episodes!.first.cid
+                              : widget.bangumiDetail!.episodes!.first.cid),
                       sheetHeight: sheetHeight,
-              changeFuc: (bvid, cid, aid) =>
+                      changeFuc: (bvid, cid, aid) => bangumiIntroController
-                  bangumiIntroController.changeSeasonOrbangu(bvid, cid, aid),
+                          .changeSeasonOrbangu(bvid, cid, aid),
                     )
                   ],
                 ],
-      )),
+              )
+            : const SizedBox(
+                height: 100,
+                child: Center(
+                  child: CircularProgressIndicator(),
+                ),
+              ),
+      ),
     );
   }
 
@@ -346,19 +404,25 @@ class _BangumiInfoState extends State<BangumiInfo> {
                   () => ActionItem(
                       icon: const Icon(FontAwesomeIcons.thumbsUp),
                       selectIcon: const Icon(FontAwesomeIcons.solidThumbsUp),
-                    onTap: handleState(bangumiIntroController.actionLikeVideo),
+                      onTap:
+                          handleState(bangumiIntroController.actionLikeVideo),
                       selectStatus: bangumiIntroController.hasLike.value,
-                    text: widget.bangumiDetail!.stat!['likes']!.toString(),
+                      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),
+                      onTap:
+                          handleState(bangumiIntroController.actionCoinVideo),
                       selectStatus: bangumiIntroController.hasCoin.value,
-                    text: widget.bangumiDetail!.stat!['coins']!.toString(),
+                      loadingStatus: false,
-                  ),
+                      text: !widget.loadingStatus
+                          ? widget.bangumiDetail!.stat!['coins']!.toString()
+                          : bangumiItem!.stat!['coins']!.toString()),
                 ),
                 Obx(
                   () => ActionItem(
@@ -366,22 +430,29 @@ class _BangumiInfoState extends State<BangumiInfo> {
                       selectIcon: const Icon(FontAwesomeIcons.solidStar),
                       onTap: () => showFavBottomSheet(),
                       selectStatus: bangumiIntroController.hasFav.value,
-                    text: widget.bangumiDetail!.stat!['favorite']!.toString(),
+                      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(),
+                    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/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/main/controller.dart

@@ -9,7 +9,6 @@ import 'package:pilipala/http/common.dart';
 import 'package:pilipala/pages/dynamics/index.dart';
 import 'package:pilipala/pages/home/view.dart';
 import 'package:pilipala/pages/media/index.dart';
-import 'package:pilipala/pages/rank/index.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:pilipala/utils/utils.dart';
 import '../../models/common/dynamic_badge_mode.dart';
@@ -18,7 +17,6 @@ import '../../models/common/nav_bar_config.dart';
 class MainController extends GetxController {
   List<Widget> pages = <Widget>[
     const HomePage(),
-    const RankPage(),
     const DynamicsPage(),
     const MediaPage(),
   ];

lib/pages/main/view.dart

@@ -7,7 +7,6 @@ import 'package:pilipala/models/common/dynamic_badge_mode.dart';
 import 'package:pilipala/pages/dynamics/index.dart';
 import 'package:pilipala/pages/home/index.dart';
 import 'package:pilipala/pages/media/index.dart';
-import 'package:pilipala/pages/rank/index.dart';
 import 'package:pilipala/utils/event_bus.dart';
 import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/storage.dart';
@@ -23,7 +22,6 @@ class MainApp extends StatefulWidget {
 class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
   final MainController _mainController = Get.put(MainController());
   final HomeController _homeController = Get.put(HomeController());
-  final RankController _rankController = Get.put(RankController());
   final DynamicsController _dynamicController = Get.put(DynamicsController());
   final MediaController _mediaController = Get.put(MediaController());
 
@@ -59,21 +57,6 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
       _homeController.flag = false;
     }
 
-    if (currentPage is RankPage) {
-      if (_rankController.flag) {
-        // 单击返回顶部 双击并刷新
-        if (DateTime.now().millisecondsSinceEpoch - _lastSelectTime! < 500) {
-          _rankController.onRefresh();
-        } else {
-          _rankController.animateToTop();
-        }
-        _lastSelectTime = DateTime.now().millisecondsSinceEpoch;
-      }
-      _rankController.flag = true;
-    } else {
-      _rankController.flag = false;
-    }
-
     if (currentPage is DynamicsPage) {
       if (_dynamicController.flag) {
         // 单击返回顶部 双击并刷新

lib/pages/rank/controller.dart

@@ -1,70 +0,0 @@
-import 'dart:async';
-
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:hive/hive.dart';
-import 'package:pilipala/models/common/rank_type.dart';
-import 'package:pilipala/utils/storage.dart';
-
-class RankController extends GetxController with GetTickerProviderStateMixin {
-  bool flag = false;
-  late RxList tabs = [].obs;
-  RxInt initialIndex = 1.obs;
-  late TabController tabController;
-  late List tabsCtrList;
-  late List<Widget> tabsPageList;
-  Box setting = GStrorage.setting;
-  late final StreamController<bool> searchBarStream =
-      StreamController<bool>.broadcast();
-  late bool enableGradientBg;
-
-  @override
-  void onInit() {
-    super.onInit();
-    enableGradientBg =
-        setting.get(SettingBoxKey.enableGradientBg, defaultValue: true);
-    // 进行tabs配置
-    setTabConfig();
-  }
-
-  void onRefresh() {
-    int index = tabController.index;
-    var ctr = tabsCtrList[index];
-    ctr().onRefresh();
-  }
-
-  void animateToTop() {
-    int index = tabController.index;
-    var ctr = tabsCtrList[index];
-    ctr().animateToTop();
-  }
-
-  void setTabConfig() async {
-    tabs.value = tabsConfig;
-    initialIndex.value = 0;
-    tabsCtrList = tabs.map((e) => e['ctr']).toList();
-    tabsPageList = tabs.map<Widget>((e) => e['page']).toList();
-
-    tabController = TabController(
-      initialIndex: initialIndex.value,
-      length: tabs.length,
-      vsync: this,
-    );
-    // 监听 tabController 切换
-    if (enableGradientBg) {
-      tabController.animation!.addListener(() {
-        if (tabController.indexIsChanging) {
-          if (initialIndex.value != tabController.index) {
-            initialIndex.value = tabController.index;
-          }
-        } else {
-          final int temp = tabController.animation!.value.round();
-          if (initialIndex.value != temp) {
-            initialIndex.value = temp;
-            tabController.index = initialIndex.value;
-          }
-        }
-      });
-    }
-  }
-}

lib/pages/rank/index.dart

@@ -1,4 +0,0 @@
-library rank;
-
-export './controller.dart';
-export './view.dart';

lib/pages/rank/view.dart

@@ -1,149 +0,0 @@
-import 'dart:async';
-
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:get/get.dart';
-import 'package:pilipala/utils/feed_back.dart';
-import './controller.dart';
-
-class RankPage extends StatefulWidget {
-  const RankPage({Key? key}) : super(key: key);
-
-  @override
-  State<RankPage> createState() => _RankPageState();
-}
-
-class _RankPageState extends State<RankPage>
-    with AutomaticKeepAliveClientMixin, TickerProviderStateMixin {
-  final RankController _rankController = Get.put(RankController());
-  List videoList = [];
-  late Stream<bool> stream;
-
-  @override
-  bool get wantKeepAlive => true;
-
-  @override
-  void initState() {
-    super.initState();
-    stream = _rankController.searchBarStream.stream;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    super.build(context);
-    Brightness currentBrightness = MediaQuery.of(context).platformBrightness;
-    // 设置状态栏图标的亮度
-    if (_rankController.enableGradientBg) {
-      SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
-        statusBarIconBrightness: currentBrightness == Brightness.light
-            ? Brightness.dark
-            : Brightness.light,
-      ));
-    }
-    return Scaffold(
-      extendBody: true,
-      extendBodyBehindAppBar: false,
-      appBar: _rankController.enableGradientBg
-          ? null
-          : AppBar(toolbarHeight: 0, elevation: 0),
-      body: Stack(
-        children: [
-          // gradient background
-          if (_rankController.enableGradientBg) ...[
-            Align(
-              alignment: Alignment.topLeft,
-              child: Opacity(
-                opacity: 0.6,
-                child: Container(
-                  width: MediaQuery.of(context).size.width,
-                  height: MediaQuery.of(context).size.height,
-                  decoration: BoxDecoration(
-                    gradient: LinearGradient(
-                        colors: [
-                          Theme.of(context)
-                              .colorScheme
-                              .primary
-                              .withOpacity(0.9),
-                          Theme.of(context)
-                              .colorScheme
-                              .primary
-                              .withOpacity(0.5),
-                          Theme.of(context).colorScheme.surface
-                        ],
-                        begin: Alignment.topLeft,
-                        end: Alignment.bottomRight,
-                        stops: const [0, 0.0034, 0.34]),
-                  ),
-                ),
-              ),
-            ),
-          ],
-          Column(
-            children: [
-              const CustomAppBar(),
-              if (_rankController.tabs.length > 1) ...[
-                const SizedBox(height: 4),
-                SizedBox(
-                  width: double.infinity,
-                  height: 42,
-                  child: Align(
-                    alignment: Alignment.center,
-                    child: TabBar(
-                      controller: _rankController.tabController,
-                      tabs: [
-                        for (var i in _rankController.tabs)
-                          Tab(text: i['label'])
-                      ],
-                      isScrollable: true,
-                      dividerColor: Colors.transparent,
-                      enableFeedback: true,
-                      splashBorderRadius: BorderRadius.circular(10),
-                      tabAlignment: TabAlignment.center,
-                      onTap: (value) {
-                        feedBack();
-                        if (_rankController.initialIndex.value == value) {
-                          _rankController.tabsCtrList[value]().animateToTop();
-                        }
-                        _rankController.initialIndex.value = value;
-                      },
-                    ),
-                  ),
-                ),
-              ] else ...[
-                const SizedBox(height: 6),
-              ],
-              Expanded(
-                child: TabBarView(
-                  controller: _rankController.tabController,
-                  children: _rankController.tabsPageList,
-                ),
-              ),
-            ],
-          ),
-        ],
-      ),
-    );
-  }
-}
-
-class CustomAppBar extends StatelessWidget implements PreferredSizeWidget {
-  final double height;
-
-  const CustomAppBar({
-    super.key,
-    this.height = kToolbarHeight,
-  });
-
-  @override
-  Size get preferredSize => Size.fromHeight(height);
-
-  @override
-  Widget build(BuildContext context) {
-    final double top = MediaQuery.of(context).padding.top;
-    return Container(
-      width: MediaQuery.of(context).size.width,
-      height: top,
-      color: Colors.transparent,
-    );
-  }
-}

lib/pages/rank/zone/controller.dart

@@ -1,53 +0,0 @@
-import 'package:get/get.dart';
-import 'package:flutter/material.dart';
-import 'package:pilipala/http/video.dart';
-import 'package:pilipala/models/model_hot_video_item.dart';
-
-class ZoneController extends GetxController {
-  final ScrollController scrollController = ScrollController();
-  RxList<HotVideoItemModel> videoList = <HotVideoItemModel>[].obs;
-  bool isLoadingMore = false;
-  bool flag = false;
-  OverlayEntry? popupDialog;
-  int zoneID = 0;
-
-  // 获取推荐
-  Future queryRankFeed(type, rid) async {
-    zoneID = rid;
-    var res = await VideoHttp.getRankVideoList(zoneID);
-    if (res['status']) {
-      if (type == 'init') {
-        videoList.value = res['data'];
-      } else if (type == 'onRefresh') {
-        videoList.clear();
-        videoList.addAll(res['data']);
-      } else if (type == 'onLoad') {
-        videoList.clear();
-        videoList.addAll(res['data']);
-      }
-    }
-    isLoadingMore = false;
-    return res;
-  }
-
-  // 下拉刷新
-  Future onRefresh() async {
-    queryRankFeed('onRefresh', zoneID);
-  }
-
-  // 上拉加载
-  Future onLoad() async {
-    queryRankFeed('onLoad', zoneID);
-  }
-
-  // 返回顶部并刷新
-  void animateToTop() async {
-    if (scrollController.offset >=
-        MediaQuery.of(Get.context!).size.height * 5) {
-      scrollController.jumpTo(0);
-    } else {
-      await scrollController.animateTo(0,
-          duration: const Duration(milliseconds: 500), curve: Curves.easeInOut);
-    }
-  }
-}

lib/pages/rank/zone/index.dart

@@ -1,4 +0,0 @@
-library rank.zone;
-
-export './controller.dart';
-export './view.dart';

lib/pages/rank/zone/view.dart

@@ -1,148 +0,0 @@
-import 'dart:async';
-
-import 'package:flutter/material.dart';
-import 'package:flutter/rendering.dart';
-import 'package:get/get.dart';
-import 'package:pilipala/common/constants.dart';
-import 'package:pilipala/common/widgets/animated_dialog.dart';
-import 'package:pilipala/common/widgets/overlay_pop.dart';
-import 'package:pilipala/common/skeleton/video_card_h.dart';
-import 'package:pilipala/common/widgets/http_error.dart';
-import 'package:pilipala/common/widgets/video_card_h.dart';
-import 'package:pilipala/pages/home/index.dart';
-import 'package:pilipala/pages/main/index.dart';
-import 'package:pilipala/pages/rank/zone/index.dart';
-
-class ZonePage extends StatefulWidget {
-  const ZonePage({Key? key, required this.rid}) : super(key: key);
-
-  final int rid;
-
-  @override
-  State<ZonePage> createState() => _ZonePageState();
-}
-
-class _ZonePageState extends State<ZonePage> {
-  final ZoneController _zoneController = Get.put(ZoneController());
-  List videoList = [];
-  Future? _futureBuilderFuture;
-  late ScrollController scrollController;
-
-  @override
-  void initState() {
-    super.initState();
-    _futureBuilderFuture = _zoneController.queryRankFeed('init', widget.rid);
-    scrollController = _zoneController.scrollController;
-    StreamController<bool> mainStream =
-        Get.find<MainController>().bottomBarStream;
-    StreamController<bool> searchBarStream =
-        Get.find<HomeController>().searchBarStream;
-    scrollController.addListener(
-      () {
-        if (scrollController.position.pixels >=
-            scrollController.position.maxScrollExtent - 200) {
-          if (!_zoneController.isLoadingMore) {
-            _zoneController.isLoadingMore = true;
-            _zoneController.onLoad();
-          }
-        }
-
-        final ScrollDirection direction =
-            scrollController.position.userScrollDirection;
-        if (direction == ScrollDirection.forward) {
-          mainStream.add(true);
-          searchBarStream.add(true);
-        } else if (direction == ScrollDirection.reverse) {
-          mainStream.add(false);
-          searchBarStream.add(false);
-        }
-      },
-    );
-  }
-
-  @override
-  void dispose() {
-    scrollController.removeListener(() {});
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return RefreshIndicator(
-      onRefresh: () async {
-        return await _zoneController.onRefresh();
-      },
-      child: CustomScrollView(
-        controller: _zoneController.scrollController,
-        slivers: [
-          SliverPadding(
-            // 单列布局 EdgeInsets.zero
-            padding:
-                const EdgeInsets.fromLTRB(0, StyleString.safeSpace - 5, 0, 0),
-            sliver: FutureBuilder(
-              future: _futureBuilderFuture,
-              builder: (context, snapshot) {
-                if (snapshot.connectionState == ConnectionState.done) {
-                  Map data = snapshot.data as Map;
-                  if (data['status']) {
-                    return Obx(
-                      () => SliverList(
-                        delegate: SliverChildBuilderDelegate((context, index) {
-                          return VideoCardH(
-                            videoItem: _zoneController.videoList[index],
-                            showPubdate: true,
-                            longPress: () {
-                              _zoneController.popupDialog = _createPopupDialog(
-                                  _zoneController.videoList[index]);
-                              Overlay.of(context)
-                                  .insert(_zoneController.popupDialog!);
-                            },
-                            longPressEnd: () {
-                              _zoneController.popupDialog?.remove();
-                            },
-                          );
-                        }, childCount: _zoneController.videoList.length),
-                      ),
-                    );
-                  } else {
-                    return HttpError(
-                      errMsg: data['msg'],
-                      fn: () {
-                        setState(() {
-                          _futureBuilderFuture =
-                              _zoneController.queryRankFeed('init', widget.rid);
-                        });
-                      },
-                    );
-                  }
-                } else {
-                  // 骨架屏
-                  return SliverList(
-                    delegate: SliverChildBuilderDelegate((context, index) {
-                      return const VideoCardHSkeleton();
-                    }, childCount: 10),
-                  );
-                }
-              },
-            ),
-          ),
-          SliverToBoxAdapter(
-            child: SizedBox(
-              height: MediaQuery.of(context).padding.bottom + 10,
-            ),
-          )
-        ],
-      ),
-    );
-  }
-
-  OverlayEntry _createPopupDialog(videoItem) {
-    return OverlayEntry(
-      builder: (context) => AnimatedDialog(
-        closeFn: _zoneController.popupDialog?.remove,
-        child: OverlayPop(
-            videoItem: videoItem, closeFn: _zoneController.popupDialog?.remove),
-      ),
-    );
-  }
-}

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 =
-      chooseSpeed = PlaySpeed.values[index].value;
+        type == 'system' ? playSpeedSystem[index] : customSpeedsList[index];
-    } else {
-      chooseSpeed = 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) {
+      late List speedsList =
-        playSpeedDefault = 1.0;
+          type == 'system' ? playSpeedSystem : customSpeedsList;
-        videoStorage.put(VideoBoxKey.playSpeedDefault, playSpeedDefault);
+      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);
+      speedsList.removeAt(index);
-      await videoStorage.put(VideoBoxKey.customSpeedsList, customSpeedsList);
+      await videoStorage.put(
+          type == 'system'
+              ? VideoBoxKey.playSpeedSystem
+              : VideoBoxKey.customSpeedsList,
+          speedsList);
     }
     setState(() {});
     SmartDialog.showToast('操作成功');
@@ -249,6 +252,7 @@ class _PlaySpeedPageState extends State<PlaySpeedPage> {
                     subtitle: Text(longPressSpeedDefault.toString()),
                   )
                 : const SizedBox(),
+            if (playSpeedSystem.isNotEmpty) ...[
               Padding(
                 padding: const EdgeInsets.only(
                   left: 14,
@@ -272,15 +276,16 @@ class _PlaySpeedPageState extends State<PlaySpeedPage> {
                   spacing: 8,
                   runSpacing: 2,
                   children: [
-                  for (var i in PlaySpeed.values) ...[
+                    for (int i = 0; i < playSpeedSystem.length; i++) ...[
                       FilledButton.tonal(
-                      onPressed: () => showBottomSheet('system', i.index),
+                        onPressed: () => showBottomSheet('system', i),
-                      child: Text(i.description),
+                        child: Text(playSpeedSystem[i].toString()),
                       ),
                     ]
                   ],
                 ),
-            ),
+              )
+            ],
             Padding(
                 padding: const EdgeInsets.only(
                   left: 14,

lib/pages/video/detail/controller.dart

@@ -91,6 +91,7 @@ class VideoDetailController extends GetxController
   late int cacheAudioQa;
 
   PersistentBottomSheetController? replyReplyBottomSheetCtr;
+  late bool enableRelatedVideo;
 
   @override
   void onInit() {
@@ -113,7 +114,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;

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(
+          return VideoInfo(
-            child: SizedBox(
+            loadingStatus: true,
-              height: 100,
+            videoDetail: videoDetail,
-              child: Center(
+            heroTag: heroTag,
-                child: CircularProgressIndicator(),
+            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;
+    loadingStatus = widget.loadingStatus;
-    follower = Utils.numFormat(videoIntroController.userStat['follower']);
+    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});
   }
@@ -250,14 +270,17 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
       padding: const EdgeInsets.only(
           left: StyleString.safeSpace, right: StyleString.safeSpace, top: 10),
       sliver: SliverToBoxAdapter(
-          child: Column(
+        child: !loadingStatus
+            ? Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
                   GestureDetector(
                     behavior: HitTestBehavior.translucent,
                     onTap: () => showIntroDetail(),
                     child: Text(
-              widget.videoDetail!.title!,
+                      !loadingStatus
+                          ? widget.videoDetail!.title
+                          : videoItem['title'],
                       style: const TextStyle(
                         fontSize: 18,
                         fontWeight: FontWeight.bold,
@@ -277,18 +300,25 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
                             children: [
                               StatView(
                                 theme: 'gray',
-                        view: widget.videoDetail!.stat!.view,
+                                view: !loadingStatus
+                                    ? widget.videoDetail!.stat!.view
+                                    : videoItem['stat'].view,
                                 size: 'medium',
                               ),
                               const SizedBox(width: 10),
                               StatDanMu(
                                 theme: 'gray',
-                        danmu: widget.videoDetail!.stat!.danmaku,
+                                danmu: !loadingStatus
+                                    ? widget.videoDetail!.stat!.danmaku
+                                    : videoItem['stat'].danmaku,
                                 size: 'medium',
                               ),
                               const SizedBox(width: 10),
                               Text(
-                        Utils.dateFormat(widget.videoDetail!.pubdate,
+                                Utils.dateFormat(
+                                    !loadingStatus
+                                        ? widget.videoDetail!.pubdate
+                                        : videoItem['pubdate'],
                                     formatType: 'detail'),
                                 style: TextStyle(
                                   fontSize: 12,
@@ -316,21 +346,33 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
                           top: 6,
                           child: GestureDetector(
                             onTap: () async {
-                      final res = await videoIntroController.aiConclusion();
+                              final res =
+                                  await videoIntroController.aiConclusion();
                               if (res['status']) {
                                 showAiBottomSheet();
                               }
                             },
-                    child: Image.asset('assets/images/ai.png', height: 22),
+                            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 (widget.videoDetail!.ugcSeason != null) ...[
+                  if (!loadingStatus &&
+                      widget.videoDetail!.ugcSeason != null) ...[
                     Obx(
                       () => SeasonPanel(
                         ugcSeason: widget.videoDetail!.ugcSeason!,
@@ -338,37 +380,43 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
                             ? videoIntroController.lastPlayCid.value
                             : widget.videoDetail!.pages!.first.cid,
                         sheetHeight: sheetHeight,
-                changeFuc: (bvid, cid, aid) =>
+                        changeFuc: (bvid, cid, aid) => videoIntroController
-                    videoIntroController.changeSeasonOrbangu(bvid, cid, aid),
+                            .changeSeasonOrbangu(bvid, cid, aid),
                       ),
                     )
                   ],
-          if (widget.videoDetail!.pages != null &&
+                  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(
+                          changeFuc: (cid) =>
+                              videoIntroController.changeSeasonOrbangu(
                                   videoIntroController.bvid, cid, null),
                         ))
                   ],
                   GestureDetector(
                     onTap: onPushMember,
                     child: Container(
-              padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 4),
+                      padding: const EdgeInsets.symmetric(
+                          vertical: 12, horizontal: 4),
                       child: Row(
                         children: [
                           NetworkImgLayer(
                             type: 'avatar',
-                    src: widget.videoDetail!.owner!.face,
+                            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)),
+                          Text(owner.name,
+                              style: const TextStyle(fontSize: 13)),
                           const SizedBox(width: 6),
                           Text(
                             follower,
@@ -379,16 +427,20 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
                           ),
                           const Spacer(),
                           Obx(() => AnimatedOpacity(
-                        opacity:
+                                opacity: loadingStatus ||
-                            videoIntroController.followStatus.isEmpty ? 0 : 1,
+                                        videoIntroController
+                                            .followStatus.isEmpty
+                                    ? 0
+                                    : 1,
                                 duration: const Duration(milliseconds: 50),
                                 child: SizedBox(
                                   height: 32,
                                   child: Obx(
-                            () => videoIntroController.followStatus.isNotEmpty
+                                    () => videoIntroController
+                                            .followStatus.isNotEmpty
                                         ? TextButton(
-                                    onPressed:
+                                            onPressed: videoIntroController
-                                        videoIntroController.actionRelationMod,
+                                                .actionRelationMod,
                                             style: TextButton.styleFrom(
                                               padding: const EdgeInsets.only(
                                                   left: 8, right: 8),
@@ -398,7 +450,8 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
                                                       : t.colorScheme.onPrimary,
                                               backgroundColor:
                                                   followStatus['attribute'] != 0
-                                              ? t.colorScheme.onInverseSurface
+                                                      ? t.colorScheme
+                                                          .onInverseSurface
                                                       : t.colorScheme
                                                           .primary, // 设置按钮背景色
                                             ),
@@ -407,13 +460,13 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
                                                   ? '已关注'
                                                   : '关注',
                                               style: TextStyle(
-                                          fontSize: t
+                                                  fontSize: t.textTheme
-                                              .textTheme.labelMedium!.fontSize),
+                                                      .labelMedium!.fontSize),
                                             ),
                                           )
                                         : ElevatedButton(
-                                    onPressed:
+                                            onPressed: videoIntroController
-                                        videoIntroController.actionRelationMod,
+                                                .actionRelationMod,
                                             child: const Text('关注'),
                                           ),
                                   ),
@@ -424,7 +477,14 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
                     ),
                   ),
                 ],
-      )),
+              )
+            : const SizedBox(
+                height: 100,
+                child: Center(
+                  child: CircularProgressIndicator(),
+                ),
+              ),
+      ),
     );
   }
 
@@ -446,7 +506,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),
@@ -460,8 +523,10 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
                   selectIcon: const Icon(FontAwesomeIcons.b),
                   onTap: handleState(videoIntroController.actionCoinVideo),
                   selectStatus: videoIntroController.hasCoin.value,
-                text: widget.videoDetail!.stat!.coin!.toString(),
+                  loadingStatus: loadingStatus,
-              ),
+                  text: !loadingStatus
+                      ? widget.videoDetail!.stat!.coin!.toString()
+                      : '-'),
             ),
             Obx(
               () => ActionItem(
@@ -470,24 +535,88 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
                   onTap: () => showFavBottomSheet(),
                   onLongPress: () => showFavBottomSheet(type: 'longPress'),
                   selectStatus: videoIntroController.hasFav.value,
-                text: widget.videoDetail!.stat!.favorite!.toString(),
+                  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(),
+                loadingStatus: loadingStatus,
-            ),
+                text: !loadingStatus
+                    ? widget.videoDetail!.stat!.reply!.toString()
+                    : '评论'),
             ActionItem(
                 icon: const Icon(FontAwesomeIcons.shareFromSquare),
                 onTap: () => videoIntroController.actionShareVideo(),
                 selectStatus: false,
-              text: '分享',
+                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(
+          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,
+                    fontSize: Theme.of(context).textTheme.labelSmall!.fontSize),
+              ),
+            ),
           ),
-          )
         ],
       ),
     );

lib/pages/video/detail/view.dart

@@ -521,6 +521,9 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                           .withOpacity(0.06),
                                     ),
                                   ),
+                                  if (videoDetailController.videoType ==
+                                          SearchType.video &&
+                                      videoDetailController.enableRelatedVideo)
                                     const RelatedVideoPanel(),
                                 ],
                               );

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

@@ -47,7 +47,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);

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 {
+List<double> generatePlaySpeedList() {
-  pointTwoFive,
+  List<double> playSpeed = [];
-  pointFive,
+  double startSpeed = 0.25;
-  pointSevenFive,
+  double endSpeed = 2.0;
+  double increment = 0.25;
 
-  one,
+  for (double speed = startSpeed; speed <= endSpeed; speed += increment) {
-  onePointTwoFive,
+    playSpeed.add(speed);
-  onePointFive,
+  }
-  onePointSevenFive,
 
-  two,
+  return playSpeed;
 }
 
-extension PlaySpeedExtension on PlaySpeed {
+// 导出 playSpeed 列表
-  static final List<String> _descList = [
+List<double> playSpeed = generatePlaySpeedList();
-    '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];
-}

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',
       // 默认长按倍速