EchoZenith/PiliPlus
1
0
Fork 0
mirror of https://github.com/bggRGjQaUbCoE/PiliPlus.git synced 2026-07-28 06:20:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

opt: player controller (#1753)

Browse Source 
* opt: player controller

* tweak [skip ci]

Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>

---------

Co-authored-by: bggRGjQaUbCoE <githubaccount56556@proton.me>
This commit is contained in:
My-Responsitories
2025-11-26 11:45:16 +08:00
committed by GitHub
parent 54b26d20fa
commit 38a7afd63a
4 changed files with 145 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pages/video/controller.dart
View File

@@ -122,7 +122,7 @@ class VideoDetailController extends GetxController
final childKey = GlobalKey<ScaffoldState>(); final childKey = GlobalKey<ScaffoldState>();
final plPlayerController = PlPlayerController.getInstance() final plPlayerController = PlPlayerController.getInstance()
..setCurrBrightness(-1.0); ..brightness.value = -1;
bool get setSystemBrightness => plPlayerController.setSystemBrightness; bool get setSystemBrightness => plPlayerController.setSystemBrightness;
late VideoItem firstVideo; late VideoItem firstVideo;

5
lib/pages/video/view.dart
View File

@@ -431,9 +431,8 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
Platform.isAndroid && Platform.isAndroid &&
!videoDetailController.setSystemBrightness) { !videoDetailController.setSystemBrightness) {
if (videoDetailController.brightness != null) { if (videoDetailController.brightness != null) {
plPlayerController?.setCurrBrightness( plPlayerController?.brightness.value =
videoDetailController.brightness!, videoDetailController.brightness!;
);
if (videoDetailController.brightness != -1.0) { if (videoDetailController.brightness != -1.0) {
ScreenBrightnessPlatform.instance.setApplicationScreenBrightness( ScreenBrightnessPlatform.instance.setApplicationScreenBrightness(
videoDetailController.brightness!, videoDetailController.brightness!,

314
lib/plugin/pl_player/controller.dart
View File

@@ -67,7 +67,7 @@ class PlPlayerController {
static PlPlayerController? _instance; static PlPlayerController? _instance;
// 流事件 监听播放状态变化 // 流事件 监听播放状态变化
StreamSubscription? _playerEventSubs; // StreamSubscription? _playerEventSubs;
/// [playerStatus] has a [status] observable /// [playerStatus] has a [status] observable
final playerStatus = PlPlayerStatus(PlayerStatus.playing); final playerStatus = PlPlayerStatus(PlayerStatus.playing);
@@ -80,15 +80,21 @@ class PlPlayerController {
/// 响应数据 /// 响应数据
/// 带有Seconds的变量只在秒数更新时更新，以避免频繁触发重绘 /// 带有Seconds的变量只在秒数更新时更新，以避免频繁触发重绘
// 播放位置 // 播放位置
final Rx<Duration> _position = Rx(Duration.zero); final Rx<Duration> position = Rx(Duration.zero);
final RxInt positionSeconds = 0.obs; final RxInt positionSeconds = 0.obs;
final Rx<Duration> _sliderPosition = Rx(Duration.zero);
/// 进度条位置
final Rx<Duration> sliderPosition = Rx(Duration.zero);
final RxInt sliderPositionSeconds = 0.obs; final RxInt sliderPositionSeconds = 0.obs;
// 展示使用 // 展示使用
final Rx<Duration> _sliderTempPosition = Rx(Duration.zero); final Rx<Duration> sliderTempPosition = Rx(Duration.zero);
final Rx<Duration> _duration = Rx(Duration.zero);
/// 视频时长
final Rx<Duration> duration = Rx(Duration.zero);
final Rx<Duration> durationSeconds = Duration.zero.obs; final Rx<Duration> durationSeconds = Duration.zero.obs;
final Rx<Duration> _buffered = Rx(Duration.zero);
/// 视频缓冲
final Rx<Duration> buffered = Rx(Duration.zero);
final RxInt bufferedSeconds = 0.obs; final RxInt bufferedSeconds = 0.obs;
int _playerCount = 0; int _playerCount = 0;
@@ -96,33 +102,62 @@ class PlPlayerController {
late double lastPlaybackSpeed = 1.0; late double lastPlaybackSpeed = 1.0;
final RxDouble _playbackSpeed = Pref.playSpeedDefault.obs; final RxDouble _playbackSpeed = Pref.playSpeedDefault.obs;
late final RxDouble _longPressSpeed = Pref.longPressSpeedDefault.obs; late final RxDouble _longPressSpeed = Pref.longPressSpeedDefault.obs;
final RxDouble _currentVolume = RxDouble(
/// 音量控制条
final RxDouble volume = RxDouble(
Utils.isDesktop ? Pref.desktopVolume : 1.0, Utils.isDesktop ? Pref.desktopVolume : 1.0,
); );
final setSystemBrightness = Pref.setSystemBrightness; final setSystemBrightness = Pref.setSystemBrightness;
final RxDouble _currentBrightness = (-1.0).obs;
final RxBool _showControls = false.obs; /// 亮度控制条
final RxBool _showVolumeStatus = false.obs; final RxDouble brightness = (-1.0).obs;
final RxBool _showBrightnessStatus = false.obs;
final RxBool _longPressStatus = false.obs; /// 是否展示控制条
final RxBool _controlsLock = false.obs; final RxBool showControls = false.obs;
final RxBool _isFullScreen = false.obs;
/// 音量控制条展示/隐藏
final RxBool showVolumeStatus = false.obs;
/// 亮度控制条展示/隐藏
final RxBool showBrightnessStatus = false.obs;
/// 是否长按倍速
final RxBool longPressStatus = false.obs;
/// 屏幕锁 为true时，关闭控制栏
final RxBool controlsLock = false.obs;
/// 全屏状态
final RxBool isFullScreen = false.obs;
// 默认投稿视频格式 // 默认投稿视频格式
bool isLive = false; bool isLive = false;
bool _isVertical = false; bool _isVertical = false;
final Rx<VideoFitType> _videoFit = Rx(VideoFitType.contain); /// 视频比例
late StreamSubscription<DataStatus> _dataListenerForVideoFit; final Rx<VideoFitType> videoFit = Rx(VideoFitType.contain);
late StreamSubscription<DataStatus> _dataListenerForEnterFullscreen;
StreamSubscription<DataStatus>? _dataListenerForVideoFit;
StreamSubscription<DataStatus>? _dataListenerForEnterFullScreen;
void _stopListenerForVideoFit() {
_dataListenerForVideoFit?.cancel();
_dataListenerForVideoFit = null;
}
void _stopListenerForEnterFullScreen() {
_dataListenerForEnterFullScreen?.cancel();
_dataListenerForEnterFullScreen = null;
}
/// 后台播放 /// 后台播放
late final RxBool _continuePlayInBackground = late final RxBool continuePlayInBackground =
Pref.continuePlayInBackground.obs; Pref.continuePlayInBackground.obs;
/// ///
final RxBool _isSliderMoving = false.obs; final RxBool isSliderMoving = false.obs;
/// 是否循环
PlaylistMode _looping = PlaylistMode.none; PlaylistMode _looping = PlaylistMode.none;
bool _autoPlay = false; bool _autoPlay = false;
@@ -152,78 +187,19 @@ class PlPlayerController {
String get bvid => _bvid!; String get bvid => _bvid!;
/// 数据加载监听
Stream<DataStatus> get onDataStatusChanged => dataStatus.status.stream;
/// 播放状态监听
Stream<PlayerStatus> get onPlayerStatusChanged => playerStatus.stream;
/// 视频时长
Rx<Duration> get duration => _duration;
Stream<Duration> get onDurationChanged => _duration.stream;
/// 视频当前播放位置
Rx<Duration> get position => _position;
Stream<Duration> get onPositionChanged => _position.stream;
/// 视频播放速度 /// 视频播放速度
double get playbackSpeed => _playbackSpeed.value; double get playbackSpeed => _playbackSpeed.value;
// 长按倍速 // 长按倍速
double get longPressSpeed => _longPressSpeed.value; double get longPressSpeed => _longPressSpeed.value;
/// 视频缓冲
Rx<Duration> get buffered => _buffered;
Stream<Duration> get onBufferedChanged => _buffered.stream;
/// [videoPlayerController] instance of Player /// [videoPlayerController] instance of Player
Player? get videoPlayerController => _videoPlayerController; Player? get videoPlayerController => _videoPlayerController;
/// [videoController] instance of Player /// [videoController] instance of Player
VideoController? get videoController => _videoController; VideoController? get videoController => _videoController;
RxBool get isSliderMoving => _isSliderMoving; bool isMuted = false;
/// 进度条位置及监听
Rx<Duration> get sliderPosition => _sliderPosition;
Stream<Duration> get onSliderPositionChanged => _sliderPosition.stream;
Rx<Duration> get sliderTempPosition => _sliderTempPosition;
// Stream<Duration> get onSliderPositionChanged => _sliderPosition.stream;
/// 是否展示控制条及监听
RxBool get showControls => _showControls;
Stream<bool> get onShowControlsChanged => _showControls.stream;
/// 音量控制条展示/隐藏
RxBool get showVolumeStatus => _showVolumeStatus;
Stream<bool> get onShowVolumeStatusChanged => _showVolumeStatus.stream;
/// 亮度控制条展示/隐藏
RxBool get showBrightnessStatus => _showBrightnessStatus;
Stream<bool> get onShowBrightnessStatusChanged =>
_showBrightnessStatus.stream;
/// 音量控制条
RxDouble get volume => _currentVolume;
Stream<double> get onVolumeChanged => _currentVolume.stream;
late bool isMuted = false;
/// 亮度控制条
RxDouble get brightness => _currentBrightness;
Stream<double> get onBrightnessChanged => _currentBrightness.stream;
/// 是否循环
PlaylistMode get looping => _looping;
/// 是否自动播放
bool get autoplay => _autoPlay;
/// 视频比例
Rx<VideoFitType> get videoFit => _videoFit;
/// 后台播放
RxBool get continuePlayInBackground => _continuePlayInBackground;
/// 听视频 /// 听视频
late final RxBool onlyPlayAudio = false.obs; late final RxBool onlyPlayAudio = false.obs;
@@ -233,16 +209,7 @@ class PlPlayerController {
late final RxBool flipY = false.obs; late final RxBool flipY = false.obs;
/// 是否长按倍速 final RxBool isBuffering = true.obs;
RxBool get longPressStatus => _longPressStatus;
RxBool isBuffering = true.obs;
/// 屏幕锁 为true时，关闭控制栏
RxBool get controlsLock => _controlsLock;
/// 全屏状态
RxBool get isFullScreen => _isFullScreen;
/// 全屏方向 /// 全屏方向
bool get isVertical => _isVertical; bool get isVertical => _isVertical;
@@ -512,27 +479,27 @@ class PlPlayerController {
} }
void updateSliderPositionSecond() { void updateSliderPositionSecond() {
int newSecond = _sliderPosition.value.inSeconds; int newSecond = sliderPosition.value.inSeconds;
if (sliderPositionSeconds.value != newSecond) { if (sliderPositionSeconds.value != newSecond) {
sliderPositionSeconds.value = newSecond; sliderPositionSeconds.value = newSecond;
} }
} }
void updatePositionSecond() { void updatePositionSecond() {
int newSecond = _position.value.inSeconds; int newSecond = position.value.inSeconds;
if (positionSeconds.value != newSecond) { if (positionSeconds.value != newSecond) {
positionSeconds.value = newSecond; positionSeconds.value = newSecond;
} }
} }
void updateDurationSecond() { void updateDurationSecond() {
if (durationSeconds.value != _duration.value) { if (durationSeconds.value != duration.value) {
durationSeconds.value = _duration.value; durationSeconds.value = duration.value;
} }
} }
void updateBufferedSecond() { void updateBufferedSecond() {
int newSecond = _buffered.value.inSeconds; int newSecond = buffered.value.inSeconds;
if (bufferedSeconds.value != newSecond) { if (bufferedSeconds.value != newSecond) {
bufferedSeconds.value = newSecond; bufferedSeconds.value = newSecond;
} }
@@ -704,8 +671,8 @@ class PlPlayerController {
volume, volume,
); );
// 获取视频时长 00:00 // 获取视频时长 00:00
_duration.value = duration ?? _videoPlayerController!.state.duration; this.duration.value = duration ?? _videoPlayerController!.state.duration;
_position.value = _buffered.value = _sliderPosition.value = position.value = buffered.value = sliderPosition.value =
seekTo ?? Duration.zero; seekTo ?? Duration.zero;
updateDurationSecond(); updateDurationSecond();
updatePositionSecond(); updatePositionSecond();
@@ -818,7 +785,7 @@ class PlPlayerController {
isBuffering.value = false; isBuffering.value = false;
buffered.value = Duration.zero; buffered.value = Duration.zero;
_heartDuration = 0; _heartDuration = 0;
_position.value = Duration.zero; position.value = Duration.zero;
// 初始化时清空弹幕，防止上次重叠 // 初始化时清空弹幕，防止上次重叠
danmakuController?.clear(); danmakuController?.clear();
@@ -982,7 +949,7 @@ class PlPlayerController {
Media( Media(
dataSource.videoSource!, dataSource.videoSource!,
httpHeaders: dataSource.httpHeaders, httpHeaders: dataSource.httpHeaders,
start: _position.value, start: position.value,
), ),
play: true, play: true,
); );
@@ -1023,9 +990,10 @@ class PlPlayerController {
if (enableAutoEnter) { if (enableAutoEnter) {
Future.delayed(const Duration(milliseconds: 500), () { Future.delayed(const Duration(milliseconds: 500), () {
if (dataStatus.status.value != DataStatus.loaded) { if (dataStatus.status.value != DataStatus.loaded) {
_dataListenerForEnterFullscreen = dataStatus.status.listen((status) { _stopListenerForEnterFullScreen();
_dataListenerForEnterFullScreen = dataStatus.status.listen((status) {
if (status == DataStatus.loaded) { if (status == DataStatus.loaded) {
_dataListenerForEnterFullscreen.cancel(); _stopListenerForEnterFullScreen();
triggerFullScreen(status: true); triggerFullScreen(status: true);
} }
}); });
@@ -1086,10 +1054,10 @@ class PlPlayerController {
makeHeartBeat(positionSeconds.value, type: HeartBeatType.completed); makeHeartBeat(positionSeconds.value, type: HeartBeatType.completed);
}), }),
videoPlayerController!.stream.position.listen((event) { videoPlayerController!.stream.position.listen((event) {
_position.value = event; position.value = event;
updatePositionSecond(); updatePositionSecond();
if (!isSliderMoving.value) { if (!isSliderMoving.value) {
_sliderPosition.value = event; sliderPosition.value = event;
updateSliderPositionSecond(); updateSliderPositionSecond();
} }
@@ -1103,7 +1071,7 @@ class PlPlayerController {
duration.value = event; duration.value = event;
}), }),
videoPlayerController!.stream.buffer.listen((Duration event) { videoPlayerController!.stream.buffer.listen((Duration event) {
_buffered.value = event; buffered.value = event;
updateBufferedSecond(); updateBufferedSecond();
}), }),
videoPlayerController!.stream.buffering.listen((bool event) { videoPlayerController!.stream.buffering.listen((bool event) {
@@ -1150,7 +1118,7 @@ class PlPlayerController {
// if (kDebugMode) { // if (kDebugMode) {
// debugPrint("_buffered.value: ${_buffered.value}"); // debugPrint("_buffered.value: ${_buffered.value}");
// } // }
if (isBuffering.value && _buffered.value == Duration.zero) { if (isBuffering.value && buffered.value == Duration.zero) {
SmartDialog.showToast( SmartDialog.showToast(
'视频链接打开失败，重试中', '视频链接打开失败，重试中',
displayTime: const Duration(milliseconds: 500), displayTime: const Duration(milliseconds: 500),
@@ -1181,14 +1149,14 @@ class PlPlayerController {
// }), // }),
// 媒体通知监听 // 媒体通知监听
if (videoPlayerServiceHandler != null) ...[ if (videoPlayerServiceHandler != null) ...[
onPlayerStatusChanged.listen((PlayerStatus event) { playerStatus.listen((PlayerStatus event) {
videoPlayerServiceHandler!.onStatusChange( videoPlayerServiceHandler!.onStatusChange(
event, event,
isBuffering.value, isBuffering.value,
isLive, isLive,
); );
}), }),
onPositionChanged.listen((Duration event) { position.listen((Duration event) {
EasyThrottle.throttle( EasyThrottle.throttle(
'mediaServicePosition', 'mediaServicePosition',
const Duration(seconds: 1), const Duration(seconds: 1),
@@ -1215,7 +1183,7 @@ class PlPlayerController {
if (position < Duration.zero) { if (position < Duration.zero) {
position = Duration.zero; position = Duration.zero;
} }
_position.value = position; this.position.value = position;
updatePositionSecond(); updatePositionSecond();
_heartDuration = position.inSeconds; _heartDuration = position.inSeconds;
if (duration.value.inSeconds != 0) { if (duration.value.inSeconds != 0) {
@@ -1337,23 +1305,23 @@ class PlPlayerController {
/// 调整播放时间 /// 调整播放时间
void onChangedSlider(double v) { void onChangedSlider(double v) {
_sliderPosition.value = Duration(seconds: v.floor()); sliderPosition.value = Duration(seconds: v.floor());
updateSliderPositionSecond(); updateSliderPositionSecond();
} }
void onChangedSliderStart([Duration? value]) { void onChangedSliderStart([Duration? value]) {
if (value != null) { if (value != null) {
_sliderTempPosition.value = value; sliderTempPosition.value = value;
} }
_isSliderMoving.value = true; isSliderMoving.value = true;
} }
bool? cancelSeek; bool? cancelSeek;
bool? hasToast; bool? hasToast;
void onUpdatedSliderProgress(Duration value) { void onUpdatedSliderProgress(Duration value) {
_sliderTempPosition.value = value; sliderTempPosition.value = value;
_sliderPosition.value = value; sliderPosition.value = value;
updateSliderPositionSecond(); updateSliderPositionSecond();
} }
@@ -1363,7 +1331,7 @@ class PlPlayerController {
} }
cancelSeek = null; cancelSeek = null;
hasToast = null; hasToast = null;
_isSliderMoving.value = false; isSliderMoving.value = false;
hideTaskControls(); hideTaskControls();
} }
@@ -1405,14 +1373,10 @@ class PlPlayerController {
}); });
} }
void setCurrBrightness(double brightness) {
_currentBrightness.value = brightness;
}
/// Toggle Change the videofit accordingly /// Toggle Change the videofit accordingly
void toggleVideoFit(VideoFitType value) { void toggleVideoFit(VideoFitType value) {
_videoFit.value = value; videoFit.value = value;
video.put(VideoBoxKey.cacheVideoFit, _videoFit.value.index); video.put(VideoBoxKey.cacheVideoFit, value.index);
} }
/// 读取fit /// 读取fit
@@ -1423,12 +1387,13 @@ class PlPlayerController {
if (attr == VideoFitType.none || attr == VideoFitType.scaleDown) { if (attr == VideoFitType.none || attr == VideoFitType.scaleDown) {
if (buffered.value == Duration.zero) { if (buffered.value == Duration.zero) {
attr = VideoFitType.contain; attr = VideoFitType.contain;
_stopListenerForVideoFit();
_dataListenerForVideoFit = dataStatus.status.listen((status) { _dataListenerForVideoFit = dataStatus.status.listen((status) {
if (status == DataStatus.loaded) { if (status == DataStatus.loaded) {
_dataListenerForVideoFit.cancel(); _stopListenerForVideoFit();
var attr = VideoFitType.values[fitValue]; var attr = VideoFitType.values[fitValue];
if (attr == VideoFitType.none || attr == VideoFitType.scaleDown) { if (attr == VideoFitType.none || attr == VideoFitType.scaleDown) {
_videoFit.value = attr; videoFit.value = attr;
} }
} }
}); });
@@ -1437,7 +1402,7 @@ class PlPlayerController {
} else if (attr == VideoFitType.fill && isVertical) { } else if (attr == VideoFitType.fill && isVertical) {
attr = VideoFitType.contain; attr = VideoFitType.contain;
} }
_videoFit.value = attr; videoFit.value = attr;
} }
/// 设置后台播放 /// 设置后台播放
@@ -1449,7 +1414,7 @@ class PlPlayerController {
} }
set controls(bool visible) { set controls(bool visible) {
_showControls.value = visible; showControls.value = visible;
_timer?.cancel(); _timer?.cancel();
if (visible) { if (visible) {
hideTaskControls(); hideTaskControls();
@@ -1470,12 +1435,12 @@ class PlPlayerController {
if (controlsLock.value) { if (controlsLock.value) {
return; return;
} }
if (_longPressStatus.value == val) { if (longPressStatus.value == val) {
return; return;
} }
if (val) { if (val) {
if (playerStatus.value == PlayerStatus.playing) { if (playerStatus.value == PlayerStatus.playing) {
_longPressStatus.value = val; longPressStatus.value = val;
HapticFeedback.lightImpact(); HapticFeedback.lightImpact();
await setPlaybackSpeed( await setPlaybackSpeed(
enableAutoLongPressSpeed ? playbackSpeed * 2 : longPressSpeed, enableAutoLongPressSpeed ? playbackSpeed * 2 : longPressSpeed,
@@ -1483,7 +1448,7 @@ class PlPlayerController {
} }
} else { } else {
// if (kDebugMode) debugPrint('$playbackSpeed'); // if (kDebugMode) debugPrint('$playbackSpeed');
_longPressStatus.value = val; longPressStatus.value = val;
await setPlaybackSpeed(lastPlaybackSpeed); await setPlaybackSpeed(lastPlaybackSpeed);
} }
} }
@@ -1514,11 +1479,11 @@ class PlPlayerController {
} }
void onForward(Duration duration) { void onForward(Duration duration) {
onForwardBackward(_position.value + duration); onForwardBackward(position.value + duration);
} }
void onBackward(Duration duration) { void onBackward(Duration duration) {
onForwardBackward(_position.value - duration); onForwardBackward(position.value - duration);
} }
void onForwardBackward(Duration duration) { void onForwardBackward(Duration duration) {
@@ -1551,15 +1516,15 @@ class PlPlayerController {
/// 关闭控制栏 /// 关闭控制栏
void onLockControl(bool val) { void onLockControl(bool val) {
feedBack(); feedBack();
_controlsLock.value = val; controlsLock.value = val;
if (!val && _showControls.value) { if (!val && showControls.value) {
_showControls.refresh(); showControls.refresh();
} }
controls = !val; controls = !val;
} }
void toggleFullScreen(bool val) { void toggleFullScreen(bool val) {
_isFullScreen.value = val; isFullScreen.value = val;
updateSubtitleStyle(); updateSubtitleStyle();
} }
@@ -1582,52 +1547,51 @@ class PlPlayerController {
return; return;
} }
fsProcessing = true; fsProcessing = true;
try {
mode ??= this.mode;
this.isManualFS = isManualFS;
mode ??= this.mode; if (status) {
this.isManualFS = isManualFS; if (Utils.isMobile) {
toggleFullScreen(status); hideStatusBar();
if (mode == FullScreenMode.none) {
if (status) { return;
if (Utils.isMobile) { }
hideStatusBar(); if (mode == FullScreenMode.gravity) {
if (mode == FullScreenMode.none) { await fullAutoModeForceSensor();
fsProcessing = false; return;
return; }
} late final size = Get.mediaQuery.size;
if (mode == FullScreenMode.gravity) { if ((mode == FullScreenMode.vertical ||
await fullAutoModeForceSensor(); (mode == FullScreenMode.auto && isVertical) ||
fsProcessing = false; (mode == FullScreenMode.ratio &&
return; (isVertical || size.height / size.width < kScreenRatio)))) {
} await verticalScreenForTwoSeconds();
late final size = Get.mediaQuery.size; } else {
if ((mode == FullScreenMode.vertical || await landscape();
(mode == FullScreenMode.auto && isVertical) || }
(mode == FullScreenMode.ratio &&
(isVertical || size.height / size.width < kScreenRatio)))) {
await verticalScreenForTwoSeconds();
} else { } else {
await landscape(); await enterDesktopFullscreen(inAppFullScreen: inAppFullScreen);
} }
} else { } else {
await enterDesktopFullscreen(inAppFullScreen: inAppFullScreen); if (Utils.isMobile) {
} showStatusBar();
} else { if (mode == FullScreenMode.none) {
if (Utils.isMobile) { return;
showStatusBar(); }
if (mode == FullScreenMode.none) { if (!horizontalScreen) {
fsProcessing = false; await verticalScreenForTwoSeconds();
return; } else {
} await autoScreen();
if (!horizontalScreen) { }
await verticalScreenForTwoSeconds();
} else { } else {
await autoScreen(); await exitDesktopFullscreen();
} }
} else {
await exitDesktopFullscreen();
} }
} finally {
toggleFullScreen(status);
fsProcessing = false;
} }
fsProcessing = false;
} }
void addPositionListener(Function(Duration position) listener) => void addPositionListener(Function(Duration position) listener) =>
@@ -1753,6 +1717,8 @@ class PlPlayerController {
return; return;
} }
_playerCount = 0; _playerCount = 0;
_stopListenerForVideoFit();
_stopListenerForEnterFullScreen();
disableAutoEnterPip(); disableAutoEnterPip();
setPlayCallBack(null); setPlayCallBack(null);
dmState.clear(); dmState.clear();
@@ -1762,7 +1728,7 @@ class PlPlayerController {
_timerForSeek?.cancel(); _timerForSeek?.cancel();
_timerForShowingVolume?.cancel(); _timerForShowingVolume?.cancel();
// _position.close(); // _position.close();
_playerEventSubs?.cancel(); // _playerEventSubs?.cancel();
// _sliderPosition.close(); // _sliderPosition.close();
// _sliderTempPosition.close(); // _sliderTempPosition.close();
// _isSliderMoving.close(); // _isSliderMoving.close();
@@ -1794,11 +1760,11 @@ class PlPlayerController {
} }
void setContinuePlayInBackground() { void setContinuePlayInBackground() {
_continuePlayInBackground.value = !_continuePlayInBackground.value; continuePlayInBackground.value = !continuePlayInBackground.value;
if (!tempPlayerConf) { if (!tempPlayerConf) {
setting.put( setting.put(
SettingBoxKey.continuePlayInBackground, SettingBoxKey.continuePlayInBackground,
_continuePlayInBackground.value, continuePlayInBackground.value,
); );
} }
} }
@@ -1814,7 +1780,7 @@ class PlPlayerController {
LoadingState<VideoShotData>? videoShot; LoadingState<VideoShotData>? videoShot;
late final RxBool showPreview = false.obs; late final RxBool showPreview = false.obs;
late final showSeekPreview = Pref.showSeekPreview; late final showSeekPreview = Pref.showSeekPreview;
late final Rx<int?> previewIndex = Rx<int?>(null); late final previewIndex = RxnInt();
void updatePreviewIndex(int seconds) { void updatePreviewIndex(int seconds) {
if (videoShot == null) { if (videoShot == null) {

4
lib/plugin/pl_player/utils/fullscreen.dart
View File

@@ -59,8 +59,8 @@ Future<void> autoScreen() async {
} }
} }
Future<void> fullAutoModeForceSensor() async { Future<void> fullAutoModeForceSensor() {
await AutoOrientation.fullAutoMode(forceSensor: true); return AutoOrientation.fullAutoMode(forceSensor: true);
} }
bool _showStatusBar = true; bool _showStatusBar = true;