修复全屏

Author: liuchuancong

lib/common/global/platform/desktop_manager.dart

@@ -3,6 +3,7 @@ import 'dart:ui';
 import 'package:flutter/material.dart';
 import 'package:pure_live/plugins/utils.dart';
 import 'package:tray_manager/tray_manager.dart';
+import 'package:pure_live/player/fullscreen.dart';
 import 'package:window_manager/window_manager.dart';
 import 'package:flutter_acrylic/flutter_acrylic.dart';
 import 'package:pure_live/common/global/platform_utils.dart';
@@ -183,6 +184,11 @@ class DesktopManager {
 }
 
 mixin DesktopWindowMixin<T extends StatefulWidget> on State<T> implements WindowListener, TrayListener {
+  Future<void> saveWindowBounds() async {
+    if (await windowManager.isFullScreen()) return;
+    WindowService.normalWindowBounds = await windowManager.getBounds();
+  }
+
   @override
   void onWindowClose() => DesktopManager.handleWindowClose();
 
@@ -215,11 +221,17 @@ mixin DesktopWindowMixin<T extends StatefulWidget> on State<T> implements Window
   @override
   void onWindowResize() {}
   @override
-  void onWindowResized() {}
+  void onWindowResized() async {
+    await saveWindowBounds();
+  }
+
   @override
   void onWindowMove() {}
   @override
-  void onWindowMoved() {}
+  void onWindowMoved() async {
+    await saveWindowBounds();
+  }
+
   @override
   void onWindowEnterFullScreen() {}
   @override

lib/modules/live_play/live_play_controller.dart

@@ -75,7 +75,9 @@ class LivePlayController extends StateController with GetSingleTickerProviderSta
     success.value = false;
     SwitchableGlobalPlayer().stop();
     tabController.dispose();
-    BackButtonInterceptor.removeByName("live_play_page");
+    if (Platform.isAndroid) {
+      BackButtonInterceptor.removeByName("live_play_page");
+    }
     super.onClose();
   }
 

lib/player/fullscreen.dart

@@ -13,7 +13,7 @@ class WindowService {
   WindowService._internal();
 
   // 用于存储进入全屏前的窗口位置和大小
-  Rect? _normalWindowBounds;
+  static Rect? normalWindowBounds;
 
   //横屏
   Future<void> landScape() async {
@@ -72,10 +72,10 @@ class WindowService {
     await windowManager.setHasShadow(true);
     await windowManager.setTitleBarStyle(TitleBarStyle.normal);
 
-    if (_normalWindowBounds != null) {
-      await windowManager.setBounds(_normalWindowBounds!);
+    if (normalWindowBounds != null) {
+      await windowManager.setBounds(normalWindowBounds!);
     } else {
-      await windowManager.setSize(const Size(1280, 720));
+      await windowManager.setSize(const Size(1080, 720));
       await windowManager.center();
     }
     if (Platform.isWindows) {
@@ -85,7 +85,8 @@ class WindowService {
 
   Future<void> doEnterWindowFullScreen() async {
     // 1. 先彻底移除装饰和阴影
-    _normalWindowBounds = await windowManager.getBounds();
+    await Future.delayed(const Duration(milliseconds: 50));
+    normalWindowBounds = await windowManager.getBounds();
     await windowManager.setHasShadow(false);
     // 建议增加：隐藏标题栏，防止 Windows 11 顶部出现细线
     await windowManager.setTitleBarStyle(TitleBarStyle.hidden, windowButtonVisibility: false);

pubspec.yaml

@@ -1,6 +1,6 @@
 name: pure_live
 description: 纯粹直播,一款开源的第三方多平台直播聚合播放器.
-
+publish_to: none
 version: 2.0.10+21
 
 environment: