HCha/PiliPlus
1
0
Fork 0
mirror of https://github.com/HChaZZY/PiliPlus.git synced 2025-12-06 09:13:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: headerControl缺少heroTag（改为直接传入）

Browse Source
This commit is contained in:
orz12
2024-06-01 11:29:03 +08:00
parent e460579bbc
commit 45056792aa
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/pages/video/detail/controller.dart
View File

@@ -134,6 +134,7 @@ class VideoDetailController extends GetxController
controller: plPlayerController, controller: plPlayerController,
videoDetailCtr: this, videoDetailCtr: this,
floating: floating, floating: floating,
heroTag: heroTag,
); );
// CDN优化 // CDN优化
enableCDN = setting.get(SettingBoxKey.enableCDN, defaultValue: true); enableCDN = setting.get(SettingBoxKey.enableCDN, defaultValue: true);

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

@@ -72,7 +72,9 @@ class _VideoDetailPageState extends State<VideoDetailPage>
@override @override
void initState() { void initState() {
super.initState(); super.initState();
heroTag = Get.arguments['heroTag']; if (Get.arguments != null && Get.arguments['heroTag'] != null) {
heroTag = Get.arguments['heroTag'];
}
videoDetailController = Get.put(VideoDetailController(), tag: heroTag); videoDetailController = Get.put(VideoDetailController(), tag: heroTag);
videoIntroController = Get.put(VideoIntroController(), tag: heroTag); videoIntroController = Get.put(VideoIntroController(), tag: heroTag);
videoIntroController.videoDetail.listen((value) { videoIntroController.videoDetail.listen((value) {
@@ -247,6 +249,9 @@ class _VideoDetailPageState extends State<VideoDetailPage>
void dispose() { void dispose() {
videoDetailController.floating?.dispose(); videoDetailController.floating?.dispose();
floating.dispose(); floating.dispose();
videoIntroController.videoDetail.close();
bangumiIntroController.bangumiDetail.close();
videoDetailController.cid.close();
if (!horizontalScreen) { if (!horizontalScreen) {
AutoOrientation.portraitUpMode(); AutoOrientation.portraitUpMode();
} }
@@ -1124,6 +1129,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
headerControl: HeaderControl( headerControl: HeaderControl(
controller: plPlayerController, controller: plPlayerController,
videoDetailCtr: videoDetailController, videoDetailCtr: videoDetailController,
heroTag: heroTag,
), ),
danmuWidget: pipNoDanmaku danmuWidget: pipNoDanmaku
? null ? null

9
lib/pages/video/detail/widgets/header_control.dart
View File

@@ -28,11 +28,13 @@ class HeaderControl extends StatefulWidget implements PreferredSizeWidget {
this.controller, this.controller,
this.videoDetailCtr, this.videoDetailCtr,
this.floating, this.floating,
required this.heroTag,
super.key, super.key,
}); });
final PlPlayerController? controller; final PlPlayerController? controller;
final VideoDetailController? videoDetailCtr; final VideoDetailController? videoDetailCtr;
final Floating? floating; final Floating? floating;
final String heroTag;
@override @override
State<HeaderControl> createState() => _HeaderControlState(); State<HeaderControl> createState() => _HeaderControlState();
@@ -64,9 +66,10 @@ class _HeaderControlState extends State<HeaderControl> {
super.initState(); super.initState();
videoInfo = widget.videoDetailCtr!.data; videoInfo = widget.videoDetailCtr!.data;
listenFullScreenStatus(); listenFullScreenStatus();
if (Get.arguments != null) { heroTag = widget.heroTag;
heroTag = Get.arguments['heroTag']; // if (Get.arguments != null && Get.arguments['heroTag'] != null) {
} // heroTag = Get.arguments['heroTag'];
// }
videoIntroController = Get.put(VideoIntroController(), tag: heroTag); videoIntroController = Get.put(VideoIntroController(), tag: heroTag);
horizontalScreen = horizontalScreen =
setting.get(SettingBoxKey.horizontalScreen, defaultValue: false); setting.get(SettingBoxKey.horizontalScreen, defaultValue: false);