基于自定义规则的番剧采集APP,支持流媒体在线观看,支持弹幕,支持实时超分辨率。
feat: long press shortcuts (#1545)
遥遥紫荆c36f252d0561
diff --git a/lib/pages/player/player_item.dart b/lib/pages/player/player_item.dartindex 58a3aee8..d7a31a22 100644--- a/lib/pages/player/player_item.dart+++ b/lib/pages/player/player_item.dart@@ -72,6 +72,7 @@ class _PlayerItemState extends State<PlayerItem>final CollectController collectController = Modular.get<CollectController>();final MyController myController = Modular.get<MyController>();late Map<String, List<String>> keyboardShortcuts;+ late List<String> keyboardActionsNeedLongPress;late Map<String, void Function()> keyboardActions;@@ -142,10 +143,13 @@ class _PlayerItemState extends State<PlayerItem>}void _initKeyboardActions(){+ //需要实现长按的功能列表。+ keyboardActionsNeedLongPress = ["forward"];+ //快捷键功能对应表keyboardActions = {'playorpause': () => playerController.playOrPause(),- 'forward': () async => handleShortcutSeek('forward'),- 'rewind': () async => handleShortcutSeek('rewind'),+ 'forward': () async => handleShortcutForwardDown(),+ 'rewind': () async => handleShortcutRewind(),'next': () async => handlePreNextEpisode('next'),'prev': () async => handlePreNextEpisode('prev'),'volumeup': () async => handleShortcutVolumeChange('up'),@@ -161,6 +165,10 @@ class _PlayerItemState extends State<PlayerItem>'speed3': () async => setPlaybackSpeed(3.0),'speedup': () async => handleSpeedChange('up'),'speeddown': () async => handleSpeedChange('down'),+ // 开始对应长按功能+ // 如需对应长按功能,例如对功能'func'对应长按,请分别添加'funcRepeat'和'funcUp'。+ 'forwardRepeat': () async => handleShortcutForwardRepeat(),+ 'forwardUp' : () async => handleShortcutForwardUp(),};}//初始化播放器菜单@@ -171,7 +179,8 @@ class _PlayerItemState extends State<PlayerItem>void _disposePlayerMenu(){Utils.disposePlayerMenu();}- bool handleShortcutInput(String keyLabel) {+ //快捷键按下+ bool handleShortcutDown(String keyLabel) {for (final entry in keyboardShortcuts.entries) {final func = entry.key;final keys = entry.value;@@ -185,6 +194,20 @@ class _PlayerItemState extends State<PlayerItem>}return false;}+ // 快捷键长按+ bool handleShortcutLongPress(String keyLabel, String mode) {+ for (final func in keyboardActionsNeedLongPress){+ final keys = keyboardShortcuts[func];+ if (keys?.contains(keyLabel) == true) {+ final action = keyboardActions[func + mode];+ if (action != null){+ action();+ return true;+ }+ }+ }+ return false;+ }//上一集下一集动作Future<void> handlePreNextEpisode(String direction) async{@@ -210,22 +233,14 @@ class _PlayerItemState extends State<PlayerItem>widget.changeEpisode(targetEpisode, currentRoad: currentRoad);}- //快进快退快捷键动作- Future<void> handleShortcutSeek(String direction) async {+ //快退快捷键动作+ Future<void> handleShortcutRewind() async {int skipTime = playerController.arrowKeySkipTime;int current = playerController.currentPosition.inSeconds;- int total = playerController.playerDuration.inSeconds;int targetPosition;- if (direction == 'forward') {- targetPosition = current + skipTime;- if (targetPosition > total) targetPosition = total;- } else if (direction == 'rewind') {- targetPosition = current - skipTime;- if (targetPosition < 0) targetPosition = 0;- } else {- return;- }+ targetPosition = current - skipTime;+ if (targetPosition < 0) targetPosition = 0;try {playerTimer?.cancel();@@ -235,6 +250,37 @@ class _PlayerItemState extends State<PlayerItem>KazumiLogger().e('PlayerController: seek failed', error: e);}}+ // 快进快捷键动作+ Future<void> handleShortcutForwardDown() async {+ lastPlayerSpeed = playerController.playerSpeed;+ }+ Future<void> handleShortcutForwardRepeat() async {+ if (playerController.playerSpeed < 2.0) {+ playerController.showPlaySpeed = true;+ setPlaybackSpeed(2.0);+ }+ }+ Future<void> handleShortcutForwardUp() async {+ int skipTime = playerController.arrowKeySkipTime;+ int current = playerController.currentPosition.inSeconds;+ int total = playerController.duration.inSeconds;+ int targetPosition;++ targetPosition = current + skipTime;+ if (targetPosition > total) targetPosition = total;+ if (playerController.showPlaySpeed) {+ playerController.showPlaySpeed = false;+ setPlaybackSpeed(lastPlayerSpeed);+ } else {+ try {+ playerTimer?.cancel();+ playerController.seek(Duration(seconds: targetPosition));+ playerTimer = getPlayerTimer();+ } catch (e) {+ KazumiLogger().e('PlayerController: seek failed', error: e);+ }+ }+ }//全屏快捷键动作void handleShortcutFullscreen(){@@ -1331,15 +1377,18 @@ class _PlayerItemState extends State<PlayerItem>focusNode: widget.keyboardFocus,autofocus: true,onKeyEvent: (focusNode, KeyEvent event) {+ bool handled = false;+ final keyLabel = event.logicalKey.keyLabel.isNotEmpty+ ? event.logicalKey.keyLabel+ : event.logicalKey.debugName ?? '';if (event is KeyDownEvent) {- final keyLabel = event.logicalKey.keyLabel.isNotEmpty- ? event.logicalKey.keyLabel- : event.logicalKey.debugName ?? '';- if (handleShortcutInput(keyLabel)) {- return KeyEventResult.handled;- }- }- return KeyEventResult.ignored;+ handled = handleShortcutDown(keyLabel);+ } else if (event is KeyRepeatEvent) {+ handled = handleShortcutLongPress(keyLabel,"Repeat");+ } else if (event is KeyUpEvent) {+ handled = handleShortcutLongPress(keyLabel,"Up");+ }+ return handled ? KeyEventResult.handled : KeyEventResult.ignored;},child: const PlayerItemSurface())),(playerController.isBuffering ||diff --git a/lib/utils/constants.dart b/lib/utils/constants.dartindex 2ac10338..04c14ade 100644--- a/lib/utils/constants.dart+++ b/lib/utils/constants.dart@@ -243,7 +243,7 @@ final List<String> defaultAnimeTags = const [//功能中文名对应final Map<String, String> shortcutsChineseName = {'playorpause': '播放 / 暂停',- 'forward': '快进',+ 'forward': '快进 / 长按倍速','rewind': '快退','next': '下一集','prev': '上一集',