opt: video page

show tabbar on landscape page
prevent showing bottomsheet above fullscreen video

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

@@ -12,7 +12,6 @@ import 'package:PiliPalaX/common/widgets/stat/danmu.dart';
 import 'package:PiliPalaX/common/widgets/stat/view.dart';
 import 'package:PiliPalaX/models/video_detail_res.dart';
 import 'package:PiliPalaX/pages/video/detail/introduction/controller.dart';
-import 'package:PiliPalaX/pages/video/detail/widgets/ai_detail.dart';
 import 'package:PiliPalaX/utils/feed_back.dart';
 import 'package:PiliPalaX/utils/storage.dart';
 import 'package:PiliPalaX/utils/utils.dart';
@@ -26,8 +25,15 @@ import 'widgets/page.dart';
 import 'widgets/season.dart';
 
 class VideoIntroPanel extends StatefulWidget {
-  const VideoIntroPanel({required this.heroTag, super.key});
+  const VideoIntroPanel({
+    super.key,
+    required this.heroTag,
+    required this.showAiBottomSheet,
+    required this.showIntroDetail,
+  });
   final String heroTag;
+  final Function showAiBottomSheet;
+  final Function showIntroDetail;
 
   @override
   State<VideoIntroPanel> createState() => _VideoIntroPanelState();
@@ -74,6 +80,8 @@ class _VideoIntroPanelState extends State<VideoIntroPanel>
             loadingStatus: true,
             videoDetail: videoDetail,
             heroTag: heroTag,
+            showAiBottomSheet: widget.showAiBottomSheet,
+            showIntroDetail: widget.showIntroDetail,
           )
         : VideoInfo(
             //key:herotag
@@ -81,6 +89,8 @@ class _VideoIntroPanelState extends State<VideoIntroPanel>
             loadingStatus: false,
             videoDetail: videoIntroController.videoDetail.value,
             heroTag: heroTag,
+            showAiBottomSheet: widget.showAiBottomSheet,
+            showIntroDetail: widget.showIntroDetail,
           ));
   }
 }
@@ -89,10 +99,17 @@ class VideoInfo extends StatefulWidget {
   final bool loadingStatus;
   final VideoDetailData? videoDetail;
   final String? heroTag;
+  final Function showAiBottomSheet;
+  final Function showIntroDetail;
 
-  const VideoInfo(
+  const VideoInfo({
-      {Key? key, this.loadingStatus = false, this.videoDetail, this.heroTag})
+    Key? key,
-      : super(key: key);
+    this.loadingStatus = false,
+    this.videoDetail,
+    this.heroTag,
+    required this.showAiBottomSheet,
+    required this.showIntroDetail,
+  }) : super(key: key);
 
   @override
   State<VideoInfo> createState() => _VideoInfoState();
@@ -177,13 +194,7 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
       return;
     }
     feedBack();
-    showBottomSheet(
+    widget.showIntroDetail(widget.videoDetail);
-      context: context,
-      enableDrag: true,
-      builder: (BuildContext context) {
-        return IntroDetail(videoDetail: widget.videoDetail!);
-      },
-    );
   }
 
   // 用户主页
@@ -200,17 +211,6 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
         arguments: {'face': face, 'heroTag': memberHeroTag});
   }
 
-  // ai总结
-  showAiBottomSheet() {
-    showBottomSheet(
-      context: context,
-      enableDrag: true,
-      builder: (BuildContext context) {
-        return AiDetail(modelResult: videoIntroController.modelResult);
-      },
-    );
-  }
-
   @override
   Widget build(BuildContext context) {
     final ThemeData t = Theme.of(context);
@@ -384,7 +384,7 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
                               final res =
                                   await videoIntroController.aiConclusion();
                               if (res['status']) {
-                                showAiBottomSheet();
+                                widget.showAiBottomSheet();
                               }
                             },
                             child:

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

@@ -1,6 +1,5 @@
 import 'package:PiliPalaX/common/widgets/http_error.dart';
 import 'package:PiliPalaX/http/loading_state.dart';
-import 'package:PiliPalaX/pages/video/detail/reply_reply/view.dart';
 import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
@@ -18,6 +17,7 @@ class VideoReplyPanel extends StatefulWidget {
   final int rpid;
   final String? replyLevel;
   final String heroTag;
+  final Function replyReply;
 
   const VideoReplyPanel({
     this.bvid,
@@ -25,6 +25,7 @@ class VideoReplyPanel extends StatefulWidget {
     this.rpid = 0,
     this.replyLevel,
     required this.heroTag,
+    required this.replyReply,
     super.key,
   });
 
@@ -115,21 +116,6 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
     }
   }
 
-  // 展示二级回复
-  void replyReply(replyItem) {
-    showBottomSheet(
-      context: context,
-      builder: (context) => VideoReplyReplyPanel(
-        rcount: replyItem.rcount,
-        oid: replyItem.oid,
-        rpid: replyItem.rpid,
-        firstFloor: replyItem,
-        replyType: ReplyType.video,
-        source: 'videoDetail',
-      ),
-    );
-  }
-
   @override
   Widget build(BuildContext context) {
     super.build(context);
@@ -239,7 +225,7 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
                     replyItem: loadingState.response[index],
                     showReplyRow: true,
                     replyLevel: replyLevel,
-                    replyReply: replyReply,
+                    replyReply: widget.replyReply,
                     replyType: ReplyType.video,
                     onReply: () {
                       _videoReplyController.onReply(

lib/pages/video/detail/view.dart

@@ -4,6 +4,10 @@ import 'dart:math';
 
 import 'package:PiliPalaX/common/constants.dart';
 import 'package:PiliPalaX/http/loading_state.dart';
+import 'package:PiliPalaX/models/common/reply_type.dart';
+import 'package:PiliPalaX/pages/video/detail/introduction/widgets/intro_detail.dart';
+import 'package:PiliPalaX/pages/video/detail/reply_reply/view.dart';
+import 'package:PiliPalaX/pages/video/detail/widgets/ai_detail.dart';
 import 'package:PiliPalaX/utils/extension.dart';
 import 'package:PiliPalaX/utils/id_utils.dart';
 import 'package:auto_orientation/auto_orientation.dart';
@@ -76,6 +80,8 @@ class _VideoDetailPageState extends State<VideoDetailPage>
   late final MethodChannel onUserLeaveHintListener;
   // StreamSubscription<Duration>? _bufferedListener;
 
+  final scaffoldKey = GlobalKey<ScaffoldState>();
+
   @override
   void initState() {
     super.initState();
@@ -411,7 +417,11 @@ class _VideoDetailPageState extends State<VideoDetailPage>
   @override
   Widget build(BuildContext context) {
     /// tabbar
-    Widget tabbarBuild = Container(
+    Widget tabbarBuild([
+      bool needIndicator = true,
+      String introText = '简介',
+    ]) {
+      return Container(
         width: double.infinity,
         height: 45,
         decoration: BoxDecoration(
@@ -429,14 +439,16 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                 flex: 1,
                 child: Obx(
                   () => TabBar(
+                    indicatorColor: needIndicator ? null : Colors.transparent,
                     padding: EdgeInsets.zero,
                     controller: videoDetailController.tabCtr,
                     labelStyle: const TextStyle(fontSize: 13),
-                  labelPadding:
+                    labelPadding: const EdgeInsets.symmetric(
-                      const EdgeInsets.symmetric(horizontal: 10.0), // 设置每个标签的宽度
+                        horizontal: 10.0), // 设置每个标签的宽度
                     dividerColor: Colors.transparent,
                     onTap: (value) {
-                    if (!videoDetailController.tabCtr.indexIsChanging) {
+                      if (!needIndicator ||
+                          !videoDetailController.tabCtr.indexIsChanging) {
                         if (value == 0) {
                           _introController.animToTop();
                         } else {
@@ -445,7 +457,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                       }
                     },
                     tabs: [
-                    const Tab(text: '简介'),
+                      Tab(text: introText),
                       Tab(
                         text:
                             '评论${_videoReplyController.count.value == -1 ? '' : ' ${_videoReplyController.count.value}'}',
@@ -454,59 +466,11 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                   ),
                 ),
               ),
-            Flexible(
-                flex: 1,
-                child: Center(
-                  child: Row(
-                    mainAxisAlignment: MainAxisAlignment.end,
-                    children: [
-                      SizedBox(
-                        height: 32,
-                        child: TextButton(
-                          style: ButtonStyle(
-                            padding: WidgetStateProperty.all(EdgeInsets.zero),
-                          ),
-                          onPressed: null,
-                          // onPressed: () => videoDetailController.showShootDanmakuSheet(),
-                          child:
-                              const Text('发弹幕', style: TextStyle(fontSize: 12)),
-                        ),
-                      ),
-                      // SizedBox(
-                      //   width: 38,
-                      //   height: 38,
-                      //   child: Obx(
-                      //     () => IconButton(
-                      //       onPressed: () {
-                      //         plPlayerController?.isOpenDanmu.value =
-                      //             !(plPlayerController?.isOpenDanmu.value ??
-                      //                 false);
-                      //       },
-                      //       icon: !(plPlayerController?.isOpenDanmu.value ??
-                      //               false)
-                      //           ? SvgPicture.asset(
-                      //               'assets/images/video/danmu_close.svg',
-                      //               // ignore: deprecated_member_use
-                      //               color:
-                      //                   Theme.of(context).colorScheme.outline,
-                      //             )
-                      //           : SvgPicture.asset(
-                      //               'assets/images/video/danmu_open.svg',
-                      //               // ignore: deprecated_member_use
-                      //               color:
-                      //                   Theme.of(context).colorScheme.primary,
-                      //             ),
-                      //     ),
-                      //   ),
-                      // ),
-                      const SizedBox(width: 14),
-                    ],
-                  ),
-                )),
             ],
           ),
         ),
       );
+    }
 
     Widget plPlayer = FutureBuilder(
         future: _futureBuilderFuture,
@@ -664,8 +628,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                       if (!removeSafeArea) showStatusBar();
                     }
                     return Container(
-                        color:
+                      color: showStatusBarBackgroundColor ? null : Colors.black,
-                            showStatusBarBackgroundColor ? null : Colors.black,
                       height: MediaQuery.of(context).orientation ==
                                   Orientation.landscape ||
                               isFullScreen.value == true
@@ -682,8 +645,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                             (horizontalScreen ||
                                 MediaQuery.of(context).orientation ==
                                     Orientation.portrait),
-                            onPopInvokedWithResult:
+                        onPopInvokedWithResult: (bool didPop, Object? result) {
-                                (bool didPop, Object? result) {
                           if (isFullScreen.value == true) {
                             plPlayerController!
                                 .triggerFullScreen(status: false);
@@ -703,8 +665,8 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                 .autoPlay.value) ...<Widget>[
                               Obx(
                                 () => Visibility(
-                                      visible: videoDetailController
+                                  visible:
-                                          .isShowCover.value,
+                                      videoDetailController.isShowCover.value,
                                   child: Positioned(
                                     top: 0,
                                     left: 0,
@@ -727,7 +689,8 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                               manualPlayerWidget,
                             ]
                           ],
-                            )),
+                        ),
+                      ),
                     );
                   },
                 ),
@@ -735,9 +698,11 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                   child: ColoredBox(
                     key: Key(heroTag),
                     color: Theme.of(context).colorScheme.surface,
-                      child: Column(
+                    child: Scaffold(
+                      key: scaffoldKey,
+                      body: Column(
                         children: [
-                          tabbarBuild,
+                          tabbarBuild(),
                           Expanded(
                             child: TabBarView(
                               physics: const BouncingScrollPhysics(),
@@ -749,7 +714,11 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                   slivers: <Widget>[
                                     if (videoDetailController.videoType ==
                                         SearchType.video) ...[
-                                      VideoIntroPanel(heroTag: heroTag),
+                                      VideoIntroPanel(
+                                        heroTag: heroTag,
+                                        showAiBottomSheet: showAiBottomSheet,
+                                        showIntroDetail: showIntroDetail,
+                                      ),
                                     ] else if (videoDetailController
                                             .videoType ==
                                         SearchType.media_bangumi) ...[
@@ -776,13 +745,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                     RelatedVideoPanel(heroTag: heroTag),
                                   ],
                                 ),
-                                Obx(
+                                videoReplyPanel,
-                                  () => VideoReplyPanel(
-                                    bvid: videoDetailController.bvid,
-                                    oid: videoDetailController.oid.value,
-                                    heroTag: heroTag,
-                                  ),
-                                )
                               ],
                             ),
                           ),
@@ -790,8 +753,10 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                       ),
                     ),
                   ),
+                ),
               ],
-              )),
+            ),
+          ),
         ],
       ),
     );
@@ -851,17 +816,28 @@ class _VideoDetailPageState extends State<VideoDetailPage>
               ]),
             ),
           ),
+          Expanded(
+            child: Scaffold(
+              key: scaffoldKey,
+              body: Column(
+                children: [
+                  tabbarBuild(),
                   Expanded(
                     child: TabBarView(
                       physics: const BouncingScrollPhysics(),
                       controller: videoDetailController.tabCtr,
                       children: <Widget>[
                         CustomScrollView(
+                          controller: _introController,
                           key: const PageStorageKey<String>('简介'),
                           slivers: <Widget>[
                             if (videoDetailController.videoType ==
                                 SearchType.video) ...[
-                      VideoIntroPanel(heroTag: heroTag),
+                              VideoIntroPanel(
+                                heroTag: heroTag,
+                                showAiBottomSheet: showAiBottomSheet,
+                                showIntroDetail: showIntroDetail,
+                              ),
                             ] else if (videoDetailController.videoType ==
                                 SearchType.media_bangumi) ...[
                               Obx(() => BangumiIntroPanel(
@@ -870,30 +846,29 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                             ],
                             SliverToBoxAdapter(
                               child: Padding(
-                        padding:
+                                padding: const EdgeInsets.only(
-                            const EdgeInsets.only(top: StyleString.safeSpace),
+                                    top: StyleString.safeSpace),
                                 child: Divider(
                                   height: 1,
                                   indent: 12,
                                   endIndent: 12,
-                          color:
+                                  color: Theme.of(context)
-                              Theme.of(context).dividerColor.withOpacity(0.06),
+                                      .dividerColor
+                                      .withOpacity(0.06),
                                 ),
                               ),
                             ),
                             RelatedVideoPanel(heroTag: heroTag),
                           ],
                         ),
-                Obx(
+                        videoReplyPanel,
-                  () => VideoReplyPanel(
-                    bvid: videoDetailController.bvid,
-                    oid: videoDetailController.oid.value,
-                    heroTag: heroTag,
-                  ),
-                )
                       ],
                     ),
                   ),
+                ],
+              ),
+            ),
+          ),
         ]);
       }
       final double videoHeight = context.height / 2.5;
@@ -953,31 +928,46 @@ class _VideoDetailPageState extends State<VideoDetailPage>
             ),
           ),
           Expanded(
-              child: Row(children: [
+            child: Scaffold(
+              key: scaffoldKey,
+              body: Column(
+                children: [
+                  tabbarBuild(false),
+                  Expanded(
+                    child: Row(
+                      children: [
                         Expanded(
                             child: CustomScrollView(
-              key: PageStorageKey<String>('简介${videoDetailController.bvid}'),
+                          controller: _introController,
+                          key: PageStorageKey<String>(
+                              '简介${videoDetailController.bvid}'),
                           slivers: <Widget>[
-                if (videoDetailController.videoType == SearchType.video) ...[
+                            if (videoDetailController.videoType ==
-                  VideoIntroPanel(heroTag: heroTag),
+                                SearchType.video) ...[
+                              VideoIntroPanel(
+                                heroTag: heroTag,
+                                showAiBottomSheet: showAiBottomSheet,
+                                showIntroDetail: showIntroDetail,
+                              ),
                               RelatedVideoPanel(heroTag: heroTag),
                             ] else if (videoDetailController.videoType ==
                                 SearchType.media_bangumi) ...[
                               Obx(() => BangumiIntroPanel(
-                      heroTag: heroTag, cid: videoDetailController.cid.value)),
+                                  heroTag: heroTag,
+                                  cid: videoDetailController.cid.value)),
                             ]
                           ],
                         )),
                         Expanded(
-              child: Obx(
+                          child: videoReplyPanel,
-                () => VideoReplyPanel(
+                        )
-                  bvid: videoDetailController.bvid,
+                      ],
-                  oid: videoDetailController.oid.value,
-                  heroTag: heroTag,
-                ),
                     ),
                   )
-          ]))
+                ],
+              ),
+            ),
+          ),
         ],
       );
     });
@@ -994,7 +984,11 @@ class _VideoDetailPageState extends State<VideoDetailPage>
               key: PageStorageKey<String>('简介${videoDetailController.bvid}'),
               slivers: <Widget>[
                 if (videoDetailController.videoType == SearchType.video) ...[
-                  VideoIntroPanel(heroTag: heroTag),
+                  VideoIntroPanel(
+                    heroTag: heroTag,
+                    showAiBottomSheet: showAiBottomSheet,
+                    showIntroDetail: showIntroDetail,
+                  ),
                   RelatedVideoPanel(heroTag: heroTag),
                 ] else if (videoDetailController.videoType ==
                     SearchType.media_bangumi) ...[
@@ -1052,12 +1046,9 @@ class _VideoDetailPageState extends State<VideoDetailPage>
               ),
             ),
             Expanded(
-              child: Obx(
+              child: Scaffold(
-                () => VideoReplyPanel(
+                key: scaffoldKey,
-                  bvid: videoDetailController.bvid,
+                body: videoReplyPanel,
-                  oid: videoDetailController.oid.value,
-                  heroTag: heroTag,
-                ),
               ),
             ),
             // Expanded(
@@ -1169,7 +1160,11 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                     slivers: <Widget>[
                       if (videoDetailController.videoType ==
                           SearchType.video) ...[
-                        VideoIntroPanel(heroTag: heroTag),
+                        VideoIntroPanel(
+                          heroTag: heroTag,
+                          showAiBottomSheet: showAiBottomSheet,
+                          showIntroDetail: showIntroDetail,
+                        ),
                         // RelatedVideoPanel(heroTag: heroTag),
                       ] else if (videoDetailController.videoType ==
                           SearchType.media_bangumi) ...[
@@ -1194,26 +1189,32 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                           MediaQuery.of(context).padding.right))),
               height: context.height -
                   (removeSafeArea ? 0 : MediaQuery.of(context).padding.top),
+              child: Scaffold(
+                key: scaffoldKey,
+                body: Column(
+                  children: [
+                    tabbarBuild(true, '相关视频'),
+                    Expanded(
                       child: TabBarView(
                         physics: const BouncingScrollPhysics(),
                         controller: videoDetailController.tabCtr,
                         children: <Widget>[
-                  if (videoDetailController.videoType == SearchType.video)
+                          if (videoDetailController.videoType ==
+                              SearchType.video)
                             CustomScrollView(
+                              controller: _introController,
                               slivers: [
                                 RelatedVideoPanel(heroTag: heroTag),
                               ],
                             ),
-                  Obx(
+                          videoReplyPanel,
-                    () => VideoReplyPanel(
+                        ],
-                      bvid: videoDetailController.bvid,
-                      oid: videoDetailController.oid.value,
-                      heroTag: heroTag,
                       ),
                     )
                   ],
                 ),
               ),
+            ),
           )
         ],
       );
@@ -1239,7 +1240,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                       systemNavigationBarColor: Colors.transparent),
                 ),
           body: Container(
-              color: Theme.of(context).colorScheme.background,
+              color: Theme.of(context).colorScheme.surface,
               child: SafeArea(
                   left: !removeSafeArea && isFullScreen.value != true,
                   right: !removeSafeArea && isFullScreen.value != true,
@@ -1268,7 +1269,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                       systemNavigationBarColor: Colors.transparent),
                 ),
           body: Container(
-              color: Theme.of(context).colorScheme.background,
+              color: Theme.of(context).colorScheme.surface,
               child: SafeArea(
                   left: !removeSafeArea && isFullScreen.value != true,
                   right: !removeSafeArea && isFullScreen.value != true,
@@ -1324,7 +1325,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
     return LayoutBuilder(
         builder: (BuildContext context, BoxConstraints constraints) {
       if (!isShowing) {
-        return ColoredBox(color: Theme.of(context).colorScheme.background);
+        return ColoredBox(color: Theme.of(context).colorScheme.surface);
       }
       if (constraints.maxWidth > constraints.maxHeight * 1.25) {
 //             hideStatusBar();
@@ -1372,4 +1373,39 @@ class _VideoDetailPageState extends State<VideoDetailPage>
       //     : childWhenDisabledLandscape;
     });
   }
+
+  Widget get videoReplyPanel => Obx(
+        () => VideoReplyPanel(
+          bvid: videoDetailController.bvid,
+          oid: videoDetailController.oid.value,
+          heroTag: heroTag,
+          replyReply: replyReply,
+        ),
+      );
+
+  // 展示二级回复
+  void replyReply(replyItem) {
+    scaffoldKey.currentState?.showBottomSheet(
+      (context) => VideoReplyReplyPanel(
+        rcount: replyItem.rcount,
+        oid: replyItem.oid,
+        rpid: replyItem.rpid,
+        firstFloor: replyItem,
+        replyType: ReplyType.video,
+        source: 'videoDetail',
+      ),
+    );
+  }
+
+  // ai总结
+  showAiBottomSheet() {
+    scaffoldKey.currentState?.showBottomSheet(
+        enableDrag: true,
+        (context) => AiDetail(modelResult: videoIntroController.modelResult));
+  }
+
+  showIntroDetail(videoDetail) {
+    scaffoldKey.currentState?.showBottomSheet(
+        enableDrag: true, (context) => IntroDetail(videoDetail: videoDetail));
+  }
 }