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

Merge branch 'main' into feature-updateVideoDetailStructure

Browse Source
This commit is contained in:
guozhigq
2024-03-16 22:52:15 +08:00
parent 2ad9c3c993 5e8d9b524b
commit 32cbc2759e
11 changed files with 97 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/pages/fav_detail/controller.dart
View File

@ -16,7 +16,7 @@ class FavDetailController extends GetxController {
RxMap favInfo = {}.obs; RxMap favInfo = {}.obs;
RxList favList = [].obs; RxList favList = [].obs;
RxString loadingText = '加载中...'.obs; RxString loadingText = '加载中...'.obs;
int mediaCount = 0; RxInt mediaCount = 0.obs;
@override @override
void onInit() { void onInit() {
@ -29,7 +29,7 @@ class FavDetailController extends GetxController {
} }
Future<dynamic> queryUserFavFolderDetail({type = 'init'}) async { Future<dynamic> queryUserFavFolderDetail({type = 'init'}) async {
if (type == 'onLoad' && favList.length >= mediaCount) { if (type == 'onLoad' && favList.length >= mediaCount.value) {
loadingText.value = '没有更多了'; loadingText.value = '没有更多了';
return; return;
} }
@ -43,11 +43,11 @@ class FavDetailController extends GetxController {
favInfo.value = res['data'].info; favInfo.value = res['data'].info;
if (currentPage == 1 && type == 'init') { if (currentPage == 1 && type == 'init') {
favList.value = res['data'].medias; favList.value = res['data'].medias;
mediaCount = res['data'].info['media_count']; mediaCount.value = res['data'].info['media_count'];
} else if (type == 'onLoad') { } else if (type == 'onLoad') {
favList.addAll(res['data'].medias); favList.addAll(res['data'].medias);
} }
if (favList.length >= mediaCount) { if (favList.length >= mediaCount.value) {
loadingText.value = '没有更多了'; loadingText.value = '没有更多了';
} }
} }

4
lib/pages/fav_detail/view.dart
View File

@ -84,7 +84,7 @@ class _FavDetailPageState extends State<FavDetailPage> {
style: Theme.of(context).textTheme.titleMedium, style: Theme.of(context).textTheme.titleMedium,
), ),
Text( Text(
'共${_favDetailController.item!.mediaCount!}条视频', '共${_favDetailController.mediaCount}条视频',
style: Theme.of(context).textTheme.labelMedium, style: Theme.of(context).textTheme.labelMedium,
) )
], ],
@ -175,7 +175,7 @@ class _FavDetailPageState extends State<FavDetailPage> {
padding: const EdgeInsets.only(top: 15, bottom: 8, left: 14), padding: const EdgeInsets.only(top: 15, bottom: 8, left: 14),
child: Obx( child: Obx(
() => Text( () => Text(
'共${_favDetailController.favList.length}条视频', '共${_favDetailController.mediaCount}条视频',
style: TextStyle( style: TextStyle(
fontSize: fontSize:
Theme.of(context).textTheme.labelMedium!.fontSize, Theme.of(context).textTheme.labelMedium!.fontSize,

1
lib/pages/live_room/widgets/bottom_control.dart
View File

@ -29,7 +29,6 @@ class BottomControl extends StatefulWidget implements PreferredSizeWidget {
class _BottomControlState extends State<BottomControl> { class _BottomControlState extends State<BottomControl> {
late PlayUrlModel videoInfo; late PlayUrlModel videoInfo;
List<PlaySpeed> playSpeed = PlaySpeed.values;
TextStyle subTitleStyle = const TextStyle(fontSize: 12); TextStyle subTitleStyle = const TextStyle(fontSize: 12);
TextStyle titleStyle = const TextStyle(fontSize: 14); TextStyle titleStyle = const TextStyle(fontSize: 14);
Size get preferredSize => const Size(double.infinity, kToolbarHeight); Size get preferredSize => const Size(double.infinity, kToolbarHeight);

6
lib/pages/setting/extra_setting.dart
View File

@ -173,6 +173,12 @@ class _ExtraSettingState extends State<ExtraSetting> {
setKey: SettingBoxKey.enableAi, setKey: SettingBoxKey.enableAi,
defaultVal: true, defaultVal: true,
), ),
const SetSwitchItem(
title: '相关视频推荐',
subTitle: '视频详情页推荐相关视频',
setKey: SettingBoxKey.enableRelatedVideo,
defaultVal: true,
),
ListTile( ListTile(
dense: false, dense: false,
title: Text('评论展示', style: titleStyle), title: Text('评论展示', style: titleStyle),

101
lib/pages/setting/pages/play_speed_set.dart
View File

@ -17,6 +17,7 @@ class _PlaySpeedPageState extends State<PlaySpeedPage> {
Box videoStorage = GStrorage.video; Box videoStorage = GStrorage.video;
Box settingStorage = GStrorage.setting; Box settingStorage = GStrorage.setting;
late double playSpeedDefault; late double playSpeedDefault;
late List<double> playSpeedSystem;
late double longPressSpeedDefault; late double longPressSpeedDefault;
late List customSpeedsList; late List customSpeedsList;
late bool enableAutoLongPressSpeed; late bool enableAutoLongPressSpeed;
@ -53,6 +54,9 @@ class _PlaySpeedPageState extends State<PlaySpeedPage> {
@override @override
void initState() { void initState() {
super.initState(); super.initState();
// 系统预设倍速
playSpeedSystem =
videoStorage.get(VideoBoxKey.playSpeedSystem, defaultValue: playSpeed);
// 默认倍速 // 默认倍速
playSpeedDefault = playSpeedDefault =
videoStorage.get(VideoBoxKey.playSpeedDefault, defaultValue: 1.0); videoStorage.get(VideoBoxKey.playSpeedDefault, defaultValue: 1.0);
@ -64,6 +68,7 @@ class _PlaySpeedPageState extends State<PlaySpeedPage> {
videoStorage.get(VideoBoxKey.customSpeedsList, defaultValue: []); videoStorage.get(VideoBoxKey.customSpeedsList, defaultValue: []);
enableAutoLongPressSpeed = settingStorage enableAutoLongPressSpeed = settingStorage
.get(SettingBoxKey.enableAutoLongPressSpeed, defaultValue: false); .get(SettingBoxKey.enableAutoLongPressSpeed, defaultValue: false);
// 开启动态长按倍速时不展示
if (enableAutoLongPressSpeed) { if (enableAutoLongPressSpeed) {
Map newItem = sheetMenu[1]; Map newItem = sheetMenu[1];
newItem['show'] = false; newItem['show'] = false;
@ -123,7 +128,7 @@ class _PlaySpeedPageState extends State<PlaySpeedPage> {
} }
// 设定倍速弹窗 // 设定倍速弹窗
void showBottomSheet(type, i) { void showBottomSheet(String type, int i) {
showModalBottomSheet<void>( showModalBottomSheet<void>(
context: context, context: context,
isScrollControlled: true, isScrollControlled: true,
@ -159,18 +164,11 @@ class _PlaySpeedPageState extends State<PlaySpeedPage> {
} }
// //
void menuAction(type, index, id) async { void menuAction(type, int index, id) async {
double chooseSpeed = 1.0; double chooseSpeed = 1.0;
if (type == 'system' && id == -1) {
SmartDialog.showToast('系统预设倍速不支持删除');
return;
}
// 获取当前选中的倍速值 // 获取当前选中的倍速值
if (type == 'system') { chooseSpeed =
chooseSpeed = PlaySpeed.values[index].value; type == 'system' ? playSpeedSystem[index] : customSpeedsList[index];
} else {
chooseSpeed = customSpeedsList[index];
}
// 设置 // 设置
if (id == 1) { if (id == 1) {
// 设置默认倍速 // 设置默认倍速
@ -182,17 +180,22 @@ class _PlaySpeedPageState extends State<PlaySpeedPage> {
videoStorage.put( videoStorage.put(
VideoBoxKey.longPressSpeedDefault, longPressSpeedDefault); VideoBoxKey.longPressSpeedDefault, longPressSpeedDefault);
} else if (id == -1) { } else if (id == -1) {
if (customSpeedsList[index] == playSpeedDefault) { late List speedsList =
playSpeedDefault = 1.0; type == 'system' ? playSpeedSystem : customSpeedsList;
videoStorage.put(VideoBoxKey.playSpeedDefault, playSpeedDefault); if (speedsList[index] == playSpeedDefault) {
SmartDialog.showToast('默认倍速不可删除');
} }
if (customSpeedsList[index] == longPressSpeedDefault) { if (speedsList[index] == longPressSpeedDefault) {
longPressSpeedDefault = 2.0; longPressSpeedDefault = 2.0;
videoStorage.put( videoStorage.put(
VideoBoxKey.longPressSpeedDefault, longPressSpeedDefault); VideoBoxKey.longPressSpeedDefault, longPressSpeedDefault);
} }
customSpeedsList.removeAt(index); speedsList.removeAt(index);
await videoStorage.put(VideoBoxKey.customSpeedsList, customSpeedsList); await videoStorage.put(
type == 'system'
? VideoBoxKey.playSpeedSystem
: VideoBoxKey.customSpeedsList,
speedsList);
} }
setState(() {}); setState(() {});
SmartDialog.showToast('操作成功'); SmartDialog.showToast('操作成功');
@ -249,38 +252,40 @@ class _PlaySpeedPageState extends State<PlaySpeedPage> {
subtitle: Text(longPressSpeedDefault.toString()), subtitle: Text(longPressSpeedDefault.toString()),
) )
: const SizedBox(), : const SizedBox(),
Padding( if (playSpeedSystem.isNotEmpty) ...[
padding: const EdgeInsets.only( Padding(
left: 14, padding: const EdgeInsets.only(
right: 14, left: 14,
bottom: 10, right: 14,
top: 20, bottom: 10,
top: 20,
),
child: Text(
'系统预设倍速',
style: Theme.of(context).textTheme.titleMedium,
),
), ),
child: Text( Padding(
'系统预设倍速', padding: const EdgeInsets.only(
style: Theme.of(context).textTheme.titleMedium, left: 18,
), right: 18,
), bottom: 30,
Padding( ),
padding: const EdgeInsets.only( child: Wrap(
left: 18, alignment: WrapAlignment.start,
right: 18, spacing: 8,
bottom: 30, runSpacing: 2,
), children: [
child: Wrap( for (int i = 0; i < playSpeedSystem.length; i++) ...[
alignment: WrapAlignment.start, FilledButton.tonal(
spacing: 8, onPressed: () => showBottomSheet('system', i),
runSpacing: 2, child: Text(playSpeedSystem[i].toString()),
children: [ ),
for (var i in PlaySpeed.values) ...[ ]
FilledButton.tonal( ],
onPressed: () => showBottomSheet('system', i.index), ),
child: Text(i.description), )
), ],
]
],
),
),
Padding( Padding(
padding: const EdgeInsets.only( padding: const EdgeInsets.only(
left: 14, left: 14,

4
lib/pages/video/detail/controller.dart
View File

@ -93,6 +93,7 @@ class VideoDetailController extends GetxController
late int cacheAudioQa; late int cacheAudioQa;
PersistentBottomSheetController? replyReplyBottomSheetCtr; PersistentBottomSheetController? replyReplyBottomSheetCtr;
late bool enableRelatedVideo;
@override @override
void onInit() { void onInit() {
@ -115,7 +116,8 @@ class VideoDetailController extends GetxController
autoPlay.value = autoPlay.value =
setting.get(SettingBoxKey.autoPlayEnable, defaultValue: true); setting.get(SettingBoxKey.autoPlayEnable, defaultValue: true);
enableHA.value = setting.get(SettingBoxKey.enableHA, defaultValue: true); enableHA.value = setting.get(SettingBoxKey.enableHA, defaultValue: true);
enableRelatedVideo =
setting.get(SettingBoxKey.enableRelatedVideo, defaultValue: true);
if (userInfo == null || if (userInfo == null ||
localCache.get(LocalCacheKey.historyPause) == true) { localCache.get(LocalCacheKey.historyPause) == true) {
enableHeart = false; enableHeart = false;

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

@ -557,7 +557,9 @@ class _VideoDetailPageState extends State<VideoDetailPage>
.withOpacity(0.06), .withOpacity(0.06),
), ),
), ),
const RelatedVideoPanel(), if (vdCtr.videoType == SearchType.video &&
vdCtr.enableRelatedVideo)
const RelatedVideoPanel(),
], ],
); );
}, },

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

@ -45,7 +45,6 @@ class HeaderControl extends StatefulWidget implements PreferredSizeWidget {
class _HeaderControlState extends State<HeaderControl> { class _HeaderControlState extends State<HeaderControl> {
late PlayUrlModel videoInfo; late PlayUrlModel videoInfo;
List<PlaySpeed> playSpeed = PlaySpeed.values;
static const TextStyle subTitleStyle = TextStyle(fontSize: 12); static const TextStyle subTitleStyle = TextStyle(fontSize: 12);
static const TextStyle titleStyle = TextStyle(fontSize: 14); static const TextStyle titleStyle = TextStyle(fontSize: 14);
Size get preferredSize => const Size(double.infinity, kToolbarHeight); Size get preferredSize => const Size(double.infinity, kToolbarHeight);

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

@ -292,11 +292,19 @@ class PlPlayerController {
_longPressSpeed.value = videoStorage _longPressSpeed.value = videoStorage
.get(VideoBoxKey.longPressSpeedDefault, defaultValue: 2.0); .get(VideoBoxKey.longPressSpeedDefault, defaultValue: 2.0);
} }
// 自定义倍速集合
speedsList = List<double>.from(videoStorage speedsList = List<double>.from(videoStorage
.get(VideoBoxKey.customSpeedsList, defaultValue: <double>[])); .get(VideoBoxKey.customSpeedsList, defaultValue: <double>[]));
for (final PlaySpeed i in PlaySpeed.values) { // 默认倍速
speedsList.add(i.value); speedsList = List<double>.from(videoStorage
} .get(VideoBoxKey.customSpeedsList, defaultValue: <double>[]));
//playSpeedSystem
final List<double> playSpeedSystem =
videoStorage.get(VideoBoxKey.playSpeedSystem, defaultValue: playSpeed);
// for (final PlaySpeed i in PlaySpeed.values) {
speedsList.addAll(playSpeedSystem);
// }
// _playerEventSubs = onPlayerStatusChanged.listen((PlayerStatus status) { // _playerEventSubs = onPlayerStatusChanged.listen((PlayerStatus status) {
// if (status == PlayerStatus.playing) { // if (status == PlayerStatus.playing) {
@ -676,18 +684,6 @@ class PlPlayerController {
_playbackSpeed.value = speed; _playbackSpeed.value = speed;
} }
/// 设置倍速
// Future<void> togglePlaybackSpeed() async {
// List<double> allowedSpeeds =
// PlaySpeed.values.map<double>((e) => e.value).toList();
// int index = allowedSpeeds.indexOf(_playbackSpeed.value);
// if (index < allowedSpeeds.length - 1) {
// setPlaybackSpeed(allowedSpeeds[index + 1]);
// } else {
// setPlaybackSpeed(allowedSpeeds[0]);
// }
// }
/// 播放视频 /// 播放视频
/// TODO _duration.value丢失 /// TODO _duration.value丢失
Future<void> play( Future<void> play(

46
lib/plugin/pl_player/models/play_speed.dart
View File

@ -1,39 +1,15 @@
enum PlaySpeed { List<double> generatePlaySpeedList() {
pointTwoFive, List<double> playSpeed = [];
pointFive, double startSpeed = 0.25;
pointSevenFive, double endSpeed = 2.0;
double increment = 0.25;
one, for (double speed = startSpeed; speed <= endSpeed; speed += increment) {
onePointTwoFive, playSpeed.add(speed);
onePointFive, }
onePointSevenFive,
two, return playSpeed;
} }
extension PlaySpeedExtension on PlaySpeed { // 导出 playSpeed 列表
static final List<String> _descList = [ List<double> playSpeed = generatePlaySpeedList();
'0.25',
'0.5',
'0.75',
'正常',
'1.25',
'1.5',
'1.75',
'2.0',
];
String get description => _descList[index];
static final List<double> _valueList = [
0.25,
0.5,
0.75,
1.0,
1.25,
1.5,
1.75,
2.0,
];
double get value => _valueList[index];
double get defaultValue => _valueList[3];
}

5
lib/utils/storage.dart
View File

@ -131,7 +131,8 @@ class SettingBoxKey {
enableSearchWord = 'enableSearchWord', enableSearchWord = 'enableSearchWord',
enableSystemProxy = 'enableSystemProxy', enableSystemProxy = 'enableSystemProxy',
enableAi = 'enableAi', enableAi = 'enableAi',
defaultHomePage = 'defaultHomePage'; defaultHomePage = 'defaultHomePage',
enableRelatedVideo = 'enableRelatedVideo';
/// 外观 /// 外观
static const String themeMode = 'themeMode', static const String themeMode = 'themeMode',
@ -181,6 +182,8 @@ class VideoBoxKey {
videoSpeed = 'videoSpeed', videoSpeed = 'videoSpeed',
// 播放顺序 // 播放顺序
playRepeat = 'playRepeat', playRepeat = 'playRepeat',
// 系统预设倍速
playSpeedSystem = 'playSpeedSystem',
// 默认倍速 // 默认倍速
playSpeedDefault = 'playSpeedDefault', playSpeedDefault = 'playSpeedDefault',
// 默认长按倍速 // 默认长按倍速