diff --git a/lib/common/skeleton/video_card_v.dart b/lib/common/skeleton/video_card_v.dart index f8f9a2cb..faa33a92 100644 --- a/lib/common/skeleton/video_card_v.dart +++ b/lib/common/skeleton/video_card_v.dart @@ -10,6 +10,7 @@ class VideoCardVSkeleton extends StatelessWidget { final color = Theme.of(context).colorScheme.onInverseSurface; return Skeleton( child: Column( + crossAxisAlignment: CrossAxisAlignment.start, children: [ AspectRatio( aspectRatio: StyleString.aspectRatio, diff --git a/lib/pages/article_list/view.dart b/lib/pages/article_list/view.dart index b7351d8d..6926d979 100644 --- a/lib/pages/article_list/view.dart +++ b/lib/pages/article_list/view.dart @@ -172,7 +172,8 @@ class _ArticleListPageState extends State with GridMixin { TextSpan( children: [ TextSpan( - text: '${DateFormatUtils.dateFormat(item.updateTime)}更新', + text: + '${DateFormatUtils.dateFormat(item.updateTime)}更新', ), divider, TextSpan(text: '文集号: ${item.id}'), diff --git a/lib/pages/dynamics_create_reserve/view.dart b/lib/pages/dynamics_create_reserve/view.dart index b01a2055..169a74fa 100644 --- a/lib/pages/dynamics_create_reserve/view.dart +++ b/lib/pages/dynamics_create_reserve/view.dart @@ -127,7 +127,9 @@ class _CreateReservePageState extends State { padding: const EdgeInsets.symmetric(vertical: 4), child: Obx( () => Text( - DateFormatUtils.longFormatD.format(_controller.date.value), + DateFormatUtils.longFormatD.format( + _controller.date.value, + ), ), ), ), diff --git a/lib/pages/dynamics_create_vote/view.dart b/lib/pages/dynamics_create_vote/view.dart index faffefad..326e21f0 100644 --- a/lib/pages/dynamics_create_vote/view.dart +++ b/lib/pages/dynamics_create_vote/view.dart @@ -244,7 +244,9 @@ class _CreateVotePageState extends State { padding: const EdgeInsets.symmetric(vertical: 4), child: Obx( () => Text( - DateFormatUtils.longFormatD.format(_controller.endtime.value), + DateFormatUtils.longFormatD.format( + _controller.endtime.value, + ), ), ), ), diff --git a/lib/pages/live_room/view.dart b/lib/pages/live_room/view.dart index 74e712b1..89eb24cc 100644 --- a/lib/pages/live_room/view.dart +++ b/lib/pages/live_room/view.dart @@ -672,8 +672,10 @@ class _LiveRoomPageState extends State } Widget get _buildBodyH { - final videoWidth = + double videoWidth = clampDouble(maxHeight / maxWidth * 1.08, 0.56, 0.7) * maxWidth; + final rigthWidth = min(400.0, maxWidth - videoWidth - padding.horizontal); + videoWidth = maxWidth - rigthWidth; final videoHeight = maxHeight - padding.top; return Obx( () { @@ -707,7 +709,7 @@ class _LiveRoomPageState extends State Offstage( offstage: isFullScreen, child: SizedBox( - width: maxWidth - videoWidth - padding.horizontal, + width: rigthWidth, height: videoHeight, child: _buildBottomWidget, ), diff --git a/lib/pages/video/widgets/header_control.dart b/lib/pages/video/widgets/header_control.dart index 293231ac..4beefd65 100644 --- a/lib/pages/video/widgets/header_control.dart +++ b/lib/pages/video/widgets/header_control.dart @@ -1977,8 +1977,8 @@ class HeaderControlState extends State { ), if (introController.videoDetail.value.title != null && (isFullScreen || - (!horizontalScreen && !isPortrait) || - plPlayerController.isDesktopPip)) + ((!horizontalScreen || plPlayerController.isDesktopPip) && + !isPortrait))) Expanded( child: Column( mainAxisSize: MainAxisSize.min, diff --git a/pubspec.lock b/pubspec.lock index e65aabb0..109708f1 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1195,7 +1195,7 @@ packages: description: path: media_kit_video ref: "version_1.2.5" - resolved-ref: "3ab061c314d0a7f57e8cd6ea610cc1977686fdc1" + resolved-ref: "902e962556c0bde4d384cd8f72b814598e5dfcf2" url: "https://github.com/bggRGjQaUbCoE/media-kit.git" source: git version: "1.2.5"