From a437524c8f2ee160a985f338024e82978595f74f Mon Sep 17 00:00:00 2001 From: 21pages Date: Sun, 24 Sep 2023 17:56:35 +0800 Subject: [PATCH] await loadCache Signed-off-by: 21pages --- flutter/lib/main.dart | 6 ++---- flutter/lib/models/ab_model.dart | 2 +- flutter/lib/models/group_model.dart | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/flutter/lib/main.dart b/flutter/lib/main.dart index d4e81a82d..79ef0616d 100644 --- a/flutter/lib/main.dart +++ b/flutter/lib/main.dart @@ -125,8 +125,7 @@ void runMainApp(bool startService) async { bind.pluginSyncUi(syncTo: kAppTypeMain); bind.pluginListReload(); } - gFFI.abModel.loadCache(); - gFFI.groupModel.loadCache(); + await Future.wait([gFFI.abModel.loadCache(), gFFI.groupModel.loadCache()]); gFFI.userModel.refreshCurrentUser(); runApp(App()); // Set window option. @@ -154,8 +153,7 @@ void runMobileApp() async { await initEnv(kAppTypeMain); if (isAndroid) androidChannelInit(); platformFFI.syncAndroidServiceAppDirConfigPath(); - gFFI.abModel.loadCache(); - gFFI.groupModel.loadCache(); + await Future.wait([gFFI.abModel.loadCache(), gFFI.groupModel.loadCache()]); gFFI.userModel.refreshCurrentUser(); runApp(App()); } diff --git a/flutter/lib/models/ab_model.dart b/flutter/lib/models/ab_model.dart index e64759f91..03fb5897f 100644 --- a/flutter/lib/models/ab_model.dart +++ b/flutter/lib/models/ab_model.dart @@ -478,7 +478,7 @@ class AbModel { } } - loadCache() async { + Future loadCache() async { try { if (_cacheLoadOnceFlag || abLoading.value || initialized) return; _cacheLoadOnceFlag = true; diff --git a/flutter/lib/models/group_model.dart b/flutter/lib/models/group_model.dart index ddb02d370..ebd49b560 100644 --- a/flutter/lib/models/group_model.dart +++ b/flutter/lib/models/group_model.dart @@ -231,7 +231,7 @@ class GroupModel { } } - loadCache() async { + Future loadCache() async { try { if (_cacheLoadOnceFlag || groupLoading.value || initialized) return; _cacheLoadOnceFlag = true;