fix(添加小窗播放)

liuchuancong · liuchuancong · commit 18bc0b20f00d · 2025-12-31T13:21:37.000+08:00
diff --git a/lib/common/global/initialized.dart b/lib/common/global/initialized.dart
@@ -1,6 +1,8 @@
 import 'dart:io';
+import 'dart:ffi';
 import 'dart:developer';
 import 'package:get/get.dart';
+import 'package:win32/win32.dart';
 import 'package:pure_live/common/index.dart';
 import 'package:pure_live/plugins/global.dart';
 import 'package:hive_ce_flutter/hive_flutter.dart';
@@ -37,21 +39,37 @@ class AppInitializer {
     // 👇 从启动参数获取实例 ID
     String instanceId = getInstanceIdFromArgs(args);
 
-    if (PlatformUtils.isDesktop) {
-      await DesktopManager.initialize();
-    } else if (PlatformUtils.isMobile) {
-      await MobileManager.initialize();
-    }
-
-    PrefUtil.prefs = await SharedPreferences.getInstance();
-
     // 👇 每个实例使用独立 Hive 路径
     final appDir = await getApplicationDocumentsDirectory();
     String path = '${appDir.path}${Platform.pathSeparator}pure_live${Platform.pathSeparator}$instanceId';
     if (instanceId.isEmpty) {
       path = '${appDir.path}${Platform.pathSeparator}pure_live';
     }
+    if (PlatformUtils.isDesktopNotMac) {
+      // Hive 默认锁文件通常叫 'LOCK'，但我们可以自己维护一个实例锁，更加稳定
+      final lockFile = File('$path${Platform.pathSeparator}app_instance.lock');
+
+      try {
+        if (!lockFile.parent.existsSync()) lockFile.parent.createSync(recursive: true);
+        final raf = lockFile.openSync(mode: FileMode.write);
+        raf.lockSync();
+      } catch (e) {
+        log("检测到实例 [$instanceId] 文件夹已被锁定，正在唤醒已有窗口...");
+        final hwnd = FindWindow(nullptr, TEXT('纯粹直播'));
+        if (hwnd != 0) {
+          if (IsIconic(hwnd) != 0) ShowWindow(hwnd, SW_RESTORE);
+          SetForegroundWindow(hwnd);
+        }
+        exit(0);
+      }
+    }
+    if (PlatformUtils.isDesktop) {
+      await DesktopManager.initialize();
+    } else if (PlatformUtils.isMobile) {
+      await MobileManager.initialize();
+    }
 
+    PrefUtil.prefs = await SharedPreferences.getInstance();
     try {
       await Hive.initFlutter(path);
       await HivePrefUtil.init();
@@ -70,13 +88,11 @@ class AppInitializer {
     initService();
 
     if (PlatformUtils.isDesktopNotMac) {
-      if (instanceId == 'default') {
-        if (!await FlutterSingleInstance().isFirstInstance()) {
-          log("Default instance is already running");
-          exit(0);
-        }
-        await _setupLaunchAtStartup();
+      if (!await FlutterSingleInstance().isFirstInstance()) {
+        log("Default instance is already running");
+        exit(0);
       }
+      await _setupLaunchAtStartup();
     }
     _isInitialized = true;
   }
diff --git a/lib/common/services/settings_service.dart b/lib/common/services/settings_service.dart
@@ -75,7 +75,7 @@ class SettingsService extends GetxController {
   final videoOutputDriver = (HivePrefUtil.getString('videoOutputDriver') ?? "gpu").obs;
   final audioOutputDriver = (HivePrefUtil.getString('audioOutputDriver') ?? "auto").obs;
   final videoHardwareDecoder = (HivePrefUtil.getString('videoHardwareDecoder') ?? "auto").obs;
-
+  final floatPlay = (HivePrefUtil.getBool('floatPlay') ?? true).obs;
   // ==============================
   // 🍪 平台 Cookie
   // ==============================
@@ -237,6 +237,10 @@ class SettingsService extends GetxController {
       FlutterExitApp.exitApp();
     });
 
+    floatPlay.listen((value) {
+      HivePrefUtil.setBool('floatPlay', value);
+    });
+
     videoFitIndex.listen((value) {
       HivePrefUtil.setInt('videoFitIndex', value);
     });
@@ -660,6 +664,7 @@ class SettingsService extends GetxController {
         ? double.parse(json['danmakuFontBorder'].toString())
         : 4.0;
     danmakuOpacity.value = json['danmakuOpacity'] != null ? double.parse(json['danmakuOpacity'].toString()) : 1.0;
+    floatPlay.value = json['floatPlay'] ?? true;
     enableCodec.value = json['enableCodec'] ?? true;
     playerCompatMode.value = json['playerCompatMode'] ?? false;
     bilibiliCookie.value = json['bilibiliCookie'] ?? '';
@@ -725,6 +730,7 @@ class SettingsService extends GetxController {
     json['danmakuFontSize'] = danmakuFontSize.value;
     json['danmakuFontBorder'] = danmakuFontBorder.value;
     json['danmakuOpacity'] = danmakuOpacity.value;
+    json['floatPlay'] = floatPlay.value;
     json['videoPlayerIndex'] = videoPlayerIndex.value;
     json['enableCodec'] = enableCodec.value;
     json['playerCompatMode'] = playerCompatMode.value;
diff --git a/lib/common/widgets/floating_icon.dart b/lib/common/widgets/floating_icon.dart
diff --git a/lib/modules/live_play/live_play_controller.dart b/lib/modules/live_play/live_play_controller.dart
@@ -72,8 +72,6 @@ class LivePlayController extends StateController with GetSingleTickerProviderSta
 
   @override
   void onClose() {
-    success.value = false;
-    SwitchableGlobalPlayer().stop();
     tabController.dispose();
     if (Platform.isAndroid) {
       BackButtonInterceptor.removeByName("live_play_page");
@@ -83,8 +81,6 @@ class LivePlayController extends StateController with GetSingleTickerProviderSta
 
   @override
   void dispose() {
-    success.value = false;
-    SwitchableGlobalPlayer().stop();
     tabController.dispose();
     if (Platform.isAndroid) {
       BackButtonInterceptor.removeByName("live_play_page");
@@ -141,23 +137,18 @@ class LivePlayController extends StateController with GetSingleTickerProviderSta
   }
 
   bool myInterceptor(bool stopDefaultButtonEvent, RouteInfo info) {
-    // 1. 如果是全屏，退出全屏
     if (videoController.value!.isFullscreen.value) {
       setNormalScreen();
       videoController.value!.exitFullScreen();
-      return true; // 拦截，不让页面关闭
+      return true;
     }
 
-    // 2. 如果显示设置面板，隐藏它
     if (videoController.value!.showSettting.value) {
       videoController.value!.showSettting.toggle();
-      return true; // 拦截，不让页面关闭
+      return true;
     }
-
-    // 3. 所有特殊状态都处理完了，现在决定是否允许退出页面
-    // 如果你想直接退出页面：
     success.value = false;
-    return false; // 不拦截，让系统执行默认的返回（关闭页面）
+    return false;
   }
 
   Future<LiveRoom> onInitPlayerState({
diff --git a/lib/modules/settings/settings_page.dart b/lib/modules/settings/settings_page.dart
@@ -86,6 +86,15 @@ class SettingsPage extends GetView<SettingsService> {
             onTap: () => Navigator.push(context, MaterialPageRoute(builder: (context) => const BackupPage())),
           ),
           SectionTitle(title: S.of(context).video),
+          Obx(
+            () => SwitchListTile(
+              title: Text('退出小窗播放'),
+              subtitle: Text("应用退出时是否关闭小窗播放"),
+              value: controller.floatPlay.value,
+              activeThumbColor: Theme.of(context).colorScheme.primary,
+              onChanged: (bool value) => controller.floatPlay.value = value,
+            ),
+          ),
           if (Platform.isAndroid)
             Obx(
               () => ListTile(
diff --git a/lib/player/switchable_global_player.dart b/lib/player/switchable_global_player.dart
@@ -8,6 +8,8 @@ import 'package:rxdart/rxdart.dart';
 import 'unified_player_interface.dart';
 import 'package:floating/floating.dart';
 import 'package:pure_live/common/index.dart';
+import 'package:pure_live/routes/app_navigation.dart';
+import 'package:flutter_floating/flutter_floating.dart';
 import 'package:pure_live/common/global/platform_utils.dart';
 
 enum PlayerEngine { mediaKit, fijk }
@@ -28,7 +30,8 @@ class SwitchableGlobalPlayer {
   late Floating floating;
   bool playerHasInit = false;
   bool hasSetVolume = false;
-
+  static const String _floatTag = "global_video_player";
+  final isFloating = false.obs;
   // 依赖
   final SettingsService settings = Get.find<SettingsService>();
 
@@ -55,6 +58,8 @@ class SwitchableGlobalPlayer {
   Stream<int?> get width => _currentPlayer?.width ?? Stream.value(null);
   Stream<int?> get height => _currentPlayer?.height ?? Stream.value(null);
 
+  // 全局floating
+  late LiveRoom currentFloatRoom;
   Future<void> init(PlayerEngine engine) async {
     if (_currentPlayer != null) return;
     _currentPlayer = _createPlayer(engine);
@@ -130,6 +135,88 @@ class SwitchableGlobalPlayer {
     }
   }
 
+  /// 构建悬浮窗关闭按钮
+  Widget _buildCloseButton() {
+    return GestureDetector(
+      onTap: () {
+        stop();
+        closeAppFloating();
+      },
+      child: Container(
+        padding: const EdgeInsets.all(4),
+        decoration: BoxDecoration(
+          color: Colors.black.withAlpha(128),
+          shape: BoxShape.circle,
+          border: Border.all(color: Colors.white24, width: 0.5),
+        ),
+        child: const Icon(Icons.close, color: Colors.white, size: 16),
+      ),
+    );
+  }
+
+  void showAppFloating(LiveRoom room) {
+    floatingManager.disposeFloating(_floatTag);
+    double baseWidth = Platform.isWindows ? 300.0 : 200.0;
+    double ratio = isVerticalVideo.value ? (9 / 16) : (16 / 9);
+    double floatHeight = baseWidth / ratio;
+    floatingManager.createFloating(
+      _floatTag,
+      FloatingOverlay(
+        Container(
+          width: baseWidth,
+          height: floatHeight,
+          clipBehavior: Clip.antiAlias,
+          decoration: BoxDecoration(
+            borderRadius: BorderRadius.circular(12),
+            color: Colors.black,
+            boxShadow: [
+              BoxShadow(
+                color: Colors.black.withAlpha(100), // 加深一点阴影
+                blurRadius: 15,
+                spreadRadius: 2,
+                offset: const Offset(0, 4),
+              ),
+            ],
+          ),
+          child: Stack(
+            children: [
+              getVideoWidget(null),
+              Positioned.fill(
+                child: GestureDetector(
+                  behavior: HitTestBehavior.opaque,
+                  onTap: () {
+                    // 点击悬浮窗回到页面的逻辑
+                    closeAppFloating();
+                    AppNavigator.toLiveRoomDetail(liveRoom: currentFloatRoom);
+                  },
+                  child: const SizedBox.expand(),
+                ),
+              ),
+
+              // 3. 顶层：关闭按钮
+              Positioned(right: 8, top: 8, child: _buildCloseButton()),
+            ],
+          ),
+        ),
+        right: 50,
+        top: 100,
+        slideType: FloatingEdgeType.onRightAndTop,
+        params: FloatingParams(isSnapToEdge: false, snapToEdgeSpace: 10, dragOpacity: 0.8),
+      ),
+    );
+
+    floatingManager.getFloating(_floatTag).open(Get.context!);
+    currentFloatRoom = room;
+    isFloating.value = true;
+  }
+
+  /// 关闭并销毁悬浮播放器
+  void closeAppFloating() {
+    if (!isFloating.value) return;
+    floatingManager.disposeFloating(_floatTag);
+    isFloating.value = false;
+  }
+
   Future<void> setVolume(double volume) async {
     final clamped = volume.clamp(0.0, 1.0);
     currentVolume.value = clamped;
@@ -168,6 +255,7 @@ class SwitchableGlobalPlayer {
 
   Widget getVideoWidget(Widget? child) {
     return Obx(() {
+      final bool isFloatContent = isFloating.value && child == null;
       if (!isInitialized.value) {
         return Material(
           child: Stack(
@@ -200,7 +288,7 @@ class SwitchableGlobalPlayer {
                 children: [
                   Container(color: Colors.black),
                   _currentPlayer?.getVideoWidget(settings.videoFitIndex.value, child) ?? const SizedBox(),
-                  child ?? const SizedBox(),
+                  if (!isFloatContent) child ?? const SizedBox(),
                 ],
               ),
               resizeToAvoidBottomInset: true,
@@ -238,7 +326,7 @@ class SwitchableGlobalPlayer {
                 children: [
                   Container(color: Colors.black),
                   _currentPlayer?.getVideoWidget(settings.videoFitIndex.value, child) ?? const SizedBox(),
-                  child ?? const SizedBox(),
+                  if (!isFloatContent) child ?? const SizedBox(),
                 ],
               ),
               resizeToAvoidBottomInset: true,
diff --git a/lib/routes/app_navigation.dart b/lib/routes/app_navigation.dart
@@ -42,18 +42,34 @@ class BackButtonObserver extends RouteObserver<PageRoute<dynamic>> {
   @override
   void didPop(Route route, Route? previousRoute) {
     super.didPop(route, previousRoute);
-    // 处理路由弹出事件
     if (route.settings.name == RoutePath.kLivePlay) {
       try {
-        SwitchableGlobalPlayer().stop();
-        Get.find<LivePlayController>().success.value = false;
+        final livePlayController = Get.find<LivePlayController>();
+        livePlayController.success.value = false;
+        final settings = Get.find<SettingsService>();
+        if (settings.floatPlay.value) {
+          Future.delayed(Duration(milliseconds: 200), () {
+            SwitchableGlobalPlayer().showAppFloating(livePlayController.detail.value!);
+          });
+          log("BackButtonObserver showAppFloating");
+        } else {
+          SwitchableGlobalPlayer().stop();
+        }
         if (PlatformUtils.isMobile) {
           WindowService().doExitFullScreen();
         }
-        Get.find<LivePlayController>().onDelete();
       } catch (e) {
-        log(e.toString());
+        log("BackButtonObserver Error: ${e.toString()}");
       }
     }
   }
+
+  @override
+  void didPush(Route<dynamic> route, Route<dynamic>? previousRoute) {
+    super.didPush(route, previousRoute);
+    if (route.settings.name == RoutePath.kLivePlay) {
+      log("BackButtonObserver enter LivePlay");
+      SwitchableGlobalPlayer().closeAppFloating();
+    }
+  }
 }
diff --git a/pubspec.lock b/pubspec.lock
@@ -345,6 +345,14 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.2"
+  cupertino_icons:
+    dependency: transitive
+    description:
+      name: cupertino_icons
+      sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.0.8"
   dart_quickjs:
     dependency: "direct main"
     description:
@@ -576,6 +584,14 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.0"
+  flutter_floating:
+    dependency: "direct main"
+    description:
+      name: flutter_floating
+      sha256: "9887a378b4f48ed7a29f67562e8da2205d3c39f62baf9d75e376c0a190ab32ce"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.0.1"
   flutter_highlight:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -120,6 +120,7 @@ dependencies:
   markdown_widget: ^2.3.2+8
   google_fonts: ^6.3.3
   back_button_interceptor: ^8.0.4
+  flutter_floating: ^2.0.1
   win32: ^5.15.0
 dependency_overrides:
   media_kit:
