mod: read schame补充

Merge branch 'main' into feature-appScheme
2024-03-24 13:16:13 +08:00 · 2024-03-24 11:44:02 +08:00
41 changed files with 278 additions and 1002 deletions
--- a/.github/workflows/beta_ci.yml
+++ b/.github/workflows/beta_ci.yml
@ -4,7 +4,7 @@ on:
  workflow_dispatch:
  push:
    branches:
-      - "x-main"
+      - "main"
    paths-ignore:
      - "**.md"
      - "**.txt"
--- a/README.md
+++ b/README.md
@ -26,13 +26,13 @@
 Xcode 13.4 不支持**auto_orientation**，请注释相关代码

 ```bash
-[✓] Flutter (Channel stable, 3.16.5, on macOS 14.1.2 23B92 darwin-arm64, locale
+[✓] Flutter (Channel stable, 3.16.4, on macOS 14.1.2 23B92 darwin-arm64, locale
    zh-Hans-CN)
 [✓] Android toolchain - develop for Android devices (Android SDK version 34.0.0)
 [✓] Xcode - develop for iOS and macOS (Xcode 15.1)
 [✓] Chrome - develop for the web
 [✓] Android Studio (version 2022.3)
-[✓] VS Code (version 1.87.2)
+[✓] VS Code (version 1.85.1)
 [✓] Connected device (3 available)
 [✓] Network resources

@ -44,9 +44,6 @@ Xcode 13.4 不支持**auto_orientation**，请注释相关代码
 ## 技术交流

 Telegram: https://t.me/+lm_oOVmF0RJiODk1
-
-Tg Beta版本：@PiliPala_Beta
-
 QQ频道: https://pd.qq.com/s/365esodk3


--- a/change_log/1.0.22.0430.md
+++ b/change_log/1.0.22.0430.md
@ -1,29 +0,0 @@
-## 1.0.22
-
-明天晚上或者后天晚上应该会更新
-
-### 功能
-+ 字幕
-+ 全屏时选集
-+ 动态转发
-+ 评论视频并转发
-+ 收藏夹删除
-+ 合集显示封面
-+ 底部导航栏编辑、排序功能
-+ 历史记录进度条展示
-+ 直播画质切换
-+ 排行榜功能
-+ 视频详情页推荐视频开关
-+ 显示联合投稿up
-  
-### 修复
-+ 收藏夹个数错误
-+ 封面保存权限问题
-+ 合集最后1p未展示
-+ up主页关注按钮触发灰屏
-
-### 优化
-+ 视频简介查看逻辑
-
-更多更新日志可在Github上查看
-问题反馈、功能建议请查看「关于」页面。
--- a/change_log/1.0.23.0505.md
+++ b/change_log/1.0.23.0505.md
@ -1,15 +0,0 @@
-## 1.0.23
-
-### 功能
-+ 封面下载
-
-  
-### 修复
-+ 全屏问题
-+ 视频播放器灰屏问题
-+ 评论区点击区域问题
-+ 动态详情跳转异常问题
-
-
-更多更新日志可在Github上查看
-问题反馈、功能建议请查看「关于」页面。
--- a/lib/common/widgets/network_img_layer.dart
+++ b/lib/common/widgets/network_img_layer.dart
@ -36,7 +36,7 @@ class NetworkImgLayer extends StatelessWidget {
    final int defaultImgQuality = GlobalData().imgQuality;
    final String imageUrl =
        '${src!.startsWith('//') ? 'https:${src!}' : src!}@${quality ?? defaultImgQuality}q.webp';
-    print(imageUrl);
+    // print(imageUrl);
    int? memCacheWidth, memCacheHeight;
    double aspectRatio = (width / height).toDouble();

--- a/lib/http/api.dart
+++ b/lib/http/api.dart
@ -484,9 +484,6 @@ class Api {
  /// 激活buvid3
  static const activateBuvidApi = '/x/internal/gaia-gateway/ExClimbWuzhi';

-  /// 获取字幕配置
-  static const getSubtitleConfig = '/x/player/v2';
-
  /// 我的订阅
  static const userSubFolder = '/x/v3/fav/folder/collected/list';

@ -506,6 +503,4 @@ class Api {
  /// 排行榜
  static const String getRankApi = "/x/web-interface/ranking/v2";

-  /// 取消订阅
-  static const String cancelSub = '/x/v3/fav/season/unfav';
 }
--- a/lib/http/user.dart
+++ b/lib/http/user.dart
@ -349,21 +349,4 @@ class UserHttp {
      return {'status': false, 'msg': res.data['message']};
    }
  }
-
-  // 取消订阅
-  static Future cancelSub({required int seasonId}) async {
-    var res = await Request().post(
-      Api.cancelSub,
-      queryParameters: {
-        'platform': 'web',
-        'season_id': seasonId,
-        'csrf': await Request.getCsrf(),
-      },
-    );
-    if (res.data['code'] == 0) {
-      return {'status': true};
-    } else {
-      return {'status': false, 'msg': res.data['message']};
-    }
-  }
 }
--- a/lib/http/video.dart
+++ b/lib/http/video.dart
@ -8,11 +8,9 @@ import '../models/model_rec_video_item.dart';
 import '../models/user/fav_folder.dart';
 import '../models/video/ai.dart';
 import '../models/video/play/url.dart';
-import '../models/video/subTitile/result.dart';
 import '../models/video_detail_res.dart';
 import '../utils/recommend_filter.dart';
 import '../utils/storage.dart';
-import '../utils/subtitle.dart';
 import '../utils/wbi_sign.dart';
 import 'api.dart';
 import 'init.dart';
@ -478,25 +476,6 @@ class VideoHttp {
    }
  }

-  static Future getSubtitle({int? cid, String? bvid}) async {
-    var res = await Request().get(Api.getSubtitleConfig, data: {
-      'cid': cid,
-      'bvid': bvid,
-    });
-    try {
-      if (res.data['code'] == 0) {
-        return {
-          'status': true,
-          'data': SubTitlteModel.fromJson(res.data['data']),
-        };
-      } else {
-        return {'status': false, 'data': [], 'msg': res.data['msg']};
-      }
-    } catch (err) {
-      print(err);
-    }
-  }
-
  // 视频排行
  static Future getRankVideoList(int rid) async {
    try {
@ -519,12 +498,4 @@ class VideoHttp {
      return {'status': false, 'data': [], 'msg': err};
    }
  }
-
-  // 获取字幕内容
-  static Future<Map<String, dynamic>> getSubtitleContent(url) async {
-    var res = await Request().get('https:$url');
-    final String content = SubTitleUtils.convertToWebVTT(res.data['body']);
-    final List body = res.data['body'];
-    return {'content': content, 'body': body};
-  }
 }
--- a/lib/main.dart
+++ b/lib/main.dart
@ -34,7 +34,6 @@ void main() async {
      .then((_) async {
    await GStrorage.init();
    await setupServiceLocator();
-    clearLogs();
    Request();
    await Request.setCookie();
    RecommendFilter();
--- a/lib/models/common/subtitle_type.dart
+++ b/lib/models/common/subtitle_type.dart
@ -1,47 +0,0 @@
-enum SubtitleType {
-  // 中文（中国）
-  zhCN,
-  // 中文（自动翻译）
-  aizh,
-  // 英语（自动生成）
-  aien,
-}
-
-extension SubtitleTypeExtension on SubtitleType {
-  String get description {
-    switch (this) {
-      case SubtitleType.zhCN:
-        return '中文（中国）';
-      case SubtitleType.aizh:
-        return '中文（自动翻译）';
-      case SubtitleType.aien:
-        return '英语（自动生成）';
-    }
-  }
-}
-
-extension SubtitleIdExtension on SubtitleType {
-  String get id {
-    switch (this) {
-      case SubtitleType.zhCN:
-        return 'zh-CN';
-      case SubtitleType.aizh:
-        return 'ai-zh';
-      case SubtitleType.aien:
-        return 'ai-en';
-    }
-  }
-}
-
-extension SubtitleCodeExtension on SubtitleType {
-  int get code {
-    switch (this) {
-      case SubtitleType.zhCN:
-        return 1;
-      case SubtitleType.aizh:
-        return 2;
-      case SubtitleType.aien:
-        return 3;
-    }
-  }
-}
--- a/lib/models/member/info.dart
+++ b/lib/models/member/info.dart
@ -47,23 +47,18 @@ class Vip {
    this.status,
    this.dueDate,
    this.label,
-    this.nicknameColor,
  });

  int? type;
  int? status;
  int? dueDate;
  Map? label;
-  int? nicknameColor;

  Vip.fromJson(Map<String, dynamic> json) {
    type = json['type'];
    status = json['status'];
    dueDate = json['due_date'];
    label = json['label'];
-    nicknameColor = json['nickname_color'] == ''
-        ? null
-        : int.parse("0xFF${json['nickname_color'].replaceAll('#', '')}");
  }
 }

--- a/lib/models/search/result.dart
+++ b/lib/models/search/result.dart
@ -437,8 +437,7 @@ class SearchArticleItemModel {
    pubTime = json['pub_time'];
    like = json['like'];
    title = Em.regTitle(json['title']);
-    subTitle =
-        Em.decodeHtmlEntities(json['title'].replaceAll(RegExp(r'<[^>]*>'), ''));
+    subTitle = json['title'].replaceAll(RegExp(r'<[^>]*>'), '');
    rankOffset = json['rank_offset'];
    mid = json['mid'];
    imageUrls = json['image_urls'];
--- a/lib/models/video/subTitile/content.dart
+++ b/lib/models/video/subTitile/content.dart
@ -1,20 +0,0 @@
-class SubTitileContentModel {
-  double? from;
-  double? to;
-  int? location;
-  String? content;
-
-  SubTitileContentModel({
-    this.from,
-    this.to,
-    this.location,
-    this.content,
-  });
-
-  SubTitileContentModel.fromJson(Map<String, dynamic> json) {
-    from = json['from'];
-    to = json['to'];
-    location = json['location'];
-    content = json['content'];
-  }
-}
--- a/lib/models/video/subTitile/result.dart
+++ b/lib/models/video/subTitile/result.dart
@ -1,89 +0,0 @@
-import 'package:get/get.dart';
-import '../../common/subtitle_type.dart';
-
-class SubTitlteModel {
-  SubTitlteModel({
-    this.aid,
-    this.bvid,
-    this.cid,
-    this.loginMid,
-    this.loginMidHash,
-    this.isOwner,
-    this.name,
-    this.subtitles,
-  });
-
-  int? aid;
-  String? bvid;
-  int? cid;
-  int? loginMid;
-  String? loginMidHash;
-  bool? isOwner;
-  String? name;
-  List<SubTitlteItemModel>? subtitles;
-
-  factory SubTitlteModel.fromJson(Map<String, dynamic> json) => SubTitlteModel(
-        aid: json["aid"],
-        bvid: json["bvid"],
-        cid: json["cid"],
-        loginMid: json["login_mid"],
-        loginMidHash: json["login_mid_hash"],
-        isOwner: json["is_owner"],
-        name: json["name"],
-        subtitles: json["subtitle"] != null
-            ? json["subtitle"]["subtitles"]
-                .map<SubTitlteItemModel>((x) => SubTitlteItemModel.fromJson(x))
-                .toList()
-            : [],
-      );
-}
-
-class SubTitlteItemModel {
-  SubTitlteItemModel({
-    this.id,
-    this.lan,
-    this.lanDoc,
-    this.isLock,
-    this.subtitleUrl,
-    this.type,
-    this.aiType,
-    this.aiStatus,
-    this.title,
-    this.code,
-    this.content,
-    this.body,
-  });
-
-  int? id;
-  String? lan;
-  String? lanDoc;
-  bool? isLock;
-  String? subtitleUrl;
-  int? type;
-  int? aiType;
-  int? aiStatus;
-  String? title;
-  int? code;
-  String? content;
-  List? body;
-
-  factory SubTitlteItemModel.fromJson(Map<String, dynamic> json) =>
-      SubTitlteItemModel(
-        id: json["id"],
-        lan: json["lan"].replaceAll('-', ''),
-        lanDoc: json["lan_doc"],
-        isLock: json["is_lock"],
-        subtitleUrl: json["subtitle_url"],
-        type: json["type"],
-        aiType: json["ai_type"],
-        aiStatus: json["ai_status"],
-        title: json["lan_doc"],
-        code: SubtitleType.values
-                .firstWhereOrNull(
-                    (element) => element.id.toString() == json["lan"])
-                ?.index ??
-            -1,
-        content: '',
-        body: [],
-      );
-}
--- a/lib/pages/history/widgets/item.dart
+++ b/lib/pages/history/widgets/item.dart
@ -185,7 +185,7 @@ class HistoryItem extends StatelessWidget {
                                            ? '已看完'
                                            : '${Utils.timeFormat(videoItem.progress!)}/${Utils.timeFormat(videoItem.duration!)}',
                                        right: 6.0,
-                                        bottom: 8.0,
+                                        bottom: 6.0,
                                        type: 'gray',
                                      ),
                                    // 右上角
@ -258,27 +258,6 @@ class HistoryItem extends StatelessWidget {
                              ),
                            ),
                          ),
-                          videoItem.progress != 0
-                              ? Positioned(
-                                  left: 3,
-                                  right: 3,
-                                  bottom: 0,
-                                  child: ClipRRect(
-                                    borderRadius: BorderRadius.only(
-                                      bottomLeft: Radius.circular(
-                                          StyleString.imgRadius.x),
-                                      bottomRight: Radius.circular(
-                                          StyleString.imgRadius.x),
-                                    ),
-                                    child: LinearProgressIndicator(
-                                      value: videoItem.progress == -1
-                                          ? 100
-                                          : videoItem.progress /
-                                              videoItem.duration,
-                                    ),
-                                  ),
-                                )
-                              : const SizedBox()
                        ],
                      ),
                      VideoContent(videoItem: videoItem, ctr: ctr)
--- a/lib/pages/member/view.dart
+++ b/lib/pages/member/view.dart
@ -281,8 +281,8 @@ class _MemberPageState extends State<MemberPage>
        future: _futureBuilderFuture,
        builder: (context, snapshot) {
          if (snapshot.connectionState == ConnectionState.done) {
-            Map? data = snapshot.data;
-            if (data != null && data['status']) {
+            Map data = snapshot.data!;
+            if (data['status']) {
              return Obx(
                () => Stack(
                  alignment: AlignmentDirectional.center,
@ -302,14 +302,7 @@ class _MemberPageState extends State<MemberPage>
                              style: Theme.of(context)
                                  .textTheme
                                  .titleMedium!
-                                  .copyWith(
-                                      fontWeight: FontWeight.bold,
-                                      color: _memberController.memberInfo.value
-                                                  .vip!.nicknameColor !=
-                                              null
-                                          ? Color(_memberController.memberInfo
-                                              .value.vip!.nicknameColor!)
-                                          : null),
+                                  .copyWith(fontWeight: FontWeight.bold),
                            )),
                            const SizedBox(width: 2),
                            if (_memberController.memberInfo.value.sex == '女')
--- a/lib/pages/member/widgets/seasons.dart
+++ b/lib/pages/member/widgets/seasons.dart
@ -18,32 +18,45 @@ class MemberSeasonsPanel extends StatelessWidget {
      itemBuilder: (context, index) {
        MemberSeasonsList item = data!.seasonsList![index];
        return Padding(
-          padding: const EdgeInsets.only(bottom: 12),
+          padding: const EdgeInsets.only(bottom: 12, right: 4),
          child: Column(
            mainAxisAlignment: MainAxisAlignment.start,
            crossAxisAlignment: CrossAxisAlignment.start,
            children: [
-              ListTile(
-                onTap: () => Get.toNamed(
-                    '/memberSeasons?mid=${item.meta!.mid}&seasonId=${item.meta!.seasonId}'),
-                title: Text(
-                  item.meta!.name!,
-                  maxLines: 1,
-                  overflow: TextOverflow.ellipsis,
-                  style: Theme.of(context).textTheme.titleSmall!,
-                ),
-                dense: true,
-                leading: PBadge(
-                  stack: 'relative',
-                  size: 'small',
-                  text: item.meta!.total.toString(),
-                ),
-                trailing: const Icon(
-                  Icons.arrow_forward,
-                  size: 20,
+              Padding(
+                padding: const EdgeInsets.only(bottom: 12, left: 4),
+                child: Row(
+                  children: [
+                    Text(
+                      item.meta!.name!,
+                      maxLines: 1,
+                      style: Theme.of(context).textTheme.titleSmall!,
+                    ),
+                    const SizedBox(width: 10),
+                    PBadge(
+                      stack: 'relative',
+                      size: 'small',
+                      text: item.meta!.total.toString(),
+                    ),
+                    const Spacer(),
+                    SizedBox(
+                      width: 35,
+                      height: 35,
+                      child: IconButton(
+                        onPressed: () => Get.toNamed(
+                            '/memberSeasons?mid=${item.meta!.mid}&seasonId=${item.meta!.seasonId}'),
+                        style: ButtonStyle(
+                          padding: MaterialStateProperty.all(EdgeInsets.zero),
+                        ),
+                        icon: const Icon(
+                          Icons.arrow_forward,
+                          size: 20,
+                        ),
+                      ),
+                    )
+                  ],
                ),
              ),
-              const SizedBox(height: 10),
              LayoutBuilder(
                builder: (context, boxConstraints) {
                  return GridView.builder(
--- a/lib/pages/rank/controller.dart
+++ b/lib/pages/rank/controller.dart
@ -9,7 +9,7 @@ import 'package:pilipala/utils/storage.dart';
 class RankController extends GetxController with GetTickerProviderStateMixin {
  bool flag = false;
  late RxList tabs = [].obs;
-  RxInt initialIndex = 0.obs;
+  RxInt initialIndex = 1.obs;
  late TabController tabController;
  late List tabsCtrList;
  late List<Widget> tabsPageList;
@ -50,5 +50,21 @@ class RankController extends GetxController with GetTickerProviderStateMixin {
      length: tabs.length,
      vsync: this,
    );
+    // 监听 tabController 切换
+    if (enableGradientBg) {
+      tabController.animation!.addListener(() {
+        if (tabController.indexIsChanging) {
+          if (initialIndex.value != tabController.index) {
+            initialIndex.value = tabController.index;
+          }
+        } else {
+          final int temp = tabController.animation!.value.round();
+          if (initialIndex.value != temp) {
+            initialIndex.value = temp;
+            tabController.index = initialIndex.value;
+          }
+        }
+      });
+    }
  }
 }
--- a/lib/pages/rank/zone/view.dart
+++ b/lib/pages/rank/zone/view.dart
@ -22,20 +22,15 @@ class ZonePage extends StatefulWidget {
  State<ZonePage> createState() => _ZonePageState();
 }

-class _ZonePageState extends State<ZonePage>
-    with AutomaticKeepAliveClientMixin {
-  late ZoneController _zoneController;
+class _ZonePageState extends State<ZonePage> {
+  final ZoneController _zoneController = Get.put(ZoneController());
  List videoList = [];
  Future? _futureBuilderFuture;
  late ScrollController scrollController;

-  @override
-  bool get wantKeepAlive => true;
-
  @override
  void initState() {
    super.initState();
-    _zoneController = Get.put(ZoneController(), tag: widget.rid.toString());
    _futureBuilderFuture = _zoneController.queryRankFeed('init', widget.rid);
    scrollController = _zoneController.scrollController;
    StreamController<bool> mainStream =
@ -73,7 +68,6 @@ class _ZonePageState extends State<ZonePage>

  @override
  Widget build(BuildContext context) {
-    super.build(context);
    return RefreshIndicator(
      onRefresh: () async {
        return await _zoneController.onRefresh();
--- a/lib/pages/setting/widgets/select_dialog.dart
+++ b/lib/pages/setting/widgets/select_dialog.dart
@ -44,7 +44,6 @@ class _SelectDialogState<T> extends State<SelectDialog<T>> {
                    setState(() {
                      _tempValue = value as T;
                    });
-                    Navigator.pop(context, _tempValue);
                  },
                ),
              ]
@ -52,6 +51,19 @@ class _SelectDialogState<T> extends State<SelectDialog<T>> {
          ),
        );
      }),
+      actions: [
+        TextButton(
+          onPressed: () => Navigator.pop(context),
+          child: Text(
+            '取消',
+            style: TextStyle(color: Theme.of(context).colorScheme.outline),
+          ),
+        ),
+        TextButton(
+          onPressed: () => Navigator.pop(context, _tempValue),
+          child: const Text('确定'),
+        )
+      ],
    );
  }
 }
--- a/lib/pages/subscription/controller.dart
+++ b/lib/pages/subscription/controller.dart
@ -46,40 +46,4 @@ class SubController extends GetxController {
  Future onLoad() async {
    querySubFolder(type: 'onload');
  }
-
-  // 取消订阅
-  Future<void> cancelSub(SubFolderItemData subFolderItem) async {
-    showDialog(
-      context: Get.context!,
-      builder: (context) => AlertDialog(
-        title: const Text('提示'),
-        content: const Text('确定取消订阅吗？'),
-        actions: [
-          TextButton(
-            onPressed: () {
-              Get.back();
-            },
-            child: Text(
-              '取消',
-              style: TextStyle(color: Theme.of(context).colorScheme.outline),
-            ),
-          ),
-          TextButton(
-            onPressed: () async {
-              var res = await UserHttp.cancelSub(seasonId: subFolderItem.id!);
-              if (res['status']) {
-                subFolderData.value.list!.remove(subFolderItem);
-                subFolderData.update((val) {});
-                SmartDialog.showToast('取消订阅成功');
-              } else {
-                SmartDialog.showToast(res['msg']);
-              }
-              Get.back();
-            },
-            child: const Text('确定'),
-          ),
-        ],
-      ),
-    );
-  }
 }
--- a/lib/pages/subscription/view.dart
+++ b/lib/pages/subscription/view.dart
@ -58,8 +58,7 @@ class _SubPageState extends State<SubPage> {
                  itemBuilder: (context, index) {
                    return SubItem(
                        subFolderItem:
-                            _subController.subFolderData.value.list![index],
-                        cancelSub: _subController.cancelSub);
+                            _subController.subFolderData.value.list![index]);
                  },
                ),
              );
--- a/lib/pages/subscription/widgets/item.dart
+++ b/lib/pages/subscription/widgets/item.dart
@ -8,12 +8,7 @@ import '../../../models/user/sub_folder.dart';

 class SubItem extends StatelessWidget {
  final SubFolderItemData subFolderItem;
-  final Function(SubFolderItemData) cancelSub;
-  const SubItem({
-    super.key,
-    required this.subFolderItem,
-    required this.cancelSub,
-  });
+  const SubItem({super.key, required this.subFolderItem});

  @override
  Widget build(BuildContext context) {
@ -56,10 +51,7 @@ class SubItem extends StatelessWidget {
                      },
                    ),
                  ),
-                  VideoContent(
-                    subFolderItem: subFolderItem,
-                    cancelSub: cancelSub,
-                  )
+                  VideoContent(subFolderItem: subFolderItem)
                ],
              ),
            );
@ -72,8 +64,7 @@ class SubItem extends StatelessWidget {

 class VideoContent extends StatelessWidget {
  final SubFolderItemData subFolderItem;
-  final Function(SubFolderItemData)? cancelSub;
-  const VideoContent({super.key, required this.subFolderItem, this.cancelSub});
+  const VideoContent({super.key, required this.subFolderItem});

  @override
  Widget build(BuildContext context) {
@ -109,24 +100,6 @@ class VideoContent extends StatelessWidget {
                color: Theme.of(context).colorScheme.outline,
              ),
            ),
-            const Spacer(),
-            Row(
-              mainAxisAlignment: MainAxisAlignment.end,
-              children: [
-                SizedBox(
-                  height: 35,
-                  width: 35,
-                  child: IconButton(
-                    onPressed: () => cancelSub?.call(subFolderItem),
-                    style: TextButton.styleFrom(
-                      foregroundColor: Theme.of(context).colorScheme.outline,
-                      padding: const EdgeInsets.fromLTRB(0, 0, 0, 0),
-                    ),
-                    icon: const Icon(Icons.delete_outline, size: 18),
-                  ),
-                )
-              ],
-            )
          ],
        ),
      ),
--- a/lib/pages/video/detail/controller.dart
+++ b/lib/pages/video/detail/controller.dart
@ -20,7 +20,6 @@ import 'package:pilipala/utils/utils.dart';
 import 'package:pilipala/utils/video_utils.dart';
 import 'package:screen_brightness/screen_brightness.dart';

-import '../../../models/video/subTitile/content.dart';
 import '../../../http/danmaku.dart';
 import '../../../utils/id_utils.dart';
 import 'widgets/header_control.dart';
@ -91,13 +90,10 @@ class VideoDetailController extends GetxController
  late bool enableCDN;
  late int? cacheVideoQa;
  late String cacheDecode;
-  late int defaultAudioQa;
+  late int cacheAudioQa;

  PersistentBottomSheetController? replyReplyBottomSheetCtr;
-  RxList<SubTitileContentModel> subtitleContents =
-      <SubTitileContentModel>[].obs;
  late bool enableRelatedVideo;
-  List subtitles = [];

  @override
  void onInit() {
@ -146,10 +142,9 @@ class VideoDetailController extends GetxController
    // 预设的解码格式
    cacheDecode = setting.get(SettingBoxKey.defaultDecode,
        defaultValue: VideoDecodeFormats.values.last.code);
-    defaultAudioQa = setting.get(SettingBoxKey.defaultAudioQa,
+    cacheAudioQa = setting.get(SettingBoxKey.defaultAudioQa,
        defaultValue: AudioQuality.hiRes.code);
    oid.value = IdUtils.bv2av(Get.parameters['bvid']!);
-    getSubtitle();
  }

  showReplyReplyPanel() {
@ -256,8 +251,6 @@ class VideoDetailController extends GetxController

    /// 开启自动全屏时，在player初始化完成后立即传入headerControl
    plPlayerController.headerControl = headerControl;
-
-    plPlayerController.subtitles.value = subtitles;
  }

  // 视频链接
@ -353,9 +346,9 @@ class VideoDetailController extends GetxController

        if (audiosList.isNotEmpty) {
          final List<int> numbers = audiosList.map((map) => map.id!).toList();
-          int closestNumber = Utils.findClosestNumber(defaultAudioQa, numbers);
-          if (!numbers.contains(defaultAudioQa) &&
-              numbers.any((e) => e > defaultAudioQa)) {
+          int closestNumber = Utils.findClosestNumber(cacheAudioQa, numbers);
+          if (!numbers.contains(cacheAudioQa) &&
+              numbers.any((e) => e > cacheAudioQa)) {
            closestNumber = 30280;
          }
          firstAudio = audiosList.firstWhere((e) => e.id == closestNumber);
@ -395,45 +388,6 @@ class VideoDetailController extends GetxController
        : print('replyReplyBottomSheetCtr is null');
  }

-  // 获取字幕配置
-  Future getSubtitle() async {
-    var result = await VideoHttp.getSubtitle(bvid: bvid, cid: cid.value);
-    if (result['status']) {
-      if (result['data'].subtitles.isNotEmpty) {
-        subtitles = result['data'].subtitles;
-        if (subtitles.isNotEmpty) {
-          for (var i in subtitles) {
-            final Map<String, dynamic> res = await VideoHttp.getSubtitleContent(
-              i.subtitleUrl,
-            );
-            i.content = res['content'];
-            i.body = res['body'];
-          }
-        }
-      }
-      return result['data'];
-    }
-  }
-
-  // 获取字幕内容
-  // Future getSubtitleContent(String url) async {
-  //   var res = await Request().get('https:$url');
-  //   subtitleContents.value = res.data['body'].map<SubTitileContentModel>((e) {
-  //     return SubTitileContentModel.fromJson(e);
-  //   }).toList();
-  //   setSubtitleContent();
-  // }
-
-  setSubtitleContent() {
-    plPlayerController.subtitleContent.value = '';
-    plPlayerController.subtitles.value = subtitles;
-  }
-
-  clearSubtitleContent() {
-    plPlayerController.subtitleContent.value = '';
-    plPlayerController.subtitles.value = [];
-  }
-
  /// 发送弹幕
  void showShootDanmakuSheet() {
    final TextEditingController textController = TextEditingController();
--- a/lib/pages/video/detail/introduction/view.dart
+++ b/lib/pages/video/detail/introduction/view.dart
@ -1,4 +1,3 @@
-import 'package:expandable/expandable.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:get/get.dart';
@ -16,7 +15,6 @@ import 'package:pilipala/pages/video/detail/widgets/ai_detail.dart';
 import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:pilipala/utils/utils.dart';
-import '../../../../http/user.dart';
 import 'widgets/action_item.dart';
 import 'widgets/fav_panel.dart';
 import 'widgets/intro_detail.dart';
@ -139,9 +137,6 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
  late String memberHeroTag;
  late bool enableAi;
  bool isProcessing = false;
-  RxBool isExpand = false.obs;
-  late ExpandableController _expandableCtr;
-
  void Function()? handleState(Future Function() action) {
    return isProcessing
        ? null
@ -165,7 +160,6 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
    follower = Utils.numFormat(videoIntroController.userStat['follower']);
    followStatus = videoIntroController.followStatus;
    enableAi = setting.get(SettingBoxKey.enableAi, defaultValue: true);
-    _expandableCtr = ExpandableController(initialExpanded: false);
  }

  // 收藏
@ -218,8 +212,13 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
  // 视频介绍
  showIntroDetail() {
    feedBack();
-    isExpand.value = !(isExpand.value);
-    _expandableCtr.toggle();
+    showBottomSheet(
+      context: context,
+      enableDrag: true,
+      builder: (BuildContext context) {
+        return IntroDetail(videoDetail: widget.videoDetail!);
+      },
+    );
  }

  // 用户主页
@ -243,12 +242,6 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
    );
  }

-  @override
-  void dispose() {
-    _expandableCtr.dispose();
-    super.dispose();
-  }
-
  @override
  Widget build(BuildContext context) {
    final ThemeData t = Theme.of(context);
@ -266,34 +259,14 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
          GestureDetector(
            behavior: HitTestBehavior.translucent,
            onTap: () => showIntroDetail(),
-            child: ExpandablePanel(
-              controller: _expandableCtr,
-              collapsed: Text(
-                widget.videoDetail!.title!,
-                softWrap: true,
-                maxLines: 2,
-                overflow: TextOverflow.ellipsis,
-                style: const TextStyle(
-                  fontSize: 18,
-                  fontWeight: FontWeight.bold,
-                ),
-              ),
-              expanded: Text(
-                widget.videoDetail!.title!,
-                softWrap: true,
-                maxLines: 4,
-                style: const TextStyle(
-                  fontSize: 18,
-                  fontWeight: FontWeight.bold,
-                ),
-              ),
-              theme: const ExpandableThemeData(
-                animationDuration: Duration(milliseconds: 300),
-                scrollAnimationDuration: Duration(milliseconds: 300),
-                crossFadePoint: 0,
-                fadeCurve: Curves.ease,
-                sizeCurve: Curves.linear,
+            child: Text(
+              widget.videoDetail!.title!,
+              style: const TextStyle(
+                fontSize: 18,
+                fontWeight: FontWeight.bold,
              ),
+              maxLines: 2,
+              overflow: TextOverflow.ellipsis,
            ),
          ),
          Stack(
@ -357,20 +330,6 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
            ],
          ),

-          /// 视频简介
-          ExpandablePanel(
-            controller: _expandableCtr,
-            collapsed: const SizedBox(height: 0),
-            expanded: IntroDetail(videoDetail: widget.videoDetail!),
-            theme: const ExpandableThemeData(
-              animationDuration: Duration(milliseconds: 300),
-              scrollAnimationDuration: Duration(milliseconds: 300),
-              crossFadePoint: 0,
-              fadeCurve: Curves.ease,
-              sizeCurve: Curves.linear,
-            ),
-          ),
-
          /// 点赞收藏转发
          actionGrid(context, videoIntroController),
          // 合集
@ -479,7 +438,6 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
        margin: const EdgeInsets.only(top: 6, bottom: 4),
        height: constraints.maxWidth / 5 * 0.8,
        child: GridView.count(
-          physics: const NeverScrollableScrollPhysics(),
          primary: false,
          padding: EdgeInsets.zero,
          crossAxisCount: 5,
@ -493,6 +451,12 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
                  selectStatus: videoIntroController.hasLike.value,
                  text: widget.videoDetail!.stat!.like!.toString()),
            ),
+            // ActionItem(
+            //     icon: const Icon(FontAwesomeIcons.clock),
+            //     onTap: () => videoIntroController.actionShareVideo(),
+            //     selectStatus: false,
+            //     loadingStatus: loadingStatus,
+            //     text: '稍后再看'),
            Obx(
              () => ActionItem(
                icon: const Icon(FontAwesomeIcons.b),
@ -513,14 +477,10 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
              ),
            ),
            ActionItem(
-              icon: const Icon(FontAwesomeIcons.clock),
-              onTap: () async {
-                final res =
-                    await UserHttp.toViewLater(bvid: widget.videoDetail!.bvid);
-                SmartDialog.showToast(res['msg']);
-              },
+              icon: const Icon(FontAwesomeIcons.comment),
+              onTap: () => videoDetailCtr.tabCtr.animateTo(1),
              selectStatus: false,
-              text: '稍后看',
+              text: widget.videoDetail!.stat!.reply!.toString(),
            ),
            ActionItem(
              icon: const Icon(FontAwesomeIcons.shareFromSquare),
--- a/lib/pages/video/detail/introduction/widgets/intro_detail.dart
+++ b/lib/pages/video/detail/introduction/widgets/intro_detail.dart
@ -1,10 +1,16 @@
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
+import 'package:hive/hive.dart';
+import 'package:pilipala/common/widgets/stat/danmu.dart';
+import 'package:pilipala/common/widgets/stat/view.dart';
+import 'package:pilipala/utils/storage.dart';
 import 'package:pilipala/utils/utils.dart';

+Box localCache = GStrorage.localCache;
+late double sheetHeight;
+
 class IntroDetail extends StatelessWidget {
  const IntroDetail({
    super.key,
@ -14,39 +20,105 @@ class IntroDetail extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    return SizedBox(
-      width: double.infinity,
-      child: SelectableRegion(
-        focusNode: FocusNode(),
-        selectionControls: MaterialTextSelectionControls(),
+    sheetHeight = localCache.get('sheetHeight');
+    return Container(
+        color: Theme.of(context).colorScheme.background,
+        padding: EdgeInsets.only(
+            left: 14,
+            right: 14,
+            bottom: MediaQuery.of(context).padding.bottom + 20),
+        height: sheetHeight,
        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: <Widget>[
-            const SizedBox(height: 4),
-            GestureDetector(
-              onTap: () {
-                Clipboard.setData(ClipboardData(text: videoDetail!.bvid!));
-                SmartDialog.showToast('已复制');
-              },
-              child: Text(
-                videoDetail!.bvid!,
-                style: TextStyle(
-                    fontSize: 13, color: Theme.of(context).colorScheme.primary),
+          children: [
+            InkWell(
+              onTap: () => Get.back(),
+              child: Container(
+                height: 35,
+                padding: const EdgeInsets.only(bottom: 2),
+                child: Center(
+                  child: Container(
+                    width: 32,
+                    height: 3,
+                    decoration: BoxDecoration(
+                        color: Theme.of(context).colorScheme.primary,
+                        borderRadius:
+                            const BorderRadius.all(Radius.circular(3))),
+                  ),
+                ),
              ),
            ),
-            const SizedBox(height: 4),
-            Text.rich(
-              style: const TextStyle(height: 1.4),
-              TextSpan(
-                children: [
-                  buildContent(context, videoDetail!),
-                ],
+            Expanded(
+              child: SingleChildScrollView(
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text(
+                      videoDetail!.title,
+                      style: const TextStyle(
+                        fontSize: 16,
+                        fontWeight: FontWeight.w500,
+                      ),
+                    ),
+                    const SizedBox(height: 6),
+                    Row(
+                      children: [
+                        StatView(
+                          theme: 'gray',
+                          view: videoDetail!.stat!.view,
+                          size: 'medium',
+                        ),
+                        const SizedBox(width: 10),
+                        StatDanMu(
+                          theme: 'gray',
+                          danmu: videoDetail!.stat!.danmaku,
+                          size: 'medium',
+                        ),
+                        const SizedBox(width: 10),
+                        Text(
+                          Utils.dateFormat(videoDetail!.pubdate,
+                              formatType: 'detail'),
+                          style: TextStyle(
+                            fontSize: 12,
+                            color: Theme.of(context).colorScheme.outline,
+                          ),
+                        ),
+                      ],
+                    ),
+                    const SizedBox(height: 20),
+                    SizedBox(
+                      width: double.infinity,
+                      child: SelectableRegion(
+                        focusNode: FocusNode(),
+                        selectionControls: MaterialTextSelectionControls(),
+                        child: Column(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: <Widget>[
+                            Text(
+                              videoDetail!.bvid!,
+                              style: const TextStyle(fontSize: 13),
+                            ),
+                            const SizedBox(height: 4),
+                            Text.rich(
+                              style: const TextStyle(
+                                height: 1.4,
+                                // fontSize: 13,
+                              ),
+                              TextSpan(
+                                children: [
+                                  buildContent(context, videoDetail!),
+                                ],
+                              ),
+                            ),
+                          ],
+                        ),
+                      ),
+                    ),
+                  ],
+                ),
              ),
-            ),
+            )
          ],
-        ),
-      ),
-    );
+        ));
  }

  InlineSpan buildContent(BuildContext context, content) {
--- a/lib/pages/video/detail/reply/view.dart
+++ b/lib/pages/video/detail/reply/view.dart
@ -149,16 +149,13 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
                delegate: _MySliverPersistentHeaderDelegate(
                  child: Container(
                    height: 40,
-                    padding: const EdgeInsets.fromLTRB(12, 0, 6, 0),
-                    color: Theme.of(context).colorScheme.surface,
+                    padding: const EdgeInsets.fromLTRB(12, 6, 6, 0),
                    child: Row(
                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
                      children: [
-                        Obx(
-                          () => Text(
-                            '${_videoReplyController.sortTypeLabel.value}评论',
-                            style: const TextStyle(fontSize: 13),
-                          ),
+                        Text(
+                          '${_videoReplyController.sortTypeLabel.value}评论',
+                          style: const TextStyle(fontSize: 13),
                        ),
                        SizedBox(
                          height: 35,
--- a/lib/pages/video/detail/reply/widgets/reply_item.dart
+++ b/lib/pages/video/detail/reply/widgets/reply_item.dart
@ -525,18 +525,14 @@ InlineSpan buildContent(
  if (jumpUrlKeysList.isNotEmpty) {
    patternStr += '|${jumpUrlKeysList.join('|')}';
  }
-  RegExp bv23Regex = RegExp(r'https://b23\.tv/[a-zA-Z0-9]{7}');
  final RegExp pattern = RegExp(patternStr);
  List<String> matchedStrs = [];
  void addPlainTextSpan(str) {
-    spanChilds.add(
-      TextSpan(
+    spanChilds.add(TextSpan(
        text: str,
        recognizer: TapGestureRecognizer()
          ..onTap = () =>
-              replyReply?.call(replyItem.root == 0 ? replyItem : fReplyItem),
-      ),
-    );
+              replyReply?.call(replyItem.root == 0 ? replyItem : fReplyItem)));
  }

  // 分割文本并处理每个部分
@ -738,36 +734,8 @@ InlineSpan buildContent(
      return '';
    },
    onNonMatch: (String nonMatchStr) {
-      return nonMatchStr.splitMapJoin(
-        bv23Regex,
-        onMatch: (Match match) {
-          String matchStr = match[0]!;
-          spanChilds.add(
-            TextSpan(
-              text: ' $matchStr ',
-              style: isVideoPage
-                  ? TextStyle(
-                      color: Theme.of(context).colorScheme.primary,
-                    )
-                  : null,
-              recognizer: TapGestureRecognizer()
-                ..onTap = () => Get.toNamed(
-                      '/webview',
-                      parameters: {
-                        'url': matchStr,
-                        'type': 'url',
-                        'pageTitle': matchStr
-                      },
-                    ),
-            ),
-          );
-          return '';
-        },
-        onNonMatch: (String nonMatchOtherStr) {
-          addPlainTextSpan(nonMatchOtherStr);
-          return nonMatchOtherStr;
-        },
-      );
+      addPlainTextSpan(nonMatchStr);
+      return nonMatchStr;
    },
  );

--- a/lib/pages/video/detail/reply_new/view.dart
+++ b/lib/pages/video/detail/reply_new/view.dart
@ -142,10 +142,9 @@ class _VideoReplyNewDialogState extends State<VideoReplyNewDialog>

  @override
  Widget build(BuildContext context) {
-    double _keyboardHeight = EdgeInsets.fromViewPadding(
+    double keyboardHeight = EdgeInsets.fromViewPadding(
            View.of(context).viewInsets, View.of(context).devicePixelRatio)
        .bottom;
-    print('_keyboardHeight: $_keyboardHeight');
    return Container(
      clipBehavior: Clip.hardEdge,
      decoration: BoxDecoration(
@ -236,11 +235,7 @@ class _VideoReplyNewDialogState extends State<VideoReplyNewDialog>
            duration: const Duration(milliseconds: 300),
            child: SizedBox(
              width: double.infinity,
-              height: toolbarType == 'input'
-                  ? (_keyboardHeight > keyboardHeight
-                      ? _keyboardHeight
-                      : keyboardHeight)
-                  : emoteHeight,
+              height: toolbarType == 'input' ? keyboardHeight : emoteHeight,
              child: EmotePanel(
                onChoose: (package, emote) => onChooseEmote(package, emote),
              ),
--- a/lib/pages/video/detail/view.dart
+++ b/lib/pages/video/detail/view.dart
@ -212,7 +212,6 @@ class _VideoDetailPageState extends State<VideoDetailPage>
      videoIntroController.isPaused = true;
      plPlayerController!.removeStatusLister(playerListener);
      plPlayerController!.pause();
-      vdCtr.clearSubtitleContent();
    }
    setState(() => isShowing = false);
    super.didPushNext();
@ -223,10 +222,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
  void didPopNext() async {
    if (plPlayerController != null &&
        plPlayerController!.videoPlayerController != null) {
-      setState(() {
-        vdCtr.setSubtitleContent();
-        isShowing = true;
-      });
+      setState(() => isShowing = true);
    }
    vdCtr.isFirstTime = false;
    final bool autoplay = autoPlayEnable;
@ -376,9 +372,6 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                    false)
                                ? SvgPicture.asset(
                                    'assets/images/video/danmu_close.svg',
-                                    // ignore: deprecated_member_use
-                                    color:
-                                        Theme.of(context).colorScheme.outline,
                                  )
                                : SvgPicture.asset(
                                    'assets/images/video/danmu_open.svg',
--- a/lib/pages/video/detail/widgets/app_bar.dart
+++ b/lib/pages/video/detail/widgets/app_bar.dart
@ -17,16 +17,12 @@ class ScrollAppBar extends StatelessWidget {
  Widget build(BuildContext context) {
    final double statusBarHeight = MediaQuery.of(context).padding.top;
    final videoHeight = MediaQuery.sizeOf(context).width * 9 / 16;
-    double scrollDistance = scrollVal;
-    if (scrollVal > videoHeight - kToolbarHeight) {
-      scrollDistance = videoHeight - kToolbarHeight;
-    }
    return Positioned(
-      top: -videoHeight + scrollDistance + kToolbarHeight + 0.5,
+      top: -videoHeight + scrollVal + kToolbarHeight + 0.5,
      left: 0,
      right: 0,
      child: Opacity(
-        opacity: scrollDistance / (videoHeight - kToolbarHeight),
+        opacity: scrollVal / (videoHeight - kToolbarHeight),
        child: Container(
          height: statusBarHeight + kToolbarHeight,
          color: Theme.of(context).colorScheme.background,
--- a/lib/pages/video/detail/widgets/expandable_section.dart
+++ b/lib/pages/video/detail/widgets/expandable_section.dart
@ -32,14 +32,28 @@ class _ExpandedSectionState extends State<ExpandedSection>
    _runExpandCheck();
  }

+  ///Setting up the animation
+  // void prepareAnimations() {
+  //   expandController = AnimationController(
+  //       vsync: this, duration: const Duration(milliseconds: 500));
+  //   animation = CurvedAnimation(
+  //     parent: expandController,
+  //     curve: Curves.fastOutSlowIn,
+  //   );
+  // }
+
  void prepareAnimations() {
    expandController = AnimationController(
        vsync: this, duration: const Duration(milliseconds: 400));
    Animation<double> curve = CurvedAnimation(
      parent: expandController,
-      curve: Curves.linear,
+      curve: Curves.fastOutSlowIn,
    );
    animation = Tween(begin: widget.begin, end: widget.end).animate(curve);
+    //   animation = CurvedAnimation(
+    //     parent: expandController,
+    //     curve: Curves.fastOutSlowIn,
+    //   );
  }

  void _runExpandCheck() {
@ -53,9 +67,7 @@ class _ExpandedSectionState extends State<ExpandedSection>
  @override
  void didUpdateWidget(ExpandedSection oldWidget) {
    super.didUpdateWidget(oldWidget);
-    if (widget.expand != oldWidget.expand) {
-      _runExpandCheck();
-    }
+    _runExpandCheck();
  }

  @override
--- a/lib/pages/video/detail/widgets/header_control.dart
+++ b/lib/pages/video/detail/widgets/header_control.dart
@ -17,7 +17,6 @@ import 'package:pilipala/plugin/pl_player/index.dart';
 import 'package:pilipala/plugin/pl_player/models/play_repeat.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:pilipala/services/shutdown_timer_service.dart';
-import '../../../../http/danmaku.dart';
 import '../../../../models/common/search_type.dart';
 import '../../../../models/video_detail_res.dart';
 import '../introduction/index.dart';
@ -53,7 +52,7 @@ class _HeaderControlState extends State<HeaderControl> {
  final Box<dynamic> videoStorage = GStrorage.video;
  late List<double> speedsList;
  double buttonSpace = 8;
-  RxBool isFullScreen = false.obs;
+  bool showTitle = false;
  late String heroTag;
  late VideoIntroController videoIntroController;
  late VideoDetailData videoDetail;
@ -70,8 +69,13 @@ class _HeaderControlState extends State<HeaderControl> {
  }

  void fullScreenStatusListener() {
-    widget.videoDetailCtr!.plPlayerController.isFullScreen.listen((bool val) {
-      isFullScreen.value = val;
+    widget.videoDetailCtr!.plPlayerController.isFullScreen
+        .listen((bool isFullScreen) {
+      if (isFullScreen) {
+        showTitle = true;
+      } else {
+        showTitle = false;
+      }

      /// TODO setState() called after dispose()
      if (mounted) {
@ -214,87 +218,6 @@ class _HeaderControlState extends State<HeaderControl> {
    );
  }

-  /// 发送弹幕
-  void showShootDanmakuSheet() {
-    final TextEditingController textController = TextEditingController();
-    bool isSending = false; // 追踪是否正在发送
-    showDialog(
-      context: Get.context!,
-      builder: (BuildContext context) {
-        // TODO: 支持更多类型和颜色的弹幕
-        return AlertDialog(
-          title: const Text('发送弹幕（测试）'),
-          content: StatefulBuilder(
-              builder: (BuildContext context, StateSetter setState) {
-            return TextField(
-              controller: textController,
-            );
-          }),
-          actions: [
-            TextButton(
-              onPressed: () => Get.back(),
-              child: Text(
-                '取消',
-                style: TextStyle(color: Theme.of(context).colorScheme.outline),
-              ),
-            ),
-            StatefulBuilder(
-                builder: (BuildContext context, StateSetter setState) {
-              return TextButton(
-                onPressed: isSending
-                    ? null
-                    : () async {
-                        final String msg = textController.text;
-                        if (msg.isEmpty) {
-                          SmartDialog.showToast('弹幕内容不能为空');
-                          return;
-                        } else if (msg.length > 100) {
-                          SmartDialog.showToast('弹幕内容不能超过100个字符');
-                          return;
-                        }
-                        setState(() {
-                          isSending = true; // 开始发送，更新状态
-                        });
-                        //修改按钮文字
-                        final dynamic res = await DanmakaHttp.shootDanmaku(
-                          oid: widget.videoDetailCtr!.cid.value,
-                          msg: textController.text,
-                          bvid: widget.videoDetailCtr!.bvid,
-                          progress:
-                              widget.controller!.position.value.inMilliseconds,
-                          type: 1,
-                        );
-                        setState(() {
-                          isSending = false; // 发送结束，更新状态
-                        });
-                        if (res['status']) {
-                          SmartDialog.showToast('发送成功');
-                          // 发送成功，自动预览该弹幕，避免重新请求
-                          // TODO: 暂停状态下预览弹幕仍会移动与计时，可考虑添加到dmSegList或其他方式实现
-                          widget.controller!.danmakuController!.addItems([
-                            DanmakuItem(
-                              msg,
-                              color: Colors.white,
-                              time: widget
-                                  .controller!.position.value.inMilliseconds,
-                              type: DanmakuItemType.scroll,
-                              isSend: true,
-                            )
-                          ]);
-                          Get.back();
-                        } else {
-                          SmartDialog.showToast('发送失败，错误信息为${res['msg']}');
-                        }
-                      },
-                child: Text(isSending ? '发送中...' : '发送'),
-              );
-            })
-          ],
-        );
-      },
-    );
-  }
-
  /// 定时关闭
  void scheduleExit() async {
    const List<int> scheduleTimeChoices = [
@ -421,56 +344,6 @@ class _HeaderControlState extends State<HeaderControl> {
    );
  }

-  /// 选择字幕
-  void showSubtitleDialog() async {
-    int tempThemeValue = widget.controller!.subTitleCode.value;
-    int len = widget.videoDetailCtr!.subtitles.length;
-    showDialog(
-        context: context,
-        builder: (BuildContext context) {
-          return AlertDialog(
-            title: const Text('选择字幕'),
-            contentPadding: const EdgeInsets.fromLTRB(0, 12, 0, 18),
-            content: StatefulBuilder(builder: (context, StateSetter setState) {
-              return len == 0
-                  ? const SizedBox(
-                      height: 60,
-                      child: Center(
-                        child: Text('没有字幕'),
-                      ),
-                    )
-                  : Column(
-                      mainAxisSize: MainAxisSize.min,
-                      children: [
-                        RadioListTile(
-                          value: -1,
-                          title: const Text('关闭弹幕'),
-                          groupValue: tempThemeValue,
-                          onChanged: (value) {
-                            tempThemeValue = value!;
-                            widget.controller?.toggleSubtitle(value);
-                            Get.back();
-                          },
-                        ),
-                        ...widget.videoDetailCtr!.subtitles
-                            .map((e) => RadioListTile(
-                                  value: e.code,
-                                  title: Text(e.title),
-                                  groupValue: tempThemeValue,
-                                  onChanged: (value) {
-                                    tempThemeValue = value!;
-                                    widget.controller?.toggleSubtitle(value);
-                                    Get.back();
-                                  },
-                                ))
-                            .toList(),
-                      ],
-                    );
-            }),
-          );
-        });
-  }
-
  /// 选择倍速
  void showSetSpeedSheet() {
    final double currentSpeed = widget.controller!.playbackSpeed;
@ -1156,7 +1029,7 @@ class _HeaderControlState extends State<HeaderControl> {
            },
          ),
          SizedBox(width: buttonSpace),
-          if (isFullScreen.value &&
+          if (showTitle &&
              isLandscape &&
              widget.videoType == SearchType.video) ...[
            Column(
@ -1208,43 +1081,6 @@ class _HeaderControlState extends State<HeaderControl> {
          //   ),
          //   fuc: () => _.screenshot(),
          // ),
-          if (isFullScreen.value) ...[
-            SizedBox(
-              width: 56,
-              height: 34,
-              child: TextButton(
-                style: ButtonStyle(
-                  padding: MaterialStateProperty.all(EdgeInsets.zero),
-                ),
-                onPressed: () => showShootDanmakuSheet(),
-                child: const Text(
-                  '发弹幕',
-                  style: textStyle,
-                ),
-              ),
-            ),
-            SizedBox(
-              width: 34,
-              height: 34,
-              child: Obx(
-                () => IconButton(
-                  style: ButtonStyle(
-                    padding: MaterialStateProperty.all(EdgeInsets.zero),
-                  ),
-                  onPressed: () {
-                    _.isOpenDanmu.value = !_.isOpenDanmu.value;
-                  },
-                  icon: Icon(
-                    _.isOpenDanmu.value
-                        ? Icons.subtitles_outlined
-                        : Icons.subtitles_off_outlined,
-                    size: 19,
-                    color: Colors.white,
-                  ),
-                ),
-              ),
-            ),
-          ],
          SizedBox(width: buttonSpace),
          if (Platform.isAndroid) ...<Widget>[
            SizedBox(
@ -1279,31 +1115,6 @@ class _HeaderControlState extends State<HeaderControl> {
            ),
            SizedBox(width: buttonSpace),
          ],
-
-          /// 字幕
-          // SizedBox(
-          //   width: 34,
-          //   height: 34,
-          //   child: IconButton(
-          //     style: ButtonStyle(
-          //       padding: MaterialStateProperty.all(EdgeInsets.zero),
-          //     ),
-          //     onPressed: () => showSubtitleDialog(),
-          //     icon: const Icon(
-          //       Icons.closed_caption_off,
-          //       size: 22,
-          //     ),
-          //   ),
-          // ),
-          ComBtn(
-            icon: const Icon(
-              Icons.closed_caption_off,
-              size: 22,
-              color: Colors.white,
-            ),
-            fuc: () => showSubtitleDialog(),
-          ),
-          SizedBox(width: buttonSpace),
          Obx(
            () => SizedBox(
              width: 45,
--- a/lib/plugin/pl_player/controller.dart
+++ b/lib/plugin/pl_player/controller.dart
@ -21,8 +21,6 @@ import 'package:pilipala/utils/storage.dart';
 import 'package:screen_brightness/screen_brightness.dart';
 import 'package:status_bar_control/status_bar_control.dart';
 import 'package:universal_platform/universal_platform.dart';
-import '../../models/video/subTitile/content.dart';
-import '../../models/video/subTitile/result.dart';
 // import 'package:wakelock_plus/wakelock_plus.dart';

 Box videoStorage = GStrorage.video;
@ -75,8 +73,6 @@ class PlPlayerController {
  final Rx<bool> _doubleSpeedStatus = false.obs;
  final Rx<bool> _controlsLock = false.obs;
  final Rx<bool> _isFullScreen = false.obs;
-  final Rx<bool> _subTitleOpen = false.obs;
-  final Rx<int> _subTitleCode = (-1).obs;
  // 默认投稿视频格式
  static Rx<String> _videoType = 'archive'.obs;

@ -122,7 +118,6 @@ class PlPlayerController {
  PreferredSizeWidget? headerControl;
  PreferredSizeWidget? bottomControl;
  Widget? danmuWidget;
-  late RxList subtitles;

  /// 数据加载监听
  Stream<DataStatus> get onDataStatusChanged => dataStatus.status.stream;
@ -152,11 +147,6 @@ class PlPlayerController {
  Rx<bool> get mute => _mute;
  Stream<bool> get onMuteChanged => _mute.stream;

-  /// 字幕开启状态
-  Rx<bool> get subTitleOpen => _subTitleOpen;
-  Rx<int> get subTitleCode => _subTitleCode;
-  // Stream<bool> get onSubTitleOpenChanged => _subTitleOpen.stream;
-
  /// [videoPlayerController] instace of Player
  Player? get videoPlayerController => _videoPlayerController;

@ -241,10 +231,6 @@ class PlPlayerController {
  // 播放顺序相关
  PlayRepeat playRepeat = PlayRepeat.pause;

-  RxList<SubTitileContentModel> subtitleContents =
-      <SubTitileContentModel>[].obs;
-  RxString subtitleContent = ''.obs;
-
  void updateSliderPositionSecond() {
    int newSecond = _sliderPosition.value.inSeconds;
    if (sliderPositionSeconds.value != newSecond) {
@ -364,8 +350,6 @@ class PlPlayerController {
    bool enableHeart = true,
    // 是否首次加载
    bool isFirstTime = true,
-    //  是否开启字幕
-    bool enableSubTitle = false,
  }) async {
    try {
      _autoPlay = autoplay;
@ -380,9 +364,7 @@ class PlPlayerController {
      _cid = cid;
      _enableHeart = enableHeart;
      _isFirstTime = isFirstTime;
-      _subTitleOpen.value = enableSubTitle;
-      subtitles = [].obs;
-      subtitleContent.value = '';
+
      if (_videoPlayerController != null &&
          _videoPlayerController!.state.playing) {
        await pause(notify: false);
@ -593,8 +575,6 @@ class PlPlayerController {
            _sliderPosition.value = event;
            updateSliderPositionSecond();
          }
-          querySubtitleContent(
-              videoPlayerController!.state.position.inSeconds.toDouble());

          /// 触发回调事件
          for (var element in _positionListeners) {
@ -629,10 +609,6 @@ class PlPlayerController {
              const Duration(seconds: 1),
              () => videoPlayerServiceHandler.onPositionChange(event));
        }),
-
-        // onSubTitleOpenChanged.listen((bool event) {
-        //   toggleSubtitle(event ? subTitleCode.value : -1);
-        // })
      ],
    );
  }
@ -1071,61 +1047,12 @@ class PlPlayerController {
    }
  }

-  /// 字幕
-  void toggleSubtitle(int code) {
-    _subTitleOpen.value = code != -1;
-    _subTitleCode.value = code;
-    // if (code == -1) {
-    //   // 关闭字幕
-    //   _subTitleOpen.value = false;
-    //   _subTitleCode.value = code;
-    //   _videoPlayerController?.setSubtitleTrack(SubtitleTrack.no());
-    //   return;
-    // }
-    // final SubTitlteItemModel? subtitle = subtitles?.firstWhereOrNull(
-    //   (element) => element.code == code,
-    // );
-    // _subTitleOpen.value = true;
-    // _subTitleCode.value = code;
-    // _videoPlayerController?.setSubtitleTrack(
-    //   SubtitleTrack.data(
-    //     subtitle!.content!,
-    //     title: subtitle.title,
-    //     language: subtitle.lan,
-    //   ),
-    // );
-  }
-
-  void querySubtitleContent(double progress) {
-    if (subTitleCode.value == -1) {
-      subtitleContent.value = '';
-      return;
-    }
-    if (subtitles.isEmpty) {
-      return;
-    }
-    final SubTitlteItemModel? subtitle = subtitles.firstWhereOrNull(
-      (element) => element.code == subTitleCode.value,
-    );
-    if (subtitle != null && subtitle.body!.isNotEmpty) {
-      for (var content in subtitle.body!) {
-        if (progress >= content['from']! && progress <= content['to']!) {
-          subtitleContent.value = content['content']!;
-          return;
-        }
-      }
-    }
-  }
-
  setPlayRepeat(PlayRepeat type) {
    playRepeat = type;
    videoStorage.put(VideoBoxKey.playRepeat, type.value);
  }

  Future<void> dispose({String type = 'single'}) async {
-    print('dispose');
-    print('dispose: ${playerCount.value}');
-
    // 每次减1，最后销毁
    if (type == 'single' && playerCount.value > 1) {
      _playerCount.value -= 1;
@ -1135,7 +1062,6 @@ class PlPlayerController {
    }
    _playerCount.value = 0;
    try {
-      print('dispose dispose ---------');
      _timer?.cancel();
      _timerForVolume?.cancel();
      _timerForGettingVolume?.cancel();
--- a/lib/plugin/pl_player/view.dart
+++ b/lib/plugin/pl_player/view.dart
@ -580,45 +580,6 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
        if (widget.danmuWidget != null)
          Positioned.fill(top: 4, child: widget.danmuWidget!),

-        /// 开启且有字幕时展示
-        Stack(
-          children: [
-            Positioned(
-              left: 0,
-              right: 0,
-              bottom: 30,
-              child: Align(
-                alignment: Alignment.center,
-                child: Obx(
-                  () => Visibility(
-                      visible: widget.controller.subTitleCode.value != -1,
-                      child: Container(
-                        decoration: BoxDecoration(
-                          borderRadius: BorderRadius.circular(4),
-                          color: widget.controller.subtitleContent.value != ''
-                              ? Colors.black.withOpacity(0.6)
-                              : Colors.transparent,
-                        ),
-                        padding: widget.controller.subTitleCode.value != -1
-                            ? const EdgeInsets.symmetric(
-                                horizontal: 10,
-                                vertical: 4,
-                              )
-                            : EdgeInsets.zero,
-                        child: Text(
-                          widget.controller.subtitleContent.value,
-                          style: const TextStyle(
-                            color: Colors.white,
-                            fontSize: 12,
-                          ),
-                        ),
-                      )),
-                ),
-              ),
-            ),
-          ],
-        ),
-
        /// 手势
        Positioned.fill(
          left: 16,
--- a/lib/utils/app_scheme.dart
+++ b/lib/utils/app_scheme.dart
@ -20,7 +20,7 @@ class PiliSchame {
    /// 完整链接进入 b23.无效
    appScheme.getLatestScheme().then((SchemeEntity? value) {
      if (value != null) {
-        _fullPathPush(value);
+        _routePush(value);
      }
    });

@ -37,7 +37,6 @@ class PiliSchame {
    final String scheme = value.scheme;
    final String host = value.host;
    final String path = value.path;
-
    if (scheme == 'bilibili') {
      if (host == 'root') {
        Navigator.popUntil(
@ -85,6 +84,14 @@ class PiliSchame {
        }
      } else if (host == 'search') {
        Get.toNamed('/searchResult', parameters: {'keyword': ''});
+      } else if (host == 'article') {
+        final String id = path.split('/').last.split('?').first;
+        Get.toNamed('/htmlRender', parameters: {
+          'url': 'https://www.bilibili.com/read/cv$id',
+          'title': 'cv$id',
+          'id': 'cv$id',
+          'dynamicType': 'read'
+        });
      }
    }
    if (scheme == 'https') {
@ -226,6 +233,13 @@ class PiliSchame {
          break;
        case 'read':
          print('专栏');
+          String id = 'cv${matchNum(query!['id']!).first}';
+          Get.toNamed('/htmlRender', parameters: {
+            'url': value.dataString!,
+            'title': '',
+            'id': id,
+            'dynamicType': 'read'
+          });
          break;
        case 'space':
          print('个人空间');
--- a/lib/utils/em.dart
+++ b/lib/utils/em.dart
@ -19,7 +19,15 @@ class Em {
      return regCate(matchStr);
    }, onNonMatch: (String str) {
      if (str != '') {
-        str = decodeHtmlEntities(str);
+        str = str
+            .replaceAll('&lt;', '<')
+            .replaceAll('&gt;', '>')
+            .replaceAll('&#34;', '"')
+            .replaceAll('&#39;', "'")
+            .replaceAll('&quot;', '"')
+            .replaceAll('&apos;', "'")
+            .replaceAll('&nbsp;', " ")
+            .replaceAll('&amp;', "&");
        Map map = {'type': 'text', 'text': str};
        res.add(map);
      }
@ -27,17 +35,4 @@ class Em {
    });
    return res;
  }
-
-  static String decodeHtmlEntities(String title) {
-    return title
-        .replaceAll('&lt;', '<')
-        .replaceAll('&gt;', '>')
-        .replaceAll('&#34;', '"')
-        .replaceAll('&#39;', "'")
-        .replaceAll('&quot;', '"')
-        .replaceAll('&apos;', "'")
-        .replaceAll('&nbsp;', " ")
-        .replaceAll('&amp;', "&")
-        .replaceAll('&#x27;', "'");
-  }
 }
--- a/lib/utils/subtitle.dart
+++ b/lib/utils/subtitle.dart
@ -1,32 +0,0 @@
-class SubTitleUtils {
-  // 格式整理
-  static String convertToWebVTT(List jsonData) {
-    String webVTTContent = 'WEBVTT FILE\n\n';
-
-    for (int i = 0; i < jsonData.length; i++) {
-      final item = jsonData[i];
-      double from = item['from'] as double;
-      double to = item['to'] as double;
-      int sid = (item['sid'] ?? 0) as int;
-      String content = item['content'] as String;
-
-      webVTTContent += '$sid\n';
-      webVTTContent += '${formatTime(from)} --> ${formatTime(to)}\n';
-      webVTTContent += '$content\n\n';
-    }
-
-    return webVTTContent;
-  }
-
-  static String formatTime(num seconds) {
-    final String h = (seconds / 3600).floor().toString().padLeft(2, '0');
-    final String m = (seconds % 3600 / 60).floor().toString().padLeft(2, '0');
-    final String s = (seconds % 60).floor().toString().padLeft(2, '0');
-    final String ms =
-        (seconds * 1000 % 1000).floor().toString().padLeft(3, '0');
-    if (h == '00') {
-      return "$m:$s.$ms";
-    }
-    return "$h:$m:$s.$ms";
-  }
-}
--- a/lib/utils/utils.dart
+++ b/lib/utils/utils.dart
@ -51,7 +51,7 @@ class Utils {
    }
    if (time < 3600) {
      if (time == 0) {
-        return '00:00';
+        return time;
      }
      final int minute = time ~/ 60;
      final double res = time / 60;
@ -208,35 +208,17 @@ class Utils {

  static int findClosestNumber(int target, List<int> numbers) {
    int minDiff = 127;
-    int closestNumber = 0; // 初始化为0，表示没有找到比目标值小的整数
-
-    // 向下查找
+    late int closestNumber;
    try {
      for (int number in numbers) {
-        if (number < target) {
-          int diff = target - number; // 计算目标值与当前整数的差值
+        int diff = (number - target).abs();

-          if (diff < minDiff) {
-            minDiff = diff;
-            closestNumber = number;
-          }
+        if (diff < minDiff) {
+          minDiff = diff;
+          closestNumber = number;
        }
      }
    } catch (_) {}
-
-    // 向上查找
-    if (closestNumber == 0) {
-      try {
-        for (int number in numbers) {
-          int diff = (number - target).abs();
-
-          if (diff < minDiff) {
-            minDiff = diff;
-            closestNumber = number;
-          }
-        }
-      } catch (_) {}
-    }
    return closestNumber;
  }

--- a/pubspec.lock
+++ b/pubspec.lock
@ -433,14 +433,6 @@ packages:
      url: "https://pub.flutter-io.cn"
    source: hosted
    version: "5.0.3"
-  expandable:
-    dependency: "direct main"
-    description:
-      name: expandable
-      sha256: "9604d612d4d1146dafa96c6d8eec9c2ff0994658d6d09fed720ab788c7f5afc2"
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "5.0.1"
  extended_image:
    dependency: "direct main"
    description:
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.0.23+1023
+version: 1.0.21+1021

 environment:
  sdk: ">=3.0.0 <4.0.0"
@ -142,8 +142,6 @@ dependencies:
  path: 1.8.3
  # 电池优化
  disable_battery_optimization: ^1.1.1
-  # 展开/收起
-  expandable: ^5.0.1

 dev_dependencies:
  flutter_test:
Author	SHA1	Message	Date
guozhigq	53b72bec25	mod: read schame补充	2024-03-24 13:16:13 +08:00
guozhigq	20745a4541	Merge branch 'main' into feature-appScheme	2024-03-24 11:44:02 +08:00