win (#1240)

Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>

lib/plugin/pl_player/controller.dart

@@ -51,7 +51,6 @@ import 'package:media_kit/media_kit.dart';
 import 'package:media_kit_video/media_kit_video.dart';
 import 'package:path/path.dart' as path;
 import 'package:path_provider/path_provider.dart';
-import 'package:screen_brightness/screen_brightness.dart';
 import 'package:universal_platform/universal_platform.dart';
 
 class PlPlayerController {
@@ -465,11 +464,8 @@ class PlPlayerController {
     return _instance?.volume.value;
   }
 
-  static Future<void> setVolumeIfExists(
-    double volumeNew, {
-    bool videoPlayerVolume = false,
-  }) async {
-    await _instance?.setVolume(volumeNew, videoPlayerVolume: videoPlayerVolume);
+  static Future<void> setVolumeIfExists(double volumeNew) async {
+    await _instance?.setVolume(volumeNew);
   }
 
   Box video = GStorage.video;
@@ -897,7 +893,7 @@ class PlPlayerController {
         } else {
           playerStatus.status.value = PlayerStatus.paused;
         }
-        videoPlayerServiceHandler.onStatusChange(
+        videoPlayerServiceHandler?.onStatusChange(
           playerStatus.status.value,
           isBuffering.value,
           isLive,
@@ -947,7 +943,7 @@ class PlPlayerController {
       }),
       videoPlayerController!.stream.buffering.listen((bool event) {
         isBuffering.value = event;
-        videoPlayerServiceHandler.onStatusChange(
+        videoPlayerServiceHandler?.onStatusChange(
           playerStatus.status.value,
           event,
           isLive,
@@ -1012,20 +1008,22 @@ class PlPlayerController {
       //   }
       // }),
       // 媒体通知监听
-      onPlayerStatusChanged.listen((PlayerStatus event) {
-        videoPlayerServiceHandler.onStatusChange(
-          event,
-          isBuffering.value,
-          isLive,
-        );
-      }),
-      onPositionChanged.listen((Duration event) {
-        EasyThrottle.throttle(
-          'mediaServicePosition',
-          const Duration(seconds: 1),
-          () => videoPlayerServiceHandler.onPositionChange(event),
-        );
-      }),
+      if (videoPlayerServiceHandler != null) ...[
+        onPlayerStatusChanged.listen((PlayerStatus event) {
+          videoPlayerServiceHandler!.onStatusChange(
+            event,
+            isBuffering.value,
+            isLive,
+          );
+        }),
+        onPositionChanged.listen((Duration event) {
+          EasyThrottle.throttle(
+            'mediaServicePosition',
+            const Duration(seconds: 1),
+            () => videoPlayerServiceHandler!.onPositionChange(event),
+          );
+        }),
+      ],
     };
   }
 
@@ -1138,7 +1136,7 @@ class PlPlayerController {
     playerStatus.status.value = PlayerStatus.playing;
     // screenManager.setOverlays(false);
 
-    audioSessionHandler.setActive(true);
+    audioSessionHandler?.setActive(true);
   }
 
   /// 暂停播放
@@ -1148,7 +1146,7 @@ class PlPlayerController {
 
     // 主动暂停时让出音频焦点
     if (!isInterrupt) {
-      audioSessionHandler.setActive(false);
+      audioSessionHandler?.setActive(false);
     }
   }
 
@@ -1208,31 +1206,15 @@ class PlPlayerController {
     hideTaskControls();
   }
 
-  /// 音量
-  Future<void> getCurrentVolume() async {
-    // mac try...catch
+  Future<void> setVolume(double volume) async {
+    this.volume.value = volume;
     try {
-      _currentVolume.value = (await FlutterVolumeController.getVolume())!;
-    } catch (_) {}
-  }
-
-  Future<void> setVolume(
-    double volumeNew, {
-    bool videoPlayerVolume = false,
-  }) async {
-    if (volumeNew < 0.0) {
-      volumeNew = 0.0;
-    } else if (volumeNew > 1.0) {
-      volumeNew = 1.0;
-    }
-    if (volume.value == volumeNew) {
-      return;
-    }
-    volume.value = volumeNew;
-
-    try {
-      FlutterVolumeController.updateShowSystemUI(false);
-      await FlutterVolumeController.setVolume(volumeNew);
+      if (Utils.isDesktop) {
+        _videoPlayerController!.setVolume(volume * 100);
+      } else {
+        FlutterVolumeController.updateShowSystemUI(false);
+        await FlutterVolumeController.setVolume(volume);
+      }
     } catch (err) {
       if (kDebugMode) debugPrint(err.toString());
     }
@@ -1246,30 +1228,10 @@ class PlPlayerController {
     });
   }
 
-  /// 亮度
-  Future<void> getCurrentBrightness() async {
-    try {
-      _currentBrightness.value = await ScreenBrightness.instance.application;
-    } catch (e) {
-      throw 'Failed to get current brightness';
-      //return 0;
-    }
-  }
-
   void setCurrBrightness(double brightness) {
     _currentBrightness.value = brightness;
   }
 
-  Future<void> setBrightness(double brightness) async {
-    try {
-      this.brightness.value = brightness;
-      ScreenBrightness.instance.setApplicationScreenBrightness(brightness);
-      // setVideoBrightness();
-    } catch (e) {
-      throw 'Failed to set brightness';
-    }
-  }
-
   /// Toggle Change the videofit accordingly
   void toggleVideoFit(VideoFitType value) {
     _videoFit.value = value;
@@ -1303,7 +1265,7 @@ class PlPlayerController {
 
   /// 设置后台播放
   Future<void> setBackgroundPlay(bool val) async {
-    videoPlayerServiceHandler.enableBackgroundPlay = val;
+    videoPlayerServiceHandler?.enableBackgroundPlay = val;
     if (!tempPlayerConf) {
       setting.put(SettingBoxKey.enableBackgroundPlay, val);
     }
@@ -1387,10 +1349,11 @@ class PlPlayerController {
         return;
       }
       late final size = Get.size;
-      if (mode == FullScreenMode.vertical ||
-          (mode == FullScreenMode.auto && isVertical) ||
-          (mode == FullScreenMode.ratio &&
-              (isVertical || size.height / size.width < 1.25))) {
+      if (Utils.isMobile &&
+          (mode == FullScreenMode.vertical ||
+              (mode == FullScreenMode.auto && isVertical) ||
+              (mode == FullScreenMode.ratio &&
+                  (isVertical || size.height / size.width < 1.25)))) {
         await verticalScreenForTwoSeconds();
       } else {
         await landScape();
@@ -1561,7 +1524,7 @@ class PlPlayerController {
         _videoPlayerController = null;
       }
       _instance = null;
-      videoPlayerServiceHandler.clear();
+      videoPlayerServiceHandler?.clear();
     } catch (err) {
       if (kDebugMode) debugPrint(err.toString());
     }

lib/plugin/pl_player/utils/fullscreen.dart

@@ -13,9 +13,9 @@ Future<void> landScape() async {
   try {
     if (kIsWeb) {
       await document.documentElement?.requestFullscreen();
-    } else if (Platform.isAndroid || Platform.isIOS) {
+    } else if (Utils.isMobile) {
       await AutoOrientation.landscapeAutoMode(forceSensor: true);
-    } else if (Platform.isMacOS || Platform.isWindows || Platform.isLinux) {
+    } else if (Utils.isDesktop) {
       await const MethodChannel(
         'com.alexmercerind/media_kit_video',
       ).invokeMethod(
@@ -86,7 +86,7 @@ Future<void> showStatusBar() async {
   try {
     if (kIsWeb) {
       document.exitFullscreen();
-    } else if (Platform.isAndroid || Platform.isIOS) {
+    } else if (Utils.isMobile) {
       if (Platform.isAndroid && (await Utils.sdkInt < 29)) {
         mode = SystemUiMode.manual;
       }
@@ -94,7 +94,7 @@ Future<void> showStatusBar() async {
         mode,
         overlays: SystemUiOverlay.values,
       );
-    } else if (Platform.isMacOS || Platform.isWindows || Platform.isLinux) {
+    } else if (Utils.isDesktop) {
       await const MethodChannel(
         'com.alexmercerind/media_kit_video',
       ).invokeMethod(

lib/plugin/pl_player/view.dart

@@ -40,9 +40,9 @@ import 'package:PiliPlus/plugin/pl_player/widgets/common_btn.dart';
 import 'package:PiliPlus/plugin/pl_player/widgets/forward_seek.dart';
 import 'package:PiliPlus/plugin/pl_player/widgets/mpv_convert_webp.dart';
 import 'package:PiliPlus/plugin/pl_player/widgets/play_pause_btn.dart';
-import 'package:PiliPlus/utils/duration_util.dart';
-import 'package:PiliPlus/utils/extension.dart';
+import 'package:PiliPlus/utils/duration_utils.dart';
 import 'package:PiliPlus/utils/id_utils.dart';
+import 'package:PiliPlus/utils/image_utils.dart';
 import 'package:PiliPlus/utils/storage.dart';
 import 'package:PiliPlus/utils/storage_key.dart';
 import 'package:PiliPlus/utils/utils.dart';
@@ -61,8 +61,7 @@ import 'package:get/get.dart' hide ContextExtensionss;
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 import 'package:media_kit/media_kit.dart';
 import 'package:media_kit_video/media_kit_video.dart';
-import 'package:saver_gallery/saver_gallery.dart';
-import 'package:screen_brightness/screen_brightness.dart';
+import 'package:screen_brightness_platform_interface/screen_brightness_platform_interface.dart';
 
 class PLVideoPlayer extends StatefulWidget {
   const PLVideoPlayer({
@@ -123,7 +122,6 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
   final RxBool _brightnessIndicator = false.obs;
   Timer? _brightnessTimer;
 
-  final RxDouble _volumeValue = 0.0.obs;
   final RxBool _volumeIndicator = false.obs;
   Timer? _volumeTimer;
 
@@ -207,49 +205,52 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
       duration: const Duration(milliseconds: 100),
     );
     videoController = plPlayerController.videoController!;
-    Future.microtask(() async {
-      try {
-        FlutterVolumeController.updateShowSystemUI(true);
-        _volumeValue.value = (await FlutterVolumeController.getVolume())!;
-        FlutterVolumeController.addListener((double value) {
-          if (mounted && !_volumeInterceptEventStream.value) {
-            _volumeValue.value = value;
-            if (Platform.isIOS && !FlutterVolumeController.showSystemUI) {
-              _volumeIndicator.value = true;
-              _volumeTimer?.cancel();
-              _volumeTimer = Timer(const Duration(milliseconds: 800), () {
+
+    if (Utils.isMobile) {
+      Future.microtask(() async {
+        try {
+          FlutterVolumeController.updateShowSystemUI(true);
+          plPlayerController.volume.value =
+              (await FlutterVolumeController.getVolume())!;
+          FlutterVolumeController.addListener((double value) {
+            if (mounted && !_volumeInterceptEventStream.value) {
+              plPlayerController.volume.value = value;
+              if (Platform.isIOS && !FlutterVolumeController.showSystemUI) {
+                _volumeIndicator.value = true;
+                _volumeTimer?.cancel();
+                _volumeTimer = Timer(const Duration(milliseconds: 800), () {
+                  if (mounted) {
+                    _volumeIndicator.value = false;
+                  }
+                });
+              }
+            }
+          });
+        } catch (_) {}
+      });
+
+      Future.microtask(() async {
+        try {
+          _brightnessValue.value =
+              await ScreenBrightnessPlatform.instance.application;
+          _listener = ScreenBrightnessPlatform
+              .instance
+              .onApplicationScreenBrightnessChanged
+              .listen((double value) {
                 if (mounted) {
-                  _volumeIndicator.value = false;
+                  _brightnessValue.value = value;
                 }
               });
-            }
-          }
-        });
-      } catch (_) {}
-    });
-
-    Future.microtask(() async {
-      try {
-        _brightnessValue.value = await ScreenBrightness.instance.application;
-        _listener = ScreenBrightness
-            .instance
-            .onApplicationScreenBrightnessChanged
-            .listen((double value) {
-              if (mounted) {
-                _brightnessValue.value = value;
-              }
-            });
-      } catch (_) {}
-    });
+        } catch (_) {}
+      });
+    }
   }
 
   Future<void> setVolume(double value) async {
-    try {
-      FlutterVolumeController.updateShowSystemUI(false);
-      await FlutterVolumeController.setVolume(value);
-    } catch (_) {}
-
-    _volumeValue.value = value;
+    if (plPlayerController.volume.value == value) {
+      return;
+    }
+    plPlayerController.setVolume(value);
     _volumeIndicator.value = true;
     _volumeInterceptEventStream.value = true;
     _volumeTimer?.cancel();
@@ -263,7 +264,9 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
 
   Future<void> setBrightness(double value) async {
     try {
-      await ScreenBrightness.instance.setApplicationScreenBrightness(value);
+      await ScreenBrightnessPlatform.instance.setApplicationScreenBrightness(
+        value,
+      );
     } catch (_) {}
     _brightnessIndicator.value = true;
     _brightnessTimer?.cancel();
@@ -281,7 +284,9 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
     _listener?.cancel();
     _controlsListener?.cancel();
     animationController.dispose();
-    FlutterVolumeController.removeListener();
+    if (Utils.isMobile) {
+      FlutterVolumeController.removeListener();
+    }
     transformationController.dispose();
     super.dispose();
   }
@@ -347,7 +352,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
           // 播放时间
           Obx(
             () => Text(
-              DurationUtil.formatDuration(
+              DurationUtils.formatDuration(
                 plPlayerController.positionSeconds.value,
               ),
               style: const TextStyle(
@@ -360,7 +365,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
           ),
           Obx(
             () => Text(
-              DurationUtil.formatDuration(
+              DurationUtils.formatDuration(
                 plPlayerController.durationSeconds.value.inSeconds,
               ),
               style: const TextStyle(
@@ -847,7 +852,8 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
         final double tapPosition = details.localFocalPoint.dx;
         final double sectionWidth = maxWidth / 3;
         if (tapPosition < sectionWidth) {
-          if (!plPlayerController.enableSlideVolumeBrightness) {
+          if (Utils.isDesktop ||
+              !plPlayerController.enableSlideVolumeBrightness) {
             return;
           }
           // 左边区域
@@ -975,9 +981,12 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
         'setVolume',
         const Duration(milliseconds: 20),
         () {
-          final double volume = _volumeValue.value - delta.dy / level;
-          final double result = volume.clamp(0.0, 1.0);
-          setVolume(result);
+          final double volume = clampDouble(
+            plPlayerController.volume.value - delta.dy / level,
+            0.0,
+            1.0,
+          );
+          setVolume(volume);
         },
       );
     }
@@ -1025,7 +1034,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
     final double sectionWidth = maxWidth / 3;
     late GestureType gestureType;
     if (tapPosition < sectionWidth) {
-      if (!plPlayerController.enableSlideVolumeBrightness) {
+      if (Utils.isDesktop || !plPlayerController.enableSlideVolumeBrightness) {
         return;
       }
       // 左边区域
@@ -1089,9 +1098,12 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
         'setVolume',
         const Duration(milliseconds: 20),
         () {
-          final double volume = _volumeValue.value - details.delta.dy / level;
-          final double result = volume.clamp(0.0, 1.0);
-          setVolume(result);
+          final double volume = clampDouble(
+            plPlayerController.volume.value - details.delta.dy / level,
+            0.0,
+            1.0,
+          );
+          setVolume(volume);
         },
       );
     }
@@ -1298,7 +1310,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                         children: [
                           Obx(() {
                             return Text(
-                              DurationUtil.formatDuration(
+                              DurationUtils.formatDuration(
                                 plPlayerController
                                     .sliderTempPosition
                                     .value
@@ -1311,7 +1323,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                           Obx(
                             () {
                               return Text(
-                                DurationUtil.formatDuration(
+                                DurationUtils.formatDuration(
                                   plPlayerController
                                       .durationSeconds
                                       .value
@@ -1336,44 +1348,47 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
           child: Align(
             alignment: Alignment.center,
             child: Obx(
-              () => AnimatedOpacity(
-                curve: Curves.easeInOut,
-                opacity: _volumeIndicator.value ? 1.0 : 0.0,
-                duration: const Duration(milliseconds: 150),
-                child: Container(
-                  padding: const EdgeInsets.symmetric(
-                    horizontal: 8,
-                    vertical: 5,
-                  ),
-                  decoration: const BoxDecoration(
-                    color: Color(0x88000000),
-                    borderRadius: BorderRadius.all(Radius.circular(64)),
-                  ),
-                  child: Row(
-                    mainAxisSize: MainAxisSize.min,
-                    mainAxisAlignment: MainAxisAlignment.center,
-                    children: <Widget>[
-                      Icon(
-                        _volumeValue.value == 0.0
-                            ? Icons.volume_off
-                            : _volumeValue.value < 0.5
-                            ? Icons.volume_down
-                            : Icons.volume_up,
-                        color: Colors.white,
-                        size: 20.0,
-                      ),
-                      const SizedBox(width: 2.0),
-                      Text(
-                        '${(_volumeValue.value * 100.0).round()}%',
-                        style: const TextStyle(
-                          fontSize: 13.0,
+              () {
+                final volume = plPlayerController.volume.value;
+                return AnimatedOpacity(
+                  curve: Curves.easeInOut,
+                  opacity: _volumeIndicator.value ? 1.0 : 0.0,
+                  duration: const Duration(milliseconds: 150),
+                  child: Container(
+                    padding: const EdgeInsets.symmetric(
+                      horizontal: 8,
+                      vertical: 5,
+                    ),
+                    decoration: const BoxDecoration(
+                      color: Color(0x88000000),
+                      borderRadius: BorderRadius.all(Radius.circular(64)),
+                    ),
+                    child: Row(
+                      mainAxisSize: MainAxisSize.min,
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      children: <Widget>[
+                        Icon(
+                          volume == 0.0
+                              ? Icons.volume_off
+                              : volume < 0.5
+                              ? Icons.volume_down
+                              : Icons.volume_up,
                           color: Colors.white,
+                          size: 20.0,
                         ),
-                      ),
-                    ],
+                        const SizedBox(width: 2.0),
+                        Text(
+                          '${(volume * 100.0).round()}%',
+                          style: const TextStyle(
+                            fontSize: 13.0,
+                            color: Colors.white,
+                          ),
+                        ),
+                      ],
+                    ),
                   ),
-                ),
-              ),
+                );
+              },
             ),
           ),
         ),
@@ -1728,29 +1743,13 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                                         //移除圆角
                                         shape: const RoundedRectangleBorder(),
                                         content: GestureDetector(
-                                          onTap: () async {
+                                          onTap: () {
                                             Get.back();
-
-                                            String name = DateTime.now()
-                                                .toString();
-                                            final SaveResult result =
-                                                await SaverGallery.saveImage(
-                                                  value,
-                                                  fileName: name,
-                                                  androidRelativePath:
-                                                      "Pictures/Screenshots",
-                                                  skipIfExists: false,
-                                                );
-
-                                            if (result.isSuccess) {
-                                              SmartDialog.showToast(
-                                                '$name.png已保存到相册/截图',
-                                              );
-                                            } else {
-                                              SmartDialog.showToast(
-                                                '保存失败，${result.errorMessage}',
-                                              );
-                                            }
+                                            ImageUtils.saveByteImg(
+                                              bytes: value,
+                                              fileName:
+                                                  'screenshot_${ImageUtils.time}',
+                                            );
                                           },
                                           child: ConstrainedBox(
                                             constraints: BoxConstraints(
@@ -2047,18 +2046,15 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
           mpv.dispose();
         }
         if (await future) {
-          await SaverGallery.saveFile(
+          await ImageUtils.saveFileImg(
             filePath: file,
-            fileName: name,
-            androidRelativePath: 'Pictures/Screenshots',
-            skipIfExists: false,
+            fileName: '$name.webp',
+            needToast: true,
           );
-          SmartDialog.showToast('$name已保存到相册/截图');
         } else {
           SmartDialog.showToast('转码出现错误或已取消');
         }
         progress.close();
-        File(file).delSync();
         if (isPlay) ctr.play();
       },
     );
@@ -2233,7 +2229,7 @@ Future<ui.Image?> _getImg(String url) async {
       options: Options(responseType: ResponseType.bytes),
     );
     if (res.statusCode == 200) {
-      final data = res.data;
+      final Uint8List data = res.data;
       cacheManager.putFile(cacheKey, data, fileExtension: 'jpg');
       return _loadImg(data);
     }