Merge branch 'main' into feature-media_kit
This commit is contained in:
@ -21,6 +21,8 @@ import 'package:pilipala/utils/storage.dart';
|
||||
import 'package:screen_brightness/screen_brightness.dart';
|
||||
import 'package:status_bar_control/status_bar_control.dart';
|
||||
import 'package:universal_platform/universal_platform.dart';
|
||||
import '../../models/video/subTitile/content.dart';
|
||||
import '../../models/video/subTitile/result.dart';
|
||||
// import 'package:wakelock_plus/wakelock_plus.dart';
|
||||
|
||||
Box videoStorage = GStrorage.video;
|
||||
@ -73,6 +75,8 @@ class PlPlayerController {
|
||||
final Rx<bool> _doubleSpeedStatus = false.obs;
|
||||
final Rx<bool> _controlsLock = false.obs;
|
||||
final Rx<bool> _isFullScreen = false.obs;
|
||||
final Rx<bool> _subTitleOpen = false.obs;
|
||||
final Rx<int> _subTitleCode = (-1).obs;
|
||||
// 默认投稿视频格式
|
||||
static Rx<String> _videoType = 'archive'.obs;
|
||||
|
||||
@ -118,6 +122,7 @@ class PlPlayerController {
|
||||
PreferredSizeWidget? headerControl;
|
||||
PreferredSizeWidget? bottomControl;
|
||||
Widget? danmuWidget;
|
||||
late RxList subtitles;
|
||||
|
||||
/// 数据加载监听
|
||||
Stream<DataStatus> get onDataStatusChanged => dataStatus.status.stream;
|
||||
@ -147,6 +152,11 @@ class PlPlayerController {
|
||||
Rx<bool> get mute => _mute;
|
||||
Stream<bool> get onMuteChanged => _mute.stream;
|
||||
|
||||
/// 字幕开启状态
|
||||
Rx<bool> get subTitleOpen => _subTitleOpen;
|
||||
Rx<int> get subTitleCode => _subTitleCode;
|
||||
// Stream<bool> get onSubTitleOpenChanged => _subTitleOpen.stream;
|
||||
|
||||
/// [videoPlayerController] instace of Player
|
||||
Player? get videoPlayerController => _videoPlayerController;
|
||||
|
||||
@ -231,6 +241,10 @@ class PlPlayerController {
|
||||
// 播放顺序相关
|
||||
PlayRepeat playRepeat = PlayRepeat.pause;
|
||||
|
||||
RxList<SubTitileContentModel> subtitleContents =
|
||||
<SubTitileContentModel>[].obs;
|
||||
RxString subtitleContent = ''.obs;
|
||||
|
||||
void updateSliderPositionSecond() {
|
||||
int newSecond = _sliderPosition.value.inSeconds;
|
||||
if (sliderPositionSeconds.value != newSecond) {
|
||||
@ -350,6 +364,8 @@ class PlPlayerController {
|
||||
bool enableHeart = true,
|
||||
// 是否首次加载
|
||||
bool isFirstTime = true,
|
||||
// 是否开启字幕
|
||||
bool enableSubTitle = false,
|
||||
}) async {
|
||||
try {
|
||||
_autoPlay = autoplay;
|
||||
@ -364,7 +380,9 @@ class PlPlayerController {
|
||||
_cid = cid;
|
||||
_enableHeart = enableHeart;
|
||||
_isFirstTime = isFirstTime;
|
||||
|
||||
_subTitleOpen.value = enableSubTitle;
|
||||
subtitles = [].obs;
|
||||
subtitleContent.value = '';
|
||||
if (_videoPlayerController != null &&
|
||||
_videoPlayerController!.state.playing) {
|
||||
await pause(notify: false);
|
||||
@ -580,6 +598,8 @@ class PlPlayerController {
|
||||
_sliderPosition.value = event;
|
||||
updateSliderPositionSecond();
|
||||
}
|
||||
querySubtitleContent(
|
||||
videoPlayerController!.state.position.inSeconds.toDouble());
|
||||
|
||||
/// 触发回调事件
|
||||
for (var element in _positionListeners) {
|
||||
@ -614,6 +634,10 @@ class PlPlayerController {
|
||||
const Duration(seconds: 1),
|
||||
() => videoPlayerServiceHandler.onPositionChange(event));
|
||||
}),
|
||||
|
||||
// onSubTitleOpenChanged.listen((bool event) {
|
||||
// toggleSubtitle(event ? subTitleCode.value : -1);
|
||||
// })
|
||||
],
|
||||
);
|
||||
}
|
||||
@ -1045,12 +1069,61 @@ class PlPlayerController {
|
||||
}
|
||||
}
|
||||
|
||||
/// 字幕
|
||||
void toggleSubtitle(int code) {
|
||||
_subTitleOpen.value = code != -1;
|
||||
_subTitleCode.value = code;
|
||||
// if (code == -1) {
|
||||
// // 关闭字幕
|
||||
// _subTitleOpen.value = false;
|
||||
// _subTitleCode.value = code;
|
||||
// _videoPlayerController?.setSubtitleTrack(SubtitleTrack.no());
|
||||
// return;
|
||||
// }
|
||||
// final SubTitlteItemModel? subtitle = subtitles?.firstWhereOrNull(
|
||||
// (element) => element.code == code,
|
||||
// );
|
||||
// _subTitleOpen.value = true;
|
||||
// _subTitleCode.value = code;
|
||||
// _videoPlayerController?.setSubtitleTrack(
|
||||
// SubtitleTrack.data(
|
||||
// subtitle!.content!,
|
||||
// title: subtitle.title,
|
||||
// language: subtitle.lan,
|
||||
// ),
|
||||
// );
|
||||
}
|
||||
|
||||
void querySubtitleContent(double progress) {
|
||||
if (subTitleCode.value == -1) {
|
||||
subtitleContent.value = '';
|
||||
return;
|
||||
}
|
||||
if (subtitles.isEmpty) {
|
||||
return;
|
||||
}
|
||||
final SubTitlteItemModel? subtitle = subtitles.firstWhereOrNull(
|
||||
(element) => element.code == subTitleCode.value,
|
||||
);
|
||||
if (subtitle != null && subtitle.body!.isNotEmpty) {
|
||||
for (var content in subtitle.body!) {
|
||||
if (progress >= content['from']! && progress <= content['to']!) {
|
||||
subtitleContent.value = content['content']!;
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
setPlayRepeat(PlayRepeat type) {
|
||||
playRepeat = type;
|
||||
videoStorage.put(VideoBoxKey.playRepeat, type.value);
|
||||
}
|
||||
|
||||
Future<void> dispose({String type = 'single'}) async {
|
||||
print('dispose');
|
||||
print('dispose: ${playerCount.value}');
|
||||
|
||||
// 每次减1,最后销毁
|
||||
if (type == 'single' && playerCount.value > 1) {
|
||||
_playerCount.value -= 1;
|
||||
@ -1060,6 +1133,7 @@ class PlPlayerController {
|
||||
}
|
||||
_playerCount.value = 0;
|
||||
try {
|
||||
print('dispose dispose ---------');
|
||||
_timer?.cancel();
|
||||
_timerForVolume?.cancel();
|
||||
_timerForGettingVolume?.cancel();
|
||||
|
||||
Reference in New Issue
Block a user