tweak

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

lib/common/widgets/video_card/video_card_h.dart

@@ -60,21 +60,13 @@ class VideoCardH extends StatelessWidget {
             label: Utils.videoItemSemantics(videoItem),
             excludeSemantics: true,
             child: InkWell(
-              onLongPress: () {
+              onLongPress: onLongPress ??
-                if (onLongPress != null) {
+                  () => imageSaveDialog(
-                  onLongPress!();
-                } else {
-                  imageSaveDialog(
                         title: videoItem.title,
                         cover: videoItem.pic,
-                  );
+                      ),
-                }
+              onTap: onTap ??
-              },
+                  () async {
-              onTap: () async {
-                if (onTap != null) {
-                  onTap!();
-                  return;
-                }
                     if (type == 'ketang') {
                       SmartDialog.showToast('课堂视频暂不支持播放');
                       return;

lib/common/widgets/video_card/video_card_h_member_video.dart

@@ -37,12 +37,10 @@ class VideoCardHMemberVideo extends StatelessWidget {
             title: videoItem.title,
             cover: videoItem.cover,
           ),
-          onTap: () async {
+          onTap: onTap ??
-            if (onTap != null) {
+              () async {
-              onTap!();
+                if (videoItem.isPgc == true &&
-              return;
+                    videoItem.uri?.isNotEmpty == true) {
-            }
-            if (videoItem.isPgc == true && videoItem.uri?.isNotEmpty == true) {
                   if (PageUtils.viewPgcFromUri(videoItem.uri!)) {
                     return;
                   }

lib/http/search.dart

@@ -215,14 +215,13 @@ class SearchHttp {
     dynamic seasonId,
     dynamic epId,
   }) async {
-    final Map<String, dynamic> data = {};
+    var res = await Request().get(
-    if (seasonId != null) {
+      Api.bangumiInfo,
-      data['season_id'] = seasonId;
+      queryParameters: {
-    } else if (epId != null) {
+        if (seasonId != null) 'season_id': seasonId,
-      data['ep_id'] = epId;
+        if (epId != null) 'ep_id': epId,
-    }
+      },
-    var res = await Request().get(Api.bangumiInfo, queryParameters: data);
+    );
-
     if (res.data['code'] == 0) {
       return {
         'status': true,

lib/pages/dynamics/widgets/up_panel.dart

@@ -149,10 +149,9 @@ class _UpPanelState extends State<UpPanel> {
           }
         },
         onDoubleTap: data is LiveUserItem ? () => _onSelect(data) : null,
-        onLongPress: () {
+        onLongPress: data.mid == -1
-          if (data.mid == -1) {
+            ? null
-            return;
+            : () {
-          }
                 String heroTag = Utils.makeHeroTag(data.mid);
                 Get.toNamed('/member?mid=${data.mid}',
                     arguments: {'face': data.face, 'heroTag': heroTag});

lib/pages/fav_detail/widget/fav_video_card.dart

@@ -35,12 +35,8 @@ class FavVideoCardH extends StatelessWidget {
     return InkWell(
       onTap: isSort == true
           ? null
-          : () async {
+          : onTap ??
-              if (onTap != null) {
+              () {
-                onTap!();
-                return;
-              }
-
                 if (!const [0, 16].contains(videoItem.attr)) {
                   Get.toNamed('/member?mid=${videoItem.owner.mid}');
                   return;
@@ -59,16 +55,11 @@ class FavVideoCardH extends StatelessWidget {
               },
       onLongPress: isSort == true
           ? null
-          : () {
+          : onLongPress ??
-              if (onLongPress != null) {
+              () => imageSaveDialog(
-                onLongPress!();
-              } else {
-                imageSaveDialog(
                     title: videoItem.title,
                     cover: videoItem.pic,
-                );
+                  ),
-              }
-            },
       child: Padding(
         padding: const EdgeInsets.symmetric(
           horizontal: StyleString.safeSpace,

lib/pages/video/introduction/pgc/widgets/intro_detail.dart

@@ -173,7 +173,7 @@ class _IntroDetailState extends CommonCollapseSlidePageState<IntroDetail> {
                       '/searchResult',
                       parameters: {'keyword': tagName},
                     ),
-                    onLongPress: (tagName) => Utils.copyText(tagName),
+                    onLongPress: Utils.copyText,
                   ),
                 )
                 .toList(),

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

@@ -719,8 +719,7 @@ class _VideoInfoState extends State<VideoInfo> {
                                           '/searchResult',
                                           parameters: {'keyword': tagName},
                                         ),
-                                        onLongPress: (tagName) =>
+                                        onLongPress: Utils.copyText,
-                                            Utils.copyText(tagName),
                                       ),
                                     )
                                     .toList(),

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

@@ -145,9 +145,9 @@ class ActionItemState extends State<ActionItem>
                   widget.onTap?.call();
                 },
           onLongPress: _isThumbsUp ? null : widget.onLongPress,
-          onTapDown: (details) => _isThumbsUp ? _startLongPress() : null,
+          onTapDown: _isThumbsUp ? (details) => _startLongPress() : null,
-          onTapUp: (details) => _isThumbsUp ? _cancelLongPress() : null,
+          onTapUp: _isThumbsUp ? (details) => _cancelLongPress() : null,
-          onTapCancel: () => _isThumbsUp ? _cancelLongPress(true) : null,
+          onTapCancel: _isThumbsUp ? () => _cancelLongPress(true) : null,
           child: Column(
             mainAxisAlignment: MainAxisAlignment.center,
             children: [

lib/utils/app_scheme.dart

@@ -87,7 +87,8 @@ class PiliScheme {
               PageUtils.viewBangumi(
                 seasonId: isEp ? null : id,
                 epId: isEp ? id : null,
-                  progress: uri.queryParameters['start_progress']);
+                progress: uri.queryParameters['start_progress'],
+              );
               return true;
             }
             return false;

lib/utils/page_utils.dart

@@ -697,7 +697,7 @@ class PageUtils {
   }
 
   static Future<void> viewBangumi(
-      {dynamic seasonId, dynamic epId, dynamic progress}) async {
+      {dynamic seasonId, dynamic epId, String? progress}) async {
     try {
       SmartDialog.showLoading(msg: '资源获取中');
       var result = await SearchHttp.bangumiInfo(seasonId: seasonId, epId: epId);