Merge pull request #325 from orz12/fix_portrait_fullscreen_bottom_cherry_pick

fix: 竖屏非全屏状态小白条适配

lib/pages/video/detail/view.dart

@@ -244,7 +244,8 @@ class _VideoDetailPageState extends State<VideoDetailPage>
     }
     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(
@@ -432,7 +433,8 @@ class _VideoDetailPageState extends State<VideoDetailPage>
               // },
               /// 不收回
               pinnedHeaderSliverHeightBuilder: () {
-                return pinnedHeaderHeight;
+                return plPlayerController!.isFullScreen.value ?
+                MediaQuery.of(context).size.height: pinnedHeaderHeight;
               },
               onlyOneScrollInBody: true,
               body: Container(

lib/plugin/pl_player/controller.dart

@@ -937,32 +937,13 @@ class PlPlayerController {
     if (!isFullScreen.value && status) {
       /// 按照视频宽高比决定全屏方向
       toggleFullScreen(true);
-      switch (mode) {
+      /// 进入全屏
-        case FullScreenMode.auto:
+      await enterFullScreen();
-          if (direction.value == 'horizontal') {
+      if(mode == FullScreenMode.vertical ||
-            /// 进入全屏
+          (mode == FullScreenMode.auto && direction.value == 'vertical')) {
-            await enterFullScreen();
+        await verticalScreen();
-            // 横屏
+      } else {
-            await landScape();
+        await landScape();
-          } else {
-            // 竖屏
-            await verticalScreen();
-          }
-          break;
-        case FullScreenMode.vertical:
-
-          /// 进入全屏
-          await enterFullScreen();
-          // 竖屏
-          await verticalScreen();
-          break;
-        case FullScreenMode.horizontal:
-
-          /// 进入全屏
-          await enterFullScreen();
-          // 横屏
-          await landScape();
-          break;
       }
 
       // bool isValid =

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,
+      height: 90,
-      padding: const EdgeInsets.only(left: 14, right: 14),
+      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,
+                  barHeight: 3.5,
-                  thumbRadius: 5.5,
+                  thumbRadius: 7,
                   onDragStart: (duration) {
                     feedBack();
                     _.onChangedSliderStart();