From 930ed385d1223301942522b6067b399ea710f803 Mon Sep 17 00:00:00 2001
From: orz12 <ms_lyq@hotmail.com>
Date: Sat, 20 Jul 2024 15:21:08 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"feat:=20=E6=96=B0=E5=A2=9E=E6=9C=AA?=
 =?UTF-8?q?=E6=92=AD=E6=94=BE=E7=9A=84=E5=88=9D=E5=A7=8B=E6=80=81=EF=BC=9B?=
 =?UTF-8?q?=E9=BB=91=E5=B1=8F=E5=90=8E=E4=BB=8D=E5=8F=AF=E9=9A=8F=E6=92=AD?=
 =?UTF-8?q?=E6=94=BE=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA=E5=87=BA=E6=92=AD?=
 =?UTF-8?q?=E6=94=BE=E5=99=A8"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7b5e695a7beb1cf57af89f5ee2fff2bbac05154d.
---
 lib/pages/video/detail/view.dart             | 11 +++++------
 lib/plugin/pl_player/models/play_status.dart |  8 ++------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/lib/pages/video/detail/view.dart b/lib/pages/video/detail/view.dart
index edaafd5c..c250778d 100644
--- a/lib/pages/video/detail/view.dart
+++ b/lib/pages/video/detail/view.dart
@@ -46,7 +46,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
   late BangumiIntroController bangumiIntroController;
   late String heroTag;
 
-  Rx<PlayerStatus> playerStatus = PlayerStatus.none.obs;
+  PlayerStatus playerStatus = PlayerStatus.playing;
   double doubleOffset = 0;
 
   final Box<dynamic> localCache = GStorage.localCache;
@@ -157,7 +157,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
 
   // 播放器状态监听
   void playerListener(PlayerStatus? status) async {
-    playerStatus.value = status!;
+    playerStatus = status!;
     if (status == PlayerStatus.completed) {
       shutdownTimerService.handleWaitingFinished();
       bool notExitFlag = false;
@@ -387,13 +387,12 @@ class _VideoDetailPageState extends State<VideoDetailPage>
     Widget plPlayer = FutureBuilder(
         future: _futureBuilderFuture,
         builder: (BuildContext context, AsyncSnapshot snapshot) {
-          if (snapshot.connectionState == ConnectionState.done) {
+          if (snapshot.hasData && snapshot.data['status']) {
             return Obx(
               () => !videoDetailController.autoPlay.value ||
                       plPlayerController == null ||
-                      plPlayerController!.videoController == null ||
-                      playerStatus.value == PlayerStatus.none
-                  ? Text(playerStatus.value.toString())
+                      plPlayerController!.videoController == null
+                  ? nil
                   : PLVideoPlayer(
                       controller: plPlayerController!,
                       videoIntroController:
diff --git a/lib/plugin/pl_player/models/play_status.dart b/lib/plugin/pl_player/models/play_status.dart
index 47c5e69b..2af09a61 100644
--- a/lib/plugin/pl_player/models/play_status.dart
+++ b/lib/plugin/pl_player/models/play_status.dart
@@ -1,13 +1,9 @@
 import 'package:get/get.dart';
 
-enum PlayerStatus { completed, playing, paused, none }
+enum PlayerStatus { completed, playing, paused }
 
 class PlPlayerStatus {
-  Rx<PlayerStatus> status = Rx(PlayerStatus.none);
-
-  bool get none {
-    return status.value == PlayerStatus.none;
-  }
+  Rx<PlayerStatus> status = Rx(PlayerStatus.paused);
 
   bool get playing {
     return status.value == PlayerStatus.playing;