Skip to content

基于自定义规则的番剧采集APP,支持流媒体在线观看,支持弹幕,支持实时超分辨率。

feat(player): add configurable control overlay hide delay (#2230)

Otaku_Luo8a242065c191
diff --git a/lib/pages/player/player_item.dart b/lib/pages/player/player_item.dart
index 3f8d319b..29edb173 100644
--- a/lib/pages/player/player_item.dart
+++ b/lib/pages/player/player_item.dart
@@ -118,6 +118,9 @@ class _PlayerItemState extends State<PlayerItem>
late bool backgroundPlayback;
late bool brightnessVolumeGesture;
+ // 播放器控制面板无交互后自动隐藏所需时间 (单位:毫秒)
+ late int playerControllerLayerDisappearTime;
+
Timer? hideTimer;
Timer? playerTimer;
Timer? mouseScrollerTimer;
@@ -892,7 +895,8 @@ class _PlayerItemState extends State<PlayerItem>
if (!_canHidePlayerPanel) {
return;
}
- hideTimer = Timer(const Duration(seconds: 4), () {
+ hideTimer =
+ Timer(Duration(milliseconds: playerControllerLayerDisappearTime), () {
if (mounted) {
hideVideoController();
}
@@ -1688,6 +1692,8 @@ class _PlayerItemState extends State<PlayerItem>
backgroundPlayback = GStorage.getSetting(SettingsKeys.backgroundPlayback);
brightnessVolumeGesture =
GStorage.getSetting(SettingsKeys.brightnessVolumeGesture);
+ playerControllerLayerDisappearTime =
+ GStorage.getSetting(SettingsKeys.playerControllerLayerDisappearTime);
unawaited(_bindAudioService());
playerTimer = getPlayerTimer();
windowManager.addListener(this);
diff --git a/lib/pages/settings/player_settings.dart b/lib/pages/settings/player_settings.dart
index 4e54885b..6a6a2aea 100644
--- a/lib/pages/settings/player_settings.dart
+++ b/lib/pages/settings/player_settings.dart
@@ -18,6 +18,10 @@ class PlayerSettingsPage extends StatefulWidget {
}
class _PlayerSettingsPageState extends State<PlayerSettingsPage> {
+ static const double _minPlayerControllerLayerDisappearSeconds = 1;
+ static const double _maxPlayerControllerLayerDisappearSeconds = 10;
+ static const int _playerControllerLayerDisappearDivisions = 18;
+
late double defaultPlaySpeed;
late double defaultShortcutForwardPlaySpeed;
late int defaultAspectRatioType;
@@ -37,6 +41,7 @@ class _PlayerSettingsPageState extends State<PlayerSettingsPage> {
late int playerButtonSkipTime;
late int playerArrowKeySkipTime;
late int playerLogLevel;
+ late int playerControllerLayerDisappearTime;
final MenuController playerAspectRatioMenuController = MenuController();
final MenuController playerLogLevelMenuController = MenuController();
@@ -78,6 +83,9 @@ class _PlayerSettingsPageState extends State<PlayerSettingsPage> {
GStorage.getSetting<int>(SettingsKeys.buttonSkipTime);
playerArrowKeySkipTime =
GStorage.getSetting<int>(SettingsKeys.arrowKeySkipTime);
+
+ playerControllerLayerDisappearTime = GStorage.getSetting<int>(
+ SettingsKeys.playerControllerLayerDisappearTime);
}
Future<void> resetPlayerSettings() async {
@@ -211,6 +219,32 @@ class _PlayerSettingsPageState extends State<PlayerSettingsPage> {
});
}
+ double get playerControllerLayerDisappearSeconds =>
+ (playerControllerLayerDisappearTime / Duration.millisecondsPerSecond)
+ .clamp(_minPlayerControllerLayerDisappearSeconds,
+ _maxPlayerControllerLayerDisappearSeconds)
+ .toDouble();
+
+ String formatPlayerControllerLayerDisappearSeconds(double seconds) {
+ if (seconds == seconds.roundToDouble()) {
+ return '${seconds.toInt()} 秒';
+ }
+ return '${seconds.toStringAsFixed(1)} 秒';
+ }
+
+ void updatePlayerControllerLayerDisappearSeconds(double seconds) {
+ final int newDisappearTime =
+ (seconds * Duration.millisecondsPerSecond).round();
+ if (newDisappearTime == playerControllerLayerDisappearTime) {
+ return;
+ }
+ GStorage.putSetting<int>(
+ SettingsKeys.playerControllerLayerDisappearTime, newDisappearTime);
+ setState(() {
+ playerControllerLayerDisappearTime = newDisappearTime;
+ });
+ }
+
@override
Widget build(BuildContext context) {
final fontFamily = Theme.of(context).textTheme.bodyMedium?.fontFamily;
@@ -537,6 +571,20 @@ class _PlayerSettingsPageState extends State<PlayerSettingsPage> {
value: Text('$playerButtonSkipTime 秒',
style: TextStyle(fontFamily: fontFamily)),
),
+ SettingsTile(
+ title: Text(
+ '播放控制器消失时间:${formatPlayerControllerLayerDisappearSeconds(playerControllerLayerDisappearSeconds)}',
+ style: TextStyle(fontFamily: fontFamily)),
+ description: Slider(
+ value: playerControllerLayerDisappearSeconds,
+ min: _minPlayerControllerLayerDisappearSeconds,
+ max: _maxPlayerControllerLayerDisappearSeconds,
+ divisions: _playerControllerLayerDisappearDivisions,
+ label: formatPlayerControllerLayerDisappearSeconds(
+ playerControllerLayerDisappearSeconds),
+ onChanged: updatePlayerControllerLayerDisappearSeconds,
+ ),
+ ),
SettingsTile.navigation(
onPressed: (_) async {
if (playerAspectRatioMenuController.isOpen) {
diff --git a/lib/services/storage/settings_keys.dart b/lib/services/storage/settings_keys.dart
index 45bae6f3..526b8d21 100644
--- a/lib/services/storage/settings_keys.dart
+++ b/lib/services/storage/settings_keys.dart
@@ -476,6 +476,11 @@ class SettingsKeys {
false,
group: SettingGroup.sync,
);
+ static const playerControllerLayerDisappearTime = SettingKey<int>(
+ 'playerControllerLayerDisappearTime',
+ 4000,
+ group: SettingGroup.player,
+ );
static final List<SettingKey<Object?>> all = [
hAenable,
@@ -565,6 +570,7 @@ class SettingsKeys {
historySyncDeviceId,
historySyncSequence,
historySyncSnapshotInitialized,
+ playerControllerLayerDisappearTime,
];
static List<SettingKey<Object?>> byGroup(SettingGroup group) {