fix: #92

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

lib/common/widgets/video_card_h.dart

@@ -41,7 +41,6 @@ class VideoCardH extends StatelessWidget {
     try {
       type = videoItem.type;
     } catch (_) {}
-    final String heroTag = Utils.makeHeroTag(aid);
     return Stack(children: [
       Semantics(
         label: Utils.videoItemSemantics(videoItem),
@@ -81,8 +80,13 @@ class VideoCardH extends StatelessWidget {
             try {
               final int cid =
                   videoItem.cid ?? await SearchHttp.ab2c(aid: aid, bvid: bvid);
-              Get.toNamed('/video?bvid=$bvid&cid=$cid',
-                  arguments: {'videoItem': videoItem, 'heroTag': heroTag});
+              Get.toNamed(
+                '/video?bvid=$bvid&cid=$cid',
+                arguments: {
+                  'videoItem': videoItem,
+                  'heroTag': Utils.makeHeroTag(aid)
+                },
+              );
             } catch (err) {
               SmartDialog.showToast(err.toString());
             }
@@ -105,13 +109,10 @@ class VideoCardH extends StatelessWidget {
                       final double maxHeight = boxConstraints.maxHeight;
                       return Stack(
                         children: [
-                          Hero(
-                            tag: heroTag,
-                            child: NetworkImgLayer(
-                              src: videoItem.pic as String,
-                              width: maxWidth,
-                              height: maxHeight,
-                            ),
+                          NetworkImgLayer(
+                            src: videoItem.pic as String,
+                            width: maxWidth,
+                            height: maxHeight,
                           ),
                           if (videoItem.duration != 0)
                             PBadge(

lib/common/widgets/video_card_h_grpc.dart

@@ -59,13 +59,6 @@ class VideoCardHGrpc extends StatelessWidget {
             }
             try {
               PiliScheme.routePush(Uri.parse(videoItem.smallCoverV5.base.uri));
-              // final int cid =
-              //     videoItem.smallCoverV5.base.playerArgs.cid.toInt() ??
-              //         await SearchHttp.ab2c(aid: aid, bvid: bvid);
-              // Get.toNamed('/video?bvid=$bvid&cid=$cid',
-              //     arguments: {'heroTag': heroTag});
-              // Get.toNamed('/video?bvid=$bvid&cid=$cid',
-              //     arguments: {'videoItem': videoItem, 'heroTag': heroTag});
             } catch (err) {
               SmartDialog.showToast(err.toString());
             }

lib/common/widgets/video_card_h_member_video.dart

@@ -27,7 +27,6 @@ class VideoCardHMemberVideo extends StatelessWidget {
   Widget build(BuildContext context) {
     final int aid = int.tryParse(videoItem.param ?? '') ?? -1;
     final String bvid = videoItem.bvid ?? '';
-    final String heroTag = Utils.makeHeroTag(aid);
     return Stack(
       children: [
         InkWell(
@@ -42,8 +41,12 @@ class VideoCardHMemberVideo extends StatelessWidget {
               return;
             }
             try {
-              Get.toNamed('/video?bvid=$bvid&cid=${videoItem.firstCid}',
-                  arguments: {'heroTag': heroTag});
+              Get.toNamed(
+                '/video?bvid=$bvid&cid=${videoItem.firstCid}',
+                arguments: {
+                  'heroTag': Utils.makeHeroTag(aid),
+                },
+              );
             } catch (err) {
               SmartDialog.showToast(err.toString());
             }
@@ -68,14 +71,11 @@ class VideoCardHMemberVideo extends StatelessWidget {
                           final double maxHeight = boxConstraints.maxHeight;
                           return Stack(
                             children: [
-                              Hero(
-                                tag: heroTag,
-                                child: NetworkImgLayer(
-                                  src: videoItem.cover,
-                                  // videoItem.season?['cover'] ?? videoItem.cover,
-                                  width: maxWidth,
-                                  height: maxHeight,
-                                ),
+                              NetworkImgLayer(
+                                src: videoItem.cover,
+                                // videoItem.season?['cover'] ?? videoItem.cover,
+                                width: maxWidth,
+                                height: maxHeight,
                               ),
                               // if (videoItem.season != null)
                               //   PBadge(

lib/common/widgets/video_card_v.dart

@@ -81,11 +81,14 @@ class VideoCardV extends StatelessWidget {
         if (cid == -1) {
           cid = await SearchHttp.ab2c(aid: videoItem.aid, bvid: bvid);
         }
-        Get.toNamed('/video?bvid=$bvid&cid=$cid', arguments: {
-          // 'videoItem': videoItem,
-          'pic': videoItem.pic,
-          'heroTag': heroTag,
-        });
+        Get.toNamed(
+          '/video?bvid=$bvid&cid=$cid',
+          arguments: {
+            // 'videoItem': videoItem,
+            'pic': videoItem.pic,
+            'heroTag': heroTag,
+          },
+        );
         break;
       // 动态
       case 'picture':
@@ -145,7 +148,6 @@ class VideoCardV extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    String heroTag = Utils.makeHeroTag(videoItem.id);
     return Stack(children: [
       Semantics(
         label: Utils.videoItemSemantics(videoItem),
@@ -158,7 +160,7 @@ class VideoCardV extends StatelessWidget {
           clipBehavior: Clip.hardEdge,
           margin: EdgeInsets.zero,
           child: InkWell(
-            onTap: () async => onPushDetail(heroTag),
+            onTap: () => onPushDetail(Utils.makeHeroTag(videoItem.id)),
             onLongPress: () => imageSaveDialog(
               context: context,
               title: videoItem.title,
@@ -173,13 +175,10 @@ class VideoCardV extends StatelessWidget {
                     double maxHeight = boxConstraints.maxHeight;
                     return Stack(
                       children: [
-                        Hero(
-                          tag: heroTag,
-                          child: NetworkImgLayer(
-                            src: videoItem.pic,
-                            width: maxWidth,
-                            height: maxHeight,
-                          ),
+                        NetworkImgLayer(
+                          src: videoItem.pic,
+                          width: maxWidth,
+                          height: maxHeight,
                         ),
                         if (videoItem.duration > 0)
                           PBadge(

lib/common/widgets/video_card_v_member_home.dart

@@ -64,11 +64,14 @@ class VideoCardVMemberHome extends StatelessWidget {
       // break;
       case 'av':
         String bvid = videoItem.bvid ?? '';
-        Get.toNamed('/video?bvid=$bvid&cid=${videoItem.firstCid}', arguments: {
-          // 'videoItem': videoItem,
-          'pic': videoItem.cover,
-          'heroTag': heroTag,
-        });
+        Get.toNamed(
+          '/video?bvid=$bvid&cid=${videoItem.firstCid}',
+          arguments: {
+            // 'videoItem': videoItem,
+            'pic': videoItem.cover,
+            'heroTag': heroTag,
+          },
+        );
         break;
       // 动态
       // case 'picture':
@@ -128,7 +131,6 @@ class VideoCardVMemberHome extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    String heroTag = Utils.makeHeroTag(videoItem.bvid);
     // List<VideoCustomAction> actions =
     //     VideoCustomActions(videoItem, context).actions;
     return Stack(children: [
@@ -143,7 +145,7 @@ class VideoCardVMemberHome extends StatelessWidget {
           clipBehavior: Clip.hardEdge,
           margin: EdgeInsets.zero,
           child: InkWell(
-            onTap: () async => onPushDetail(heroTag),
+            onTap: () => onPushDetail(Utils.makeHeroTag(videoItem.bvid)),
             onLongPress: () => imageSaveDialog(
               context: context,
               title: videoItem.title,
@@ -158,13 +160,10 @@ class VideoCardVMemberHome extends StatelessWidget {
                     double maxHeight = boxConstraints.maxHeight;
                     return Stack(
                       children: [
-                        Hero(
-                          tag: heroTag,
-                          child: NetworkImgLayer(
-                            src: videoItem.cover,
-                            width: maxWidth,
-                            height: maxHeight,
-                          ),
+                        NetworkImgLayer(
+                          src: videoItem.cover,
+                          width: maxWidth,
+                          height: maxHeight,
                         ),
                         if ((videoItem.duration ?? -1) > 0)
                           PBadge(