Skip to content

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

fix fullscreen bug when player is not loaded and back button triggered

Prediditca97f2d59823
diff --git a/lib/pages/player/player_item.dart b/lib/pages/player/player_item.dart
index b6f37e50..f1d5fb59 100644
--- a/lib/pages/player/player_item.dart
+++ b/lib/pages/player/player_item.dart
@@ -33,6 +33,7 @@ import 'package:kazumi/pages/settings/danmaku/danmaku_settings_window.dart';
import 'package:kazumi/utils/constants.dart';
import 'package:kazumi/pages/player/episode_comments_sheet.dart';
import 'package:saver_gallery/saver_gallery.dart';
+import 'package:mobx/mobx.dart' as mobx;
import 'package:kazumi/bean/widget/collect_button.dart';
class PlayerItem extends StatefulWidget {
@@ -40,12 +41,14 @@ class PlayerItem extends StatefulWidget {
{super.key,
required this.openMenu,
required this.locateEpisode,
- required this.changeEpisode});
+ required this.changeEpisode,
+ required this.onBackPressed});
final VoidCallback openMenu;
final VoidCallback locateEpisode;
final Future<void> Function(int episode, {int currentRoad, int offset})
changeEpisode;
+ final void Function(BuildContext) onBackPressed;
@override
State<PlayerItem> createState() => _PlayerItemState();
@@ -116,6 +119,8 @@ class _PlayerItemState extends State<PlayerItem>
List<double> playSpeedList = defaultPlaySpeedList;
int episodeNum = 0;
+ late mobx.ReactionDisposer _fullscreenListener;
+
/// 处理 Android/iOS 应用后台或熄屏
@override
void didChangeAppLifecycleState(AppLifecycleState state) {
@@ -311,29 +316,19 @@ class _PlayerItemState extends State<PlayerItem>
try {
playerTimer!.cancel();
} catch (_) {}
- widget.changeEpisode(
- videoPageController.currentEpisode + 1,
+ widget.changeEpisode(videoPageController.currentEpisode + 1,
currentRoad: videoPageController.currentRoad);
}
});
}
- void onBackPressed(BuildContext context) async {
+ void _handleFullscreenChange(BuildContext context) async {
if (videoPageController.isFullscreen && !Utils.isTablet()) {
- widget.locateEpisode();
setState(() {
lockPanel = false;
});
- try {
- await Utils.exitFullScreen();
- videoPageController.isFullscreen = false;
- danmakuController.clear();
- return;
- } catch (e) {
- KazumiLogger().log(Level.error, '卸载播放器错误 ${e.toString()}');
- }
}
-
+ danmakuController.clear();
if (webDavEnable) {
try {
var webDav = WebDav();
@@ -343,24 +338,11 @@ class _PlayerItemState extends State<PlayerItem>
KazumiLogger().log(Level.error, '同步记录失败 ${e.toString()}');
}
}
- if (mounted) {
- if (videoPageController.isFullscreen == true) {
- Utils.exitFullScreen();
- videoPageController.isFullscreen = false;
- }
- Navigator.of(context).pop();
- }
- // Navigator.of(context).pop();
}
void _handleFullscreen() {
+ _handleFullscreenChange(context);
if (videoPageController.isFullscreen) {
- try {
- danmakuController.onClear();
- } catch (_) {}
- setState(() {
- lockPanel = false;
- });
Utils.exitFullScreen();
widget.locateEpisode();
} else {
@@ -677,6 +659,12 @@ class _PlayerItemState extends State<PlayerItem>
@override
void initState() {
super.initState();
+ _fullscreenListener = mobx.reaction<bool>(
+ (_) => videoPageController.isFullscreen,
+ (_) {
+ _handleFullscreenChange(context);
+ },
+ );
// workaround for #214
if (Platform.isIOS) {
FlutterVolumeController.setIOSAudioSessionCategory(
@@ -744,6 +732,7 @@ class _PlayerItemState extends State<PlayerItem>
// Don't dispose player here
// We need to reuse the player after episode is changed and player item is disposed
// We dispose player after video page disposed
+ _fullscreenListener();
WidgetsBinding.instance.removeObserver(this);
windowManager.removeListener(this);
playerTimer?.cancel();
@@ -757,16 +746,8 @@ class _PlayerItemState extends State<PlayerItem>
Widget build(BuildContext context) {
collectType = collectController.getCollectType(infoController.bangumiItem);
- return PopScope(
- canPop: false,
- onPopInvokedWithResult: (bool didPop, Object? result) {
- debugPrint("checkPoint: didPop: $didPop");
- if (didPop) {
- return;
- }
- onBackPressed(context);
- },
- child: Observer(builder: (context) {
+ return Observer(
+ builder: (context) {
return ClipRect(
child: Container(
color: Colors.black,
@@ -1328,7 +1309,7 @@ class _PlayerItemState extends State<PlayerItem>
color: Colors.white,
icon: const Icon(Icons.arrow_back),
onPressed: () {
- onBackPressed(context);
+ widget.onBackPressed(context);
},
),
(videoPageController.isFullscreen ||
@@ -1598,7 +1579,7 @@ class _PlayerItemState extends State<PlayerItem>
},
)
: Container(),
- forwardIcon(),
+ forwardIcon(),
Expanded(
child: ProgressBar(
timeLabelLocation: TimeLabelLocation.none,
@@ -1618,7 +1599,9 @@ class _PlayerItemState extends State<PlayerItem>
});
},
onDragUpdate: (details) => {
- playerController.currentPosition = details.timeStamp},
+ playerController.currentPosition =
+ details.timeStamp
+ },
onDragEnd: () {
playerController.play();
startHideTimer();
@@ -1710,7 +1693,7 @@ class _PlayerItemState extends State<PlayerItem>
)
// SizedBox(child: Text("${videoController.androidFullscreen}")),
;
- }),
+ },
);
}
@@ -1763,7 +1746,6 @@ class _PlayerItemState extends State<PlayerItem>
});
}
-
Widget forwardIcon() {
return Tooltip(
message: '长按修改时间',
diff --git a/lib/pages/video/video_page.dart b/lib/pages/video/video_page.dart
index 5bd17d12..8b376990 100644
--- a/lib/pages/video/video_page.dart
+++ b/lib/pages/video/video_page.dart
@@ -107,7 +107,8 @@ class _VideoPageState extends State<VideoPage>
webviewItemController.onVideoLoading.listen((event) {
videoPageController.loading = event;
});
- _videoURLSubscription = webviewItemController.onVideoURLParser.listen((event) {
+ _videoURLSubscription =
+ webviewItemController.onVideoURLParser.listen((event) {
final (mediaUrl, offset) = event;
playerController.init(mediaUrl, offset: offset);
});
@@ -197,104 +198,65 @@ class _VideoPageState extends State<VideoPage>
});
}
+ void onBackPressed(BuildContext context) async {
+ if (videoPageController.isFullscreen && !Utils.isTablet()) {
+ menuJumpToCurrentEpisode();
+ await Utils.exitFullScreen();
+ videoPageController.isFullscreen = false;
+ return;
+ }
+ if (videoPageController.isFullscreen) {
+ Utils.exitFullScreen();
+ videoPageController.isFullscreen = false;
+ }
+ Navigator.of(context).pop();
+ }
+
@override
Widget build(BuildContext context) {
WidgetsBinding.instance.addPostFrameCallback((_) {
openTabBodyAnimated();
});
- return OrientationBuilder(builder: (context, orientation) {
- if (!Utils.isDesktop()) {
- if (orientation == Orientation.landscape &&
- !videoPageController.isFullscreen) {
- videoPageController.enterFullScreen();
- } else if (orientation == Orientation.portrait &&
- videoPageController.isFullscreen) {
- videoPageController.exitFullScreen();
- menuJumpToCurrentEpisode();
+ return PopScope(
+ canPop: false,
+ onPopInvokedWithResult: (bool didPop, Object? result) {
+ debugPrint("checkPoint: didPop: $didPop");
+ if (didPop) {
+ return;
}
- }
- return Observer(builder: (context) {
- return Scaffold(
- appBar: ((videoPageController.currentPlugin.useNativePlayer ||
- videoPageController.isFullscreen)
- ? null
- : SysAppBar(
- title: Text(videoPageController.title),
- )),
- body: SafeArea(
- top: !videoPageController.isFullscreen,
- bottom: false, // set iOS and Android navigation bar to immersive
- left: !videoPageController.isFullscreen,
- right: !videoPageController.isFullscreen,
- child: (Utils.isDesktop()) ||
- ((Utils.isTablet()) &&
- MediaQuery.of(context).size.height <
- MediaQuery.of(context).size.width)
- ? Stack(
- alignment: Alignment.centerRight,
- children: [
- Container(
- color: Colors.black,
- height: MediaQuery.of(context).size.height,
- width: MediaQuery.of(context).size.width,
- child: playerBody),
- if (videoPageController.showTabBody) ...[
- GestureDetector(
- onTap: () {
- closeTabBodyAnimated();
- },
- child: Container(
- color: Colors.black38,
- width: double.infinity,
- height: double.infinity,
- ),
- ),
- SlideTransition(
- position: _rightOffsetAnimation,
- child: SizedBox(
- height: MediaQuery.of(context).size.height,
- width: MediaQuery.of(context).size.width *
- 1 /
- 3 >
- 420
- ? 420
- : MediaQuery.of(context).size.width * 1 / 3,
- child: Container(
- color: Theme.of(context).canvasColor,
- child: GridViewObserver(
- controller: observerController,
- child: Column(
- children: [
- tabBar,
- tabBody,
- ],
- ),
- ))))
- ]
- ],
- )
- : (!videoPageController.isFullscreen)
- ? Column(
- children: [
- Container(
- color: Colors.black,
- height:
- MediaQuery.of(context).size.width * 9 / 16,
- width: MediaQuery.of(context).size.width,
- child: playerBody),
- Expanded(
- child: GridViewObserver(
- controller: observerController,
- child: Column(
- children: [
- tabBar,
- tabBody,
- ],
- ),
- ))
- ],
- )
- : Stack(alignment: Alignment.centerRight, children: [
+ onBackPressed(context);
+ },
+ child: OrientationBuilder(builder: (context, orientation) {
+ if (!Utils.isDesktop()) {
+ if (orientation == Orientation.landscape &&
+ !videoPageController.isFullscreen) {
+ videoPageController.enterFullScreen();
+ } else if (orientation == Orientation.portrait &&
+ videoPageController.isFullscreen) {
+ videoPageController.exitFullScreen();
+ menuJumpToCurrentEpisode();
+ }
+ }
+ return Observer(builder: (context) {
+ return Scaffold(
+ appBar: ((videoPageController.currentPlugin.useNativePlayer ||
+ videoPageController.isFullscreen)
+ ? null
+ : SysAppBar(
+ title: Text(videoPageController.title),
+ )),
+ body: SafeArea(
+ top: !videoPageController.isFullscreen,
+ bottom: false, // set iOS and Android navigation bar to immersive
+ left: !videoPageController.isFullscreen,
+ right: !videoPageController.isFullscreen,
+ child: (Utils.isDesktop()) ||
+ ((Utils.isTablet()) &&
+ MediaQuery.of(context).size.height <
+ MediaQuery.of(context).size.width)
+ ? Stack(
+ alignment: Alignment.centerRight,
+ children: [
Container(
color: Colors.black,
height: MediaQuery.of(context).size.height,
@@ -315,9 +277,14 @@ class _VideoPageState extends State<VideoPage>
position: _rightOffsetAnimation,
child: SizedBox(
height: MediaQuery.of(context).size.height,
- width: (Utils.isTablet())
- ? MediaQuery.of(context).size.width / 2
- : MediaQuery.of(context).size.height,
+ width: MediaQuery.of(context).size.width *
+ 1 /
+ 3 >
+ 420
+ ? 420
+ : MediaQuery.of(context).size.width *
+ 1 /
+ 3,
child: Container(
color: Theme.of(context).canvasColor,
child: GridViewObserver(
@@ -330,11 +297,71 @@ class _VideoPageState extends State<VideoPage>
),
))))
]
- ]),
- ),
- );
- });
- });
+ ],
+ )
+ : (!videoPageController.isFullscreen)
+ ? Column(
+ children: [
+ Container(
+ color: Colors.black,
+ height:
+ MediaQuery.of(context).size.width * 9 / 16,
+ width: MediaQuery.of(context).size.width,
+ child: playerBody),
+ Expanded(
+ child: GridViewObserver(
+ controller: observerController,
+ child: Column(
+ children: [
+ tabBar,
+ tabBody,
+ ],
+ ),
+ ))
+ ],
+ )
+ : Stack(alignment: Alignment.centerRight, children: [
+ Container(
+ color: Colors.black,
+ height: MediaQuery.of(context).size.height,
+ width: MediaQuery.of(context).size.width,
+ child: playerBody),
+ if (videoPageController.showTabBody) ...[
+ GestureDetector(
+ onTap: () {
+ closeTabBodyAnimated();
+ },
+ child: Container(
+ color: Colors.black38,
+ width: double.infinity,
+ height: double.infinity,
+ ),
+ ),
+ SlideTransition(
+ position: _rightOffsetAnimation,
+ child: SizedBox(
+ height: MediaQuery.of(context).size.height,
+ width: (Utils.isTablet())
+ ? MediaQuery.of(context).size.width / 2
+ : MediaQuery.of(context).size.height,
+ child: Container(
+ color: Theme.of(context).canvasColor,
+ child: GridViewObserver(
+ controller: observerController,
+ child: Column(
+ children: [
+ tabBar,
+ tabBody,
+ ],
+ ),
+ ))))
+ ]
+ ]),
+ ),
+ );
+ });
+ }),
+ );
}
Widget get playerBody {
@@ -499,6 +526,7 @@ class _VideoPageState extends State<VideoPage>
openMenu: openTabBodyAnimated,
locateEpisode: menuJumpToCurrentEpisode,
changeEpisode: changeEpisode,
+ onBackPressed: onBackPressed,
),
),