mod: refresh

related #306

Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>

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

lib/pages/common/reply_controller.dart

@@ -139,8 +139,7 @@ abstract class ReplyController extends CommonController {
           break;
       }
       nextOffset = '';
-      loadingState.value = LoadingState.loading();
+      onReload();
-      onRefresh();
     });
   }
 

lib/pages/dynamics/controller.dart

@@ -162,11 +162,9 @@ class DynamicsController extends GetxController
 
   onRefresh() async {
     queryFollowUp();
-    await Future.wait(<Future>[
+    await Get.find<DynamicsTabController>(
-      Get.find<DynamicsTabController>(
+            tag: tabsConfig[tabController.index]['tag'])
-              tag: tabsConfig[tabController.index]['tag'])
+        .onRefresh();
-          .onRefresh()
-    ]);
   }
 
   // 返回顶部并刷新

lib/pages/fav_search/view.dart

@@ -50,7 +50,7 @@ class _FavSearchPageState extends State<FavSearchPage> {
               onPressed: _favSearchCtr.onClear,
             ),
           ),
-          onSubmitted: (value) => _favSearchCtr.onRefresh(),
+          onSubmitted: (value) => _favSearchCtr.onReload(),
         ),
       ),
       body: Obx(() => _buildBody(_favSearchCtr.loadingState.value)),

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();
+                    onReload();
-                    onRefresh();
                   }
                 }
                 Get.back();

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();
+    onReload();
-    onRefresh();
   }
 
   void toViewPlayAll() async {

lib/pages/member/new/member_page.dart

@@ -297,10 +297,7 @@ class _MemberPageNewState extends State<MemberPageNew>
   Widget _errorWidget(msg) {
     return errorWidget(
       errMsg: msg,
-      callback: () {
+      callback: _userController.onReload,
-        _userController.loadingState.value = LoadingState.loading();
-        _userController.onRefresh();
-      },
     );
   }
 

lib/pages/rank/zone/view.dart

@@ -66,7 +66,7 @@ class _ZonePageState extends State<ZonePage>
     super.build(context);
     return refreshIndicator(
       onRefresh: () async {
-        return await _zoneController.onRefresh();
+        await _zoneController.onRefresh();
       },
       child: CustomScrollView(
         controller: _zoneController.scrollController,

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

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

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

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();
+    onReload();
-    onRefresh();
   }
 }

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();
+    onReload();
-    onRefresh();
   }
 }