Skip to content

基于自定义规则的番剧采集APP,支持流媒体在线观看,支持弹幕,支持实时超分辨率。

macOS and tablet player improvement

ErBW_sbcdce27e79ff
diff --git a/lib/pages/player/player_item.dart b/lib/pages/player/player_item.dart
index b89c9511..2f34c0ed 100644
--- a/lib/pages/player/player_item.dart
+++ b/lib/pages/player/player_item.dart
@@ -311,7 +311,7 @@ class _PlayerItemState extends State<PlayerItem>
}
void onBackPressed(BuildContext context) async {
- if (videoPageController.androidFullscreen) {
+ if (videoPageController.androidFullscreen && !Utils.isTablet()) {
widget.locateEpisode();
setState(() {
lockPanel = false;
@@ -337,6 +337,8 @@ class _PlayerItemState extends State<PlayerItem>
}
if (mounted) {
Navigator.of(context).pop();
+ Utils.exitFullScreen();
+ videoPageController.androidFullscreen = false;
}
// Navigator.of(context).pop();
}
@@ -804,7 +806,7 @@ class _PlayerItemState extends State<PlayerItem>
}
// Esc键被按下
if (event.logicalKey == LogicalKeyboardKey.escape) {
- if (videoPageController.androidFullscreen) {
+ if (videoPageController.androidFullscreen && !Utils.isTablet()) {
try {
danmakuController.onClear();
} catch (_) {}
@@ -1179,7 +1181,7 @@ class _PlayerItemState extends State<PlayerItem>
onBackPressed(context);
},
),
- (videoPageController.androidFullscreen)
+ (videoPageController.androidFullscreen || Utils.isDesktop())
? Text(
' ${videoPageController.title} [${videoPageController.roadList[videoPageController.currentRoad].identifier[videoPageController.currentEspisode - 1]}]',
style: TextStyle(
@@ -1447,7 +1449,9 @@ class _PlayerItemState extends State<PlayerItem>
widget.openMenu();
},
),
- IconButton(
+ (Utils.isTablet() && videoPageController.androidFullscreen)
+ ? Container()
+ : IconButton(
color: Colors.white,
icon: Icon(
videoPageController.androidFullscreen
diff --git a/lib/pages/settings/player_settings.dart b/lib/pages/settings/player_settings.dart
index 4859d9d7..e9ee022a 100644
--- a/lib/pages/settings/player_settings.dart
+++ b/lib/pages/settings/player_settings.dart
@@ -59,7 +59,7 @@ class _PlayerSettingsPageState extends State<PlayerSettingsPage> {
if (hAenable) {
if (lowMemoryMode) {
fvp.registerWith(options: {
- 'platforms': ['windows', 'linux'],
+ 'platforms': ['windows', 'linux', 'macos'],
'player': {
'avio.reconnect': '1',
'avio.reconnect_delay_max': '7',
@@ -68,7 +68,7 @@ class _PlayerSettingsPageState extends State<PlayerSettingsPage> {
});
} else {
fvp.registerWith(options: {
- 'platforms': ['windows', 'linux'],
+ 'platforms': ['windows', 'linux', 'macos'],
'player': {
'avio.reconnect': '1',
'avio.reconnect_delay_max': '7',
@@ -150,7 +150,7 @@ class _PlayerSettingsPageState extends State<PlayerSettingsPage> {
content: StatefulBuilder(builder:
(BuildContext context, StateSetter setState) {
final List<double> playSpeedList;
- if ((Platform.isMacOS || Platform.isIOS) &&
+ if (Platform.isIOS &&
setting.get(SettingBoxKey.hAenable,
defaultValue: true)) {
playSpeedList = defaultPlaySpeedList;
diff --git a/lib/pages/video/video_page.dart b/lib/pages/video/video_page.dart
index d3cdbc4a..ef6d0b6e 100644
--- a/lib/pages/video/video_page.dart
+++ b/lib/pages/video/video_page.dart
@@ -127,7 +127,7 @@ class _VideoPageState extends State<VideoPage>
openTabBodyAnimated();
});
return OrientationBuilder(builder: (context, orientation) {
- if (!Utils.isTablet() && !Utils.isDesktop()) {
+ if (!Utils.isDesktop()) {
if (orientation == Orientation.landscape &&
!videoPageController.androidFullscreen) {
Utils.enterFullScreen(lockOrientation: false);
@@ -350,13 +350,13 @@ class _VideoPageState extends State<VideoPage>
color: Colors.white),
onPressed: () {
if (videoPageController.androidFullscreen ==
- true) {
+ true && !Utils.isTablet()) {
Utils.exitFullScreen();
menuJumpToCurrentEpisode();
- videoPageController.androidFullscreen =
- false;
return;
}
+ Utils.exitFullScreen();
+ videoPageController.androidFullscreen = false;
Navigator.of(context).pop();
},
),
@@ -536,8 +536,11 @@ class _VideoPageState extends State<VideoPage>
),
const SizedBox(width: 6)
],
- Text(
+ Expanded(
+ child: Text(
road.identifier[count0 - 1],
+ maxLines: 2,
+ overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 13,
color: (count0 ==
@@ -547,7 +550,7 @@ class _VideoPageState extends State<VideoPage>
videoPageController.currentRoad)
? Theme.of(context).colorScheme.primary
: Theme.of(context).colorScheme.onSurface),
- ),
+ )),
const SizedBox(width: 2),
],
),