remove _item and onVideoDetailDispose

orz12 · Jul 24, 2024 · c52c7ad · c52c7ad
1 parent e0d2855
commit c52c7ad
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/lib/pages/video/detail/view.dart b/lib/pages/video/detail/view.dart
@@ -269,7 +269,6 @@ class _VideoDetailPageState extends State<VideoDetailPage>
       fullScreenStatusListener.cancel();
       plPlayerController!.dispose();
     }
-    videoPlayerServiceHandler.onVideoDetailDispose();
     VideoDetailPage.routeObserver.unsubscribe(this);
     // _lifecycleListener.dispose();
     showStatusBar();

diff --git a/lib/plugin/pl_player/controller.dart b/lib/plugin/pl_player/controller.dart
@@ -914,9 +914,9 @@ class PlPlayerController {
     playerStatus.status.value = PlayerStatus.paused;
 
     // 主动暂停时让出音频焦点
-    // if (!isInterrupt) {
-    //   audioSessionHandler.setActive(false);
-    // }
+    if (!isInterrupt) {
+      audioSessionHandler.setActive(false);
+    }
   }
 
   /// 更改播放状态
@@ -1277,6 +1277,7 @@ class PlPlayerController {
   Future<void> dispose({String type = 'single'}) async {
     // 每次减1，最后销毁
     if (type == 'single' && playerCount.value > 1) {
+      // videoPlayerServiceHandler.onVideoDetailDispose();
       _playerCount.value -= 1;
       _heartDuration = 0;
       pause();

diff --git a/lib/services/audio_handler.dart b/lib/services/audio_handler.dart
@@ -26,7 +26,7 @@ Future<VideoPlayerServiceHandler> initAudioService() async {
 }
 
 class VideoPlayerServiceHandler extends BaseAudioHandler with SeekHandler {
-  static final List<MediaItem> _item = [];
+  // static final List<MediaItem> _item = [];
   Box setting = GStorage.setting;
   bool enableBackgroundPlay = true;
   // PlPlayerController player = PlPlayerController.getInstance();
@@ -113,7 +113,7 @@ class VideoPlayerServiceHandler extends BaseAudioHandler with SeekHandler {
   onStatusChange(PlayerStatus status, bool isBuffering) {
     if (!enableBackgroundPlay) return;
 
-    if (_item.isEmpty) return;
+    // if (_item.isEmpty) return;
     setPlaybackState(status, isBuffering);
   }
 
@@ -159,7 +159,7 @@ class VideoPlayerServiceHandler extends BaseAudioHandler with SeekHandler {
     if (mediaItem == null) return;
     // print("exist: ${PlPlayerController.instanceExists()}");
     if (!PlPlayerController.instanceExists()) return;
-    _item.add(mediaItem);
+    // _item.add(mediaItem);
     setMediaItem(mediaItem);
   }
 
@@ -172,15 +172,15 @@ class VideoPlayerServiceHandler extends BaseAudioHandler with SeekHandler {
           : AudioProcessingState.idle,
       playing: false,
     ));
-    if (_item.isNotEmpty) {
-      _item.removeLast();
-    }
-    if (_item.isNotEmpty) {
-      setMediaItem(_item.last);
-      // stop();
-    } else {
-      clear();
-    }
+    // if (_item.isNotEmpty) {
+    //   _item.removeLast();
+    // }
+    // if (_item.isNotEmpty) {
+    //   setMediaItem(_item.last);
+    //   // stop();
+    // } else {
+    //   clear();
+    // }
   }
 
   clear() {
@@ -192,7 +192,7 @@ class VideoPlayerServiceHandler extends BaseAudioHandler with SeekHandler {
           : AudioProcessingState.idle,
       playing: false,
     ));
-    _item.clear();
+    // _item.clear();
     // stop();
   }