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

Merge branch 'design'

Browse Source
This commit is contained in:
guozhigq
2024-06-30 22:02:37 +08:00
parent b1e283beea a19129c596
commit 3b42cf5ba9
11 changed files with 89 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/pages/setting/play_setting.dart
View File

@ -3,6 +3,7 @@ import 'dart:io';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:hive/hive.dart';
import 'package:pilipala/http/init.dart';
import 'package:pilipala/models/video/play/ao_output.dart';
import 'package:pilipala/models/video/play/quality.dart';
import 'package:pilipala/pages/setting/widgets/select_dialog.dart';
@ -163,6 +164,14 @@ class _PlaySettingState extends State<PlaySetting> {
callFn: (bool val) {
GlobalData().enablePlayerControlAnimation = val;
}),
SetSwitchItem(
title: '港澳台模式',
setKey: SettingBoxKey.enableGATMode,
defaultVal: false,
callFn: (bool val) {
Request.setBaseUrl(type: val ? 'bangumi' : 'default');
},
),
ListTile(
dense: false,
title: Text('默认视频画质', style: titleStyle),

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

@ -141,13 +141,7 @@ class VideoDetailController extends GetxController
if (Platform.isAndroid) {
floating = Floating();
}
headerControl = HeaderControl(
controller: plPlayerController,
videoDetailCtr: this,
floating: floating,
bvid: bvid,
videoType: videoType,
);
// CDN优化
enableCDN = setting.get(SettingBoxKey.enableCDN, defaultValue: true);
// 预设的画质
@ -158,7 +152,18 @@ class VideoDetailController extends GetxController
defaultAudioQa = setting.get(SettingBoxKey.defaultAudioQa,
defaultValue: AudioQuality.hiRes.code);
oid.value = IdUtils.bv2av(Get.parameters['bvid']!);
getSubtitle();
getSubtitle().then(
(subtitles) {
headerControl = HeaderControl(
controller: plPlayerController,
videoDetailCtr: this,
floating: floating,
bvid: bvid,
videoType: videoType,
showSubtitleBtn: subtitles.isNotEmpty,
);
},
);
}
showReplyReplyPanel(oid, fRpid, firstFloor) {
@ -432,28 +437,24 @@ class VideoDetailController extends GetxController
if (result['status']) {
if (result['data'].subtitles.isNotEmpty) {
subtitles = result['data'].subtitles;
if (subtitles.isNotEmpty) {
for (var i in subtitles) {
final Map<String, dynamic> res = await VideoHttp.getSubtitleContent(
i.subtitleUrl,
);
i.content = res['content'];
i.body = res['body'];
}
}
getDanmaku(subtitles);
}
return result['data'];
return subtitles;
}
}
// 获取字幕内容
// Future getSubtitleContent(String url) async {
// var res = await Request().get('https:$url');
// subtitleContents.value = res.data['body'].map<SubTitileContentModel>((e) {
// return SubTitileContentModel.fromJson(e);
// }).toList();
// setSubtitleContent();
// }
// 获取弹幕
Future getDanmaku(List subtitles) async {
if (subtitles.isNotEmpty) {
for (var i in subtitles) {
final Map<String, dynamic> res = await VideoHttp.getSubtitleContent(
i.subtitleUrl,
);
i.content = res['content'];
i.body = res['body'];
}
}
}
setSubtitleContent() {
plPlayerController.subtitleContent.value = '';

3
lib/pages/video/detail/introduction/controller.dart
View File

@ -435,7 +435,8 @@ class VideoIntroController extends GetxController {
videoDetailCtr.danmakuCid.value = cid;
videoDetailCtr.cover.value = cover;
videoDetailCtr.queryVideoUrl();
videoDetailCtr.getSubtitle();
videoDetailCtr.clearSubtitleContent();
await videoDetailCtr.getSubtitle();
videoDetailCtr.setSubtitleContent();
// 重新请求评论
try {

2
lib/pages/video/detail/reply/view.dart
View File

@ -188,7 +188,7 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
if (snapshot.connectionState == ConnectionState.done) {
var data = snapshot.data;
if (_videoReplyController.replyList.isNotEmpty ||
(data && data['status'])) {
(data != null && data['status'])) {
// 请求成功
return Obx(
() => _videoReplyController.isLoadingMore &&

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

@ -30,6 +30,7 @@ class HeaderControl extends StatefulWidget implements PreferredSizeWidget {
this.floating,
this.bvid,
this.videoType,
this.showSubtitleBtn,
super.key,
});
final PlPlayerController? controller;
@ -37,6 +38,7 @@ class HeaderControl extends StatefulWidget implements PreferredSizeWidget {
final Floating? floating;
final String? bvid;
final SearchType? videoType;
final bool? showSubtitleBtn;
@override
State<HeaderControl> createState() => _HeaderControlState();
@ -426,7 +428,12 @@ class _HeaderControlState extends State<HeaderControl> {
/// 选择字幕
void showSubtitleDialog() async {
int tempThemeValue = widget.controller!.subTitleCode.value;
int len = widget.videoDetailCtr!.subtitles.length;
final List subtitles = widget.videoDetailCtr!.subtitles;
int len = subtitles.length;
if (subtitles.firstWhereOrNull((element) => element.id == tempThemeValue) ==
null) {
tempThemeValue = -1;
}
showDialog(
context: context,
builder: (BuildContext context) {
@ -458,7 +465,7 @@ class _HeaderControlState extends State<HeaderControl> {
),
...widget.videoDetailCtr!.subtitles
.map((e) => RadioListTile(
value: e.code,
value: e.id,
title: Text(e.title),
groupValue: tempThemeValue,
onChanged: (value) {
@ -1322,14 +1329,15 @@ class _HeaderControlState extends State<HeaderControl> {
],
/// 字幕
ComBtn(
icon: const Icon(
Icons.closed_caption_off,
size: 22,
color: Colors.white,
if (widget.showSubtitleBtn!)
ComBtn(
icon: const Icon(
Icons.closed_caption_off,
size: 22,
color: Colors.white,
),
fuc: () => showSubtitleDialog(),
),
fuc: () => showSubtitleDialog(),
),
SizedBox(width: buttonSpace),
Obx(
() => SizedBox(