Merge branch 'main' into feature-customBottomControl

feat: 接收自定义组件传入
2024-03-23 18:13:47 +08:00 · 2024-03-11 23:03:50 +08:00
27 changed files with 312 additions and 757 deletions
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@ -9,7 +9,6 @@ PODS:
    - Flutter
  - connectivity_plus (0.0.1):
    - Flutter
-    - FlutterMacOS
    - ReachabilitySwift
  - device_info_plus (0.0.1):
    - Flutter
@ -39,7 +38,7 @@ PODS:
  - path_provider_foundation (0.0.1):
    - Flutter
    - FlutterMacOS
-  - permission_handler_apple (9.3.0):
+  - permission_handler_apple (9.1.1):
    - Flutter
  - ReachabilitySwift (5.0.0)
  - saver_gallery (0.0.1):
@ -72,7 +71,7 @@ DEPENDENCIES:
  - audio_service (from `.symlinks/plugins/audio_service/ios`)
  - audio_session (from `.symlinks/plugins/audio_session/ios`)
  - auto_orientation (from `.symlinks/plugins/auto_orientation/ios`)
-  - connectivity_plus (from `.symlinks/plugins/connectivity_plus/darwin`)
+  - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
  - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
  - Flutter (from `Flutter`)
  - flutter_mailer (from `.symlinks/plugins/flutter_mailer/ios`)
@ -114,7 +113,7 @@ EXTERNAL SOURCES:
  auto_orientation:
    :path: ".symlinks/plugins/auto_orientation/ios"
  connectivity_plus:
-    :path: ".symlinks/plugins/connectivity_plus/darwin"
+    :path: ".symlinks/plugins/connectivity_plus/ios"
  device_info_plus:
    :path: ".symlinks/plugins/device_info_plus/ios"
  Flutter:
@ -167,7 +166,7 @@ SPEC CHECKSUMS:
  audio_service: f509d65da41b9521a61f1c404dd58651f265a567
  audio_session: 4f3e461722055d21515cf3261b64c973c062f345
  auto_orientation: 102ed811a5938d52c86520ddd7ecd3a126b5d39d
-  connectivity_plus: e2dad488011aeb593e219360e804c43cc1af5770
+  connectivity_plus: 07c49e96d7fc92bc9920617b83238c4d178b446a
  device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
  flutter_mailer: 2ef5a67087bc8c6c4cefd04a178bf1ae2c94cd83
@ -181,7 +180,7 @@ SPEC CHECKSUMS:
  media_kit_video: 5da63f157170e5bf303bf85453b7ef6971218a2e
  package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
  path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
-  permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
+  permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
  ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
  saver_gallery: 2b4e584106fde2407ab51560f3851564963e6b78
  screen_brightness_ios: 715ca807df953bf676d339f11464e438143ee625
@ -194,7 +193,7 @@ SPEC CHECKSUMS:
  volume_controller: 531ddf792994285c9b17f9d8a7e4dcdd29b3eae9
  wakelock_plus: 8b09852c8876491e4b6d179e17dfe2a0b5f60d47
  webview_cookie_manager: eaf920722b493bd0f7611b5484771ca53fed03f7
-  webview_flutter_wkwebview: 4f3e50f7273d31e5500066ed267e3ae4309c5ae4
+  webview_flutter_wkwebview: 2e2d318f21a5e036e2c3f26171342e95908bd60a

 PODFILE CHECKSUM: 637cd290bed23275b5f5ffcc7eb1e73d0a5fb2be

--- 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';

--- a/lib/http/interceptor.dart
+++ b/lib/http/interceptor.dart
@ -46,6 +46,7 @@ class ApiInterceptor extends Interceptor {
    // 处理网络请求错误
    // handler.next(err);
    String url = err.requestOptions.uri.toString();
+    print('🌹🌹ApiInterceptor: $url');
    if (!url.contains('heartBeat')) {
      SmartDialog.showToast(
        await dioError(err),
@ -78,24 +79,23 @@ class ApiInterceptor extends Interceptor {
  }

  static Future<String> checkConnect() async {
-    final List<ConnectivityResult> connectivityResult =
+    final ConnectivityResult connectivityResult =
        await Connectivity().checkConnectivity();
-    if (connectivityResult.contains(ConnectivityResult.mobile)) {
-      return '正在使用移动流量';
-    } else if (connectivityResult.contains(ConnectivityResult.wifi)) {
-      return '正在使用wifi';
-    } else if (connectivityResult.contains(ConnectivityResult.ethernet)) {
-      return '正在使用局域网';
-    } else if (connectivityResult.contains(ConnectivityResult.vpn)) {
-      return '正在使用代理网络';
-    } else if (connectivityResult.contains(ConnectivityResult.bluetooth)) {
-      return '正在使用蓝牙网络';
-    } else if (connectivityResult.contains(ConnectivityResult.other)) {
-      return '正在使用其他网络';
-    } else if (connectivityResult.contains(ConnectivityResult.none)) {
-      return '未连接到任何网络';
-    } else {
-      return '';
+    switch (connectivityResult) {
+      case ConnectivityResult.mobile:
+        return '正在使用移动流量';
+      case ConnectivityResult.wifi:
+        return '正在使用wifi';
+      case ConnectivityResult.ethernet:
+        return '正在使用局域网';
+      case ConnectivityResult.vpn:
+        return '正在使用代理网络';
+      case ConnectivityResult.other:
+        return '正在使用其他网络';
+      case ConnectivityResult.none:
+        return '未连接到任何网络';
+      default:
+        return '';
    }
  }
 }
--- 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/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/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,24 +258,6 @@ class HistoryItem extends StatelessWidget {
                              ),
                            ),
                          ),
-                          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,
-                              ),
-                            ),
-                          )
                        ],
                      ),
                      VideoContent(videoItem: videoItem, ctr: ctr)
--- 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/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';
@ -94,10 +93,7 @@ class VideoDetailController extends GetxController
  late int cacheAudioQa;

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

  @override
  void onInit() {
@ -149,7 +145,6 @@ class VideoDetailController extends GetxController
    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;
  }

  // 视频链接
@ -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
@ -148,16 +148,34 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
                floating: true,
                delegate: _MySliverPersistentHeaderDelegate(
                  child: Container(
-                    height: 40,
+                    height: 45,
                    padding: const EdgeInsets.fromLTRB(12, 0, 6, 0),
-                    color: Theme.of(context).colorScheme.surface,
+                    decoration: BoxDecoration(
+                      color: Theme.of(context).colorScheme.background,
+                      border: Border(
+                        bottom: BorderSide(
+                            color: Theme.of(context)
+                                .colorScheme
+                                .outline
+                                .withOpacity(0.1)),
+                      ),
+                    ),
                    child: Row(
                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
                      children: [
                        Obx(
-                          () => Text(
-                            '${_videoReplyController.sortTypeLabel.value}评论',
-                            style: const TextStyle(fontSize: 13),
+                          () => AnimatedSwitcher(
+                            duration: const Duration(milliseconds: 400),
+                            transitionBuilder:
+                                (Widget child, Animation<double> animation) {
+                              return ScaleTransition(
+                                  scale: animation, child: child);
+                            },
+                            child: Text(
+                              '共${_videoReplyController.count.value}条回复',
+                              key: ValueKey<int>(
+                                  _videoReplyController.count.value),
+                            ),
                          ),
                        ),
                        SizedBox(
@ -166,12 +184,10 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
                            onPressed: () =>
                                _videoReplyController.queryBySort(),
                            icon: const Icon(Icons.sort, size: 16),
-                            label: Obx(
-                              () => Text(
-                                _videoReplyController.sortTypeLabel.value,
-                                style: const TextStyle(fontSize: 13),
-                              ),
-                            ),
+                            label: Obx(() => Text(
+                                  _videoReplyController.sortTypeLabel.value,
+                                  style: const TextStyle(fontSize: 13),
+                                )),
                          ),
                        )
                      ],
@ -313,8 +329,8 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>

 class _MySliverPersistentHeaderDelegate extends SliverPersistentHeaderDelegate {
  _MySliverPersistentHeaderDelegate({required this.child});
-  final double _minExtent = 40;
-  final double _maxExtent = 40;
+  final double _minExtent = 45;
+  final double _maxExtent = 45;
  final Widget child;

  @override
--- a/lib/pages/video/detail/reply/widgets/reply_item.dart
+++ b/lib/pages/video/detail/reply/widgets/reply_item.dart
@ -498,7 +498,7 @@ InlineSpan buildContent(
      return str;
    });
  }
-  content.message = content.message.replaceAll(RegExp(r"\{vote:.*?\}"), ' ');
+  // content.message = content.message.replaceAll(RegExp(r"\{vote:.*?\}"), ' ');
  content.message = content.message
      .replaceAll('&amp;', '&')
      .replaceAll('&lt;', '<')
--- 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;
@ -372,13 +368,10 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                                  !(plPlayerController?.isOpenDanmu.value ??
                                      false);
                            },
-                            icon: !(plPlayerController?.isOpenDanmu.value ??
+                            icon: (plPlayerController?.isOpenDanmu.value ??
                                    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
@ -344,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;
@ -1165,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);
@ -393,13 +375,7 @@ class PlPlayerController {
      }
      // 配置Player 音轨、字幕等等
      _videoPlayerController = await _createVideoController(
-        dataSource,
-        _looping,
-        enableHA,
-        width,
-        height,
-        seekTo,
-      );
+          dataSource, _looping, enableHA, width, height);
      // 获取视频时长 00:00
      _duration.value = duration ?? _videoPlayerController!.state.duration;
      updateDurationSecond();
@ -410,7 +386,7 @@ class PlPlayerController {
      if (!_listenersInitialized) {
        startListeners();
      }
-      await _initializePlayer(duration: _duration.value);
+      await _initializePlayer(seekTo: seekTo, duration: _duration.value);
      bool autoEnterFullcreen =
          setting.get(SettingBoxKey.enableAutoEnter, defaultValue: false);
      if (autoEnterFullcreen && _isFirstTime) {
@ -430,7 +406,6 @@ class PlPlayerController {
    bool enableHA,
    double? width,
    double? height,
-    Duration? seekTo,
  ) async {
    // 每次配置时先移除监听
    removeListeners();
@ -513,11 +488,7 @@ class PlPlayerController {
      );
    }
    player.open(
-      Media(
-        dataSource.videoSource!,
-        httpHeaders: dataSource.httpHeaders,
-        start: seekTo ?? Duration.zero,
-      ),
+      Media(dataSource.videoSource!, httpHeaders: dataSource.httpHeaders),
      play: false,
    );
    // 音轨
@ -530,6 +501,7 @@ class PlPlayerController {

  // 开始播放
  Future _initializePlayer({
+    Duration seekTo = Duration.zero,
    Duration? duration,
  }) async {
    // 设置倍速
@ -547,6 +519,11 @@ class PlPlayerController {
    //   await setLooping(_looping);
    // }

+    // 跳转播放
+    if (seekTo != Duration.zero) {
+      await this.seekTo(seekTo);
+    }
+
    // 自动播放
    if (_autoPlay) {
      await play(duration: duration);
@ -598,8 +575,6 @@ class PlPlayerController {
            _sliderPosition.value = event;
            updateSliderPositionSecond();
          }
-          querySubtitleContent(
-              videoPlayerController!.state.position.inSeconds.toDouble());

          /// 触发回调事件
          for (var element in _positionListeners) {
@ -634,10 +609,6 @@ class PlPlayerController {
              const Duration(seconds: 1),
              () => videoPlayerServiceHandler.onPositionChange(event));
        }),
-
-        // onSubTitleOpenChanged.listen((bool event) {
-        //   toggleSubtitle(event ? subTitleCode.value : -1);
-        // })
      ],
    );
  }
@ -666,14 +637,21 @@ class PlPlayerController {
        await _videoPlayerController?.stream.buffer.first;
      }
      await _videoPlayerController?.seek(position);
+      // if (playerStatus.stopped) {
+      //   play();
+      // }
    } else {
      print('seek duration else');
      _timerForSeek?.cancel();
      _timerForSeek =
          Timer.periodic(const Duration(milliseconds: 200), (Timer t) async {
+        //_timerForSeek = null;
        if (duration.value.inSeconds != 0) {
          await _videoPlayerController!.stream.buffer.first;
          await _videoPlayerController?.seek(position);
+          // if (playerStatus.status.value == PlayerStatus.paused) {
+          //   play();
+          // }
          t.cancel();
          _timerForSeek = null;
        }
@ -1069,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;
@ -1133,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/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/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
@ -24,7 +24,7 @@ import wakelock_plus
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
  AudioServicePlugin.register(with: registry.registrar(forPlugin: "AudioServicePlugin"))
  AudioSessionPlugin.register(with: registry.registrar(forPlugin: "AudioSessionPlugin"))
-  ConnectivityPlusPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlusPlugin"))
+  ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin"))
  DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
  DynamicColorPlugin.register(with: registry.registrar(forPlugin: "DynamicColorPlugin"))
  FlutterVolumeControllerPlugin.register(with: registry.registrar(forPlugin: "FlutterVolumeControllerPlugin"))
--- a/pubspec.lock
+++ b/pubspec.lock
@ -21,10 +21,10 @@ packages:
    dependency: "direct main"
    description:
      name: animations
-      sha256: d3d6dcfb218225bbe68e87ccf6378bbb2e32a94900722c5f81611dad089911cb
+      sha256: "708e4b68c23228c264b038fe7003a2f5d01ce85fc64d8cae090e86b27fcea6c5"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "2.0.11"
+    version: "2.0.10"
  appscheme:
    dependency: "direct main"
    description:
@ -101,10 +101,10 @@ packages:
    dependency: "direct main"
    description:
      name: audio_video_progress_bar
-      sha256: ccc7d7b83d2a16c52d4a7fb332faabd1baa053fb0e4c16815aefd3945ab33b81
+      sha256: "3384875247cdbea748bd9ae8330631cd06a6cabfcda4945d45c9b406da92bc66"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "2.0.2"
+    version: "2.0.1"
  auto_orientation:
    dependency: "direct main"
    description:
@ -157,10 +157,10 @@ packages:
    dependency: "direct dev"
    description:
      name: build_runner
-      sha256: "581bacf68f89ec8792f5e5a0b2c4decd1c948e97ce659dc783688c8a88fbec21"
+      sha256: "67d591d602906ef9201caf93452495ad1812bea2074f04e25dbd7c133785821b"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "2.4.8"
+    version: "2.4.7"
  build_runner_core:
    dependency: transitive
    description:
@ -213,10 +213,10 @@ packages:
    dependency: "direct main"
    description:
      name: catcher_2
-      sha256: "9cf33d2befd10058374e5fc6177577fdd938d73d9c06810de81cf91311a7ce98"
+      sha256: ca94d45ffb52bf4b16a425cdff6734ae8443d36d5f06c276f1c2a593120b11ed
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "1.2.3"
+    version: "1.1.0"
  characters:
    dependency: transitive
    description:
@ -269,18 +269,18 @@ packages:
    dependency: "direct main"
    description:
      name: connectivity_plus
-      sha256: e9feae83b1849f61bad9f6f33ee00646e3410d54ce0821e02f262f9901dad3c9
+      sha256: "77a180d6938f78ca7d2382d2240eb626c0f6a735d0bfdce227d8ffb80f95c48b"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "6.0.1"
+    version: "4.0.2"
  connectivity_plus_platform_interface:
    dependency: transitive
    description:
      name: connectivity_plus_platform_interface
-      sha256: b6a56efe1e6675be240de39107281d4034b64ac23438026355b4234042a35adb
+      sha256: cf1d1c28f4416f8c654d7dc3cd638ec586076255d407cef3ddbdaf178272a71a
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "2.0.0"
+    version: "1.2.4"
  convert:
    dependency: transitive
    description:
@ -373,10 +373,10 @@ packages:
    dependency: "direct main"
    description:
      name: dio
-      sha256: "49af28382aefc53562459104f64d16b9dfd1e8ef68c862d5af436cc8356ce5a8"
+      sha256: "797e1e341c3dd2f69f2dad42564a6feff3bfb87187d05abb93b9609e6f1645c3"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "5.4.1"
+    version: "5.4.0"
  dio_cookie_manager:
    dependency: "direct main"
    description:
@ -413,10 +413,10 @@ packages:
    dependency: "direct main"
    description:
      name: dynamic_color
-      sha256: eae98052fa6e2826bdac3dd2e921c6ce2903be15c6b7f8b6d8a5d49b5086298d
+      sha256: "8b8bd1d798bd393e11eddeaa8ae95b12ff028bf7d5998fc5d003488cd5f4ce2f"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "1.7.0"
+    version: "1.6.8"
  easy_debounce:
    dependency: "direct main"
    description:
@ -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:
@ -477,10 +469,10 @@ packages:
    dependency: "direct main"
    description:
      name: extended_nested_scroll_view
-      sha256: "835580d40c2c62b448bd14adecd316acba469ba61f1510ef559d17668a85e777"
+      sha256: "444a6f883e6e07effc7639e69a309e1fb491b6c19b095e9281714a51ace2b384"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "6.2.1"
+    version: "6.1.2"
  fake_async:
    dependency: transitive
    description:
@ -600,10 +592,10 @@ packages:
    dependency: "direct main"
    description:
      name: flutter_svg
-      sha256: "7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2"
+      sha256: d39e7f95621fc84376bc0f7d504f05c3a41488c562f4a8ad410569127507402c
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "2.0.10+1"
+    version: "2.0.9"
  flutter_test:
    dependency: "direct dev"
    description: flutter
@ -865,11 +857,10 @@ packages:
  media_kit:
    dependency: "direct main"
    description:
-      path: media_kit
-      ref: HEAD
-      resolved-ref: "77a130b1d7ce733b47d2133b57563716090450d0"
-      url: "https://github.com/media-kit/media-kit.git"
-    source: git
+      name: media_kit
+      sha256: "3289062540e3b8b9746e5c50d95bd78a9289826b7227e253dff806d002b9e67a"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
    version: "1.1.10+1"
  media_kit_libs_android_video:
    dependency: transitive
@ -906,11 +897,10 @@ packages:
  media_kit_libs_video:
    dependency: "direct main"
    description:
-      path: "libs/universal/media_kit_libs_video"
-      ref: HEAD
-      resolved-ref: "77a130b1d7ce733b47d2133b57563716090450d0"
-      url: "https://github.com/media-kit/media-kit.git"
-    source: git
+      name: media_kit_libs_video
+      sha256: "3688e0c31482074578652bf038ce6301a5d21e1eda6b54fc3117ffeb4bdba067"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
    version: "1.0.4"
  media_kit_libs_windows_video:
    dependency: transitive
@ -931,11 +921,10 @@ packages:
  media_kit_video:
    dependency: "direct main"
    description:
-      path: media_kit_video
-      ref: HEAD
-      resolved-ref: "77a130b1d7ce733b47d2133b57563716090450d0"
-      url: "https://github.com/media-kit/media-kit.git"
-    source: git
+      name: media_kit_video
+      sha256: c048d11a19e379aebbe810647636e3fc6d18374637e2ae12def4ff8a4b99a882
+      url: "https://pub.flutter-io.cn"
+    source: hosted
    version: "1.2.4"
  meta:
    dependency: transitive
@ -1078,50 +1067,50 @@ packages:
    dependency: "direct main"
    description:
      name: permission_handler
-      sha256: "74e962b7fad7ff75959161bb2c0ad8fe7f2568ee82621c9c2660b751146bfe44"
+      sha256: "860c6b871c94c78e202dc69546d4d8fd84bd59faeb36f8fb9888668a53ff4f78"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "11.3.0"
+    version: "11.1.0"
  permission_handler_android:
    dependency: transitive
    description:
      name: permission_handler_android
-      sha256: "1acac6bae58144b442f11e66621c062aead9c99841093c38f5bcdcc24c1c3474"
+      sha256: "2f1bec180ee2f5665c22faada971a8f024761f632e93ddc23310487df52dcfa6"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "12.0.5"
+    version: "12.0.1"
  permission_handler_apple:
    dependency: transitive
    description:
      name: permission_handler_apple
-      sha256: "92861b0f0c2443dd8898398c2baa4f1ae925109b5909ae4a17d0108a6a788932"
+      sha256: "1a816084338ada8d574b1cb48390e6e8b19305d5120fe3a37c98825bacc78306"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "9.4.2"
+    version: "9.2.0"
  permission_handler_html:
    dependency: transitive
    description:
      name: permission_handler_html
-      sha256: "54bf176b90f6eddd4ece307e2c06cf977fb3973719c35a93b85cc7093eb6070d"
+      sha256: "11b762a8c123dced6461933a88ea1edbbe036078c3f9f41b08886e678e7864df"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "0.1.1"
+    version: "0.1.0+2"
  permission_handler_platform_interface:
    dependency: transitive
    description:
      name: permission_handler_platform_interface
-      sha256: "23dfba8447c076ab5be3dee9ceb66aad345c4a648f0cac292c77b1eb0e800b78"
+      sha256: d87349312f7eaf6ce0adaf668daf700ac5b06af84338bd8b8574dfbd93ffe1a1
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "4.2.0"
+    version: "4.0.2"
  permission_handler_windows:
    dependency: transitive
    description:
      name: permission_handler_windows
-      sha256: "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e"
+      sha256: "1e8640c1e39121128da6b816d236e714d2cf17fac5a105dd6acdd3403a628004"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "0.2.1"
+    version: "0.2.0"
  petitparser:
    dependency: transitive
    description:
@ -1547,26 +1536,26 @@ packages:
    dependency: transitive
    description:
      name: vector_graphics
-      sha256: "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3"
+      sha256: "0f0c746dd2d6254a0057218ff980fc7f5670fd0fcf5e4db38a490d31eed4ad43"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "1.1.11+1"
+    version: "1.1.9+1"
  vector_graphics_codec:
    dependency: transitive
    description:
      name: vector_graphics_codec
-      sha256: c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da
+      sha256: "0edf6d630d1bfd5589114138ed8fada3234deacc37966bec033d3047c29248b7"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "1.1.11+1"
+    version: "1.1.9+1"
  vector_graphics_compiler:
    dependency: transitive
    description:
      name: vector_graphics_compiler
-      sha256: "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81"
+      sha256: d24333727332d9bd20990f1483af4e09abdb9b1fc7c3db940b56ab5c42790c26
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "1.1.11+1"
+    version: "1.1.9+1"
  vector_math:
    dependency: transitive
    description:
@ -1651,10 +1640,10 @@ packages:
    dependency: "direct main"
    description:
      name: webview_flutter
-      sha256: d81b68e88cc353e546afb93fb38958e3717282c5ac6e5d3be4a4aef9fc3c1413
+      sha256: "42393b4492e629aa3a88618530a4a00de8bb46e50e7b3993fedbfdc5352f0dbf"
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "4.5.0"
+    version: "4.4.2"
  webview_flutter_android:
    dependency: transitive
    description:
@ -1675,10 +1664,10 @@ packages:
    dependency: transitive
    description:
      name: webview_flutter_wkwebview
-      sha256: "4d062ad505390ecef1c4bfb6001cd857a51e00912cc9dfb66edb1886a9ebd80c"
+      sha256: accdaaa49a2aca2dc3c3230907988954cdd23fed0a19525d6c9789d380f4dc76
      url: "https://pub.flutter-io.cn"
    source: hosted
-    version: "3.10.2"
+    version: "3.9.4"
  win32:
    dependency: transitive
    description:
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -19,7 +19,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 version: 1.0.21+1021

 environment:
-  sdk: ">=3.0.0 <4.0.0"
+  sdk: ">=2.19.6 <3.0.0"

 # Dependencies specify other packages that your package needs in order to work.
 # To automatically upgrade your package dependencies to the latest versions
@ -36,15 +36,15 @@ dependencies:
  # Use with the CupertinoIcons class for iOS style icons.
  cupertino_icons: ^1.0.5
  # 动态取色
-  dynamic_color: ^1.7.0
+  dynamic_color: ^1.6.8

  get: ^4.6.5

  # 网络
-  dio: ^5.4.1
+  dio: ^5.3.3
  cookie_jar: ^4.0.8
  dio_cookie_manager: ^3.1.1
-  connectivity_plus: ^6.0.1
+  connectivity_plus: ^4.0.1
  dio_http2_adapter: ^2.3.1+1

  # 图片
@ -58,17 +58,17 @@ dependencies:
  hive_flutter: ^1.1.0

  # 设备信息
-  device_info_plus: ^9.0.0
+  device_info_plus: ^9.0.2
  # 权限
-  permission_handler: ^11.3.0
+  permission_handler: ^11.0.1
  # 分享
  share_plus: ^7.0.2
  # cookie 管理
  webview_cookie_manager: ^2.0.6
  # 浏览器
-  webview_flutter: ^4.5.0
+  webview_flutter: ^4.2.2
  # 解决sliver滑动不同步
-  extended_nested_scroll_view: ^6.2.1
+  extended_nested_scroll_view: ^6.1.2
  # 上拉加载
  loading_more_list: ^6.0.0
  # 下拉刷新
@ -99,15 +99,15 @@ dependencies:
  wakelock_plus: ^1.1.1
  universal_platform: ^1.0.0+1
  # 进度条
-  audio_video_progress_bar: ^2.0.2
+  audio_video_progress_bar: ^2.0.1
  auto_orientation: ^2.3.1
  protobuf: ^3.0.0
-  animations: ^2.0.11
+  animations: ^2.0.8

  # 获取appx信息
  package_info_plus: ^4.1.0
  url_launcher: ^6.1.14
-  flutter_svg: ^2.0.10+1
+  flutter_svg: ^2.0.7
  # 防抖节流
  easy_debounce: ^2.0.3
  # 高帧率
@ -137,13 +137,11 @@ dependencies:
  uuid: ^3.0.7
  scrollable_positioned_list: ^0.3.8
  nil: ^1.1.1
-  catcher_2: ^1.2.3
+  catcher_2: ^1.1.0
  logger: ^2.0.2+1
  path: 1.8.3
  # 电池优化
  disable_battery_optimization: ^1.1.1
-  # 展开/收起
-  expandable: ^5.0.1

 dev_dependencies:
  flutter_test:
@ -161,21 +159,7 @@ dev_dependencies:
  #     url: https://github.com/nvi9/flutter_launcher_icons.git
  #     ref: e045d40
  hive_generator: ^2.0.0
-  build_runner: ^2.4.8
-
-dependency_overrides:
-  media_kit:
-    git:
-      url: https://github.com/media-kit/media-kit.git
-      path: media_kit
-  media_kit_video:
-    git:
-      url: https://github.com/media-kit/media-kit.git
-      path: media_kit_video
-  media_kit_libs_video:
-    git:
-      url: https://github.com/media-kit/media-kit.git
-      path: libs/universal/media_kit_libs_video
+  build_runner: ^2.3.3

 flutter_launcher_icons:
  android: true
Author	SHA1	Message	Date
guozhigq	57f7628795	Merge branch 'main' into feature-customBottomControl	2024-03-23 18:13:47 +08:00
guozhigq	ab10223eca	feat: 接收自定义组件传入	2024-03-11 23:03:50 +08:00