Merge pull request #635 from guozhigq/feature-videoDetailCodeCleanUp

feat: 视频番剧详情页代码整理

lib/pages/bangumi/introduction/controller.dart

@@ -25,13 +25,6 @@ class BangumiIntroController extends GetxController {
       ? int.tryParse(Get.parameters['epId']!)
       : null;
 
-  // 是否预渲染 骨架屏
-  bool preRender = false;
-
-  // 视频详情 上个页面传入
-  Map? videoItem = {};
-  BangumiInfoModel? bangumiItem;
-
   // 请求状态
   RxBool isLoading = false.obs;
 
@@ -63,27 +56,6 @@ class BangumiIntroController extends GetxController {
   @override
   void onInit() {
     super.onInit();
-    if (Get.arguments.isNotEmpty as bool) {
-      if (Get.arguments.containsKey('bangumiItem') as bool) {
-        preRender = true;
-        bangumiItem = Get.arguments['bangumiItem'];
-        // bangumiItem!['pic'] = args.pic;
-        // if (args.title is String) {
-        //   videoItem!['title'] = args.title;
-        // } else {
-        //   String str = '';
-        //   for (Map map in args.title) {
-        //     str += map['text'];
-        //   }
-        //   videoItem!['title'] = str;
-        // }
-        // if (args.stat != null) {
-        //   videoItem!['stat'] = args.stat;
-        // }
-        // videoItem!['pubdate'] = args.pubdate;
-        // videoItem!['owner'] = args.owner;
-      }
-    }
     userInfo = userInfoCache.get('userInfoCache');
     userLogin = userInfo != null;
   }
@@ -196,7 +168,8 @@ class BangumiIntroController extends GetxController {
                   }
                   Get.back();
                 },
-                  child: const Text('确定'))
+                child: const Text('确定'),
+              )
             ],
           );
         });

lib/pages/bangumi/introduction/view.dart

@@ -12,11 +12,10 @@ import 'package:pilipala/models/bangumi/info.dart';
 import 'package:pilipala/pages/bangumi/widgets/bangumi_panel.dart';
 import 'package:pilipala/pages/video/detail/index.dart';
 import 'package:pilipala/pages/video/detail/introduction/widgets/action_item.dart';
-import 'package:pilipala/pages/video/detail/introduction/widgets/action_row_item.dart';
 import 'package:pilipala/pages/video/detail/introduction/widgets/fav_panel.dart';
 import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/storage.dart';
-
+import '../../../common/widgets/http_error.dart';
 import 'controller.dart';
 import 'widgets/intro_detail.dart';
 
@@ -51,9 +50,6 @@ class _BangumiIntroPanelState extends State<BangumiIntroPanel>
     cid = widget.cid!;
     bangumiIntroController = Get.put(BangumiIntroController(), tag: heroTag);
     videoDetailCtr = Get.find<VideoDetailController>(tag: heroTag);
-    bangumiIntroController.bangumiDetail.listen((BangumiInfoModel value) {
-      bangumiDetail = value;
-    });
     _futureBuilderFuture = bangumiIntroController.queryBangumiIntro();
     videoDetailCtr.cid.listen((int p0) {
       cid = p0;
@@ -68,27 +64,32 @@ class _BangumiIntroPanelState extends State<BangumiIntroPanel>
       future: _futureBuilderFuture,
       builder: (BuildContext context, AsyncSnapshot snapshot) {
         if (snapshot.connectionState == ConnectionState.done) {
+          if (snapshot.data == null) {
+            return const SliverToBoxAdapter(child: SizedBox());
+          }
           if (snapshot.data['status']) {
             // 请求成功
-
+            return Obx(
-            return BangumiInfo(
+              () => BangumiInfo(
-              loadingStatus: false,
+                bangumiDetail: bangumiIntroController.bangumiDetail.value,
-              bangumiDetail: bangumiDetail,
                 cid: cid,
+              ),
             );
           } else {
             // 请求错误
-            // return HttpError(
+            return HttpError(
-            //   errMsg: snapshot.data['msg'],
+              errMsg: snapshot.data['msg'],
-            //   fn: () => Get.back(),
+              fn: () => Get.back(),
-            // );
+            );
-            return const SizedBox();
           }
         } else {
-          return BangumiInfo(
+          return const SliverToBoxAdapter(
-            loadingStatus: true,
+            child: SizedBox(
-            bangumiDetail: bangumiDetail,
+              height: 100,
-            cid: cid,
+              child: Center(
+                child: CircularProgressIndicator(),
+              ),
+            ),
           );
         }
       },
@@ -99,12 +100,10 @@ class _BangumiIntroPanelState extends State<BangumiIntroPanel>
 class BangumiInfo extends StatefulWidget {
   const BangumiInfo({
     super.key,
-    this.loadingStatus = false,
     this.bangumiDetail,
     this.cid,
   });
 
-  final bool loadingStatus;
   final BangumiInfoModel? bangumiDetail;
   final int? cid;
 
@@ -117,7 +116,6 @@ class _BangumiInfoState extends State<BangumiInfo> {
   late final BangumiIntroController bangumiIntroController;
   late final VideoDetailController videoDetailCtr;
   Box localCache = GStrorage.localCache;
-  late final BangumiInfoModel? bangumiItem;
   late double sheetHeight;
   int? cid;
   bool isProcessing = false;
@@ -136,13 +134,10 @@ class _BangumiInfoState extends State<BangumiInfo> {
     super.initState();
     bangumiIntroController = Get.put(BangumiIntroController(), tag: heroTag);
     videoDetailCtr = Get.find<VideoDetailController>(tag: heroTag);
-    bangumiItem = bangumiIntroController.bangumiItem;
     sheetHeight = localCache.get('sheetHeight');
     cid = widget.cid!;
-    print('cid:  $cid');
     videoDetailCtr.cid.listen((p0) {
       cid = p0;
-      print('cid:  $cid');
       setState(() {});
     });
   }
@@ -182,8 +177,7 @@ class _BangumiInfoState extends State<BangumiInfo> {
       padding: const EdgeInsets.only(
           left: StyleString.safeSpace, right: StyleString.safeSpace, top: 20),
       sliver: SliverToBoxAdapter(
-        child: !widget.loadingStatus || bangumiItem != null
+          child: Column(
-            ? Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           Row(
@@ -194,15 +188,10 @@ class _BangumiInfoState extends State<BangumiInfo> {
                   NetworkImgLayer(
                     width: 105,
                     height: 160,
-                            src: !widget.loadingStatus
+                    src: widget.bangumiDetail!.cover!,
-                                ? widget.bangumiDetail!.cover!
-                                : bangumiItem!.cover!,
                   ),
-                          if (bangumiItem != null &&
-                              bangumiItem!.rating != null)
                   PBadge(
-                              text:
+                    text: '评分 ${widget.bangumiDetail!.rating!['score']!}',
-                                  '评分 ${!widget.loadingStatus ? widget.bangumiDetail!.rating!['score']! : bangumiItem!.rating!['score']!}',
                     top: null,
                     right: 6,
                     bottom: 6,
@@ -224,9 +213,7 @@ class _BangumiInfoState extends State<BangumiInfo> {
                           children: [
                             Expanded(
                               child: Text(
-                                        !widget.loadingStatus
+                                widget.bangumiDetail!.title!,
-                                            ? widget.bangumiDetail!.title!
-                                            : bangumiItem!.title!,
                                 style: const TextStyle(
                                   fontSize: 16,
                                   fontWeight: FontWeight.w500,
@@ -246,8 +233,7 @@ class _BangumiInfoState extends State<BangumiInfo> {
                                   backgroundColor:
                                       MaterialStateProperty.resolveWith(
                                           (Set<MaterialState> states) {
-                                            return t
+                                    return t.colorScheme.primaryContainer
-                                                .colorScheme.primaryContainer
                                         .withOpacity(0.7);
                                   }),
                                 ),
@@ -266,18 +252,13 @@ class _BangumiInfoState extends State<BangumiInfo> {
                           children: [
                             StatView(
                               theme: 'gray',
-                                      view: !widget.loadingStatus
+                              view: widget.bangumiDetail!.stat!['views'],
-                                          ? widget.bangumiDetail!.stat!['views']
-                                          : bangumiItem!.stat!['views'],
                               size: 'medium',
                             ),
                             const SizedBox(width: 6),
                             StatDanMu(
                               theme: 'gray',
-                                      danmu: !widget.loadingStatus
+                              danmu: widget.bangumiDetail!.stat!['danmakus'],
-                                          ? widget
-                                              .bangumiDetail!.stat!['danmakus']
-                                          : bangumiItem!.stat!['danmakus'],
                               size: 'medium',
                             ),
                           ],
@@ -286,15 +267,8 @@ class _BangumiInfoState extends State<BangumiInfo> {
                         Row(
                           children: [
                             Text(
-                                      !widget.loadingStatus
+                              (widget.bangumiDetail!.areas!.isNotEmpty
-                                          ? (widget.bangumiDetail!.areas!
+                                  ? widget.bangumiDetail!.areas!.first['name']
-                                                  .isNotEmpty
-                                              ? widget.bangumiDetail!.areas!
-                                                  .first['name']
-                                              : '')
-                                          : (bangumiItem!.areas!.isNotEmpty
-                                              ? bangumiItem!
-                                                  .areas!.first['name']
                                   : ''),
                               style: TextStyle(
                                 fontSize: 12,
@@ -303,11 +277,7 @@ class _BangumiInfoState extends State<BangumiInfo> {
                             ),
                             const SizedBox(width: 6),
                             Text(
-                                      !widget.loadingStatus
+                              widget.bangumiDetail!.publish!['pub_time_show'],
-                                          ? widget.bangumiDetail!
-                                              .publish!['pub_time_show']
-                                          : bangumiItem!
-                                              .publish!['pub_time_show'],
                               style: TextStyle(
                                 fontSize: 12,
                                 color: t.colorScheme.outline,
@@ -315,20 +285,16 @@ class _BangumiInfoState extends State<BangumiInfo> {
                             ),
                           ],
                         ),
-                                // const SizedBox(height: 4),
                         Text(
-                                  !widget.loadingStatus
+                          widget.bangumiDetail!.newEp!['desc'],
-                                      ? widget.bangumiDetail!.newEp!['desc']
-                                      : bangumiItem!.newEp!['desc'],
                           style: TextStyle(
                             fontSize: 12,
                             color: t.colorScheme.outline,
                           ),
                         ),
-                                // const SizedBox(height: 10),
                         const Spacer(),
                         Text(
-                                  '简介：${!widget.loadingStatus ? widget.bangumiDetail!.evaluate! : bangumiItem!.evaluate!}',
+                          '简介：${widget.bangumiDetail!.evaluate!}',
                           maxLines: 3,
                           overflow: TextOverflow.ellipsis,
                           style: TextStyle(
@@ -344,45 +310,21 @@ class _BangumiInfoState extends State<BangumiInfo> {
             ],
           ),
           const SizedBox(height: 6),
-                  // 点赞收藏转发 布局样式1
+
-                  // SingleChildScrollView(
+          /// 点赞收藏转发
-                  //   padding: const EdgeInsets.only(top: 7, bottom: 7),
-                  //   scrollDirection: Axis.horizontal,
-                  //   child: actionRow(
-                  //     context,
-                  //     bangumiIntroController,
-                  //     videoDetailCtr,
-                  //   ),
-                  // ),
-                  // 点赞收藏转发 布局样式2
           actionGrid(context, bangumiIntroController),
           // 番剧分p
-                  if ((!widget.loadingStatus &&
+          if (widget.bangumiDetail!.episodes!.isNotEmpty) ...[
-                          widget.bangumiDetail!.episodes!.isNotEmpty) ||
-                      bangumiItem != null &&
-                          bangumiItem!.episodes!.isNotEmpty) ...[
             BangumiPanel(
-                      pages: bangumiItem != null
+              pages: widget.bangumiDetail!.episodes!,
-                          ? bangumiItem!.episodes!
+              cid: cid ?? widget.bangumiDetail!.episodes!.first.cid,
-                          : widget.bangumiDetail!.episodes!,
-                      cid: cid ??
-                          (bangumiItem != null
-                              ? bangumiItem!.episodes!.first.cid
-                              : widget.bangumiDetail!.episodes!.first.cid),
               sheetHeight: sheetHeight,
-                      changeFuc: (bvid, cid, aid) => bangumiIntroController
+              changeFuc: (bvid, cid, aid) =>
-                          .changeSeasonOrbangu(bvid, cid, aid),
+                  bangumiIntroController.changeSeasonOrbangu(bvid, cid, aid),
             )
           ],
         ],
-              )
+      )),
-            : const SizedBox(
-                height: 100,
-                child: Center(
-                  child: CircularProgressIndicator(),
-                ),
-              ),
-      ),
     );
   }
 
@@ -404,25 +346,19 @@ class _BangumiInfoState extends State<BangumiInfo> {
                   () => ActionItem(
                     icon: const Icon(FontAwesomeIcons.thumbsUp),
                     selectIcon: const Icon(FontAwesomeIcons.solidThumbsUp),
-                      onTap:
+                    onTap: handleState(bangumiIntroController.actionLikeVideo),
-                          handleState(bangumiIntroController.actionLikeVideo),
                     selectStatus: bangumiIntroController.hasLike.value,
-                      loadingStatus: false,
+                    text: widget.bangumiDetail!.stat!['likes']!.toString(),
-                      text: !widget.loadingStatus
+                  ),
-                          ? widget.bangumiDetail!.stat!['likes']!.toString()
-                          : bangumiItem!.stat!['likes']!.toString()),
                 ),
                 Obx(
                   () => ActionItem(
                     icon: const Icon(FontAwesomeIcons.b),
                     selectIcon: const Icon(FontAwesomeIcons.b),
-                      onTap:
+                    onTap: handleState(bangumiIntroController.actionCoinVideo),
-                          handleState(bangumiIntroController.actionCoinVideo),
                     selectStatus: bangumiIntroController.hasCoin.value,
-                      loadingStatus: false,
+                    text: widget.bangumiDetail!.stat!['coins']!.toString(),
-                      text: !widget.loadingStatus
+                  ),
-                          ? widget.bangumiDetail!.stat!['coins']!.toString()
-                          : bangumiItem!.stat!['coins']!.toString()),
                 ),
                 Obx(
                   () => ActionItem(
@@ -430,29 +366,22 @@ class _BangumiInfoState extends State<BangumiInfo> {
                     selectIcon: const Icon(FontAwesomeIcons.solidStar),
                     onTap: () => showFavBottomSheet(),
                     selectStatus: bangumiIntroController.hasFav.value,
-                      loadingStatus: false,
+                    text: widget.bangumiDetail!.stat!['favorite']!.toString(),
-                      text: !widget.loadingStatus
+                  ),
-                          ? widget.bangumiDetail!.stat!['favorite']!.toString()
-                          : bangumiItem!.stat!['favorite']!.toString()),
                 ),
                 ActionItem(
                   icon: const Icon(FontAwesomeIcons.comment),
                   selectIcon: const Icon(FontAwesomeIcons.reply),
                   onTap: () => videoDetailCtr.tabCtr.animateTo(1),
                   selectStatus: false,
-                  loadingStatus: false,
+                  text: widget.bangumiDetail!.stat!['reply']!.toString(),
-                  text: !widget.loadingStatus
-                      ? widget.bangumiDetail!.stat!['reply']!.toString()
-                      : bangumiItem!.stat!['reply']!.toString(),
                 ),
                 ActionItem(
                   icon: const Icon(FontAwesomeIcons.shareFromSquare),
                   onTap: () => bangumiIntroController.actionShareVideo(),
                   selectStatus: false,
-                    loadingStatus: false,
+                  text: widget.bangumiDetail!.stat!['share']!.toString(),
-                    text: !widget.loadingStatus
+                ),
-                        ? widget.bangumiDetail!.stat!['share']!.toString()
-                        : bangumiItem!.stat!['share']!.toString()),
               ],
             ),
           ),
@@ -460,63 +389,4 @@ class _BangumiInfoState extends State<BangumiInfo> {
       );
     });
   }
-
-  Widget actionRow(BuildContext context, videoIntroController, videoDetailCtr) {
-    return Row(children: [
-      Obx(
-        () => ActionRowItem(
-          icon: const Icon(FontAwesomeIcons.thumbsUp),
-          onTap: handleState(videoIntroController.actionLikeVideo),
-          selectStatus: videoIntroController.hasLike.value,
-          loadingStatus: widget.loadingStatus,
-          text: !widget.loadingStatus
-              ? widget.bangumiDetail!.stat!['likes']!.toString()
-              : '-',
-        ),
-      ),
-      const SizedBox(width: 8),
-      Obx(
-        () => ActionRowItem(
-          icon: const Icon(FontAwesomeIcons.b),
-          onTap: handleState(videoIntroController.actionCoinVideo),
-          selectStatus: videoIntroController.hasCoin.value,
-          loadingStatus: widget.loadingStatus,
-          text: !widget.loadingStatus
-              ? widget.bangumiDetail!.stat!['coins']!.toString()
-              : '-',
-        ),
-      ),
-      const SizedBox(width: 8),
-      Obx(
-        () => ActionRowItem(
-          icon: const Icon(FontAwesomeIcons.heart),
-          onTap: () => showFavBottomSheet(),
-          selectStatus: videoIntroController.hasFav.value,
-          loadingStatus: widget.loadingStatus,
-          text: !widget.loadingStatus
-              ? widget.bangumiDetail!.stat!['favorite']!.toString()
-              : '-',
-        ),
-      ),
-      const SizedBox(width: 8),
-      ActionRowItem(
-        icon: const Icon(FontAwesomeIcons.comment),
-        onTap: () {
-          videoDetailCtr.tabCtr.animateTo(1);
-        },
-        selectStatus: false,
-        loadingStatus: widget.loadingStatus,
-        text: !widget.loadingStatus
-            ? widget.bangumiDetail!.stat!['reply']!.toString()
-            : '-',
-      ),
-      const SizedBox(width: 8),
-      ActionRowItem(
-          icon: const Icon(FontAwesomeIcons.share),
-          onTap: () => videoIntroController.actionShareVideo(),
-          selectStatus: false,
-          loadingStatus: widget.loadingStatus,
-          text: '转发'),
-    ]);
-  }
 }

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

@@ -25,13 +25,6 @@ class VideoIntroController extends GetxController {
   VideoIntroController({required this.bvid});
   // 视频bvid
   String bvid;
-
-  // 是否预渲染 骨架屏
-  bool preRender = false;
-
-  // 视频详情 上个页面传入
-  Map? videoItem = {};
-
   // 请求状态
   RxBool isLoading = false.obs;
 
@@ -74,26 +67,6 @@ class VideoIntroController extends GetxController {
     try {
       heroTag = Get.arguments['heroTag'];
     } catch (_) {}
-    if (Get.arguments.isNotEmpty) {
-      if (Get.arguments.containsKey('videoItem')) {
-        preRender = true;
-        var args = Get.arguments['videoItem'];
-        var keys = Get.arguments.keys.toList();
-        videoItem!['pic'] = args.pic;
-        if (args.title is String) {
-          videoItem!['title'] = args.title;
-        } else {
-          String str = '';
-          for (Map map in args.title) {
-            str += map['text'];
-          }
-          videoItem!['title'] = str;
-        }
-        videoItem!['stat'] = keys.contains('stat') && args.stat;
-        videoItem!['pubdate'] = keys.contains('pubdate') && args.pubdate;
-        videoItem!['owner'] = keys.contains('owner') && args.owner;
-      }
-    }
     userLogin = userInfo != null;
     lastPlayCid.value = int.parse(Get.parameters['cid']!);
     isShowOnlineTotal =

lib/pages/video/detail/introduction/view.dart

@@ -15,9 +15,7 @@ import 'package:pilipala/pages/video/detail/widgets/ai_detail.dart';
 import 'package:pilipala/utils/feed_back.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:pilipala/utils/utils.dart';
-
 import 'widgets/action_item.dart';
-import 'widgets/action_row_item.dart';
 import 'widgets/fav_panel.dart';
 import 'widgets/intro_detail.dart';
 import 'widgets/page.dart';
@@ -78,7 +76,6 @@ class _VideoIntroPanelState extends State<VideoIntroPanel>
             // 请求成功
             return Obx(
               () => VideoInfo(
-                loadingStatus: false,
                 videoDetail: videoIntroController.videoDetail.value,
                 heroTag: heroTag,
                 bvid: widget.bvid,
@@ -96,11 +93,13 @@ class _VideoIntroPanelState extends State<VideoIntroPanel>
             );
           }
         } else {
-          return VideoInfo(
+          return const SliverToBoxAdapter(
-            loadingStatus: true,
+            child: SizedBox(
-            videoDetail: videoDetail,
+              height: 100,
-            heroTag: heroTag,
+              child: Center(
-            bvid: widget.bvid,
+                child: CircularProgressIndicator(),
+              ),
+            ),
           );
         }
       },
@@ -109,14 +108,12 @@ class _VideoIntroPanelState extends State<VideoIntroPanel>
 }
 
 class VideoInfo extends StatefulWidget {
-  final bool loadingStatus;
   final VideoDetailData? videoDetail;
   final String? heroTag;
   final String bvid;
 
   const VideoInfo({
     Key? key,
-    this.loadingStatus = false,
     this.videoDetail,
     this.heroTag,
     required this.bvid,
@@ -127,18 +124,12 @@ class VideoInfo extends StatefulWidget {
 }
 
 class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
-  // final String heroTag = Get.arguments['heroTag'];
   late String heroTag;
   late final VideoIntroController videoIntroController;
   late final VideoDetailController videoDetailCtr;
-  late final Map<dynamic, dynamic> videoItem;
-
   final Box<dynamic> localCache = GStrorage.localCache;
   final Box<dynamic> setting = GStrorage.setting;
   late double sheetHeight;
-
-  late final bool loadingStatus; // 加载状态
-
   late final dynamic owner;
   late final dynamic follower;
   late final dynamic followStatus;
@@ -163,14 +154,10 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
     videoIntroController =
         Get.put(VideoIntroController(bvid: widget.bvid), tag: heroTag);
     videoDetailCtr = Get.find<VideoDetailController>(tag: heroTag);
-    videoItem = videoIntroController.videoItem!;
     sheetHeight = localCache.get('sheetHeight');
 
-    loadingStatus = widget.loadingStatus;
+    owner = widget.videoDetail!.owner;
-    owner = loadingStatus ? videoItem['owner'] : widget.videoDetail!.owner;
+    follower = Utils.numFormat(videoIntroController.userStat['follower']);
-    follower = loadingStatus
-        ? '-'
-        : Utils.numFormat(videoIntroController.userStat['follower']);
     followStatus = videoIntroController.followStatus;
     enableAi = setting.get(SettingBoxKey.enableAi, defaultValue: true);
   }
@@ -224,9 +211,6 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
 
   // 视频介绍
   showIntroDetail() {
-    if (loadingStatus) {
-      return;
-    }
     feedBack();
     showBottomSheet(
       context: context,
@@ -240,13 +224,9 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
   // 用户主页
   onPushMember() {
     feedBack();
-    mid = !loadingStatus
+    mid = widget.videoDetail!.owner!.mid!;
-        ? widget.videoDetail!.owner!.mid
-        : videoItem['owner'].mid;
     memberHeroTag = Utils.makeHeroTag(mid);
-    String face = !loadingStatus
+    String face = widget.videoDetail!.owner!.face!;
-        ? widget.videoDetail!.owner!.face
-        : videoItem['owner'].face;
     Get.toNamed('/member?mid=$mid',
         arguments: {'face': face, 'heroTag': memberHeroTag});
   }
@@ -273,17 +253,14 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
         top: 16,
       ),
       sliver: SliverToBoxAdapter(
-        child: !loadingStatus
+          child: Column(
-            ? Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           GestureDetector(
             behavior: HitTestBehavior.translucent,
             onTap: () => showIntroDetail(),
             child: Text(
-                      !loadingStatus
+              widget.videoDetail!.title!,
-                          ? widget.videoDetail!.title
-                          : videoItem['title'],
               style: const TextStyle(
                 fontSize: 18,
                 fontWeight: FontWeight.bold,
@@ -303,25 +280,18 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
                     children: [
                       StatView(
                         theme: 'gray',
-                                view: !loadingStatus
+                        view: widget.videoDetail!.stat!.view,
-                                    ? widget.videoDetail!.stat!.view
-                                    : videoItem['stat'].view,
                         size: 'medium',
                       ),
                       const SizedBox(width: 10),
                       StatDanMu(
                         theme: 'gray',
-                                danmu: !loadingStatus
+                        danmu: widget.videoDetail!.stat!.danmaku,
-                                    ? widget.videoDetail!.stat!.danmaku
-                                    : videoItem['stat'].danmaku,
                         size: 'medium',
                       ),
                       const SizedBox(width: 10),
                       Text(
-                                Utils.dateFormat(
+                        Utils.dateFormat(widget.videoDetail!.pubdate,
-                                    !loadingStatus
-                                        ? widget.videoDetail!.pubdate
-                                        : videoItem['pubdate'],
                             formatType: 'detail'),
                         style: TextStyle(
                           fontSize: 12,
@@ -349,33 +319,21 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
                   top: 6,
                   child: GestureDetector(
                     onTap: () async {
-                              final res =
+                      final res = await videoIntroController.aiConclusion();
-                                  await videoIntroController.aiConclusion();
                       if (res['status']) {
                         showAiBottomSheet();
                       }
                     },
-                            child:
+                    child: Image.asset('assets/images/ai.png', height: 22),
-                                Image.asset('assets/images/ai.png', height: 22),
                   ),
                 )
             ],
           ),
-                  // 点赞收藏转发 布局样式1
+
-                  // SingleChildScrollView(
+          /// 点赞收藏转发
-                  //   padding: const EdgeInsets.only(top: 7, bottom: 7),
-                  //   scrollDirection: Axis.horizontal,
-                  //   child: actionRow(
-                  //     context,
-                  //     videoIntroController,
-                  //     videoDetailCtr,
-                  //   ),
-                  // ),
-                  // 点赞收藏转发 布局样式2
           actionGrid(context, videoIntroController),
           // 合集
-                  if (!loadingStatus &&
+          if (widget.videoDetail!.ugcSeason != null) ...[
-                      widget.videoDetail!.ugcSeason != null) ...[
             Obx(
               () => SeasonPanel(
                 ugcSeason: widget.videoDetail!.ugcSeason!,
@@ -383,43 +341,37 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
                     ? videoIntroController.lastPlayCid.value
                     : widget.videoDetail!.pages!.first.cid,
                 sheetHeight: sheetHeight,
-                        changeFuc: (bvid, cid, aid) => videoIntroController
+                changeFuc: (bvid, cid, aid) =>
-                            .changeSeasonOrbangu(bvid, cid, aid),
+                    videoIntroController.changeSeasonOrbangu(bvid, cid, aid),
               ),
             )
           ],
-                  if (!loadingStatus &&
+          if (widget.videoDetail!.pages != null &&
-                      widget.videoDetail!.pages != null &&
               widget.videoDetail!.pages!.length > 1) ...[
             Obx(() => PagesPanel(
                   pages: widget.videoDetail!.pages!,
                   cid: videoIntroController.lastPlayCid.value,
                   sheetHeight: sheetHeight,
-                          changeFuc: (cid) =>
+                  changeFuc: (cid) => videoIntroController.changeSeasonOrbangu(
-                              videoIntroController.changeSeasonOrbangu(
                       videoIntroController.bvid, cid, null),
                 ))
           ],
           GestureDetector(
             onTap: onPushMember,
             child: Container(
-                      padding: const EdgeInsets.symmetric(
+              padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 4),
-                          vertical: 12, horizontal: 4),
               child: Row(
                 children: [
                   NetworkImgLayer(
                     type: 'avatar',
-                            src: loadingStatus
+                    src: widget.videoDetail!.owner!.face,
-                                ? owner.face
-                                : widget.videoDetail!.owner!.face,
                     width: 34,
                     height: 34,
                     fadeInDuration: Duration.zero,
                     fadeOutDuration: Duration.zero,
                   ),
                   const SizedBox(width: 10),
-                          Text(owner.name,
+                  Text(owner.name, style: const TextStyle(fontSize: 13)),
-                              style: const TextStyle(fontSize: 13)),
                   const SizedBox(width: 6),
                   Text(
                     follower,
@@ -430,20 +382,16 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
                   ),
                   const Spacer(),
                   Obx(() => AnimatedOpacity(
-                                opacity: loadingStatus ||
+                        opacity:
-                                        videoIntroController
+                            videoIntroController.followStatus.isEmpty ? 0 : 1,
-                                            .followStatus.isEmpty
-                                    ? 0
-                                    : 1,
                         duration: const Duration(milliseconds: 50),
                         child: SizedBox(
                           height: 32,
                           child: Obx(
-                                    () => videoIntroController
+                            () => videoIntroController.followStatus.isNotEmpty
-                                            .followStatus.isNotEmpty
                                 ? TextButton(
-                                            onPressed: videoIntroController
+                                    onPressed:
-                                                .actionRelationMod,
+                                        videoIntroController.actionRelationMod,
                                     style: TextButton.styleFrom(
                                       padding: const EdgeInsets.only(
                                           left: 8, right: 8),
@@ -453,8 +401,7 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
                                               : t.colorScheme.onPrimary,
                                       backgroundColor:
                                           followStatus['attribute'] != 0
-                                                      ? t.colorScheme
+                                              ? t.colorScheme.onInverseSurface
-                                                          .onInverseSurface
                                               : t.colorScheme
                                                   .primary, // 设置按钮背景色
                                     ),
@@ -463,13 +410,13 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
                                           ? '已关注'
                                           : '关注',
                                       style: TextStyle(
-                                                  fontSize: t.textTheme
+                                          fontSize: t
-                                                      .labelMedium!.fontSize),
+                                              .textTheme.labelMedium!.fontSize),
                                     ),
                                   )
                                 : ElevatedButton(
-                                            onPressed: videoIntroController
+                                    onPressed:
-                                                .actionRelationMod,
+                                        videoIntroController.actionRelationMod,
                                     child: const Text('关注'),
                                   ),
                           ),
@@ -480,14 +427,7 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
             ),
           ),
         ],
-              )
+      )),
-            : const SizedBox(
-                height: 100,
-                child: Center(
-                  child: CircularProgressIndicator(),
-                ),
-              ),
-      ),
     );
   }
 
@@ -509,10 +449,7 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
                   selectIcon: const Icon(FontAwesomeIcons.solidThumbsUp),
                   onTap: handleState(videoIntroController.actionLikeVideo),
                   selectStatus: videoIntroController.hasLike.value,
-                  loadingStatus: loadingStatus,
+                  text: widget.videoDetail!.stat!.like!.toString()),
-                  text: !loadingStatus
-                      ? widget.videoDetail!.stat!.like!.toString()
-                      : '-'),
             ),
             // ActionItem(
             //     icon: const Icon(FontAwesomeIcons.clock),
@@ -526,10 +463,8 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
                 selectIcon: const Icon(FontAwesomeIcons.b),
                 onTap: handleState(videoIntroController.actionCoinVideo),
                 selectStatus: videoIntroController.hasCoin.value,
-                  loadingStatus: loadingStatus,
+                text: widget.videoDetail!.stat!.coin!.toString(),
-                  text: !loadingStatus
+              ),
-                      ? widget.videoDetail!.stat!.coin!.toString()
-                      : '-'),
             ),
             Obx(
               () => ActionItem(
@@ -538,88 +473,24 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
                 onTap: () => showFavBottomSheet(),
                 onLongPress: () => showFavBottomSheet(type: 'longPress'),
                 selectStatus: videoIntroController.hasFav.value,
-                  loadingStatus: loadingStatus,
+                text: widget.videoDetail!.stat!.favorite!.toString(),
-                  text: !loadingStatus
+              ),
-                      ? widget.videoDetail!.stat!.favorite!.toString()
-                      : '-'),
             ),
             ActionItem(
               icon: const Icon(FontAwesomeIcons.comment),
               onTap: () => videoDetailCtr.tabCtr.animateTo(1),
               selectStatus: false,
-                loadingStatus: loadingStatus,
+              text: widget.videoDetail!.stat!.reply!.toString(),
-                text: !loadingStatus
+            ),
-                    ? widget.videoDetail!.stat!.reply!.toString()
-                    : '评论'),
             ActionItem(
               icon: const Icon(FontAwesomeIcons.shareFromSquare),
               onTap: () => videoIntroController.actionShareVideo(),
               selectStatus: false,
-                loadingStatus: loadingStatus,
+              text: '分享',
-                text: '分享'),
+            ),
           ],
         ),
       );
     });
   }
-
-  Widget actionRow(BuildContext context, videoIntroController, videoDetailCtr) {
-    return Row(children: <Widget>[
-      Obx(
-        () => ActionRowItem(
-          icon: const Icon(FontAwesomeIcons.thumbsUp),
-          onTap: handleState(videoIntroController.actionLikeVideo),
-          selectStatus: videoIntroController.hasLike.value,
-          loadingStatus: loadingStatus,
-          text:
-              !loadingStatus ? widget.videoDetail!.stat!.like!.toString() : '-',
-        ),
-      ),
-      const SizedBox(width: 8),
-      Obx(
-        () => ActionRowItem(
-          icon: const Icon(FontAwesomeIcons.b),
-          onTap: handleState(videoIntroController.actionCoinVideo),
-          selectStatus: videoIntroController.hasCoin.value,
-          loadingStatus: loadingStatus,
-          text:
-              !loadingStatus ? widget.videoDetail!.stat!.coin!.toString() : '-',
-        ),
-      ),
-      const SizedBox(width: 8),
-      Obx(
-        () => ActionRowItem(
-          icon: const Icon(FontAwesomeIcons.heart),
-          onTap: () => showFavBottomSheet(),
-          onLongPress: () => showFavBottomSheet(type: 'longPress'),
-          selectStatus: videoIntroController.hasFav.value,
-          loadingStatus: loadingStatus,
-          text: !loadingStatus
-              ? widget.videoDetail!.stat!.favorite!.toString()
-              : '-',
-        ),
-      ),
-      const SizedBox(width: 8),
-      ActionRowItem(
-        icon: const Icon(FontAwesomeIcons.comment),
-        onTap: () {
-          videoDetailCtr.tabCtr.animateTo(1);
-        },
-        selectStatus: false,
-        loadingStatus: loadingStatus,
-        text:
-            !loadingStatus ? widget.videoDetail!.stat!.reply!.toString() : '-',
-      ),
-      const SizedBox(width: 8),
-      ActionRowItem(
-          icon: const Icon(FontAwesomeIcons.share),
-          onTap: () => videoIntroController.actionShareVideo(),
-          selectStatus: false,
-          loadingStatus: loadingStatus,
-          // text: !loadingStatus
-          //     ? widget.videoDetail!.stat!.share!.toString()
-          //     : '-',
-          text: '转发'),
-    ]);
-  }
 }

lib/pages/video/detail/introduction/widgets/action_item.dart

@@ -7,7 +7,6 @@ class ActionItem extends StatelessWidget {
   final Icon? selectIcon;
   final Function? onTap;
   final Function? onLongPress;
-  final bool? loadingStatus;
   final String? text;
   final bool selectStatus;
 
@@ -17,7 +16,6 @@ class ActionItem extends StatelessWidget {
     this.selectIcon,
     this.onTap,
     this.onLongPress,
-    this.loadingStatus,
     this.text,
     this.selectStatus = false,
   }) : super(key: key);
@@ -43,25 +41,15 @@ class ActionItem extends StatelessWidget {
               : Icon(icon!.icon!,
                   size: 18, color: Theme.of(context).colorScheme.outline),
           const SizedBox(height: 6),
-          AnimatedOpacity(
+          Text(
-            opacity: loadingStatus! ? 0 : 1,
-            duration: const Duration(milliseconds: 200),
-            child: AnimatedSwitcher(
-              duration: const Duration(milliseconds: 300),
-              transitionBuilder: (Widget child, Animation<double> animation) {
-                return ScaleTransition(scale: animation, child: child);
-              },
-              child: Text(
             text ?? '',
-                key: ValueKey<String>(text ?? ''),
             style: TextStyle(
               color: selectStatus
                   ? Theme.of(context).colorScheme.primary
                   : Theme.of(context).colorScheme.outline,
-                    fontSize: Theme.of(context).textTheme.labelSmall!.fontSize),
+              fontSize: Theme.of(context).textTheme.labelSmall!.fontSize,
-              ),
-            ),
             ),
+          )
         ],
       ),
     );