feat: 拆分设置，新增音频输出、缓冲区、竖屏扩展显示设置

lib/pages/setting/play_setting.dart

@@ -3,7 +3,6 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
-import 'package:PiliPalaX/models/video/play/quality.dart';
 import 'package:PiliPalaX/pages/setting/widgets/select_dialog.dart';
 import 'package:PiliPalaX/plugin/pl_player/index.dart';
 import 'package:PiliPalaX/services/service_locator.dart';
@@ -21,10 +20,6 @@ class PlaySetting extends StatefulWidget {
 
 class _PlaySettingState extends State<PlaySetting> {
   Box setting = GStrorage.setting;
-  late dynamic defaultVideoQa;
-  late dynamic defaultAudioQa;
-  late dynamic defaultDecode;
-  late dynamic secondDecode;
   late String defaultSubtitlePreference;
   late int defaultFullScreenMode;
   late int defaultBtmProgressBehavior;
@@ -32,14 +27,6 @@ class _PlaySettingState extends State<PlaySetting> {
   @override
   void initState() {
     super.initState();
-    defaultVideoQa = setting.get(SettingBoxKey.defaultVideoQa,
-        defaultValue: VideoQuality.values.last.code);
-    defaultAudioQa = setting.get(SettingBoxKey.defaultAudioQa,
-        defaultValue: AudioQuality.values.last.code);
-    defaultDecode = setting.get(SettingBoxKey.defaultDecode,
-        defaultValue: VideoDecodeFormats.values.last.code);
-    secondDecode = setting.get(SettingBoxKey.secondDecode,
-        defaultValue: VideoDecodeFormats.values[1].code);
     defaultFullScreenMode = setting.get(SettingBoxKey.fullScreenMode,
         defaultValue: FullScreenMode.values.first.code);
     defaultBtmProgressBehavior = setting.get(SettingBoxKey.btmProgressBehavior,
@@ -68,7 +55,7 @@ class _PlaySettingState extends State<PlaySetting> {
         centerTitle: false,
         titleSpacing: 0,
         title: Text(
-          '播放设置',
+          '播放器设置',
           style: Theme.of(context).textTheme.titleMedium,
         ),
       ),
@@ -125,6 +112,12 @@ class _PlaySettingState extends State<PlaySetting> {
               }
             },
           ),
+          const SetSwitchItem(
+            title: '竖屏扩大展示',
+            subTitle: '小屏竖屏视频由16:9扩大至5:4展示（！暂不支持临时收起）',
+            setKey: SettingBoxKey.enableVerticalExpand,
+            defaultVal: false,
+          ),
           const SetSwitchItem(
             title: '自动全屏',
             subTitle: '视频开始播放时进入全屏',
@@ -162,134 +155,6 @@ class _PlaySettingState extends State<PlaySetting> {
             setKey: SettingBoxKey.enableOnlineTotal,
             defaultVal: false,
           ),
-          ListTile(
-            dense: false,
-            title: Text('默认画质', style: titleStyle),
-            subtitle: Text(
-              '当前画质：${VideoQualityCode.fromCode(defaultVideoQa)!.description!}',
-              style: subTitleStyle,
-            ),
-            onTap: () async {
-              int? result = await showDialog(
-                context: context,
-                builder: (context) {
-                  return SelectDialog<int>(
-                      title: '默认画质',
-                      value: defaultVideoQa,
-                      values: VideoQuality.values.reversed.map((e) {
-                        return {'title': e.description, 'value': e.code};
-                      }).toList());
-                },
-              );
-              if (result != null) {
-                defaultVideoQa = result;
-                setting.put(SettingBoxKey.defaultVideoQa, result);
-                setState(() {});
-              }
-            },
-          ),
-          ListTile(
-            dense: false,
-            title: Text('默认音质', style: titleStyle),
-            subtitle: Text(
-              '当前音质：${AudioQualityCode.fromCode(defaultAudioQa)!.description!}',
-              style: subTitleStyle,
-            ),
-            onTap: () async {
-              int? result = await showDialog(
-                context: context,
-                builder: (context) {
-                  return SelectDialog<int>(
-                      title: '默认音质',
-                      value: defaultAudioQa,
-                      values: AudioQuality.values.reversed.map((e) {
-                        return {'title': e.description, 'value': e.code};
-                      }).toList());
-                },
-              );
-              if (result != null) {
-                defaultAudioQa = result;
-                setting.put(SettingBoxKey.defaultAudioQa, result);
-                setState(() {});
-              }
-            },
-          ),
-          ListTile(
-            dense: false,
-            title: Text('首选解码格式', style: titleStyle),
-            subtitle: Text(
-              '首选解码格式：${VideoDecodeFormatsCode.fromCode(defaultDecode)!.description!}，请根据设备支持情况与需求调整',
-              style: subTitleStyle,
-            ),
-            onTap: () async {
-              String? result = await showDialog(
-                context: context,
-                builder: (context) {
-                  return SelectDialog<String>(
-                      title: '默认解码格式',
-                      value: defaultDecode,
-                      values: VideoDecodeFormats.values.map((e) {
-                        return {'title': e.description, 'value': e.code};
-                      }).toList());
-                },
-              );
-              if (result != null) {
-                defaultDecode = result;
-                setting.put(SettingBoxKey.defaultDecode, result);
-                setState(() {});
-              }
-            },
-          ),
-          ListTile(
-            dense: false,
-            title: Text('次选解码格式', style: titleStyle),
-            subtitle: Text(
-              '非杜比视频次选：${VideoDecodeFormatsCode.fromCode(secondDecode)!.description!}，仍无则选择首个提供的解码格式',
-              style: subTitleStyle,
-            ),
-            onTap: () async {
-              String? result = await showDialog(
-                context: context,
-                builder: (context) {
-                  return SelectDialog<String>(
-                      title: '次选解码格式',
-                      value: secondDecode,
-                      values: VideoDecodeFormats.values.map((e) {
-                        return {'title': e.description, 'value': e.code};
-                      }).toList());
-                },
-              );
-              if (result != null) {
-                secondDecode = result;
-                setting.put(SettingBoxKey.secondDecode, result);
-                setState(() {});
-              }
-            },
-          ),
-          const SetSwitchItem(
-            title: '开启硬解',
-            subTitle: '以较低功耗播放视频，若使用中异常卡死，请尝试关闭',
-            setKey: SettingBoxKey.enableHA,
-            defaultVal: true,
-          ),
-          const SetSwitchItem(
-            title: '亮度记忆',
-            subTitle: '返回时自动调整视频亮度',
-            setKey: SettingBoxKey.enableAutoBrightness,
-            defaultVal: false,
-          ),
-          const SetSwitchItem(
-            title: '免登录1080P',
-            subTitle: '免登录查看1080P视频',
-            setKey: SettingBoxKey.p1080,
-            defaultVal: true,
-          ),
-          const SetSwitchItem(
-            title: 'CDN优化',
-            subTitle: '使用优质CDN线路',
-            setKey: SettingBoxKey.enableCDN,
-            defaultVal: true,
-          ),
           ListTile(
             dense: false,
             title: Text('默认全屏方式', style: titleStyle),

lib/pages/setting/video_setting.dart

@@ -0,0 +1,203 @@
+import 'dart:io';
+
+import 'package:flutter/material.dart';
+import 'package:hive/hive.dart';
+import 'package:PiliPalaX/models/video/play/quality.dart';
+import 'package:PiliPalaX/pages/setting/widgets/select_dialog.dart';
+import 'package:PiliPalaX/plugin/pl_player/index.dart';
+import 'package:PiliPalaX/utils/storage.dart';
+
+import '../../models/video/play/subtitle.dart';
+import 'widgets/switch_item.dart';
+
+class VideoSetting extends StatefulWidget {
+  const VideoSetting({super.key});
+
+  @override
+  State<VideoSetting> createState() => _VideoSettingState();
+}
+
+class _VideoSettingState extends State<VideoSetting> {
+  Box setting = GStrorage.setting;
+  late dynamic defaultVideoQa;
+  late dynamic defaultAudioQa;
+  late dynamic defaultDecode;
+  late dynamic secondDecode;
+
+  @override
+  void initState() {
+    super.initState();
+    defaultVideoQa = setting.get(SettingBoxKey.defaultVideoQa,
+        defaultValue: VideoQuality.values.last.code);
+    defaultAudioQa = setting.get(SettingBoxKey.defaultAudioQa,
+        defaultValue: AudioQuality.values.last.code);
+    defaultDecode = setting.get(SettingBoxKey.defaultDecode,
+        defaultValue: VideoDecodeFormats.values.last.code);
+    secondDecode = setting.get(SettingBoxKey.secondDecode,
+        defaultValue: VideoDecodeFormats.values[1].code);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    TextStyle titleStyle = Theme.of(context).textTheme.titleMedium!;
+    TextStyle subTitleStyle = Theme.of(context)
+        .textTheme
+        .labelMedium!
+        .copyWith(color: Theme.of(context).colorScheme.outline);
+    return Scaffold(
+      appBar: AppBar(
+        centerTitle: false,
+        titleSpacing: 0,
+        title: Text(
+          '音视频设置',
+          style: Theme.of(context).textTheme.titleMedium,
+        ),
+      ),
+      body: ListView(
+        children: [
+          const SetSwitchItem(
+            title: '开启硬解',
+            subTitle: '以较低功耗播放视频，若遇异常卡死，请尝试关闭',
+            setKey: SettingBoxKey.enableHA,
+            defaultVal: true,
+          ),
+          const SetSwitchItem(
+            title: '亮度记忆',
+            subTitle: '返回时自动调整视频亮度',
+            setKey: SettingBoxKey.enableAutoBrightness,
+            defaultVal: false,
+          ),
+          const SetSwitchItem(
+            title: '免登录1080P',
+            subTitle: '免登录查看1080P视频',
+            setKey: SettingBoxKey.p1080,
+            defaultVal: true,
+          ),
+          const SetSwitchItem(
+            title: 'CDN优化',
+            subTitle: '使用优质CDN线路',
+            setKey: SettingBoxKey.enableCDN,
+            defaultVal: true,
+          ),
+          ListTile(
+            dense: false,
+            title: Text('默认画质', style: titleStyle),
+            subtitle: Text(
+              '当前画质：${VideoQualityCode.fromCode(defaultVideoQa)!.description!}',
+              style: subTitleStyle,
+            ),
+            onTap: () async {
+              int? result = await showDialog(
+                context: context,
+                builder: (context) {
+                  return SelectDialog<int>(
+                      title: '默认画质',
+                      value: defaultVideoQa,
+                      values: VideoQuality.values.reversed.map((e) {
+                        return {'title': e.description, 'value': e.code};
+                      }).toList());
+                },
+              );
+              if (result != null) {
+                defaultVideoQa = result;
+                setting.put(SettingBoxKey.defaultVideoQa, result);
+                setState(() {});
+              }
+            },
+          ),
+          ListTile(
+            dense: false,
+            title: Text('默认音质', style: titleStyle),
+            subtitle: Text(
+              '当前音质：${AudioQualityCode.fromCode(defaultAudioQa)!.description!}',
+              style: subTitleStyle,
+            ),
+            onTap: () async {
+              int? result = await showDialog(
+                context: context,
+                builder: (context) {
+                  return SelectDialog<int>(
+                      title: '默认音质',
+                      value: defaultAudioQa,
+                      values: AudioQuality.values.reversed.map((e) {
+                        return {'title': e.description, 'value': e.code};
+                      }).toList());
+                },
+              );
+              if (result != null) {
+                defaultAudioQa = result;
+                setting.put(SettingBoxKey.defaultAudioQa, result);
+                setState(() {});
+              }
+            },
+          ),
+          ListTile(
+            dense: false,
+            title: Text('首选解码格式', style: titleStyle),
+            subtitle: Text(
+              '首选解码格式：${VideoDecodeFormatsCode.fromCode(defaultDecode)!.description!}，请根据设备支持情况与需求调整',
+              style: subTitleStyle,
+            ),
+            onTap: () async {
+              String? result = await showDialog(
+                context: context,
+                builder: (context) {
+                  return SelectDialog<String>(
+                      title: '默认解码格式',
+                      value: defaultDecode,
+                      values: VideoDecodeFormats.values.map((e) {
+                        return {'title': e.description, 'value': e.code};
+                      }).toList());
+                },
+              );
+              if (result != null) {
+                defaultDecode = result;
+                setting.put(SettingBoxKey.defaultDecode, result);
+                setState(() {});
+              }
+            },
+          ),
+          ListTile(
+            dense: false,
+            title: Text('次选解码格式', style: titleStyle),
+            subtitle: Text(
+              '非杜比视频次选：${VideoDecodeFormatsCode.fromCode(secondDecode)!.description!}，仍无则选择首个提供的解码格式',
+              style: subTitleStyle,
+            ),
+            onTap: () async {
+              String? result = await showDialog(
+                context: context,
+                builder: (context) {
+                  return SelectDialog<String>(
+                      title: '次选解码格式',
+                      value: secondDecode,
+                      values: VideoDecodeFormats.values.map((e) {
+                        return {'title': e.description, 'value': e.code};
+                      }).toList());
+                },
+              );
+              if (result != null) {
+                secondDecode = result;
+                setting.put(SettingBoxKey.secondDecode, result);
+                setState(() {});
+              }
+            },
+          ),
+          if (Platform.isAndroid)
+            const SetSwitchItem(
+              title: '优先使用 OpenSL ES 输出音频',
+              subTitle: '关闭则优先使用AudioTrack输出音频（此项即mpv的--ao）',
+              setKey: SettingBoxKey.useOpenSLES,
+              defaultVal: true,
+            ),
+          const SetSwitchItem(
+            title: '扩大缓冲区',
+            subTitle: '默认缓冲区为视频5MB/直播32MB，开启后为视频32MB/直播64MB，但会延长首次加载时间',
+            setKey: SettingBoxKey.expandBuffer,
+            defaultVal: false,
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/pages/setting/view.dart

@@ -33,23 +33,30 @@ class SettingPage extends StatelessWidget {
           ListTile(
             onTap: () => Get.toNamed('/recommendSetting'),
             dense: false,
-            leading: const Icon(Icons.grid_view_outlined),
+            leading: const Icon(Icons.explore_outlined),
             title: const Text('推荐流设置'),
             subtitle: Text('推荐来源（web/app）、刷新保留内容、过滤器', style: subTitleStyle),
           ),
           ListTile(
-            onTap: () => Get.toNamed('/playSetting'),
-            leading: const Icon(Icons.play_arrow_outlined),
+            onTap: () => Get.toNamed('/videoSetting'),
+            leading: const Icon(Icons.video_settings_outlined),
             dense: false,
-            title: const Text('播放设置'),
-            subtitle: Text('弹幕、字幕、播放器行为与手势、画质、音质、解码、底部进度条等', style: subTitleStyle),
+            title: const Text('音视频设置'),
+            subtitle: Text('画质、音质、解码、缓冲、音频输出等', style: subTitleStyle),
+          ),
+          ListTile(
+            onTap: () => Get.toNamed('/playSetting'),
+            leading: const Icon(Icons.touch_app_outlined),
+            dense: false,
+            title: const Text('播放器设置'),
+            subtitle: Text('双击/长按、全屏、后台播放、弹幕、字幕、底部进度条等', style: subTitleStyle),
           ),
           ListTile(
             onTap: () => Get.toNamed('/styleSetting'),
             leading: const Icon(Icons.style_outlined),
             dense: false,
             title: const Text('外观设置'),
-            subtitle: Text('横屏适配、列宽、首页、主题、字号、图片、动态红点、帧率等', style: subTitleStyle),
+            subtitle: Text('横屏适配（平板）、列宽、首页、主题、字号、图片、动态红点、帧率等', style: subTitleStyle),
           ),
           ListTile(
             onTap: () => Get.toNamed('/extraSetting'),

lib/pages/video/detail/view.dart

@@ -56,6 +56,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
   late bool autoExitFullcreen;
   late bool autoPlayEnable;
   late bool horizontalScreen;
+  late bool enableVerticalExpand;
   late bool autoPiP;
   final Floating floating = Floating();
   // 生命周期监听
@@ -64,6 +65,8 @@ class _VideoDetailPageState extends State<VideoDetailPage>
   RxBool isFullScreen = false.obs;
   late StreamSubscription<bool> fullScreenStatusListener;
   late final MethodChannel onUserLeaveHintListener;
+  late AnimationController _animationController;
+  late Animation<double> _animation;
 
   @override
   void initState() {
@@ -91,6 +94,8 @@ class _VideoDetailPageState extends State<VideoDetailPage>
     autoPlayEnable =
         setting.get(SettingBoxKey.autoPlayEnable, defaultValue: true);
     autoPiP = setting.get(SettingBoxKey.autoPiP, defaultValue: false);
+    enableVerticalExpand =
+        setting.get(SettingBoxKey.enableVerticalExpand, defaultValue: false);
     videoSourceInit();
     appbarStreamListen();
     // lifecycleListener();
@@ -103,6 +108,19 @@ class _VideoDetailPageState extends State<VideoDetailPage>
         }
       }
     });
+    // _animationController = AnimationController(
+    //   vsync: this,
+    //   duration: const Duration(milliseconds: 300),
+    // );
+    // _animation = Tween<double>(
+    //   begin: MediaQuery.of(context).orientation == Orientation.landscape
+    //       ? context.height
+    //       : ((enableVerticalExpand &&
+    //               plPlayerController?.direction.value == 'vertical')
+    //           ? context.width * 5 / 4
+    //           : context.width * 9 / 16),
+    //   end: 0,
+    // ).animate(_animationController);
   }
 
   // 获取视频资源，初始化播放器
@@ -233,6 +251,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
     videoPlayerServiceHandler.onVideoDetailDispose();
     // _lifecycleListener.dispose();
     showStatusBar();
+    // _animationController.dispose();
     super.dispose();
   }
 
@@ -341,12 +360,14 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                 children: [
                   Obx(
                     () {
-                      final double videoheight = Get.width * 9 / 16;
-                      // final double videoheight =
-                      //     plPlayerController?.direction.value == 'vertical'
-                      //         ? Get.width
-                      //         : Get.width * 9 / 16;
-                      final double videowidth = Get.width;
+                      double videoheight = context.width * 9 / 16;
+                      final double videowidth = context.width;
+                      print(videoDetailController.tabCtr.index);
+                      if (enableVerticalExpand &&
+                          plPlayerController?.direction.value == 'vertical' &&
+                          videoDetailController.tabCtr.index != 1) {
+                        videoheight = context.width * 5 / 4;
+                      }
                       return SizedBox(
                         height: MediaQuery.of(context).orientation ==
                                     Orientation.landscape ||
@@ -357,7 +378,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                     ? 0
                                     : MediaQuery.of(context).padding.top)
                             : videoheight,
-                        width: MediaQuery.of(context).size.width,
+                        width: context.width,
                         child: PopScope(
                             canPop: isFullScreen.value != true &&
                                 (horizontalScreen ||
@@ -514,7 +535,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                           Opacity(
                             opacity: 0,
                             child: SizedBox(
-                              width: double.infinity,
+                              width: context.width,
                               height: 0,
                               child: Obx(
                                 () => TabBar(
@@ -598,9 +619,9 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                 // 1812x+2176y+1985.68z=680
                 // 1080x+2340y+1589.72z=540
                 final double videoheight =
-                    sqrt(Get.height * Get.width) * 12.972 -
-                        Get.height * 7.928 -
-                        Get.width * 4.923;
+                    sqrt(context.height * context.width) * 12.972 -
+                        context.height * 7.928 -
+                        context.width * 4.923;
                 final double videowidth = videoheight * 16 / 9;
                 return Row(
                   children: [
@@ -608,10 +629,10 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                       children: [
                         SizedBox(
                             width: isFullScreen.value == true
-                                ? Get.width
+                                ? context.width
                                 : videowidth,
                             height: isFullScreen.value == true
-                                ? Get.height
+                                ? context.height
                                 : videoheight,
                             child: PopScope(
                                 canPop: isFullScreen.value != true,
@@ -758,11 +779,11 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                 ))),
                         SizedBox(
                           width: isFullScreen.value == true
-                              ? Get.width
+                              ? context.width
                               : videowidth,
                           height: isFullScreen.value == true
                               ? 0
-                              : Get.height -
+                              : context.height -
                                   videoheight -
                                   MediaQuery.of(context).padding.top -
                                   MediaQuery.of(context).padding.bottom,
@@ -781,11 +802,11 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                     SizedBox(
                       width: isFullScreen.value == true
                           ? 0
-                          : (Get.width -
+                          : (context.width -
                               MediaQuery.of(context).padding.left -
                               MediaQuery.of(context).padding.right -
                               videowidth),
-                      height: Get.height -
+                      height: context.height -
                           MediaQuery.of(context).padding.top -
                           MediaQuery.of(context).padding.bottom,
                       child: TabBarView(