fix: 全屏时展示弹幕操作

2024-04-02 23:13:15 +08:00
22 changed files with 189 additions and 614 deletions
--- a/lib/http/api.dart
+++ b/lib/http/api.dart
@ -484,9 +484,6 @@ class Api {
  /// 激活buvid3
  static const activateBuvidApi = '/x/internal/gaia-gateway/ExClimbWuzhi';

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

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

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

-  static Future getSubtitle({int? cid, String? bvid}) async {
-    var res = await Request().get(Api.getSubtitleConfig, data: {
-      'cid': cid,
-      'bvid': bvid,
-    });
-    try {
-      if (res.data['code'] == 0) {
-        return {
-          'status': true,
-          'data': SubTitlteModel.fromJson(res.data['data']),
-        };
-      } else {
-        return {'status': false, 'data': [], 'msg': res.data['msg']};
-      }
-    } catch (err) {
-      print(err);
-    }
-  }
-
  // 视频排行
  static Future getRankVideoList(int rid) async {
    try {
@ -519,12 +498,4 @@ class VideoHttp {
      return {'status': false, 'data': [], 'msg': err};
    }
  }
-
-  // 获取字幕内容
-  static Future<Map<String, dynamic>> getSubtitleContent(url) async {
-    var res = await Request().get('https:$url');
-    final String content = SubTitleUtils.convertToWebVTT(res.data['body']);
-    final List body = res.data['body'];
-    return {'content': content, 'body': body};
-  }
 }
--- a/lib/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/subscription/controller.dart
+++ b/lib/pages/subscription/controller.dart
@ -46,40 +46,4 @@ class SubController extends GetxController {
  Future onLoad() async {
    querySubFolder(type: 'onload');
  }
-
-  // 取消订阅
-  Future<void> cancelSub(SubFolderItemData subFolderItem) async {
-    showDialog(
-      context: Get.context!,
-      builder: (context) => AlertDialog(
-        title: const Text('提示'),
-        content: const Text('确定取消订阅吗？'),
-        actions: [
-          TextButton(
-            onPressed: () {
-              Get.back();
-            },
-            child: Text(
-              '取消',
-              style: TextStyle(color: Theme.of(context).colorScheme.outline),
-            ),
-          ),
-          TextButton(
-            onPressed: () async {
-              var res = await UserHttp.cancelSub(seasonId: subFolderItem.id!);
-              if (res['status']) {
-                subFolderData.value.list!.remove(subFolderItem);
-                subFolderData.update((val) {});
-                SmartDialog.showToast('取消订阅成功');
-              } else {
-                SmartDialog.showToast(res['msg']);
-              }
-              Get.back();
-            },
-            child: const Text('确定'),
-          ),
-        ],
-      ),
-    );
-  }
 }
--- a/lib/pages/subscription/view.dart
+++ b/lib/pages/subscription/view.dart
@ -58,8 +58,7 @@ class _SubPageState extends State<SubPage> {
                  itemBuilder: (context, index) {
                    return SubItem(
                        subFolderItem:
-                            _subController.subFolderData.value.list![index],
-                        cancelSub: _subController.cancelSub);
+                            _subController.subFolderData.value.list![index]);
                  },
                ),
              );
--- a/lib/pages/subscription/widgets/item.dart
+++ b/lib/pages/subscription/widgets/item.dart
@ -8,12 +8,7 @@ import '../../../models/user/sub_folder.dart';

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

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

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

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

-import '../../../models/video/subTitile/content.dart';
 import '../../../http/danmaku.dart';
 import '../../../utils/id_utils.dart';
 import 'widgets/header_control.dart';
@ -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/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;
--- a/lib/pages/video/detail/widgets/header_control.dart
+++ b/lib/pages/video/detail/widgets/header_control.dart
@ -17,6 +17,7 @@ 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';
@ -52,7 +53,7 @@ class _HeaderControlState extends State<HeaderControl> {
  final Box<dynamic> videoStorage = GStrorage.video;
  late List<double> speedsList;
  double buttonSpace = 8;
-  bool showTitle = false;
+  RxBool isFullScreen = false.obs;
  late String heroTag;
  late VideoIntroController videoIntroController;
  late VideoDetailData videoDetail;
@ -69,13 +70,8 @@ class _HeaderControlState extends State<HeaderControl> {
  }

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

      /// TODO setState() called after dispose()
      if (mounted) {
@ -218,6 +214,87 @@ 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 = [
@ -344,56 +421,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;
@ -1079,7 +1106,7 @@ class _HeaderControlState extends State<HeaderControl> {
            },
          ),
          SizedBox(width: buttonSpace),
-          if (showTitle &&
+          if (isFullScreen.value &&
              isLandscape &&
              widget.videoType == SearchType.video) ...[
            Column(
@ -1131,6 +1158,43 @@ 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(
@ -1165,31 +1229,6 @@ class _HeaderControlState extends State<HeaderControl> {
            ),
            SizedBox(width: buttonSpace),
          ],
-
-          /// 字幕
-          // SizedBox(
-          //   width: 34,
-          //   height: 34,
-          //   child: IconButton(
-          //     style: ButtonStyle(
-          //       padding: MaterialStateProperty.all(EdgeInsets.zero),
-          //     ),
-          //     onPressed: () => showSubtitleDialog(),
-          //     icon: const Icon(
-          //       Icons.closed_caption_off,
-          //       size: 22,
-          //     ),
-          //   ),
-          // ),
-          ComBtn(
-            icon: const Icon(
-              Icons.closed_caption_off,
-              size: 22,
-              color: Colors.white,
-            ),
-            fuc: () => showSubtitleDialog(),
-          ),
-          SizedBox(width: buttonSpace),
          Obx(
            () => SizedBox(
              width: 45,
--- a/lib/plugin/pl_player/controller.dart
+++ b/lib/plugin/pl_player/controller.dart
@ -21,8 +21,6 @@ import 'package:pilipala/utils/storage.dart';
 import 'package:screen_brightness/screen_brightness.dart';
 import 'package:status_bar_control/status_bar_control.dart';
 import 'package:universal_platform/universal_platform.dart';
-import '../../models/video/subTitile/content.dart';
-import '../../models/video/subTitile/result.dart';
 // import 'package:wakelock_plus/wakelock_plus.dart';

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

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

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

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

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

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

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

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

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

-        /// 开启且有字幕时展示
-        Stack(
-          children: [
-            Positioned(
-              left: 0,
-              right: 0,
-              bottom: 30,
-              child: Align(
-                alignment: Alignment.center,
-                child: Obx(
-                  () => Visibility(
-                      visible: widget.controller.subTitleCode.value != -1,
-                      child: Container(
-                        decoration: BoxDecoration(
-                          borderRadius: BorderRadius.circular(4),
-                          color: widget.controller.subtitleContent.value != ''
-                              ? Colors.black.withOpacity(0.6)
-                              : Colors.transparent,
-                        ),
-                        padding: widget.controller.subTitleCode.value != -1
-                            ? const EdgeInsets.symmetric(
-                                horizontal: 10,
-                                vertical: 4,
-                              )
-                            : EdgeInsets.zero,
-                        child: Text(
-                          widget.controller.subtitleContent.value,
-                          style: const TextStyle(
-                            color: Colors.white,
-                            fontSize: 12,
-                          ),
-                        ),
-                      )),
-                ),
-              ),
-            ),
-          ],
-        ),
-
        /// 手势
        Positioned.fill(
          left: 16,
--- a/lib/utils/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";
-  }
-}