fix:修复登录问题

Author: wanwusangzhi

lib/page/app_login/index.dart

@@ -134,8 +134,8 @@ class _IndexState extends State<Index> {
                                     .validate()) {
                                   await Store.value<UserModel>(context)
                                       .$loginController(context, {
-                                    'name': nameCtl.text,
-                                    'pwd': pwdCtl.text
+                                    'name': nameCtl.text.trim(),
+                                    'pwd': pwdCtl.text.trim()
                                   });
                                 }
                               },

lib/store/objects/github_resp_info.dart

@@ -4,7 +4,7 @@
 class GitHubRespInfo extends Object {
   num id;
   String url;
-  Map app;
+  App app;
   String token;
   String hashed_token;
   String token_last_eight;
@@ -45,19 +45,19 @@ class GitHubRespInfo extends Object {
     fingerprint = json['fingerprint'];
   }
 
-  Map<String, dynamic> toJson(instance) => {
-        'id': instance.id,
-        'url': instance.url,
-        'app': App.fromJson(instance.app),
-        'token': instance.token,
-        'hashed_token': instance.hashed_token,
-        'token_last_eight': instance.token_last_eight,
-        'note': instance.note,
-        'note_url': instance.note_url,
-        'created_at': instance.created_at,
-        'updated_at': instance.updated_at,
-        'scopes': instance.scopes,
-        'fingerprint': instance.fingerprint,
+  Map<String, dynamic> toJson() => {
+        'id': id,
+        'url': url,
+        'app': App.fromJson(app),
+        'token': token,
+        'hashed_token': hashed_token,
+        'token_last_eight': token_last_eight,
+        'note': note,
+        'note_url': note_url,
+        'created_at': created_at,
+        'updated_at': updated_at,
+        'scopes': scopes,
+        'fingerprint': fingerprint,
       };
 }
 
@@ -84,11 +84,11 @@ class App extends Object {
     map = json['map'];
   }
 
-  Map<String, dynamic> toJson(instance) => {
-        'str': instance.str,
-        'number': instance.number,
-        'boolean': instance.boolean,
-        'array': instance.array,
-        'map': instance.map,
+  Map<String, dynamic> toJson() => {
+        'str': str,
+        'number': number,
+        'boolean': boolean,
+        'array': array,
+        'map': map,
       };
 }

lib/store/objects/user_info.dart

@@ -119,7 +119,7 @@ class UserInfo extends Object {
     disk_usage = instance['disk_usage'];
     collaborators = instance['collaborators'];
     two_factor_authentication = instance['two_factor_authentication'];
-    plan = Plan.fromJson(json.decode(instance['plan']));
+    plan = Plan.fromJson(instance['plan']);
   }
 
   Map<String, dynamic> toJson() => {
@@ -160,7 +160,7 @@ class UserInfo extends Object {
         'disk_usage': disk_usage,
         'collaborators': collaborators,
         'two_factor_authentication': two_factor_authentication,
-        'plan': json.encode(plan),
+        'plan': plan,
       };
 }
 
@@ -177,8 +177,11 @@ class Plan extends Object {
     this.private_repos,
   });
 
-  Plan.fromJson(Map<String, dynamic> instance) {
+  Plan.fromJson(instance) {
     if (instance != null) {
+      if (instance.runtimeType == String) {
+        instance = json.decode(instance);
+      }
       name = instance['name'];
       space = instance['space'];
       collaborators = instance['collaborators'];

lib/widget/common/iconbutton/demo.dart

@@ -6,7 +6,7 @@ class Index extends StatefulWidget {
 }
 
 class _IndexState extends State<Index> {
-  List data = [58273,58275,59493,57903,58283,58284,57771,58285];
+  List data = [58273, 58275, 59493, 57903, 58283, 58284, 57771, 58285];
   int index = 0;
   @override
   void initState() {
@@ -16,52 +16,49 @@ class _IndexState extends State<Index> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(
-        title: Text('IconButton'),
-      ),
-      body: Container(
-        padding: EdgeInsets.fromLTRB(20.0, 0, 20.0, 0),
-        child: ListView(
-          children: <Widget>[
-            IconButton(
-              iconSize: 30.0,
-              padding: EdgeInsets.all(8.0),
-              alignment: Alignment.center,
-              icon: Icon(IconData(
-                data[index],
-                fontFamily: 'MaterialIcons',
-                matchTextDirection: true
-              )),
-              color: Theme.of(context).primaryColor,
-              highlightColor: Colors.black12,
-              splashColor: Theme.of(context).primaryColorLight,
-              onPressed: (){
-                if (index < 7) {
-                  this.setState(() {
-                    index = index + 1;
-                  });
-                } else {
-                  this.setState(() {
-                    index = 0;
-                  });
-                }
-              },
-              tooltip: '长按文本提示',
-            ),
-            IconButton(
-              iconSize: 30.0,
-              padding: EdgeInsets.all(8.0),
-              alignment: Alignment.center,
-              icon: Icon(Icons.sync_disabled),
-              color: Theme.of(context).primaryColor,
-              highlightColor: Colors.black12,
-              splashColor: Theme.of(context).primaryColorLight,
-              tooltip: '长按文本提示',
-              disabledColor: Colors.grey
-            )
-          ],
+        appBar: AppBar(
+          title: Text('IconButton'),
         ),
-      )
-    );
+        body: Container(
+          padding: EdgeInsets.fromLTRB(20.0, 0, 20.0, 0),
+          child: ListView(
+            children: <Widget>[
+              IconButton(
+                iconSize: 30.0,
+                padding: EdgeInsets.all(8.0),
+                alignment: Alignment.center,
+                icon: Icon(IconData(data[index],
+                    fontFamily: 'MaterialIcons', matchTextDirection: true)),
+                color: Theme.of(context).primaryColor,
+                highlightColor: Colors.black12,
+                splashColor: Theme.of(context).primaryColorLight,
+                onPressed: () {
+                  if (index < 7) {
+                    this.setState(() {
+                      index = index + 1;
+                    });
+                  } else {
+                    this.setState(() {
+                      index = 0;
+                    });
+                  }
+                },
+                tooltip: '长按文本提示',
+              ),
+              IconButton(
+                iconSize: 30.0,
+                padding: EdgeInsets.all(8.0),
+                alignment: Alignment.center,
+                icon: Icon(Icons.sync_disabled),
+                color: Theme.of(context).primaryColor,
+                highlightColor: Colors.black12,
+                splashColor: Theme.of(context).primaryColorLight,
+                tooltip: '长按文本提示',
+                disabledColor: Colors.grey,
+                onPressed: () {},
+              )
+            ],
+          ),
+        ));
   }
 }