fix(fullscreen)

Author: liuchuancong

android/app/src/main/AndroidManifest.xml

@@ -40,7 +40,7 @@
     android:usesCleartextTraffic="true"
     android:networkSecurityConfig="@xml/network_security_config"
     android:requestLegacyExternalStorage="true" 
-    android:enableOnBackInvokedCallback="true"
+    android:enableOnBackInvokedCallback="false"
     android:allowNativeHeapPointerTagging="false" 
     android:icon="@mipmap/ic_launcher">
     <activity android:name=".MainActivity" 
@@ -53,7 +53,7 @@
       android:hardwareAccelerated="true" 
       android:resizeableActivity="true"
       android:supportsPictureInPicture="true" 
-      android:enableOnBackInvokedCallback="true"
+      android:enableOnBackInvokedCallback="false"
       android:windowSoftInputMode="adjustResize">
       <meta-data android:name="io.flutter.embedding.android.NormalTheme"
         android:resource="@style/NormalTheme" />

lib/main.dart

@@ -98,7 +98,14 @@ class _MyAppState extends State<MyApp> with DesktopWindowMixin {
               title: '纯粹直播',
               debugShowCheckedModeBanner: false,
               themeMode: AppConsts.themeModes[settings.themeModeName.value]!,
-              theme: lightTheme.copyWith(appBarTheme: AppBarTheme(surfaceTintColor: Colors.transparent)),
+              theme: lightTheme.copyWith(
+                appBarTheme: AppBarTheme(surfaceTintColor: Colors.transparent),
+                pageTransitionsTheme: const PageTransitionsTheme(
+                  builders: <TargetPlatform, PageTransitionsBuilder>{
+                    TargetPlatform.android: PredictiveBackPageTransitionsBuilder(),
+                  },
+                ),
+              ),
               darkTheme: darkTheme.copyWith(appBarTheme: AppBarTheme(surfaceTintColor: Colors.transparent)),
               locale: AppConsts.languages[settings.languageName.value]!,
               navigatorObservers: [FlutterSmartDialog.observer, BackButtonObserver()],
@@ -111,7 +118,7 @@ class _MyAppState extends State<MyApp> with DesktopWindowMixin {
                 GlobalCupertinoLocalizations.delegate,
               ],
               initialRoute: showSplashPage ? RoutePath.kSplash : RoutePath.kInitial,
-              defaultTransition: Platform.isAndroid ? Transition.cupertino : Transition.native,
+              defaultTransition: Transition.native,
               getPages: AppPages.routes,
             );
           });

lib/modules/live_play/live_play_controller.dart

@@ -15,6 +15,7 @@ import 'package:pure_live/core/danmaku/douyin_danmaku.dart';
 import 'package:pure_live/core/interface/live_danmaku.dart';
 import 'package:pure_live/modules/live_play/player_state.dart';
 import 'package:pure_live/player/switchable_global_player.dart';
+import 'package:back_button_interceptor/back_button_interceptor.dart';
 
 enum VideoMode { normal, widescreen, fullscreen }
 
@@ -69,26 +70,12 @@ class LivePlayController extends StateController with GetSingleTickerProviderSta
 
   final refreshKey = DateTime.now().millisecondsSinceEpoch.obs;
 
-  Future<bool> onBackPressed() async {
-    unawaited(
-      Future.microtask(() {
-        success.value = false;
-        if (videoController.value!.showSettting.value) {
-          videoController.value!.showSettting.toggle();
-        }
-        if (videoController.value!.isFullscreen.value) {
-          videoController.value!.exitFullScreen();
-        }
-      }),
-    );
-    return await Future.value(true);
-  }
-
   @override
   void onClose() {
     success.value = false;
     SwitchableGlobalPlayer().stop();
     tabController.dispose();
+    BackButtonInterceptor.removeByName("live_play_page");
     super.onClose();
   }
 
@@ -97,12 +84,18 @@ class LivePlayController extends StateController with GetSingleTickerProviderSta
     success.value = false;
     SwitchableGlobalPlayer().stop();
     tabController.dispose();
+    if (Platform.isAndroid) {
+      BackButtonInterceptor.removeByName("live_play_page");
+    }
     super.dispose();
   }
 
   @override
   void onInit() {
     super.onInit();
+    if (Platform.isAndroid) {
+      BackButtonInterceptor.add(myInterceptor, zIndex: 1, name: "live_play_page");
+    }
     detail.value = room;
     currentSite = Sites.of(site);
     liveDanmaku = Sites.of(site).liveSite.getDanmaku();
@@ -145,6 +138,26 @@ class LivePlayController extends StateController with GetSingleTickerProviderSta
     });
   }
 
+  bool myInterceptor(bool stopDefaultButtonEvent, RouteInfo info) {
+    // 1. 如果是全屏，退出全屏
+    if (videoController.value!.isFullscreen.value) {
+      setNormalScreen();
+      videoController.value!.exitFullScreen();
+      return true; // 拦截，不让页面关闭
+    }
+
+    // 2. 如果显示设置面板，隐藏它
+    if (videoController.value!.showSettting.value) {
+      videoController.value!.showSettting.toggle();
+      return true; // 拦截，不让页面关闭
+    }
+
+    // 3. 所有特殊状态都处理完了，现在决定是否允许退出页面
+    // 如果你想直接退出页面：
+    success.value = false;
+    return false; // 不拦截，让系统执行默认的返回（关闭页面）
+  }
+
   Future<LiveRoom> onInitPlayerState({
     ReloadDataType reloadDataType = ReloadDataType.refreash,
     int line = 0,

lib/modules/live_play/live_play_page.dart

@@ -15,29 +15,18 @@ class LivePlayPage extends GetView<LivePlayController> {
   LivePlayPage({super.key});
 
   final SettingsService settings = Get.find<SettingsService>();
-  Future<void> onWillPop(bool didPop, Object? result) async {
-    if (didPop) return;
-    var shouldPop = await controller.onBackPressed();
-    if (shouldPop) {
-      Navigator.of(Get.context!).pop();
-    }
-  }
 
   @override
   Widget build(BuildContext context) {
     if (settings.enableScreenKeepOn.value) {
       WakelockPlus.toggle(enable: settings.enableScreenKeepOn.value);
     }
-    return PopScope(
-      canPop: false,
-      onPopInvokedWithResult: onWillPop,
-      child: Obx(() {
-        if (controller.screenMode.value == VideoMode.normal) {
-          return buildNormalPlayerView(context);
-        }
-        return buildVideoPlayer();
-      }),
-    );
+    return Obx(() {
+      if (controller.screenMode.value == VideoMode.normal) {
+        return buildNormalPlayerView(context);
+      }
+      return buildVideoPlayer();
+    });
   }
 
   Scaffold buildNormalPlayerView(BuildContext context) {

lib/player/fullscreen.dart

@@ -2,6 +2,7 @@ import 'dart:io';
 import 'package:flutter/services.dart';
 import 'package:flutter/foundation.dart';
 import 'package:window_manager/window_manager.dart';
+import 'package:screen_retriever/screen_retriever.dart';
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:auto_orientation_v2/auto_orientation_v2.dart';
 
@@ -17,6 +18,36 @@ Future<void> landScape() async {
       await windowManager.setHasShadow(false); // 去掉阴影
       await windowManager.setAsFrameless(); // 设置为无边框模式
       await windowManager.setFullScreen(true);
+      // 1. 獲取目前視窗的中心點
+      Rect windowRect = await windowManager.getBounds();
+      Offset center = windowRect.center;
+
+      // 2. 獲取所有顯示器
+      List<Display> displays = await screenRetriever.getAllDisplays();
+
+      // 3. 尋找視窗中心點在哪個顯示器範圍內
+      Display currentDisplay = displays.firstWhere((display) {
+        // 注意：這裡使用 visiblePosition 或 bounds.topLeft
+        final Offset origin = display.visiblePosition ?? Offset.zero;
+        final Size size = display.size;
+
+        return center.dx >= origin.dx &&
+            center.dx <= origin.dx + size.width &&
+            center.dy >= origin.dy &&
+            center.dy <= origin.dy + size.height;
+      }, orElse: () => displays.first);
+
+      // 4. 根據找到的螢幕設定全螢幕範圍
+      await windowManager.setBounds(
+        Rect.fromLTWH(
+          currentDisplay.visiblePosition!.dx,
+          currentDisplay.visiblePosition!.dy,
+          currentDisplay.size.width,
+          currentDisplay.size.height,
+        ),
+      );
+
+      await windowManager.setAlwaysOnTop(true);
     }
   } catch (exception, stacktrace) {
     debugPrint(exception.toString());
@@ -36,6 +67,35 @@ Future<void> doEnterFullScreen() async {
     await windowManager.setHasShadow(false); // 去掉阴影
     await windowManager.setAsFrameless(); // 设置为无边框模式
     await windowManager.setFullScreen(true);
+    // 1. 獲取目前視窗的中心點
+    Rect windowRect = await windowManager.getBounds();
+    Offset center = windowRect.center;
+
+    // 2. 獲取所有顯示器
+    List<Display> displays = await screenRetriever.getAllDisplays();
+
+    // 3. 尋找視窗中心點在哪個顯示器範圍內
+    Display currentDisplay = displays.firstWhere((display) {
+      // 注意：這裡使用 visiblePosition 或 bounds.topLeft
+      final Offset origin = display.visiblePosition ?? Offset.zero;
+      final Size size = display.size;
+
+      return center.dx >= origin.dx &&
+          center.dx <= origin.dx + size.width &&
+          center.dy >= origin.dy &&
+          center.dy <= origin.dy + size.height;
+    }, orElse: () => displays.first);
+
+    // 4. 根據找到的螢幕設定全螢幕範圍
+    await windowManager.setBounds(
+      Rect.fromLTWH(
+        currentDisplay.visiblePosition!.dx,
+        currentDisplay.visiblePosition!.dy,
+        currentDisplay.size.width,
+        currentDisplay.size.height,
+      ),
+    );
+    await windowManager.setAlwaysOnTop(true);
   }
 }
 

pubspec.lock

@@ -89,6 +89,14 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.3.7"
+  back_button_interceptor:
+    dependency: "direct main"
+    description:
+      name: back_button_interceptor
+      sha256: b85977faabf4aeb95164b3b8bf81784bed4c54ea1aef90a036ab6927ecf80c5a
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "8.0.4"
   battery_plus:
     dependency: "direct main"
     description:
@@ -1586,12 +1594,13 @@ packages:
     source: hosted
     version: "2.1.0"
   screen_retriever:
-    dependency: transitive
+    dependency: "direct main"
     description:
-      name: screen_retriever
-      sha256: "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c"
-      url: "https://pub.flutter-io.cn"
-    source: hosted
+      path: "packages/screen_retriever"
+      ref: main
+      resolved-ref: b246b3963738d6cc159c921764c194c73dbdf2ad
+      url: "https://github.com/MSOB7YY/screen_retriever.git"
+    source: git
     version: "0.2.0"
   screen_retriever_linux:
     dependency: transitive

pubspec.yaml

@@ -118,6 +118,12 @@ dependencies:
   hive_ce_flutter: ^2.3.3
   markdown_widget: ^2.3.2+8
   google_fonts: ^6.3.3
+  back_button_interceptor: ^8.0.4
+  screen_retriever:
+     git:
+      url: https://github.com/MSOB7YY/screen_retriever.git
+      path: ./packages/screen_retriever
+      ref: main
 dependency_overrides:
   media_kit:
     git:
@@ -159,6 +165,11 @@ dependency_overrides:
       url: https://github.com/Predidit/media-kit.git
       ref: main
       path: ./libs/macos/media_kit_libs_macos_video
+  screen_retriever:
+     git:
+      url: https://github.com/MSOB7YY/screen_retriever.git
+      path: ./packages/screen_retriever
+      ref: main
 dev_dependencies:
   flutter_test:
     sdk: flutter