From 7f912a17813b004b2f57ace720810c508137d06e Mon Sep 17 00:00:00 2001 From: bggRGjQaUbCoE Date: Mon, 24 Feb 2025 17:10:40 +0800 Subject: [PATCH] mod: refresh related #306 Signed-off-by: bggRGjQaUbCoE --- lib/pages/common/common_controller.dart | 4 ++-- lib/pages/common/reply_controller.dart | 3 +-- lib/pages/dynamics/controller.dart | 8 +++----- lib/pages/fav_search/view.dart | 2 +- lib/pages/later/controller.dart | 3 +-- .../content/video/member_video_ctr.dart | 3 +-- lib/pages/member/new/member_page.dart | 5 +---- lib/pages/rank/zone/view.dart | 2 +- lib/pages/search_panel/widgets/article_panel.dart | 4 ++-- lib/pages/search_panel/widgets/user_panel.dart | 4 ++-- lib/pages/search_panel/widgets/video_panel.dart | 10 +++++----- lib/pages/video/detail/member/controller.dart | 3 +-- lib/pages/video/detail/reply_reply/controller.dart | 3 +-- 13 files changed, 22 insertions(+), 32 deletions(-) diff --git a/lib/pages/common/common_controller.dart b/lib/pages/common/common_controller.dart index 1528fd2b..59a3f53c 100644 --- a/lib/pages/common/common_controller.dart +++ b/lib/pages/common/common_controller.dart @@ -64,9 +64,9 @@ abstract class CommonController extends GetxController { scrollController.animToTop(); } - void onReload() { + Future onReload() async { loadingState.value = LoadingState.loading(); - onRefresh(); + await onRefresh(); } @override diff --git a/lib/pages/common/reply_controller.dart b/lib/pages/common/reply_controller.dart index e0daf4be..2bfdb9a8 100644 --- a/lib/pages/common/reply_controller.dart +++ b/lib/pages/common/reply_controller.dart @@ -139,8 +139,7 @@ abstract class ReplyController extends CommonController { break; } nextOffset = ''; - loadingState.value = LoadingState.loading(); - onRefresh(); + onReload(); }); } diff --git a/lib/pages/dynamics/controller.dart b/lib/pages/dynamics/controller.dart index d8031306..baf0de62 100644 --- a/lib/pages/dynamics/controller.dart +++ b/lib/pages/dynamics/controller.dart @@ -162,11 +162,9 @@ class DynamicsController extends GetxController onRefresh() async { queryFollowUp(); - await Future.wait([ - Get.find( - tag: tabsConfig[tabController.index]['tag']) - .onRefresh() - ]); + await Get.find( + tag: tabsConfig[tabController.index]['tag']) + .onRefresh(); } // 返回顶部并刷新 diff --git a/lib/pages/fav_search/view.dart b/lib/pages/fav_search/view.dart index fc4bf65c..e85fbd5e 100644 --- a/lib/pages/fav_search/view.dart +++ b/lib/pages/fav_search/view.dart @@ -50,7 +50,7 @@ class _FavSearchPageState extends State { onPressed: _favSearchCtr.onClear, ), ), - onSubmitted: (value) => _favSearchCtr.onRefresh(), + onSubmitted: (value) => _favSearchCtr.onReload(), ), ), body: Obx(() => _buildBody(_favSearchCtr.loadingState.value)), diff --git a/lib/pages/later/controller.dart b/lib/pages/later/controller.dart index 090c494e..fca80a1c 100644 --- a/lib/pages/later/controller.dart +++ b/lib/pages/later/controller.dart @@ -67,8 +67,7 @@ class LaterController extends MultiSelectController { count.value -= 1; loadingState.value = LoadingState.success(list); } else { - loadingState.value = LoadingState.loading(); - onRefresh(); + onReload(); } } Get.back(); diff --git a/lib/pages/member/new/content/member_contribute/content/video/member_video_ctr.dart b/lib/pages/member/new/content/member_contribute/content/video/member_video_ctr.dart index d0bfdbe0..2f30633d 100644 --- a/lib/pages/member/new/content/member_contribute/content/video/member_video_ctr.dart +++ b/lib/pages/member/new/content/member_contribute/content/video/member_video_ctr.dart @@ -91,8 +91,7 @@ class MemberVideoCtr extends CommonController { } else { sort.value = sort.value == 'desc' ? 'asc' : 'desc'; } - loadingState.value = LoadingState.loading(); - onRefresh(); + onReload(); } void toViewPlayAll() async { diff --git a/lib/pages/member/new/member_page.dart b/lib/pages/member/new/member_page.dart index 1919af25..b1819169 100644 --- a/lib/pages/member/new/member_page.dart +++ b/lib/pages/member/new/member_page.dart @@ -297,10 +297,7 @@ class _MemberPageNewState extends State Widget _errorWidget(msg) { return errorWidget( errMsg: msg, - callback: () { - _userController.loadingState.value = LoadingState.loading(); - _userController.onRefresh(); - }, + callback: _userController.onReload, ); } diff --git a/lib/pages/rank/zone/view.dart b/lib/pages/rank/zone/view.dart index 0984c3bf..0672cd4c 100644 --- a/lib/pages/rank/zone/view.dart +++ b/lib/pages/rank/zone/view.dart @@ -66,7 +66,7 @@ class _ZonePageState extends State super.build(context); return refreshIndicator( onRefresh: () async { - return await _zoneController.onRefresh(); + await _zoneController.onRefresh(); }, child: CustomScrollView( controller: _zoneController.scrollController, diff --git a/lib/pages/search_panel/widgets/article_panel.dart b/lib/pages/search_panel/widgets/article_panel.dart index f1f7c45e..05c0f26f 100644 --- a/lib/pages/search_panel/widgets/article_panel.dart +++ b/lib/pages/search_panel/widgets/article_panel.dart @@ -291,7 +291,7 @@ class ArticlePanelController extends GetxController { tag: 'article${searchPanelCtr.keyword}'); ctr.order.value = item['order']; SmartDialog.showLoading(msg: 'loading'); - await ctr.onRefresh(); + await ctr.onReload(); SmartDialog.dismiss(); }, bgColor: item['value'] == currentOrderFilterval.value @@ -324,7 +324,7 @@ class ArticlePanelController extends GetxController { tag: 'article${searchPanelCtr.keyword}'); ctr.categoryId = item['categoryId']; SmartDialog.showLoading(msg: 'loading'); - await ctr.onRefresh(); + await ctr.onReload(); SmartDialog.dismiss(); }, bgColor: item['value'] == currentZoneFilterval.value diff --git a/lib/pages/search_panel/widgets/user_panel.dart b/lib/pages/search_panel/widgets/user_panel.dart index e731d2ce..38c83a82 100644 --- a/lib/pages/search_panel/widgets/user_panel.dart +++ b/lib/pages/search_panel/widgets/user_panel.dart @@ -217,7 +217,7 @@ class UserPanelController extends GetxController { ctr.orderSort = item['orderSort']; ctr.order.value = item['order']; SmartDialog.showLoading(msg: 'loading'); - await ctr.onRefresh(); + await ctr.onReload(); SmartDialog.dismiss(); }, bgColor: item['value'] == currentOrderFilterval.value @@ -250,7 +250,7 @@ class UserPanelController extends GetxController { tag: 'bili_user${searchPanelCtr.keyword}'); ctr.userType = item['userType']; SmartDialog.showLoading(msg: 'loading'); - await ctr.onRefresh(); + await ctr.onReload(); SmartDialog.dismiss(); }, bgColor: item['value'] == currentUserTypeFilterval.value diff --git a/lib/pages/search_panel/widgets/video_panel.dart b/lib/pages/search_panel/widgets/video_panel.dart index 072bcbf1..9bce3552 100644 --- a/lib/pages/search_panel/widgets/video_panel.dart +++ b/lib/pages/search_panel/widgets/video_panel.dart @@ -51,7 +51,7 @@ Widget searchVideoPanel(context, ctr, LoadingState loadingState) { ctr.order.value = i['type'].toString().split('.').last; SmartDialog.showLoading(msg: 'loading'); - await ctr.onRefresh(); + await ctr.onReload(); SmartDialog.dismiss(); }, ), @@ -257,7 +257,7 @@ class VideoPanelController extends GetxController { 1000; setState(() {}); SmartDialog.showLoading(msg: 'loading'); - await ctr.onRefresh(); + await ctr.onReload(); SmartDialog.dismiss(); } }); @@ -334,7 +334,7 @@ class VideoPanelController extends GetxController { 1000; } SmartDialog.showLoading(msg: 'loading'); - await ctr.onRefresh(); + await ctr.onReload(); SmartDialog.dismiss(); }, bgColor: item['value'] == currentPubTimeFilterval @@ -384,7 +384,7 @@ class VideoPanelController extends GetxController { tag: 'video${searchPanelCtr.keyword}'); ctr.duration.value = item['value']; SmartDialog.showLoading(msg: 'loading'); - await ctr.onRefresh(); + await ctr.onReload(); SmartDialog.dismiss(); }, bgColor: item['value'] == currentTimeFilterval @@ -421,7 +421,7 @@ class VideoPanelController extends GetxController { tag: 'video${searchPanelCtr.keyword}'); ctr.tids = item['tids']; SmartDialog.showLoading(msg: 'loading'); - await ctr.onRefresh(); + await ctr.onReload(); SmartDialog.dismiss(); }, bgColor: item['value'] == currentZoneFilterval diff --git a/lib/pages/video/detail/member/controller.dart b/lib/pages/video/detail/member/controller.dart index c7c6204a..b936aa7a 100644 --- a/lib/pages/video/detail/member/controller.dart +++ b/lib/pages/video/detail/member/controller.dart @@ -95,7 +95,6 @@ class HorizontalMemberPageController extends CommonController { queryBySort() { order.value = order.value == 'pubdate' ? 'click' : 'pubdate'; - loadingState.value = LoadingState.loading(); - onRefresh(); + onReload(); } } diff --git a/lib/pages/video/detail/reply_reply/controller.dart b/lib/pages/video/detail/reply_reply/controller.dart index 4a474bf0..e4a00a8e 100644 --- a/lib/pages/video/detail/reply_reply/controller.dart +++ b/lib/pages/video/detail/reply_reply/controller.dart @@ -197,7 +197,6 @@ class VideoReplyReplyController extends ReplyController mode.value = mode.value == Mode.MAIN_LIST_HOT ? Mode.MAIN_LIST_TIME : Mode.MAIN_LIST_HOT; - loadingState.value = LoadingState.loading(); - onRefresh(); + onReload(); } }