重构全屏逻辑，修复全屏弹幕与横屏错位问题

不再使用showDialog覆盖并传递对象的方式实现全屏，改用原控件调整高度（用Obx包裹SliverAppBar）、safeArea切换上下边距、构建detail页时根据屏幕方向切换状态栏可见性的方式实现全屏。以上方式既能兼容屏幕旋转，也能绕过弹幕不加载的问题，还可以保留播放器上的弹幕避免旋屏时清空。另外添加了两处针对全屏或旋屏状态的返回处理。
2023-12-18 21:25:28 +08:00
parent 6dd1360a76
commit 4d07f1508a
5 changed files with 330 additions and 288 deletions
--- a/lib/pages/danmaku/view.dart
+++ b/lib/pages/danmaku/view.dart
@ -95,9 +95,9 @@ class _PlDanmakuState extends State<PlDanmaku> {
    // 根据position判断是否有已缓存弹幕。没有则请求对应段
    int segIndex = (currentPosition / (6 * 60 * 1000)).ceil();
    segIndex = segIndex < 1 ? 1 : segIndex;
-    print('🌹🌹： ${segIndex}');
-    print('🌹🌹： ${ctr.dmSegList.length}');
-    print('🌹🌹： ${ctr.hasrequestSeg.contains(segIndex - 1)}');
+    // print('🌹🌹： ${segIndex}');
+    // print('🌹🌹： ${ctr.dmSegList.length}');
+    // print('🌹🌹： ${ctr.hasrequestSeg.contains(segIndex - 1)}');
    if (segIndex - 1 >= ctr.dmSegList.length ||
        (ctr.dmSegList[segIndex - 1].elems.isEmpty &&
            !ctr.hasrequestSeg.contains(segIndex - 1))) {
--- a/lib/pages/video/detail/controller.dart
+++ b/lib/pages/video/detail/controller.dart
@ -138,8 +138,8 @@ class VideoDetailController extends GetxController
  }

  showReplyReplyPanel() {
-    PersistentBottomSheetController<void>? ctr =
-        scaffoldKey.currentState?.showBottomSheet<void>((BuildContext context) {
+    PersistentBottomSheetController? ctr =
+        scaffoldKey.currentState?.showBottomSheet((BuildContext context) {
      return VideoReplyReplyPanel(
        oid: oid,
        rpid: fRpid,
--- a/lib/pages/video/detail/view.dart
+++ b/lib/pages/video/detail/view.dart
@ -21,6 +21,7 @@ import 'package:pilipala/plugin/pl_player/models/play_repeat.dart';
 import 'package:pilipala/services/service_locator.dart';
 import 'package:pilipala/utils/storage.dart';

+import 'package:pilipala/plugin/pl_player/utils/fullscreen.dart';
 import 'widgets/header_control.dart';

 class VideoDetailPage extends StatefulWidget {
@ -233,11 +234,28 @@ class _VideoDetailPageState extends State<VideoDetailPage>
  @override
  Widget build(BuildContext context) {
    final videoHeight = MediaQuery.of(context).size.width * 9 / 16;
-    final double pinnedHeaderHeight =
-        statusBarHeight + kToolbarHeight + videoHeight;
-    Widget childWhenDisabled = SafeArea(
-      top: false,
-      bottom: false,
+    // final double pinnedHeaderHeight =
+    //     statusBarHeight + kToolbarHeight + videoHeight;
+    if (MediaQuery.of(context).orientation == Orientation.landscape) {
+      enterFullScreen();
+    } else {
+      exitFullScreen();
+    }
+    Widget childWhenDisabled = PopScope(
+        canPop: !plPlayerController!.isFullScreen.value,
+        onPopInvoked: (bool didPop) {
+          if (plPlayerController!.isFullScreen.value) {
+            plPlayerController!.triggerFullScreen(status: false);
+          }
+          if (MediaQuery.of(context).orientation == Orientation.landscape) {
+            verticalScreen();
+          }
+        },
+        child: SafeArea(
+          top: MediaQuery.of(context).orientation == Orientation.portrait,
+          bottom: MediaQuery.of(context).orientation == Orientation.portrait,
+          left: !plPlayerController!.isFullScreen.value,
+          right: !plPlayerController!.isFullScreen.value,
          child: Stack(
            children: [
              Scaffold(
@ -249,18 +267,22 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                  headerSliverBuilder:
                      (BuildContext context, bool innerBoxIsScrolled) {
                    return <Widget>[
-                  SliverAppBar(
+                      Obx(
+                        () => SliverAppBar(
                            automaticallyImplyLeading: false,
                            pinned: false,
                            elevation: 0,
                            scrolledUnderElevation: 0,
                            forceElevated: innerBoxIsScrolled,
-                    expandedHeight: videoHeight,
+                            expandedHeight:
+                                plPlayerController!.isFullScreen.value ||
+                                        MediaQuery.of(context).orientation ==
+                                            Orientation.landscape
+                                    ? MediaQuery.of(context).size.height
+                                    : videoHeight,
                            backgroundColor: Colors.black,
                            flexibleSpace: FlexibleSpaceBar(
-                      background: Padding(
-                        padding: EdgeInsets.only(top: statusBarHeight),
-                        child: LayoutBuilder(
+                              background: LayoutBuilder(
                                builder: (context, boxConstraints) {
                                  double maxWidth = boxConstraints.maxWidth;
                                  double maxHeight = boxConstraints.maxHeight;
@ -276,7 +298,8 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                                      .autoPlay.value
                                                  ? const SizedBox()
                                                  : PLVideoPlayer(
-                                                controller: plPlayerController!,
+                                                      controller:
+                                                          plPlayerController!,
                                                      headerControl:
                                                          videoDetailController
                                                              .headerControl,
@ -284,10 +307,13 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                                        () => PlDanmaku(
                                                          key: Key(
                                                              videoDetailController
-                                                            .danmakuCid.value
+                                                                  .danmakuCid
+                                                                  .value
                                                                  .toString()),
-                                                    cid: videoDetailController
-                                                        .danmakuCid.value,
+                                                          cid:
+                                                              videoDetailController
+                                                                  .danmakuCid
+                                                                  .value,
                                                          playerController:
                                                              plPlayerController!,
                                                        ),
@ -302,8 +328,8 @@ class _VideoDetailPageState extends State<VideoDetailPage>

                                      Obx(
                                        () => Visibility(
-                                    visible:
-                                        videoDetailController.isShowCover.value,
+                                          visible: videoDetailController
+                                              .isShowCover.value,
                                          child: Positioned(
                                            top: 0,
                                            left: 0,
@ -326,7 +352,8 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                                    .isShowCover.value &&
                                                videoDetailController
                                                    .isEffective.value &&
-                                          !videoDetailController.autoPlay.value,
+                                                !videoDetailController
+                                                    .autoPlay.value,
                                            child: Stack(
                                              children: [
                                                Positioned(
@ -335,7 +362,8 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                                  right: 0,
                                                  child: AppBar(
                                                    primary: false,
-                                              foregroundColor: Colors.white,
+                                                    foregroundColor:
+                                                        Colors.white,
                                                    backgroundColor:
                                                        Colors.transparent,
                                                    actions: [
@ -350,8 +378,8 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                                          SmartDialog.showToast(
                                                              res['msg']);
                                                        },
-                                                  icon: const Icon(
-                                                      Icons.history_outlined),
+                                                        icon: const Icon(Icons
+                                                            .history_outlined),
                                                      ),
                                                      const SizedBox(width: 14)
                                                    ],
@ -364,13 +392,15 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                                    style: ButtonStyle(
                                                      backgroundColor:
                                                          MaterialStateProperty
-                                                        .resolveWith((states) {
+                                                              .resolveWith(
+                                                                  (states) {
                                                        return Theme.of(context)
                                                            .colorScheme
                                                            .primaryContainer;
                                                      }),
                                                    ),
-                                              onPressed: () => handlePlay(),
+                                                    onPressed: () =>
+                                                        handlePlay(),
                                                    icon: const Icon(
                                                      Icons.play_circle_outline,
                                                      size: 20,
@ -385,8 +415,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                  );
                                },
                              ),
-                      ),
-                    ),
+                            )),
                      ),
                    ];
                  },
@ -396,9 +425,9 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                  //       : pinnedHeaderHeight;
                  // },
                  /// 不收回
-              pinnedHeaderSliverHeightBuilder: () {
-                return pinnedHeaderHeight;
-              },
+                  // pinnedHeaderSliverHeightBuilder: () {
+                  //   return pinnedHeaderHeight;
+                  // },
                  onlyOneScrollInBody: true,
                  body: Container(
                    key: Key(heroTag),
@ -435,10 +464,12 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                      if (videoDetailController.videoType ==
                                          SearchType.video) ...[
                                        const VideoIntroPanel(),
-                                  ] else if (videoDetailController.videoType ==
+                                      ] else if (videoDetailController
+                                              .videoType ==
                                          SearchType.media_bangumi) ...[
                                        Obx(() => BangumiIntroPanel(
-                                        cid: videoDetailController.cid.value)),
+                                            cid: videoDetailController
+                                                .cid.value)),
                                      ],
                                      // if (videoDetailController.videoType ==
                                      //     SearchType.video) ...[
@ -494,7 +525,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
              // )
            ],
          ),
-    );
+        ));
    Widget childWhenEnabled = FutureBuilder(
      key: Key(heroTag),
      future: _futureBuilderFuture,
--- a/lib/pages/video/detail/widgets/header_control.dart
+++ b/lib/pages/video/detail/widgets/header_control.dart
@ -880,7 +880,18 @@ class _HeaderControlState extends State<HeaderControl> {
              size: 15,
              color: Colors.white,
            ),
-            fuc: () => Get.back(),
+            fuc: () => {
+              if (widget.controller!.isFullScreen.value){
+                widget.controller!.triggerFullScreen(status: false)
+              } else {
+                if (MediaQuery.of(context).orientation == Orientation.landscape){
+                  SystemChrome.setPreferredOrientations([
+                    DeviceOrientation.portraitUp,
+                  ])
+                },
+                Get.back()
+              }
+            },
          ),
          SizedBox(width: buttonSpace),
          ComBtn(
--- a/lib/plugin/pl_player/controller.dart
+++ b/lib/plugin/pl_player/controller.dart
@ -899,6 +899,7 @@ class PlPlayerController {
    await StatusBarControl.setHidden(true, animation: StatusBarAnimation.FADE);
    if (!isFullScreen.value && status) {
      /// 按照视频宽高比决定全屏方向
+      toggleFullScreen(true);
      switch (mode) {
        case FullScreenMode.auto:
          if (direction.value == 'horizontal') {
@ -927,41 +928,40 @@ class PlPlayerController {
          break;
      }

-      toggleFullScreen(true);
-      bool isValid =
-          direction.value == 'vertical' || mode == FullScreenMode.vertical
-              ? true
-              : false;
-      var result = await showDialog(
-        context: Get.context!,
-        useSafeArea: false,
-        builder: (context) => Dialog.fullscreen(
-          backgroundColor: Colors.black,
-          child: SafeArea(
-            // 忽略手机安全区域
-            top: isValid,
-            left: false,
-            right: false,
-            bottom: isValid,
-            child: PLVideoPlayer(
-              controller: this,
-              headerControl: headerControl,
-              bottomControl: bottomControl,
-              danmuWidget: danmuWidget,
-            ),
-          ),
-        ),
-      );
-      if (result == null) {
-        // 退出全屏
-        StatusBarControl.setHidden(false, animation: StatusBarAnimation.FADE);
-        exitFullScreen();
-        await verticalScreen();
-        toggleFullScreen(false);
-      }
+      // bool isValid =
+      //     direction.value == 'vertical' || mode == FullScreenMode.vertical
+      //         ? true
+      //         : false;
+      // var result = await showDialog(
+      //   context: Get.context!,
+      //   useSafeArea: false,
+      //   builder: (context) => Dialog.fullscreen(
+      //     backgroundColor: Colors.black,
+      //     child: SafeArea(
+      //       // 忽略手机安全区域
+      //       top: isValid,
+      //       left: false,
+      //       right: false,
+      //       bottom: isValid,
+      //       child: PLVideoPlayer(
+      //         controller: this,
+      //         headerControl: headerControl,
+      //         bottomControl: bottomControl,
+      //         danmuWidget: danmuWidget,
+      //       ),
+      //     ),
+      //   ),
+      // );
+      // if (result == null) {
+      //   // 退出全屏
+      //   StatusBarControl.setHidden(false, animation: StatusBarAnimation.FADE);
+      //   exitFullScreen();
+      //   await verticalScreen();
+      //   toggleFullScreen(false);
+      // }
    } else if (isFullScreen.value) {
      StatusBarControl.setHidden(false, animation: StatusBarAnimation.FADE);
-      Get.back();
+      // Get.back();
      exitFullScreen();
      await verticalScreen();
      toggleFullScreen(false);