Merge remote-tracking branch 'upstream/main'

2025-12-06 09:13:48 +08:00 · 2024-02-24 10:46:18 +08:00
parent ba5d99008a cb0ff334b3
commit 098b4ad8ad
13 changed files with 187 additions and 50 deletions
--- a/lib/pages/about/index.dart
+++ b/lib/pages/about/index.dart
@@ -236,11 +236,26 @@ class AboutController extends GetxController {
    );
  }

+  githubRelease() {
+    launchUrl(
+      Uri.parse('https://github.com/guozhigq/pilipala/release'),
+      mode: LaunchMode.externalApplication,
+    );
+  }
+
  // 从网盘下载
  panDownload() {
-    launchUrl(
-      Uri.parse('https://www.123pan.com/s/9sVqVv-flu0A.html'),
-      mode: LaunchMode.externalApplication,
+    Clipboard.setData(
+      const ClipboardData(text: 'pili'),
+    );
+    SmartDialog.showToast(
+      '已复制提取码：pili',
+      displayTime: const Duration(milliseconds: 500),
+    ).then(
+      (value) => launchUrl(
+        Uri.parse('https://www.123pan.com/s/9sVqVv-flu0A.html'),
+        mode: LaunchMode.externalApplication,
+      ),
    );
  }
  // 问题反馈
--- a/lib/pages/home/controller.dart
+++ b/lib/pages/home/controller.dart
@@ -26,6 +26,7 @@ class HomeController extends GetxController with GetTickerProviderStateMixin {
  late List defaultTabs;
  late List<String> tabbarSort;
  RxString defaultSearch = ''.obs;
+  late bool enableGradientBg;

  @override
  void onInit() {
@@ -40,6 +41,8 @@ class HomeController extends GetxController with GetTickerProviderStateMixin {
    if (setting.get(SettingBoxKey.enableSearchWord, defaultValue: true)) {
      searchDefault();
    }
+    enableGradientBg =
+        setting.get(SettingBoxKey.enableGradientBg, defaultValue: true);
  }

  void onRefresh() {
--- a/lib/pages/home/view.dart
+++ b/lib/pages/home/view.dart
@@ -48,38 +48,48 @@ class _HomePageState extends State<HomePage>
    super.build(context);
    Brightness currentBrightness = MediaQuery.of(context).platformBrightness;
    // 设置状态栏图标的亮度
-    SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
-      statusBarIconBrightness: currentBrightness == Brightness.light
-          ? Brightness.dark
-          : Brightness.light,
-    ));
+    if (_homeController.enableGradientBg) {
+      SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
+        statusBarIconBrightness: currentBrightness == Brightness.light
+            ? Brightness.dark
+            : Brightness.light,
+      ));
+    }
    return Scaffold(
      extendBody: true,
      extendBodyBehindAppBar: true,
      body: Stack(
        children: [
          // gradient background
-          Align(
-            alignment: Alignment.topLeft,
-            child: Opacity(
-              opacity: 0.6,
-              child: Container(
-                width: MediaQuery.of(context).size.width,
-                height: MediaQuery.of(context).size.height,
-                decoration: BoxDecoration(
-                  gradient: LinearGradient(
-                      colors: [
-                        Theme.of(context).colorScheme.primary.withOpacity(0.9),
-                        Theme.of(context).colorScheme.primary.withOpacity(0.5),
-                        Theme.of(context).colorScheme.surface
-                      ],
-                      begin: Alignment.topLeft,
-                      end: Alignment.bottomRight,
-                      stops: const [0, 0.0034, 0.34]),
+          if (_homeController.enableGradientBg) ...[
+            Align(
+              alignment: Alignment.topLeft,
+              child: Opacity(
+                opacity: 0.6,
+                child: Container(
+                  width: MediaQuery.of(context).size.width,
+                  height: MediaQuery.of(context).size.height,
+                  decoration: BoxDecoration(
+                    gradient: LinearGradient(
+                        colors: [
+                          Theme.of(context)
+                              .colorScheme
+                              .primary
+                              .withOpacity(0.9),
+                          Theme.of(context)
+                              .colorScheme
+                              .primary
+                              .withOpacity(0.5),
+                          Theme.of(context).colorScheme.surface
+                        ],
+                        begin: Alignment.topLeft,
+                        end: Alignment.bottomRight,
+                        stops: const [0, 0.0034, 0.34]),
+                  ),
                ),
              ),
            ),
-          ),
+          ],
          Column(
            children: [
              CustomAppBar(
@@ -90,7 +100,37 @@ class _HomePageState extends State<HomePage>
                callback: showUserBottomSheet,
              ),
              if (_homeController.tabs.length > 1) ...[
-                const CustomTabs(),
+                if (_homeController.enableGradientBg) ...[
+                  const CustomTabs(),
+                ] else ...[
+                  const SizedBox(height: 4),
+                  SizedBox(
+                    width: double.infinity,
+                    height: 42,
+                    child: Align(
+                      alignment: Alignment.center,
+                      child: TabBar(
+                        controller: _homeController.tabController,
+                        tabs: [
+                          for (var i in _homeController.tabs)
+                            Tab(text: i['label'])
+                        ],
+                        isScrollable: true,
+                        dividerColor: Colors.transparent,
+                        enableFeedback: true,
+                        splashBorderRadius: BorderRadius.circular(10),
+                        tabAlignment: TabAlignment.center,
+                        onTap: (value) {
+                          feedBack();
+                          if (_homeController.initialIndex.value == value) {
+                            _homeController.tabsCtrList[value]().animateToTop();
+                          }
+                          _homeController.initialIndex.value = value;
+                        },
+                      ),
+                    ),
+                  ),
+                ],
              ] else ...[
                const SizedBox(height: 6),
              ],
--- a/lib/pages/live_room/controller.dart
+++ b/lib/pages/live_room/controller.dart
@@ -4,6 +4,8 @@ import 'package:PiliPalaX/http/live.dart';
 import 'package:PiliPalaX/models/live/room_info.dart';
 import 'package:PiliPalaX/plugin/pl_player/index.dart';
 import '../../models/live/room_info_h5.dart';
+import '../../utils/storage.dart';
+import '../../utils/video_utils.dart';

 class LiveRoomController extends GetxController {
  String cover = '';
@@ -16,6 +18,7 @@ class LiveRoomController extends GetxController {
  PlPlayerController plPlayerController =
      PlPlayerController.getInstance(videoType: 'live');
  Rx<RoomInfoH5Model> roomInfoH5 = RoomInfoH5Model().obs;
+  late bool enableCDN;

  @override
  void onInit() {
@@ -31,6 +34,8 @@ class LiveRoomController extends GetxController {
        cover = liveItem.cover;
      }
    }
+    // CDN优化
+    enableCDN = setting.get(SettingBoxKey.enableCDN, defaultValue: true);
  }

  playerInit(source) async {
@@ -57,9 +62,11 @@ class LiveRoomController extends GetxController {
      List<CodecItem> codec =
          res['data'].playurlInfo.playurl.stream.first.format.first.codec;
      CodecItem item = codec.first;
-      String videoUrl = (item.urlInfo?.first.host)! +
-          item.baseUrl! +
-          item.urlInfo!.first.extra!;
+      String videoUrl = enableCDN
+          ? VideoUtils.getCdnUrl(item)
+          : (item.urlInfo?.first.host)! +
+              item.baseUrl! +
+              item.urlInfo!.first.extra!;
      await playerInit(videoUrl);
      return res;
    }
--- a/lib/pages/setting/style_setting.dart
+++ b/lib/pages/setting/style_setting.dart
@@ -102,6 +102,12 @@ class _StyleSettingState extends State<StyleSetting> {
            defaultVal: true,
            needReboot: true,
          ),
+          const SetSwitchItem(
+            title: '首页底栏背景渐变',
+            setKey: SettingBoxKey.enableGradientBg,
+            defaultVal: true,
+            needReboot: true,
+          ),
          ListTile(
            onTap: () async {
              double? result = await showDialog(
--- a/lib/pages/video/detail/reply/widgets/reply_item.dart
+++ b/lib/pages/video/detail/reply/widgets/reply_item.dart
@@ -507,6 +507,7 @@ InlineSpan buildContent(
  // 构建正则表达式
  final List<String> specialTokens = [
    ...content.emote.keys,
+    ...content.topicsMeta?.keys?.map((e) => '#$e#') ?? [],
    ...content.atNameToMid.keys.map((e) => '@$e'),
    ...content.jumpUrl.keys.map((e) =>
        e.replaceAll('?', '\\?').replaceAll('+', '\\+').replaceAll('*', '\\*')),
@@ -590,7 +591,7 @@ InlineSpan buildContent(
          ),
        );
      } else {
-        // print("matchStr=$matchStr");
+        print("matchStr=$matchStr");
        String appUrlSchema = '';
        final bool enableWordRe = setting.get(SettingBoxKey.enableWordRe,
            defaultValue: false) as bool;
@@ -693,6 +694,23 @@ InlineSpan buildContent(
          );
          // 只显示一次
          matchedStrs.add(matchStr);
+        } else if (content
+                .topicsMeta[matchStr.substring(1, matchStr.length - 1)] !=
+            null) {
+          spanChilds.add(
+            TextSpan(
+              text: matchStr,
+              style: TextStyle(
+                color: Theme.of(context).colorScheme.primary,
+              ),
+              recognizer: TapGestureRecognizer()
+                ..onTap = () {
+                  final String topic =
+                      matchStr.substring(1, matchStr.length - 1);
+                  Get.toNamed('/searchResult', parameters: {'keyword': topic});
+                },
+            ),
+          );
        } else {
          addPlainTextSpan(matchStr);
        }