From e651ae6232c2e6c738a61675b6ca2ebe11ce745a Mon Sep 17 00:00:00 2001 From: orz12 Date: Wed, 20 Dec 2023 15:56:04 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E7=AB=96=E5=B1=8F=E9=9D=9E=E5=85=A8?= =?UTF-8?q?=E5=B1=8F=E7=8A=B6=E6=80=81=E5=B0=8F=E7=99=BD=E6=9D=A1=E9=80=82?= =?UTF-8?q?=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/video/detail/view.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/pages/video/detail/view.dart b/lib/pages/video/detail/view.dart index 96a8b8fd..af51f941 100644 --- a/lib/pages/video/detail/view.dart +++ b/lib/pages/video/detail/view.dart @@ -244,7 +244,8 @@ class _VideoDetailPageState extends State } Widget childWhenDisabled = SafeArea( top: MediaQuery.of(context).orientation == Orientation.portrait, - bottom: MediaQuery.of(context).orientation == Orientation.portrait, + bottom: MediaQuery.of(context).orientation == Orientation.portrait + && plPlayerController!.isFullScreen.value, left: !plPlayerController!.isFullScreen.value, right: !plPlayerController!.isFullScreen.value, child: Stack( From 621a597d8f9b95a72c58bb0d32efab0a9a02add9 Mon Sep 17 00:00:00 2001 From: orz12 Date: Thu, 21 Dec 2023 12:23:01 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=AB=96=E5=B1=8F=E5=85=A8=E5=B1=8F?= =?UTF-8?q?=E4=B9=9F=E9=9A=90=E8=97=8F=E7=8A=B6=E6=80=81=E6=A0=8F=E4=B8=8E?= =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/plugin/pl_player/controller.dart | 33 ++++++---------------------- 1 file changed, 7 insertions(+), 26 deletions(-) diff --git a/lib/plugin/pl_player/controller.dart b/lib/plugin/pl_player/controller.dart index ff3857ba..61155ad6 100644 --- a/lib/plugin/pl_player/controller.dart +++ b/lib/plugin/pl_player/controller.dart @@ -937,32 +937,13 @@ class PlPlayerController { if (!isFullScreen.value && status) { /// 按照视频宽高比决定全屏方向 toggleFullScreen(true); - switch (mode) { - case FullScreenMode.auto: - if (direction.value == 'horizontal') { - /// 进入全屏 - await enterFullScreen(); - // 横屏 - await landScape(); - } else { - // 竖屏 - await verticalScreen(); - } - break; - case FullScreenMode.vertical: - - /// 进入全屏 - await enterFullScreen(); - // 竖屏 - await verticalScreen(); - break; - case FullScreenMode.horizontal: - - /// 进入全屏 - await enterFullScreen(); - // 横屏 - await landScape(); - break; + /// 进入全屏 + await enterFullScreen(); + if(mode == FullScreenMode.vertical || + (mode == FullScreenMode.auto && direction.value == 'vertical')) { + await verticalScreen(); + } else { + await landScape(); } // bool isValid = From a10af323f9aca722fb87f416532a47177d21553c Mon Sep 17 00:00:00 2001 From: orz12 Date: Thu, 21 Dec 2023 12:24:08 +0800 Subject: [PATCH 3/4] =?UTF-8?q?bottom=20control=E5=B0=BA=E5=AF=B8=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=8C=E6=9B=B4=E6=98=93=E6=8B=96=E5=8A=A8=E8=BF=9B?= =?UTF-8?q?=E5=BA=A6=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/plugin/pl_player/widgets/bottom_control.dart | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/plugin/pl_player/widgets/bottom_control.dart b/lib/plugin/pl_player/widgets/bottom_control.dart index dfb2c6a0..1fd8aa65 100644 --- a/lib/plugin/pl_player/widgets/bottom_control.dart +++ b/lib/plugin/pl_player/widgets/bottom_control.dart @@ -26,8 +26,8 @@ class BottomControl extends StatelessWidget implements PreferredSizeWidget { return Container( color: Colors.transparent, - height: 85, - padding: const EdgeInsets.only(left: 14, right: 14), + height: 90, + padding: const EdgeInsets.only(left: 18, right: 18), child: Column( mainAxisAlignment: MainAxisAlignment.end, children: [ @@ -50,8 +50,8 @@ class BottomControl extends StatelessWidget implements PreferredSizeWidget { bufferedBarColor: colorTheme.withOpacity(0.4), timeLabelLocation: TimeLabelLocation.none, thumbColor: colorTheme, - barHeight: 3.0, - thumbRadius: 5.5, + barHeight: 3.5, + thumbRadius: 7, onDragStart: (duration) { feedBack(); _.onChangedSliderStart(); From 6fb7b4ba73cff2983d1f786ee22a02bdec1af424 Mon Sep 17 00:00:00 2001 From: orz12 Date: Thu, 21 Dec 2023 19:21:13 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E5=85=A8=E5=B1=8F=E6=97=B6=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E5=BA=95=E9=83=A8=E6=9C=89=E5=8F=AF=E8=83=BD=E6=BB=91?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/video/detail/view.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/pages/video/detail/view.dart b/lib/pages/video/detail/view.dart index af51f941..f02fcd6d 100644 --- a/lib/pages/video/detail/view.dart +++ b/lib/pages/video/detail/view.dart @@ -433,7 +433,8 @@ class _VideoDetailPageState extends State // }, /// 不收回 pinnedHeaderSliverHeightBuilder: () { - return pinnedHeaderHeight; + return plPlayerController!.isFullScreen.value ? + MediaQuery.of(context).size.height: pinnedHeaderHeight; }, onlyOneScrollInBody: true, body: Container(