use stop instead seek, try to show more error, remove clear

orz12 · Jul 26, 2024 · da139be · da139be
1 parent df84e4a
commit da139be
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 15 deletions.
diff --git a/lib/plugin/pl_player/controller.dart b/lib/plugin/pl_player/controller.dart
@@ -892,17 +892,18 @@ class PlPlayerController {
     controls = !hideControls;
     // // repeat为true，将从头播放
 
-    playerStatus.status.value = PlayerStatus.playing;
-    await _videoPlayerController?.play();
     if (repeat) {
-      SmartDialog.showToast("repeating");
-      await seekTo(Duration.zero);
-      SmartDialog.showToast("repeated");
+      SmartDialog.showToast("stoping");
+      // await seekTo(Duration.zero);
+      await _videoPlayerController?.stop();
+      SmartDialog.showToast("stopped");
     }
+    playerStatus.status.value = PlayerStatus.playing;
+    await _videoPlayerController?.play();
     // if (!playerStatus.playing) await _videoPlayerController?.playOrPause();
 
-    // getCurrentVolume();
-    // getCurrentBrightness();
+    getCurrentVolume();
+    getCurrentBrightness();
 
     // screenManager.setOverlays(false);
   }
@@ -967,8 +968,14 @@ class PlPlayerController {
   Future<void> getCurrentVolume() async {
     // mac try...catch
     try {
-      _currentVolume.value = (await FlutterVolumeController.getVolume())!;
-    } catch (_) {}
+      _currentVolume.value = (await FlutterVolumeController.getVolume()
+          .onError((error, stackTrace) {
+        SmartDialog.showToast("get volume error11 $error $stackTrace");
+        return 0;
+      }))!;
+    } catch (e) {
+      SmartDialog.showToast("get volume error $e");
+    }
   }
 
   Future<void> setVolume(double volumeNew,
@@ -1002,9 +1009,13 @@ class PlPlayerController {
   /// 亮度
   Future<void> getCurrentBrightness() async {
     try {
-      _currentBrightness.value = await ScreenBrightness().current;
+      _currentBrightness.value =
+          await ScreenBrightness().current.onError((error, stackTrace) {
+        SmartDialog.showToast("get volume error11 $error $stackTrace");
+        return 0;
+      });
     } catch (e) {
-      throw 'Failed to get current brightness';
+      SmartDialog.showToast("get brightness error $e");
       //return 0;
     }
   }
@@ -1015,15 +1026,15 @@ class PlPlayerController {
       ScreenBrightness().setScreenBrightness(brightness);
       // setVideoBrightness();
     } catch (e) {
-      throw 'Failed to set brightness';
+      SmartDialog.showToast("set brightness error $e");
     }
   }
 
   Future<void> resetBrightness() async {
     try {
       await ScreenBrightness().resetScreenBrightness();
     } catch (e) {
-      throw 'Failed to reset brightness';
+      SmartDialog.showToast("reset brightness error $e");
     }
   }
 

diff --git a/lib/services/audio_handler.dart b/lib/services/audio_handler.dart
@@ -75,7 +75,11 @@ class VideoPlayerServiceHandler extends BaseAudioHandler with SeekHandler {
     // print(newMediaItem);
     // print(newMediaItem.title);
     // debugPrint(StackTrace.current.toString());
-    if (!mediaItem.isClosed) mediaItem.add(newMediaItem);
+    try {
+      if (!mediaItem.isClosed) mediaItem.add(newMediaItem);
+    } catch (e) {
+      SmartDialog.showToast("setMediaItem error $e");
+    }
   }
 
   Future<void> setPlaybackState(PlayerStatus status, bool isBuffering) async {
@@ -188,7 +192,6 @@ class VideoPlayerServiceHandler extends BaseAudioHandler with SeekHandler {
         "${mediaItem.album}\n"
         "${mediaItem.artUri}");
     // _item.add(mediaItem);
-    clear();
     setMediaItem(mediaItem);
   }