From a921b983f54114ab15dfc55541829c24d033733c Mon Sep 17 00:00:00 2001
From: bggRGjQaUbCoE <githubaccount56556@proton.me>
Date: Tue, 25 Feb 2025 18:03:26 +0800
Subject: [PATCH] opt: cancel seek

Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>
---
 lib/plugin/pl_player/controller.dart | 27 +++-----------
 lib/plugin/pl_player/view.dart       | 53 ++++++++++++++++++++++++----
 2 files changed, 51 insertions(+), 29 deletions(-)

diff --git a/lib/plugin/pl_player/controller.dart b/lib/plugin/pl_player/controller.dart
index 6157ad00..74c5a6a6 100644
--- a/lib/plugin/pl_player/controller.dart
+++ b/lib/plugin/pl_player/controller.dart
@@ -1152,27 +1152,8 @@ class PlPlayerController {
     _isSliderMoving.value = true;
   }
 
-  double? slideDy;
+  bool? cancelSeek;
   bool? hasToast;
-  void updateSlideDy(double dy) {
-    slideDy ??= 0;
-    slideDy = slideDy! + dy;
-    if (slideDy!.abs() >= 100) {
-      if (hasToast != true) {
-        hasToast = true;
-        SmartDialog.showToast(
-          '取消${sliderPosition.value > position.value ? '快进' : '快退'}',
-        );
-      }
-    } else {
-      if (hasToast == true) {
-        hasToast = null;
-        SmartDialog.showToast(
-          sliderPosition.value > position.value ? '快进' : '快退',
-        );
-      }
-    }
-  }
 
   void onUpdatedSliderProgress(Duration value) {
     _sliderTempPosition.value = value;
@@ -1180,11 +1161,11 @@ class PlPlayerController {
     updateSliderPositionSecond();
   }
 
-  void onChangedSliderEnd([bool? isCancel]) {
-    if (isCancel != true) {
+  void onChangedSliderEnd() {
+    if (cancelSeek != true) {
       feedBack();
     }
-    slideDy = null;
+    cancelSeek = null;
     hasToast = null;
     _isSliderMoving.value = false;
     _hideTaskControls();
diff --git a/lib/plugin/pl_player/view.dart b/lib/plugin/pl_player/view.dart
index 09d0dea2..6b7a3e93 100644
--- a/lib/plugin/pl_player/view.dart
+++ b/lib/plugin/pl_player/view.dart
@@ -771,10 +771,53 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                         curSliderPosition + (delta.dx * scale).round());
                 final Duration result =
                     pos.clamp(Duration.zero, plPlayerController.duration.value);
-                plPlayerController.updateSlideDy(delta.dy);
+                final height = renderBox.size.height * 0.125;
+                if ((details.localFocalPoint.dx >=
+                            renderBox.size.width * 0.875 &&
+                        details.localFocalPoint.dy <= height) ||
+                    (details.localFocalPoint.dx <=
+                            renderBox.size.width * 0.125 &&
+                        details.localFocalPoint.dy <= height)) {
+                  plPlayerController.cancelSeek = true;
+                  plPlayerController.showPreview.value = false;
+                  if (plPlayerController.hasToast != true) {
+                    plPlayerController.hasToast = true;
+                    SmartDialog.showAttach(
+                      targetContext: context,
+                      alignment: Alignment.center,
+                      animationTime: const Duration(milliseconds: 200),
+                      animationType: SmartAnimationType.fade,
+                      displayTime: const Duration(milliseconds: 1500),
+                      maskColor: Colors.transparent,
+                      builder: (context) => Container(
+                        padding: const EdgeInsets.symmetric(
+                            horizontal: 8, vertical: 4),
+                        decoration: BoxDecoration(
+                          borderRadius: BorderRadius.circular(6),
+                          color:
+                              Theme.of(context).colorScheme.secondaryContainer,
+                        ),
+                        child: Text(
+                          '松开手指，取消进退',
+                          style: TextStyle(
+                            color: Theme.of(context)
+                                .colorScheme
+                                .onSecondaryContainer,
+                          ),
+                        ),
+                      ),
+                    );
+                  }
+                } else {
+                  if (plPlayerController.cancelSeek == true) {
+                    plPlayerController.cancelSeek = null;
+                    plPlayerController.hasToast = null;
+                  }
+                }
                 plPlayerController.onUpdatedSliderProgress(result);
                 plPlayerController.onChangedSliderStart();
-                if (plPlayerController.showSeekPreview) {
+                if (plPlayerController.showSeekPreview &&
+                    plPlayerController.cancelSeek != true) {
                   try {
                     plPlayerController.previewDx.value = result.inMilliseconds /
                         plPlayerController
@@ -835,10 +878,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                 plPlayerController.showPreview.value = false;
               }
               if (plPlayerController.isSliderMoving.value) {
-                bool isCancel = plPlayerController.slideDy != null &&
-                    plPlayerController.slideDy!.abs() >= 100;
-                plPlayerController.onChangedSliderEnd(isCancel);
-                if (isCancel) {
+                if (plPlayerController.cancelSeek == true) {
                   plPlayerController.onUpdatedSliderProgress(
                     plPlayerController.position.value,
                   );
@@ -848,6 +888,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                     type: 'slider',
                   );
                 }
+                plPlayerController.onChangedSliderEnd();
               }
               interacting = false;
               _initialFocalPoint = Offset.zero;