HCha/PiliPlus
1
0
Fork 0
mirror of https://github.com/HChaZZY/PiliPlus.git synced 2025-12-06 09:13:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

opt: tap (#1719)

Browse Source 
* opt: tap

* revert: remove suspendedDm
This commit is contained in:
My-Responsitories
2025-10-27 21:32:39 +08:00
committed by GitHub
parent c3d3fa67f7
commit 2f6f6da6c0
2 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/common/widgets/gesture/immediate_tap_gesture_recognizer.dart
View File

@@ -8,7 +8,7 @@ class ImmediateTapGestureRecognizer extends OneSequenceGestureRecognizer {
super.allowedButtonsFilter, super.allowedButtonsFilter,
this.onTapDown, this.onTapDown,
required this.onTapUp, required this.onTapUp,
required this.onTapCancel, this.onTapCancel,
this.onTap, this.onTap,
}); });
@@ -16,7 +16,7 @@ class ImmediateTapGestureRecognizer extends OneSequenceGestureRecognizer {
final GestureTapUpCallback onTapUp; final GestureTapUpCallback onTapUp;
final GestureTapCancelCallback onTapCancel; final GestureTapCancelCallback? onTapCancel;
final GestureTapCallback? onTap; final GestureTapCallback? onTap;
@@ -100,8 +100,8 @@ class ImmediateTapGestureRecognizer extends OneSequenceGestureRecognizer {
} }
void _cancelGesture(String reason) { void _cancelGesture(String reason) {
if (_sentTapDown) { if (_sentTapDown && onTapCancel != null) {
invokeCallback<void>('onTapCancel: $reason', onTapCancel); invokeCallback<void>('onTapCancel: $reason', onTapCancel!);
} }
_reset(); _reset();
} }

20
lib/plugin/pl_player/view.dart
View File

@@ -152,13 +152,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
WakelockPlus.enable(); WakelockPlus.enable();
} }
wakeLock = player?.stream.playing.listen( wakeLock = player?.stream.playing.listen(
(value) { (v) => WakelockPlus.toggle(enable: v),
if (value) {
WakelockPlus.enable();
} else {
WakelockPlus.disable();
}
},
); );
_controlsListener = plPlayerController.showControls.listen((bool val) { _controlsListener = plPlayerController.showControls.listen((bool val) {
@@ -234,11 +228,13 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
_danmakuListener = plPlayerController.enableShowDanmaku.listen((value) { _danmakuListener = plPlayerController.enableShowDanmaku.listen((value) {
if (!value) _removeDmAction(); if (!value) _removeDmAction();
(_tapGestureRecognizer as ImmediateTapGestureRecognizer).onTapDown = _tapGestureRecognizer.onTapDown = value ? _onTapDown : null;
value ? _onTapDown : null;
}); });
} else { } else {
_tapGestureRecognizer = TapGestureRecognizer()..onTapUp = _onTapUp; _tapGestureRecognizer = ImmediateTapGestureRecognizer(
onTapUp: _onTapUp,
allowedButtonsFilter: (buttons) => buttons == kPrimaryButton,
);
} }
_doubleTapGestureRecognizer = DoubleTapGestureRecognizer() _doubleTapGestureRecognizer = DoubleTapGestureRecognizer()
@@ -1160,12 +1156,10 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
final item = ctr.findSingleDanmaku(pos); final item = ctr.findSingleDanmaku(pos);
if (item == null) { if (item == null) {
_suspendedDm?.suspend = false; _suspendedDm?.suspend = false;
_suspendedDm = null;
_dmOffset.value = null; _dmOffset.value = null;
} else if (item != _suspendedDm) { } else if (item != _suspendedDm) {
_suspendedDm?.suspend = false; _suspendedDm?.suspend = false;
if (item.content.extra == null) { if (item.content.extra == null) {
_suspendedDm = null;
_dmOffset.value = null; _dmOffset.value = null;
return; return;
} }
@@ -1197,7 +1191,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
..onLongPressEnd = ((_) => plPlayerController.setLongPressStatus(false)) ..onLongPressEnd = ((_) => plPlayerController.setLongPressStatus(false))
..onLongPressCancel = (() => ..onLongPressCancel = (() =>
plPlayerController.setLongPressStatus(false)); plPlayerController.setLongPressStatus(false));
late final OneSequenceGestureRecognizer _tapGestureRecognizer; late final ImmediateTapGestureRecognizer _tapGestureRecognizer;
late final DoubleTapGestureRecognizer _doubleTapGestureRecognizer; late final DoubleTapGestureRecognizer _doubleTapGestureRecognizer;
StreamSubscription<bool>? _danmakuListener; StreamSubscription<bool>? _danmakuListener;