faat: message to comment

lib/pages/message/like/view.dart

@@ -1,13 +1,11 @@
 import 'package:easy_debounce/easy_throttle.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
-import 'package:pilipala/http/search.dart';
 import 'package:pilipala/models/msg/like.dart';
 import 'package:pilipala/utils/utils.dart';
-
+import '../utils/index.dart';
 import 'controller.dart';
 
 class MessageLikePage extends StatefulWidget {
@@ -122,39 +120,13 @@ class LikeItem extends StatelessWidget {
     final nickNameList = item.users!.map((e) => e.nickname).take(2).toList();
     int usersLen = item.users!.length > 3 ? 3 : item.users!.length;
     final Uri uri = Uri.parse(item.item!.uri!);
-    final String path = uri.path;
-    final String bvid = path.split('/').last;
 
     /// bilibili://
     final Uri nativeUri = Uri.parse(item.item!.nativeUri!);
-    final Map<String, String> queryParameters = nativeUri.queryParameters;
     final String type = item.item!.type!;
-    // cid
-    final String? argCid = queryParameters['cid'];
-    // 页码
-    final String? page = queryParameters['page'];
-    // 根评论id
-    final String? commentRootId = queryParameters['comment_root_id'];
-    // 二级评论id
-    final String? commentSecondaryId = queryParameters['comment_secondary_id'];
-
     return InkWell(
       onTap: () async {
-        try {
-          final int cid = argCid != null
-              ? int.parse(argCid)
-              : await SearchHttp.ab2c(bvid: bvid);
-          final String heroTag = Utils.makeHeroTag(bvid);
-          Get.toNamed<dynamic>(
-            '/video?bvid=$bvid&cid=$cid',
-            arguments: <String, String?>{
-              'pic': '',
-              'heroTag': heroTag,
-            },
-          );
-        } catch (e) {
-          SmartDialog.showToast('视频可能失效了$e');
-        }
+        MessageUtils.onClickMessage(context, uri, nativeUri, type);
       },
       child: Stack(
         children: [
@@ -243,6 +215,7 @@ class LikeItem extends StatelessWidget {
                     width: 60,
                     height: 60,
                     src: item.item!.image,
+                    radius: 6,
                   ),
               ],
             ),

lib/pages/message/reply/view.dart

@@ -4,10 +4,9 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
-import 'package:pilipala/http/search.dart';
 import 'package:pilipala/models/msg/reply.dart';
+import 'package:pilipala/pages/message/utils/index.dart';
 import 'package:pilipala/utils/utils.dart';
-
 import 'controller.dart';
 
 class MessageReplyPage extends StatefulWidget {
@@ -112,28 +111,14 @@ class ReplyItem extends StatelessWidget {
   Widget build(BuildContext context) {
     Color outline = Theme.of(context).colorScheme.outline;
     final String heroTag = Utils.makeHeroTag(item.user!.mid);
-    final String bvid = item.item!.uri!.split('/').last;
-    // 页码
-    final String page =
-        item.item!.nativeUri!.split('page=').last.split('&').first;
-    // 根评论id
-    final String commentRootId =
-        item.item!.nativeUri!.split('comment_root_id=').last.split('&').first;
-    // 二级评论id
-    final String commentSecondaryId =
-        item.item!.nativeUri!.split('comment_secondary_id=').last;
+    final Uri uri = Uri.parse(item.item!.uri!);
 
+    /// bilibili://
+    final Uri nativeUri = Uri.parse(item.item!.nativeUri!);
+    final String type = item.item!.type!;
     return InkWell(
       onTap: () async {
-        final int cid = await SearchHttp.ab2c(bvid: bvid);
-        final String heroTag = Utils.makeHeroTag(bvid);
-        Get.toNamed<dynamic>(
-          '/video?bvid=$bvid&cid=$cid',
-          arguments: <String, String?>{
-            'pic': '',
-            'heroTag': heroTag,
-          },
-        );
+        MessageUtils.onClickMessage(context, uri, nativeUri, type);
       },
       child: Padding(
         padding: const EdgeInsets.all(14),
@@ -217,6 +202,7 @@ class ReplyItem extends StatelessWidget {
                 width: 60,
                 height: 60,
                 src: item.item!.image,
+                radius: 6,
               ),
           ],
         ),

lib/pages/message/utils/index.dart

@@ -0,0 +1,89 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
+import 'package:get/get.dart';
+import 'package:pilipala/http/search.dart';
+import 'package:pilipala/models/common/reply_type.dart';
+import 'package:pilipala/pages/video/detail/reply_reply/index.dart';
+import 'package:pilipala/utils/app_scheme.dart';
+import 'package:pilipala/utils/utils.dart';
+
+class MessageUtils {
+  // 回复我的、收到的赞点击
+  static void onClickMessage(
+      BuildContext context, Uri uri, Uri nativeUri, String type) async {
+    final String path = uri.path;
+    final String bvid = path.split('/').last;
+    final String nativePath = nativeUri.path;
+    final String oid = nativePath.split('/').last;
+    final Map<String, String> queryParameters = nativeUri.queryParameters;
+    final String? argCid = queryParameters['cid'];
+    // final String? page = queryParameters['page'];
+    final String? commentRootId = queryParameters['comment_root_id'];
+    // final String? commentSecondaryId = queryParameters['comment_secondary_id'];
+    switch (type) {
+      case 'video':
+      case 'danmu':
+        try {
+          final int cid = argCid != null
+              ? int.parse(argCid)
+              : await SearchHttp.ab2c(bvid: bvid);
+          final String heroTag = Utils.makeHeroTag(bvid);
+          Get.toNamed<dynamic>(
+            '/video?bvid=$bvid&cid=$cid',
+            arguments: <String, String?>{
+              'pic': '',
+              'heroTag': heroTag,
+            },
+          );
+        } catch (e) {
+          SmartDialog.showToast('视频可能失效了$e');
+        }
+        break;
+      case 'reply':
+        debugPrint('commentRootId: $oid, $commentRootId');
+        navigateToComment(
+            context, oid, commentRootId!, ReplyType.video, nativeUri);
+        break;
+      default:
+        break;
+    }
+  }
+
+  // 跳转查看评论
+  static void navigateToComment(
+    BuildContext context,
+    String oid,
+    String rpid,
+    ReplyType replyType,
+    Uri nativeUri,
+  ) {
+    Navigator.push(
+      context,
+      MaterialPageRoute(
+        builder: (context) => Scaffold(
+          appBar: AppBar(
+            title: const Text('评论详情'),
+            actions: [
+              IconButton(
+                tooltip: '查看原内容',
+                onPressed: () {
+                  PiliSchame.routePush(nativeUri);
+                },
+                icon: const Icon(Icons.open_in_new_outlined),
+              ),
+              const SizedBox(width: 10),
+            ],
+          ),
+          body: VideoReplyReplyPanel(
+            oid: int.tryParse(oid),
+            rpid: int.tryParse(rpid),
+            source: 'routePush',
+            replyType: replyType,
+            firstFloor: null,
+            showRoot: true,
+          ),
+        ),
+      ),
+    );
+  }
+}