mod: 视频播放器重构 - 基本功能

2023-07-30 22:44:18 +08:00
parent ca12be5373
commit 636ff2b9ad
31 changed files with 1583 additions and 390 deletions
--- a/lib/pages/video/detail/controller.dart
+++ b/lib/pages/video/detail/controller.dart
@ -1,6 +1,5 @@
 import 'dart:async';
 import 'package:flutter/material.dart';
-import 'package:flutter_meedu_media_kit/meedu_player.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
 import 'package:pilipala/http/constants.dart';
@ -9,6 +8,7 @@ import 'package:pilipala/models/common/reply_type.dart';
 import 'package:pilipala/models/video/play/url.dart';
 import 'package:pilipala/models/video/reply/item.dart';
 import 'package:pilipala/pages/video/detail/replyReply/index.dart';
+import 'package:pilipala/plugin/pl_player/index.dart';
 import 'package:pilipala/utils/storage.dart';

 class VideoDetailController extends GetxController
@ -38,21 +38,12 @@ class VideoDetailController extends GetxController
  int fRpid = 0;

  ReplyItemModel? firstFloor;
-
  final scaffoldKey = GlobalKey<ScaffoldState>();
-
-  MeeduPlayerController meeduPlayerController = MeeduPlayerController(
-    colorTheme: Theme.of(Get.context!).colorScheme.primary,
-    pipEnabled: true,
-    controlsStyle: ControlsStyle.youtube,
-    enabledButtons: const EnabledButtons(pip: true),
-  );
-
  Timer? timer;
-
  RxString bgCover = ''.obs;
  Box user = GStrorage.user;
  Box localCache = GStrorage.localCache;
+  PlPlayerController plPlayerController = PlPlayerController();

  @override
  void onInit() {
@ -95,38 +86,30 @@ class VideoDetailController extends GetxController
    });
  }

-  playerInit(source, audioSource, {Duration defaultST = Duration.zero}) {
-    meeduPlayerController.onVideoFitChange(BoxFit.cover);
-    meeduPlayerController.setDataSource(
+  playerInit(source, audioSource,
+      {Duration defaultST = Duration.zero, int duration = 0}) async {
+    plPlayerController.setDataSource(
      DataSource(
-        type: DataSourceType.network,
-        source: source,
+        videoSource: source,
        audioSource: audioSource,
+        type: DataSourceType.network,
        httpHeaders: {
          'user-agent':
              'Mozilla/5.0 (Macintosh; Intel Mac OS X 13_3_1) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.4 Safari/605.1.15',
          'referer': HttpString.baseUrl
        },
      ),
+      // 硬解
+      enableHA: true,
      autoplay: true,
      seekTo: defaultST,
+      duration: Duration(milliseconds: duration),
    );
  }

-  // Future<void> meeduDispose() async {
-  //   if (meeduPlayerController != null) {
-  //     _playerEventSubs?.cancel();
-  //     await meeduPlayerController!.dispose();
-  //     meeduPlayerController = null;
-  //     // The next line disables the wakelock again.
-  //     // await Wakelock.disable();
-  //   }
-  // }
-
  // 视频链接
  queryVideoUrl() async {
    var result = await VideoHttp.videoUrl(cid: cid, bvid: bvid);
-    // log('result: ${result.toString()}');
    if (result['status']) {
      PlayUrlModel data = result['data'];
      // 指定质量的视频 -> 最高质量的视频
@ -134,7 +117,8 @@ class VideoDetailController extends GetxController
      String audioUrl =
          data.dash!.audio!.isNotEmpty ? data.dash!.audio!.first.baseUrl! : '';
      playerInit(videoUrl, audioUrl,
-          defaultST: Duration(milliseconds: data.lastPlayTime!));
+          defaultST: Duration(milliseconds: data.lastPlayTime!),
+          duration: data.timeLength ?? 0);
    }
  }

@ -151,7 +135,7 @@ class VideoDetailController extends GetxController
    if (localCache.get(LocalCacheKey.historyStatus) == true) {
      return;
    }
-    Duration progress = meeduPlayerController.position.value;
+    Duration progress = plPlayerController.position.value;
    await VideoHttp.heartBeat(
      bvid: bvid,
      cid: cid,
--- a/lib/pages/video/detail/reply/widgets/reply_item.dart
+++ b/lib/pages/video/detail/reply/widgets/reply_item.dart
@ -595,11 +595,11 @@ InlineSpan buildContent(
              ),
              recognizer: TapGestureRecognizer()
                ..onTap = () {
-                  Get.find<VideoDetailController>(tag: Get.arguments['heroTag'])
-                      .meeduPlayerController
-                      .seekTo(
-                        Duration(seconds: Utils.duration(matchStr)),
-                      );
+                  // Get.find<VideoDetailController>(tag: Get.arguments['heroTag'])
+                  //     .meeduPlayerController
+                  //     .seekTo(
+                  //       Duration(seconds: Utils.duration(matchStr)),
+                  //     );
                },
            ),
          );
--- a/lib/pages/video/detail/view.dart
+++ b/lib/pages/video/detail/view.dart
@ -1,7 +1,6 @@
 import 'dart:async';

 import 'package:extended_nested_scroll_view/extended_nested_scroll_view.dart';
-import 'package:flutter_meedu_media_kit/meedu_player.dart';
 import 'package:get/get.dart';
 import 'package:flutter/material.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
@ -11,6 +10,7 @@ import 'package:pilipala/pages/video/detail/reply/index.dart';
 import 'package:pilipala/pages/video/detail/controller.dart';
 import 'package:pilipala/pages/video/detail/introduction/index.dart';
 import 'package:pilipala/pages/video/detail/related/index.dart';
+import 'package:pilipala/plugin/pl_player/index.dart';

 import 'widgets/app_bar.dart';

@ -27,21 +27,20 @@ class _VideoDetailPageState extends State<VideoDetailPage>
    with TickerProviderStateMixin, RouteAware {
  final VideoDetailController videoDetailController =
      Get.put(VideoDetailController(), tag: Get.arguments['heroTag']);
-  MeeduPlayerController? _meeduPlayerController;
+  PlPlayerController? plPlayerController;
  final ScrollController _extendNestCtr = ScrollController();
  late StreamController<double> appbarStream;

-  StreamSubscription? _playerEventSubs;
  bool isPlay = false;
-  PlayerStatus playerStatus = PlayerStatus.paused;
+  PlayerStatus playerStatus = PlayerStatus.playing;
  bool isShowCover = true;
  double doubleOffset = 0;

  @override
  void initState() {
    super.initState();
-    _meeduPlayerController = videoDetailController.meeduPlayerController;
-    _playerEventSubs = _meeduPlayerController!.onPlayerStatusChanged.listen(
+    plPlayerController = videoDetailController.plPlayerController;
+    plPlayerController!.onPlayerStatusChanged.listen(
      (PlayerStatus status) {
        videoDetailController.markHeartBeat();
        playerStatus = status;
@ -70,24 +69,15 @@ class _VideoDetailPageState extends State<VideoDetailPage>
    );
  }

-  Future<void> _meeduDispose() async {
-    if (_meeduPlayerController != null) {
-      _playerEventSubs?.cancel();
-      await _meeduPlayerController!.dispose();
-      _meeduPlayerController = null;
-      // The next line disables the wakelock again.
-    }
-  }
-
  void continuePlay() async {
    await _extendNestCtr.animateTo(0,
        duration: const Duration(milliseconds: 500), curve: Curves.easeInOut);
-    _meeduPlayerController!.play();
+    plPlayerController!.play();
  }

  @override
  void dispose() {
-    videoDetailController.meeduPlayerController.dispose();
+    plPlayerController!.dispose();
    if (videoDetailController.timer != null) {
      videoDetailController.timer!.cancel();
    }
@ -97,9 +87,6 @@ class _VideoDetailPageState extends State<VideoDetailPage>
  @override
  // 离开当前页面时
  void didPushNext() async {
-    if (!_meeduPlayerController!.pipAvailable.value) {
-      _meeduPlayerController!.pause();
-    }
    if (videoDetailController.timer!.isActive) {
      videoDetailController.timer!.cancel();
    }
@ -111,7 +98,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
  void didPopNext() async {
    if (_extendNestCtr.position.pixels == 0) {
      await Future.delayed(const Duration(milliseconds: 300));
-      _meeduPlayerController!.play();
+      plPlayerController!.play();
    }
    if (!videoDetailController.timer!.isActive) {
      videoDetailController.loopHeartBeat();
@ -167,34 +154,11 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                              tag: videoDetailController.heroTag,
                              child: Stack(
                                children: [
-                                  AspectRatio(
-                                    aspectRatio: 16 / 9,
-                                    child: MeeduVideoPlayer(
-                                      controller: _meeduPlayerController!,
-                                      header: (BuildContext context,
-                                          MeeduPlayerController
-                                              meeduPlayerController,
-                                          Responsive responsive) {
-                                        return AppBar(
-                                          toolbarHeight: 40,
-                                          backgroundColor: Colors.transparent,
-                                          primary: false,
-                                          elevation: 0,
-                                          scrolledUnderElevation: 0,
-                                          foregroundColor: Colors.white,
-                                          leading: IconButton(
-                                            onPressed: () {
-                                              Get.back();
-                                            },
-                                            icon: const Icon(
-                                              Icons.arrow_back_ios,
-                                              size: 19,
-                                            ),
-                                          ),
-                                        );
-                                      },
-                                    ),
-                                  ),
+                                  if (plPlayerController!
+                                          .videoPlayerController !=
+                                      null)
+                                    PLVideoPlayer(
+                                        controller: plPlayerController!),
                                  Visibility(
                                    visible: isShowCover,
                                    child: Positioned(
@ -305,8 +269,8 @@ class _VideoDetailPageState extends State<VideoDetailPage>
            builder: ((context, snapshot) {
              return ScrollAppBar(
                snapshot.data!.toDouble(),
-                continuePlay,
-                playerStatus,
+                () {},
+                playerStatus != PlayerStatus.playing,
                null,
              );
            }),
--- a/lib/pages/video/detail/widgets/app_bar.dart
+++ b/lib/pages/video/detail/widgets/app_bar.dart
@ -1,10 +1,9 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_meedu_media_kit/meedu_player.dart';

 class ScrollAppBar extends StatelessWidget {
  final double scrollVal;
  final Function callback;
-  final PlayerStatus playerStatus;
+  final bool playerStatus;

  const ScrollAppBar(
    this.scrollVal,
@ -34,18 +33,9 @@ class ScrollAppBar extends StatelessWidget {
            centerTitle: true,
            title: TextButton(
              onPressed: () => callback(),
-              child: Row(
+              child: const Row(
                mainAxisSize: MainAxisSize.min,
-                children: [
-                  const Icon(Icons.play_arrow_rounded),
-                  Text(
-                    playerStatus == PlayerStatus.paused
-                        ? '继续播放'
-                        : playerStatus == PlayerStatus.completed
-                            ? '重新播放'
-                            : '播放中',
-                  )
-                ],
+                children: [Icon(Icons.play_arrow_rounded), Text('继续播放')],
              ),
            ),
            actions: [