pause

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

.fvmrc

@@ -1,3 +1,3 @@
 {
-  "flutter": "3.35.5"
+  "flutter": "3.35.6"
 }

.github/workflows/android.yml

@@ -42,6 +42,7 @@ jobs:
       - name: apply bottom sheet patch
         working-directory: ${{ env.FLUTTER_ROOT }}
         run: git apply $GITHUB_WORKSPACE/lib/scripts/bottom_sheet_patch.diff
+        continue-on-error: true
 
       # - name: 下载项目依赖
       #   run: flutter pub get

lib/main.dart

@@ -295,10 +295,15 @@ class MyApp extends StatelessWidget {
                   Get.back();
                 }
 
-                return Shortcuts(
-                  shortcuts: {
-                    LogicalKeySet(LogicalKeyboardKey.escape):
-                        VoidCallbackIntent(onBack),
+                return Focus(
+                  canRequestFocus: false,
+                  onKeyEvent: (_, event) {
+                    if (event.logicalKey == LogicalKeyboardKey.escape &&
+                        event is KeyDownEvent) {
+                      onBack();
+                      return KeyEventResult.handled;
+                    }
+                    return KeyEventResult.ignored;
                   },
                   child: MouseBackDetector(
                     onTapDown: onBack,

lib/pages/common/publish/common_publish_page.dart

@@ -30,7 +30,7 @@ abstract class CommonPublishPageState<T extends CommonPublishPage>
   late final controller = ChatBottomPanelContainerController<PanelType>();
   TextEditingController get editController;
 
-  Rx<PanelType> panelType = PanelType.none.obs;
+  final Rx<PanelType> panelType = PanelType.none.obs;
   late final RxBool readOnly = false.obs;
   late final RxBool enablePublish = false.obs;
 

lib/pages/live_room/controller.dart

@@ -462,6 +462,7 @@ class LiveRoomController extends GetxController {
           fromEmote: fromEmote,
           liveRoomController: this,
           items: savedDanmaku,
+          autofocus: !fromEmote,
           onSave: (msg) {
             if (msg.isEmpty) {
               savedDanmaku?.clear();

lib/pages/live_room/send_danmaku/view.dart

@@ -20,6 +20,7 @@ class LiveSendDmPanel extends CommonRichTextPubPage {
     super.key,
     super.items,
     super.onSave,
+    super.autofocus = true,
     this.fromEmote = false,
     required this.liveRoomController,
   });

lib/plugin/pl_player/controller.dart

@@ -1254,14 +1254,12 @@ class PlPlayerController {
 
   /// 暂停播放
   Future<void> pause({bool notify = true, bool isInterrupt = false}) async {
-    if (videoPlayerController?.state.playing ?? false) {
-      _videoPlayerController!.playOrPause();
-      playerStatus.status.value = PlayerStatus.paused;
+    await _videoPlayerController?.pause();
+    playerStatus.status.value = PlayerStatus.paused;
 
-      // 主动暂停时让出音频焦点
-      if (!isInterrupt) {
-        audioSessionHandler?.setActive(false);
-      }
+    // 主动暂停时让出音频焦点
+    if (!isInterrupt) {
+      audioSessionHandler?.setActive(false);
     }
   }
 

lib/plugin/pl_player/view.dart

@@ -805,6 +805,10 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
               ),
         onTap: () =>
             plPlayerController.triggerFullScreen(status: !isFullScreen),
+        onSecondaryTap: () => plPlayerController.triggerFullScreen(
+          status: !isFullScreen,
+          inAppFullScreen: true,
+        ),
       ),
     };
 

lib/utils/update.dart

@@ -107,6 +107,7 @@ abstract class Update {
                   downloadBtn('zip', ext: 'zip'),
                   downloadBtn('exe', ext: 'exe'),
                 ] else if (Platform.isLinux) ...[
+                  downloadBtn('rpm', ext: 'rpm'),
                   downloadBtn('deb', ext: 'deb'),
                   downloadBtn('targz', ext: 'tar.gz'),
                 ] else

pubspec.lock

@@ -223,7 +223,7 @@ packages:
     description:
       path: "."
       ref: main
-      resolved-ref: af2fc10742cadd279f917b14c53f2ecb68fd9217
+      resolved-ref: da0a87b34d94e706f5125449ef064706dcd573f5
       url: "https://github.com/bggRGjQaUbCoE/canvas_danmaku.git"
     source: git
     version: "0.2.6"
@@ -700,10 +700,10 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_native_splash
-      sha256: "8321a6d11a8d13977fa780c89de8d257cce3d841eecfb7a4cadffcc4f12d82dc"
+      sha256: "4fb9f4113350d3a80841ce05ebf1976a36de622af7d19aca0ca9a9911c7ff002"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.6"
+    version: "2.4.7"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
@@ -1097,7 +1097,7 @@ packages:
     description:
       path: media_kit
       ref: "version_1.2.5"
-      resolved-ref: ebc4b1a4a3ec3170898e2a502e17c0a25289eb53
+      resolved-ref: bc999bf181ddf12d60891f76e41359e4177b93a7
       url: "https://github.com/bggRGjQaUbCoE/media-kit.git"
     source: git
     version: "1.1.11"
@@ -1106,7 +1106,7 @@ packages:
     description:
       path: "libs/android/media_kit_libs_android_video"
       ref: "version_1.2.5"
-      resolved-ref: ebc4b1a4a3ec3170898e2a502e17c0a25289eb53
+      resolved-ref: bc999bf181ddf12d60891f76e41359e4177b93a7
       url: "https://github.com/bggRGjQaUbCoE/media-kit.git"
     source: git
     version: "1.3.7"
@@ -1139,7 +1139,7 @@ packages:
     description:
       path: "libs/universal/media_kit_libs_video"
       ref: "version_1.2.5"
-      resolved-ref: ebc4b1a4a3ec3170898e2a502e17c0a25289eb53
+      resolved-ref: bc999bf181ddf12d60891f76e41359e4177b93a7
       url: "https://github.com/bggRGjQaUbCoE/media-kit.git"
     source: git
     version: "1.0.5"
@@ -1148,7 +1148,7 @@ packages:
     description:
       path: "libs/windows/media_kit_libs_windows_video"
       ref: "version_1.2.5"
-      resolved-ref: ebc4b1a4a3ec3170898e2a502e17c0a25289eb53
+      resolved-ref: bc999bf181ddf12d60891f76e41359e4177b93a7
       url: "https://github.com/bggRGjQaUbCoE/media-kit.git"
     source: git
     version: "1.0.10"
@@ -1157,7 +1157,7 @@ packages:
     description:
       path: media_kit_native_event_loop
       ref: "version_1.2.5"
-      resolved-ref: ebc4b1a4a3ec3170898e2a502e17c0a25289eb53
+      resolved-ref: bc999bf181ddf12d60891f76e41359e4177b93a7
       url: "https://github.com/bggRGjQaUbCoE/media-kit.git"
     source: git
     version: "1.0.9"
@@ -1166,7 +1166,7 @@ packages:
     description:
       path: media_kit_video
       ref: "version_1.2.5"
-      resolved-ref: ebc4b1a4a3ec3170898e2a502e17c0a25289eb53
+      resolved-ref: bc999bf181ddf12d60891f76e41359e4177b93a7
       url: "https://github.com/bggRGjQaUbCoE/media-kit.git"
     source: git
     version: "1.2.5"
@@ -2012,4 +2012,4 @@ packages:
     version: "3.1.3"
 sdks:
   dart: ">=3.9.0 <4.0.0"
-  flutter: "3.35.5"
+  flutter: "3.35.6"

pubspec.yaml

@@ -21,7 +21,7 @@ version: 1.1.4+1
 
 environment:
   sdk: ">=3.9.0 <4.0.0"
-  flutter: 3.35.5 # update `.fvmrc` config
+  flutter: 3.35.6 # update `.fvmrc` config
 
 # Dependencies specify other packages that your package needs in order to work.
 # To automatically upgrade your package dependencies to the latest versions