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: video toolbar

Browse Source 
Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>
This commit is contained in:
bggRGjQaUbCoE
2025-02-26 20:23:26 +08:00
parent 94f05127b6
commit fb11208bbe
2 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -129,6 +129,7 @@ class VideoDetailController extends GetxController
late final scrollKey = GlobalKey<ExtendedNestedScrollViewState>();
late final RxString direction = 'horizontal'.obs;
late final RxDouble scrollRatio = 0.0.obs;
bool imageStatus = false;
@@ -2027,6 +2028,10 @@ class VideoDetailController extends GetxController
videoUrl = null;
audioUrl = null;
if (Get.currentRoute.startsWith('/videoV') && scrollRatio.value != 0) {
scrollRatio.refresh();
}
// danmaku
dmTrend = null;
savedDanmaku = null;

38
lib/pages/video/detail/view_v.dart
View File

@@ -565,7 +565,6 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
..addListener(scrollListener);
late final double defVideoHeight = MediaQuery.sizeOf(context).width * 9 / 16;
late double videoHeight = MediaQuery.sizeOf(context).width * 9 / 16;
late RxDouble scrollRatio = 0.0.obs;
late bool isExpanding = false;
void animListener() {
@@ -577,19 +576,19 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
void scrollListener() {
if (scrollController.hasClients) {
if (scrollController.offset == 0) {
scrollRatio.value = 0;
videoDetailController.scrollRatio.value = 0;
} else {
double offset =
scrollController.offset - (videoHeight - defVideoHeight);
if (offset > 0) {
scrollRatio.value = clampDouble(
videoDetailController.scrollRatio.value = clampDouble(
offset.toPrecision(2) /
(defVideoHeight - kToolbarHeight).toPrecision(2),
0.0,
1.0,
);
} else {
scrollRatio.value = 0;
videoDetailController.scrollRatio.value = 0;
}
}
}
@@ -638,13 +637,14 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
backgroundColor: Colors.black,
toolbarHeight: 0,
),
if (scrollRatio.value != 0 &&
if (videoDetailController.scrollRatio.value != 0 &&
scrollController.offset != 0)
AppBar(
backgroundColor: Theme.of(context)
.colorScheme
.surface
.withOpacity(scrollRatio.value),
.withOpacity(
videoDetailController.scrollRatio.value),
toolbarHeight: 0,
),
],
@@ -748,7 +748,8 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
Obx(
() {
Widget toolbar() => Opacity(
opacity: scrollRatio.value,
opacity:
videoDetailController.scrollRatio.value,
child: Container(
color:
Theme.of(context).colorScheme.surface,
@@ -810,7 +811,7 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
.primary,
),
Text(
'${plPlayerController == null ? '立即' : plPlayerController!.playerStatus.status.value == PlayerStatus.completed ? '重新' : '继续'}播放',
'${videoDetailController.playedTime == null ? '立即' : plPlayerController!.playerStatus.status.value == PlayerStatus.completed ? '重新' : '继续'}播放',
style: TextStyle(
color: Theme.of(context)
.colorScheme
@@ -825,14 +826,31 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
),
),
);
return scrollRatio.value == 0 ||
return videoDetailController.scrollRatio.value ==
0 ||
scrollController.offset == 0
? const SizedBox.shrink()
: Positioned.fill(
bottom: -2,
child: GestureDetector(
onTap: () async {
scrollRatio.value = 0;
if (videoDetailController
.isQuerying) {
debugPrint('handlePlay: querying');
return;
}
if (videoDetailController.videoUrl ==
null ||
videoDetailController.audioUrl ==
null) {
debugPrint(
'handlePlay: videoUrl/audioUrl not initialized');
videoDetailController
.queryVideoUrl();
return;
}
videoDetailController
.scrollRatio.value = 0;
if (plPlayerController == null) {
handlePlay();
} else {