HCha/PiliPlus
1
0
Fork 0
mirror of https://github.com/HChaZZY/PiliPlus.git synced 2025-12-20 09:06:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

opt player

Browse Source 
Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>
This commit is contained in:
bggRGjQaUbCoE
2025-08-10 13:03:49 +08:00
parent b788794f4b
commit dbde90459b
4 changed files with 1263 additions and 1230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
lib/pages/live_room/view.dart
View File

@@ -14,7 +14,6 @@ import 'package:PiliPlus/plugin/pl_player/models/play_status.dart';
import 'package:PiliPlus/plugin/pl_player/utils/fullscreen.dart'; import 'package:PiliPlus/plugin/pl_player/utils/fullscreen.dart';
import 'package:PiliPlus/plugin/pl_player/view.dart'; import 'package:PiliPlus/plugin/pl_player/view.dart';
import 'package:PiliPlus/services/service_locator.dart'; import 'package:PiliPlus/services/service_locator.dart';
import 'package:PiliPlus/utils/context_ext.dart';
import 'package:PiliPlus/utils/duration_util.dart'; import 'package:PiliPlus/utils/duration_util.dart';
import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/extension.dart';
import 'package:PiliPlus/utils/page_utils.dart'; import 'package:PiliPlus/utils/page_utils.dart';
@@ -113,20 +112,39 @@ class _LiveRoomPageState extends State<LiveRoomPage>
} }
} }
late double maxWidth;
late double maxHeight;
late EdgeInsets padding;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final isPortrait = context.isPortrait; padding = MediaQuery.paddingOf(context);
return LayoutBuilder(
builder: (context, constraints) {
maxWidth = constraints.maxWidth;
maxHeight = constraints.maxHeight;
final isPortrait = maxHeight >= maxWidth;
if (Platform.isAndroid) { if (Platform.isAndroid) {
return Floating().isPipMode return Floating().isPipMode
? videoPlayerPanel(isFullScreen, isPipMode: true) ? videoPlayerPanel(
isFullScreen,
width: maxWidth,
height: maxHeight,
isPipMode: true,
)
: childWhenDisabled(isPortrait); : childWhenDisabled(isPortrait);
} else { } else {
return childWhenDisabled(isPortrait); return childWhenDisabled(isPortrait);
} }
},
);
} }
Widget videoPlayerPanel( Widget videoPlayerPanel(
bool isFullScreen, { bool isFullScreen, {
required double width,
required double height,
bool isPipMode = false, bool isPipMode = false,
Color? fill, Color? fill,
Alignment? alignment, Alignment? alignment,
@@ -144,6 +162,8 @@ class _LiveRoomPageState extends State<LiveRoomPage>
final roomInfoH5 = _liveRoomController.roomInfoH5.value; final roomInfoH5 = _liveRoomController.roomInfoH5.value;
return PLVideoPlayer( return PLVideoPlayer(
key: playerKey, key: playerKey,
maxWidth: width,
maxHeight: height,
fill: fill, fill: fill,
alignment: alignment, alignment: alignment,
plPlayerController: plPlayerController, plPlayerController: plPlayerController,
@@ -212,11 +232,10 @@ class _LiveRoomPageState extends State<LiveRoomPage>
?.appBackground; ?.appBackground;
Widget child; Widget child;
if (appBackground?.isNotEmpty == true) { if (appBackground?.isNotEmpty == true) {
final size = Get.size;
child = CachedNetworkImage( child = CachedNetworkImage(
fit: BoxFit.cover, fit: BoxFit.cover,
width: size.width, width: maxWidth,
height: size.height, height: maxHeight,
imageUrl: appBackground!.http2https, imageUrl: appBackground!.http2https,
); );
} else { } else {
@@ -254,14 +273,18 @@ class _LiveRoomPageState extends State<LiveRoomPage>
Widget get _buildPH { Widget get _buildPH {
final isFullScreen = this.isFullScreen; final isFullScreen = this.isFullScreen;
final size = Get.size; final height = isFullScreen ? maxHeight : maxWidth * 9 / 16;
return Column( return Column(
children: [ children: [
if (!isFullScreen) _buildAppBar, if (!isFullScreen) _buildAppBar,
SizedBox( SizedBox(
width: size.width, width: maxWidth,
height: isFullScreen ? size.height : size.width * 9 / 16, height: height,
child: videoPlayerPanel(isFullScreen), child: videoPlayerPanel(
isFullScreen,
width: maxWidth,
height: height,
),
), ),
..._buildBottomWidget, ..._buildBottomWidget,
], ],
@@ -270,11 +293,17 @@ class _LiveRoomPageState extends State<LiveRoomPage>
Widget get _buildPP { Widget get _buildPP {
final isFullScreen = this.isFullScreen; final isFullScreen = this.isFullScreen;
final bottomHeight = 85.0 + padding.bottom;
final height = isFullScreen
? maxHeight
: maxHeight - padding.top - kToolbarHeight - bottomHeight;
Widget child = Stack( Widget child = Stack(
clipBehavior: Clip.none, clipBehavior: Clip.none,
children: [ children: [
Positioned.fill( Positioned.fill(
child: videoPlayerPanel( child: videoPlayerPanel(
width: maxWidth,
height: height,
isFullScreen, isFullScreen,
alignment: isFullScreen ? null : Alignment.topCenter, alignment: isFullScreen ? null : Alignment.topCenter,
needDm: isFullScreen, needDm: isFullScreen,
@@ -288,7 +317,7 @@ class _LiveRoomPageState extends State<LiveRoomPage>
maintainState: true, maintainState: true,
visible: !isFullScreen, visible: !isFullScreen,
child: SizedBox( child: SizedBox(
height: Get.height * 0.32, height: maxHeight * 0.32,
child: _buildChatWidget(true), child: _buildChatWidget(true),
), ),
), ),
@@ -302,7 +331,10 @@ class _LiveRoomPageState extends State<LiveRoomPage>
children: [ children: [
_buildAppBar, _buildAppBar,
Expanded(child: child), Expanded(child: child),
_buildInputWidget, SizedBox(
height: bottomHeight,
child: _buildInputWidget,
),
], ],
); );
} }
@@ -471,23 +503,23 @@ class _LiveRoomPageState extends State<LiveRoomPage>
Widget get _buildBodyH { Widget get _buildBodyH {
double videoWidth = double videoWidth =
clampDouble(context.height / context.width * 1.08, 0.58, 0.75) * clampDouble(maxHeight / maxWidth * 1.08, 0.58, 0.75) * maxWidth;
context.width;
return Obx( return Obx(
() { () {
final isFullScreen = this.isFullScreen; final isFullScreen = this.isFullScreen;
final size = Get.size; final width = isFullScreen ? maxWidth : videoWidth;
final height = isFullScreen ? maxHeight : maxWidth * 9 / 16;
Widget child = Row( Widget child = Row(
children: [ children: [
Container( Container(
margin: EdgeInsets.only( margin: EdgeInsets.only(bottom: padding.bottom),
bottom: MediaQuery.paddingOf(context).bottom, width: width,
), height: height,
width: isFullScreen ? size.width : videoWidth,
height: isFullScreen ? size.height : size.width * 9 / 16,
child: videoPlayerPanel( child: videoPlayerPanel(
isFullScreen, isFullScreen,
fill: Colors.transparent, fill: Colors.transparent,
width: width,
height: height,
), ),
), ),
Expanded( Expanded(
@@ -531,7 +563,7 @@ class _LiveRoomPageState extends State<LiveRoomPage>
top: 5, top: 5,
left: 10, left: 10,
right: 10, right: 10,
bottom: 15 + MediaQuery.paddingOf(context).bottom, bottom: 15 + padding.bottom,
), ),
decoration: const BoxDecoration( decoration: const BoxDecoration(
borderRadius: BorderRadius.only( borderRadius: BorderRadius.only(

104
lib/pages/video/view.dart
View File

@@ -665,8 +665,7 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
showStatusBar(); showStatusBar();
} }
} }
return SizedBox( final height = !isPortrait || isFullScreen
height: !isPortrait || isFullScreen
? maxHeight - ? maxHeight -
(!isPortrait || removeSafeArea (!isPortrait || removeSafeArea
? 0 ? 0
@@ -674,16 +673,13 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
: videoDetailController.isExpanding || : videoDetailController.isExpanding ||
videoDetailController.isCollapsing videoDetailController.isCollapsing
? animHeight ? animHeight
: videoDetailController.videoHeight, : videoDetailController.videoHeight;
return SizedBox(
width: maxWidth, width: maxWidth,
height: height,
child: videoPlayer( child: videoPlayer(
maxWidth, width: maxWidth,
!isPortrait || isFullScreen height: height,
? maxHeight
: videoDetailController.isExpanding ||
videoDetailController.isCollapsing
? animHeight
: videoDetailController.videoHeight,
), ),
); );
}, },
@@ -964,14 +960,18 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
if (videoDetailController.isVertical.value && enableVerticalExpand) { if (videoDetailController.isVertical.value && enableVerticalExpand) {
final double videoHeight = final double videoHeight =
maxHeight - (removeSafeArea ? 0 : padding.vertical); maxHeight - (removeSafeArea ? 0 : padding.vertical);
final double videoWidth = videoHeight * 9 / 16; final double width = videoHeight * 9 / 16;
final videoWidth = isFullScreen ? maxWidth : width;
return Row( return Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
SizedBox( SizedBox(
width: videoWidth,
height: videoHeight, height: videoHeight,
width: isFullScreen ? maxWidth : videoWidth, child: videoPlayer(
child: videoPlayer(videoWidth, videoHeight), width: videoWidth,
height: videoHeight,
),
), ),
Expanded( Expanded(
child: Scaffold( child: Scaffold(
@@ -986,7 +986,7 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
controller: videoDetailController.tabCtr, controller: videoDetailController.tabCtr,
children: [ children: [
videoIntro( videoIntro(
width: maxWidth - videoWidth, width: maxWidth - width,
height: maxHeight, height: maxHeight,
), ),
if (videoDetailController.showReply) if (videoDetailController.showReply)
@@ -1002,16 +1002,20 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
], ],
); );
} }
final double videoHeight = maxHeight / 2.5;
final shouldShowSeasonPanel = _shouldShowSeasonPanel; final shouldShowSeasonPanel = _shouldShowSeasonPanel;
final double height = maxHeight / 2.5;
final videoHeight = isFullScreen
? maxHeight - (removeSafeArea ? 0 : padding.vertical)
: height;
return Column( return Column(
children: [ children: [
SizedBox( SizedBox(
width: maxWidth, width: maxWidth,
height: isFullScreen height: videoHeight,
? maxHeight - (removeSafeArea ? 0 : padding.vertical) child: videoPlayer(
: videoHeight, width: maxWidth,
child: videoPlayer(maxWidth, videoHeight), height: videoHeight,
),
), ),
Expanded( Expanded(
child: Scaffold( child: Scaffold(
@@ -1032,7 +1036,7 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
if (shouldShowSeasonPanel) flex++; if (shouldShowSeasonPanel) flex++;
return maxWidth / flex; return maxWidth / flex;
}(), }(),
height: maxHeight - videoHeight, height: maxHeight - height,
), ),
), ),
if (videoDetailController.showReply) if (videoDetailController.showReply)
@@ -1056,20 +1060,24 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
if (videoDetailController.isVertical.value && enableVerticalExpand) { if (videoDetailController.isVertical.value && enableVerticalExpand) {
final double videoHeight = final double videoHeight =
maxHeight - (removeSafeArea ? 0 : padding.top); maxHeight - (removeSafeArea ? 0 : padding.top);
final double videoWidth = videoHeight * 9 / 16; final double width = videoHeight * 9 / 16;
final videoWidth = isFullScreen ? maxWidth : width;
return Row( return Row(
children: [ children: [
if (!isFullScreen) if (!isFullScreen)
Expanded( Expanded(
child: videoIntro( child: videoIntro(
width: (maxWidth - videoWidth) / 2, width: (maxWidth - width) / 2,
height: maxHeight, height: maxHeight,
), ),
), ),
SizedBox( SizedBox(
width: videoWidth,
height: videoHeight, height: videoHeight,
width: isFullScreen ? maxWidth : videoWidth, child: videoPlayer(
child: videoPlayer(videoWidth, videoHeight), width: videoWidth,
height: videoHeight,
),
), ),
Expanded( Expanded(
child: Scaffold( child: Scaffold(
@@ -1096,12 +1104,13 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
], ],
); );
} }
double videoWidth = double width =
clampDouble(maxHeight / maxWidth * 1.08, 0.5, 0.7) * maxWidth; clampDouble(maxHeight / maxWidth * 1.08, 0.5, 0.7) * maxWidth;
if (maxWidth >= 560) { if (maxWidth >= 560) {
videoWidth = min(videoWidth, maxWidth - 280); width = min(width, maxWidth - 280);
} }
final double videoHeight = videoWidth * 9 / 16; final videoWidth = isFullScreen ? maxWidth : width;
final double videoHeight = isFullScreen ? maxHeight : width * 9 / 16;
final introHeight = final introHeight =
maxHeight - videoHeight - (removeSafeArea ? 0 : padding.top); maxHeight - videoHeight - (removeSafeArea ? 0 : padding.top);
return Row( return Row(
@@ -1109,17 +1118,20 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
Column( Column(
children: [ children: [
SizedBox( SizedBox(
width: isFullScreen ? maxWidth : videoWidth, width: videoWidth,
height: isFullScreen ? maxHeight : videoHeight, height: videoHeight,
child: videoPlayer(videoWidth, videoHeight), child: videoPlayer(
width: videoWidth,
height: videoHeight,
),
), ),
Offstage( Offstage(
offstage: isFullScreen, offstage: isFullScreen,
child: SizedBox( child: SizedBox(
width: videoWidth, width: width,
height: introHeight, height: introHeight,
child: videoIntro( child: videoIntro(
width: videoWidth, width: width,
height: introHeight, height: introHeight,
needRelated: false, needRelated: false,
needCtr: false, needCtr: false,
@@ -1132,9 +1144,7 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
offstage: isFullScreen, offstage: isFullScreen,
child: SizedBox( child: SizedBox(
width: width:
maxWidth - maxWidth - width - (removeSafeArea ? 0 : padding.horizontal),
videoWidth -
(removeSafeArea ? 0 : padding.horizontal),
height: maxHeight - (removeSafeArea ? 0 : padding.top), height: maxHeight - (removeSafeArea ? 0 : padding.top),
child: Scaffold( child: Scaffold(
key: videoDetailController.childKey, key: videoDetailController.childKey,
@@ -1372,7 +1382,11 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
return const SizedBox.shrink(); return const SizedBox.shrink();
}); });
Widget plPlayer([bool isPipMode = false]) => Obx( Widget plPlayer({
required double width,
required double height,
bool isPipMode = false,
}) => Obx(
key: videoPlayerKey, key: videoPlayerKey,
() => () =>
videoDetailController.videoState.value is! Success || videoDetailController.videoState.value is! Success ||
@@ -1381,6 +1395,8 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
? const SizedBox.shrink() ? const SizedBox.shrink()
: PLVideoPlayer( : PLVideoPlayer(
key: playerKey, key: playerKey,
maxWidth: width,
maxHeight: height,
plPlayerController: plPlayerController!, plPlayerController: plPlayerController!,
videoDetailController: videoDetailController, videoDetailController: videoDetailController,
introController: videoDetailController.isUgc introController: videoDetailController.isUgc
@@ -1410,7 +1426,9 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
Widget autoChoose(Widget childWhenDisabled) { Widget autoChoose(Widget childWhenDisabled) {
if (Platform.isAndroid) { if (Platform.isAndroid) {
return Floating().isPipMode ? plPlayer(true) : childWhenDisabled; return Floating().isPipMode
? plPlayer(width: maxWidth, height: maxHeight, isPipMode: true)
: childWhenDisabled;
} }
return childWhenDisabled; return childWhenDisabled;
} }
@@ -1428,7 +1446,7 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
builder: (context, constraints) { builder: (context, constraints) {
maxWidth = constraints.maxWidth; maxWidth = constraints.maxWidth;
maxHeight = constraints.maxHeight; maxHeight = constraints.maxHeight;
isPortrait = maxHeight > maxWidth; isPortrait = maxHeight >= maxWidth;
if (!videoDetailController.horizontalScreen) { if (!videoDetailController.horizontalScreen) {
return autoChoose(childWhenDisabled); return autoChoose(childWhenDisabled);
@@ -1599,7 +1617,7 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
); );
} }
Widget videoPlayer(double videoWidth, double videoHeight) { Widget videoPlayer({required double width, required double height}) {
final isFullScreen = this.isFullScreen; final isFullScreen = this.isFullScreen;
return PopScope( return PopScope(
canPop: canPop:
@@ -1611,7 +1629,7 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
children: [ children: [
const Positioned.fill(child: ColoredBox(color: Colors.black)), const Positioned.fill(child: ColoredBox(color: Colors.black)),
if (isShowing) plPlayer(), if (isShowing) plPlayer(width: width, height: height),
Obx(() { Obx(() {
if (!videoDetailController.autoPlay.value) { if (!videoDetailController.autoPlay.value) {
@@ -1621,12 +1639,12 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
child: Obx( child: Obx(
() => CachedNetworkImage( () => CachedNetworkImage(
imageUrl: videoDetailController.cover.value.http2https, imageUrl: videoDetailController.cover.value.http2https,
width: videoWidth, width: width,
height: videoHeight, height: height,
fit: BoxFit.cover, fit: BoxFit.cover,
fadeOutDuration: const Duration(milliseconds: 120), fadeOutDuration: const Duration(milliseconds: 120),
fadeInDuration: const Duration(milliseconds: 120), fadeInDuration: const Duration(milliseconds: 120),
memCacheWidth: videoWidth.cacheSize(context), memCacheWidth: width.cacheSize(context),
placeholder: (context, url) => Center( placeholder: (context, url) => Center(
child: Image.asset('assets/images/loading.png'), child: Image.asset('assets/images/loading.png'),
), ),

120
lib/plugin/pl_player/view.dart
View File

@@ -46,6 +46,8 @@ import 'package:screen_brightness/screen_brightness.dart';
class PLVideoPlayer extends StatefulWidget { class PLVideoPlayer extends StatefulWidget {
const PLVideoPlayer({ const PLVideoPlayer({
required this.maxWidth,
required this.maxHeight,
required this.plPlayerController, required this.plPlayerController,
this.videoDetailController, this.videoDetailController,
this.introController, this.introController,
@@ -61,6 +63,8 @@ class PLVideoPlayer extends StatefulWidget {
super.key, super.key,
}); });
final double maxWidth;
final double maxHeight;
final PlPlayerController plPlayerController; final PlPlayerController plPlayerController;
final VideoDetailController? videoDetailController; final VideoDetailController? videoDetailController;
final CommonIntroController? introController; final CommonIntroController? introController;
@@ -244,7 +248,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
} }
// 动态构建底部控制条 // 动态构建底部控制条
Widget buildBottomControl() { Widget buildBottomControl(double maxWidth) {
final videoDetail = introController.videoDetail.value; final videoDetail = introController.videoDetail.value;
final isSeason = videoDetail.ugcSeason != null; final isSeason = videoDetail.ugcSeason != null;
final isPart = videoDetail.pages != null && videoDetail.pages!.length > 1; final isPart = videoDetail.pages != null && videoDetail.pages!.length > 1;
@@ -659,12 +663,9 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
children: [ children: [
...userSpecifyItemLeft.map(progressWidget), ...userSpecifyItemLeft.map(progressWidget),
Expanded( Expanded(
child: LayoutBuilder( child: FittedBox(
builder: (context, constraints) => FittedBox(
child: ConstrainedBox( child: ConstrainedBox(
constraints: BoxConstraints( constraints: BoxConstraints(minWidth: maxWidth),
minWidth: constraints.maxWidth,
),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.end, mainAxisAlignment: MainAxisAlignment.end,
children: userSpecifyItemRight.map(progressWidget).toList(), children: userSpecifyItemRight.map(progressWidget).toList(),
@@ -672,7 +673,6 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
), ),
), ),
), ),
),
], ],
); );
} }
@@ -691,10 +691,10 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
color: Colors.white, color: Colors.white,
fontSize: 12, fontSize: 12,
); );
return LayoutBuilder(
builder: (context, constraints) { final maxWidth = widget.maxWidth;
final maxWidth = constraints.maxWidth; final maxHeight = widget.maxHeight;
final maxHeight = constraints.maxHeight;
return Stack( return Stack(
fit: StackFit.passthrough, fit: StackFit.passthrough,
key: _playerKey, key: _playerKey,
@@ -739,8 +739,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
if (interacting || _initialFocalPoint == Offset.zero) return; if (interacting || _initialFocalPoint == Offset.zero) return;
Offset cumulativeDelta = Offset cumulativeDelta =
details.localFocalPoint - _initialFocalPoint; details.localFocalPoint - _initialFocalPoint;
if (details.pointerCount == 2 && if (details.pointerCount == 2 && cumulativeDelta.distance < 1.5) {
cumulativeDelta.distance < 1.5) {
interacting = true; interacting = true;
_gestureType = null; _gestureType = null;
return; return;
@@ -751,8 +750,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
if (_gestureType == null) { if (_gestureType == null) {
if (cumulativeDelta.distance < 1) return; if (cumulativeDelta.distance < 1) return;
if (cumulativeDelta.dx.abs() > if (cumulativeDelta.dx.abs() > 3 * cumulativeDelta.dy.abs()) {
3 * cumulativeDelta.dy.abs()) {
_gestureType = GestureType.horizontal; _gestureType = GestureType.horizontal;
} else if (cumulativeDelta.dy.abs() > } else if (cumulativeDelta.dy.abs() >
3 * cumulativeDelta.dx.abs()) { 3 * cumulativeDelta.dx.abs()) {
@@ -910,8 +908,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
'setVolume', 'setVolume',
const Duration(milliseconds: 20), const Duration(milliseconds: 20),
() { () {
final double volume = final double volume = _volumeValue.value - delta.dy / level;
_volumeValue.value - delta.dy / level;
final double result = volume.clamp(0.0, 1.0); final double result = volume.clamp(0.0, 1.0);
setVolume(result); setVolume(result);
}, },
@@ -1087,9 +1084,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
translation: const Offset(0.0, 0.3), // 上下偏移量（负数向上偏移） translation: const Offset(0.0, 0.3), // 上下偏移量（负数向上偏移）
child: AnimatedOpacity( child: AnimatedOpacity(
curve: Curves.easeInOut, curve: Curves.easeInOut,
opacity: plPlayerController.longPressStatus.value opacity: plPlayerController.longPressStatus.value ? 1.0 : 0.0,
? 1.0
: 0.0,
duration: const Duration(milliseconds: 150), duration: const Duration(milliseconds: 150),
child: Container( child: Container(
alignment: Alignment.center, alignment: Alignment.center,
@@ -1126,9 +1121,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
child: Obx( child: Obx(
() => AnimatedOpacity( () => AnimatedOpacity(
curve: Curves.easeInOut, curve: Curves.easeInOut,
opacity: plPlayerController.isSliderMoving.value opacity: plPlayerController.isSliderMoving.value ? 1.0 : 0.0,
? 1.0
: 0.0,
duration: const Duration(milliseconds: 150), duration: const Duration(milliseconds: 150),
child: IntrinsicWidth( child: IntrinsicWidth(
child: Container( child: Container(
@@ -1302,6 +1295,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
BottomControl( BottomControl(
controller: plPlayerController, controller: plPlayerController,
buildBottomControl: buildBottomControl, buildBottomControl: buildBottomControl,
maxWidth: maxWidth,
), ),
), ),
], ],
@@ -1328,8 +1322,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
// ), // ),
Obx( Obx(
() => () =>
showRestoreScaleBtn.value && showRestoreScaleBtn.value && plPlayerController.showControls.value
plPlayerController.showControls.value
? Align( ? Align(
alignment: Alignment.bottomCenter, alignment: Alignment.bottomCenter,
child: Padding( child: Padding(
@@ -1337,9 +1330,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
child: FilledButton.tonal( child: FilledButton.tonal(
style: FilledButton.styleFrom( style: FilledButton.styleFrom(
tapTargetSize: MaterialTapTargetSize.shrinkWrap, tapTargetSize: MaterialTapTargetSize.shrinkWrap,
backgroundColor: theme backgroundColor: theme.colorScheme.secondaryContainer
.colorScheme
.secondaryContainer
.withValues(alpha: 0.8), .withValues(alpha: 0.8),
visualDensity: VisualDensity.compact, visualDensity: VisualDensity.compact,
padding: const EdgeInsets.all(15), padding: const EdgeInsets.all(15),
@@ -1384,10 +1375,8 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
/// 进度条 live模式下禁用 /// 进度条 live模式下禁用
Obx( Obx(
() { () {
final int value = final int value = plPlayerController.sliderPositionSeconds.value;
plPlayerController.sliderPositionSeconds.value; final int max = plPlayerController.durationSeconds.value.inSeconds;
final int max =
plPlayerController.durationSeconds.value.inSeconds;
final int buffer = plPlayerController.bufferedSeconds.value; final int buffer = plPlayerController.bufferedSeconds.value;
if (plPlayerController.showControls.value) { if (plPlayerController.showControls.value) {
return const SizedBox.shrink(); return const SizedBox.shrink();
@@ -1433,7 +1422,11 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
buildDmChart(theme, plPlayerController), buildDmChart(theme, plPlayerController),
if (plPlayerController.viewPointList.isNotEmpty && if (plPlayerController.viewPointList.isNotEmpty &&
plPlayerController.showVP.value) plPlayerController.showVP.value)
buildViewPointWidget(plPlayerController, 4.25), buildViewPointWidget(
plPlayerController,
4.25,
maxWidth,
),
IgnorePointer( IgnorePointer(
child: ProgressBar( child: ProgressBar(
progress: Duration(seconds: value), progress: Duration(seconds: value),
@@ -1445,9 +1438,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
timeLabelLocation: TimeLabelLocation.none, timeLabelLocation: TimeLabelLocation.none,
thumbColor: primary, thumbColor: primary,
barHeight: 3.5, barHeight: 3.5,
thumbRadius: draggingFixedProgressBar.value thumbRadius: draggingFixedProgressBar.value ? 7 : 2.5,
? 7
: 2.5,
// onDragStart: (duration) { // onDragStart: (duration) {
// feedBack(); // feedBack();
// plPlayerController.onChangedSliderStart(); // plPlayerController.onChangedSliderStart();
@@ -1500,8 +1491,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
child: CustomPaint( child: CustomPaint(
size: const Size(double.infinity, 3.5), size: const Size(double.infinity, 3.5),
painter: SegmentProgressBar( painter: SegmentProgressBar(
segmentColors: segmentColors: plPlayerController.viewPointList,
plPlayerController.viewPointList,
), ),
), ),
), ),
@@ -1511,7 +1501,10 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
left: 0, left: 0,
right: 0, right: 0,
bottom: 12, bottom: 12,
child: buildSeekPreviewWidget(plPlayerController), child: buildSeekPreviewWidget(
plPlayerController,
maxWidth,
),
), ),
], ],
), ),
@@ -1541,8 +1534,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
child: Visibility( child: Visibility(
visible: visible:
plPlayerController.showControls.value && plPlayerController.showControls.value &&
(isFullScreen || (isFullScreen || plPlayerController.controlsLock.value),
plPlayerController.controlsLock.value),
child: DecoratedBox( child: DecoratedBox(
decoration: const BoxDecoration( decoration: const BoxDecoration(
color: Color(0x45000000), color: Color(0x45000000),
@@ -1553,8 +1545,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
plPlayerController.controlsLock.value plPlayerController.controlsLock.value
? FontAwesomeIcons.lock ? FontAwesomeIcons.lock
: FontAwesomeIcons.lockOpen, : FontAwesomeIcons.lockOpen,
semanticLabel: semanticLabel: plPlayerController.controlsLock.value
plPlayerController.controlsLock.value
? '解锁' ? '解锁'
: '锁定', : '锁定',
size: 15, size: 15,
@@ -1611,7 +1602,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
8, 8,
), ),
insetPadding: EdgeInsets.only( insetPadding: EdgeInsets.only(
left: context.width / 2, left: maxWidth / 2,
), ),
//移除圆角 //移除圆角
shape: const RoundedRectangleBorder(), shape: const RoundedRectangleBorder(),
@@ -1719,9 +1710,7 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
/// 点击 快进/快退 /// 点击 快进/快退
Obx( Obx(
() => () => _mountSeekBackwardButton.value || _mountSeekForwardButton.value
_mountSeekBackwardButton.value ||
_mountSeekForwardButton.value
? Positioned.fill( ? Positioned.fill(
child: Row( child: Row(
children: [ children: [
@@ -1735,15 +1724,14 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
child: child, child: child,
), ),
child: BackwardSeekIndicator( child: BackwardSeekIndicator(
duration: plPlayerController duration:
.fastForBackwardDuration, plPlayerController.fastForBackwardDuration,
onSubmitted: (Duration value) { onSubmitted: (Duration value) {
_mountSeekBackwardButton.value = false; _mountSeekBackwardButton.value = false;
final Player player = widget final Player player = widget
.plPlayerController .plPlayerController
.videoPlayerController!; .videoPlayerController!;
Duration result = Duration result = player.state.position - value;
player.state.position - value;
result = result.clamp( result = result.clamp(
Duration.zero, Duration.zero,
player.state.duration, player.state.duration,
@@ -1766,15 +1754,14 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
child: child, child: child,
), ),
child: ForwardSeekIndicator( child: ForwardSeekIndicator(
duration: plPlayerController duration:
.fastForBackwardDuration, plPlayerController.fastForBackwardDuration,
onSubmitted: (Duration value) { onSubmitted: (Duration value) {
_mountSeekForwardButton.value = false; _mountSeekForwardButton.value = false;
final Player player = widget final Player player = widget
.plPlayerController .plPlayerController
.videoPlayerController!; .videoPlayerController!;
Duration result = Duration result = player.state.position + value;
player.state.position + value;
result = result.clamp( result = result.clamp(
Duration.zero, Duration.zero,
player.state.duration, player.state.duration,
@@ -1793,8 +1780,6 @@ class _PLVideoPlayerState extends State<PLVideoPlayer>
), ),
], ],
); );
},
);
} }
} }
@@ -1851,7 +1836,10 @@ Widget buildDmChart(
); );
} }
Widget buildSeekPreviewWidget(PlPlayerController plPlayerController) { Widget buildSeekPreviewWidget(
PlPlayerController plPlayerController,
double maxWidth,
) {
return Obx( return Obx(
() { () {
if (!plPlayerController.showPreview.value || if (!plPlayerController.showPreview.value ||
@@ -1864,8 +1852,6 @@ Widget buildSeekPreviewWidget(PlPlayerController plPlayerController) {
VideoShotData data = plPlayerController.videoShot!['data']; VideoShotData data = plPlayerController.videoShot!['data'];
return LayoutBuilder(
builder: (context, constraints) {
try { try {
double scale = double scale =
plPlayerController.isFullScreen.value && plPlayerController.isFullScreen.value &&
@@ -1874,7 +1860,7 @@ Widget buildSeekPreviewWidget(PlPlayerController plPlayerController) {
: 2.5; : 2.5;
// offset // offset
double left = (plPlayerController.previewDx.value - 48 * scale / 2) double left = (plPlayerController.previewDx.value - 48 * scale / 2)
.clamp(8, constraints.maxWidth - 48 * scale - 8); .clamp(8, maxWidth - 48 * scale - 8);
// index // index
// int index = plPlayerController.sliderPositionSeconds.value ~/ 5; // int index = plPlayerController.sliderPositionSeconds.value ~/ 5;
@@ -1883,8 +1869,7 @@ Widget buildSeekPreviewWidget(PlPlayerController plPlayerController) {
(data.index! (data.index!
.where( .where(
(item) => (item) =>
item <= item <= plPlayerController.sliderPositionSeconds.value,
plPlayerController.sliderPositionSeconds.value,
) )
.length - .length -
2), 2),
@@ -1933,16 +1918,13 @@ Widget buildSeekPreviewWidget(PlPlayerController plPlayerController) {
} }
}, },
); );
},
);
} }
Widget buildViewPointWidget( Widget buildViewPointWidget(
PlPlayerController plPlayerController, PlPlayerController plPlayerController,
double offset, double offset,
double maxWidth,
) { ) {
return LayoutBuilder(
builder: (context, constraints) {
return Container( return Container(
height: 16, height: 16,
margin: EdgeInsets.only(bottom: offset), margin: EdgeInsets.only(bottom: offset),
@@ -1950,7 +1932,7 @@ Widget buildViewPointWidget(
behavior: HitTestBehavior.opaque, behavior: HitTestBehavior.opaque,
onPointerDown: (event) { onPointerDown: (event) {
try { try {
double seg = event.localPosition.dx / constraints.maxWidth; double seg = event.localPosition.dx / maxWidth;
Segment item = plPlayerController.viewPointList Segment item = plPlayerController.viewPointList
.where((item) => item.start >= seg) .where((item) => item.start >= seg)
.reduce((a, b) => a.start < b.start ? a : b); .reduce((a, b) => a.start < b.start ? a : b);
@@ -1966,6 +1948,4 @@ Widget buildViewPointWidget(
}, },
), ),
); );
},
);
} }

13
lib/plugin/pl_player/widgets/bottom_control.dart
View File

@@ -10,14 +10,17 @@ import 'package:flutter/rendering.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
class BottomControl extends StatelessWidget { class BottomControl extends StatelessWidget {
final PlPlayerController controller;
final Function buildBottomControl;
const BottomControl({ const BottomControl({
required this.controller, required this.controller,
required this.buildBottomControl, required this.buildBottomControl,
required this.maxWidth,
super.key, super.key,
}); });
final PlPlayerController controller;
final Widget Function(double maxWidth) buildBottomControl;
final double maxWidth;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final theme = Theme.of(context); final theme = Theme.of(context);
@@ -51,7 +54,7 @@ class BottomControl extends StatelessWidget {
buildDmChart(theme, controller, 4.5), buildDmChart(theme, controller, 4.5),
if (controller.viewPointList.isNotEmpty && if (controller.viewPointList.isNotEmpty &&
controller.showVP.value) controller.showVP.value)
buildViewPointWidget(controller, 8.75), buildViewPointWidget(controller, 8.75, maxWidth),
ProgressBar( ProgressBar(
progress: Duration(seconds: value), progress: Duration(seconds: value),
buffered: Duration(seconds: buffer), buffered: Duration(seconds: buffer),
@@ -146,7 +149,7 @@ class BottomControl extends StatelessWidget {
left: 0, left: 0,
right: 0, right: 0,
bottom: 18, bottom: 18,
child: buildSeekPreviewWidget(controller), child: buildSeekPreviewWidget(controller, maxWidth),
), ),
], ],
), ),
@@ -154,7 +157,7 @@ class BottomControl extends StatelessWidget {
); );
}, },
), ),
buildBottomControl(), buildBottomControl(maxWidth),
const SizedBox(height: 12), const SizedBox(height: 12),
], ],
), ),