diff --git a/lib/pages/dynamics/widgets/action_panel.dart b/lib/pages/dynamics/widgets/action_panel.dart index 03183d233..8cad2382d 100644 --- a/lib/pages/dynamics/widgets/action_panel.dart +++ b/lib/pages/dynamics/widgets/action_panel.dart @@ -61,8 +61,7 @@ class ActionPanel extends StatelessWidget { ), Expanded( child: TextButton.icon( - onPressed: () => - PageUtils.pushDynDetail(item, isPush: true, viewReply: true), + onPressed: () => PageUtils.pushDynDetail(item, isPush: true), icon: Icon( FontAwesomeIcons.comment, size: 16, diff --git a/lib/pages/dynamics_detail/controller.dart b/lib/pages/dynamics_detail/controller.dart index e4147ab64..1374d0c34 100644 --- a/lib/pages/dynamics_detail/controller.dart +++ b/lib/pages/dynamics_detail/controller.dart @@ -3,8 +3,6 @@ import 'package:PiliPlus/models/dynamics/result.dart'; import 'package:PiliPlus/pages/common/dyn/common_dyn_controller.dart'; import 'package:PiliPlus/utils/id_utils.dart'; import 'package:PiliPlus/utils/storage_pref.dart'; -import 'package:flutter/material.dart' show GlobalKey, Scrollable; -import 'package:flutter/scheduler.dart' show SchedulerBinding; import 'package:get/get.dart'; class DynamicDetailController extends CommonDynController { @@ -19,18 +17,12 @@ class DynamicDetailController extends CommonDynController { @override dynamic get sourceId => replyType == 1 ? IdUtils.av2bv(oid) : oid; - GlobalKey? replyKey; - @override void onInit() { super.onInit(); - final args = Get.arguments; - dynItem = args['item']; - if (args['viewReply'] ?? false) { - replyKey = GlobalKey(); - } - final commentType = dynItem.basic?.commentType; - final commentIdStr = dynItem.basic?.commentIdStr; + dynItem = Get.arguments['item']; + var commentType = dynItem.basic?.commentType; + var commentIdStr = dynItem.basic?.commentIdStr; if (commentType != null && commentType != 0 && commentIdStr != null && @@ -51,17 +43,6 @@ class DynamicDetailController extends CommonDynController { void _init(String commentIdStr, int commentType) { oid = int.parse(commentIdStr); replyType = commentType; - queryData().whenComplete(() { - if (replyKey != null && count.value > 0) { - SchedulerBinding.instance.addPostFrameCallback((_) { - if (replyKey?.currentContext != null) { - Scrollable.ensureVisible( - replyKey!.currentContext!, - duration: const Duration(milliseconds: 200), - ); - } - }); - } - }); + queryData(); } } diff --git a/lib/pages/dynamics_detail/view.dart b/lib/pages/dynamics_detail/view.dart index cd5c67e87..b5bf173fa 100644 --- a/lib/pages/dynamics_detail/view.dart +++ b/lib/pages/dynamics_detail/view.dart @@ -113,10 +113,7 @@ class _DynamicDetailPageState extends CommonDynPageState { ), ), buildReplyHeader(theme), - Obx( - key: controller.replyKey, - () => replyList(theme, controller.loadingState.value), - ), + Obx(() => replyList(theme, controller.loadingState.value)), ], ), ); diff --git a/lib/utils/page_utils.dart b/lib/utils/page_utils.dart index 6dbf8daa1..640de6482 100644 --- a/lib/utils/page_utils.dart +++ b/lib/utils/page_utils.dart @@ -374,7 +374,6 @@ abstract final class PageUtils { static Future pushDynDetail( DynamicItemModel item, { bool isPush = false, - bool viewReply = false, }) async { feedBack(); @@ -392,7 +391,6 @@ abstract final class PageUtils { '/dynamicDetail', arguments: { 'item': item, - 'viewReply': viewReply, }, ); }