From 29d436731658a15eaf2ee09080d8fc37e9003e15 Mon Sep 17 00:00:00 2001
From: guozhigq <guozhigq@outlook.com>
Date: Tue, 16 Apr 2024 23:38:03 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20seekTo=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/plugin/pl_player/controller.dart | 74 +++++++++++++++-------------
 1 file changed, 41 insertions(+), 33 deletions(-)

diff --git a/lib/plugin/pl_player/controller.dart b/lib/plugin/pl_player/controller.dart
index f936526b..1ede7045 100644
--- a/lib/plugin/pl_player/controller.dart
+++ b/lib/plugin/pl_player/controller.dart
@@ -473,17 +473,17 @@ class PlPlayerController {
     }
 
     // 字幕
-    if (dataSource.subFiles != '' && dataSource.subFiles != null) {
-      await pp.setProperty(
-        'sub-files',
-        UniversalPlatform.isWindows
-            ? dataSource.subFiles!.replaceAll(';', '\\;')
-            : dataSource.subFiles!.replaceAll(':', '\\:'),
-      );
-      await pp.setProperty("subs-with-matching-audio", "no");
-      await pp.setProperty("sub-forced-only", "yes");
-      await pp.setProperty("blend-subtitles", "video");
-    }
+    // if (dataSource.subFiles != '' && dataSource.subFiles != null) {
+    //   await pp.setProperty(
+    //     'sub-files',
+    //     UniversalPlatform.isWindows
+    //         ? dataSource.subFiles!.replaceAll(';', '\\;')
+    //         : dataSource.subFiles!.replaceAll(':', '\\:'),
+    //   );
+    //   await pp.setProperty("subs-with-matching-audio", "no");
+    //   await pp.setProperty("sub-forced-only", "yes");
+    //   await pp.setProperty("blend-subtitles", "video");
+    // }
 
     _videoController = _videoController ??
         VideoController(
@@ -603,7 +603,9 @@ class PlPlayerController {
           makeHeartBeat(event.inSeconds);
         }),
         videoPlayerController!.stream.duration.listen((event) {
-          duration.value = event;
+          if (event > Duration.zero) {
+            duration.value = event;
+          }
         }),
         videoPlayerController!.stream.buffer.listen((event) {
           _buffered.value = event;
@@ -646,32 +648,38 @@ class PlPlayerController {
 
   /// 跳转至指定位置
   Future<void> seekTo(Duration position, {type = 'seek'}) async {
-    if (position < Duration.zero) {
-      position = Duration.zero;
-    }
-    _position.value = position;
-    updatePositionSecond();
-    _heartDuration = position.inSeconds;
-    if (duration.value.inSeconds != 0) {
-      if (type != 'slider') {
-        /// 拖动进度条调节时，不等待第一帧，防止抖动
-        await _videoPlayerController?.stream.buffer.first;
+    try {
+      if (position < Duration.zero) {
+        position = Duration.zero;
       }
-      await _videoPlayerController?.seek(position);
-    } else {
-      _timerForSeek?.cancel();
-      _timerForSeek ??=
-          Timer.periodic(const Duration(milliseconds: 200), (Timer t) async {
-        if (duration.value.inSeconds != 0) {
-          await _videoPlayerController!.stream.buffer.first;
-          await _videoPlayerController?.seek(position);
-          t.cancel();
-          _timerForSeek = null;
+      _position.value = position;
+      updatePositionSecond();
+      _heartDuration = position.inSeconds;
+      if (duration.value.inSeconds != 0) {
+        if (type != 'slider') {
+          await _videoPlayerController?.stream.buffer.first;
         }
-      });
+        await _videoPlayerController?.seek(position);
+      } else {
+        _timerForSeek?.cancel();
+        _timerForSeek ??= _startSeekTimer(position);
+      }
+    } catch (err) {
+      print('Error while seeking: $err');
     }
   }
 
+  Timer? _startSeekTimer(Duration position) {
+    return Timer.periodic(const Duration(milliseconds: 200), (Timer t) async {
+      if (duration.value.inSeconds != 0) {
+        await _videoPlayerController!.stream.buffer.first;
+        await _videoPlayerController?.seek(position);
+        t.cancel();
+        _timerForSeek = null;
+      }
+    });
+  }
+
   /// 设置倍速
   Future<void> setPlaybackSpeed(double speed) async {
     /// TODO  _duration.value丢失