fix #1712

fix #1641 Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>
2026-06-23 10:40:08 +08:00 · 2025-10-26 20:10:40 +08:00
parent e9dc154642
commit 032dfd69be
14 changed files with 64 additions and 115 deletions
--- a/lib/pages/video/controller.dart
+++ b/lib/pages/video/controller.dart
@@ -98,7 +98,7 @@ class VideoDetailController extends GetxController
  final Rx<LoadingState> videoState = LoadingState.loading().obs;

  /// 播放器配置 画质 音质 解码格式
-  late Rx<VideoQuality> currentVideoQa;
+  final Rxn<VideoQuality> currentVideoQa = Rxn<VideoQuality>();
  AudioQuality? currentAudioQa;
  late VideoDecodeFormatType currentDecodeFormats;

@@ -239,15 +239,7 @@ class VideoDetailController extends GetxController
    }
  }

-  bool imageStatus = false;
-
-  void onViewImage() {
-    imageStatus = true;
-  }
-
-  void onDismissed(int _) {
-    imageStatus = false;
-  }
+  bool imageview = false;

  final isLoginVideo = Accounts.get(AccountType.video).isLogin;

@@ -993,7 +985,7 @@ class VideoDetailController extends GetxController
      SmartDialog.showToast('UP主已关闭弹幕');
      return;
    }
-    final isPlaying = plPlayerController.playerStatus.playing;
+    final isPlaying = autoPlay.value && plPlayerController.playerStatus.playing;
    if (isPlaying) {
      await plPlayerController.pause();
    }
@@ -1063,6 +1055,8 @@ class VideoDetailController extends GetxController

  /// 更新画质、音质
  void updatePlayer() {
+    final currentVideoQa = this.currentVideoQa.value;
+    if (currentVideoQa == null) return;
    autoPlay.value = true;
    playedTime = plPlayerController.position.value;
    plPlayerController
@@ -1070,7 +1064,7 @@ class VideoDetailController extends GetxController
      ..isBuffering.value = false
      ..buffered.value = Duration.zero;

-    final video = findVideoByQa(currentVideoQa.value.code);
+    final video = findVideoByQa(currentVideoQa.code);
    if (firstVideo.codecs != video.codecs) {
      currentDecodeFormats = VideoDecodeFormatType.fromString(video.codecs!);
    }
@@ -1089,6 +1083,15 @@ class VideoDetailController extends GetxController
    playerInit();
  }

+  FutureOr<void> _initPlayerIfNeeded() {
+    if ((autoPlay.value ||
+            (plPlayerController.preInitPlayer &&
+                !plPlayerController.processing)) &&
+        childKey.currentState?.mounted == true) {
+      return playerInit();
+    }
+  }
+
  Future<void> playerInit({
    String? video,
    String? audio,
@@ -1248,10 +1251,8 @@ class VideoDetailController extends GetxController
        );
        setVideoHeight();
        currentDecodeFormats = VideoDecodeFormatType.fromString('avc1');
-        currentVideoQa = Rx(VideoQuality.fromCode(data.quality!));
-        if (autoPlay.value || plPlayerController.preInitPlayer) {
-          await playerInit();
-        }
+        currentVideoQa.value = VideoQuality.fromCode(data.quality!);
+        await _initPlayerIfNeeded();
        isQuerying = false;
        return;
      }
@@ -1282,7 +1283,7 @@ class VideoDetailController extends GetxController
          numbers,
        );
      }
-      currentVideoQa = Rx(VideoQuality.fromCode(resVideoQa));
+      currentVideoQa.value = VideoQuality.fromCode(resVideoQa);

      /// 取出符合当前画质的videoList
      final List<VideoItem> videosList = allVideosList
@@ -1354,9 +1355,7 @@ class VideoDetailController extends GetxController
        firstAudio = AudioItem();
        audioUrl = '';
      }
-      if (autoPlay.value || plPlayerController.preInitPlayer) {
-        await playerInit();
-      }
+      await _initPlayerIfNeeded();
    } else {
      autoPlay.value = false;
      videoState.value = result..toast();
--- a/lib/pages/video/introduction/pgc/view.dart
+++ b/lib/pages/video/introduction/pgc/view.dart
@@ -145,10 +145,8 @@ class _PgcIntroPageState extends State<PgcIntroPage> {
      children: [
        GestureDetector(
          onTap: () {
-            videoDetailCtr.onViewImage();
            PageUtils.imageView(
              imgList: [SourceModel(url: item.cover!)],
-              onDismissed: videoDetailCtr.onDismissed,
            );
          },
          child: Hero(
--- a/lib/pages/video/member/view.dart
+++ b/lib/pages/video/member/view.dart
@@ -398,10 +398,8 @@ class _HorizontalMemberPageState extends State<HorizontalMemberPage> {

  Widget _buildAvatar(String face) => GestureDetector(
    onTap: () {
-      widget.videoDetailController.onViewImage();
      PageUtils.imageView(
        imgList: [SourceModel(url: face)],
-        onDismissed: widget.videoDetailController.onDismissed,
      );
    },
    child: NetworkImgLayer(
--- a/lib/pages/video/reply/view.dart
+++ b/lib/pages/video/reply/view.dart
@@ -20,15 +20,11 @@ class VideoReplyPanel extends StatefulWidget {
    super.key,
    this.replyLevel = 1,
    required this.heroTag,
-    this.onViewImage,
-    this.onDismissed,
    required this.isNested,
  });

  final int replyLevel;
  final String heroTag;
-  final VoidCallback? onViewImage;
-  final ValueChanged<int>? onDismissed;
  final bool isNested;

  @override
@@ -216,8 +212,6 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
                          _videoReplyController.onRemove(index, item, subIndex),
                      upMid: _videoReplyController.upMid,
                      getTag: () => heroTag,
-                      onViewImage: widget.onViewImage,
-                      onDismissed: widget.onDismissed,
                      onCheckReply: (item) => _videoReplyController
                          .onCheckReply(item, isManual: true),
                      onToggleTop: (item) => _videoReplyController.onToggleTop(
@@ -258,8 +252,6 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
          firstFloor: replyItem,
          replyType: _videoReplyController.videoType.replyType,
          isVideoDetail: true,
-          onViewImage: widget.onViewImage,
-          onDismissed: widget.onDismissed,
          isNested: widget.isNested,
        ),
      );
--- a/lib/pages/video/reply/widgets/reply_item_grpc.dart
+++ b/lib/pages/video/reply/widgets/reply_item_grpc.dart
@@ -50,7 +50,6 @@ class ReplyItemGrpc extends StatelessWidget {
    this.showDialogue,
    this.getTag,
    this.onViewImage,
-    this.onDismissed,
    this.onCheckReply,
    this.onToggleTop,
    this.jumpToDialogue,
@@ -65,7 +64,6 @@ class ReplyItemGrpc extends StatelessWidget {
  final VoidCallback? showDialogue;
  final Function? getTag;
  final VoidCallback? onViewImage;
-  final ValueChanged<int>? onDismissed;
  final ValueChanged<ReplyInfo>? onCheckReply;
  final ValueChanged<ReplyInfo>? onToggleTop;
  final VoidCallback? jumpToDialogue;
@@ -317,7 +315,6 @@ class ReplyItemGrpc extends StatelessWidget {
                    )
                    .toList(),
                onViewImage: onViewImage,
-                onDismissed: onDismissed,
              ),
            ),
          ),
--- a/lib/pages/video/reply_reply/view.dart
+++ b/lib/pages/video/reply_reply/view.dart
@@ -29,8 +29,6 @@ class VideoReplyReplyPanel extends CommonSlidePage {
    this.firstFloor,
    required this.isVideoDetail,
    required this.replyType,
-    this.onViewImage,
-    this.onDismissed,
    this.isNested = false,
  });
  final int? id;
@@ -40,8 +38,6 @@ class VideoReplyReplyPanel extends CommonSlidePage {
  final ReplyInfo? firstFloor;
  final bool isVideoDetail;
  final int replyType;
-  final VoidCallback? onViewImage;
-  final ValueChanged<int>? onDismissed;
  final bool isNested;

  @override
@@ -231,8 +227,6 @@ class _VideoReplyReplyPanelState extends State<VideoReplyReplyPanel>
              index: -1,
            ),
            upMid: _controller.upMid,
-            onViewImage: widget.onViewImage,
-            onDismissed: widget.onDismissed,
            onCheckReply: (item) =>
                _controller.onCheckReply(item, isManual: true),
          ),
@@ -390,8 +384,6 @@ class _VideoReplyReplyPanelState extends State<VideoReplyReplyPanel>
          SmartDialog.showToast('评论可能已被删除');
        }
      },
-      onViewImage: widget.onViewImage,
-      onDismissed: widget.onDismissed,
      onCheckReply: (item) => _controller.onCheckReply(item, isManual: true),
    );
  }
--- a/lib/pages/video/view.dart
+++ b/lib/pages/video/view.dart
@@ -6,6 +6,7 @@ import 'dart:ui';
 import 'package:PiliPlus/common/constants.dart';
 import 'package:PiliPlus/common/widgets/custom_icon.dart';
 import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
+import 'package:PiliPlus/common/widgets/interactiveviewer_gallery/hero_dialog_route.dart';
 import 'package:PiliPlus/common/widgets/keep_alive_wrapper.dart';
 import 'package:PiliPlus/common/widgets/scroll_physics.dart';
 import 'package:PiliPlus/http/loading_state.dart';
@@ -364,7 +365,8 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
  @override
  // 离开当前页面时
  Future<void> didPushNext() async {
-    if (videoDetailController.imageStatus) {
+    if (Get.routing.route is HeroDialogRoute) {
+      videoDetailController.imageview = true;
      return;
    }

@@ -395,7 +397,8 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
  @override
  // 返回当前页面时
  Future<void> didPopNext() async {
-    if (videoDetailController.imageStatus) {
+    if (videoDetailController.imageview) {
+      videoDetailController.imageview = false;
      return;
    }

@@ -519,7 +522,7 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
      ..addListener(animListener);
    if (Utils.isMobile && mounted && isShowing && !isFullScreen) {
      if (isPortrait) {
-        if (!videoDetailController.imageStatus) {
+        if (!videoDetailController.imageview) {
          showStatusBar();
        }
      } else if (!videoDetailController.horizontalScreen) {
@@ -1944,8 +1947,6 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
    key: videoReplyPanelKey,
    isNested: isNested,
    heroTag: heroTag,
-    onViewImage: videoDetailController.onViewImage,
-    onDismissed: videoDetailController.onDismissed,
  );

  // ai总结
--- a/lib/pages/video/widgets/header_control.dart
+++ b/lib/pages/video/widgets/header_control.dart
@@ -493,7 +493,7 @@ class HeaderControlState extends State<HeaderControl> {
                  leading: const Icon(Icons.play_circle_outline, size: 20),
                  title: const Text('选择画质', style: titleStyle),
                  subtitle: Text(
-                    '当前画质 ${videoDetailCtr.currentVideoQa.value.desc}',
+                    '当前画质 ${videoDetailCtr.currentVideoQa.value?.desc}',
                    style: subTitleStyle,
                  ),
                ),
@@ -759,7 +759,8 @@ class HeaderControlState extends State<HeaderControl> {
      return;
    }
    final List<FormatItem> videoFormat = videoInfo.supportFormats!;
-    final VideoQuality currentVideoQa = videoDetailCtr.currentVideoQa.value;
+    final VideoQuality? currentVideoQa = videoDetailCtr.currentVideoQa.value;
+    if (currentVideoQa == null) return;

    /// 总质量分类
    final int totalQaSam = videoFormat.length;