Merge branch 'main' into fix

2024-11-20 09:32:53 +08:00
parent f44b5793c2 3fda360739
commit 94fa0a1e6e
30 changed files with 181 additions and 108 deletions
--- a/lib/pages/video/detail/controller.dart
+++ b/lib/pages/video/detail/controller.dart
@ -14,6 +14,7 @@ import 'package:pilipala/models/common/reply_type.dart';
 import 'package:pilipala/models/common/search_type.dart';
 import 'package:pilipala/models/sponsor_block/segment.dart';
 import 'package:pilipala/models/sponsor_block/segment_type.dart';
+import 'package:pilipala/models/user/info.dart';
 import 'package:pilipala/models/video/later.dart';
 import 'package:pilipala/models/video/play/quality.dart';
 import 'package:pilipala/models/video/play/url.dart';
@ -94,7 +95,7 @@ class VideoDetailController extends GetxController
  double? brightness;
  // 默认记录历史记录
  bool enableHeart = true;
-  var userInfo;
+  UserInfoData? userInfo;
  late bool isFirstTime = true;
  Floating? floating;
  late PreferredSizeWidget headerControl;
@ -125,6 +126,8 @@ class VideoDetailController extends GetxController
  RxInt watchLaterCount = 0.obs;
  List<SegmentDataModel> skipSegments = <SegmentDataModel>[];
  int? lastPosition;
+  // 默认屏幕方向
+  RxString videoDirection = 'horizontal'.obs;

  @override
  void onInit() {
@ -283,6 +286,10 @@ class VideoDetailController extends GetxController
    } else {
      ScreenBrightness().resetScreenBrightness();
    }
+    videoDirection.value = (firstVideo.width != null &&
+            firstVideo.height != null)
+        ? (firstVideo.width! > firstVideo.height! ? 'horizontal' : 'vertical')
+        : 'horizontal';
    await plPlayerController.setDataSource(
      DataSource(
        videoSource: video ?? videoUrl,
@ -299,11 +306,7 @@ class VideoDetailController extends GetxController
      seekTo: seekToTime ?? defaultST,
      duration: duration ?? Duration(milliseconds: data.timeLength ?? 0),
      // 宽>高 水平 否则 垂直
-      direction: firstVideo.width != null && firstVideo.height != null
-          ? ((firstVideo.width! - firstVideo.height!) > 0
-              ? 'horizontal'
-              : 'vertical')
-          : null,
+      direction: videoDirection.value,
      bvid: bvid,
      cid: cid.value,
      enableHeart: enableHeart,
@ -615,7 +618,7 @@ class VideoDetailController extends GetxController
    var count = argMap['count'];
    var res = await UserHttp.getMediaList(
      type: 2,
-      bizId: userInfo.mid,
+      bizId: userInfo!.mid!,
      ps: count,
    );
    if (res['status']) {
--- a/lib/pages/video/detail/introduction/controller.dart
+++ b/lib/pages/video/detail/introduction/controller.dart
@ -9,6 +9,7 @@ import 'package:pilipala/http/constants.dart';
 import 'package:pilipala/http/user.dart';
 import 'package:pilipala/http/video.dart';
 import 'package:pilipala/models/user/fav_folder.dart';
+import 'package:pilipala/models/user/info.dart';
 import 'package:pilipala/models/video/ai.dart';
 import 'package:pilipala/models/video/tags.dart';
 import 'package:pilipala/models/video_detail_res.dart';
@ -49,10 +50,8 @@ class VideoIntroController extends GetxController {
  List delMediaIdsNew = [];
  // 关注状态 默认未关注
  RxMap followStatus = {}.obs;
-  int _tempThemeValue = -1;
-
  RxInt lastPlayCid = 0.obs;
-  var userInfo;
+  UserInfoData? userInfo;
  RxList<VideoTagItem> videoTags = <VideoTagItem>[].obs;

  // 同时观看
@ -301,7 +300,7 @@ class VideoIntroController extends GetxController {

  Future queryVideoInFolder() async {
    var result = await VideoHttp.videoInFolder(
-        mid: userInfo.mid, rid: IdUtils.bv2av(bvid));
+        mid: userInfo!.mid!, rid: IdUtils.bv2av(bvid));
    if (result['status']) {
      favFolderData.value = result['data'];
    }
--- a/lib/pages/video/detail/view.dart
+++ b/lib/pages/video/detail/view.dart
@ -123,14 +123,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
  // 流
  appbarStreamListen() {
    appbarStream = StreamController<double>.broadcast();
-    _extendNestCtr.addListener(
-      () {
-        final double offset = _extendNestCtr.position.pixels;
-        vdCtr.sheetHeight.value =
-            Get.size.height - videoHeight - statusBarHeight + offset;
-        appbarStream.add(offset);
-      },
-    );
+    _extendNestCtr.addListener(_extendNestCtrListener);
  }

  // 播放器状态监听
@ -225,6 +218,20 @@ class _VideoDetailPageState extends State<VideoDetailPage>
    statusHeight = await StatusBarControl.getHeight;
  }

+  // _extendNestCtr监听
+  void _extendNestCtrListener() {
+    final double offset = _extendNestCtr.position.pixels;
+    if (vdCtr.videoDirection.value == 'horizontal') {
+      vdCtr.sheetHeight.value =
+          Get.size.height - videoHeight - statusBarHeight + offset;
+      appbarStream.add(offset);
+    } else {
+      if (offset > (Get.size.width * 22 / 16 - videoHeight)) {
+        appbarStream.add(offset - (Get.size.width * 22 / 16 - videoHeight));
+      }
+    }
+  }
+
  @override
  void dispose() {
    shutdownTimerService.handleWaitingFinished();
@ -243,6 +250,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
    appbarStream.close();
    WidgetsBinding.instance.removeObserver(this);
    _lifecycleListener.dispose();
+    _extendNestCtr.removeListener(_extendNestCtrListener);
    super.dispose();
  }

@ -494,11 +502,18 @@ class _VideoDetailPageState extends State<VideoDetailPage>
  Widget build(BuildContext context) {
    final sizeContext = MediaQuery.sizeOf(context);
    final _context = MediaQuery.of(context);
-    late double defaultVideoHeight = sizeContext.width * 9 / 16;
+    late final double verticalHeight = sizeContext.width * 22 / 16;
+    late double defaultVideoHeight = vdCtr.videoDirection.value == 'vertical'
+        ? verticalHeight
+        : sizeContext.width * 9 / 16;
    late RxDouble videoHeight = defaultVideoHeight.obs;
    final double pinnedHeaderHeight =
        statusBarHeight + kToolbarHeight + videoHeight.value;
-    // ignore: no_leading_underscores_for_local_identifiers
+    vdCtr.videoDirection.listen((p0) {
+      if (p0 == 'vertical') {
+        videoHeight.value = defaultVideoHeight = verticalHeight;
+      }
+    });

    // 竖屏
    final bool isPortrait = _context.orientation == Orientation.portrait;
@ -541,10 +556,6 @@ class _VideoDetailPageState extends State<VideoDetailPage>
              showEposideCb: () => vdCtr.videoType == SearchType.video
                  ? videoIntroController.showEposideHandler()
                  : bangumiIntroController.showEposideHandler(),
-              fullScreenCb: (bool status) {
-                videoHeight.value =
-                    status ? Get.size.height : defaultVideoHeight;
-              },
            ));
    }

@ -594,6 +605,28 @@ class _VideoDetailPageState extends State<VideoDetailPage>
      );
    }

+    Widget buildAppBar(BuildContext context, AsyncSnapshot<num> snapshot) {
+      final double distance =
+          statusBarHeight + MediaQuery.of(context).padding.top;
+      return AppBar(
+        backgroundColor: Colors.black,
+        systemOverlayStyle: Platform.isAndroid
+            ? SystemUiOverlayStyle(
+                statusBarIconBrightness:
+                    Theme.of(context).brightness == Brightness.dark
+                        ? Brightness.light
+                        : (snapshot.data! > distance
+                            ? Brightness.dark
+                            : Brightness.light),
+              )
+            : Theme.of(context).brightness == Brightness.dark
+                ? SystemUiOverlayStyle.light
+                : (snapshot.data! > distance
+                    ? SystemUiOverlayStyle.dark
+                    : SystemUiOverlayStyle.light),
+      );
+    }
+
    Widget childWhenDisabled = SafeArea(
      top: MediaQuery.of(context).orientation == Orientation.portrait &&
          plPlayerController?.isFullScreen.value == true,
@ -611,11 +644,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
              child: StreamBuilder(
                stream: appbarStream.stream.distinct(),
                initialData: 0,
-                builder: ((context, snapshot) {
-                  return AppBar(
-                    backgroundColor: Colors.black,
-                  );
-                }),
+                builder: buildAppBar,
              ),
            ),
            body: ExtendedNestedScrollView(
@ -773,7 +802,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
            builder: ((context, snapshot) {
              return ScrollAppBar(
                snapshot.data!.toDouble(),
-                () => continuePlay(),
+                continuePlay,
                playerStatus.value,
                null,
              );
--- a/lib/pages/video/detail/widgets/app_bar.dart
+++ b/lib/pages/video/detail/widgets/app_bar.dart
@ -34,21 +34,16 @@ class ScrollAppBar extends StatelessWidget {
          child: AppBar(
            primary: false,
            centerTitle: true,
-            title: TextButton(
+            title: TextButton.icon(
              onPressed: () => callback(),
-              child: Row(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  const Icon(Icons.play_arrow_rounded),
-                  Text(
-                    playerStatus == PlayerStatus.paused
-                        ? '继续播放'
-                        : playerStatus == PlayerStatus.completed
-                            ? '重新播放'
-                            : '播放中',
-                  )
-                ],
+              label: Text(
+                playerStatus == PlayerStatus.paused
+                    ? '继续播放'
+                    : playerStatus == PlayerStatus.completed
+                        ? '重新播放'
+                        : '播放中',
              ),
+              icon: const Icon(Icons.play_arrow_rounded),
            ),
            // actions: [
            //   IconButton(