fix 用户动态错位与缓存问题

CarGuo · CarGuo · commit d25c0631e79f · 2018-08-31T13:58:58.000+08:00
diff --git a/lib/page/MyPage.dart b/lib/page/MyPage.dart
@@ -36,7 +36,6 @@ class _MyPageState extends BasePersonState<MyPage> {
 
   Color notifyColor = const Color(GSYColors.subTextColor);
 
-  final List<UserOrg> orgList = new List();
 
 
   Store<GSYState> _getStore() {
@@ -73,27 +72,6 @@ class _MyPageState extends BasePersonState<MyPage> {
     });
   }
 
-  _getUserOrg(String userName) {
-    if (page <= 1) {
-      UserDao.getUserOrgsDao(userName, page, needDb: true).then((res) {
-        if (res != null && res.result) {
-          setState(() {
-            orgList.clear();
-            orgList.addAll(res.data);
-          });
-          return res.next;
-        }
-        return new Future.value(null);
-      }).then((res) {
-        if (res != null && res.result) {
-          setState(() {
-            orgList.clear();
-            orgList.addAll(res.data);
-          });
-        }
-      });
-    }
-  }
 
   @override
   bool get wantKeepAlive => true;
@@ -116,7 +94,7 @@ class _MyPageState extends BasePersonState<MyPage> {
     UserDao.getUserInfo(null).then((res) {
       if (res != null && res.result) {
         _getStore().dispatch(UpdateUserAction(res.data));
-        _getUserOrg(_getUserName());
+        getUserOrg(_getUserName());
       }
     });
     ReposDao.getUserRepository100StatusDao(_getUserName()).then((res) {
diff --git a/lib/page/PersonPage.dart b/lib/page/PersonPage.dart
@@ -121,33 +121,12 @@ class _PersonState extends BasePersonState<PersonPage> {
     return userInfo.login;
   }
 
-  _getUserOrg() {
-    if (page <= 1) {
-      UserDao.getUserOrgsDao(userName, page, needDb: true).then((res) {
-        if (res != null && res.result) {
-          setState(() {
-            orgList.clear();
-            orgList.addAll(res.data);
-          });
-          return res.next;
-        }
-        return new Future.value(null);
-      }).then((res) {
-        if (res != null && res.result) {
-          setState(() {
-            orgList.clear();
-            orgList.addAll(res.data);
-          });
-        }
-      });
-    }
-  }
 
   _getDataLogic() async {
     if (userInfo.type == "Organization") {
       return await UserDao.getMemberDao(_getUserName(), page);
     }
-    _getUserOrg();
+    getUserOrg(_getUserName());
     return await EventDao.getEventDao(_getUserName(), page: page, needDb: page <= 1);
   }
 
diff --git a/lib/widget/BasePersonState.dart b/lib/widget/BasePersonState.dart
@@ -1,4 +1,7 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';
+import 'package:gsy_github_app_flutter/common/dao/UserDao.dart';
 import 'package:gsy_github_app_flutter/common/model/Event.dart';
 import 'package:gsy_github_app_flutter/common/model/User.dart';
 import 'package:gsy_github_app_flutter/common/model/UserOrg.dart';
@@ -16,6 +19,9 @@ import 'package:gsy_github_app_flutter/widget/UserItem.dart';
 
 abstract class BasePersonState<T extends StatefulWidget> extends GSYListState<T> {
 
+  final List<UserOrg> orgList = new List();
+
+  @protected
   renderItem(index, User userInfo, String beStaredCount, Color notifyColor, VoidCallback refreshCallBack, List<UserOrg> orgList) {
     if (index == 0) {
       return new UserHeaderItem(userInfo, beStaredCount, Theme.of(context).primaryColor,
@@ -41,4 +47,28 @@ abstract class BasePersonState<T extends StatefulWidget> extends GSYListState<T>
 
   @override
   bool get needHeader => true;
+
+  @protected
+  getUserOrg(String userName) {
+    if (page <= 1) {
+      UserDao.getUserOrgsDao(userName, page, needDb: true).then((res) {
+        if (res != null && res.result) {
+          setState(() {
+            orgList.clear();
+            orgList.addAll(res.data);
+          });
+          return res.next;
+        }
+        return new Future.value(null);
+      }).then((res) {
+        if (res != null && res.result) {
+          setState(() {
+            orgList.clear();
+            orgList.addAll(res.data);
+          });
+        }
+      });
+    }
+  }
+
 }
