From c6b32b81f692bdf23647b8bb1d688c0685cb7f10 Mon Sep 17 00:00:00 2001
From: orz12 <ms_lyq@hotmail.com>
Date: Mon, 19 Aug 2024 07:09:17 +0800
Subject: [PATCH 01/20] =?UTF-8?q?fix:=20=E8=AF=84=E8=AE=BA=E5=8C=BAallCoun?=
 =?UTF-8?q?t=E4=B8=BA=E7=A9=BA=E6=97=B6=E4=BF=9D=E5=BA=95=E5=80=BC0?=
 =?UTF-8?q?=EF=BC=9B=E6=B7=BB=E5=8A=A0=E9=A2=9D=E5=A4=96=E7=9A=84hasData?=
 =?UTF-8?q?=E5=88=A4=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/models/video/reply/page.dart             | 2 +-
 lib/pages/dynamics/detail/controller.dart    | 2 +-
 lib/pages/dynamics/detail/view.dart          | 3 ++-
 lib/pages/html/controller.dart               | 2 +-
 lib/pages/video/detail/reply/controller.dart | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/models/video/reply/page.dart b/lib/models/video/reply/page.dart
index ee10c7ac5..37de67ada 100644
--- a/lib/models/video/reply/page.dart
+++ b/lib/models/video/reply/page.dart
@@ -53,7 +53,7 @@ class ReplyCursor {
     isEnd = json['is_end'];
     mode = json['mode'];
     modeText = json['mode_text'];
-    allCount = json['all_count'];
+    allCount = json['all_count'] ?? 0;
     supportMode = json['support_mode'].cast<int>();
     name = json['name'];
     paginationReply = json['pagination_reply'] != null
diff --git a/lib/pages/dynamics/detail/controller.dart b/lib/pages/dynamics/detail/controller.dart
index 3385c378e..f7322c360 100644
--- a/lib/pages/dynamics/detail/controller.dart
+++ b/lib/pages/dynamics/detail/controller.dart
@@ -63,7 +63,7 @@ class DynamicDetailController extends GetxController {
     isLoadingMore = false;
     if (res['status']) {
       List<ReplyItemModel> replies = res['data'].replies;
-      acount.value = res['data'].cursor.allCount;
+      acount.value = res['data'].cursor.allCount ?? 0;
       nextOffset = res['data'].cursor.paginationReply.nextOffset ?? "";
       if (replies.isNotEmpty) {
         noMore.value = '加载中...';
diff --git a/lib/pages/dynamics/detail/view.dart b/lib/pages/dynamics/detail/view.dart
index 73c5079a1..bd0725028 100644
--- a/lib/pages/dynamics/detail/view.dart
+++ b/lib/pages/dynamics/detail/view.dart
@@ -382,7 +382,8 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
     return FutureBuilder(
       future: _futureBuilderFuture,
       builder: (context, snapshot) {
-        if (snapshot.connectionState == ConnectionState.done) {
+        if (snapshot.connectionState == ConnectionState.done &&
+            snapshot.hasData) {
           Map data = snapshot.data as Map;
           if (snapshot.data['status']) {
             // 请求成功
diff --git a/lib/pages/html/controller.dart b/lib/pages/html/controller.dart
index c62f20392..8a07bdd15 100644
--- a/lib/pages/html/controller.dart
+++ b/lib/pages/html/controller.dart
@@ -73,7 +73,7 @@ class HtmlRenderController extends GetxController {
     );
     if (res['status']) {
       List<ReplyItemModel> replies = res['data'].replies;
-      acount.value = res['data'].cursor.allCount;
+      acount.value = res['data'].cursor.allCount ?? 0;
       nextOffset = res['data'].cursor.paginationReply.nextOffset ?? "";
       if (replies.isNotEmpty) {
         noMore.value = '加载中...';
diff --git a/lib/pages/video/detail/reply/controller.dart b/lib/pages/video/detail/reply/controller.dart
index e33787f72..8c643d874 100644
--- a/lib/pages/video/detail/reply/controller.dart
+++ b/lib/pages/video/detail/reply/controller.dart
@@ -92,7 +92,7 @@ class VideoReplyController extends GetxController {
           }
         }
         replies.insertAll(0, res['data'].topReplies);
-        count.value = res['data'].cursor.allCount;
+        count.value = res['data'].cursor.allCount ?? 0;
         replyList.value = replies;
       } else {
         replyList.addAll(replies);

From edce79030dcc72efd4e6db1b4b3d909bfa66b092 Mon Sep 17 00:00:00 2001
From: orz12 <ms_lyq@hotmail.com>
Date: Sun, 25 Aug 2024 13:43:53 +0800
Subject: [PATCH 02/20] =?UTF-8?q?feat:=20=E4=B8=B4=E6=97=B6=E7=9A=84?=
 =?UTF-8?q?=E5=90=AC=E8=A7=86=E9=A2=91=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../video/detail/widgets/header_control.dart    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/lib/pages/video/detail/widgets/header_control.dart b/lib/pages/video/detail/widgets/header_control.dart
index e77d0672b..a478bce18 100644
--- a/lib/pages/video/detail/widgets/header_control.dart
+++ b/lib/pages/video/detail/widgets/header_control.dart
@@ -9,6 +9,7 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
+import 'package:media_kit/media_kit.dart';
 import 'package:ns_danmaku/ns_danmaku.dart';
 import 'package:PiliPalaX/http/user.dart';
 import 'package:PiliPalaX/models/video/play/quality.dart';
@@ -223,6 +224,22 @@ class _HeaderControlState extends State<HeaderControl> {
                         }
                       },
                     ),
+                    ListTile(
+                      onTap: () {
+                        Get.back();
+                        Player? player =
+                            widget.controller?.videoPlayerController;
+                        if (player == null) {
+                          SmartDialog.showToast('播放器未初始化');
+                          return;
+                        }
+                        var pp = player.platform as NativePlayer;
+                        pp.setProperty("video", "no");
+                      },
+                      dense: true,
+                      leading: const Icon(Icons.headphones_outlined, size: 20),
+                      title: const Text('听视频（需返回首页才能终止该状态）', style: titleStyle),
+                    ),
                     ListTile(
                       onTap: () => {Get.back(), showSetVideoQa()},
                       dense: true,

From 9a1fad9b0a99d0d40e465fdc94bf39225cb9de58 Mon Sep 17 00:00:00 2001
From: orz12 <ms_lyq@hotmail.com>
Date: Sun, 25 Aug 2024 13:48:34 +0800
Subject: [PATCH 03/20] =?UTF-8?q?feat:=20=E7=99=BB=E5=BD=95=E9=A3=8E?=
 =?UTF-8?q?=E6=8E=A7=E6=B5=81=E7=A8=8B=E7=BB=A7=E7=BB=AD=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/http/login.dart             | 2 +-
 lib/pages/login/controller.dart | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/http/login.dart b/lib/http/login.dart
index c2d4d3cf0..4327bbfa6 100644
--- a/lib/http/login.dart
+++ b/lib/http/login.dart
@@ -355,7 +355,7 @@ class LoginHttp {
     required String tmpCode,
   }) async {
     var res = await Request().get(Api.safeCenterGetInfo, data: {
-      tmpCode: tmpCode,
+      'tmp_code': tmpCode,
     });
     print(res);
     if (res.data['code'] == 0) {
diff --git a/lib/pages/login/controller.dart b/lib/pages/login/controller.dart
index 517c547d0..187d7a691 100644
--- a/lib/pages/login/controller.dart
+++ b/lib/pages/login/controller.dart
@@ -310,6 +310,7 @@ class LoginPageController extends GetxController
         Uri currentUri = Uri.parse(Url);
         var safeCenterRes = await LoginHttp.safeCenterGetInfo(
             tmpCode: currentUri.queryParameters['tmp_token']!);
+        //{"code":0,"message":"0","ttl":1,"data":{"account_info":{"hide_tel":"111*****111","hide_mail":"aaa*****aaaa.aaa","bind_mail":true,"bind_tel":true,"tel_verify":true,"mail_verify":true,"unneeded_check":false,"bind_safe_question":false,"mid":1111111},"member_info":{"nickname":"xxxxxxx","face":"https://i0.hdslb.com/bfs/face/xxxxxxx.jpg","realname_status":false},"sns_info":{"bind_google":false,"bind_fb":false,"bind_apple":false,"bind_qq":true,"bind_weibo":true,"bind_wechat":false},"account_safe":{"score":80}}}
         if (!safeCenterRes['status']) {
           SmartDialog.showToast("获取安全验证信息失败，请尝试其它登录方式\n"
               "(${safeCenterRes['code']}) ${safeCenterRes['msg']}");
@@ -317,9 +318,9 @@ class LoginPageController extends GetxController
         }
         Map<String, String> accountInfo = {
           "telVerify": safeCenterRes['data']['account_info']!['tel_verify'],
-          "bindTel": safeCenterRes['data']['account_info']!["bind_tel"],
+          "hindTel": safeCenterRes['data']['account_info']!["hide_tel"],
           "mailVerify": safeCenterRes['data']['account_info']!['mailVerify'],
-          "bindMail": safeCenterRes['data']['account_info']!["bind_mail"],
+          "hindMail": safeCenterRes['data']['account_info']!["hide_mail"],
         };
         TextEditingController _textFieldController = TextEditingController();
         String captchaKey = '';
@@ -327,7 +328,7 @@ class LoginPageController extends GetxController
           title: const Text("本次登录需要验证您的手机号"),
           content: Column(
             children:[
-              Text(accountInfo['bindTel'] ?? '未能获取手机号'),
+              Text(accountInfo['hindTel'] ?? '未能获取手机号'),
           TextField(
             controller: _textFieldController,
             decoration: const InputDecoration(hintText: "请输入短信验证码"),

From 9130fa63402796e09029986da7de4d4bffcd959b Mon Sep 17 00:00:00 2001
From: orz12 <ms_lyq@hotmail.com>
Date: Sun, 25 Aug 2024 13:49:06 +0800
Subject: [PATCH 04/20] =?UTF-8?q?mod:=20=E8=A1=A5=E5=85=85FOREGROUND=5FSER?=
 =?UTF-8?q?VICE=5FMEDIA=5FPLAYBACK=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 android/app/src/main/AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 5c175a5a7..55d764ce7 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -191,6 +191,7 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="28"/>
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK"/>
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
     <!--
       Media access permissions.

From 7d352ac98d7f028deeca4eb37609ee02a2fa91dd Mon Sep 17 00:00:00 2001
From: orz12 <ms_lyq@hotmail.com>
Date: Sun, 25 Aug 2024 13:49:26 +0800
Subject: [PATCH 05/20] =?UTF-8?q?feat:=20=E4=B8=93=E6=A0=8F=E6=96=87?=
 =?UTF-8?q?=E6=9C=AC=E6=94=AF=E6=8C=81=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/common/widgets/html_render.dart | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/common/widgets/html_render.dart b/lib/common/widgets/html_render.dart
index ee3f8b2f3..c5292511b 100644
--- a/lib/common/widgets/html_render.dart
+++ b/lib/common/widgets/html_render.dart
@@ -25,7 +25,8 @@ class HtmlRender extends StatelessWidget {
   Widget build(BuildContext context) {
     double textScale =
         setting.get(SettingBoxKey.defaultTextScale, defaultValue: 1.0);
-    return Html(
+    return SelectionArea(
+        child: Html(
       data: htmlContent,
       onLinkTap: (String? url, Map<String, String> buildContext, attributes) {},
       extensions: [
@@ -124,6 +125,6 @@ class HtmlRender extends StatelessWidget {
           margin: Margins.zero,
         ),
       },
-    );
+    ));
   }
 }

From 5f43846d0c5c256290dfe43e93bc4a0c4b5f8fe0 Mon Sep 17 00:00:00 2001
From: orz12 <ms_lyq@hotmail.com>
Date: Sun, 25 Aug 2024 13:49:48 +0800
Subject: [PATCH 06/20] =?UTF-8?q?feat:=20=E7=B3=BB=E7=BB=9F=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E6=96=87=E6=9C=AC=E6=94=AF=E6=8C=81=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/pages/msg_feed_top/sys_msg/view.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pages/msg_feed_top/sys_msg/view.dart b/lib/pages/msg_feed_top/sys_msg/view.dart
index bf23dc362..da35fa4e7 100644
--- a/lib/pages/msg_feed_top/sys_msg/view.dart
+++ b/lib/pages/msg_feed_top/sys_msg/view.dart
@@ -81,7 +81,7 @@ class _SysMsgPageState extends State<SysMsgPage> {
                             crossAxisAlignment: CrossAxisAlignment.start,
                             children: [
                               const SizedBox(height: 4),
-                          Text(
+                          SelectableText(
                               "$content",
                               style: Theme.of(context)
                                   .textTheme

From 8c60bef9827980b785b5b3c11331b8c622cc6e66 Mon Sep 17 00:00:00 2001
From: orz12 <ms_lyq@hotmail.com>
Date: Sun, 25 Aug 2024 13:51:40 +0800
Subject: [PATCH 07/20] =?UTF-8?q?feat:=20=E8=A1=A5=E5=85=85=E6=A0=B9?=
 =?UTF-8?q?=E8=AF=84=E8=AE=BA=E7=BB=93=E6=9E=84=EF=BC=9B=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E8=87=B3=E8=AF=84=E8=AE=BA=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/models/video/reply/data.dart              |   3 +
 .../video/detail/reply_reply/controller.dart  |   4 +-
 lib/pages/video/detail/reply_reply/view.dart  | 130 ++++++++++-------
 lib/utils/app_scheme.dart                     | 131 ++++++++++++++++--
 4 files changed, 209 insertions(+), 59 deletions(-)

diff --git a/lib/models/video/reply/data.dart b/lib/models/video/reply/data.dart
index cce2b5d45..15735c531 100644
--- a/lib/models/video/reply/data.dart
+++ b/lib/models/video/reply/data.dart
@@ -44,6 +44,7 @@ class ReplyReplyData {
     this.replies,
     this.topReplies,
     this.upper,
+    this.root,
   });
 
   ReplyPage? page;
@@ -51,6 +52,7 @@ class ReplyReplyData {
   late List<ReplyItemModel>? replies;
   late List<ReplyItemModel>? topReplies;
   ReplyUpper? upper;
+  ReplyItemModel? root;
 
   ReplyReplyData.fromJson(Map<String, dynamic> json) {
     page = ReplyPage.fromJson(json['page']);
@@ -67,5 +69,6 @@ class ReplyReplyData {
         isTopStatus: true)))
         : <ReplyItemModel>[];
     upper = ReplyUpper.fromJson(json['upper']);
+    root = ReplyItemModel.fromJson(json['root'], json['upper']['mid']);
   }
 }
diff --git a/lib/pages/video/detail/reply_reply/controller.dart b/lib/pages/video/detail/reply_reply/controller.dart
index af77743c0..6a8377b12 100644
--- a/lib/pages/video/detail/reply_reply/controller.dart
+++ b/lib/pages/video/detail/reply_reply/controller.dart
@@ -11,7 +11,7 @@ class VideoReplyReplyController extends GetxController {
   int? aid;
   // rpid 请求楼中楼回复
   String? rpid;
-  ReplyType replyType = ReplyType.video;
+  ReplyType replyType; // = ReplyType.video;
   RxList<ReplyItemModel> replyList = <ReplyItemModel>[].obs;
   // 当前页
   int currentPage = 0;
@@ -19,6 +19,7 @@ class VideoReplyReplyController extends GetxController {
   RxString noMore = ''.obs;
   // 当前回复的回复
   ReplyItemModel? currentReplyItem;
+  ReplyItemModel? root;
 
   @override
   void onInit() {
@@ -41,6 +42,7 @@ class VideoReplyReplyController extends GetxController {
       type: replyType.index,
     );
     if (res['status']) {
+      if (res['data'].root != null) root = res['data'].root;
       final List<ReplyItemModel> replies = res['data'].replies;
       if (replies.isNotEmpty) {
         noMore.value = '加载中...';
diff --git a/lib/pages/video/detail/reply_reply/view.dart b/lib/pages/video/detail/reply_reply/view.dart
index 89d323a22..a1d188890 100644
--- a/lib/pages/video/detail/reply_reply/view.dart
+++ b/lib/pages/video/detail/reply_reply/view.dart
@@ -73,7 +73,8 @@ class _VideoReplyReplyPanelState extends State<VideoReplyReplyPanel> {
   @override
   Widget build(BuildContext context) {
     return Container(
-      height: widget.source == 'videoDetail' ? Utils.getSheetHeight(context) : null,
+      height:
+          widget.source == 'videoDetail' ? Utils.getSheetHeight(context) : null,
       color: Theme.of(context).colorScheme.background,
       child: Column(
         children: [
@@ -137,60 +138,91 @@ class _VideoReplyReplyPanelState extends State<VideoReplyReplyPanel> {
                   FutureBuilder(
                     future: _futureBuilderFuture,
                     builder: (BuildContext context, snapshot) {
-                      if (snapshot.connectionState == ConnectionState.done) {
+                      if (snapshot.connectionState == ConnectionState.done &&
+                          snapshot.hasData) {
                         final Map data = snapshot.data as Map;
                         if (data['status']) {
                           // 请求成功
-                          return Obx(
-                            () => SliverList(
-                              delegate: SliverChildBuilderDelegate(
-                                (BuildContext context, int index) {
-                                  if (index ==
-                                      _videoReplyReplyController
-                                          .replyList.length) {
-                                    return Container(
-                                      padding: EdgeInsets.only(
-                                          bottom: MediaQuery.of(context)
-                                              .padding
-                                              .bottom),
-                                      height: MediaQuery.of(context)
-                                              .padding
-                                              .bottom +
-                                          100,
-                                      child: Center(
-                                        child: Obx(
-                                          () => Text(
-                                            _videoReplyReplyController
-                                                .noMore.value,
-                                            style: TextStyle(
-                                              fontSize: 12,
-                                              color: Theme.of(context)
-                                                  .colorScheme
-                                                  .outline,
+                          return SliverMainAxisGroup(
+                            slivers: <Widget>[
+                              if (widget.firstFloor == null &&
+                                  _videoReplyReplyController.root != null) ...[
+                                SliverToBoxAdapter(
+                                  child: ReplyItem(
+                                    replyItem: _videoReplyReplyController.root,
+                                    replyLevel: '2',
+                                    showReplyRow: false,
+                                    addReply: (replyItem) {
+                                      _videoReplyReplyController.replyList
+                                          .add(replyItem);
+                                    },
+                                    replyType: widget.replyType,
+                                    replyReply: (replyItem) =>
+                                        replyReply(replyItem),
+                                  ),
+                                ),
+                                SliverToBoxAdapter(
+                                  child: Divider(
+                                    height: 20,
+                                    color: Theme.of(context)
+                                        .dividerColor
+                                        .withOpacity(0.1),
+                                    thickness: 6,
+                                  ),
+                                ),
+                              ],
+                              Obx(
+                                () => SliverList(
+                                  delegate: SliverChildBuilderDelegate(
+                                    (BuildContext context, int index) {
+                                      if (index ==
+                                          _videoReplyReplyController
+                                              .replyList.length) {
+                                        return Container(
+                                          padding: EdgeInsets.only(
+                                              bottom: MediaQuery.of(context)
+                                                  .padding
+                                                  .bottom),
+                                          height: MediaQuery.of(context)
+                                                  .padding
+                                                  .bottom +
+                                              100,
+                                          child: Center(
+                                            child: Obx(
+                                              () => Text(
+                                                _videoReplyReplyController
+                                                    .noMore.value,
+                                                style: TextStyle(
+                                                  fontSize: 12,
+                                                  color: Theme.of(context)
+                                                      .colorScheme
+                                                      .outline,
+                                                ),
+                                              ),
                                             ),
                                           ),
-                                        ),
-                                      ),
-                                    );
-                                  } else {
-                                    return ReplyItem(
-                                      replyItem: _videoReplyReplyController
-                                          .replyList[index],
-                                      replyLevel: '2',
-                                      showReplyRow: false,
-                                      addReply: (replyItem) {
-                                        _videoReplyReplyController.replyList
-                                            .add(replyItem);
-                                      },
-                                      replyType: widget.replyType,
-                                    );
-                                  }
-                                },
-                                childCount: _videoReplyReplyController
-                                        .replyList.length +
-                                    1,
+                                        );
+                                      } else {
+                                        return ReplyItem(
+                                          replyItem: _videoReplyReplyController
+                                              .replyList[index],
+                                          replyLevel: '2',
+                                          showReplyRow: false,
+                                          addReply: (replyItem) {
+                                            _videoReplyReplyController.replyList
+                                                .add(replyItem);
+                                          },
+                                          replyType: widget.replyType,
+                                        );
+                                      }
+                                    },
+                                    childCount: _videoReplyReplyController
+                                            .replyList.length +
+                                        1,
+                                  ),
+                                ),
                               ),
-                            ),
+                            ],
                           );
                         } else {
                           // 请求错误
diff --git a/lib/utils/app_scheme.dart b/lib/utils/app_scheme.dart
index ea5708c82..b90201abb 100644
--- a/lib/utils/app_scheme.dart
+++ b/lib/utils/app_scheme.dart
@@ -1,11 +1,15 @@
 import 'dart:async';
 
+import 'package:PiliPalaX/models/common/reply_type.dart';
+import 'package:PiliPalaX/pages/video/detail/reply/widgets/reply_item.dart';
 import 'package:app_links/app_links.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
+import 'package:path/path.dart';
 import '../http/search.dart';
 import '../models/common/search_type.dart';
+import '../pages/video/detail/reply_reply/view.dart';
 import 'id_utils.dart';
 import 'url_utils.dart';
 import 'utils.dart';
@@ -30,6 +34,7 @@ class PiliScheme {
     final String path = value.path;
 
     if (scheme == 'bilibili') {
+      print(value);
       if (host == 'root') {
         Navigator.popUntil(
             Get.context!, (Route<dynamic> route) => route.isFirst);
@@ -41,6 +46,38 @@ class PiliScheme {
         );
       } else if (host == 'video') {
         String pathQuery = path.split('/').last;
+        if (value.queryParameters['comment_root_id'] != null) {
+          Get.to(
+            () => Scaffold(
+              appBar: AppBar(
+                titleSpacing: 0,
+                centerTitle: false,
+                title: Text(
+                  '评论详情',
+                  // style: Theme.of(context).textTheme.titleMedium,
+                ),
+                actions: [
+                  IconButton(
+                    tooltip: '前往原视频',
+                    onPressed: () {
+                      String? enterUri = value.toString().split('?').first;
+                      routePush(Uri.parse(enterUri));
+                    },
+                    icon: const Icon(Icons.open_in_new),
+                  ),
+                ],
+              ),
+              body: VideoReplyReplyPanel(
+                oid: int.tryParse(pathQuery),
+                rpid: int.tryParse(value.queryParameters['comment_root_id']!),
+                source: 'routePush',
+                replyType: ReplyType.video,
+                firstFloor: null,
+              ),
+            ),
+          );
+          return;
+        }
         final numericRegex = RegExp(r'^[0-9]+$');
         if (numericRegex.hasMatch(pathQuery)) {
           pathQuery = 'AV$pathQuery';
@@ -87,16 +124,92 @@ class PiliScheme {
             'dynamicType': 'read'
           },
         );
-      } else if (host == 'following' && path.startsWith("/detail/")) {
-        var opusId = path.split('/').last;
-        Get.toNamed(
-          '/webview',
-          parameters: {
-            'url': 'https://www.bilibili.com/opus/$opusId',
-            'type': 'url',
-            'pageTitle': '',
-          },
+      } else if (host == 'comment' && path.startsWith("/detail/")) {
+        //bilibili://comment/detail/17/832703053858603029/238686570016/?subType=0&anchor=238686628816&showEnter=1&extraIntentId=0&scene=1&enterName=%E6%9F%A5%E7%9C%8B%E5%8A%A8%E6%80%81%E8%AF%A6%E6%83%85&enterUri=bilibili://following/detail/832703053858603029
+        //fmt.Sprintf("bilibili://comment/detail/%d/%d/%d/?subType=%d&anchor=%d&showEnter=1&extraIntentId=%d", rp.Type, rp.Oid, rootID, subType, rp.RpID, extraIntentID)
+        print(value.queryParameters);
+        List<String> pathParts = path.split('/');
+        int type = int.parse(pathParts[2]);
+        int oid = int.parse(pathParts[3]);
+        int rootId = int.parse(pathParts[4]);
+        int subType = int.parse(value.queryParameters['subType'] ?? '0');
+        int RpID = int.parse(value.queryParameters['anchor'] ?? '0');
+        int extraIntentId =
+            int.parse(value.queryParameters['extraIntentId'] ?? '0');
+        Get.to(
+          () => Scaffold(
+            appBar: AppBar(
+              titleSpacing: 0,
+              centerTitle: false,
+              title: Text(
+                '评论详情',
+                // style: Theme.of(context).textTheme.titleMedium,
+              ),
+              actions: [
+                IconButton(
+                  tooltip: '前往',
+                  onPressed: () {
+                    String? enterUri = value.queryParameters['enterUri'];
+                    if (enterUri != null) {
+                      routePush(Uri.parse(enterUri));
+                    }
+                  },
+                  icon: const Icon(Icons.open_in_new),
+                ),
+              ],
+            ),
+            body: VideoReplyReplyPanel(
+                oid: oid,
+                rpid: RpID,
+                source: 'routePush',
+                replyType: ReplyType.dynamics,
+                firstFloor: null),
+          ),
         );
+      } else if (host == 'following' && path.startsWith("/detail/")) {
+        void getToOpusWeb() {
+          var opusId = path.split('/').last;
+          Get.toNamed(
+            '/webview',
+            parameters: {
+              'url': 'https://m.bilibili.com/dynamic/$opusId',
+              'type': 'url',
+              'pageTitle': '',
+            },
+          );
+        }
+
+        if (value.queryParameters['comment_root_id'] != null) {
+          Get.to(
+            () => Scaffold(
+              appBar: AppBar(
+                titleSpacing: 0,
+                centerTitle: false,
+                title: Text(
+                  '评论详情',
+                  // style: Theme.of(context).textTheme.titleMedium,
+                ),
+                actions: [
+                  IconButton(
+                    tooltip: '前往',
+                    onPressed: () {
+                      getToOpusWeb();
+                    },
+                    icon: const Icon(Icons.open_in_new),
+                  ),
+                ],
+              ),
+              body: VideoReplyReplyPanel(
+                  oid: int.tryParse(path.split('/').last),
+                  rpid: int.tryParse(value.queryParameters['comment_root_id']!),
+                  source: 'routePush',
+                  replyType: ReplyType.dynamics,
+                  firstFloor: null),
+            ),
+          );
+        } else {
+          getToOpusWeb();
+        }
       } else {
         print(value);
         SmartDialog.showToast('未知路径:$value，请截图反馈给开发者');

From 2be8e9a56a8f20a496811d50a2e34d5b47b6e4b2 Mon Sep 17 00:00:00 2001
From: orz12 <ms_lyq@hotmail.com>
Date: Sun, 25 Aug 2024 13:52:00 +0800
Subject: [PATCH 08/20] =?UTF-8?q?mod:=20=E4=BE=9D=E8=B5=96=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pubspec.lock | 50 +++++++++++++++++++++++++-------------------------
 pubspec.yaml |  1 +
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/pubspec.lock b/pubspec.lock
index 9ace381cd..f5bc58957 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -34,10 +34,10 @@ packages:
     dependency: "direct main"
     description:
       name: app_links
-      sha256: "4acba851087b25136e8f6e32a53bd4536eb3bec69947ddb66e7b9a5792ceb0c7"
+      sha256: f04c3ca96426baba784c736a201926bd4145524c36a1b38942a351b033305e21
       url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
     source: hosted
-    version: "6.2.0"
+    version: "6.2.1"
   app_links_linux:
     dependency: transitive
     description:
@@ -959,10 +959,10 @@ packages:
     dependency: "direct main"
     description:
       name: media_kit
-      sha256: "3289062540e3b8b9746e5c50d95bd78a9289826b7227e253dff806d002b9e67a"
+      sha256: "1f1deee148533d75129a6f38251ff8388e33ee05fc2d20a6a80e57d6051b7b62"
       url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
     source: hosted
-    version: "1.1.10+1"
+    version: "1.1.11"
   media_kit_libs_android_video:
     dependency: transitive
     description:
@@ -999,34 +999,34 @@ packages:
     dependency: "direct main"
     description:
       name: media_kit_libs_video
-      sha256: "3688e0c31482074578652bf038ce6301a5d21e1eda6b54fc3117ffeb4bdba067"
+      sha256: "20bb4aefa8fece282b59580e1cd8528117297083a6640c98c2e98cfc96b93288"
       url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
     source: hosted
-    version: "1.0.4"
+    version: "1.0.5"
   media_kit_libs_windows_video:
     dependency: transitive
     description:
       name: media_kit_libs_windows_video
-      sha256: "7bace5f35d9afcc7f9b5cdadb7541d2191a66bb3fc71bfa11c1395b3360f6122"
+      sha256: "32654572167825c42c55466f5d08eee23ea11061c84aa91b09d0e0f69bdd0887"
       url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
     source: hosted
-    version: "1.0.9"
+    version: "1.0.10"
   media_kit_native_event_loop:
     dependency: transitive
     description:
       name: media_kit_native_event_loop
-      sha256: a605cf185499d14d58935b8784955a92a4bf0ff4e19a23de3d17a9106303930e
+      sha256: "7d82e3b3e9ded5c35c3146c5ba1da3118d1dd8ac3435bac7f29f458181471b40"
       url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
     source: hosted
-    version: "1.0.8"
+    version: "1.0.9"
   media_kit_video:
     dependency: "direct main"
     description:
       name: media_kit_video
-      sha256: c048d11a19e379aebbe810647636e3fc6d18374637e2ae12def4ff8a4b99a882
+      sha256: "2cc3b966679963ba25a4ce5b771e532a521ebde7c6aa20e9802bec95d9916c8f"
       url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
     source: hosted
-    version: "1.2.4"
+    version: "1.2.5"
   meta:
     dependency: transitive
     description:
@@ -1193,10 +1193,10 @@ packages:
     dependency: transitive
     description:
       name: permission_handler_html
-      sha256: d220eb8476b466d58b161e10b3001d93999010a26228a3fb89c4280db1249546
+      sha256: af26edbbb1f2674af65a8f4b56e1a6f526156bc273d0e65dd8075fab51c78851
       url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
     source: hosted
-    version: "0.1.3+1"
+    version: "0.1.3+2"
   permission_handler_platform_interface:
     dependency: transitive
     description:
@@ -1302,13 +1302,13 @@ packages:
     source: hosted
     version: "4.1.0"
   rxdart:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
       name: rxdart
-      sha256: "0c7c0cedd93788d996e33041ffecda924cc54389199cde4e6a34b440f50044cb"
+      sha256: "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962"
       url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
     source: hosted
-    version: "0.27.7"
+    version: "0.28.0"
   safe_local_storage:
     dependency: transitive
     description:
@@ -1590,10 +1590,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: f0c73347dfcfa5b3db8bc06e1502668265d39c08f310c29bff4e28eea9699f79
+      sha256: e35a698ac302dd68e41f73250bd9517fe3ab5fa4f18fe4647a0872db61bacbab
       url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
     source: hosted
-    version: "6.3.9"
+    version: "6.3.10"
   url_launcher_ios:
     dependency: transitive
     description:
@@ -1774,18 +1774,18 @@ packages:
     dependency: "direct main"
     description:
       name: webview_flutter
-      sha256: "6869c8786d179f929144b4a1f86e09ac0eddfe475984951ea6c634774c16b522"
+      sha256: ec81f57aa1611f8ebecf1d2259da4ef052281cb5ad624131c93546c79ccc7736
       url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
     source: hosted
-    version: "4.8.0"
+    version: "4.9.0"
   webview_flutter_android:
     dependency: transitive
     description:
       name: webview_flutter_android
-      sha256: c66651fba15f9d7ddd31daec42da8d6bce46c85610a7127e3ebcb39a4395c3c9
+      sha256: "6e64fcb1c19d92024da8f33503aaeeda35825d77142c01d0ea2aa32edc79fdc8"
       url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
     source: hosted
-    version: "3.16.6"
+    version: "3.16.7"
   webview_flutter_platform_interface:
     dependency: transitive
     description:
@@ -1798,10 +1798,10 @@ packages:
     dependency: transitive
     description:
       name: webview_flutter_wkwebview
-      sha256: "9c62cc46fa4f2d41e10ab81014c1de470a6c6f26051a2de32111b2ee55287feb"
+      sha256: "1942a12224ab31e9508cf00c0c6347b931b023b8a4f0811e5dec3b06f94f117d"
       url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
     source: hosted
-    version: "3.14.0"
+    version: "3.15.0"
   win32:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index fc2640994..fec114286 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -152,6 +152,7 @@ dependency_overrides:
   mime:
     git: https://github.com/orz12/mime.git
   fading_edge_scrollview: ^4.1.1
+  rxdart: ^0.28.0
 
 dev_dependencies:
   flutter_test:

From a7bfd4b1566b148d5c27db50bf7060a85521e19d Mon Sep 17 00:00:00 2001
From: orz12 <ms_lyq@hotmail.com>
Date: Sun, 25 Aug 2024 23:50:27 +0800
Subject: [PATCH 09/20] mod: tab

---
 lib/pages/dynamics/view.dart | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/pages/dynamics/view.dart b/lib/pages/dynamics/view.dart
index 582de4717..08787682d 100644
--- a/lib/pages/dynamics/view.dart
+++ b/lib/pages/dynamics/view.dart
@@ -63,9 +63,9 @@ class _DynamicsPageState extends State<DynamicsPage>
       scrollController.addListener(() {
         if (scrollController.position.pixels >=
             scrollController.position.maxScrollExtent - 300) {
-            EasyThrottle.throttle('following', const Duration(seconds: 1), () {
-              _dynamicsController.queryFollowing2();
-            });
+          EasyThrottle.throttle('following', const Duration(seconds: 1), () {
+            _dynamicsController.queryFollowing2();
+          });
         }
       });
     }

From d2b8c01ac4ac7bc07f55988a4be94260a23c8400 Mon Sep 17 00:00:00 2001
From: orz12 <ms_lyq@hotmail.com>
Date: Sun, 25 Aug 2024 23:52:10 +0800
Subject: [PATCH 10/20] =?UTF-8?q?fix:=20=E5=B1=8F=E5=B9=95=E9=98=85?=
 =?UTF-8?q?=E8=AF=BB=E5=99=A8=E7=82=B9=E5=87=BB=E6=8C=89=E9=92=AE=E6=97=A0?=
 =?UTF-8?q?=E5=A3=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../live_room/widgets/bottom_control.dart     |  6 ++--
 lib/plugin/pl_player/view.dart                | 20 ++++++------
 lib/plugin/pl_player/widgets/common_btn.dart  | 12 ++-----
 .../pl_player/widgets/play_pause_btn.dart     | 32 +++++++++----------
 4 files changed, 31 insertions(+), 39 deletions(-)

diff --git a/lib/pages/live_room/widgets/bottom_control.dart b/lib/pages/live_room/widgets/bottom_control.dart
index b91cde184..50459ec4e 100644
--- a/lib/pages/live_room/widgets/bottom_control.dart
+++ b/lib/pages/live_room/widgets/bottom_control.dart
@@ -102,9 +102,7 @@ class _BottomControlState extends State<BottomControl> {
                     canUsePiP = false;
                   }
                   if (canUsePiP) {
-                    await widget.floating!.enable(
-                      const EnableManual()
-                    );
+                    await widget.floating!.enable(const EnableManual());
                   } else {}
                 },
                 icon: const Icon(
@@ -117,9 +115,9 @@ class _BottomControlState extends State<BottomControl> {
             const SizedBox(width: 4),
           ],
           ComBtn(
-            tooltip: '全屏切换',
             icon: const Icon(
               Icons.fullscreen,
+              semanticLabel: '全屏切换',
               size: 20,
               color: Colors.white,
             ),
diff --git a/lib/plugin/pl_player/view.dart b/lib/plugin/pl_player/view.dart
index 53e64405f..237cfb9b7 100644
--- a/lib/plugin/pl_player/view.dart
+++ b/lib/plugin/pl_player/view.dart
@@ -231,6 +231,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
         child: ComBtn(
           icon: const Icon(
             Icons.skip_previous,
+            semanticLabel: '上一集',
             size: 22,
             color: Colors.white,
           ),
@@ -246,7 +247,6 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
               SmartDialog.showToast('已经是第一集了');
             }
           },
-          tooltip: '上一集',
         ),
       ),
 
@@ -263,6 +263,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
         child: ComBtn(
           icon: const Icon(
             Icons.skip_next,
+            semanticLabel: '下一集',
             size: 22,
             color: Colors.white,
           ),
@@ -278,7 +279,6 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
               SmartDialog.showToast('已经是最后一集了');
             }
           },
-          tooltip: '下一集',
         ),
       ),
 
@@ -327,10 +327,10 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
         child: ComBtn(
           icon: const Icon(
             Icons.list,
+            semanticLabel: '选集',
             size: 22,
             color: Colors.white,
           ),
-          tooltip: '选集',
           fuc: () {
             int currentCid = widget.controller.cid;
             String bvid = widget.controller.bvid;
@@ -466,9 +466,9 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
         width: 42,
         height: 30,
         child: Obx(() => ComBtn(
-              tooltip: _.isFullScreen.value ? '退出全屏' : '全屏',
               icon: Icon(
                 _.isFullScreen.value ? Icons.fullscreen_exit : Icons.fullscreen,
+                semanticLabel: _.isFullScreen.value ? '退出全屏' : '全屏',
                 size: 24,
                 color: Colors.white,
               ),
@@ -607,10 +607,12 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
 
                 void fullScreenTrigger(bool status) {
                   EasyThrottle.throttle(
-                      'fullScreen', const Duration(milliseconds: 800), () async {
+                      'fullScreen', const Duration(milliseconds: 800),
+                      () async {
                     await _.triggerFullScreen(status: status);
                   });
                 }
+
                 if (cumulativeDy > threshold) {
                   _gestureType = 'center_down';
                   if (_.isFullScreen.value ^ fullScreenGestureReverse) {
@@ -1052,11 +1054,11 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                   visible: _.showControls.value &&
                       (_.isFullScreen.value || _.controlsLock.value),
                   child: ComBtn(
-                    tooltip: _.controlsLock.value ? '解锁' : '锁定',
                     icon: Icon(
                       _.controlsLock.value
                           ? FontAwesomeIcons.lock
                           : FontAwesomeIcons.lockOpen,
+                      semanticLabel: _.controlsLock.value ? '解锁' : '锁定',
                       size: 15,
                       color: Colors.white,
                     ),
@@ -1077,9 +1079,9 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
               child: Visibility(
                 visible: _.showControls.value && _.isFullScreen.value,
                 child: ComBtn(
-                  tooltip: '截图',
                   icon: const Icon(
                     Icons.photo_camera,
+                    semanticLabel: '截图',
                     size: 20,
                     color: Colors.white,
                   ),
@@ -1224,7 +1226,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                                   Duration.zero,
                                   player.state.duration,
                                 );
-                                player.seek(result);
+                                widget.controller.seekTo(result, type: 'slider');
                                 widget.controller.play();
                               },
                             ),
@@ -1269,7 +1271,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                                   Duration.zero,
                                   player.state.duration,
                                 );
-                                player.seek(result);
+                                widget.controller.seekTo(result, type: 'slider');
                                 widget.controller.play();
                               },
                             ),
diff --git a/lib/plugin/pl_player/widgets/common_btn.dart b/lib/plugin/pl_player/widgets/common_btn.dart
index 18ffa2280..1da7691f5 100644
--- a/lib/plugin/pl_player/widgets/common_btn.dart
+++ b/lib/plugin/pl_player/widgets/common_btn.dart
@@ -3,12 +3,10 @@ import 'package:flutter/material.dart';
 class ComBtn extends StatelessWidget {
   final Widget? icon;
   final Function? fuc;
-  final String tooltip;
 
   const ComBtn({
     this.icon,
     this.fuc,
-    required this.tooltip,
     super.key,
   });
 
@@ -17,15 +15,11 @@ class ComBtn extends StatelessWidget {
     return SizedBox(
       width: 34,
       height: 34,
-      child: IconButton(
-        tooltip: tooltip,
-        style: ButtonStyle(
-          padding: MaterialStateProperty.all(EdgeInsets.zero),
-        ),
-        onPressed: () {
+      child: InkWell(
+        onTap: () {
           fuc!();
         },
-        icon: icon!,
+        child: icon!,
       ),
     );
   }
diff --git a/lib/plugin/pl_player/widgets/play_pause_btn.dart b/lib/plugin/pl_player/widgets/play_pause_btn.dart
index 78933ef36..294be6fde 100644
--- a/lib/plugin/pl_player/widgets/play_pause_btn.dart
+++ b/lib/plugin/pl_player/widgets/play_pause_btn.dart
@@ -66,25 +66,23 @@ class PlayOrPauseButtonState extends State<PlayOrPauseButton>
     return SizedBox(
       width: 42,
       height: 34,
-      child: IconButton(
-        tooltip: widget.controller!.videoPlayerController!.state.playing
-            ? '暂停'
-            : '播放',
-        style: ButtonStyle(
-          padding: MaterialStateProperty.all(EdgeInsets.zero),
-        ),
-        onPressed: player.playOrPause,
-        color: Colors.white,
-        iconSize: 25,
+      child: InkWell(
+        onTap: player.playOrPause,
         // iconSize: widget.iconSize ?? _theme(context).buttonBarButtonSize,
         // color: widget.iconColor ?? _theme(context).buttonBarButtonColor,
-        icon: AnimatedIcon(
-          progress: animation,
-          icon: AnimatedIcons.play_pause,
-          color: Colors.white,
-          size: 20,
-          // size: widget.iconSize ?? _theme(context).buttonBarButtonSize,
-          // color: widget.iconColor ?? _theme(context).buttonBarButtonColor,
+        child: Center(
+          child: AnimatedIcon(
+            semanticLabel:
+                widget.controller!.videoPlayerController!.state.playing
+                    ? '暂停'
+                    : '播放',
+            progress: animation,
+            icon: AnimatedIcons.play_pause,
+            color: Colors.white,
+            size: 20,
+            // size: widget.iconSize ?? _theme(context).buttonBarButtonSize,
+            // color: widget.iconColor ?? _theme(context).buttonBarButtonColor,
+          ),
         ),
       ),
     );

From a51aa1ce132dca2e518f0d4ce6afa75bca60043a Mon Sep 17 00:00:00 2001
From: orz12 <ms_lyq@hotmail.com>
Date: Sun, 25 Aug 2024 23:54:05 +0800
Subject: [PATCH 11/20] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E6=92=AD?=
 =?UTF-8?q?=E6=94=BE=E6=8E=A7=E4=BB=B6=E6=B6=88=E5=A4=B1=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=BB=B6=E9=95=BF10=E5=80=8D=E7=9A=84=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/pages/setting/play_setting.dart  | 9 ++++++++-
 lib/pages/setting/style_setting.dart | 2 +-
 lib/plugin/pl_player/controller.dart | 6 +++++-
 lib/utils/storage.dart               | 1 +
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/lib/pages/setting/play_setting.dart b/lib/pages/setting/play_setting.dart
index a5fccb59d..10496f7c4 100644
--- a/lib/pages/setting/play_setting.dart
+++ b/lib/pages/setting/play_setting.dart
@@ -85,7 +85,7 @@ class _PlaySettingState extends State<PlaySetting> {
           ),
           const SetSwitchItem(
             title: '双击快退/快进',
-            subTitle: '左侧双击快退，右侧双击快进',
+            subTitle: '左侧双击快退/右侧双击快进，关闭则双击均为暂停/播放',
             leading: Icon(Icons.touch_app_outlined),
             setKey: SettingBoxKey.enableQuickDouble,
             defaultVal: true,
@@ -139,6 +139,13 @@ class _PlaySettingState extends State<PlaySetting> {
             setKey: SettingBoxKey.enableAutoExit,
             defaultVal: true,
           ),
+          const SetSwitchItem(
+              title: '延长播放控件显示时间',
+              subTitle: '开启后延长至30秒，便于屏幕阅读器滑动切换控件焦点',
+              leading: Icon(Icons.timer_outlined),
+              setKey: SettingBoxKey.enableLongShowControl,
+              defaultVal: false
+          ),
           const SetSwitchItem(
             title: '全向旋转',
             subTitle: '小屏可受重力转为临时全屏，若系统锁定旋转仍触发请关闭，关闭会影响横屏适配',
diff --git a/lib/pages/setting/style_setting.dart b/lib/pages/setting/style_setting.dart
index a716ae9f7..d0fcaf131 100644
--- a/lib/pages/setting/style_setting.dart
+++ b/lib/pages/setting/style_setting.dart
@@ -69,7 +69,7 @@ class _StyleSettingState extends State<StyleSetting> {
         children: [
           SetSwitchItem(
               title: '横屏适配',
-              subTitle: '启用横屏布局与逻辑，适用于平板等设备；推荐全屏方向设为【不改变当前方向】',
+              subTitle: '启用横屏布局与逻辑，平板、折叠屏等可开启；建议全屏方向设为【不改变当前方向】',
               leading: const Icon(Icons.phonelink_outlined),
               setKey: SettingBoxKey.horizontalScreen,
               defaultVal: false,
diff --git a/lib/plugin/pl_player/controller.dart b/lib/plugin/pl_player/controller.dart
index 5a86af827..9b98f0fd7 100644
--- a/lib/plugin/pl_player/controller.dart
+++ b/lib/plugin/pl_player/controller.dart
@@ -253,6 +253,7 @@ class PlPlayerController {
   late List<double> speedsList;
   double? defaultDuration;
   late bool enableAutoLongPressSpeed = false;
+  late bool enableLongShowControl;
 
   // 播放顺序相关
   PlayRepeat playRepeat = PlayRepeat.pause;
@@ -361,6 +362,8 @@ class PlPlayerController {
       _longPressSpeed.value = videoStorage
           .get(VideoBoxKey.longPressSpeedDefault, defaultValue: 3.0);
     }
+    enableLongShowControl =
+        setting.get(SettingBoxKey.enableLongShowControl, defaultValue: false);
     speedsList = List<double>.from(videoStorage
         .get(VideoBoxKey.customSpeedsList, defaultValue: <double>[]));
     for (final PlaySpeed i in PlaySpeed.values) {
@@ -927,7 +930,8 @@ class PlPlayerController {
     if (_timer != null) {
       _timer!.cancel();
     }
-    _timer = Timer(const Duration(milliseconds: 3000), () {
+    Duration waitingTime = Duration(seconds: enableLongShowControl ? 30 : 3);
+    _timer = Timer(waitingTime, () {
       if (!isSliderMoving.value) {
         controls = false;
       }
diff --git a/lib/utils/storage.dart b/lib/utils/storage.dart
index 1a4924e51..61883da1f 100644
--- a/lib/utils/storage.dart
+++ b/lib/utils/storage.dart
@@ -112,6 +112,7 @@ class SettingBoxKey {
       enableAutoBrightness = 'enableAutoBrightness',
       enableAutoEnter = 'enableAutoEnter',
       enableAutoExit = 'enableAutoExit',
+      enableLongShowControl = 'enableLongShowControl',
       allowRotateScreen = 'allowRotateScreen',
       horizontalScreen = 'horizontalScreen',
       p1080 = 'p1080',

From eaf12d8e9ebc11e7c4f0ad9a40f8a9569a381e3b Mon Sep 17 00:00:00 2001
From: orz12 <ms_lyq@hotmail.com>
Date: Sun, 25 Aug 2024 23:55:56 +0800
Subject: [PATCH 12/20] =?UTF-8?q?fix:=20=E6=81=A2=E5=A4=8D=E4=BA=AE?=
 =?UTF-8?q?=E5=BA=A6=E5=85=B3=E9=97=AD=E6=97=B6=E4=BB=8D=E4=BC=9A=E6=94=B9?=
 =?UTF-8?q?=E5=8F=98=E4=BA=AE=E5=BA=A6=EF=BC=9B=E5=90=AC=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=8B=E8=B0=83=E8=8A=82=E8=BF=9B=E5=BA=A6?=
 =?UTF-8?q?=E6=97=A0=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/pages/video/detail/view.dart     | 22 ++++++----------------
 lib/plugin/pl_player/controller.dart | 16 ++++++++++++----
 lib/services/audio_handler.dart      |  2 +-
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/lib/pages/video/detail/view.dart b/lib/pages/video/detail/view.dart
index c250778d0..878f95d74 100644
--- a/lib/pages/video/detail/view.dart
+++ b/lib/pages/video/detail/view.dart
@@ -453,7 +453,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                 bottom: 10,
                 child: IconButton(
                     tooltip: '播放',
-                    onPressed: () => handlePlay(),
+                    onPressed: handlePlay,
                     icon: Image.asset(
                       'assets/images/play.png',
                       width: 60,
@@ -565,9 +565,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                         left: 0,
                                         right: 0,
                                         child: GestureDetector(
-                                          onTap: () {
-                                            handlePlay();
-                                          },
+                                          onTap: handlePlay,
                                           child: NetworkImgLayer(
                                             type: 'emote',
                                             src: videoDetailController
@@ -698,9 +696,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                         left: 0,
                         right: 0,
                         child: GestureDetector(
-                          onTap: () {
-                            handlePlay();
-                          },
+                          onTap: handlePlay,
                           child: NetworkImgLayer(
                             type: 'emote',
                             src: videoDetailController.videoItem['pic'],
@@ -793,9 +789,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                         left: 0,
                         right: 0,
                         child: GestureDetector(
-                          onTap: () {
-                            handlePlay();
-                          },
+                          onTap: handlePlay,
                           child: NetworkImgLayer(
                             type: 'emote',
                             src: videoDetailController.videoItem['pic'],
@@ -891,9 +885,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                             left: 0,
                             right: 0,
                             child: GestureDetector(
-                              onTap: () {
-                                handlePlay();
-                              },
+                              onTap: handlePlay,
                               child: NetworkImgLayer(
                                 type: 'emote',
                                 src: videoDetailController.videoItem['pic'],
@@ -997,9 +989,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                   left: 0,
                                   right: 0,
                                   child: GestureDetector(
-                                    onTap: () {
-                                      handlePlay();
-                                    },
+                                    onTap: handlePlay,
                                     child: NetworkImgLayer(
                                       type: 'emote',
                                       src: videoDetailController
diff --git a/lib/plugin/pl_player/controller.dart b/lib/plugin/pl_player/controller.dart
index 9b98f0fd7..9304a3b31 100644
--- a/lib/plugin/pl_player/controller.dart
+++ b/lib/plugin/pl_player/controller.dart
@@ -895,13 +895,18 @@ class PlPlayerController {
 
     await _videoPlayerController?.play();
 
-    await getCurrentVolume();
-    await getCurrentBrightness();
-
     playerStatus.status.value = PlayerStatus.playing;
     // screenManager.setOverlays(false);
 
     audioSessionHandler.setActive(true);
+
+    Future.delayed(const Duration(milliseconds: 100), () {
+      getCurrentVolume();
+      if (setting.get(SettingBoxKey.enableAutoBrightness, defaultValue: false)
+          as bool) {
+        getCurrentBrightness();
+      }
+    });
   }
 
   /// 暂停播放
@@ -1313,7 +1318,10 @@ class PlPlayerController {
       }
       _instance = null;
       // 关闭所有视频页面恢复亮度
-      resetBrightness();
+      if (setting.get(SettingBoxKey.enableAutoBrightness, defaultValue: false)
+          as bool) {
+        resetBrightness();
+      }
       videoPlayerServiceHandler.clear();
     } catch (err) {
       print(err);
diff --git a/lib/services/audio_handler.dart b/lib/services/audio_handler.dart
index f45e587b9..7ee587bdc 100644
--- a/lib/services/audio_handler.dart
+++ b/lib/services/audio_handler.dart
@@ -54,7 +54,7 @@ class VideoPlayerServiceHandler extends BaseAudioHandler with SeekHandler {
     playbackState.add(playbackState.value.copyWith(
       updatePosition: position,
     ));
-    await PlPlayerController.seekToIfExists(position);
+    await PlPlayerController.seekToIfExists(position, type: 'slider');
     // await player.seekTo(position);
   }
 

From 8dbf1baafa9b5cca8fcc76a73aa5eca2299105df Mon Sep 17 00:00:00 2001
From: orz12 <ms_lyq@hotmail.com>
Date: Sun, 25 Aug 2024 13:55:46 +0800
Subject: [PATCH 13/20] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=92=AD?=
 =?UTF-8?q?=E6=94=BE=E4=BF=A1=E6=81=AF=E6=9F=A5=E7=9C=8B=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../video/detail/widgets/header_control.dart  | 167 ++++++++++++++++++
 1 file changed, 167 insertions(+)

diff --git a/lib/pages/video/detail/widgets/header_control.dart b/lib/pages/video/detail/widgets/header_control.dart
index a478bce18..f329c3902 100644
--- a/lib/pages/video/detail/widgets/header_control.dart
+++ b/lib/pages/video/detail/widgets/header_control.dart
@@ -4,6 +4,7 @@ import 'dart:math';
 
 import 'package:floating/floating.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:get/get.dart';
@@ -282,6 +283,172 @@ class _HeaderControlState extends State<HeaderControl> {
                       leading: const Icon(Icons.subtitles_outlined, size: 20),
                       title: const Text('弹幕设置', style: titleStyle),
                     ),
+                    ListTile(
+                        title: const Text('播放信息', style: titleStyle),
+                        leading: const Icon(Icons.info_outline, size: 20),
+                        onTap: () {
+                          Player? player =
+                              widget.controller?.videoPlayerController;
+                          if (player == null) {
+                            SmartDialog.showToast('播放器未初始化');
+                            return;
+                          }
+                          showDialog(
+                            context: context,
+                            builder: (context) {
+                              return AlertDialog(
+                                title: const Text('播放信息'),
+                                content: SizedBox(
+                                  width: double.maxFinite,
+                                  child: ListView(
+                                    children: [
+                                      ListTile(
+                                        title: const Text("Resolution"),
+                                        subtitle: Text(
+                                            '${player.state.width}x${player.state.height}'),
+                                        onTap: () {
+                                          Clipboard.setData(
+                                            ClipboardData(
+                                              text:
+                                                  "Resolution\n${player.state.width}x${player.state.height}",
+                                            ),
+                                          );
+                                        },
+                                      ),
+                                      ListTile(
+                                        title: const Text("VideoParams"),
+                                        subtitle: Text(player.state.videoParams
+                                            .toString()),
+                                        onTap: () {
+                                          Clipboard.setData(
+                                            ClipboardData(
+                                              text:
+                                                  "VideoParams\n${player.state.videoParams}",
+                                            ),
+                                          );
+                                        },
+                                      ),
+                                      ListTile(
+                                        title: const Text("AudioParams"),
+                                        subtitle: Text(player.state.audioParams
+                                            .toString()),
+                                        onTap: () {
+                                          Clipboard.setData(
+                                            ClipboardData(
+                                              text:
+                                                  "AudioParams\n${player.state.audioParams}",
+                                            ),
+                                          );
+                                        },
+                                      ),
+                                      ListTile(
+                                        title: const Text("Media"),
+                                        subtitle: Text(
+                                            player.state.playlist.toString()),
+                                        onTap: () {
+                                          Clipboard.setData(
+                                            ClipboardData(
+                                              text:
+                                                  "Media\n${player.state.playlist}",
+                                            ),
+                                          );
+                                        },
+                                      ),
+                                      ListTile(
+                                        title: const Text("AudioTrack"),
+                                        subtitle: Text(player.state.track.audio
+                                            .toString()),
+                                        onTap: () {
+                                          Clipboard.setData(
+                                            ClipboardData(
+                                              text:
+                                                  "AudioTrack\n${player.state.track.audio}",
+                                            ),
+                                          );
+                                        },
+                                      ),
+                                      ListTile(
+                                        title: const Text("VideoTrack"),
+                                        subtitle: Text(player.state.track.video
+                                            .toString()),
+                                        onTap: () {
+                                          Clipboard.setData(
+                                            ClipboardData(
+                                              text:
+                                                  "VideoTrack\n${player.state.track.audio}",
+                                            ),
+                                          );
+                                        },
+                                      ),
+                                      ListTile(
+                                          title: const Text("pitch"),
+                                          subtitle: Text(
+                                              player.state.pitch.toString()),
+                                          onTap: () {
+                                            Clipboard.setData(
+                                              ClipboardData(
+                                                text:
+                                                    "pitch\n${player.state.pitch}",
+                                              ),
+                                            );
+                                          }),
+                                      ListTile(
+                                          title: const Text("rate"),
+                                          subtitle: Text(
+                                              player.state.rate.toString()),
+                                          onTap: () {
+                                            Clipboard.setData(
+                                              ClipboardData(
+                                                text:
+                                                "rate\n${player.state.rate}",
+                                              ),
+                                            );
+                                          }),
+                                      ListTile(
+                                        title: const Text("AudioBitrate"),
+                                        subtitle: Text(player.state.audioBitrate
+                                            .toString()),
+                                        onTap: () {
+                                          Clipboard.setData(
+                                            ClipboardData(
+                                              text:
+                                                  "AudioBitrate\n${player.state.audioBitrate}",
+                                            ),
+                                          );
+                                        },
+                                      ),
+                                      ListTile(
+                                        title: const Text("Volume"),
+                                        subtitle: Text(
+                                            player.state.volume.toString()),
+                                        onTap: () {
+                                          Clipboard.setData(
+                                            ClipboardData(
+                                              text:
+                                                  "Volume\n${player.state.volume}",
+                                            ),
+                                          );
+                                        },
+                                      ),
+                                    ],
+                                  ),
+                                ),
+                                actions: [
+                                  TextButton(
+                                    onPressed: () => Get.back(),
+                                    child: Text(
+                                      '确定',
+                                      style: TextStyle(
+                                          color: Theme.of(context)
+                                              .colorScheme
+                                              .outline),
+                                    ),
+                                  ),
+                                ],
+                              );
+                            },
+                          );
+                        })
                   ],
                 ),
               ))

From 938647effe95388f80a8f407afc16b84e0f59e68 Mon Sep 17 00:00:00 2001
From: orz12 <ms_lyq@hotmail.com>
Date: Mon, 26 Aug 2024 01:42:01 +0800
Subject: [PATCH 14/20] =?UTF-8?q?fix:=20=E6=8A=95=E7=A8=BF=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E5=88=B0=E5=B7=B2=E5=A4=B1=E6=95=88=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E6=97=B6=E5=8D=A1=E4=BD=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/utils/app_scheme.dart | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/lib/utils/app_scheme.dart b/lib/utils/app_scheme.dart
index b90201abb..d256e5e10 100644
--- a/lib/utils/app_scheme.dart
+++ b/lib/utils/app_scheme.dart
@@ -229,7 +229,6 @@ class PiliScheme {
 
   // 投稿跳转
   static Future<void> videoPush(int? aidVal, String? bvidVal) async {
-    SmartDialog.showLoading<dynamic>(msg: '获取中...');
     try {
       int? aid = aidVal;
       String? bvid = bvidVal;
@@ -239,17 +238,17 @@ class PiliScheme {
       if (bvidVal == null) {
         bvid = IdUtils.av2bv(aidVal!);
       }
+      SmartDialog.showLoading<dynamic>(msg: '获取中...');
       final int cid = await SearchHttp.ab2c(bvid: bvidVal, aid: aidVal);
+      SmartDialog.dismiss();
       final String heroTag = Utils.makeHeroTag(aid);
-      SmartDialog.dismiss<dynamic>().then(
-        // ignore: always_specify_types
-        (e) => Get.toNamed<dynamic>('/video?bvid=$bvid&cid=$cid',
-            arguments: <String, String?>{
-              'pic': null,
-              'heroTag': heroTag,
-            }),
-      );
+      Get.toNamed<dynamic>('/video?bvid=$bvid&cid=$cid',
+          arguments: <String, String?>{
+            'pic': null,
+            'heroTag': heroTag,
+          });
     } catch (e) {
+      SmartDialog.dismiss();
       SmartDialog.showToast('video获取失败: $e');
     }
   }

From 70a50bdbf8d01b4a4ade73456fd4f79ccdad4e1a Mon Sep 17 00:00:00 2001
From: orz12 <ms_lyq@hotmail.com>
Date: Mon, 26 Aug 2024 06:04:03 +0800
Subject: [PATCH 15/20] =?UTF-8?q?fix:=20=E5=89=8D=E5=AF=BC0=E8=A2=AB?=
 =?UTF-8?q?=E8=AF=86=E5=88=AB=E6=88=90=E5=85=AB=E8=BF=9B=E5=88=B6=EF=BC=88?=
 =?UTF-8?q?=E5=AE=9E=E9=99=85=E5=BA=94=E8=AF=A5=E6=98=AF=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/CI.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 8cd27bd62..16dcd2446 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -54,7 +54,8 @@ jobs:
           fi
 
           version_code=$(echo $last_tag | cut -d "+" -f 2)
-          beta_code=0$(echo $last_tag | cut -d "+" -f 1 | cut -d "." -f 4)
+          beta_code=$(echo $last_tag | cut -d "+" -f 1 | cut -d "." -f 4)
+          beta_code=${beta_code:-0}
 
           echo "beta-code=$beta_code" >> $GITHUB_OUTPUT
           echo "version-code=$version_code" >> $GITHUB_OUTPUT

From 7192d2b5e1dee97fcb7b647cc45eb4c262a7ce07 Mon Sep 17 00:00:00 2001
From: orz12 <ms_lyq@hotmail.com>
Date: Mon, 26 Aug 2024 06:04:48 +0800
Subject: [PATCH 16/20] =?UTF-8?q?mod:=20=E5=A2=9E=E5=8A=A0systemNavigation?=
 =?UTF-8?q?BarContrastEnforced=3Dfalse?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/main.dart | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/main.dart b/lib/main.dart
index 956e55d95..056e7e975 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -90,6 +90,7 @@ void main() async {
     systemNavigationBarColor: Colors.transparent,
     systemNavigationBarDividerColor: Colors.transparent,
     statusBarColor: Colors.transparent,
+    systemNavigationBarContrastEnforced: false,
   ));
   Data.init();
   PiliScheme.init();

From d455bd86bf9b98b8e7a27c8e012194f9b72711f5 Mon Sep 17 00:00:00 2001
From: orz12 <ms_lyq@hotmail.com>
Date: Mon, 26 Aug 2024 06:05:40 +0800
Subject: [PATCH 17/20] style: code format

---
 lib/main.dart            | 3 +--
 lib/pages/main/view.dart | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/main.dart b/lib/main.dart
index 056e7e975..cb6edca2f 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -30,8 +30,7 @@ void main() async {
   WidgetsFlutterBinding.ensureInitialized();
   MediaKit.ensureInitialized();
   await GStorage.init();
-  if (GStorage.setting
-      .get(SettingBoxKey.autoClearCache, defaultValue: false)) {
+  if (GStorage.setting.get(SettingBoxKey.autoClearCache, defaultValue: false)) {
     await CacheManage.clearLibraryCache();
   }
   if (GStorage.setting
diff --git a/lib/pages/main/view.dart b/lib/pages/main/view.dart
index 9cdafcbf8..9e2a395b5 100644
--- a/lib/pages/main/view.dart
+++ b/lib/pages/main/view.dart
@@ -139,7 +139,7 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
                         ],
                         begin: Alignment.topLeft,
                         end: Alignment.bottomRight,
-                        stops: const [0.1, 0.4 ,0.7]),
+                        stops: const [0.1, 0.4, 0.7]),
                   ),
                 ),
               ),

From 40819100c3f3ad3f8272d23adaabdca795456655 Mon Sep 17 00:00:00 2001
From: orz12 <ms_lyq@hotmail.com>
Date: Mon, 26 Aug 2024 06:42:05 +0800
Subject: [PATCH 18/20] =?UTF-8?q?fix:=20webview=E6=B7=BB=E5=8A=A0SafeArea?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/pages/webview/view.dart | 40 +++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/lib/pages/webview/view.dart b/lib/pages/webview/view.dart
index 585cf8d59..a034d468b 100644
--- a/lib/pages/webview/view.dart
+++ b/lib/pages/webview/view.dart
@@ -79,25 +79,27 @@ class _WebviewPageState extends State<WebviewPage> {
               ),
             ],
             Expanded(
-              child: WebViewWidget(
-                  controller: _webviewController.controller,
-                  gestureRecognizers: <Factory<OneSequenceGestureRecognizer>>{
-                    Factory<VerticalDragGestureRecognizer>(
-                      () => VerticalDragGestureRecognizer(),
-                    ),
-                    Factory<PanGestureRecognizer>(
-                      () => PanGestureRecognizer(),
-                    ),
-                    Factory<ForcePressGestureRecognizer>(
-                      () => ForcePressGestureRecognizer(),
-                    ),
-                    Factory<EagerGestureRecognizer>(
-                      () => EagerGestureRecognizer(),
-                    ),
-                    Factory<HorizontalDragGestureRecognizer>(
-                      () => HorizontalDragGestureRecognizer(),
-                    ),
-                  }),
+              child: SafeArea(
+                child: WebViewWidget(
+                    controller: _webviewController.controller,
+                    gestureRecognizers: <Factory<OneSequenceGestureRecognizer>>{
+                      Factory<VerticalDragGestureRecognizer>(
+                        () => VerticalDragGestureRecognizer(),
+                      ),
+                      Factory<PanGestureRecognizer>(
+                        () => PanGestureRecognizer(),
+                      ),
+                      Factory<ForcePressGestureRecognizer>(
+                        () => ForcePressGestureRecognizer(),
+                      ),
+                      Factory<EagerGestureRecognizer>(
+                        () => EagerGestureRecognizer(),
+                      ),
+                      Factory<HorizontalDragGestureRecognizer>(
+                        () => HorizontalDragGestureRecognizer(),
+                      ),
+                    }),
+              ),
             ),
           ],
         ));

From df2e577ebc95f282ca5e2a3eb523a377fefde36f Mon Sep 17 00:00:00 2001
From: orz12 <ms_lyq@hotmail.com>
Date: Mon, 26 Aug 2024 06:55:49 +0800
Subject: [PATCH 19/20] =?UTF-8?q?mod:=20=E5=AD=97=E9=87=8Dw500=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=E4=B8=8A=E8=B0=83=E5=88=B0w600=EF=BC=9B=E6=A8=AA?=
 =?UTF-8?q?=E7=89=88=E5=8D=A1=E7=89=87=E6=A0=87=E9=A2=98=E5=9B=9E=E9=80=80?=
 =?UTF-8?q?=E4=B8=BA2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/common/widgets/live_card.dart                    |  2 +-
 lib/common/widgets/video_card_h.dart                 | 12 ++++++------
 lib/common/widgets/video_card_v.dart                 |  1 +
 lib/pages/bangumi/introduction/view.dart             |  2 +-
 .../bangumi/introduction/widgets/intro_detail.dart   |  2 +-
 lib/pages/bangumi/widgets/bangumi_card_v.dart        |  2 +-
 lib/pages/fav/widgets/item.dart                      |  2 +-
 lib/pages/fav_detail/widget/fav_video_card.dart      |  2 +-
 lib/pages/history/widgets/item.dart                  |  2 +-
 lib/pages/live/widgets/live_item.dart                |  2 +-
 lib/pages/search_panel/widgets/article_panel.dart    |  2 +-
 lib/pages/search_panel/widgets/live_panel.dart       |  2 +-
 lib/pages/subscription/widgets/item.dart             |  2 +-
 .../subscription_detail/widget/sub_video_card.dart   |  2 +-
 lib/pages/video/detail/introduction/view.dart        |  2 +-
 .../detail/introduction/widgets/intro_detail.dart    |  2 +-
 16 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/lib/common/widgets/live_card.dart b/lib/common/widgets/live_card.dart
index 4034756de..7e6dee8d3 100644
--- a/lib/common/widgets/live_card.dart
+++ b/lib/common/widgets/live_card.dart
@@ -92,7 +92,7 @@ class LiveContent extends StatelessWidget {
           Text(
             liveItem.title as String,
             textAlign: TextAlign.start,
-            style: const TextStyle(fontSize: 13, fontWeight: FontWeight.w500),
+            style: const TextStyle(fontSize: 13, fontWeight: FontWeight.w600),
             maxLines: 2,
             overflow: TextOverflow.ellipsis,
           ),
diff --git a/lib/common/widgets/video_card_h.dart b/lib/common/widgets/video_card_h.dart
index a59b93a11..4a4216556 100644
--- a/lib/common/widgets/video_card_h.dart
+++ b/lib/common/widgets/video_card_h.dart
@@ -183,12 +183,12 @@ class VideoContent extends StatelessWidget {
                   videoItem.title as String,
                   textAlign: TextAlign.start,
                   style: TextStyle(
-                    fontWeight: FontWeight.w500,
+                    fontWeight: FontWeight.w600,
                     fontSize: Theme.of(context).textTheme.bodyMedium!.fontSize,
-                    height: 1.36,
+                    height: 1.42,
                     letterSpacing: 0.3,
                   ),
-                  maxLines: 3,
+                  maxLines: 2,
                   overflow: TextOverflow.ellipsis,
                 ),
               ),
@@ -196,14 +196,14 @@ class VideoContent extends StatelessWidget {
               Expanded(
                 child: RichText(
                   overflow: TextOverflow.ellipsis,
-                  maxLines: 3,
+                  maxLines: 2,
                   text: TextSpan(
                     children: [
                       for (final i in videoItem.title) ...[
                         TextSpan(
                           text: i['text'] as String,
                           style: TextStyle(
-                            fontWeight: FontWeight.w500,
+                            fontWeight: FontWeight.w600,
                             fontSize: Theme.of(context)
                                 .textTheme
                                 .bodyMedium!
@@ -242,7 +242,7 @@ class VideoContent extends StatelessWidget {
               Expanded(
                 flex: 0,
                 child: Text(
-                  "${pubdate}${showOwner ? videoItem.owner.name : ''}",
+                  "${pubdate} ${showOwner ? videoItem.owner.name : ''}",
                   maxLines: 1,
                   style: TextStyle(
                     fontSize: Theme.of(context).textTheme.labelSmall!.fontSize,
diff --git a/lib/common/widgets/video_card_v.dart b/lib/common/widgets/video_card_v.dart
index ee3537bfb..ea3ed8b63 100644
--- a/lib/common/widgets/video_card_v.dart
+++ b/lib/common/widgets/video_card_v.dart
@@ -218,6 +218,7 @@ class VideoContent extends StatelessWidget {
                       maxLines: 2,
                       overflow: TextOverflow.ellipsis,
                       style: const TextStyle(
+                        fontWeight: FontWeight.w600,
                         height: 1.38,
                       )),
                 ),
diff --git a/lib/pages/bangumi/introduction/view.dart b/lib/pages/bangumi/introduction/view.dart
index ad4141d5c..919d02a4a 100644
--- a/lib/pages/bangumi/introduction/view.dart
+++ b/lib/pages/bangumi/introduction/view.dart
@@ -234,7 +234,7 @@ class _BangumiInfoState extends State<BangumiInfo> {
                                             : bangumiItem!.title!,
                                         style: const TextStyle(
                                           fontSize: 16,
-                                          fontWeight: FontWeight.w500,
+                                          fontWeight: FontWeight.w600,
                                         ),
                                         maxLines: 1,
                                         overflow: TextOverflow.ellipsis,
diff --git a/lib/pages/bangumi/introduction/widgets/intro_detail.dart b/lib/pages/bangumi/introduction/widgets/intro_detail.dart
index 6ab4f331c..af6fbabc9 100644
--- a/lib/pages/bangumi/introduction/widgets/intro_detail.dart
+++ b/lib/pages/bangumi/introduction/widgets/intro_detail.dart
@@ -50,7 +50,7 @@ class IntroDetail extends StatelessWidget {
                     bangumiDetail!.title,
                     style: const TextStyle(
                       fontSize: 16,
-                      fontWeight: FontWeight.w500,
+                      fontWeight: FontWeight.w600,
                     ),
                   ),
                   const SizedBox(height: 4),
diff --git a/lib/pages/bangumi/widgets/bangumi_card_v.dart b/lib/pages/bangumi/widgets/bangumi_card_v.dart
index 19bde515a..70abd36e5 100644
--- a/lib/pages/bangumi/widgets/bangumi_card_v.dart
+++ b/lib/pages/bangumi/widgets/bangumi_card_v.dart
@@ -160,7 +160,7 @@ class BangumiContent extends StatelessWidget {
                   bangumiItem.title,
                   textAlign: TextAlign.start,
                   style: const TextStyle(
-                    fontWeight: FontWeight.w500,
+                    fontWeight: FontWeight.w600,
                     letterSpacing: 0.3,
                   ),
                   maxLines: 1,
diff --git a/lib/pages/fav/widgets/item.dart b/lib/pages/fav/widgets/item.dart
index e85cb5e4e..5a7645c2f 100644
--- a/lib/pages/fav/widgets/item.dart
+++ b/lib/pages/fav/widgets/item.dart
@@ -77,7 +77,7 @@ class VideoContent extends StatelessWidget {
               favFolderItem.title,
               textAlign: TextAlign.start,
               style: const TextStyle(
-                fontWeight: FontWeight.w500,
+                fontWeight: FontWeight.w600,
                 letterSpacing: 0.3,
               ),
             ),
diff --git a/lib/pages/fav_detail/widget/fav_video_card.dart b/lib/pages/fav_detail/widget/fav_video_card.dart
index 92fc3e30b..49a4d9673 100644
--- a/lib/pages/fav_detail/widget/fav_video_card.dart
+++ b/lib/pages/fav_detail/widget/fav_video_card.dart
@@ -157,7 +157,7 @@ class VideoContent extends StatelessWidget {
                   videoItem.title,
                   textAlign: TextAlign.start,
                   style: const TextStyle(
-                    fontWeight: FontWeight.w500,
+                    fontWeight: FontWeight.w600,
                     letterSpacing: 0.3,
                   ),
                   maxLines: 2,
diff --git a/lib/pages/history/widgets/item.dart b/lib/pages/history/widgets/item.dart
index d7f70a334..4c7609173 100644
--- a/lib/pages/history/widgets/item.dart
+++ b/lib/pages/history/widgets/item.dart
@@ -301,7 +301,7 @@ class VideoContent extends StatelessWidget {
               videoItem.title,
               textAlign: TextAlign.start,
               style: const TextStyle(
-                fontWeight: FontWeight.w500,
+                fontWeight: FontWeight.w600,
                 letterSpacing: 0.3,
               ),
               maxLines: videoItem.videos > 1 ? 1 : 2,
diff --git a/lib/pages/live/widgets/live_item.dart b/lib/pages/live/widgets/live_item.dart
index 49ccc14c9..571223777 100644
--- a/lib/pages/live/widgets/live_item.dart
+++ b/lib/pages/live/widgets/live_item.dart
@@ -105,7 +105,7 @@ class LiveContent extends StatelessWidget {
               liveItem.title,
               textAlign: TextAlign.start,
               style: const TextStyle(
-                fontWeight: FontWeight.w500,
+                fontWeight: FontWeight.w600,
                 letterSpacing: 0.3,
               ),
               maxLines: 2,
diff --git a/lib/pages/search_panel/widgets/article_panel.dart b/lib/pages/search_panel/widgets/article_panel.dart
index 64c9d4c0e..2641d6c3c 100644
--- a/lib/pages/search_panel/widgets/article_panel.dart
+++ b/lib/pages/search_panel/widgets/article_panel.dart
@@ -74,7 +74,7 @@ Widget searchArticlePanel(BuildContext context, ctr, list) {
                                         TextSpan(
                                           text: i['text'],
                                           style: TextStyle(
-                                            fontWeight: FontWeight.w500,
+                                            fontWeight: FontWeight.w600,
                                             letterSpacing: 0.3,
                                             color: i['type'] == 'em'
                                                 ? Theme.of(context)
diff --git a/lib/pages/search_panel/widgets/live_panel.dart b/lib/pages/search_panel/widgets/live_panel.dart
index 00a61b13d..41d48624b 100644
--- a/lib/pages/search_panel/widgets/live_panel.dart
+++ b/lib/pages/search_panel/widgets/live_panel.dart
@@ -114,7 +114,7 @@ class LiveContent extends StatelessWidget {
                     TextSpan(
                       text: i['text'],
                       style: TextStyle(
-                        fontWeight: FontWeight.w500,
+                        fontWeight: FontWeight.w600,
                         letterSpacing: 0.3,
                         color: i['type'] == 'em'
                             ? Theme.of(context).colorScheme.primary
diff --git a/lib/pages/subscription/widgets/item.dart b/lib/pages/subscription/widgets/item.dart
index b94b76981..a793216c4 100644
--- a/lib/pages/subscription/widgets/item.dart
+++ b/lib/pages/subscription/widgets/item.dart
@@ -97,7 +97,7 @@ class VideoContent extends StatelessWidget {
                   subFolderItem.title!,
                   textAlign: TextAlign.start,
                   style: const TextStyle(
-                    fontWeight: FontWeight.w500,
+                    fontWeight: FontWeight.w600,
                     letterSpacing: 0.3,
                   ),
                 ),
diff --git a/lib/pages/subscription_detail/widget/sub_video_card.dart b/lib/pages/subscription_detail/widget/sub_video_card.dart
index 389a2a75c..da803e816 100644
--- a/lib/pages/subscription_detail/widget/sub_video_card.dart
+++ b/lib/pages/subscription_detail/widget/sub_video_card.dart
@@ -130,7 +130,7 @@ class VideoContent extends StatelessWidget {
                   videoItem.title,
                   textAlign: TextAlign.start,
                   style: const TextStyle(
-                    fontWeight: FontWeight.w500,
+                    fontWeight: FontWeight.w600,
                     letterSpacing: 0.3,
                   ),
                   maxLines: 2,
diff --git a/lib/pages/video/detail/introduction/view.dart b/lib/pages/video/detail/introduction/view.dart
index a191291e5..16a49f171 100644
--- a/lib/pages/video/detail/introduction/view.dart
+++ b/lib/pages/video/detail/introduction/view.dart
@@ -303,7 +303,7 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
                     //     : videoItem['title'] ?? "",
                     style: const TextStyle(
                       fontSize: 16,
-                      fontWeight: FontWeight.w500,
+                      fontWeight: FontWeight.w600,
                     ),
                     maxLines: 2,
                     overflow: TextOverflow.ellipsis,
diff --git a/lib/pages/video/detail/introduction/widgets/intro_detail.dart b/lib/pages/video/detail/introduction/widgets/intro_detail.dart
index 61d582078..c34ae693d 100644
--- a/lib/pages/video/detail/introduction/widgets/intro_detail.dart
+++ b/lib/pages/video/detail/introduction/widgets/intro_detail.dart
@@ -47,7 +47,7 @@ class IntroDetail extends StatelessWidget {
                       videoDetail!.title,
                       style: const TextStyle(
                         fontSize: 16,
-                        fontWeight: FontWeight.w500,
+                        fontWeight: FontWeight.w600,
                       ),
                     ),
                     const SizedBox(height: 6),

From 339606244954b02da288936327dca18e577ce9d7 Mon Sep 17 00:00:00 2001
From: orz12 <ms_lyq@hotmail.com>
Date: Mon, 26 Aug 2024 07:07:08 +0800
Subject: [PATCH 20/20] =?UTF-8?q?mod:=20=E5=AD=97=E9=87=8D=E4=B8=B4?=
 =?UTF-8?q?=E6=97=B6=E6=94=B9=E4=B8=BAw400?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/common/widgets/stat/danmu.dart   | 1 +
 lib/common/widgets/stat/view.dart    | 1 +
 lib/common/widgets/video_card_h.dart | 1 +
 3 files changed, 3 insertions(+)

diff --git a/lib/common/widgets/stat/danmu.dart b/lib/common/widgets/stat/danmu.dart
index 155c2f319..a754e8e96 100644
--- a/lib/common/widgets/stat/danmu.dart
+++ b/lib/common/widgets/stat/danmu.dart
@@ -28,6 +28,7 @@ class StatDanMu extends StatelessWidget {
         Text(
           Utils.numFormat(danmu!),
           style: TextStyle(
+            fontWeight: FontWeight.w400,
             fontSize: size == 'medium' ? 12 : 11,
             color: color,
           ),
diff --git a/lib/common/widgets/stat/view.dart b/lib/common/widgets/stat/view.dart
index 280844f1d..c4f7630be 100644
--- a/lib/common/widgets/stat/view.dart
+++ b/lib/common/widgets/stat/view.dart
@@ -31,6 +31,7 @@ class StatView extends StatelessWidget {
         Text(
           Utils.numFormat(view!),
           style: TextStyle(
+            fontWeight: FontWeight.w400,
             fontSize: size == 'medium' ? 12 : 11,
             color: color,
           ),
diff --git a/lib/common/widgets/video_card_h.dart b/lib/common/widgets/video_card_h.dart
index 4a4216556..e26f42757 100644
--- a/lib/common/widgets/video_card_h.dart
+++ b/lib/common/widgets/video_card_h.dart
@@ -245,6 +245,7 @@ class VideoContent extends StatelessWidget {
                   "${pubdate} ${showOwner ? videoItem.owner.name : ''}",
                   maxLines: 1,
                   style: TextStyle(
+                    fontWeight: FontWeight.w400,
                     fontSize: Theme.of(context).textTheme.labelSmall!.fontSize,
                     height: 1,
                     color: Theme.of(context).colorScheme.outline,