Merge branch 'main' into design

.github/workflows/beta_ci.yml

@@ -206,4 +206,4 @@ jobs:
           method: sendFile
           path: Pilipala-Beta/*
           parse_mode: Markdown
-          context: "*Beta版本: v${{ needs.update_version.outputs.new_version }}*\n更新内容: [${{ needs.update_version.outputs.last_commit }}](${{ github.event.head_commit.url }})"
+          context: "*Beta版本: v${{ needs.update_version.outputs.new_version }}*\n更新内容: [${{ needs.update_version.outputs.last_commit }}]"

lib/main.dart

@@ -130,27 +130,10 @@ class MyApp extends StatelessWidget {
           );
         }
 
-        final SnackBarThemeData snackBarThemeData = SnackBarThemeData(
-          actionTextColor: darkColorScheme.primary,
-          backgroundColor: darkColorScheme.secondaryContainer,
-          closeIconColor: darkColorScheme.secondary,
-          contentTextStyle: TextStyle(color: darkColorScheme.secondary),
-          elevation: 20,
-        );
-
         ThemeData themeData = ThemeData(
-          // fontFamily: 'HarmonyOS',
           colorScheme: currentThemeValue == ThemeType.dark
               ? darkColorScheme
               : lightColorScheme,
-          snackBarTheme: snackBarThemeData,
-          pageTransitionsTheme: const PageTransitionsTheme(
-            builders: <TargetPlatform, PageTransitionsBuilder>{
-              TargetPlatform.android: ZoomPageTransitionsBuilder(
-                allowEnterRouteSnapshotting: false,
-              ),
-            },
-          ),
         );
 
         // 小白条、导航栏沉浸
@@ -171,9 +154,38 @@ class MyApp extends StatelessWidget {
         // 图片缓存
         // PaintingBinding.instance.imageCache.maximumSizeBytes = 1000 << 20;
         return GetMaterialApp(
-          title: 'PiLiPaLa',
+          title: 'PiliPala',
-          theme: themeData,
+          theme: ThemeData(
-          darkTheme: themeData,
+            colorScheme: currentThemeValue == ThemeType.dark
+                ? darkColorScheme
+                : lightColorScheme,
+            snackBarTheme: SnackBarThemeData(
+              actionTextColor: lightColorScheme.primary,
+              backgroundColor: lightColorScheme.secondaryContainer,
+              closeIconColor: lightColorScheme.secondary,
+              contentTextStyle: TextStyle(color: lightColorScheme.secondary),
+              elevation: 20,
+            ),
+            pageTransitionsTheme: const PageTransitionsTheme(
+              builders: <TargetPlatform, PageTransitionsBuilder>{
+                TargetPlatform.android: ZoomPageTransitionsBuilder(
+                  allowEnterRouteSnapshotting: false,
+                ),
+              },
+            ),
+          ),
+          darkTheme: ThemeData(
+            colorScheme: currentThemeValue == ThemeType.light
+                ? lightColorScheme
+                : darkColorScheme,
+            snackBarTheme: SnackBarThemeData(
+              actionTextColor: darkColorScheme.primary,
+              backgroundColor: darkColorScheme.secondaryContainer,
+              closeIconColor: darkColorScheme.secondary,
+              contentTextStyle: TextStyle(color: darkColorScheme.secondary),
+              elevation: 20,
+            ),
+          ),
           localizationsDelegates: const [
             GlobalCupertinoLocalizations.delegate,
             GlobalMaterialLocalizations.delegate,

lib/models/common/rank_type.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:get/get.dart';
 import 'package:pilipala/pages/rank/zone/index.dart';
 
 enum RandType {
@@ -74,7 +73,6 @@ List tabsConfig = [
     ),
     'label': '全站',
     'type': RandType.all,
-    'ctr': Get.put<ZoneController>,
     'page': const ZonePage(rid: 0),
   },
   {
@@ -84,7 +82,6 @@ List tabsConfig = [
     ),
     'label': '国创相关',
     'type': RandType.creation,
-    'ctr': Get.put<ZoneController>,
     'page': const ZonePage(rid: 168),
   },
   {
@@ -94,7 +91,6 @@ List tabsConfig = [
     ),
     'label': '动画',
     'type': RandType.animation,
-    'ctr': Get.put<ZoneController>,
     'page': const ZonePage(rid: 1),
   },
   {
@@ -104,7 +100,6 @@ List tabsConfig = [
     ),
     'label': '音乐',
     'type': RandType.music,
-    'ctr': Get.put<ZoneController>,
     'page': const ZonePage(rid: 3),
   },
   {
@@ -114,7 +109,6 @@ List tabsConfig = [
     ),
     'label': '舞蹈',
     'type': RandType.dance,
-    'ctr': Get.put<ZoneController>,
     'page': const ZonePage(rid: 129),
   },
   {
@@ -124,7 +118,6 @@ List tabsConfig = [
     ),
     'label': '游戏',
     'type': RandType.game,
-    'ctr': Get.put<ZoneController>,
     'page': const ZonePage(rid: 4),
   },
   {
@@ -134,7 +127,6 @@ List tabsConfig = [
     ),
     'label': '知识',
     'type': RandType.knowledge,
-    'ctr': Get.put<ZoneController>,
     'page': const ZonePage(rid: 36),
   },
   {
@@ -144,7 +136,6 @@ List tabsConfig = [
     ),
     'label': '科技',
     'type': RandType.technology,
-    'ctr': Get.put<ZoneController>,
     'page': const ZonePage(rid: 188),
   },
   {
@@ -154,7 +145,6 @@ List tabsConfig = [
     ),
     'label': '运动',
     'type': RandType.sport,
-    'ctr': Get.put<ZoneController>,
     'page': const ZonePage(rid: 234),
   },
   {
@@ -164,7 +154,6 @@ List tabsConfig = [
     ),
     'label': '汽车',
     'type': RandType.car,
-    'ctr': Get.put<ZoneController>,
     'page': const ZonePage(rid: 223),
   },
   {
@@ -174,7 +163,6 @@ List tabsConfig = [
     ),
     'label': '生活',
     'type': RandType.life,
-    'ctr': Get.put<ZoneController>,
     'page': const ZonePage(rid: 160),
   },
   {
@@ -184,7 +172,6 @@ List tabsConfig = [
     ),
     'label': '美食',
     'type': RandType.food,
-    'ctr': Get.put<ZoneController>,
     'page': const ZonePage(rid: 211),
   },
   {
@@ -194,7 +181,6 @@ List tabsConfig = [
     ),
     'label': '动物圈',
     'type': RandType.animal,
-    'ctr': Get.put<ZoneController>,
     'page': const ZonePage(rid: 217),
   },
   {
@@ -204,7 +190,6 @@ List tabsConfig = [
     ),
     'label': '鬼畜',
     'type': RandType.madness,
-    'ctr': Get.put<ZoneController>,
     'page': const ZonePage(rid: 119),
   },
   {
@@ -214,7 +199,6 @@ List tabsConfig = [
     ),
     'label': '时尚',
     'type': RandType.fashion,
-    'ctr': Get.put<ZoneController>,
     'page': const ZonePage(rid: 155),
   },
   {
@@ -224,7 +208,6 @@ List tabsConfig = [
     ),
     'label': '娱乐',
     'type': RandType.entertainment,
-    'ctr': Get.put<ZoneController>,
     'page': const ZonePage(rid: 5),
   },
   {
@@ -234,7 +217,6 @@ List tabsConfig = [
     ),
     'label': '影视',
     'type': RandType.film,
-    'ctr': Get.put<ZoneController>,
     'page': const ZonePage(rid: 181),
   }
 ];

lib/models/common/subtitle_type.dart

@@ -5,6 +5,10 @@ enum SubtitleType {
   aizh,
   // 英语（自动生成）
   aien,
+  // 中文（简体）
+  zhHans,
+  // 英文（美国）
+  enUS,
 }
 
 extension SubtitleTypeExtension on SubtitleType {
@@ -16,6 +20,10 @@ extension SubtitleTypeExtension on SubtitleType {
         return '中文（自动翻译）';
       case SubtitleType.aien:
         return '英语（自动生成）';
+      case SubtitleType.zhHans:
+        return '中文（简体）';
+      case SubtitleType.enUS:
+        return '英文（美国）';
     }
   }
 }
@@ -29,6 +37,10 @@ extension SubtitleIdExtension on SubtitleType {
         return 'ai-zh';
       case SubtitleType.aien:
         return 'ai-en';
+      case SubtitleType.zhHans:
+        return 'zh-Hans';
+      case SubtitleType.enUS:
+        return 'en-US';
     }
   }
 }
@@ -42,6 +54,10 @@ extension SubtitleCodeExtension on SubtitleType {
         return 2;
       case SubtitleType.aien:
         return 3;
+      case SubtitleType.zhHans:
+        return 4;
+      case SubtitleType.enUS:
+        return 5;
     }
   }
 }

lib/pages/bangumi/introduction/controller.dart

@@ -56,6 +56,7 @@ class BangumiIntroController extends GetxController {
   RxMap followStatus = {}.obs;
   int _tempThemeValue = -1;
   var userInfo;
+  PersistentBottomSheetController? bottomSheetController;
 
   @override
   void onInit() {
@@ -320,4 +321,8 @@ class BangumiIntroController extends GetxController {
       ).buildShowContent(Get.context!),
     );
   }
+
+  hiddenEpisodeBottomSheet() {
+    bottomSheetController?.close();
+  }
 }

lib/pages/bangumi/introduction/view.dart

@@ -325,6 +325,7 @@ class _BangumiInfoState extends State<BangumiInfo> {
               changeFuc: (bvid, cid, aid) =>
                   bangumiIntroController.changeSeasonOrbangu(bvid, cid, aid),
               bangumiDetail: bangumiIntroController.bangumiDetail.value,
+              bangumiIntroController: bangumiIntroController,
             )
           ],
         ],

lib/pages/bangumi/widgets/bangumi_panel.dart

@@ -10,6 +10,7 @@ import 'package:pilipala/utils/storage.dart';
 import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
 import '../../../common/pages_bottom_sheet.dart';
 import '../../../models/common/video_episode_type.dart';
+import '../introduction/controller.dart';
 
 class BangumiPanel extends StatefulWidget {
   const BangumiPanel({
@@ -19,6 +20,7 @@ class BangumiPanel extends StatefulWidget {
     this.sheetHeight,
     this.changeFuc,
     this.bangumiDetail,
+    this.bangumiIntroController,
   });
 
   final List<EpisodeItem> pages;
@@ -26,6 +28,7 @@ class BangumiPanel extends StatefulWidget {
   final double? sheetHeight;
   final Function? changeFuc;
   final BangumiInfoModel? bangumiDetail;
+  final BangumiIntroController? bangumiIntroController;
 
   @override
   State<BangumiPanel> createState() => _BangumiPanelState();
@@ -136,6 +139,7 @@ class _BangumiPanelState extends State<BangumiPanel> {
                     padding: MaterialStateProperty.all(EdgeInsets.zero),
                   ),
                   onPressed: () {
+                    widget.bangumiIntroController?.bottomSheetController =
                         _bottomSheetController = EpisodeBottomSheet(
                       currentCid: cid,
                       episodes: widget.pages,

lib/pages/dynamics/detail/view.dart

@@ -16,6 +16,7 @@ import 'package:pilipala/pages/video/detail/reply_reply/index.dart';
 import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/id_utils.dart';
 
+import '../../../models/video/reply/item.dart';
 import '../widgets/dynamic_panel.dart';
 
 class DynamicDetailPage extends StatefulWidget {
@@ -210,9 +211,7 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
         onRefresh: () async {
           await _dynamicDetailController.queryReplyList();
         },
-        child: Stack(
+        child: CustomScrollView(
-          children: [
-            CustomScrollView(
           controller: scrollController,
           slivers: [
             if (action != 'comment')
@@ -230,9 +229,7 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
                     border: Border(
                       top: BorderSide(
                         width: 0.6,
-                            color: Theme.of(context)
+                        color: Theme.of(context).dividerColor.withOpacity(0.05),
-                                .dividerColor
-                                .withOpacity(0.05),
                       ),
                     ),
                   ),
@@ -264,8 +261,7 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
                               _dynamicDetailController.queryBySort(),
                           icon: const Icon(Icons.sort, size: 16),
                           label: Obx(() => Text(
-                                    _dynamicDetailController
+                                _dynamicDetailController.sortTypeLabel.value,
-                                        .sortTypeLabel.value,
                                 style: const TextStyle(fontSize: 13),
                               )),
                         ),
@@ -282,22 +278,22 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
                 if (snapshot.connectionState == ConnectionState.done) {
                   Map data = snapshot.data as Map;
                   if (snapshot.data['status']) {
+                    RxList<ReplyItemModel> replyList =
+                        _dynamicDetailController.replyList;
                     // 请求成功
                     return Obx(
-                          () => _dynamicDetailController.replyList.isEmpty &&
+                      () => replyList.isEmpty &&
                               _dynamicDetailController.isLoadingMore
                           ? SliverList(
-                                  delegate: SliverChildBuilderDelegate(
+                              delegate:
-                                      (context, index) {
+                                  SliverChildBuilderDelegate((context, index) {
                                 return const VideoReplySkeleton();
                               }, childCount: 8),
                             )
                           : SliverList(
                               delegate: SliverChildBuilderDelegate(
                                 (context, index) {
-                                      if (index ==
+                                  if (index == replyList.length) {
-                                          _dynamicDetailController
-                                              .replyList.length) {
                                     return Container(
                                       padding: EdgeInsets.only(
                                           bottom: MediaQuery.of(context)
@@ -324,25 +320,21 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
                                     );
                                   } else {
                                     return ReplyItem(
-                                          replyItem: _dynamicDetailController
+                                      replyItem: replyList[index],
-                                              .replyList[index],
                                       showReplyRow: true,
                                       replyLevel: '1',
                                       replyReply: (replyItem) =>
                                           replyReply(replyItem),
-                                          replyType:
+                                      replyType: ReplyType.values[replyType],
-                                              ReplyType.values[replyType],
                                       addReply: (replyItem) {
-                                            _dynamicDetailController
+                                        replyList[index]
-                                                .replyList[index].replies!
+                                            .replies!
                                             .add(replyItem);
                                       },
                                     );
                                   }
                                 },
-                                    childCount: _dynamicDetailController
+                                childCount: replyList.length + 1,
-                                            .replyList.length +
-                                        1,
                               ),
                             ),
                     );
@@ -365,17 +357,17 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
             )
           ],
         ),
-            Positioned(
+      ),
-              bottom: MediaQuery.of(context).padding.bottom + 14,
+      floatingActionButton: SlideTransition(
-              right: 14,
-              child: SlideTransition(
         position: Tween<Offset>(
           begin: const Offset(0, 2),
           end: const Offset(0, 0),
-                ).animate(CurvedAnimation(
+        ).animate(
+          CurvedAnimation(
             parent: fabAnimationCtr,
             curve: Curves.easeInOut,
-                )),
+          ),
+        ),
         child: FloatingActionButton(
           heroTag: null,
           onPressed: () {
@@ -397,8 +389,7 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
                 // 完成评论，数据添加
                 if (value != null && value['data'] != null)
                   {
-                            _dynamicDetailController.replyList
+                    _dynamicDetailController.replyList.add(value['data']),
-                                .add(value['data']),
                     _dynamicDetailController.acount.value++
                   }
               },
@@ -408,10 +399,6 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
           child: const Icon(Icons.reply),
         ),
       ),
-            ),
-          ],
-        ),
-      ),
     );
   }
 }

lib/pages/rank/controller.dart

@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/models/common/rank_type.dart';
+import 'package:pilipala/pages/rank/zone/index.dart';
 import 'package:pilipala/utils/storage.dart';
 
 class RankController extends GetxController with GetTickerProviderStateMixin {
@@ -29,20 +30,22 @@ class RankController extends GetxController with GetTickerProviderStateMixin {
 
   void onRefresh() {
     int index = tabController.index;
-    var ctr = tabsCtrList[index];
+    final ZoneController ctr = tabsCtrList[index];
-    ctr().onRefresh();
+    ctr.onRefresh();
   }
 
   void animateToTop() {
     int index = tabController.index;
-    var ctr = tabsCtrList[index];
+    final ZoneController ctr = tabsCtrList[index];
-    ctr().animateToTop();
+    ctr.animateToTop();
   }
 
   void setTabConfig() async {
     tabs.value = tabsConfig;
     initialIndex.value = 0;
-    tabsCtrList = tabs.map((e) => e['ctr']).toList();
+    tabsCtrList = tabs
+        .map((e) => Get.put(ZoneController(), tag: e['rid'].toString()))
+        .toList();
     tabsPageList = tabs.map<Widget>((e) => e['page']).toList();
 
     tabController = TabController(

lib/pages/rank/view.dart

@@ -102,7 +102,7 @@ class _RankPageState extends State<RankPage>
                       onTap: (value) {
                         feedBack();
                         if (_rankController.initialIndex.value == value) {
-                          _rankController.tabsCtrList[value]().animateToTop();
+                          _rankController.tabsCtrList[value].animateToTop();
                         }
                         _rankController.initialIndex.value = value;
                       },

lib/pages/rank/zone/controller.dart

@@ -42,12 +42,15 @@ class ZoneController extends GetxController {
 
   // 返回顶部并刷新
   void animateToTop() async {
+    if (scrollController.hasClients) {
       if (scrollController.offset >=
           MediaQuery.of(Get.context!).size.height * 5) {
         scrollController.jumpTo(0);
       } else {
         await scrollController.animateTo(0,
-          duration: const Duration(milliseconds: 500), curve: Curves.easeInOut);
+            duration: const Duration(milliseconds: 500),
+            curve: Curves.easeInOut);
+      }
     }
   }
 }

lib/pages/video/detail/introduction/controller.dart

@@ -58,6 +58,7 @@ class VideoIntroController extends GetxController {
   String heroTag = '';
   late ModelResult modelResult;
   PersistentBottomSheetController? bottomSheetController;
+  late bool enableRelatedVideo;
 
   @override
   void onInit() {
@@ -74,6 +75,8 @@ class VideoIntroController extends GetxController {
       queryOnlineTotal();
       startTimer(); // 在页面加载时启动定时器
     }
+    enableRelatedVideo =
+        setting.get(SettingBoxKey.enableRelatedVideo, defaultValue: true);
   }
 
   // 获取视频简介&分p
@@ -447,15 +450,18 @@ class VideoIntroController extends GetxController {
     // 重新获取视频资源
     final VideoDetailController videoDetailCtr =
         Get.find<VideoDetailController>(tag: heroTag);
+    if (enableRelatedVideo) {
       final ReleatedController releatedCtr =
           Get.find<ReleatedController>(tag: heroTag);
+      releatedCtr.bvid = bvid;
+      releatedCtr.queryRelatedVideo();
+    }
+
     videoDetailCtr.bvid = bvid;
     videoDetailCtr.oid.value = aid ?? IdUtils.bv2av(bvid);
     videoDetailCtr.cid.value = cid;
     videoDetailCtr.danmakuCid.value = cid;
     videoDetailCtr.queryVideoUrl();
-    releatedCtr.bvid = bvid;
-    releatedCtr.queryRelatedVideo();
     // 重新请求评论
     try {
       /// 未渲染回复组件时可能异常

lib/pages/video/detail/view.dart

@@ -180,12 +180,21 @@ class _VideoDetailPageState extends State<VideoDetailPage>
     plPlayerController?.isFullScreen.listen((bool isFullScreen) {
       if (isFullScreen) {
         vdCtr.hiddenReplyReplyPanel();
+        if (vdCtr.videoType == SearchType.video) {
           videoIntroController.hiddenEpisodeBottomSheet();
           if (videoIntroController.videoDetail.value.ugcSeason != null ||
               (videoIntroController.videoDetail.value.pages != null &&
                   videoIntroController.videoDetail.value.pages!.length > 1)) {
             vdCtr.bottomList.insert(3, BottomControlType.episode);
           }
+        }
+        if (vdCtr.videoType == SearchType.media_bangumi) {
+          bangumiIntroController.hiddenEpisodeBottomSheet();
+          if (bangumiIntroController.bangumiDetail.value.episodes != null &&
+              bangumiIntroController.bangumiDetail.value.episodes!.length > 1) {
+            vdCtr.bottomList.insert(3, BottomControlType.episode);
+          }
+        }
       } else {
         if (vdCtr.bottomList.contains(BottomControlType.episode)) {
           vdCtr.bottomList.removeAt(3);
@@ -395,26 +404,40 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                         width: 38,
                         height: 38,
                         child: Obx(
-                          () => IconButton(
+                          () => !vdCtr.isShowCover.value
+                              ? IconButton(
                                   onPressed: () {
                                     plPlayerController?.isOpenDanmu.value =
-                                  !(plPlayerController?.isOpenDanmu.value ??
+                                        !(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:
+                                              color: Theme.of(context)
-                                        Theme.of(context).colorScheme.outline,
+                                                  .colorScheme
+                                                  .outline,
                                             )
                                           : SvgPicture.asset(
                                               'assets/images/video/danmu_open.svg',
                                               // ignore: deprecated_member_use
-                                    color:
+                                              color: Theme.of(context)
-                                        Theme.of(context).colorScheme.primary,
+                                                  .colorScheme
+                                                  .primary,
                                             ),
+                                )
+                              : IconButton(
+                                  icon: SvgPicture.asset(
+                                    'assets/images/video/danmu_close.svg',
+                                    // ignore: deprecated_member_use
+                                    color:
+                                        Theme.of(context).colorScheme.outline,
+                                  ),
+                                  onPressed: () {},
                                 ),
                         ),
                       ),

lib/pages/video/detail/widgets/header_control.dart

@@ -1306,20 +1306,6 @@ class _HeaderControlState extends State<HeaderControl> {
           ],
 
           /// 字幕
-          // 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,

lib/plugin/pl_player/controller.dart

@@ -473,17 +473,17 @@ class PlPlayerController {
     }
 
     // 字幕
-    if (dataSource.subFiles != '' && dataSource.subFiles != null) {
+    // if (dataSource.subFiles != '' && dataSource.subFiles != null) {
-      await pp.setProperty(
+    //   await pp.setProperty(
-        'sub-files',
+    //     'sub-files',
-        UniversalPlatform.isWindows
+    //     UniversalPlatform.isWindows
-            ? dataSource.subFiles!.replaceAll(';', '\\;')
+    //         ? dataSource.subFiles!.replaceAll(';', '\\;')
-            : dataSource.subFiles!.replaceAll(':', '\\:'),
+    //         : dataSource.subFiles!.replaceAll(':', '\\:'),
-      );
+    //   );
-      await pp.setProperty("subs-with-matching-audio", "no");
+    //   await pp.setProperty("subs-with-matching-audio", "no");
-      await pp.setProperty("sub-forced-only", "yes");
+    //   await pp.setProperty("sub-forced-only", "yes");
-      await pp.setProperty("blend-subtitles", "video");
+    //   await pp.setProperty("blend-subtitles", "video");
-    }
+    // }
 
     _videoController = _videoController ??
         VideoController(
@@ -522,7 +522,22 @@ class PlPlayerController {
     Duration seekTo = Duration.zero,
     Duration? duration,
   }) async {
-    // 设置倍速
+    getVideoFit();
+    // if (_looping) {
+    //   await setLooping(_looping);
+    // }
+
+    /// 跳转播放
+    if (seekTo != Duration.zero) {
+      await this.seekTo(seekTo);
+    }
+
+    /// 自动播放
+    if (_autoPlay) {
+      await play(duration: duration);
+    }
+
+    /// 设置倍速
     if (videoType.value == 'live') {
       await setPlaybackSpeed(1.0);
     } else {
@@ -532,20 +547,6 @@ class PlPlayerController {
         await setPlaybackSpeed(1.0);
       }
     }
-    getVideoFit();
-    // if (_looping) {
-    //   await setLooping(_looping);
-    // }
-
-    // 跳转播放
-    if (seekTo != Duration.zero) {
-      await this.seekTo(seekTo);
-    }
-
-    // 自动播放
-    if (_autoPlay) {
-      await play(duration: duration);
-    }
   }
 
   List<StreamSubscription> subscriptions = [];
@@ -603,7 +604,9 @@ class PlPlayerController {
           makeHeartBeat(event.inSeconds);
         }),
         videoPlayerController!.stream.duration.listen((event) {
+          if (event > Duration.zero) {
             duration.value = event;
+          }
         }),
         videoPlayerController!.stream.buffer.listen((event) {
           _buffered.value = event;
@@ -646,6 +649,7 @@ class PlPlayerController {
 
   /// 跳转至指定位置
   Future<void> seekTo(Duration position, {type = 'seek'}) async {
+    try {
       if (position < Duration.zero) {
         position = Duration.zero;
       }
@@ -654,14 +658,20 @@ class PlPlayerController {
       _heartDuration = position.inSeconds;
       if (duration.value.inSeconds != 0) {
         if (type != 'slider') {
-        /// 拖动进度条调节时，不等待第一帧，防止抖动
           await _videoPlayerController?.stream.buffer.first;
         }
         await _videoPlayerController?.seek(position);
       } else {
         _timerForSeek?.cancel();
-      _timerForSeek ??=
+        _timerForSeek ??= _startSeekTimer(position);
-          Timer.periodic(const Duration(milliseconds: 200), (Timer t) async {
+      }
+    } catch (err) {
+      print('Error while seeking: $err');
+    }
+  }
+
+  Timer? _startSeekTimer(Duration position) {
+    return Timer.periodic(const Duration(milliseconds: 200), (Timer t) async {
       if (duration.value.inSeconds != 0) {
         await _videoPlayerController!.stream.buffer.first;
         await _videoPlayerController?.seek(position);
@@ -670,7 +680,6 @@ class PlPlayerController {
       }
     });
   }
-  }
 
   /// 设置倍速
   Future<void> setPlaybackSpeed(double speed) async {
@@ -708,11 +717,10 @@ class PlPlayerController {
       await seekTo(Duration.zero);
     }
     await _videoPlayerController?.play();
-
+    playerStatus.status.value = PlayerStatus.playing;
     await getCurrentVolume();
     await getCurrentBrightness();
 
-    playerStatus.status.value = PlayerStatus.playing;
     // screenManager.setOverlays(false);
 
     /// 临时fix _duration.value丢失

lib/utils/subtitle.dart

@@ -5,8 +5,8 @@ class SubTitleUtils {
 
     for (int i = 0; i < jsonData.length; i++) {
       final item = jsonData[i];
-      double from = item['from'] as double;
+      double from = double.parse(item['from'].toString());
-      double to = item['to'] as double;
+      double to = double.parse(item['to'].toString());
       int sid = (item['sid'] ?? 0) as int;
       String content = item['content'] as String;
 

lib/utils/utils.dart

@@ -210,15 +210,18 @@ class Utils {
     int minDiff = 127;
     int closestNumber = 0; // 初始化为0，表示没有找到比目标值小的整数
 
+    if (numbers.contains(target)) {
+      return target;
+    }
     // 向下查找
     try {
       for (int number in numbers) {
         if (number < target) {
           int diff = target - number; // 计算目标值与当前整数的差值
-
           if (diff < minDiff) {
             minDiff = diff;
             closestNumber = number;
+            return closestNumber;
           }
         }
       }