precheck video dimension

Signed-off-by: dom <githubaccount56556@proton.me>

lib/common/widgets/video_card/video_card_h.dart

@@ -12,6 +12,7 @@ import 'package:PiliPlus/models/common/stat_type.dart';
 import 'package:PiliPlus/models/model_hot_video_item.dart';
 import 'package:PiliPlus/models/model_video.dart';
 import 'package:PiliPlus/models/search/result.dart';
+import 'package:PiliPlus/models_new/video/video_detail/dimension.dart';
 import 'package:PiliPlus/utils/date_utils.dart';
 import 'package:PiliPlus/utils/duration_utils.dart';
 import 'package:PiliPlus/utils/page_utils.dart';
@@ -92,30 +93,35 @@ class VideoCardH extends StatelessWidget {
                     }
                     return;
                   }
+
+                  Dimension? dimension;
                   if (videoItem case final HotVideoItemModel item) {
                     if (item.redirectUrl?.isNotEmpty == true &&
                         PageUtils.viewPgcFromUri(item.redirectUrl!)) {
                       return;
                     }
+                    dimension = item.dimension;
                   }
 
-                  try {
+                  int? cid = videoItem.cid;
-                    final int? cid =
+                  if (cid == null) {
-                        videoItem.cid ??
+                    if (await SearchHttp.ab2cWithDimension(
-                        await SearchHttp.ab2c(
                           aid: videoItem.aid,
                           bvid: videoItem.bvid,
-                        );
+                        )
-                    if (cid != null) {
+                        case final res?) {
-                      PageUtils.toVideoPage(
+                      cid = res.cid;
-                        bvid: videoItem.bvid,
+                      dimension = res.dimension;
-                        cid: cid,
-                        cover: videoItem.cover,
-                        title: videoItem.title,
-                      );
                     }
-                  } catch (err) {
+                  }
-                    SmartDialog.showToast(err.toString());
+                  if (cid != null) {
+                    PageUtils.toVideoPage(
+                      bvid: videoItem.bvid,
+                      cid: cid,
+                      cover: videoItem.cover,
+                      title: videoItem.title,
+                      dimension: dimension,
+                    );
                   }
                 },
             child: Padding(

lib/common/widgets/video_card/video_card_v.dart

@@ -6,9 +6,10 @@ import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/common/widgets/stat/stat.dart';
 import 'package:PiliPlus/common/widgets/video_popup_menu.dart';
 import 'package:PiliPlus/http/search.dart';
-import 'package:PiliPlus/models/common/badge_type.dart';
 import 'package:PiliPlus/models/common/stat_type.dart';
+import 'package:PiliPlus/models/home/rcmd/result.dart';
 import 'package:PiliPlus/models/model_rec_video_item.dart';
+import 'package:PiliPlus/models_new/video/video_detail/dimension.dart';
 import 'package:PiliPlus/utils/app_scheme.dart';
 import 'package:PiliPlus/utils/date_utils.dart';
 import 'package:PiliPlus/utils/duration_utils.dart';
@@ -31,17 +32,28 @@ class VideoCardV extends StatelessWidget {
     this.onRemove,
   });
 
-  Future<void> onPushDetail(String heroTag) async {
+  Future<void> onPushDetail() async {
-    String? goto = videoItem.goto;
+    switch (videoItem.goto) {
-    switch (goto) {
       case 'bangumi':
         PageUtils.viewPgc(epId: videoItem.param!);
         break;
       case 'av':
-        String bvid = videoItem.bvid ?? IdUtils.av2bv(videoItem.aid!);
+        var bvid = videoItem.bvid ?? IdUtils.av2bv(videoItem.aid!);
-        int? cid =
+        var cid = videoItem.cid;
-            videoItem.cid ??
+        bool isVertical = false;
-            await SearchHttp.ab2c(aid: videoItem.aid, bvid: bvid);
+        Dimension? dimension;
+        if (videoItem is RcmdVideoItemAppModel) {
+          if (videoItem.uri case final uri?) {
+            isVertical = Utils.getDimensionFromUri(uri);
+          }
+        }
+        if (cid == null) {
+          if (await SearchHttp.ab2cWithDimension(aid: videoItem.aid, bvid: bvid)
+              case final res?) {
+            cid = res.cid;
+            dimension = res.dimension;
+          }
+        }
         if (cid != null) {
           PageUtils.toVideoPage(
             aid: videoItem.aid,
@@ -49,6 +61,8 @@ class VideoCardV extends StatelessWidget {
             cid: cid,
             cover: videoItem.cover,
             title: videoItem.title,
+            isVertical: isVertical,
+            dimension: dimension,
           );
         }
         break;
@@ -80,7 +94,7 @@ class VideoCardV extends StatelessWidget {
         Card(
           clipBehavior: Clip.hardEdge,
           child: InkWell(
-            onTap: () => onPushDetail(Utils.makeHeroTag(videoItem.aid)),
+            onTap: onPushDetail,
             onLongPress: onLongPress,
             onSecondaryTap: PlatformUtils.isMobile ? null : onLongPress,
             child: Column(
@@ -105,8 +119,8 @@ class VideoCardV extends StatelessWidget {
                             PBadge(
                               bottom: 6,
                               right: 7,
-                              size: PBadgeSize.small,
+                              size: .small,
-                              type: PBadgeType.gray,
+                              type: .gray,
                               text: DurationUtils.formatDuration(
                                 videoItem.duration,
                               ),
@@ -163,31 +177,31 @@ class VideoCardV extends StatelessWidget {
                   PBadge(
                     text: videoItem.pgcBadge,
                     isStack: false,
-                    size: PBadgeSize.small,
+                    size: .small,
-                    type: PBadgeType.line_primary,
+                    type: .line_primary,
                     fontSize: 9,
                   ),
                 if (videoItem.rcmdReason != null)
                   PBadge(
                     text: videoItem.rcmdReason,
                     isStack: false,
-                    size: PBadgeSize.small,
+                    size: .small,
-                    type: PBadgeType.secondary,
+                    type: .secondary,
                   ),
                 if (videoItem.goto == 'picture')
                   const PBadge(
                     text: '动态',
                     isStack: false,
-                    size: PBadgeSize.small,
+                    size: .small,
-                    type: PBadgeType.line_primary,
+                    type: .line_primary,
                     fontSize: 9,
                   ),
                 if (videoItem.isFollowed)
                   const PBadge(
                     text: '已关注',
                     isStack: false,
-                    size: PBadgeSize.small,
+                    size: .small,
-                    type: PBadgeType.secondary,
+                    type: .secondary,
                   ),
                 Expanded(
                   flex: 1,

lib/http/search.dart

@@ -10,6 +10,7 @@ import 'package:PiliPlus/models_new/dynamic/dyn_topic_pub_search/data.dart';
 import 'package:PiliPlus/models_new/pgc/pgc_info_model/result.dart';
 import 'package:PiliPlus/models_new/search/search_rcmd/data.dart';
 import 'package:PiliPlus/models_new/search/search_trending/data.dart';
+import 'package:PiliPlus/models_new/video/video_detail/dimension.dart';
 import 'package:PiliPlus/utils/request_utils.dart';
 import 'package:PiliPlus/utils/wbi_sign.dart';
 import 'package:dio/dio.dart';
@@ -172,6 +173,14 @@ abstract final class SearchHttp {
   }
 
   static Future<int?> ab2c({dynamic aid, dynamic bvid, int? part}) async {
+    return (await ab2cWithDimension(aid: aid, bvid: bvid, part: part))?.cid;
+  }
+
+  static Future<({int? cid, Dimension? dimension})?> ab2cWithDimension({
+    dynamic aid,
+    dynamic bvid,
+    int? part,
+  }) async {
     final res = await Request().get(
       Api.ab2c,
       queryParameters: {
@@ -181,13 +190,19 @@ abstract final class SearchHttp {
     );
     if (res.data['code'] == 0) {
       if (res.data['data'] case List list) {
-        return part != null
+        final target = part != null
-            ? (list.elementAtOrNull(part - 1)?['cid'] ??
+            ? (list.elementAtOrNull(part - 1) ?? list.firstOrNull)
-                  list.firstOrNull?['cid'])
+            : list.firstOrNull;
-            : list.firstOrNull?['cid'];
+        if (target != null) {
-      } else {
+          return (
-        return null;
+            cid: target['cid'] as int?,
+            dimension: target['dimension'] == null
+                ? null
+                : Dimension.fromJson(target['dimension']),
+          );
+        }
       }
+      return null;
     } else {
       SmartDialog.showToast("ab2c error: ${res.data['message']}");
       return null;

lib/models/model_hot_video_item.dart

@@ -38,7 +38,9 @@ class HotVideoItemModel extends BaseRcmdVideoItemModel with MultiSelectData {
     duration = json["duration"];
     owner = Owner.fromJson(json["owner"]);
     stat = HotStat.fromJson(json['stat']);
-    dimension = Dimension.fromJson(json['dimension']);
+    dimension = json['dimension'] == null
+        ? null
+        : Dimension.fromJson(json['dimension']);
     firstFrame = json["first_frame"];
     pubLocation = json["pub_location"];
     dynamic rcmd = json['rcmd_reason'];

lib/models_new/download/bili_download_entry_info.dart

@@ -95,6 +95,7 @@ class BiliDownloadEntryInfo with MultiSelectData {
               epId: ep?.episodeId,
               title: title,
               cover: cover,
+              isVertical: pageData?.isVertical ?? false,
             );
           },
         ),
@@ -262,6 +263,8 @@ class PageInfo {
 
   bool get cacheWidth => width <= height;
 
+  bool get isVertical => rotate == 1 ? width > height : height > width;
+
   PageInfo({
     required this.cid,
     required this.page,

lib/models_new/video/video_detail/dimension.dart

@@ -9,10 +9,21 @@ class Dimension {
     return null;
   }
 
+  bool get isVertical =>
+      width != null && height != null ? height! > width! : false;
+
   Dimension({this.width, this.height});
 
-  factory Dimension.fromJson(Map<String, dynamic> json) => Dimension(
+  Dimension.fromJson(Map<String, dynamic> json) {
-    width: json['width'] as int?,
+    if (json['rotate'] == 1) {
-    height: json['height'] as int?,
+      width = json['height'] as int?;
-  );
+      height = json['width'] as int?;
+    } else {
+      width = json['width'] as int?;
+      height = json['height'] as int?;
+    }
+  }
+
+  @override
+  String toString() => 'width: $width, height: $height';
 }

lib/pages/download/detail/widgets/item.dart

@@ -126,6 +126,7 @@ class DetailItem extends StatelessWidget {
               cid: cid!,
               cover: entry.cover,
               title: entry.showTitle,
+              isVertical: entry.pageData?.isVertical ?? false,
               extraArguments: {
                 'sourceType': SourceType.file,
                 'entry': entry,

lib/pages/dynamics/widgets/rich_node_panel.dart

@@ -247,11 +247,15 @@ TextSpan? richNode(
                   recognizer: NoDeadlineTapGestureRecognizer()
                     ..onTap = () async {
                       try {
-                        int? cid = await SearchHttp.ab2c(bvid: i.rid);
+                        final res = await SearchHttp.ab2cWithDimension(
+                          bvid: i.rid,
+                        );
+                        final cid = res?.cid;
                         if (cid != null) {
                           PageUtils.toVideoPage(
                             bvid: i.rid,
                             cid: cid,
+                            dimension: res!.dimension,
                           );
                         }
                       } catch (err) {

lib/pages/fav_detail/controller.dart

@@ -213,6 +213,7 @@ class FavDetailController
   @override
   void onViewFav(FavDetailItemModel item, int? index) {
     final folder = folderInfo.value;
+    // TODO: dimension
     PageUtils.toVideoPage(
       bvid: item.bvid,
       cid: item.ugc!.firstCid!,

lib/pages/fav_search/controller.dart

@@ -46,6 +46,7 @@ class FavSearchController
   }
 
   @override
+  // TODO: dimension
   void onViewFav(FavDetailItemModel item, int? index) => PageUtils.toVideoPage(
     bvid: item.bvid,
     cid: item.ugc!.firstCid!,

lib/pages/history/widgets/item.dart

@@ -8,6 +8,7 @@ import 'package:PiliPlus/http/search.dart';
 import 'package:PiliPlus/http/user.dart';
 import 'package:PiliPlus/models/common/badge_type.dart';
 import 'package:PiliPlus/models_new/history/list.dart';
+import 'package:PiliPlus/models_new/video/video_detail/dimension.dart';
 import 'package:PiliPlus/pages/common/multi_select/base.dart';
 import 'package:PiliPlus/utils/date_utils.dart';
 import 'package:PiliPlus/utils/duration_utils.dart';
@@ -79,20 +80,28 @@ class HistoryItem extends StatelessWidget {
                     );
                   }
                 } else {
-                  int? cid =
+                  int? cid = item.history.cid;
-                      item.history.cid ??
+                  Dimension? dimension;
-                      await SearchHttp.ab2c(
+                  if (cid == null) {
-                        aid: aid,
+                    if (await SearchHttp.ab2cWithDimension(
-                        bvid: bvid,
+                          aid: aid,
-                        part: item.history.page,
+                          bvid: bvid,
-                      );
+                          part: item.history.page,
+                        )
+                        case final res?) {
+                      cid = res.cid;
+                      dimension = res.dimension;
+                    }
+                  }
                   if (cid != null) {
+                    // TODO: dimension
                     PageUtils.toVideoPage(
                       aid: aid,
                       bvid: bvid,
                       cid: cid,
                       cover: item.cover,
                       title: item.title,
+                      dimension: dimension,
                     );
                   }
                 }

lib/pages/later/child_view.dart

@@ -84,6 +84,7 @@ class _LaterViewChildPageState extends State<LaterViewChildPage>
                         cid: cid,
                         cover: videoItem.pic,
                         title: videoItem.title,
+                        dimension: videoItem.dimension,
                         extraArguments: _baseCtr.isPlayAll.value
                             ? {
                                 'oid': videoItem.aid,

lib/pages/later/controller.dart

@@ -170,6 +170,7 @@ class LaterController extends MultiSelectController<LaterData, LaterItemModel>
             cid: item.cid!,
             cover: item.pic,
             title: item.title,
+            dimension: item.dimension,
             extraArguments: {
               'sourceType': SourceType.watchLater,
               'count': baseCtr.counts[LaterViewType.all.index],

lib/pages/later/widgets/video_card_h_later.dart

@@ -63,7 +63,7 @@ class VideoCardHLater extends StatelessWidget {
                   return;
                 }
                 try {
-                  final int? cid =
+                  final cid =
                       videoItem.cid ??
                       await SearchHttp.ab2c(
                         aid: videoItem.aid,

lib/pages/later_search/view.dart

@@ -79,6 +79,7 @@ class _LaterSearchPageState
               cid: cid,
               cover: item.pic,
               title: item.title,
+              dimension: item.dimension,
               extraArguments: {
                 'oid': item.aid,
                 'sourceType': SourceType.watchLater,

lib/pages/member_coin_arc/widgets/item.dart

@@ -42,13 +42,15 @@ class MemberCoinLikeItem extends StatelessWidget {
           }
 
           if (item.param != null) {
-            int? cid = await SearchHttp.ab2c(aid: item.param);
+            final res = await SearchHttp.ab2cWithDimension(aid: item.param);
+            final cid = res?.cid;
             if (cid != null) {
               PageUtils.toVideoPage(
                 aid: int.parse(item.param!),
                 cid: cid,
                 cover: item.cover,
                 title: item.title,
+                dimension: res!.dimension,
               );
             }
           }

lib/pages/member_home/widgets/video_card_v_member_home.dart

@@ -6,6 +6,7 @@ import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/http/search.dart';
 import 'package:PiliPlus/models/common/badge_type.dart';
 import 'package:PiliPlus/models_new/space/space_archive/item.dart';
+import 'package:PiliPlus/models_new/video/video_detail/dimension.dart';
 import 'package:PiliPlus/utils/app_scheme.dart';
 import 'package:PiliPlus/utils/duration_utils.dart';
 import 'package:PiliPlus/utils/id_utils.dart';
@@ -44,13 +45,22 @@ class VideoCardVMemberHome extends StatelessWidget {
         }
 
         bvid ??= IdUtils.av2bv(int.parse(aid!));
-        int? cid = videoItem.cid ?? await SearchHttp.ab2c(aid: aid, bvid: bvid);
+        int? cid = videoItem.cid;
+        Dimension? dimension;
+        if (cid == null) {
+          if (await SearchHttp.ab2cWithDimension(aid: aid, bvid: bvid)
+              case final res?) {
+            cid = res.cid;
+            dimension = res.dimension;
+          }
+        }
         if (cid != null) {
           PageUtils.toVideoPage(
             bvid: bvid,
             cid: cid,
             cover: videoItem.cover,
             title: videoItem.title,
+            dimension: dimension,
           );
         }
         break;

lib/pages/member_search/child/view.dart

@@ -78,6 +78,7 @@ class _MemberSearchChildPageState extends State<MemberSearchChildPage>
                     if (index == response.length - 1) {
                       _controller.onLoadMore();
                     }
+                    // TODO: dimension
                     return VideoCardH(
                       videoItem: response[index],
                     );

lib/pages/member_video/controller.dart

@@ -13,6 +13,7 @@ import 'package:PiliPlus/pages/common/common_list_controller.dart';
 import 'package:PiliPlus/utils/extension/iterable_ext.dart';
 import 'package:PiliPlus/utils/id_utils.dart';
 import 'package:PiliPlus/utils/page_utils.dart';
+import 'package:PiliPlus/utils/utils.dart';
 import 'package:get/get.dart';
 
 class MemberVideoCtr
@@ -152,12 +153,14 @@ class MemberVideoCtr
       String? oid = params['oid'];
       if (oid != null) {
         final bvid = IdUtils.av2bv(int.parse(oid));
-        final cid = await SearchHttp.ab2c(aid: oid, bvid: bvid);
+        final res = await SearchHttp.ab2cWithDimension(aid: oid, bvid: bvid);
+        final cid = res?.cid;
         if (cid != null) {
           PageUtils.toVideoPage(
             aid: int.parse(oid),
             bvid: bvid,
             cid: cid,
+            dimension: res!.dimension,
             extraArguments: {
               'sourceType': SourceType.archive,
               'mediaId': seasonId ?? seriesId ?? mid,
@@ -190,11 +193,16 @@ class MemberVideoCtr
                   (isVideo ? order == .click : sort == .asc)
               ? !desc
               : desc;
+          bool isVertical = false;
+          if (element.uri case final uri?) {
+            isVertical = Utils.getDimensionFromUri(uri);
+          }
           PageUtils.toVideoPage(
             bvid: element.bvid,
             cid: element.cid!,
             cover: element.cover,
             title: element.title,
+            isVertical: isVertical,
             extraArguments: {
               'sourceType': SourceType.archive,
               'mediaId': seasonId ?? seriesId ?? mid,

lib/pages/member_video/widgets/video_card_h_member_video.dart

@@ -13,8 +13,8 @@ import 'package:PiliPlus/utils/date_utils.dart';
 import 'package:PiliPlus/utils/duration_utils.dart';
 import 'package:PiliPlus/utils/page_utils.dart';
 import 'package:PiliPlus/utils/platform_utils.dart';
+import 'package:PiliPlus/utils/utils.dart';
 import 'package:flutter/material.dart' hide LayoutBuilder;
-import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 
 // 视频卡片 - 水平布局
 class VideoCardHMemberVideo extends StatelessWidget {
@@ -62,16 +62,17 @@ class VideoCardHMemberVideo extends StatelessWidget {
                   if (videoItem.bvid == null || videoItem.cid == null) {
                     return;
                   }
-                  try {
+                  bool isVertical = false;
-                    PageUtils.toVideoPage(
+                  if (videoItem.uri case final uri?) {
-                      bvid: videoItem.bvid,
+                    isVertical = Utils.getDimensionFromUri(uri);
-                      cid: videoItem.cid!,
-                      cover: videoItem.cover,
-                      title: videoItem.title,
-                    );
-                  } catch (err) {
-                    SmartDialog.showToast(err.toString());
                   }
+                  PageUtils.toVideoPage(
+                    bvid: videoItem.bvid,
+                    cid: videoItem.cid!,
+                    cover: videoItem.cover,
+                    title: videoItem.title,
+                    isVertical: isVertical,
+                  );
                 },
             child: Padding(
               padding: const EdgeInsets.symmetric(

lib/pages/member_video_web/base/view.dart

@@ -99,6 +99,7 @@ abstract class BaseVideoWebState<
                       if (index == response.length - 1) {
                         controller.onLoadMore();
                       }
+                      // TODO: dimension
                       return VideoCardH(videoItem: response[index]);
                     },
                   ),

lib/pages/music/widget/music_video_card_h.dart

@@ -9,6 +9,7 @@ import 'package:PiliPlus/http/search.dart';
 import 'package:PiliPlus/models/common/badge_type.dart';
 import 'package:PiliPlus/models/common/stat_type.dart';
 import 'package:PiliPlus/models_new/music/bgm_recommend_list.dart';
+import 'package:PiliPlus/models_new/video/video_detail/dimension.dart';
 import 'package:PiliPlus/utils/duration_utils.dart';
 import 'package:PiliPlus/utils/page_utils.dart';
 import 'package:PiliPlus/utils/platform_utils.dart';
@@ -33,14 +34,22 @@ class MusicVideoCardH extends StatelessWidget {
       type: MaterialType.transparency,
       child: InkWell(
         onTap: () async {
-          int? cid =
+          int? cid = videoItem.cid;
-              videoItem.cid ?? await SearchHttp.ab2c(bvid: videoItem.bvid);
+          Dimension? dimension;
+          if (cid == null) {
+            if (await SearchHttp.ab2cWithDimension(bvid: videoItem.bvid)
+                case final res?) {
+              cid = res.cid;
+              dimension = res.dimension;
+            }
+          }
           if (cid != null) {
             PageUtils.toVideoPage(
               bvid: videoItem.bvid,
               cid: cid,
               cover: videoItem.cover,
               title: videoItem.title,
+              dimension: dimension,
             );
           }
         },

lib/pages/popular_precious/view.dart

@@ -57,6 +57,7 @@ class _PopularPreciousPageState extends State<PopularPreciousPage>
                 PageUtils.toVideoPage(
                   bvid: item.bvid,
                   cid: item.cid!,
+                  dimension: item.dimension,
                   extraArguments: {
                     'sourceType': SourceType.playlist,
                     'favTitle': '入站必刷',

lib/pages/popular_series/view.dart

@@ -72,6 +72,7 @@ class _PopularSeriesPageState extends State<PopularSeriesPage> with GridMixin {
                   PageUtils.toVideoPage(
                     bvid: item.bvid,
                     cid: item.cid!,
+                    dimension: item.dimension,
                     extraArguments: {
                       'sourceType': SourceType.playlist,
                       'favTitle': '每周必看 ${config?.label ?? ''}',

lib/pages/subscription_detail/widget/sub_video_card.dart

@@ -36,13 +36,15 @@ class SubVideoCardH extends StatelessWidget {
       type: MaterialType.transparency,
       child: InkWell(
         onTap: () async {
-          int? cid = await SearchHttp.ab2c(bvid: videoItem.bvid);
+          final res = await SearchHttp.ab2cWithDimension(bvid: videoItem.bvid);
+          final cid = res?.cid;
           if (cid != null) {
             PageUtils.toVideoPage(
               bvid: videoItem.bvid,
               cid: cid,
               cover: videoItem.cover,
               title: videoItem.title,
+              dimension: res!.dimension,
             );
           }
         },

lib/pages/video/controller.dart

@@ -166,7 +166,7 @@ class VideoDetailController extends GetxController
   PlayerStatus? playerStatus;
 
   late final scrollKey = GlobalKey<ExtendedNestedScrollViewState>();
-  late final RxBool isVertical = false.obs;
+  late final RxBool isVertical;
   late final RxDouble scrollRatio = 0.0.obs;
   ScrollController? _scrollCtr;
   ScrollController get scrollCtr =>
@@ -326,6 +326,7 @@ class VideoDetailController extends GetxController
     pgcType = args['pgcType'];
     heroTag = args['heroTag'];
     cover = RxString(args['cover'] ?? '');
+    isVertical = RxBool(args['isVertical'] ?? false);
 
     sourceType = args['sourceType'] ?? SourceType.normal;
     isFileSource = sourceType == SourceType.file;

lib/pages/video/introduction/ugc/controller.dart

@@ -15,6 +15,7 @@ import 'package:PiliPlus/models/common/video/source_type.dart';
 import 'package:PiliPlus/models_new/member_card_info/data.dart';
 import 'package:PiliPlus/models_new/relation/data.dart';
 import 'package:PiliPlus/models_new/video/video_ai_conclusion/model_result.dart';
+import 'package:PiliPlus/models_new/video/video_detail/dimension.dart';
 import 'package:PiliPlus/models_new/video/video_detail/episode.dart';
 import 'package:PiliPlus/models_new/video/video_detail/page.dart';
 import 'package:PiliPlus/models_new/video/video_detail/section.dart';
@@ -485,22 +486,33 @@ class UgcIntroController extends CommonIntroController with ReloadMixin {
     try {
       final String bvid = episode.bvid ?? this.bvid;
       final int aid = episode.aid ?? IdUtils.bv2av(bvid);
-      final int? cid =
+      int? cid = episode.cid;
-          episode.cid ?? await SearchHttp.ab2c(aid: aid, bvid: bvid);
+      Dimension? dimension;
+      if (cid == null) {
+        if (await SearchHttp.ab2cWithDimension(aid: aid, bvid: bvid)
+            case final res?) {
+          cid = res.cid;
+          dimension = res.dimension;
+        }
+      }
       if (cid == null) {
         return false;
       }
+
       final String? cover = episode.cover;
 
       // 重新获取视频资源
-
       if (videoDetailCtr.isPlayAll) {
         if (videoDetailCtr.mediaList.indexWhere((item) => item.bvid == bvid) ==
             -1) {
+          if (dimension == null && episode is EpisodeItem) {
+            dimension = episode.page?.dimension;
+          }
           PageUtils.toVideoPage(
             bvid: bvid,
             cid: cid,
             cover: cover,
+            dimension: dimension,
           );
           return false;
         }

lib/pages/whisper_detail/widget/chat_item.dart

@@ -328,13 +328,17 @@ class ChatItem extends StatelessWidget {
                   if (bvid != null) {
                     try {
                       SmartDialog.showLoading();
-                      final int? cid = await SearchHttp.ab2c(bvid: bvid);
+                      final res = await SearchHttp.ab2cWithDimension(
+                        bvid: bvid,
+                      );
+                      final cid = res?.cid;
                       SmartDialog.dismiss();
                       if (cid != null) {
                         PageUtils.toVideoPage(
                           bvid: bvid,
                           cid: cid,
                           cover: i['cover_url'],
+                          dimension: res!.dimension,
                         );
                       }
                     } catch (err) {
@@ -420,13 +424,17 @@ class ChatItem extends StatelessWidget {
                 try {
                   SmartDialog.showLoading();
                   final bvid = content["bvid"];
-                  final int? cid = await SearchHttp.ab2c(bvid: bvid);
+                  final res = await SearchHttp.ab2cWithDimension(
+                    bvid: bvid,
+                  );
+                  final cid = res?.cid;
                   SmartDialog.dismiss();
                   if (cid != null) {
                     PageUtils.toVideoPage(
                       bvid: bvid,
                       cid: cid,
                       cover: content['cover'],
+                      dimension: res!.dimension,
                     );
                   }
                 } catch (err) {
@@ -518,7 +526,10 @@ class ChatItem extends StatelessWidget {
           }
           bvid ??= IdUtils.av2bv(aid);
           SmartDialog.showLoading();
-          final int? cid = await SearchHttp.ab2c(bvid: bvid);
+          final res = await SearchHttp.ab2cWithDimension(
+            bvid: bvid,
+          );
+          final cid = res?.cid;
           SmartDialog.dismiss();
           if (cid != null) {
             PageUtils.toVideoPage(
@@ -526,6 +537,7 @@ class ChatItem extends StatelessWidget {
               bvid: bvid,
               cid: cid,
               cover: content['thumb'],
+              dimension: res!.dimension,
             );
           }
         };

lib/utils/app_scheme.dart

@@ -617,11 +617,13 @@ abstract final class PiliScheme {
             IdUtils.bvRegex.firstMatch(path)?.group(0);
         if (bvid != null) {
           if (mediaId != null) {
-            final int? cid = await SearchHttp.ab2c(bvid: bvid);
+            final res = await SearchHttp.ab2cWithDimension(bvid: bvid);
+            final cid = res?.cid;
             if (cid != null) {
               PageUtils.toVideoPage(
                 bvid: bvid,
                 cid: cid,
+                dimension: res!.dimension,
                 extraArguments: {
                   'sourceType': SourceType.playlist,
                   'favTitle': '播放列表',
@@ -877,11 +879,12 @@ abstract final class PiliScheme {
       if (showDialog) {
         SmartDialog.showLoading<dynamic>(msg: '获取中...');
       }
-      final int? cid = await SearchHttp.ab2c(
+      final res = await SearchHttp.ab2cWithDimension(
         bvid: bvid,
         aid: aid,
         part: part != null ? int.tryParse(part) : null,
       );
+      final cid = res?.cid;
       if (showDialog) {
         SmartDialog.dismiss();
       }
@@ -892,6 +895,7 @@ abstract final class PiliScheme {
           cid: cid,
           progress: progress,
           off: off,
+          dimension: res!.dimension,
         );
       }
     } catch (e) {

lib/utils/page_utils.dart

@@ -11,6 +11,7 @@ import 'package:PiliPlus/models/common/image_preview_type.dart';
 import 'package:PiliPlus/models/common/video/video_type.dart';
 import 'package:PiliPlus/models/dynamics/result.dart';
 import 'package:PiliPlus/models_new/pgc/pgc_info_model/episode.dart';
+import 'package:PiliPlus/models_new/video/video_detail/dimension.dart';
 import 'package:PiliPlus/pages/common/common_intro_controller.dart';
 import 'package:PiliPlus/pages/common/publish/publish_route.dart';
 import 'package:PiliPlus/pages/contact/view.dart';
@@ -271,12 +272,14 @@ abstract final class PageUtils {
         try {
           String bvid = archive.bvid!;
           String cover = archive.cover!;
-          int? cid = await SearchHttp.ab2c(bvid: bvid);
+          final res = await SearchHttp.ab2cWithDimension(bvid: bvid);
+          final cid = res?.cid;
           if (cid != null) {
             toVideoPage(
               bvid: bvid,
               cid: cid,
               cover: cover,
+              dimension: res!.dimension,
             );
           }
         } catch (err) {
@@ -330,13 +333,15 @@ abstract final class PageUtils {
         int aid = ugcSeason.aid!;
         String bvid = IdUtils.av2bv(aid);
         String cover = ugcSeason.cover!;
-        int? cid = await SearchHttp.ab2c(bvid: bvid);
+        final res = await SearchHttp.ab2cWithDimension(bvid: bvid);
+        final cid = res?.cid;
         if (cid != null) {
           toVideoPage(
             aid: aid,
             bvid: bvid,
             cid: cid,
             cover: cover,
+            dimension: res!.dimension,
           );
         }
         break;
@@ -554,6 +559,8 @@ abstract final class PageUtils {
     int? progress, // milliseconds
     Map? extraArguments,
     bool off = false,
+    bool isVertical = false,
+    Dimension? dimension,
   }) {
     final arguments = {
       'aid': aid ?? IdUtils.bv2av(bvid!),
@@ -566,6 +573,7 @@ abstract final class PageUtils {
       'title': ?title,
       'progress': ?progress,
       'videoType': videoType,
+      'isVertical': dimension?.isVertical ?? isVertical,
       'heroTag': Utils.makeHeroTag(cid),
       ...?extraArguments,
     };

lib/utils/url_utils.dart

@@ -49,12 +49,14 @@ abstract final class UrlUtils {
       final aid = matchRes.av;
       String? bvid = matchRes.bv;
       bvid ??= IdUtils.av2bv(aid!);
-      final int? cid = await SearchHttp.ab2c(aid: aid, bvid: bvid);
+      final res = await SearchHttp.ab2cWithDimension(aid: aid, bvid: bvid);
+      final cid = res?.cid;
       if (cid != null) {
         PageUtils.toVideoPage(
           aid: aid,
           bvid: bvid,
           cid: cid,
+          dimension: res!.dimension,
         );
       }
     } else {

lib/utils/utils.dart

@@ -33,6 +33,17 @@ abstract final class Utils {
     _ => color,
   };
 
+  static bool getDimensionFromUri(String uri) {
+    try {
+      final params = Uri.parse(uri).queryParameters;
+      final width = int.parse(params['player_width']!);
+      final height = int.parse(params['player_height']!);
+      return params['player_rotate'] == '1' ? width > height : height > width;
+    } catch (_) {
+      return false;
+    }
+  }
+
   static String themeUrl(bool isDark) =>
       'native.theme=${isDark ? 2 : 1}&night=${isDark ? 1 : 0}';