revert: 评论详情优先展示二级评论

lib/pages/dynamics/detail/view.dart

@@ -106,7 +106,7 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
   }
 
   // 查看二级评论
-  void replyReply(replyItem, currentReply) {
+  void replyReply(replyItem) {
     int oid = replyItem.oid;
     int rpid = replyItem.rpid!;
     Get.to(
@@ -324,8 +324,8 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
                                       replyItem: replyList[index],
                                       showReplyRow: true,
                                       replyLevel: '1',
-                                      replyReply: (replyItem, currentReply) =>
+                                      replyReply: (replyItem) =>
-                                          replyReply(replyItem, currentReply),
+                                          replyReply(replyItem),
                                       replyType: ReplyType.values[replyType],
                                       addReply: (replyItem) {
                                         replyList[index]

lib/pages/video/detail/controller.dart

@@ -160,7 +160,7 @@ class VideoDetailController extends GetxController
     getSubtitle();
   }
 
-  showReplyReplyPanel(oid, fRpid, firstFloor, currentReply) {
+  showReplyReplyPanel(oid, fRpid, firstFloor) {
     replyReplyBottomSheetCtr =
         scaffoldKey.currentState?.showBottomSheet((BuildContext context) {
       return VideoReplyReplyPanel(
@@ -173,7 +173,6 @@ class VideoDetailController extends GetxController
         replyType: ReplyType.video,
         source: 'videoDetail',
         sheetHeight: sheetHeight.value,
-        currentReply: currentReply,
       );
     });
     replyReplyBottomSheetCtr?.closed.then((value) {

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

@@ -110,7 +110,7 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
   }
 
   // 展示二级回复
-  void replyReply(replyItem, currentReply) {
+  void replyReply(replyItem) {
     final VideoDetailController videoDetailCtr =
         Get.find<VideoDetailController>(tag: heroTag);
     if (replyItem != null) {
@@ -118,7 +118,7 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
       videoDetailCtr.fRpid = replyItem.rpid!;
       videoDetailCtr.firstFloor = replyItem;
       videoDetailCtr.showReplyReplyPanel(
-          replyItem.oid, replyItem.rpid!, replyItem, currentReply);
+          replyItem.oid, replyItem.rpid!, replyItem);
     }
   }
 
@@ -229,8 +229,8 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
                                             .replyList[index],
                                         showReplyRow: true,
                                         replyLevel: replyLevel,
-                                        replyReply: (replyItem, currentReply) =>
+                                        replyReply: (replyItem) =>
-                                            replyReply(replyItem, currentReply),
+                                            replyReply(replyItem),
                                         replyType: ReplyType.video,
                                       );
                                     }

lib/pages/video/detail/reply/widgets/reply_item.dart

@@ -531,10 +531,8 @@ InlineSpan buildContent(
       TextSpan(
         text: str,
         recognizer: TapGestureRecognizer()
-          ..onTap = () => replyReply?.call(
+          ..onTap = () =>
-                replyItem.root == 0 ? replyItem : fReplyItem,
+              replyReply?.call(replyItem.root == 0 ? replyItem : fReplyItem),
-                replyItem,
-              ),
       ),
     );
   }

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

@@ -26,7 +26,7 @@ class VideoReplyReplyController extends GetxController {
     currentPage = 0;
   }
 
-  Future queryReplyList({type = 'init', currentReply}) async {
+  Future queryReplyList({type = 'init'}) async {
     if (type == 'init') {
       currentPage = 0;
     }
@@ -63,14 +63,6 @@ class VideoReplyReplyController extends GetxController {
         // res['data'].replies.addAll(replyList);
       }
     }
-    if (replyList.isNotEmpty && currentReply != null) {
-      int indexToRemove =
-          replyList.indexWhere((item) => currentReply.rpid == item.rpid);
-      // 如果找到了指定ID的项，则移除
-      if (indexToRemove != -1) {
-        replyList.removeAt(indexToRemove);
-      }
-    }
     isLoadingMore = false;
     return res;
   }

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

@@ -20,7 +20,6 @@ class VideoReplyReplyPanel extends StatefulWidget {
     this.source,
     this.replyType,
     this.sheetHeight,
-    this.currentReply,
     super.key,
   });
   final int? oid;
@@ -30,7 +29,6 @@ class VideoReplyReplyPanel extends StatefulWidget {
   final String? source;
   final ReplyType? replyType;
   final double? sheetHeight;
-  final dynamic currentReply;
 
   @override
   State<VideoReplyReplyPanel> createState() => _VideoReplyReplyPanelState();
@@ -65,9 +63,7 @@ class _VideoReplyReplyPanelState extends State<VideoReplyReplyPanel> {
       },
     );
 
-    _futureBuilderFuture = _videoReplyReplyController.queryReplyList(
+    _futureBuilderFuture = _videoReplyReplyController.queryReplyList();
-      currentReply: widget.currentReply,
-    );
   }
 
   void replyReply(replyItem) {}
@@ -111,9 +107,7 @@ class _VideoReplyReplyPanelState extends State<VideoReplyReplyPanel> {
               onRefresh: () async {
                 setState(() {});
                 _videoReplyReplyController.currentPage = 0;
-                return await _videoReplyReplyController.queryReplyList(
+                return await _videoReplyReplyController.queryReplyList();
-                  currentReply: widget.currentReply,
-                );
               },
               child: CustomScrollView(
                 controller: _videoReplyReplyController.scrollController,
@@ -146,10 +140,6 @@ class _VideoReplyReplyPanelState extends State<VideoReplyReplyPanel> {
                       if (snapshot.connectionState == ConnectionState.done) {
                         Map? data = snapshot.data;
                         if (data != null && data['status']) {
-                          if (widget.currentReply != null) {
-                            _videoReplyReplyController.replyList
-                                .insert(0, widget.currentReply);
-                          }
                           // 请求成功
                           return Obx(
                             () => SliverList(