diff --git a/lib/pages/dynamics/tab/view.dart b/lib/pages/dynamics/tab/view.dart index 6c23ee0e..629785a1 100644 --- a/lib/pages/dynamics/tab/view.dart +++ b/lib/pages/dynamics/tab/view.dart @@ -81,17 +81,10 @@ class _DynamicsTabPageState @override Widget build(BuildContext context) { super.build(context); - // debugPrint(widget.dynamicsType + widget.mid.value.toString()); return refreshIndicator( - // key: - // ValueKey(widget.dynamicsType + widget.mid.value.toString()), onRefresh: () async { - dynamicsWaterfallFlow = GStorage.setting - .get(SettingBoxKey.dynamicsWaterfallFlow, defaultValue: true); - await Future.wait([ - controller.onRefresh(), - dynamicsController.queryFollowUp(), - ]); + dynamicsController.queryFollowUp(); + await controller.onRefresh(); }, child: CustomScrollView( physics: const AlwaysScrollableScrollPhysics(), diff --git a/lib/pages/member_search/search_dynamic.dart b/lib/pages/member_search/search_dynamic.dart index a86507ad..fae7bf9b 100644 --- a/lib/pages/member_search/search_dynamic.dart +++ b/lib/pages/member_search/search_dynamic.dart @@ -32,10 +32,11 @@ class _SearchDynamicState extends State return Obx(() => _buildBody(context, widget.ctr.dynamicState.value)); } + late final bool dynamicsWaterfallFlow = GStorage.setting + .get(SettingBoxKey.dynamicsWaterfallFlow, defaultValue: true); + Widget _buildBody(BuildContext context, LoadingState?> loadingState) { - bool dynamicsWaterfallFlow = GStorage.setting - .get(SettingBoxKey.dynamicsWaterfallFlow, defaultValue: true); return switch (loadingState) { Loading() => loadingWidget, Success() => loadingState.response?.isNotEmpty == true