Merge branch 'opt-videoPlayerControl'

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

@@ -7,6 +7,7 @@ import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:get/get.dart';
 import 'package:hive/hive.dart';
+import 'package:marquee/marquee.dart';
 import 'package:ns_danmaku/ns_danmaku.dart';
 import 'package:pilipala/common/widgets/drag_handle.dart';
 import 'package:pilipala/http/user.dart';
@@ -62,6 +63,7 @@ class _HeaderControlState extends State<HeaderControl> {
   late String heroTag;
   late VideoIntroController videoIntroController;
   late VideoDetailData videoDetail;
+  DateTime initialTime = DateTime.now();
 
   @override
   void initState() {
@@ -108,30 +110,6 @@ class _HeaderControlState extends State<HeaderControl> {
                   child: Material(
                 child: ListView(
                   children: [
-                    // ListTile(
-                    //   onTap: () {},
-                    //   dense: true,
-                    //   enabled: false,
-                    //   leading:
-                    //       const Icon(Icons.network_cell_outlined, size: 20),
-                    //   title: Text('省流模式', style: titleStyle),
-                    //   subtitle: Text('低画质 ｜ 减少视频缓存', style: subTitleStyle),
-                    //   trailing: Transform.scale(
-                    //     scale: 0.75,
-                    //     child: Switch(
-                    //       thumbIcon: MaterialStateProperty.resolveWith<Icon?>(
-                    //           (Set<MaterialState> states) {
-                    //         if (states.isNotEmpty &&
-                    //             states.first == MaterialState.selected) {
-                    //           return const Icon(Icons.done);
-                    //         }
-                    //         return null; // All other states will use the default thumbIcon.
-                    //       }),
-                    //       value: false,
-                    //       onChanged: (value) => {},
-                    //     ),
-                    //   ),
-                    // ),
                     ListTile(
                       onTap: () async {
                         final res = await UserHttp.toViewLater(
@@ -1071,6 +1049,16 @@ class _HeaderControlState extends State<HeaderControl> {
     );
   }
 
+  Stream<DateTime> _getTimeStream() {
+    return Stream.periodic(const Duration(seconds: 60), (count) {
+      return DateTime.now();
+    });
+  }
+
+  String _formatTime(DateTime dateTime) {
+    return '${dateTime.hour}:${dateTime.minute < 10 ? '0${dateTime.minute}' : dateTime.minute}';
+  }
+
   @override
   Widget build(BuildContext context) {
     final _ = widget.controller!;
@@ -1086,7 +1074,55 @@ class _HeaderControlState extends State<HeaderControl> {
       primary: false,
       automaticallyImplyLeading: false,
       titleSpacing: 14,
-      title: Row(
+      title: Column(
+        children: [
+          if (isFullScreen.value && isLandscape) ...[
+            Row(
+              children: [
+                const SizedBox(width: 40),
+                if (videoIntroController.isShowOnlineTotal)
+                  Text(
+                    '${videoIntroController.total.value}人正在看',
+                    style: const TextStyle(
+                      color: Colors.white,
+                      fontSize: 12,
+                    ),
+                  ),
+                const Spacer(),
+                Expanded(
+                  child: Align(
+                    alignment: Alignment.center,
+                    child: StreamBuilder<DateTime>(
+                      stream: _getTimeStream(),
+                      builder: (context, snapshot) {
+                        if (snapshot.hasData) {
+                          String currentTime = _formatTime(snapshot.data!);
+                          return Text(
+                            currentTime,
+                            style: const TextStyle(fontSize: 12),
+                          );
+                        } else if (snapshot.connectionState ==
+                            ConnectionState.waiting) {
+                          // 如果Stream还未发出数据，先显示初始获取的时间
+                          String currentTime = _formatTime(initialTime);
+                          return Text(
+                            currentTime,
+                            style: const TextStyle(fontSize: 12),
+                          );
+                        } else {
+                          return const SizedBox();
+                        }
+                      },
+                    ),
+                  ),
+                ),
+                const Spacer(),
+
+                /// TODO 网络&电量
+              ],
+            ),
+          ],
+          Row(
             children: [
               ComBtn(
                 icon: const Icon(
@@ -1114,31 +1150,31 @@ class _HeaderControlState extends State<HeaderControl> {
               if (isFullScreen.value &&
                   isLandscape &&
                   widget.videoType == SearchType.video) ...[
-            Column(
+                Expanded(
-              crossAxisAlignment: CrossAxisAlignment.start,
+                  child: LayoutBuilder(builder: (context, constraints) {
-              children: [
+                    return SizedBox(
-                ConstrainedBox(
+                      width: constraints.maxWidth,
-                  constraints: const BoxConstraints(maxWidth: 200),
+                      height: 25,
                       child: Obx(
-                    () => Text(
+                        () => Marquee(
-                      videoIntroController.videoDetail.value.title ?? '',
+                          text: videoIntroController.videoDetail.value.title ??
-                      style: const TextStyle(
+                              '',
-                        color: Colors.white,
+                          style: const TextStyle(fontSize: 16),
-                        fontSize: 16,
+                          scrollAxis: Axis.horizontal,
+                          crossAxisAlignment: CrossAxisAlignment.center,
+                          blankSpace: constraints.maxWidth,
+                          velocity: 100,
+                          pauseAfterRound: const Duration(seconds: 1),
+                          startPadding: 0,
+                          accelerationDuration: const Duration(seconds: 1),
+                          accelerationCurve: Curves.linear,
+                          decelerationDuration: const Duration(seconds: 1),
+                          decelerationCurve: Curves.easeOut,
                         ),
                       ),
+                    );
+                  }),
                 ),
-                ),
-                if (videoIntroController.isShowOnlineTotal)
-                  Text(
-                    '${videoIntroController.total.value}人正在看',
-                    style: const TextStyle(
-                      color: Colors.white,
-                      fontSize: 12,
-                    ),
-                  )
-              ],
-            )
               ] else ...[
                 ComBtn(
                   icon: const Icon(
@@ -1234,7 +1270,8 @@ class _HeaderControlState extends State<HeaderControl> {
                       if (canUsePiP) {
                         final Rational aspectRatio = Rational(
                           widget.videoDetailCtr!.data.dash!.video!.first.width!,
-                      widget.videoDetailCtr!.data.dash!.video!.first.height!,
+                          widget
+                              .videoDetailCtr!.data.dash!.video!.first.height!,
                         );
                         await widget.floating!.enable(aspectRatio: aspectRatio);
                       } else {}
@@ -1271,6 +1308,8 @@ class _HeaderControlState extends State<HeaderControl> {
               ),
             ],
           ),
+        ],
+      ),
     );
   }
 }

lib/plugin/pl_player/view.dart

@@ -842,8 +842,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
                 total: Duration(seconds: max),
                 progressBarColor: colorTheme,
                 baseBarColor: Colors.white.withOpacity(0.2),
-                bufferedBarColor:
+                bufferedBarColor: Colors.white.withOpacity(0.6),
-                    Theme.of(context).colorScheme.primary.withOpacity(0.4),
                 timeLabelLocation: TimeLabelLocation.none,
                 thumbColor: colorTheme,
                 barHeight: 3,

lib/plugin/pl_player/widgets/bottom_control.dart

@@ -1,8 +1,6 @@
-import 'package:audio_video_progress_bar/audio_video_progress_bar.dart';
 import 'package:flutter/material.dart';
-import 'package:get/get.dart';
 import 'package:pilipala/plugin/pl_player/index.dart';
-import 'package:pilipala/utils/feed_back.dart';
+import 'progress_bar.dart';
 
 class BottomControl extends StatelessWidget implements PreferredSizeWidget {
   final PlPlayerController? controller;
@@ -20,54 +18,18 @@ class BottomControl extends StatelessWidget implements PreferredSizeWidget {
 
   @override
   Widget build(BuildContext context) {
-    Color colorTheme = Theme.of(context).colorScheme.primary;
-    final _ = controller!;
     return Container(
       color: Colors.transparent,
       height: 90,
-      padding: const EdgeInsets.only(left: 18, right: 18),
+      padding: const EdgeInsets.symmetric(horizontal: 18),
       child: Column(
         mainAxisAlignment: MainAxisAlignment.end,
         children: [
-          Obx(
+          Padding(
-            () {
+            padding: const EdgeInsets.fromLTRB(7, 0, 7, 6),
-              final int value = _.sliderPositionSeconds.value;
+            child: ProgressBarWidget(controller: controller!),
-              final int max = _.durationSeconds.value;
-              final int buffer = _.bufferedSeconds.value;
-              if (value > max || max <= 0) {
-                return const SizedBox();
-              }
-              return Padding(
-                padding: const EdgeInsets.only(left: 7, right: 7, bottom: 6),
-                child: ProgressBar(
-                  progress: Duration(seconds: value),
-                  buffered: Duration(seconds: buffer),
-                  total: Duration(seconds: max),
-                  progressBarColor: colorTheme,
-                  baseBarColor: Colors.white.withOpacity(0.2),
-                  bufferedBarColor: colorTheme.withOpacity(0.4),
-                  timeLabelLocation: TimeLabelLocation.none,
-                  thumbColor: colorTheme,
-                  barHeight: 3.5,
-                  thumbRadius: 7,
-                  onDragStart: (duration) {
-                    feedBack();
-                    _.onChangedSliderStart();
-                  },
-                  onDragUpdate: (duration) {
-                    _.onUpdatedSliderProgress(duration.timeStamp);
-                  },
-                  onSeek: (duration) {
-                    _.onChangedSliderEnd();
-                    _.onChangedSlider(duration.inSeconds.toDouble());
-                    _.seekTo(Duration(seconds: duration.inSeconds),
-                        type: 'slider');
-                  },
           ),
-              );
+          Row(children: buildBottomControl!),
-            },
-          ),
-          Row(children: [...buildBottomControl!]),
           const SizedBox(height: 10),
         ],
       ),

lib/plugin/pl_player/widgets/progress_bar.dart

@@ -0,0 +1,52 @@
+import 'package:audio_video_progress_bar/audio_video_progress_bar.dart';
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:pilipala/plugin/pl_player/index.dart';
+import 'package:pilipala/utils/feed_back.dart';
+
+class ProgressBarWidget extends StatelessWidget {
+  final PlPlayerController controller;
+
+  const ProgressBarWidget({
+    required this.controller,
+    Key? key,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Obx(() {
+      Color colorTheme = Theme.of(context).colorScheme.primary;
+      final _ = controller;
+      final int value = _.sliderPositionSeconds.value;
+      final int max = _.durationSeconds.value;
+      final int buffer = _.bufferedSeconds.value;
+      if (value > max || max <= 0) {
+        return const SizedBox();
+      }
+      return ProgressBar(
+        progress: Duration(seconds: value),
+        buffered: Duration(seconds: buffer),
+        total: Duration(seconds: max),
+        progressBarColor: colorTheme,
+        baseBarColor: Colors.white.withOpacity(0.2),
+        bufferedBarColor: Colors.white.withOpacity(0.6),
+        timeLabelLocation: TimeLabelLocation.none,
+        thumbColor: colorTheme,
+        barHeight: 3.5,
+        thumbRadius: 7,
+        onDragStart: (duration) {
+          feedBack();
+          _.onChangedSliderStart();
+        },
+        onDragUpdate: (duration) {
+          _.onUpdatedSliderProgress(duration.timeStamp);
+        },
+        onSeek: (duration) {
+          _.onChangedSliderEnd();
+          _.onChangedSlider(duration.inSeconds.toDouble());
+          _.seekTo(Duration(seconds: duration.inSeconds), type: 'slider');
+        },
+      );
+    });
+  }
+}

pubspec.lock

@@ -497,6 +497,14 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "6.2.1"
+  fading_edge_scrollview:
+    dependency: transitive
+    description:
+      name: fading_edge_scrollview
+      sha256: c25c2231652ce774cc31824d0112f11f653881f43d7f5302c05af11942052031
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "3.0.0"
   fake_async:
     dependency: transitive
     description:
@@ -990,6 +998,14 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "6.1.0"
+  marquee:
+    dependency: "direct main"
+    description:
+      name: marquee
+      sha256: "4b5243d2804373bdc25fc93d42c3b402d6ec1f4ee8d0bb72276edd04ae7addb8"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.2.3"
   matcher:
     dependency: transitive
     description:

pubspec.yaml

@@ -152,6 +152,8 @@ dependencies:
   re_highlight: ^0.0.3
   # 图片选择器
   image_picker: ^1.1.2
+  # 跑马灯
+  marquee: ^2.2.3
 
 dev_dependencies:
   flutter_test: