diff --git a/lib/pages/video/controller.dart b/lib/pages/video/controller.dart index 80e35b1be..ec45cb0aa 100644 --- a/lib/pages/video/controller.dart +++ b/lib/pages/video/controller.dart @@ -663,7 +663,9 @@ class VideoDetailController extends GetxController (isFileSource ? true : videoPlayerKey.currentState?.mounted == true)) { - return playerInit(autoFullScreenFlag: autoFullScreenFlag); + return playerInit( + autoFullScreenFlag: autoFullScreenFlag && _autoPlay.value, + ); } return null; } diff --git a/lib/pages/video/view.dart b/lib/pages/video/view.dart index 5f822aa19..6f9b7b2d4 100644 --- a/lib/pages/video/view.dart +++ b/lib/pages/video/view.dart @@ -309,13 +309,17 @@ class _VideoDetailPageVState extends State return null; } } - plPlayerController = videoDetailController.plPlayerController; + final plPlayerController = this.plPlayerController = + videoDetailController.plPlayerController; videoDetailController.autoPlay = true; - plPlayerController! + plPlayerController ..addStatusLister(playerListener) ..addPositionListener(positionListener); - if (videoDetailController.plPlayerController.preInitPlayer) { - return plPlayerController!.play(); + if (plPlayerController.preInitPlayer) { + if (plPlayerController.autoEnterFullScreen) { + plPlayerController.triggerFullScreen(); + } + return plPlayerController.play(); } else { return videoDetailController.playerInit( autoplay: true, diff --git a/lib/plugin/pl_player/controller.dart b/lib/plugin/pl_player/controller.dart index a4369b5f9..2e146726e 100644 --- a/lib/plugin/pl_player/controller.dart +++ b/lib/plugin/pl_player/controller.dart @@ -369,7 +369,7 @@ class PlPlayerController with BlockConfigMixin { late final showFsLockBtn = Pref.showFsLockBtn; late final keyboardControl = Pref.keyboardControl; - late final bool _autoEnterFullScreen = Pref.autoEnterFullScreen; + late final bool autoEnterFullScreen = Pref.autoEnterFullScreen; late final bool autoExitFullscreen = Pref.autoExitFullscreen; late final bool autoPlayEnable = Pref.autoPlayEnable; late final bool enableVerticalExpand = Pref.enableVerticalExpand; @@ -630,7 +630,7 @@ class PlPlayerController with BlockConfigMixin { // 数据加载完成 dataStatus.value = DataStatus.loaded; - if (autoFullScreenFlag && _autoEnterFullScreen) { + if (autoFullScreenFlag && autoEnterFullScreen) { triggerFullScreen(status: true); }