From 7db9d290f5efcae7d3911120f82516b01d1bee55 Mon Sep 17 00:00:00 2001
From: guozhigq <guozhigq@outlook.com>
Date: Sun, 17 Sep 2023 22:41:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9C=AA=E5=BC=80=E5=90=AF=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E6=92=AD=E6=94=BE=E6=97=B6=E5=8E=86=E5=8F=B2=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=9500:00?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/pages/video/detail/view.dart     | 10 ++++++----
 lib/plugin/pl_player/controller.dart |  4 +++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/pages/video/detail/view.dart b/lib/pages/video/detail/view.dart
index 37c023ca..048876d6 100644
--- a/lib/pages/video/detail/view.dart
+++ b/lib/pages/video/detail/view.dart
@@ -143,10 +143,12 @@ class _VideoDetailPageState extends State<VideoDetailPage>
     if (setting.get(SettingBoxKey.enableAutoBrightness, defaultValue: false)) {
       videoDetailController.brightness = plPlayerController!.brightness.value;
     }
-    videoDetailController.defaultST = plPlayerController!.position.value;
-    videoIntroController.isPaused = true;
-    plPlayerController!.removeStatusLister(playerListener);
-    plPlayerController!.pause();
+    if (plPlayerController != null) {
+      videoDetailController.defaultST = plPlayerController!.position.value;
+      videoIntroController.isPaused = true;
+      plPlayerController!.removeStatusLister(playerListener);
+      plPlayerController!.pause();
+    }
     super.didPushNext();
   }
 
diff --git a/lib/plugin/pl_player/controller.dart b/lib/plugin/pl_player/controller.dart
index f47d3963..9121c963 100644
--- a/lib/plugin/pl_player/controller.dart
+++ b/lib/plugin/pl_player/controller.dart
@@ -449,7 +449,9 @@ class PlPlayerController {
           for (var element in _statusListeners) {
             element(event ? PlayerStatus.playing : PlayerStatus.paused);
           }
-          makeHeartBeat(_position.value.inSeconds, type: 'status');
+          if (videoPlayerController!.state.position.inSeconds != 0) {
+            makeHeartBeat(_position.value.inSeconds, type: 'status');
+          }
         }),
         videoPlayerController!.stream.completed.listen((event) {
           if (event) {