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

Merge branch 'fix'

Browse Source
This commit is contained in:
guozhigq
2024-12-02 00:13:47 +08:00
parent 759bb8a635 a84efecb3a
commit 17f4c84740
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -554,6 +554,11 @@ class _VideoDetailPageState extends State<VideoDetailPage>
playerController: plPlayerController!, playerController: plPlayerController!,
), ),
bottomList: vdCtr.bottomList, bottomList: vdCtr.bottomList,
fullScreenCb: (bool status) {
if (vdCtr.videoDirection.value == 'vertical') {
videoHeight.value = status ? Get.size.height : verticalHeight;
}
},
showEposideCb: () => vdCtr.videoType == SearchType.video showEposideCb: () => vdCtr.videoType == SearchType.video
? videoIntroController.showEposideHandler() ? videoIntroController.showEposideHandler()
: bangumiIntroController.showEposideHandler(), : bangumiIntroController.showEposideHandler(),

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

@ -81,7 +81,7 @@ class PlPlayerController {
final Rx<bool> _subTitleOpen = false.obs; final Rx<bool> _subTitleOpen = false.obs;
final Rx<int> _subTitleCode = (-1).obs; final Rx<int> _subTitleCode = (-1).obs;
// 默认投稿视频格式 // 默认投稿视频格式
static Rx<String> _videoType = 'archive'.obs; static String _videoType = 'archive';
final Rx<String> _direction = 'horizontal'.obs; final Rx<String> _direction = 'horizontal'.obs;
@ -127,7 +127,6 @@ class PlPlayerController {
PreferredSizeWidget? bottomControl; PreferredSizeWidget? bottomControl;
Widget? danmuWidget; Widget? danmuWidget;
RxList subtitles = [].obs; RxList subtitles = [].obs;
String videoType = 'archive';
/// 数据加载监听 /// 数据加载监听
Stream<DataStatus> get onDataStatusChanged => dataStatus.status.stream; Stream<DataStatus> get onDataStatusChanged => dataStatus.status.stream;
@ -225,7 +224,7 @@ class PlPlayerController {
Rx<int> get playerCount => _playerCount; Rx<int> get playerCount => _playerCount;
/// ///
// Rx<String> get videoType => _videoType; String get videoType => _videoType;
/// 弹幕开关 /// 弹幕开关
Rx<bool> isOpenDanmu = false.obs; Rx<bool> isOpenDanmu = false.obs;
@ -279,7 +278,7 @@ class PlPlayerController {
} }
// 添加一个私有构造函数 // 添加一个私有构造函数
PlPlayerController._internal(this.videoType) { PlPlayerController._internal() {
isOpenDanmu.value = GlobalDataCache.isOpenDanmu; isOpenDanmu.value = GlobalDataCache.isOpenDanmu;
blockTypes = GlobalDataCache.blockTypes; blockTypes = GlobalDataCache.blockTypes;
showArea = GlobalDataCache.showArea; showArea = GlobalDataCache.showArea;
@ -306,11 +305,11 @@ class PlPlayerController {
String videoType = 'archive', String videoType = 'archive',
}) { }) {
// 如果实例尚未创建，则创建一个新实例 // 如果实例尚未创建，则创建一个新实例
_instance ??= PlPlayerController._internal(videoType); _instance ??= PlPlayerController._internal();
if (videoType != 'none') { if (videoType != 'none') {
_instance!._playerCount.value += 1; _instance!._playerCount.value += 1;
_videoType.value = videoType;
} }
_videoType = videoType;
return _instance!; return _instance!;
} }