EchoZenith/PiliPlus
1
0
Fork 0
mirror of https://github.com/bggRGjQaUbCoE/PiliPlus.git synced 2026-04-28 22:35:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix; set subtitle before init (#1742)

Browse Source 
* tweka

* fix; set subtitle before init
This commit is contained in:
My-Responsitories
2025-11-15 15:34:23 +08:00
committed by GitHub
parent c89d6a5a59
commit e589f27195
3 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/pages/video/controller.dart
View File

@@ -121,7 +121,7 @@ class VideoDetailController extends GetxController
final videoPlayerKey = GlobalKey();
final childKey = GlobalKey<ScaffoldState>();
PlPlayerController plPlayerController = PlPlayerController.getInstance()
final plPlayerController = PlPlayerController.getInstance()
..setCurrBrightness(-1.0);
bool get setSystemBrightness => plPlayerController.setSystemBrightness;
@@ -755,7 +755,7 @@ class VideoDetailController extends GetxController
Future<void> handleSBData(List<SegmentItemModel> list) async {
if (list.isNotEmpty) {
try {
Completer? completer;
Future? future;
final duration = list.first.videoDuration ?? data.timeLength!;
// segmentList
segmentList.addAll(
@@ -813,21 +813,20 @@ class VideoDetailController extends GetxController
case SkipType.alwaysSkip:
case SkipType.skipOnce:
segmentModel.hasSkipped = true;
completer = Completer();
final videoPlayerController =
plPlayerController.videoPlayerController!;
if (videoPlayerController.state.playing) {
onSkip(
future = onSkip(
segmentModel,
).whenComplete(completer!.complete);
);
} else {
videoPlayerController.stream.playing.firstWhere((
e,
) {
if (e) {
onSkip(
future = onSkip(
segmentModel,
).whenComplete(completer!.complete);
);
return true;
}
return false;
@@ -860,7 +859,7 @@ class VideoDetailController extends GetxController
if (positionSubscription == null &&
(autoPlay.value || plPlayerController.preInitPlayer)) {
await completer?.future;
await future;
initSkip();
}
} catch (e) {
@@ -1190,11 +1189,11 @@ class VideoDetailController extends GetxController
seasonId: isUgc ? null : seasonId,
pgcType: isUgc ? null : pgcType,
videoType: videoType,
callback: () {
callback: () async {
if (videoState.value is! Success) {
videoState.value = const Success(null);
}
setSubtitle(vttSubtitlesIndex.value);
await setSubtitle(vttSubtitlesIndex.value);
},
width: firstVideo.width,
height: firstVideo.height,
@@ -1486,16 +1485,16 @@ class VideoDetailController extends GetxController
// 设定字幕轨道
Future<void> setSubtitle(int index) async {
if (index <= 0) {
plPlayerController.videoPlayerController?.setSubtitleTrack(
await plPlayerController.videoPlayerController?.setSubtitleTrack(
SubtitleTrack.no(),
);
vttSubtitlesIndex.value = index;
return;
}
void setSub(String subtitle) {
Future<void> setSub(String subtitle) async {
final sub = subtitles[index - 1];
plPlayerController.videoPlayerController?.setSubtitleTrack(
await plPlayerController.videoPlayerController?.setSubtitleTrack(
SubtitleTrack.data(
subtitle,
title: sub.lanDoc,
@@ -1507,14 +1506,14 @@ class VideoDetailController extends GetxController
String? subtitle = vttSubtitles[index - 1];
if (subtitle != null) {
setSub(subtitle);
await setSub(subtitle);
} else {
var result = await VideoHttp.vttSubtitles(
subtitles[index - 1].subtitleUrl!,
);
if (result != null) {
vttSubtitles[index - 1] = result;
setSub(result);
await setSub(result);
}
}
}
@@ -1634,7 +1633,7 @@ class VideoDetailController extends GetxController
? 1
: 0,
};
setSubtitle(idx);
await setSubtitle(idx);
}
}
}