diff --git a/lib/pages/dynamics/controller.dart b/lib/pages/dynamics/controller.dart index ad8d74443..134d720f8 100644 --- a/lib/pages/dynamics/controller.dart +++ b/lib/pages/dynamics/controller.dart @@ -191,12 +191,16 @@ class DynamicsController extends GetxController @override Future onRefresh() { + _refreshFollowUp(); + return controller!.onRefresh(); + } + + void _refreshFollowUp() { if (_showAllUp) { _upPage = 1; _cacheUpList = null; } queryFollowUp(); - return controller!.onRefresh(); } @override @@ -235,5 +239,5 @@ class DynamicsController extends GetxController } @override - void onChangeAccount(bool isLogin) => onRefresh(); + void onChangeAccount(bool isLogin) => _refreshFollowUp(); } diff --git a/lib/pages/dynamics_tab/controller.dart b/lib/pages/dynamics_tab/controller.dart index 63b47ae2e..2842f09fc 100644 --- a/lib/pages/dynamics_tab/controller.dart +++ b/lib/pages/dynamics_tab/controller.dart @@ -91,5 +91,5 @@ class DynamicsTabController } @override - void onChangeAccount(bool isLogin) => onRefresh(); + void onChangeAccount(bool isLogin) => onReload(); } diff --git a/lib/pages/live/controller.dart b/lib/pages/live/controller.dart index f04de2731..858cd433e 100644 --- a/lib/pages/live/controller.dart +++ b/lib/pages/live/controller.dart @@ -143,5 +143,5 @@ class LiveController extends CommonListController with AccountMixin { } @override - void onChangeAccount(bool isLogin) => onRefresh(); + void onChangeAccount(bool isLogin) => onReload(); } diff --git a/lib/pages/pgc/controller.dart b/lib/pages/pgc/controller.dart index 943d9ec62..efa7eb12e 100644 --- a/lib/pages/pgc/controller.dart +++ b/lib/pages/pgc/controller.dart @@ -42,16 +42,20 @@ class PgcController @override Future onRefresh() { if (accountService.isLogin.value) { - followPage = 1; - followEnd = false; + _refreshPgcFollow(); } - queryPgcFollow(); if (showPgcTimeline) { queryPgcTimeline(); } return super.onRefresh(); } + void _refreshPgcFollow() { + followPage = 1; + followEnd = false; + queryPgcFollow(); + } + // follow late int followPage = 1; late RxInt followCount = (-1).obs; @@ -147,9 +151,7 @@ class PgcController @override void onChangeAccount(bool isLogin) { if (isLogin) { - followPage = 1; - followEnd = false; - queryPgcFollow(); + _refreshPgcFollow(); } else { followState.value = LoadingState.loading(); }