fix:修复登录loading窗口问题

Author: wanwusangzhi

lib/controller/index.dart

@@ -7,7 +7,7 @@ void initState() {
   // 获取版本号
   Store.valueNotCtx<ConfigModel>().$getAppVersion();
   // 登录
-  Store.valueNotCtx<UserModel>().$getLocalUserInfo();
+  Store.valueNotCtx<UserModel>().getLocalUserInfo();
   Future.delayed(Duration(seconds: 3), () {
     AppVersion().check(Store.widgetCtx);
   });

lib/http/loading.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:efox_flutter/store/index.dart' show Store;
 
+
 bool loading = false;
 Set dict = Set();
 
@@ -46,6 +47,11 @@ class LoadingDialog extends StatefulWidget {
 }
 
 class LoadingDialogState extends State<LoadingDialog> {
+
+  @override
+  void initState() {
+    super.initState();
+  }
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -78,9 +84,9 @@ class LoadingDialogState extends State<LoadingDialog> {
   }
 
   @override
-  void dispose() {
-    super.dispose();
-    loading = false;
-    dict.clear();
+  void dispose() async {
+    await super.dispose();
+    // loading = false;
+    // await dict.clear();
   }
 }

lib/page/app_login/index.dart

@@ -133,7 +133,7 @@ class _IndexState extends State<Index> {
                                 if ((_formKey.currentState as FormState)
                                     .validate()) {
                                   await Store.value<UserModel>(context)
-                                      .$loginController(context, {
+                                      .loginController(context, {
                                     'name': nameCtl.text.trim(),
                                     'pwd': pwdCtl.text.trim()
                                   });

lib/page/home.dart

@@ -54,7 +54,7 @@ class _IndexState extends State<Index> {
           leading: Icon(Icons.exit_to_app),
           title: Text(AppLocalizations.$t('common.logout')),
           onTap: () {
-            Store.value<UserModel>(context).$clearUserInfo();
+            Store.value<UserModel>(context).clearUserInfo();
           },
         ),
       ];

lib/store/models/user_model.dart

@@ -6,24 +6,23 @@ import '../objects/user_info.dart' show UserInfo;
 import '../objects/github_resp_info.dart' show GitHubRespInfo;
 import 'package:efox_flutter/http/index.dart' as Http;
 import 'package:efox_flutter/utils/localStorage.dart' show LocalStorage;
-import 'package:efox_flutter/http/loading.dart' as Loading;
 
 class UserModel with ChangeNotifier {
   UserInfo user = UserInfo();
   Future testLogin() async {
-    await Loading.beforeRequest('aaa', {});
-    return Future.delayed(Duration(seconds: 3), () async {
-      await Loading.afterResponse('aaa', {});
-      print("返回中");
+    return await Http.post(url: 'http://www.baidu.com').then((res) {
       return true;
+    }).catchError((error) async {
+      return await getUserInfo();
     });
   }
 
   /**
    * 登录控制
    */
-  Future $loginController(context, payload) async {
-    dynamic result = await $login(payload);
+  Future loginController(context, payload) async {
+    dynamic result = await login(payload);
+    // dynamic result = await testLogin();
     print('返回result $result');
     if (result == true) {
       print('登录成功后退');
@@ -36,7 +35,7 @@ class UserModel with ChangeNotifier {
     }
   }
 
-  Future $login(payload) async {
+  Future login(payload) async {
     var name = payload['name'];
     var pwd = payload['pwd'];
     var bytes = utf8.encode("$name:$pwd");
@@ -54,56 +53,56 @@ class UserModel with ChangeNotifier {
       options: options,
     );
     return await response.then((resp) async {
-      await $setLoginRespInfo(resp.data);
-      return true;
+      return await setLoginRespInfo(resp.data);
     }).catchError((error) {
-      $clearUserInfo();
+      clearUserInfo();
       return false;
     });
   }
 
-  $setLoginRespInfo(payload) async {
+  setLoginRespInfo(payload) async {
     GitHubRespInfo user = GitHubRespInfo.fromJson(payload);
     LocalStorage.set('githubRespInfo', user.toString());
     print('user.token.toString() ${user.token.toString()}');
     LocalStorage.set('githubRespLoginToken', user.token.toString());
-    await $getUserInfo(); // 授权成功获取用户信息
+    return await getUserInfo(); // 授权成功获取用户信息
   }
 
   /**
    * 授权成功或打开app时获取用户信息
    */
-  Future $getUserInfo() async {
+  Future getUserInfo() async {
     var response = Http.post(
       url: 'https://api.github.com/user',
     );
-    await response.then((resp) {
+    return await response.then((resp) {
       UserInfo user = UserInfo.fromJson(resp.data);
-      $setUserInfo(user);
+      setUserInfo(user);
+      return true;
     }).catchError((error) {
       print('ERROR $error');
-      // $clearUserInfo();
+      return false;
     });
   }
 
   /**
    * 获取本地数据，减少调用接口
    */
-  $getLocalUserInfo() async {
+  getLocalUserInfo() async {
     String data = await LocalStorage.get('githubUserInfo');
     print("本地数据 $data");
     if (data == null) {
-      $getUserInfo();
+      getUserInfo();
       return;
     }
     UserInfo user = UserInfo.fromJson(json.decode(data));
-    $setUserInfo(user);
+    setUserInfo(user);
   }
 
   /**
    * 设置用户信息
    */
-  $setUserInfo(payload) {
+  setUserInfo(payload) {
     user = payload;
     if (user != null && user.id != null) {
       LocalStorage.set('githubUserInfo', json.encode(user));
@@ -114,7 +113,7 @@ class UserModel with ChangeNotifier {
   /**
    * 清空用户信息
    */
-  $clearUserInfo() {
+  clearUserInfo() {
     user = UserInfo();
     LocalStorage.remove('githubUserInfo');
     LocalStorage.remove('githubRespInfo');

lib/store/objects/github_resp_info.dart

@@ -33,7 +33,7 @@ class GitHubRespInfo extends Object {
   GitHubRespInfo.fromJson(json) {
     id = json['id'];
     url = json['url'];
-    app = json['app'];
+    app = App.fromJson(json['app']);
     token = json['token'];
     hashed_token = json['hashed_token'];
     token_last_eight = json['token_last_eight'];
@@ -48,7 +48,7 @@ class GitHubRespInfo extends Object {
   Map<String, dynamic> toJson() => {
         'id': id,
         'url': url,
-        'app': App.fromJson(app),
+        'app': app,
         'token': token,
         'hashed_token': hashed_token,
         'token_last_eight': token_last_eight,

lib/store/objects/user_info.dart

@@ -179,9 +179,6 @@ class Plan extends Object {
 
   Plan.fromJson(instance) {
     if (instance != null) {
-      if (instance.runtimeType == String) {
-        instance = json.decode(instance);
-      }
       name = instance['name'];
       space = instance['space'];
       collaborators = instance['collaborators'];