opt: pages

Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>
2025-12-06 09:13:48 +08:00 · 2025-01-02 20:34:05 +08:00
parent f1a10a786d
commit 621239551f
22 changed files with 227 additions and 191 deletions
--- a/lib/common/skeleton/video_card_v.dart
+++ b/lib/common/skeleton/video_card_v.dart
@@ -45,6 +45,17 @@ class VideoCardVSkeleton extends StatelessWidget {
                  margin: const EdgeInsets.only(bottom: 12),
                  color: Theme.of(context).colorScheme.onInverseSurface,
                ),
+                Container(
+                  width: 110,
+                  height: 13,
+                  margin: const EdgeInsets.only(bottom: 5),
+                  color: Theme.of(context).colorScheme.onInverseSurface,
+                ),
+                Container(
+                  width: 75,
+                  height: 13,
+                  color: Theme.of(context).colorScheme.onInverseSurface,
+                ),
              ],
            ),
          ),
--- a/lib/common/widgets/video_card_h.dart
+++ b/lib/common/widgets/video_card_h.dart
@@ -145,7 +145,7 @@ class VideoCardH extends StatelessWidget {
      if (source == 'normal')
        Positioned(
          bottom: 0,
-          right: 0,
+          right: 12,
          child: VideoPopupMenu(
            size: 29,
            iconSize: 17,
--- a/lib/common/widgets/video_card_h_member_video.dart
+++ b/lib/common/widgets/video_card_h_member_video.dart
@@ -106,7 +106,7 @@ class VideoCardHMemberVideo extends StatelessWidget {
        ),
        Positioned(
          bottom: 0,
-          right: 0,
+          right: 12,
          child: VideoPopupMenu(
            size: 29,
            iconSize: 17,
--- a/lib/common/widgets/video_card_v_member_home.dart
+++ b/lib/common/widgets/video_card_v_member_home.dart
@@ -220,13 +220,13 @@ Widget videoContent(BuildContext context, Item videoItem) {
              ),
            ],
          ),
-          const Spacer(),
+          // const Spacer(),
          // const SizedBox(height: 2),
          // VideoStat(
          //   videoItem: videoItem,
          // ),
-          Row(
-            children: [
+          // Row(
+          //   children: [
          // if (videoItem.goto == 'bangumi') ...[
          //   PBadge(
          //     text: videoItem.bangumiBadge,
@@ -244,15 +244,15 @@ Widget videoContent(BuildContext context, Item videoItem) {
          //     type: 'color',
          //   )
          // ],
-              if (videoItem.goto == 'picture') ...[
-                const PBadge(
-                  text: '动态',
-                  stack: 'normal',
-                  size: 'small',
-                  type: 'line',
-                  fs: 9,
-                )
-              ],
+          // if (videoItem.goto == 'picture') ...[
+          //   const PBadge(
+          //     text: '动态',
+          //     stack: 'normal',
+          //     size: 'small',
+          //     type: 'line',
+          //     fs: 9,
+          //   )
+          // ],
          // if (videoItem.isFollowed == 1) ...[
          //   const PBadge(
          //     text: '已关注',
@@ -261,23 +261,23 @@ Widget videoContent(BuildContext context, Item videoItem) {
          //     type: 'color',
          //   )
          // ],
-              Expanded(
-                flex: 1,
-                child: Text(
-                  videoItem.author ?? '',
-                  // semanticsLabel: "Up主：${videoItem.owner.name}",
-                  maxLines: 1,
-                  overflow: TextOverflow.clip,
-                  style: TextStyle(
-                    height: 1.5,
-                    fontSize: Theme.of(context).textTheme.labelMedium!.fontSize,
-                    color: Theme.of(context).colorScheme.outline,
-                  ),
-                ),
-              ),
-              if (videoItem.goto == 'av') const SizedBox(width: 10)
-            ],
-          ),
+          // Expanded(
+          //   flex: 1,
+          //   child: Text(
+          //     videoItem.author ?? '',
+          //     // semanticsLabel: "Up主：${videoItem.owner.name}",
+          //     maxLines: 1,
+          //     overflow: TextOverflow.clip,
+          //     style: TextStyle(
+          //       height: 1.5,
+          //       fontSize: Theme.of(context).textTheme.labelMedium!.fontSize,
+          //       color: Theme.of(context).colorScheme.outline,
+          //     ),
+          //   ),
+          // ),
+          // if (videoItem.goto == 'av') const SizedBox(width: 10)
+          // ],
+          // ),
        ],
      ),
    ),
--- a/lib/http/video.dart
+++ b/lib/http/video.dart
@@ -230,9 +230,9 @@ class VideoHttp {
    });

    try {
-      var res = epid != null
-          ? await Request().get(Api.bangumiVideoUrl, queryParameters: params)
-          : await Request().get(Api.videoUrl, queryParameters: params);
+      var res = await Request().get(
+          epid != null ? Api.bangumiVideoUrl : Api.videoUrl,
+          queryParameters: params);
      if (res.data['code'] == 0) {
        late PlayUrlModel data;
        if (epid != null) {
--- a/lib/pages/bangumi/introduction/view.dart
+++ b/lib/pages/bangumi/introduction/view.dart
@@ -82,7 +82,7 @@ class _BangumiIntroPanelState extends State<BangumiIntroPanel>
    return switch (loadingState) {
      Loading() => BangumiInfo(
          heroTag: widget.heroTag,
-          loadingStatus: true,
+          isLoading: true,
          bangumiDetail: null,
          cid: cid,
          showEpisodes: widget.showEpisodes,
@@ -90,7 +90,7 @@ class _BangumiIntroPanelState extends State<BangumiIntroPanel>
        ),
      Success() => BangumiInfo(
          heroTag: widget.heroTag,
-          loadingStatus: false,
+          isLoading: false,
          bangumiDetail: loadingState.response,
          cid: cid,
          showEpisodes: widget.showEpisodes,
@@ -111,7 +111,7 @@ class _BangumiIntroPanelState extends State<BangumiIntroPanel>
 class BangumiInfo extends StatefulWidget {
  const BangumiInfo({
    super.key,
-    this.loadingStatus = false,
+    this.isLoading = false,
    this.bangumiDetail,
    this.cid,
    required this.showEpisodes,
@@ -119,7 +119,7 @@ class BangumiInfo extends StatefulWidget {
    required this.heroTag,
  });

-  final bool loadingStatus;
+  final bool isLoading;
  final BangumiInfoModel? bangumiDetail;
  final int? cid;
  final Function showEpisodes;
@@ -221,9 +221,11 @@ class _BangumiInfoState extends State<BangumiInfo>
      padding: EdgeInsets.only(
        left: StyleString.safeSpace,
        right: StyleString.safeSpace,
-          top: isLandscape ? 10 : 20),
+        top: StyleString.safeSpace,
+        bottom: StyleString.safeSpace + MediaQuery.paddingOf(context).bottom,
+      ),
      sliver: SliverToBoxAdapter(
-        child: !widget.loadingStatus || bangumiItem != null
+        child: !widget.isLoading || bangumiItem != null
            ? Column(
                crossAxisAlignment: CrossAxisAlignment.start,
                children: [
@@ -232,19 +234,33 @@ class _BangumiInfoState extends State<BangumiInfo>
                    children: [
                      Stack(
                        children: [
-                          NetworkImgLayer(
-                            width: isLandscape ? 160 : 105,
-                            height: isLandscape ? 105 : 160,
-                            src: !widget.loadingStatus
+                          GestureDetector(
+                            onTap: () => context.imageView(
+                              imgList: [
+                                !widget.isLoading
+                                    ? widget.bangumiDetail!.cover!
+                                    : bangumiItem!.cover!
+                              ],
+                            ),
+                            child: Hero(
+                              tag: !widget.isLoading
+                                  ? widget.bangumiDetail!.cover!
+                                  : bangumiItem!.cover!,
+                              child: NetworkImgLayer(
+                                width: isLandscape ? 115 / 0.75 : 115,
+                                height: isLandscape ? 115 : 115 / 0.75,
+                                src: !widget.isLoading
                                    ? widget.bangumiDetail!.cover!
                                    : bangumiItem!.cover!,
                                semanticsLabel: '封面',
                              ),
+                            ),
+                          ),
                          if (bangumiItem != null &&
                              bangumiItem!.rating != null)
                            PBadge(
                              text:
-                                  '评分 ${!widget.loadingStatus ? widget.bangumiDetail!.rating!['score']! : bangumiItem!.rating!['score']!}',
+                                  '评分 ${!widget.isLoading ? widget.bangumiDetail!.rating!['score']! : bangumiItem!.rating!['score']!}',
                              top: null,
                              right: 6,
                              bottom: 6,
@@ -254,19 +270,20 @@ class _BangumiInfoState extends State<BangumiInfo>
                      ),
                      const SizedBox(width: 10),
                      Expanded(
-                        child: InkWell(
+                        child: GestureDetector(
                          onTap: showIntroDetail,
                          child: SizedBox(
-                            height: isLandscape ? 103 : 158,
+                            height: isLandscape ? 115 : 115 / 0.75,
                            child: Column(
                              crossAxisAlignment: CrossAxisAlignment.start,
                              mainAxisSize: MainAxisSize.min,
                              children: [
                                Row(
+                                  crossAxisAlignment: CrossAxisAlignment.start,
                                  children: [
                                    Expanded(
                                      child: Text(
-                                        !widget.loadingStatus
+                                        !widget.isLoading
                                            ? widget.bangumiDetail!.title!
                                            : bangumiItem!.title!,
                                        style: const TextStyle(
@@ -280,8 +297,12 @@ class _BangumiInfoState extends State<BangumiInfo>
                                    Obx(
                                      () => FilledButton.tonal(
                                        style: FilledButton.styleFrom(
+                                          tapTargetSize:
+                                              MaterialTapTargetSize.shrinkWrap,
                                          padding: const EdgeInsets.symmetric(
-                                              horizontal: 20, vertical: 10),
+                                            horizontal: 20,
+                                            vertical: 10,
+                                          ),
                                          visualDensity: const VisualDensity(
                                            horizontal: -2,
                                            vertical: -2,
@@ -330,7 +351,7 @@ class _BangumiInfoState extends State<BangumiInfo>
                                    statView(
                                      context: context,
                                      theme: 'gray',
-                                      view: !widget.loadingStatus
+                                      view: !widget.isLoading
                                          ? widget.bangumiDetail!.stat!['views']
                                          : bangumiItem!.stat!['views'],
                                      size: 'medium',
@@ -339,7 +360,7 @@ class _BangumiInfoState extends State<BangumiInfo>
                                    statDanMu(
                                      context: context,
                                      theme: 'gray',
-                                      danmu: !widget.loadingStatus
+                                      danmu: !widget.isLoading
                                          ? widget
                                              .bangumiDetail!.stat!['danmakus']
                                          : bangumiItem!.stat!['danmakus'],
@@ -372,7 +393,7 @@ class _BangumiInfoState extends State<BangumiInfo>
                                      t: t),
                                const Spacer(),
                                Text(
-                                  '简介：${!widget.loadingStatus ? widget.bangumiDetail!.evaluate! : bangumiItem!.evaluate!}',
+                                  '简介：${!widget.isLoading ? widget.bangumiDetail!.evaluate! : bangumiItem!.evaluate!}',
                                  maxLines: isLandscape ? 2 : 3,
                                  overflow: TextOverflow.ellipsis,
                                  style: TextStyle(
@@ -401,7 +422,7 @@ class _BangumiInfoState extends State<BangumiInfo>
                  // 点赞收藏转发 布局样式2
                  actionGrid(context, bangumiIntroController),
                  // 番剧分p
-                  if ((!widget.loadingStatus &&
+                  if ((!widget.isLoading &&
                          widget.bangumiDetail!.episodes!.isNotEmpty) ||
                      bangumiItem != null &&
                          bangumiItem!.episodes!.isNotEmpty) ...[
@@ -452,7 +473,7 @@ class _BangumiInfoState extends State<BangumiInfo>
                    selectStatus: bangumiIntroController.hasLike.value,
                    loadingStatus: false,
                    semanticsLabel: '点赞',
-                    text: !widget.loadingStatus
+                    text: !widget.isLoading
                        ? Utils.numFormat(widget.bangumiDetail!.stat!['likes']!)
                        : Utils.numFormat(
                            bangumiItem!.stat!['likes']!,
@@ -482,7 +503,7 @@ class _BangumiInfoState extends State<BangumiInfo>
                    selectStatus: bangumiIntroController.hasCoin.value,
                    loadingStatus: false,
                    semanticsLabel: '投币',
-                    text: !widget.loadingStatus
+                    text: !widget.isLoading
                        ? Utils.numFormat(widget.bangumiDetail!.stat!['coins']!)
                        : Utils.numFormat(
                            bangumiItem!.stat!['coins']!,
@@ -499,7 +520,7 @@ class _BangumiInfoState extends State<BangumiInfo>
                    selectStatus: bangumiIntroController.hasFav.value,
                    loadingStatus: false,
                    semanticsLabel: '收藏',
-                    text: !widget.loadingStatus
+                    text: !widget.isLoading
                        ? Utils.numFormat(
                            widget.bangumiDetail!.stat!['favorite']!)
                        : Utils.numFormat(
@@ -515,7 +536,7 @@ class _BangumiInfoState extends State<BangumiInfo>
                  selectStatus: false,
                  loadingStatus: false,
                  semanticsLabel: '评论',
-                  text: !widget.loadingStatus
+                  text: !widget.isLoading
                      ? Utils.numFormat(widget.bangumiDetail!.stat!['reply']!)
                      : Utils.numFormat(bangumiItem!.stat!['reply']!),
                ),
@@ -525,7 +546,7 @@ class _BangumiInfoState extends State<BangumiInfo>
                    selectStatus: false,
                    loadingStatus: false,
                    semanticsLabel: '转发',
-                    text: !widget.loadingStatus
+                    text: !widget.isLoading
                        ? Utils.numFormat(widget.bangumiDetail!.stat!['share']!)
                        : Utils.numFormat(bangumiItem!.stat!['share']!)),
              ],
@@ -543,8 +564,8 @@ class _BangumiInfoState extends State<BangumiInfo>
          icon: const Icon(FontAwesomeIcons.thumbsUp),
          onTap: () => handleState(videoIntroController.actionLikeVideo),
          selectStatus: videoIntroController.hasLike.value,
-          loadingStatus: widget.loadingStatus,
-          text: !widget.loadingStatus
+          loadingStatus: widget.isLoading,
+          text: !widget.isLoading
              ? widget.bangumiDetail!.stat!['likes']!.toString()
              : '-',
        ),
@@ -555,8 +576,8 @@ class _BangumiInfoState extends State<BangumiInfo>
          icon: const Icon(FontAwesomeIcons.b),
          onTap: () => handleState(videoIntroController.actionCoinVideo),
          selectStatus: videoIntroController.hasCoin.value,
-          loadingStatus: widget.loadingStatus,
-          text: !widget.loadingStatus
+          loadingStatus: widget.isLoading,
+          text: !widget.isLoading
              ? widget.bangumiDetail!.stat!['coins']!.toString()
              : '-',
        ),
@@ -567,8 +588,8 @@ class _BangumiInfoState extends State<BangumiInfo>
          icon: const Icon(FontAwesomeIcons.heart),
          onTap: () => showFavBottomSheet(),
          selectStatus: videoIntroController.hasFav.value,
-          loadingStatus: widget.loadingStatus,
-          text: !widget.loadingStatus
+          loadingStatus: widget.isLoading,
+          text: !widget.isLoading
              ? widget.bangumiDetail!.stat!['favorite']!.toString()
              : '-',
        ),
@@ -580,8 +601,8 @@ class _BangumiInfoState extends State<BangumiInfo>
          videoDetailCtr.tabCtr.animateTo(1);
        },
        selectStatus: false,
-        loadingStatus: widget.loadingStatus,
-        text: !widget.loadingStatus
+        loadingStatus: widget.isLoading,
+        text: !widget.isLoading
            ? widget.bangumiDetail!.stat!['reply']!.toString()
            : '-',
      ),
@@ -590,7 +611,7 @@ class _BangumiInfoState extends State<BangumiInfo>
          icon: const Icon(FontAwesomeIcons.share),
          onTap: () => videoIntroController.actionShareVideo(),
          selectStatus: false,
-          loadingStatus: widget.loadingStatus,
+          loadingStatus: widget.isLoading,
          text: '转发'),
    ]);
  }
@@ -666,7 +687,7 @@ class AreasAndPubTime extends StatelessWidget {
    return Row(
      children: [
        Text(
-          !widget.loadingStatus
+          !widget.isLoading
              ? (widget.bangumiDetail!.areas!.isNotEmpty
                  ? widget.bangumiDetail!.areas!.first['name']
                  : '')
@@ -680,7 +701,7 @@ class AreasAndPubTime extends StatelessWidget {
        ),
        const SizedBox(width: 6),
        Text(
-          !widget.loadingStatus
+          !widget.isLoading
              ? widget.bangumiDetail!.publish!['pub_time_show']
              : bangumiItem!.publish!['pub_time_show'],
          style: TextStyle(
@@ -708,7 +729,7 @@ class NewEpDesc extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    return Text(
-      !widget.loadingStatus
+      !widget.isLoading
          ? widget.bangumiDetail!.newEp!['desc']
          : bangumiItem!.newEp!['desc'],
      style: TextStyle(
--- a/lib/pages/bangumi/view.dart
+++ b/lib/pages/bangumi/view.dart
@@ -62,8 +62,10 @@ class _BangumiPageState extends State<BangumiPage>
    super.build(context);
    return refreshIndicator(
      onRefresh: () async {
-        await _bangumiController.onRefresh();
-        await _bangumiController.queryBangumiFollow();
+        await Future.wait([
+          _bangumiController.onRefresh(),
+          _bangumiController.queryBangumiFollow(),
+        ]);
      },
      child: CustomScrollView(
        controller: _bangumiController.scrollController,
@@ -76,8 +78,7 @@ class _BangumiPageState extends State<BangumiPage>
                child: Column(
                  children: [
                    Padding(
-                      padding: const EdgeInsets.only(
-                          top: StyleString.safeSpace, bottom: 10, left: 16),
+                      padding: const EdgeInsets.only(left: 16),
                      child: Row(
                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
                        children: [
@@ -99,7 +100,8 @@ class _BangumiPageState extends State<BangumiPage>
                      ),
                    ),
                    SizedBox(
-                      height: Grid.maxRowWidth * 1,
+                      height: Grid.maxRowWidth / 2 / 0.75 +
+                          MediaQuery.textScalerOf(context).scale(50),
                      child: Obx(
                        () => _buildFollowBody(
                            _bangumiController.followState.value),
@@ -143,13 +145,13 @@ class _BangumiPageState extends State<BangumiPage>
          ? SliverGrid(
              gridDelegate: SliverGridDelegateWithExtentAndRatio(
                // 行间距
-                mainAxisSpacing: StyleString.cardSpace - 2,
+                mainAxisSpacing: StyleString.cardSpace,
                // 列间距
                crossAxisSpacing: StyleString.cardSpace,
                // 最大宽度
                maxCrossAxisExtent: Grid.maxRowWidth / 3 * 2,
-                childAspectRatio: 0.65,
-                mainAxisExtent: MediaQuery.textScalerOf(context).scale(60),
+                childAspectRatio: 0.75,
+                mainAxisExtent: MediaQuery.textScalerOf(context).scale(50),
              ),
              delegate: SliverChildBuilderDelegate(
                (BuildContext context, int index) {
@@ -180,7 +182,6 @@ class _BangumiPageState extends State<BangumiPage>
      itemBuilder: (context, index) {
        return Container(
          width: Grid.maxRowWidth / 2,
-          height: Grid.maxRowWidth * 1,
          margin: EdgeInsets.only(
            left: StyleString.safeSpace,
            right: index == loadingState.response.length - 1
--- a/lib/pages/bangumi/widgets/bangumi_card_v.dart
+++ b/lib/pages/bangumi/widgets/bangumi_card_v.dart
@@ -83,14 +83,9 @@ class BangumiCardV extends StatelessWidget {
          child: Column(
            children: [
              ClipRRect(
-                borderRadius: const BorderRadius.only(
-                  topLeft: StyleString.imgRadius,
-                  topRight: StyleString.imgRadius,
-                  bottomLeft: StyleString.imgRadius,
-                  bottomRight: StyleString.imgRadius,
-                ),
+                borderRadius: const BorderRadius.all(StyleString.imgRadius),
                child: AspectRatio(
-                  aspectRatio: 0.65,
+                  aspectRatio: 0.75,
                  child: LayoutBuilder(builder: (context, boxConstraints) {
                    final double maxWidth = boxConstraints.maxWidth;
                    final double maxHeight = boxConstraints.maxHeight;
@@ -110,7 +105,8 @@ class BangumiCardV extends StatelessWidget {
                            top: 6,
                            right: 6,
                            bottom: null,
-                              left: null),
+                            left: null,
+                          ),
                        if (bangumiItem.order != null)
                          PBadge(
                            text: bangumiItem.order,
--- a/lib/pages/bangumi/widgets/bangumi_card_v_member_home.dart
+++ b/lib/pages/bangumi/widgets/bangumi_card_v_member_home.dart
@@ -79,7 +79,7 @@ class BangumiCardVMemberHome extends StatelessWidget {
                bottomRight: StyleString.imgRadius,
              ),
              child: AspectRatio(
-                aspectRatio: 0.65,
+                aspectRatio: 0.75,
                child: LayoutBuilder(builder: (context, boxConstraints) {
                  final double maxWidth = boxConstraints.maxWidth;
                  final double maxHeight = boxConstraints.maxHeight;
--- a/lib/pages/bangumi/widgets/bangumi_panel.dart
+++ b/lib/pages/bangumi/widgets/bangumi_panel.dart
@@ -257,7 +257,7 @@ class _BangumiPanelState extends State<BangumiPanel> {
              );
            },
          ),
-        )
+        ),
      ],
    );
  }
--- a/lib/pages/dynamics/tab/view.dart
+++ b/lib/pages/dynamics/tab/view.dart
@@ -90,8 +90,10 @@ class _DynamicsTabPageState extends State<DynamicsTabPage>
      onRefresh: () async {
        dynamicsWaterfallFlow = GStorage.setting
            .get(SettingBoxKey.dynamicsWaterfallFlow, defaultValue: true);
-        await _dynamicsTabController.onRefresh();
-        await dynamicsController.queryFollowUp();
+        await Future.wait([
+          _dynamicsTabController.onRefresh(),
+          dynamicsController.queryFollowUp(),
+        ]);
      },
      child: CustomScrollView(
        physics: const AlwaysScrollableScrollPhysics(),
--- a/lib/pages/fav_detail/widget/fav_video_card.dart
+++ b/lib/pages/fav_detail/widget/fav_video_card.dart
@@ -1,3 +1,4 @@
+import 'package:PiliPalaX/common/widgets/icon_button.dart';
 import 'package:PiliPalaX/common/widgets/image_save.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
@@ -215,12 +216,13 @@ class FavVideoCardH extends StatelessWidget {
            if (searchType != 1 && isOwner)
              Positioned(
                right: 0,
-                bottom: -4,
-                child: IconButton(
+                bottom: 0,
+                child: iconButton(
+                  context: context,
+                  icon: Icons.clear,
                  tooltip: '取消收藏',
-                  style: ButtonStyle(
-                    padding: WidgetStateProperty.all(EdgeInsets.zero),
-                  ),
+                  iconColor: Theme.of(context).colorScheme.onSurfaceVariant,
+                  bgColor: Colors.transparent,
                  onPressed: () {
                    showDialog(
                      context: Get.context!,
@@ -250,11 +252,6 @@ class FavVideoCardH extends StatelessWidget {
                      },
                    );
                  },
-                  icon: Icon(
-                    Icons.clear_outlined,
-                    color: Theme.of(context).colorScheme.outline,
-                    size: 18,
-                  ),
                ),
              ),
          ],
--- a/lib/pages/history/widgets/item.dart
+++ b/lib/pages/history/widgets/item.dart
@@ -372,7 +372,7 @@ class HistoryItem extends StatelessWidget {
                    icon: Icon(
                      Icons.more_vert_outlined,
                      color: Theme.of(context).colorScheme.outline,
-                      size: 14,
+                      size: 18,
                    ),
                    position: PopupMenuPosition.under,
                    // constraints: const BoxConstraints(maxHeight: 35),
--- a/lib/pages/later/view.dart
+++ b/lib/pages/later/view.dart
@@ -221,10 +221,9 @@ class _LaterPageState extends State<LaterPage> {
                        ),
                      ),
                      Positioned(
-                        right: 0,
+                        right: 12,
                        bottom: 0,
                        child: iconButton(
-                          size: 30,
                          tooltip: '移除',
                          context: context,
                          onPressed: () {
--- a/lib/pages/member/new/content/member_contribute/content/bangumi/member_bangumi.dart
+++ b/lib/pages/member/new/content/member_contribute/content/bangumi/member_bangumi.dart
@@ -64,9 +64,9 @@ class _MemberBangumiState extends State<MemberBangumi>
                        mainAxisSpacing: StyleString.cardSpace,
                        crossAxisSpacing: StyleString.cardSpace,
                        maxCrossAxisExtent: Grid.maxRowWidth / 3 * 2,
-                        childAspectRatio: 0.65,
+                        childAspectRatio: 0.75,
                        mainAxisExtent:
-                            MediaQuery.textScalerOf(context).scale(60),
+                            MediaQuery.textScalerOf(context).scale(30),
                      ),
                      delegate: SliverChildBuilderDelegate(
                        (context, index) {
--- a/lib/pages/member/new/content/member_home/member_home.dart
+++ b/lib/pages/member/new/content/member_home/member_home.dart
@@ -64,7 +64,7 @@ class _MemberHomeState extends State<MemberHome>
                        maxCrossAxisExtent: Grid.maxRowWidth,
                        childAspectRatio: StyleString.aspectRatio,
                        mainAxisExtent:
-                            MediaQuery.textScalerOf(context).scale(90),
+                            MediaQuery.textScalerOf(context).scale(55),
                      ),
                      delegate: SliverChildBuilderDelegate(
                        (context, index) {
@@ -186,12 +186,12 @@ class _MemberHomeState extends State<MemberHome>
                    ),
                    sliver: SliverGrid(
                      gridDelegate: SliverGridDelegateWithExtentAndRatio(
-                        mainAxisSpacing: StyleString.cardSpace - 2,
+                        mainAxisSpacing: StyleString.cardSpace,
                        crossAxisSpacing: StyleString.cardSpace,
                        maxCrossAxisExtent: Grid.maxRowWidth / 3 * 2,
-                        childAspectRatio: 0.65,
+                        childAspectRatio: 0.75,
                        mainAxisExtent:
-                            MediaQuery.textScalerOf(context).scale(60),
+                            MediaQuery.textScalerOf(context).scale(30),
                      ),
                      delegate: SliverChildBuilderDelegate(
                        (context, index) {
--- a/lib/pages/video/detail/controller.dart
+++ b/lib/pages/video/detail/controller.dart
@@ -8,6 +8,7 @@ import 'package:PiliPalaX/common/widgets/pair.dart';
 import 'package:PiliPalaX/common/widgets/segment_progress_bar.dart';
 import 'package:PiliPalaX/http/danmaku.dart';
 import 'package:PiliPalaX/http/init.dart';
+import 'package:PiliPalaX/http/loading_state.dart';
 import 'package:PiliPalaX/http/user.dart';
 import 'package:PiliPalaX/models/video/later.dart';
 import 'package:PiliPalaX/models/video/play/subtitle.dart';
@@ -162,12 +163,10 @@ class VideoDetailController extends GetxController
  /// tabs相关配置
  int tabInitialIndex = 0;
  late TabController tabCtr;
-  RxList<String> tabs = <String>['简介', '评论'].obs;

  // 请求返回的视频信息
  late PlayUrlModel data;
-  // 请求状态
-  RxBool isLoading = false.obs;
+  Rx<LoadingState> videoState = LoadingState.loading().obs;

  /// 播放器配置 画质 音质 解码格式
  late VideoQuality currentVideoQa;
@@ -175,8 +174,6 @@ class VideoDetailController extends GetxController
  late VideoDecodeFormats currentDecodeFormats;
  // 是否开始自动播放 存在多p的情况下，第二p需要为true
  RxBool autoPlay = true.obs;
-  // 视频资源是否有效
-  RxBool isEffective = true.obs;
  // 封面图的展示
  RxBool isShowCover = true.obs;
  // 硬解
@@ -1061,8 +1058,13 @@ class VideoDetailController extends GetxController
    plPlayerController.headerControl = headerControl;
  }

+  bool isQuerying = false;
  // 视频链接
  Future queryVideoUrl() async {
+    if (isQuerying) {
+      return;
+    }
+    isQuerying = true;
    if (cacheVideoQa == null) {
      await Connectivity().checkConnectivity().then((res) {
        cacheVideoQa = res.contains(ConnectivityResult.wifi)
@@ -1226,7 +1228,8 @@ class VideoDetailController extends GetxController
        SmartDialog.showToast("错误（${result['code']}）：${result['msg']}");
      }
    }
-    return result;
+    isQuerying = false;
+    videoState.value = LoadingState.success(null);
  }

  List<PostSegmentModel>? list;
--- a/lib/pages/video/detail/introduction/controller.dart
+++ b/lib/pages/video/detail/introduction/controller.dart
@@ -2,6 +2,7 @@ import 'dart:async';
 import 'dart:math';

 import 'package:PiliPalaX/http/loading_state.dart';
+import 'package:PiliPalaX/utils/extension.dart';
 import 'package:PiliPalaX/utils/utils.dart';
 import 'package:expandable/expandable.dart';
 import 'package:flutter/material.dart';
@@ -146,7 +147,8 @@ class VideoIntroController extends GetxController
        final videoDetailController =
            Get.find<VideoDetailController>(tag: heroTag);
        if (videoDetailController.videoItem['pic'] == null ||
-            videoDetailController.videoItem['pic'] == '') {
+            videoDetailController.videoItem['pic'] == '' ||
+            videoDetailController.videoUrl.isNullOrEmpty) {
          videoDetailController.videoItem['pic'] = result['data'].pic;
        }
      } catch (_) {}
--- a/lib/pages/video/detail/introduction/view.dart
+++ b/lib/pages/video/detail/introduction/view.dart
@@ -653,6 +653,10 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
                            videoIntroController
                                .queryVideoIntroData.value["status"] = true;
                            videoIntroController.queryVideoIntro();
+                            if (videoDetailCtr.videoUrl.isNullOrEmpty &&
+                                videoDetailCtr.isQuerying.not) {
+                              videoDetailCtr.queryVideoUrl();
+                            }
                          },
                          label: const Text("点此重新加载"),
                        ),
--- a/lib/pages/video/detail/view.dart
+++ b/lib/pages/video/detail/view.dart
@@ -73,7 +73,6 @@ class _VideoDetailPageState extends State<VideoDetailPage>

  double doubleOffset = 0;

-  late Future _futureBuilderFuture;
  // 自动退出全屏
  late bool autoExitFullscreen;
  late bool autoPlayEnable;
@@ -194,7 +193,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>

  // 获取视频资源，初始化播放器
  Future<void> videoSourceInit() async {
-    _futureBuilderFuture = videoDetailController.queryVideoUrl();
+    videoDetailController.queryVideoUrl();
    if (videoDetailController.showReply) {
      _videoReplyController.queryData();
    }
@@ -289,6 +288,9 @@ class _VideoDetailPageState extends State<VideoDetailPage>
        videoDetailController.audioUrl == null) {
      // SmartDialog.showToast('not initialized');
      debugPrint('not initialized');
+      if (videoDetailController.isQuerying.not) {
+        videoDetailController.queryVideoUrl();
+      }
      return;
    }
    plPlayerController = videoDetailController.plPlayerController;
@@ -985,8 +987,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>

  Widget get manualPlayerWidget => Obx(
        () => Visibility(
-          visible: videoDetailController.isShowCover.value &&
-              videoDetailController.isEffective.value,
+          visible: videoDetailController.isShowCover.value,
          child: Stack(
            children: [
              Positioned(
@@ -1084,12 +1085,10 @@ class _VideoDetailPageState extends State<VideoDetailPage>
        ),
      );

-  Widget get plPlayer => FutureBuilder(
-        future: _futureBuilderFuture,
-        builder: (BuildContext context, AsyncSnapshot snapshot) {
-          if (snapshot.hasData && snapshot.data['status']) {
-            return Obx(
-              () => !videoDetailController.autoPlay.value ||
+  Widget get plPlayer => Obx(
+        () => videoDetailController.videoState.value is! Success
+            ? nil
+            : !videoDetailController.autoPlay.value ||
                    plPlayerController == null ||
                    plPlayerController!.videoController == null
                ? nil
@@ -1106,8 +1105,8 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                    headerControl: videoDetailController.headerControl,
                    danmuWidget: Obx(
                      () => PlDanmaku(
-                          key: Key(videoDetailController.danmakuCid.value
-                              .toString()),
+                        key: Key(
+                            videoDetailController.danmakuCid.value.toString()),
                        cid: videoDetailController.danmakuCid.value,
                        playerController: plPlayerController!,
                      ),
@@ -1116,11 +1115,6 @@ class _VideoDetailPageState extends State<VideoDetailPage>
                    showViewPoints: showViewPoints,
                  ),
      );
-          } else {
-            return const SizedBox();
-          }
-        },
-      );

  Widget autoChoose(Widget childWhenDisabled) {
    if (Platform.isAndroid) {
--- a/lib/pages/whisper/view.dart
+++ b/lib/pages/whisper/view.dart
@@ -71,8 +71,10 @@ class _WhisperPageState extends State<WhisperPage> {
      ),
      body: refreshIndicator(
        onRefresh: () async {
-          await _whisperController.queryMsgFeedUnread();
-          await _whisperController.onRefresh();
+          await Future.wait([
+            _whisperController.queryMsgFeedUnread(),
+            _whisperController.onRefresh(),
+          ]);
        },
        child: SingleChildScrollView(
          controller: _scrollController,
--- a/lib/utils/extension.dart
+++ b/lib/utils/extension.dart
@@ -53,6 +53,10 @@ extension StringExt on String {
  String get http2https => replaceFirst(RegExp("^http://"), "https://");
 }

+extension StringNullExt on String? {
+  bool get isNullOrEmpty => this == null || this!.isEmpty;
+}
+
 extension BoolExt on bool {
  bool get not => !this;
 }