Merge branch 'main' into feature-media_kit

lib/http/api.dart

@@ -484,6 +484,9 @@ 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';
 

lib/http/video.dart

@@ -8,9 +8,11 @@ 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';
@@ -476,6 +478,25 @@ 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 {
@@ -498,4 +519,12 @@ 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};
+  }
 }

lib/models/common/subtitle_type.dart

@@ -0,0 +1,47 @@
+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;
+    }
+  }
+}

lib/models/search/result.dart

@@ -437,7 +437,8 @@ class SearchArticleItemModel {
     pubTime = json['pub_time'];
     like = json['like'];
     title = Em.regTitle(json['title']);
-    subTitle = json['title'].replaceAll(RegExp(r'<[^>]*>'), '');
+    subTitle =
+        Em.decodeHtmlEntities(json['title'].replaceAll(RegExp(r'<[^>]*>'), ''));
     rankOffset = json['rank_offset'];
     mid = json['mid'];
     imageUrls = json['image_urls'];

lib/models/video/subTitile/content.dart

@@ -0,0 +1,20 @@
+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'];
+  }
+}

lib/models/video/subTitile/result.dart

@@ -0,0 +1,89 @@
+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: [],
+      );
+}

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: 6.0,
+                                        bottom: 8.0,
                                         type: 'gray',
                                       ),
                                     // 右上角
@@ -258,6 +258,24 @@ 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)

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 = 1.obs;
+  RxInt initialIndex = 0.obs;
   late TabController tabController;
   late List tabsCtrList;
   late List<Widget> tabsPageList;
@@ -50,21 +50,5 @@ 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;
-          }
-        }
-      });
-    }
   }
 }

lib/pages/rank/zone/view.dart

@@ -22,15 +22,20 @@ class ZonePage extends StatefulWidget {
   State<ZonePage> createState() => _ZonePageState();
 }
 
-class _ZonePageState extends State<ZonePage> {
+class _ZonePageState extends State<ZonePage>
-  final ZoneController _zoneController = Get.put(ZoneController());
+    with AutomaticKeepAliveClientMixin {
+  late ZoneController _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 =
@@ -68,6 +73,7 @@ class _ZonePageState extends State<ZonePage> {
 
   @override
   Widget build(BuildContext context) {
+    super.build(context);
     return RefreshIndicator(
       onRefresh: () async {
         return await _zoneController.onRefresh();

lib/pages/video/detail/controller.dart

@@ -20,6 +20,7 @@ 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';
@@ -93,7 +94,10 @@ class VideoDetailController extends GetxController
   late int cacheAudioQa;
 
   PersistentBottomSheetController? replyReplyBottomSheetCtr;
+  RxList<SubTitileContentModel> subtitleContents =
+      <SubTitileContentModel>[].obs;
   late bool enableRelatedVideo;
+  List subtitles = [];
 
   @override
   void onInit() {
@@ -145,6 +149,7 @@ class VideoDetailController extends GetxController
     cacheAudioQa = setting.get(SettingBoxKey.defaultAudioQa,
         defaultValue: AudioQuality.hiRes.code);
     oid.value = IdUtils.bv2av(Get.parameters['bvid']!);
+    getSubtitle();
   }
 
   showReplyReplyPanel() {
@@ -251,6 +256,8 @@ class VideoDetailController extends GetxController
 
     /// 开启自动全屏时，在player初始化完成后立即传入headerControl
     plPlayerController.headerControl = headerControl;
+
+    plPlayerController.subtitles.value = subtitles;
   }
 
   // 视频链接
@@ -388,6 +395,45 @@ 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();

lib/pages/video/detail/reply/view.dart

@@ -148,34 +148,16 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
                 floating: true,
                 delegate: _MySliverPersistentHeaderDelegate(
                   child: Container(
-                    height: 45,
+                    height: 40,
                     padding: const EdgeInsets.fromLTRB(12, 0, 6, 0),
-                    decoration: BoxDecoration(
+                    color: Theme.of(context).colorScheme.surface,
-                      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(
-                          () => AnimatedSwitcher(
+                          () => Text(
-                            duration: const Duration(milliseconds: 400),
+                            '${_videoReplyController.sortTypeLabel.value}评论',
-                            transitionBuilder:
+                            style: const TextStyle(fontSize: 13),
-                                (Widget child, Animation<double> animation) {
-                              return ScaleTransition(
-                                  scale: animation, child: child);
-                            },
-                            child: Text(
-                              '共${_videoReplyController.count.value}条回复',
-                              key: ValueKey<int>(
-                                  _videoReplyController.count.value),
-                            ),
                           ),
                         ),
                         SizedBox(
@@ -184,10 +166,12 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
                             onPressed: () =>
                                 _videoReplyController.queryBySort(),
                             icon: const Icon(Icons.sort, size: 16),
-                            label: Obx(() => Text(
+                            label: Obx(
-                                  _videoReplyController.sortTypeLabel.value,
+                              () => Text(
-                                  style: const TextStyle(fontSize: 13),
+                                _videoReplyController.sortTypeLabel.value,
-                                )),
+                                style: const TextStyle(fontSize: 13),
+                              ),
+                            ),
                           ),
                         )
                       ],
@@ -329,8 +313,8 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
 
 class _MySliverPersistentHeaderDelegate extends SliverPersistentHeaderDelegate {
   _MySliverPersistentHeaderDelegate({required this.child});
-  final double _minExtent = 45;
+  final double _minExtent = 40;
-  final double _maxExtent = 45;
+  final double _maxExtent = 40;
   final Widget child;
 
   @override

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('&', '&')
       .replaceAll('&lt;', '<')

lib/pages/video/detail/view.dart

@@ -212,6 +212,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
       videoIntroController.isPaused = true;
       plPlayerController!.removeStatusLister(playerListener);
       plPlayerController!.pause();
+      vdCtr.clearSubtitleContent();
     }
     setState(() => isShowing = false);
     super.didPushNext();
@@ -222,7 +223,10 @@ class _VideoDetailPageState extends State<VideoDetailPage>
   void didPopNext() async {
     if (plPlayerController != null &&
         plPlayerController!.videoPlayerController != null) {
-      setState(() => isShowing = true);
+      setState(() {
+        vdCtr.setSubtitleContent();
+        isShowing = true;
+      });
     }
     vdCtr.isFirstTime = false;
     final bool autoplay = autoPlayEnable;

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) {
+    widget.videoDetailCtr!.plPlayerController.isFullScreen
-      isFullScreen.value = val;
+        .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,6 +344,56 @@ 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;
@@ -1106,7 +1079,7 @@ class _HeaderControlState extends State<HeaderControl> {
             },
           ),
           SizedBox(width: buttonSpace),
-          if (isFullScreen.value &&
+          if (showTitle &&
               isLandscape &&
               widget.videoType == SearchType.video) ...[
             Column(
@@ -1158,43 +1131,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(
@@ -1229,6 +1165,31 @@ 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,

lib/plugin/pl_player/controller.dart

@@ -21,6 +21,8 @@ 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;
@@ -73,6 +75,8 @@ 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;
 
@@ -118,6 +122,7 @@ class PlPlayerController {
   PreferredSizeWidget? headerControl;
   PreferredSizeWidget? bottomControl;
   Widget? danmuWidget;
+  late RxList subtitles;
 
   /// 数据加载监听
   Stream<DataStatus> get onDataStatusChanged => dataStatus.status.stream;
@@ -147,6 +152,11 @@ 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;
 
@@ -231,6 +241,10 @@ 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) {
@@ -350,6 +364,8 @@ class PlPlayerController {
     bool enableHeart = true,
     // 是否首次加载
     bool isFirstTime = true,
+    //  是否开启字幕
+    bool enableSubTitle = false,
   }) async {
     try {
       _autoPlay = autoplay;
@@ -364,7 +380,9 @@ 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);
@@ -375,7 +393,13 @@ class PlPlayerController {
       }
       // 配置Player 音轨、字幕等等
       _videoPlayerController = await _createVideoController(
-          dataSource, _looping, enableHA, width, height);
+        dataSource,
+        _looping,
+        enableHA,
+        width,
+        height,
+        seekTo,
+      );
       // 获取视频时长 00:00
       _duration.value = duration ?? _videoPlayerController!.state.duration;
       updateDurationSecond();
@@ -386,7 +410,7 @@ class PlPlayerController {
       if (!_listenersInitialized) {
         startListeners();
       }
-      await _initializePlayer(seekTo: seekTo, duration: _duration.value);
+      await _initializePlayer(duration: _duration.value);
       bool autoEnterFullcreen =
           setting.get(SettingBoxKey.enableAutoEnter, defaultValue: false);
       if (autoEnterFullcreen && _isFirstTime) {
@@ -406,6 +430,7 @@ class PlPlayerController {
     bool enableHA,
     double? width,
     double? height,
+    Duration? seekTo,
   ) async {
     // 每次配置时先移除监听
     removeListeners();
@@ -488,7 +513,11 @@ class PlPlayerController {
       );
     }
     player.open(
-      Media(dataSource.videoSource!, httpHeaders: dataSource.httpHeaders),
+      Media(
+        dataSource.videoSource!,
+        httpHeaders: dataSource.httpHeaders,
+        start: seekTo ?? Duration.zero,
+      ),
       play: false,
     );
     // 音轨
@@ -501,7 +530,6 @@ class PlPlayerController {
 
   // 开始播放
   Future _initializePlayer({
-    Duration seekTo = Duration.zero,
     Duration? duration,
   }) async {
     // 设置倍速
@@ -519,11 +547,6 @@ class PlPlayerController {
     //   await setLooping(_looping);
     // }
 
-    // 跳转播放
-    if (seekTo != Duration.zero) {
-      await this.seekTo(seekTo);
-    }
-
     // 自动播放
     if (_autoPlay) {
       await play(duration: duration);
@@ -575,6 +598,8 @@ class PlPlayerController {
             _sliderPosition.value = event;
             updateSliderPositionSecond();
           }
+          querySubtitleContent(
+              videoPlayerController!.state.position.inSeconds.toDouble());
 
           /// 触发回调事件
           for (var element in _positionListeners) {
@@ -609,6 +634,10 @@ class PlPlayerController {
               const Duration(seconds: 1),
               () => videoPlayerServiceHandler.onPositionChange(event));
         }),
+
+        // onSubTitleOpenChanged.listen((bool event) {
+        //   toggleSubtitle(event ? subTitleCode.value : -1);
+        // })
       ],
     );
   }
@@ -637,21 +666,14 @@ 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;
         }
@@ -1047,12 +1069,61 @@ 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;
@@ -1062,6 +1133,7 @@ class PlPlayerController {
     }
     _playerCount.value = 0;
     try {
+      print('dispose dispose ---------');
       _timer?.cancel();
       _timerForVolume?.cancel();
       _timerForGettingVolume?.cancel();

lib/plugin/pl_player/view.dart

@@ -580,6 +580,45 @@ 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,

lib/utils/em.dart

@@ -19,15 +19,7 @@ class Em {
       return regCate(matchStr);
     }, onNonMatch: (String str) {
       if (str != '') {
-        str = str
+        str = decodeHtmlEntities(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);
       }
@@ -35,4 +27,17 @@ 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;', "'");
+  }
 }

lib/utils/subtitle.dart

@@ -0,0 +1,32 @@
+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";
+  }
+}

pubspec.lock

@@ -865,10 +865,11 @@ packages:
   media_kit:
     dependency: "direct main"
     description:
-      name: media_kit
+      path: media_kit
-      sha256: "3289062540e3b8b9746e5c50d95bd78a9289826b7227e253dff806d002b9e67a"
+      ref: HEAD
-      url: "https://pub.flutter-io.cn"
+      resolved-ref: "77a130b1d7ce733b47d2133b57563716090450d0"
-    source: hosted
+      url: "https://github.com/media-kit/media-kit.git"
+    source: git
     version: "1.1.10+1"
   media_kit_libs_android_video:
     dependency: transitive
@@ -905,10 +906,11 @@ packages:
   media_kit_libs_video:
     dependency: "direct main"
     description:
-      name: media_kit_libs_video
+      path: "libs/universal/media_kit_libs_video"
-      sha256: "3688e0c31482074578652bf038ce6301a5d21e1eda6b54fc3117ffeb4bdba067"
+      ref: HEAD
-      url: "https://pub.flutter-io.cn"
+      resolved-ref: "77a130b1d7ce733b47d2133b57563716090450d0"
-    source: hosted
+      url: "https://github.com/media-kit/media-kit.git"
+    source: git
     version: "1.0.4"
   media_kit_libs_windows_video:
     dependency: transitive
@@ -929,10 +931,11 @@ packages:
   media_kit_video:
     dependency: "direct main"
     description:
-      name: media_kit_video
+      path: media_kit_video
-      sha256: c048d11a19e379aebbe810647636e3fc6d18374637e2ae12def4ff8a4b99a882
+      ref: HEAD
-      url: "https://pub.flutter-io.cn"
+      resolved-ref: "77a130b1d7ce733b47d2133b57563716090450d0"
-    source: hosted
+      url: "https://github.com/media-kit/media-kit.git"
+    source: git
     version: "1.2.4"
   meta:
     dependency: transitive

pubspec.yaml

@@ -163,6 +163,20 @@ dev_dependencies:
   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
+
 flutter_launcher_icons:
   android: true
   ios: true