From 7958be966e1abf679854ddfea9db4d79c2976904 Mon Sep 17 00:00:00 2001 From: laiiihz Date: Wed, 24 Mar 2021 15:50:46 +0800 Subject: [PATCH] update getx to function --- lib/extensions/page_router.dart | 2 +- .../address_page/widget/address_item.dart | 22 +++++++++---------- .../widget/confirm_content.dart | 8 +++---- lib/pages/home/widget/home_search.dart | 2 +- lib/pages/one_alarm/widget/alarm_page.dart | 2 +- lib/pages/sign/sign_in_page.dart | 2 +- .../sign/sign_up/sign_up_pick_role_page.dart | 2 +- .../sign_up/sign_up_set_nickname_page.dart | 2 +- lib/pages/things_page/fixed_submit_page.dart | 2 +- .../activity/activity_detail_page.dart | 2 +- .../community_views/community_page.dart | 2 +- .../topic/topic_community_view.dart | 2 +- .../topic/topic_detail_page.dart | 2 +- .../community_views/widgets/chat_card.dart | 2 +- .../widgets/my_event_card.dart | 2 +- lib/ui/community/notice/notice_card.dart | 2 +- lib/ui/home/application/all_application.dart | 4 ++-- lib/ui/home/home_notification.dart | 2 +- lib/ui/manager/advice/advice_detail_page.dart | 3 ++- lib/ui/search/bee_search.dart | 2 +- lib/utils/login_util.dart | 2 +- lib/widget/picker/grid_image_picker.dart | 2 +- lib/widget/views/application_view.dart | 2 +- 23 files changed, 37 insertions(+), 38 deletions(-) diff --git a/lib/extensions/page_router.dart b/lib/extensions/page_router.dart index 5aa44709..9a5a7171 100644 --- a/lib/extensions/page_router.dart +++ b/lib/extensions/page_router.dart @@ -3,5 +3,5 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; extension PageExt on Widget { - Function get to => () => Get.to(this); + Function get to => () => Get.to(() => this); } diff --git a/lib/pages/address_page/widget/address_item.dart b/lib/pages/address_page/widget/address_item.dart index 90dfc1d9..6a2c2ba3 100644 --- a/lib/pages/address_page/widget/address_item.dart +++ b/lib/pages/address_page/widget/address_item.dart @@ -114,18 +114,16 @@ class AddressItem extends StatelessWidget { top: 55.w, child: InkWell( onTap: () { - Get.to( - AddressEditPage( - bundle: Bundle() - ..putMap('details', { - 'title': '编辑地址', - 'name': name, - 'phone': phone, - 'address': address, - 'isDelete': true - }), - ), - ); + AddressEditPage( + bundle: Bundle() + ..putMap('details', { + 'title': '编辑地址', + 'name': name, + 'phone': phone, + 'address': address, + 'isDelete': true + }), + ).to(); }, child: Row( children: [ diff --git a/lib/pages/confirm_order_page/widget/confirm_content.dart b/lib/pages/confirm_order_page/widget/confirm_content.dart index 38a09b42..eb690d24 100644 --- a/lib/pages/confirm_order_page/widget/confirm_content.dart +++ b/lib/pages/confirm_order_page/widget/confirm_content.dart @@ -190,10 +190,10 @@ class ConfirmContent extends StatelessWidget { ), InkWell( onTap: () { - Get.to(InvoicePage( - bundle: Bundle() - ..putString('title', '1123123123123'), - )); + Get.to(() => InvoicePage( + bundle: Bundle() + ..putString('title', '1123123123123'), + )); }, child: Row( children: [ diff --git a/lib/pages/home/widget/home_search.dart b/lib/pages/home/widget/home_search.dart index d04014b9..693a5366 100644 --- a/lib/pages/home/widget/home_search.dart +++ b/lib/pages/home/widget/home_search.dart @@ -39,7 +39,7 @@ class _HomeSearchState extends State { minWidth: double.infinity, color: Color(0xFFF3F3F3), onPressed: () { - Get.to(BeeSearch()); + Get.to(() => BeeSearch()); }, child: Row( children: [ diff --git a/lib/pages/one_alarm/widget/alarm_page.dart b/lib/pages/one_alarm/widget/alarm_page.dart index f0d126aa..ab7de235 100644 --- a/lib/pages/one_alarm/widget/alarm_page.dart +++ b/lib/pages/one_alarm/widget/alarm_page.dart @@ -55,7 +55,7 @@ class _AlarmPageState extends State { title: '一键报警', actions: [ MaterialButton( - onPressed: () => Get.to(AlarmDetailPage()), + onPressed: () => Get.to(() => AlarmDetailPage()), child: '功能说明'.text.black.size(28.sp).make(), ) ], diff --git a/lib/pages/sign/sign_in_page.dart b/lib/pages/sign/sign_in_page.dart index 6b51d20a..75cfd9b3 100644 --- a/lib/pages/sign/sign_in_page.dart +++ b/lib/pages/sign/sign_in_page.dart @@ -98,7 +98,7 @@ class _SignInPageState extends State { } else { cancel(); signUpProvider.setTel(_phone.text); - await Get.to(SignUpPickPlotPage()); + await Get.to(() => SignUpPickPlotPage()); signUpProvider.clearAll(); } } else { diff --git a/lib/pages/sign/sign_up/sign_up_pick_role_page.dart b/lib/pages/sign/sign_up/sign_up_pick_role_page.dart index c612e351..3cb522a2 100644 --- a/lib/pages/sign/sign_up/sign_up_pick_role_page.dart +++ b/lib/pages/sign/sign_up/sign_up_pick_role_page.dart @@ -55,7 +55,7 @@ class _SignUpPickRolePageState extends State { shape: StadiumBorder(), disabledColor: kPrimaryColor.withOpacity(0.3), child: '提交'.text.make(), - onPressed: () => Get.to(SignUpSetNicknamePage()), + onPressed: () => Get.to(() => SignUpSetNicknamePage()), elevation: 0, ).pLTRB(82.w, 0, 82.w, 155.w), ); diff --git a/lib/pages/sign/sign_up/sign_up_set_nickname_page.dart b/lib/pages/sign/sign_up/sign_up_set_nickname_page.dart index 9aea7278..31c5636e 100644 --- a/lib/pages/sign/sign_up/sign_up_set_nickname_page.dart +++ b/lib/pages/sign/sign_up/sign_up_set_nickname_page.dart @@ -73,7 +73,7 @@ class _SignUpSetNicknamePageState extends State { final signUpProvider = Provider.of(context, listen: false); signUpProvider.setNickName(_textEditingController.text); - Get.to(SignUpVerifyPage()); + Get.to(() => SignUpVerifyPage()); } }, ), diff --git a/lib/pages/things_page/fixed_submit_page.dart b/lib/pages/things_page/fixed_submit_page.dart index dec8ad96..4f7f78bf 100644 --- a/lib/pages/things_page/fixed_submit_page.dart +++ b/lib/pages/things_page/fixed_submit_page.dart @@ -260,7 +260,7 @@ class _FixedSubmitPageState extends State { Get.dialog(_showDeletDialog()); } : () async { - bool needRefresh = await Get.to(AddFixedSubmitPage()); + bool needRefresh = await Get.to(() => AddFixedSubmitPage()); if (needRefresh == null) _easyRefreshController.callRefresh(); }, child: _isEdit diff --git a/lib/ui/community/activity/activity_detail_page.dart b/lib/ui/community/activity/activity_detail_page.dart index a478cd12..63f2af2b 100644 --- a/lib/ui/community/activity/activity_detail_page.dart +++ b/lib/ui/community/activity/activity_detail_page.dart @@ -161,7 +161,7 @@ class _ActivityDetailPageState extends State { MaterialButton( height: 92.w, onPressed: () => - Get.to(ActivityPeopleListPage(id: widget.id)), + Get.to(() => ActivityPeopleListPage(id: widget.id)), child: Row( children: [ StackAvatar( diff --git a/lib/ui/community/community_views/community_page.dart b/lib/ui/community/community_views/community_page.dart index 4b22dee7..642593d1 100644 --- a/lib/ui/community/community_views/community_page.dart +++ b/lib/ui/community/community_views/community_page.dart @@ -70,7 +70,7 @@ class _CommunityPageState extends State fab: FloatingActionButton( onPressed: () async { if (LoginUtil.isNotLogin) return; - bool result = await Get.to(AddNewEventPage()); + bool result = await Get.to(() => AddNewEventPage()); if (result == true) { switch (_tabController.index) { case 0: diff --git a/lib/ui/community/community_views/topic/topic_community_view.dart b/lib/ui/community/community_views/topic/topic_community_view.dart index 9a2f29e2..bd3fbb8e 100644 --- a/lib/ui/community/community_views/topic/topic_community_view.dart +++ b/lib/ui/community/community_views/topic/topic_community_view.dart @@ -29,7 +29,7 @@ class TopicCommunityViewState extends State return MaterialButton( padding: EdgeInsets.symmetric(horizontal: 53.w, vertical: 20.w), onPressed: () { - Get.to(TopicDetailPage(model: model)); + Get.to(() => TopicDetailPage(model: model)); }, child: Row( crossAxisAlignment: CrossAxisAlignment.start, diff --git a/lib/ui/community/community_views/topic/topic_detail_page.dart b/lib/ui/community/community_views/topic/topic_detail_page.dart index e538cdc5..d30ea0c3 100644 --- a/lib/ui/community/community_views/topic/topic_detail_page.dart +++ b/lib/ui/community/community_views/topic/topic_detail_page.dart @@ -40,7 +40,7 @@ class _TopicDetailPageState extends State { heroTag: 'event_add', onPressed: () async { if (LoginUtil.isNotLogin) return; - bool result = await Get.to(AddNewEventPage()); + bool result = await Get.to(() => AddNewEventPage()); }, child: Icon(Icons.add), ), diff --git a/lib/ui/community/community_views/widgets/chat_card.dart b/lib/ui/community/community_views/widgets/chat_card.dart index a6a5dde8..440c58d5 100644 --- a/lib/ui/community/community_views/widgets/chat_card.dart +++ b/lib/ui/community/community_views/widgets/chat_card.dart @@ -274,7 +274,7 @@ class _ChatCardState extends State { padding: EdgeInsets.zero, onPressed: widget.canTap ? () { - Get.to(EventDetailPage(themeId: widget.model.id)); + Get.to(() => EventDetailPage(themeId: widget.model.id)); } : null, child: Row( diff --git a/lib/ui/community/community_views/widgets/my_event_card.dart b/lib/ui/community/community_views/widgets/my_event_card.dart index be04ac9e..16dba44a 100644 --- a/lib/ui/community/community_views/widgets/my_event_card.dart +++ b/lib/ui/community/community_views/widgets/my_event_card.dart @@ -61,7 +61,7 @@ class MyEventCard extends StatelessWidget { : SizedBox(), MaterialButton( onPressed: () { - Get.to(EventDetailPage(themeId: model.id)); + Get.to(() => EventDetailPage(themeId: model.id)); }, child: Row( crossAxisAlignment: CrossAxisAlignment.start, diff --git a/lib/ui/community/notice/notice_card.dart b/lib/ui/community/notice/notice_card.dart index 79ed3364..d3756121 100644 --- a/lib/ui/community/notice/notice_card.dart +++ b/lib/ui/community/notice/notice_card.dart @@ -69,7 +69,7 @@ class NoticeCard extends StatelessWidget { : SizedBox(), MaterialButton( onPressed: () { - Get.to(NoticeDetailPage(id: model.id)); + Get.to(() => NoticeDetailPage(id: model.id)); }, child: Row( crossAxisAlignment: CrossAxisAlignment.start, diff --git a/lib/ui/home/application/all_application.dart b/lib/ui/home/application/all_application.dart index 3a880df5..7515e751 100644 --- a/lib/ui/home/application/all_application.dart +++ b/lib/ui/home/application/all_application.dart @@ -35,7 +35,7 @@ class _AllApplicationPageState extends State { ? null : () { if (LoginUtil.isNotLogin) return; - Get.to(object.page); + Get.to(() => object.page); }, child: Column( mainAxisAlignment: MainAxisAlignment.center, @@ -239,7 +239,7 @@ class _AllApplicationPageState extends State { minWidth: double.infinity, color: Color(0xFFF3F3F3), onPressed: () { - Get.to(BeeSearch()); + Get.to(() => BeeSearch()); }, child: Row( children: [ diff --git a/lib/ui/home/home_notification.dart b/lib/ui/home/home_notification.dart index 97420886..40c961ea 100644 --- a/lib/ui/home/home_notification.dart +++ b/lib/ui/home/home_notification.dart @@ -60,7 +60,7 @@ class _HomeNotificationState extends State { : GestureDetector( onTap: () { if (randomItem != null) - Get.to(NoticeDetailPage(id: randomItem.id)); + Get.to(() => NoticeDetailPage(id: randomItem.id)); }, child: AnimatedSwitcher( duration: Duration(milliseconds: 1000), diff --git a/lib/ui/manager/advice/advice_detail_page.dart b/lib/ui/manager/advice/advice_detail_page.dart index 0c1b7dbe..ec78a203 100644 --- a/lib/ui/manager/advice/advice_detail_page.dart +++ b/lib/ui/manager/advice/advice_detail_page.dart @@ -184,7 +184,8 @@ class _AdviceDetailPageState extends State { ), bottomNavi: BottomButton( onPressed: () async { - bool result = await Get.to(AdviceAddCommentPage(id: widget.model.id)); + bool result = + await Get.to(() => AdviceAddCommentPage(id: widget.model.id)); if (result && mounted) _refreshController.callRefresh(); }, child: '继续提问'.text.bold.make(), diff --git a/lib/ui/search/bee_search.dart b/lib/ui/search/bee_search.dart index e4e47d5b..7eafaf07 100644 --- a/lib/ui/search/bee_search.dart +++ b/lib/ui/search/bee_search.dart @@ -40,7 +40,7 @@ class _BeeSearchState extends State { return MaterialButton( onPressed: () { if (LoginUtil.isNotLogin) return; - Get.to(e.page); + Get.to(() => e.page); }, shape: StadiumBorder(), child: Column( diff --git a/lib/utils/login_util.dart b/lib/utils/login_util.dart index d13d9f8c..9b6acbc0 100644 --- a/lib/utils/login_util.dart +++ b/lib/utils/login_util.dart @@ -17,7 +17,7 @@ class LoginUtil { final userProvider = Provider.of(Get.context, listen: false); if (userProvider.isNotLogin) { BotToast.showText(text: '请先登录'); - Get.to(SignInPage()); + Get.to(() => SignInPage()); return false; } return true; diff --git a/lib/widget/picker/grid_image_picker.dart b/lib/widget/picker/grid_image_picker.dart index 1ca30300..cddc7a96 100644 --- a/lib/widget/picker/grid_image_picker.dart +++ b/lib/widget/picker/grid_image_picker.dart @@ -80,7 +80,7 @@ class _GridImagePickerState extends State { ), child: MaterialButton( onPressed: () { - Get.to(BeeImagePreview.file(file: file), opaque: false); + Get.to(() => BeeImagePreview.file(file: file), opaque: false); }, onLongPress: () async { bool result = await Get.dialog(CupertinoAlertDialog( diff --git a/lib/widget/views/application_view.dart b/lib/widget/views/application_view.dart index 373c71f1..5e0e7e4d 100644 --- a/lib/widget/views/application_view.dart +++ b/lib/widget/views/application_view.dart @@ -35,7 +35,7 @@ class _ApplicationViewState extends State { padding: EdgeInsets.zero, onPressed: () { if (LoginUtil.isNotLogin) return; - Get.to(object.page); + Get.to(() => object.page); }, child: Column( mainAxisAlignment: MainAxisAlignment.center,