Merge branch 'main' into feature-liveRoomRender

2024-03-16 23:35:18 +08:00
parent da2bbeedff a57f5e8b2f
commit a37f3b8b5b
116 changed files with 5099 additions and 2153 deletions
--- a/lib/pages/setting/controller.dart
+++ b/lib/pages/setting/controller.dart
@ -8,6 +8,7 @@ import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/login.dart';
 import 'package:pilipala/utils/storage.dart';
 import '../../models/common/dynamic_badge_mode.dart';
+import '../../models/common/nav_bar_config.dart';
 import '../main/index.dart';
 import 'widgets/select_dialog.dart';

@ -23,6 +24,7 @@ class SettingController extends GetxController {
  Rx<ThemeType> themeType = ThemeType.system.obs;
  var userInfo;
  Rx<DynamicBadgeMode> dynamicBadgeType = DynamicBadgeMode.number.obs;
+  RxInt defaultHomePage = 0.obs;

  @override
  void onInit() {
@ -40,6 +42,8 @@ class SettingController extends GetxController {
    dynamicBadgeType.value = DynamicBadgeMode.values[setting.get(
        SettingBoxKey.dynamicBadgeMode,
        defaultValue: DynamicBadgeMode.number.code)];
+    defaultHomePage.value =
+        setting.get(SettingBoxKey.defaultHomePage, defaultValue: 0);
  }

  loginOut() async {
@ -110,4 +114,24 @@ class SettingController extends GetxController {
      SmartDialog.showToast('设置成功');
    }
  }
+
+  // 设置默认启动页
+  seteDefaultHomePage(BuildContext context) async {
+    int? result = await showDialog(
+      context: context,
+      builder: (context) {
+        return SelectDialog<int>(
+            title: '首页启动页',
+            value: defaultHomePage.value,
+            values: defaultNavigationBars.map((e) {
+              return {'title': e['label'], 'value': e['id']};
+            }).toList());
+      },
+    );
+    if (result != null) {
+      defaultHomePage.value = result;
+      setting.put(SettingBoxKey.defaultHomePage, result);
+      SmartDialog.showToast('设置成功，重启生效');
+    }
+  }
 }
--- a/lib/pages/setting/extra_setting.dart
+++ b/lib/pages/setting/extra_setting.dart
@ -1,11 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
+import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/models/common/dynamics_type.dart';
 import 'package:pilipala/models/common/reply_sort_type.dart';
 import 'package:pilipala/pages/setting/widgets/select_dialog.dart';
 import 'package:pilipala/utils/storage.dart';

+import '../home/index.dart';
 import 'widgets/switch_item.dart';

 class ExtraSetting extends StatefulWidget {
@ -138,18 +140,20 @@ class _ExtraSettingState extends State<ExtraSetting> {
      ),
      body: ListView(
        children: [
-          SetSwitchItem(
+          const SetSwitchItem(
            title: '大家都在搜',
            subTitle: '是否展示「大家都在搜」',
            setKey: SettingBoxKey.enableHotKey,
            defaultVal: true,
-            callFn: (val) => {SmartDialog.showToast('下次启动时生效')},
          ),
-          const SetSwitchItem(
+          SetSwitchItem(
            title: '搜索默认词',
            subTitle: '是否展示搜索框默认词',
            setKey: SettingBoxKey.enableSearchWord,
            defaultVal: true,
+            callFn: (val) {
+              Get.find<HomeController>().defaultSearch.value = '';
+            },
          ),
          const SetSwitchItem(
            title: '快速收藏',
@ -169,6 +173,12 @@ class _ExtraSettingState extends State<ExtraSetting> {
            setKey: SettingBoxKey.enableAi,
            defaultVal: true,
          ),
+          const SetSwitchItem(
+            title: '相关视频推荐',
+            subTitle: '视频详情页推荐相关视频',
+            setKey: SettingBoxKey.enableRelatedVideo,
+            defaultVal: true,
+          ),
          ListTile(
            dense: false,
            title: Text('评论展示', style: titleStyle),
--- a/lib/pages/setting/pages/home_tabbar_set.dart
+++ b/lib/pages/setting/pages/home_tabbar_set.dart
@ -40,10 +40,6 @@ class _TabbarSetPageState extends State<TabbarSetPage> {
        .where((i) => tabbarSort.contains((i['type'] as TabType).id))
        .map<String>((i) => (i['type'] as TabType).id)
        .toList();
-    if (sortedTabbar.isEmpty) {
-      SmartDialog.showToast('请至少设置一项！');
-      return;
-    }
    settingStorage.put(SettingBoxKey.tabbarSort, sortedTabbar);
    SmartDialog.showToast('保存成功，下次启动时生效');
  }
--- a/lib/pages/setting/pages/play_gesture_set.dart
+++ b/lib/pages/setting/pages/play_gesture_set.dart
@ -0,0 +1,88 @@
+import 'package:flutter/material.dart';
+import 'package:hive/hive.dart';
+import 'package:pilipala/utils/global_data.dart';
+
+import '../../../models/common/gesture_mode.dart';
+import '../../../utils/storage.dart';
+import '../widgets/select_dialog.dart';
+import '../widgets/switch_item.dart';
+
+class PlayGesturePage extends StatefulWidget {
+  const PlayGesturePage({super.key});
+
+  @override
+  State<PlayGesturePage> createState() => _PlayGesturePageState();
+}
+
+class _PlayGesturePageState extends State<PlayGesturePage> {
+  Box setting = GStrorage.setting;
+  late int fullScreenGestureMode;
+
+  @override
+  void initState() {
+    super.initState();
+    fullScreenGestureMode = setting.get(SettingBoxKey.fullScreenGestureMode,
+        defaultValue: FullScreenGestureMode.values.last.index);
+  }
+
+  @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: [
+          ListTile(
+            dense: false,
+            title: Text('全屏手势', style: titleStyle),
+            subtitle: Text(
+              '通过手势快速进入全屏',
+              style: subTitleStyle,
+            ),
+            onTap: () async {
+              String? result = await showDialog(
+                context: context,
+                builder: (context) {
+                  return SelectDialog<String>(
+                      title: '全屏手势',
+                      value: FullScreenGestureMode
+                          .values[fullScreenGestureMode].values,
+                      values: FullScreenGestureMode.values.map((e) {
+                        return {'title': e.labels, 'value': e.values};
+                      }).toList());
+                },
+              );
+              if (result != null) {
+                GlobalData().fullScreenGestureMode = FullScreenGestureMode
+                    .values
+                    .firstWhere((element) => element.values == result);
+                fullScreenGestureMode =
+                    GlobalData().fullScreenGestureMode.index;
+                setting.put(
+                    SettingBoxKey.fullScreenGestureMode, fullScreenGestureMode);
+                setState(() {});
+              }
+            },
+          ),
+          const SetSwitchItem(
+            title: '双击快退/快进',
+            subTitle: '左侧双击快退，右侧双击快进',
+            setKey: SettingBoxKey.enableQuickDouble,
+            defaultVal: true,
+          ),
+        ],
+      ),
+    );
+  }
+}
--- a/lib/pages/setting/pages/play_speed_set.dart
+++ b/lib/pages/setting/pages/play_speed_set.dart
@ -17,6 +17,7 @@ class _PlaySpeedPageState extends State<PlaySpeedPage> {
  Box videoStorage = GStrorage.video;
  Box settingStorage = GStrorage.setting;
  late double playSpeedDefault;
+  late List<double> playSpeedSystem;
  late double longPressSpeedDefault;
  late List customSpeedsList;
  late bool enableAutoLongPressSpeed;
@ -53,6 +54,9 @@ class _PlaySpeedPageState extends State<PlaySpeedPage> {
  @override
  void initState() {
    super.initState();
+    // 系统预设倍速
+    playSpeedSystem =
+        videoStorage.get(VideoBoxKey.playSpeedSystem, defaultValue: playSpeed);
    // 默认倍速
    playSpeedDefault =
        videoStorage.get(VideoBoxKey.playSpeedDefault, defaultValue: 1.0);
@ -64,6 +68,7 @@ class _PlaySpeedPageState extends State<PlaySpeedPage> {
        videoStorage.get(VideoBoxKey.customSpeedsList, defaultValue: []);
    enableAutoLongPressSpeed = settingStorage
        .get(SettingBoxKey.enableAutoLongPressSpeed, defaultValue: false);
+    // 开启动态长按倍速时不展示
    if (enableAutoLongPressSpeed) {
      Map newItem = sheetMenu[1];
      newItem['show'] = false;
@ -123,7 +128,7 @@ class _PlaySpeedPageState extends State<PlaySpeedPage> {
  }

  // 设定倍速弹窗
-  void showBottomSheet(type, i) {
+  void showBottomSheet(String type, int i) {
    showModalBottomSheet<void>(
      context: context,
      isScrollControlled: true,
@ -159,18 +164,11 @@ class _PlaySpeedPageState extends State<PlaySpeedPage> {
  }

  //
-  void menuAction(type, index, id) async {
+  void menuAction(type, int index, id) async {
    double chooseSpeed = 1.0;
-    if (type == 'system' && id == -1) {
-      SmartDialog.showToast('系统预设倍速不支持删除');
-      return;
-    }
    // 获取当前选中的倍速值
-    if (type == 'system') {
-      chooseSpeed = PlaySpeed.values[index].value;
-    } else {
-      chooseSpeed = customSpeedsList[index];
-    }
+    chooseSpeed =
+        type == 'system' ? playSpeedSystem[index] : customSpeedsList[index];
    // 设置
    if (id == 1) {
      // 设置默认倍速
@ -182,17 +180,22 @@ class _PlaySpeedPageState extends State<PlaySpeedPage> {
      videoStorage.put(
          VideoBoxKey.longPressSpeedDefault, longPressSpeedDefault);
    } else if (id == -1) {
-      if (customSpeedsList[index] == playSpeedDefault) {
-        playSpeedDefault = 1.0;
-        videoStorage.put(VideoBoxKey.playSpeedDefault, playSpeedDefault);
+      late List speedsList =
+          type == 'system' ? playSpeedSystem : customSpeedsList;
+      if (speedsList[index] == playSpeedDefault) {
+        SmartDialog.showToast('默认倍速不可删除');
      }
-      if (customSpeedsList[index] == longPressSpeedDefault) {
+      if (speedsList[index] == longPressSpeedDefault) {
        longPressSpeedDefault = 2.0;
        videoStorage.put(
            VideoBoxKey.longPressSpeedDefault, longPressSpeedDefault);
      }
-      customSpeedsList.removeAt(index);
-      await videoStorage.put(VideoBoxKey.customSpeedsList, customSpeedsList);
+      speedsList.removeAt(index);
+      await videoStorage.put(
+          type == 'system'
+              ? VideoBoxKey.playSpeedSystem
+              : VideoBoxKey.customSpeedsList,
+          speedsList);
    }
    setState(() {});
    SmartDialog.showToast('操作成功');
@ -249,38 +252,40 @@ class _PlaySpeedPageState extends State<PlaySpeedPage> {
                    subtitle: Text(longPressSpeedDefault.toString()),
                  )
                : const SizedBox(),
-            Padding(
-              padding: const EdgeInsets.only(
-                left: 14,
-                right: 14,
-                bottom: 10,
-                top: 20,
+            if (playSpeedSystem.isNotEmpty) ...[
+              Padding(
+                padding: const EdgeInsets.only(
+                  left: 14,
+                  right: 14,
+                  bottom: 10,
+                  top: 20,
+                ),
+                child: Text(
+                  '系统预设倍速',
+                  style: Theme.of(context).textTheme.titleMedium,
+                ),
              ),
-              child: Text(
-                '系统预设倍速',
-                style: Theme.of(context).textTheme.titleMedium,
-              ),
-            ),
-            Padding(
-              padding: const EdgeInsets.only(
-                left: 18,
-                right: 18,
-                bottom: 30,
-              ),
-              child: Wrap(
-                alignment: WrapAlignment.start,
-                spacing: 8,
-                runSpacing: 2,
-                children: [
-                  for (var i in PlaySpeed.values) ...[
-                    FilledButton.tonal(
-                      onPressed: () => showBottomSheet('system', i.index),
-                      child: Text(i.description),
-                    ),
-                  ]
-                ],
-              ),
-            ),
+              Padding(
+                padding: const EdgeInsets.only(
+                  left: 18,
+                  right: 18,
+                  bottom: 30,
+                ),
+                child: Wrap(
+                  alignment: WrapAlignment.start,
+                  spacing: 8,
+                  runSpacing: 2,
+                  children: [
+                    for (int i = 0; i < playSpeedSystem.length; i++) ...[
+                      FilledButton.tonal(
+                        onPressed: () => showBottomSheet('system', i),
+                        child: Text(playSpeedSystem[i].toString()),
+                      ),
+                    ]
+                  ],
+                ),
+              )
+            ],
            Padding(
                padding: const EdgeInsets.only(
                  left: 14,
--- a/lib/pages/setting/play_setting.dart
+++ b/lib/pages/setting/play_setting.dart
@ -7,6 +7,7 @@ import 'package:pilipala/models/video/play/quality.dart';
 import 'package:pilipala/pages/setting/widgets/select_dialog.dart';
 import 'package:pilipala/plugin/pl_player/index.dart';
 import 'package:pilipala/services/service_locator.dart';
+import 'package:pilipala/utils/global_data.dart';
 import 'package:pilipala/utils/storage.dart';

 import '../../models/live/quality.dart';
@ -77,6 +78,12 @@ class _PlaySettingState extends State<PlaySetting> {
            title: Text('倍速设置', style: titleStyle),
            subtitle: Text('设置视频播放速度', style: subTitleStyle),
          ),
+          ListTile(
+            dense: false,
+            onTap: () => Get.toNamed('/playerGestureSet'),
+            title: Text('手势设置', style: titleStyle),
+            subtitle: Text('设置播放器手势', style: subTitleStyle),
+          ),
          const SetSwitchItem(
            title: '开启1080P',
            subTitle: '免登录查看1080P视频',
@ -138,18 +145,20 @@ class _PlaySettingState extends State<PlaySetting> {
            setKey: SettingBoxKey.enableAutoBrightness,
            defaultVal: false,
          ),
-          const SetSwitchItem(
-            title: '双击快退/快进',
-            subTitle: '左侧双击快退，右侧双击快进',
-            setKey: SettingBoxKey.enableQuickDouble,
-            defaultVal: true,
-          ),
          const SetSwitchItem(
            title: '弹幕开关',
            subTitle: '展示弹幕',
            setKey: SettingBoxKey.enableShowDanmaku,
            defaultVal: false,
          ),
+          SetSwitchItem(
+              title: '控制栏动画',
+              subTitle: '播放器控制栏显示动画效果',
+              setKey: SettingBoxKey.enablePlayerControlAnimation,
+              defaultVal: true,
+              callFn: (bool val) {
+                GlobalData().enablePlayerControlAnimation = val;
+              }),
          ListTile(
            dense: false,
            title: Text('默认视频画质', style: titleStyle),
--- a/lib/pages/setting/style_setting.dart
+++ b/lib/pages/setting/style_setting.dart
@ -8,9 +8,11 @@ import 'package:pilipala/models/common/theme_type.dart';
 import 'package:pilipala/pages/setting/pages/color_select.dart';
 import 'package:pilipala/pages/setting/widgets/select_dialog.dart';
 import 'package:pilipala/pages/setting/widgets/slide_dialog.dart';
+import 'package:pilipala/utils/global_data.dart';
 import 'package:pilipala/utils/storage.dart';

 import '../../models/common/dynamic_badge_mode.dart';
+import '../../models/common/nav_bar_config.dart';
 import 'controller.dart';
 import 'widgets/switch_item.dart';

@ -28,7 +30,6 @@ class _StyleSettingState extends State<StyleSetting> {

  Box setting = GStrorage.setting;
  late int picQuality;
-  late double toastOpacity;
  late ThemeType _tempThemeValue;
  late dynamic defaultCustomRows;

@ -36,7 +37,6 @@ class _StyleSettingState extends State<StyleSetting> {
  void initState() {
    super.initState();
    picQuality = setting.get(SettingBoxKey.defaultPicQa, defaultValue: 10);
-    toastOpacity = setting.get(SettingBoxKey.defaultToastOp, defaultValue: 1.0);
    _tempThemeValue = settingController.themeType.value;
    defaultCustomRows = setting.get(SettingBoxKey.customRows, defaultValue: 2);
  }
@ -176,6 +176,8 @@ class _StyleSettingState extends State<StyleSetting> {
                                  SettingBoxKey.defaultPicQa, picQuality);
                              Get.back();
                              settingController.picQuality.value = picQuality;
+                              GlobalData().imgQuality = picQuality;
+                              SmartDialog.showToast('设置成功');
                            },
                            child: const Text('确定'),
                          )
@ -264,6 +266,14 @@ class _StyleSettingState extends State<StyleSetting> {
                '当前主题：${colorSelectController.type.value == 0 ? '动态取色' : '指定颜色'}',
                style: subTitleStyle)),
          ),
+          ListTile(
+            dense: false,
+            onTap: () => settingController.seteDefaultHomePage(context),
+            title: Text('默认启动页', style: titleStyle),
+            subtitle: Obx(() => Text(
+                '当前启动页：${defaultNavigationBars.firstWhere((e) => e['id'] == settingController.defaultHomePage.value)['label']}',
+                style: subTitleStyle)),
+          ),
          ListTile(
            dense: false,
            onTap: () => Get.toNamed('/fontSizeSetting'),