Fix: fix loss controller after pipstop

Jackiu1997 · Jan 29, 2023 · a259c51 · a259c51 · meetherainday · Jan 30, 2023
1 parent ce9c5e7
commit a259c51
Showing 1 changed file with 36 additions and 34 deletions.
diff --git a/lib/pages/live_play/widgets/danmaku_video_player.dart b/lib/pages/live_play/widgets/danmaku_video_player.dart
@@ -50,22 +50,16 @@ class DanmakuVideoPlayerState extends State<DanmakuVideoPlayer> {
   void resumePlayer() {
     controller = BetterPlayerController(
       BetterPlayerConfiguration(
-          autoPlay: true,
-          fit: BoxFit.contain,
-          fullScreenByDefault: widget.fullScreenByDefault,
-          allowedScreenSleep: widget.allowedScreenSleep,
-          autoDetectFullscreenDeviceOrientation: true,
-          autoDetectFullscreenAspectRatio: true,
-          errorBuilder: errorBuilder,
-          routePageBuilder: routePageBuilder,
-          eventListener: ((p0) {
-            if (p0.betterPlayerEventType == BetterPlayerEventType.pipStart) {
-              setState(() => _isPipMode = true);
-            } else if (p0.betterPlayerEventType ==
-                BetterPlayerEventType.pipStop) {
-              setState(() => _isPipMode = false);
-            }
-          })),
+        autoPlay: true,
+        fit: BoxFit.contain,
+        fullScreenByDefault: widget.fullScreenByDefault,
+        allowedScreenSleep: widget.allowedScreenSleep,
+        autoDetectFullscreenDeviceOrientation: true,
+        autoDetectFullscreenAspectRatio: true,
+        errorBuilder: errorBuilder,
+        routePageBuilder: routePageBuilder,
+        eventListener: pipModeListener,
+      ),
       betterPlayerDataSource: BetterPlayerDataSource(
         BetterPlayerDataSourceType.network,
         widget.url,
@@ -85,6 +79,14 @@ class DanmakuVideoPlayerState extends State<DanmakuVideoPlayer> {
     setState(() {});
   }
 
+  void pipModeListener(BetterPlayerEvent event) {
+    if (event.betterPlayerEventType == BetterPlayerEventType.pipStart) {
+      _isPipMode = true;
+    } else if (event.betterPlayerEventType == BetterPlayerEventType.pipStop) {
+      _isPipMode = false;
+    }
+  }
+
   void setResolution(String url) {
     controller?.setupDataSource(BetterPlayerDataSource(
       BetterPlayerDataSourceType.network,
@@ -110,21 +112,31 @@ class DanmakuVideoPlayerState extends State<DanmakuVideoPlayer> {
     return AnimatedBuilder(
       animation: animation,
       builder: (context, child) {
+        if (_isPipMode) {
+          return Scaffold(
+            resizeToAvoidBottomInset: false,
+            body: Container(
+              alignment: Alignment.center,
+              color: Colors.black,
+              child: controllerProvider,
+            ),
+          );
+        }
+
         return Scaffold(
           resizeToAvoidBottomInset: false,
           body: Container(
             alignment: Alignment.center,
             color: Colors.black,
             child: Stack(children: [
               controllerProvider,
-              if (!_isPipMode)
-                DanmakuVideoController(
-                  key: _danmakuFullScreen,
-                  playerKey: _betterPlayerKey,
-                  controller: controller!,
-                  danmakuStream: widget.danmakuStream,
-                  title: widget.room.title,
-                ),
+              DanmakuVideoController(
+                key: _danmakuFullScreen,
+                playerKey: _betterPlayerKey,
+                controller: controller!,
+                danmakuStream: widget.danmakuStream,
+                title: widget.room.title,
+              ),
             ]),
           ),
         );
@@ -152,16 +164,6 @@ class DanmakuVideoPlayerState extends State<DanmakuVideoPlayer> {
 
   @override
   Widget build(BuildContext context) {
-    if (controller == null) {
-      return Center(
-        child: IconButton(
-          onPressed: resumePlayer,
-          icon: const Icon(Icons.refresh_rounded),
-          iconSize: 30,
-        ),
-      );
-    }
-
     return Stack(
       children: [
         BetterPlayer(