mirrors/pilipala
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into design

Browse Source
This commit is contained in:
guozhigq
2024-12-01 14:12:52 +08:00
parent 518f49973c 4ac0f291ce
commit a6e3a7c27b
10 changed files with 325 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/pages/dynamics/detail/view.dart
View File

@ -20,7 +20,6 @@ import '../../../models/video/reply/item.dart';
import '../widgets/dynamic_panel.dart';
class DynamicDetailPage extends StatefulWidget {
// const DynamicDetailPage({super.key});
const DynamicDetailPage({Key? key}) : super(key: key);
@override
@ -90,19 +89,22 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
_dynamicDetailController = Get.put(
DynamicDetailController(oid, replyType),
tag: opusId.toString());
_futureBuilderFuture = _dynamicDetailController.queryReplyList();
await _dynamicDetailController.reqHtmlByOpusId(opusId!);
setState(() {});
}
} else {
oid = moduleDynamic.major!.draw!.id!;
}
} catch (_) {}
} catch (err) {
print('err:${err.toString()}');
}
}
if (!isOpusId) {
_dynamicDetailController =
Get.put(DynamicDetailController(oid, replyType), tag: oid.toString());
_futureBuilderFuture ??= _dynamicDetailController.queryReplyList();
}
_futureBuilderFuture = _dynamicDetailController.queryReplyList();
}
// 查看二级评论
@ -132,7 +134,7 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
// 分页加载
if (scrollController.position.pixels >=
scrollController.position.maxScrollExtent - 300) {
EasyThrottle.throttle('replylist', const Duration(seconds: 2), () {
EasyThrottle.throttle('replyList', const Duration(seconds: 2), () {
_dynamicDetailController.onLoad();
});
}

7
lib/pages/video/detail/reply/controller.dart
View File

@ -70,6 +70,13 @@ class VideoReplyController extends GetxController {
isEnd = res['data'].cursor.isEnd ?? false;
nextOffset = res['data'].cursor.paginationReply.nextOffset ?? "";
if (replies.isNotEmpty) {
/// 临时修复
final bool flag = replyList
.any((ReplyItemModel reply) => reply.rpid == replies.first.rpid);
if (replies.length == 1 && flag) {
replies.clear();
isEnd = true;
}
noMore.value = isEnd ? '没有更多了' : '加载中...';
} else {
noMore.value =

5
lib/pages/video/detail/view.dart
View File

@ -685,6 +685,11 @@ class _VideoDetailPageState extends State<VideoDetailPage>
canPop:
plPlayerController?.isFullScreen.value != true,
onPopInvoked: (bool didPop) {
if (plPlayerController?.controlsLock.value ==
true) {
plPlayerController?.onLockControl(false);
return;
}
if (plPlayerController?.isFullScreen.value ==
true) {
plPlayerController!

417
lib/pages/video/detail/widgets/header_control.dart
View File

@ -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,49 +1074,12 @@ class _HeaderControlState extends State<HeaderControl> {
primary: false,
automaticallyImplyLeading: false,
titleSpacing: 14,
title: Row(
title: Column(
children: [
ComBtn(
icon: const Icon(
FontAwesomeIcons.arrowLeft,
size: 15,
color: Colors.white,
),
fuc: () => <Set<void>>{
if (widget.controller!.isFullScreen.value)
<void>{widget.controller!.triggerFullScreen(status: false)}
else
<void>{
if (MediaQuery.of(context).orientation ==
Orientation.landscape)
{
SystemChrome.setPreferredOrientations([
DeviceOrientation.portraitUp,
])
},
Get.back()
}
},
),
SizedBox(width: buttonSpace),
if (isFullScreen.value &&
isLandscape &&
widget.videoType == SearchType.video) ...[
Column(
crossAxisAlignment: CrossAxisAlignment.start,
if (isFullScreen.value && isLandscape) ...[
Row(
children: [
ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 200),
child: Obx(
() => Text(
videoIntroController.videoDetail.value.title ?? '',
style: const TextStyle(
color: Colors.white,
fontSize: 16,
),
),
),
),
const SizedBox(width: 40),
if (videoIntroController.isShowOnlineTotal)
Text(
'${videoIntroController.total.value}人正在看',
@ -1136,138 +1087,226 @@ class _HeaderControlState extends State<HeaderControl> {
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 网络&电量
],
)
] else ...[
ComBtn(
icon: const Icon(
FontAwesomeIcons.house,
size: 15,
color: Colors.white,
),
fuc: () async {
// 销毁播放器实例
await widget.controller!.dispose(type: 'all');
if (context.mounted) {
Navigator.popUntil(
context, (Route<dynamic> route) => route.isFirst);
}
},
),
],
const Spacer(),
if (GlobalDataCache.enableDlna) ...[
ComBtn(
icon: Image.asset('assets/images/video/dlna.png', width: 19),
fuc: () async {
showDialog<void>(
context: context,
builder: (BuildContext context) {
return LiveDlnaPage(
datasource: widget.videoDetailCtr!.videoUrl);
},
);
},
),
SizedBox(width: buttonSpace),
],
/// 弹幕开关（全屏时）
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: buttonSpace),
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),
],
/// pip
if (Platform.isAndroid) ...<Widget>[
SizedBox(
width: 34,
height: 34,
child: IconButton(
style: ButtonStyle(
padding: MaterialStateProperty.all(EdgeInsets.zero),
),
onPressed: () async {
bool canUsePiP = false;
widget.controller!.hiddenControls(false);
try {
canUsePiP = await widget.floating!.isPipAvailable;
} on PlatformException catch (_) {
canUsePiP = false;
}
if (canUsePiP) {
final Rational aspectRatio = Rational(
widget.videoDetailCtr!.data.dash!.video!.first.width!,
widget.videoDetailCtr!.data.dash!.video!.first.height!,
);
await widget.floating!.enable(aspectRatio: aspectRatio);
} else {}
},
icon: Image.asset(
'assets/images/video/pip.png',
width: 19,
Row(
children: [
ComBtn(
icon: const Icon(
FontAwesomeIcons.arrowLeft,
size: 15,
color: Colors.white,
),
fuc: () => <Set<void>>{
if (widget.controller!.isFullScreen.value)
<void>{widget.controller!.triggerFullScreen(status: false)}
else
<void>{
if (MediaQuery.of(context).orientation ==
Orientation.landscape)
{
SystemChrome.setPreferredOrientations([
DeviceOrientation.portraitUp,
])
},
Get.back()
}
},
),
),
SizedBox(width: buttonSpace),
],
SizedBox(width: buttonSpace),
if (isFullScreen.value &&
isLandscape &&
widget.videoType == SearchType.video) ...[
Expanded(
child: LayoutBuilder(builder: (context, constraints) {
return SizedBox(
width: constraints.maxWidth,
height: 25,
child: Obx(
() => Marquee(
text: videoIntroController.videoDetail.value.title ??
'',
style: const TextStyle(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,
),
),
);
}),
),
] else ...[
ComBtn(
icon: const Icon(
FontAwesomeIcons.house,
size: 15,
color: Colors.white,
),
fuc: () async {
// 销毁播放器实例
await widget.controller!.dispose(type: 'all');
if (context.mounted) {
Navigator.popUntil(
context, (Route<dynamic> route) => route.isFirst);
}
},
),
],
const Spacer(),
if (GlobalDataCache.enableDlna) ...[
ComBtn(
icon: Image.asset('assets/images/video/dlna.png', width: 19),
fuc: () async {
showDialog<void>(
context: context,
builder: (BuildContext context) {
return LiveDlnaPage(
datasource: widget.videoDetailCtr!.videoUrl);
},
);
},
),
SizedBox(width: buttonSpace),
],
/// 字幕
if (widget.showSubtitleBtn) ...[
ComBtn(
icon: Icon(
FontAwesomeIcons.closedCaptioning,
size: 16,
color: Colors.white.withOpacity(0.9),
/// 弹幕开关（全屏时）
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: buttonSpace),
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),
],
/// pip
if (Platform.isAndroid) ...<Widget>[
SizedBox(
width: 34,
height: 34,
child: IconButton(
style: ButtonStyle(
padding: MaterialStateProperty.all(EdgeInsets.zero),
),
onPressed: () async {
bool canUsePiP = false;
widget.controller!.hiddenControls(false);
try {
canUsePiP = await widget.floating!.isPipAvailable;
} on PlatformException catch (_) {
canUsePiP = false;
}
if (canUsePiP) {
final Rational aspectRatio = Rational(
widget.videoDetailCtr!.data.dash!.video!.first.width!,
widget
.videoDetailCtr!.data.dash!.video!.first.height!,
);
await widget.floating!.enable(aspectRatio: aspectRatio);
} else {}
},
icon: Image.asset(
'assets/images/video/pip.png',
width: 19,
color: Colors.white,
),
),
),
SizedBox(width: buttonSpace),
],
/// 字幕
if (widget.showSubtitleBtn) ...[
ComBtn(
icon: Icon(
FontAwesomeIcons.closedCaptioning,
size: 16,
color: Colors.white.withOpacity(0.9),
),
fuc: () => showSubtitleDialog(),
),
SizedBox(width: buttonSpace),
],
ComBtn(
icon: const Icon(
Icons.more_vert_outlined,
size: 19,
color: Colors.white,
),
fuc: () => showSettingSheet(),
),
fuc: () => showSubtitleDialog(),
),
SizedBox(width: buttonSpace),
],
ComBtn(
icon: const Icon(
Icons.more_vert_outlined,
size: 19,
color: Colors.white,
),
fuc: () => showSettingSheet(),
],
),
],
),

3
lib/plugin/pl_player/controller.dart
View File

@ -917,7 +917,7 @@ class PlPlayerController {
if (videoType == 'live') {
return;
}
if (controlsLock.value) {
if (_controlsLock.value) {
return;
}
_doubleSpeedStatus.value = val;
@ -1093,6 +1093,7 @@ class PlPlayerController {
videoFitChangedTimer?.cancel();
// _position.close();
_playerEventSubs?.cancel();
_controlsLock.value = false;
// _sliderPosition.close();
// _sliderTempPosition.close();
// _isSliderMoving.close();

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

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

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

@ -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(
() {
final int value = _.sliderPositionSeconds.value;
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');
},
),
);
},
Padding(
padding: const EdgeInsets.fromLTRB(7, 0, 7, 6),
child: ProgressBarWidget(controller: controller!),
),
Row(children: [...buildBottomControl!]),
Row(children: buildBottomControl!),
const SizedBox(height: 10),
],
),

52
lib/plugin/pl_player/widgets/progress_bar.dart Normal file
View File

@ -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');
},
);
});
}
}

16
pubspec.lock
View File

@ -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:

2
pubspec.yaml
View File

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