Merge branch 'feat-wqf-payment' into xiaoyu_cocossteve

biao
2 parents a116d99f 8fec4713
Showing 1 changed file with 20 additions and 6 deletions
lib/app/splash_page.dart
@@ -48,7 +48,7 @@ class _TransitionViewState extends State&lt;TransitionView&gt; {
     //Log.d('Splash读当前页面：$currentPageName');
     Log.d('Splash读本地, userEntity: $userEntity');
     int apartInMilliseconds = 0;
-    // 阻塞获取系统配置信息
+    // 获取系统配置信息
     AppConfigHelper.getAppConfig();
     // 调一下接口判断一下有效性再往下
     if (userEntity != null && userEntity.token != null) {
@@ -95,7 +95,9 @@ class _TransitionViewState extends State&lt;TransitionView&gt; {
     });
   }
  
-  Future<void> fetchNecessaryData(String userToken) async {
+  Future<void> fetchNecessaryData(String userToken,
+      {Completer<void>? completer}) async {
+    completer ??= Completer<void>();
     // 获取用户信息
     try {
       UserEntity? userEntity = await UserDao.getUserInfo();
@@ -105,7 +107,10 @@ class _TransitionViewState extends State&lt;TransitionView&gt; {
         Log.d('Splash重设token, userEntity: $userEntity');
         UserUtil.saveUser(userEntity);
       }
+      //todo 如果为null是否需要清除用户信息？
+      completer.complete();
     } catch (e) {
+      debugPrint('Splash获取用户信息异常：$e');
       //异常的话弹窗提示重试
       showDialog(
         context: context,
@@ -118,13 +123,20 @@ class _TransitionViewState extends State&lt;TransitionView&gt; {
               content: const Text('网络异常，请检查网络后重试'),
               actions: <Widget>[
                 TextButton(
-                  child: const Text('退出'),
-                  onPressed: () => AppConfigHelper.exitApp()
-                ),
+                    child: const Text('退出'),
+                    onPressed: () => {
+                          // 关闭对话框并重试
+                          Navigator.of(context).pop(),
+                          AppConfigHelper.exitApp(),
+                          completer?.complete(),
+                        }),
                 TextButton(
                   child: const Text('重试'),
                   onPressed: () async {
-                    fetchNecessaryData(userToken);
+                    // 关闭对话框并重试
+                    Navigator.of(context).pop();
+                    await fetchNecessaryData(userToken, completer: completer);
+                    completer?.complete();
                   },
                 ),
               ],
@@ -134,6 +146,8 @@ class _TransitionViewState extends State&lt;TransitionView&gt; {
       );
       e.logE();
     }
+    // 等待completer完成，这会阻塞后续代码的执行，直到用户做出选择
+    await completer.future;
   }
  
   @override