增加用户组织

CarGuo · CarGuo · commit ff0e03582c2f · 2018-08-10T14:45:34.000+08:00
diff --git a/lib/common/dao/UserDao.dart b/lib/common/dao/UserDao.dart
@@ -11,6 +11,7 @@ import 'package:gsy_github_app_flutter/common/dao/DaoResult.dart';
 import 'package:gsy_github_app_flutter/common/local/LocalStorage.dart';
 import 'package:gsy_github_app_flutter/common/model/Notification.dart';
 import 'package:gsy_github_app_flutter/common/model/User.dart';
+import 'package:gsy_github_app_flutter/common/model/UserOrg.dart';
 import 'package:gsy_github_app_flutter/common/net/Address.dart';
 import 'package:gsy_github_app_flutter/common/net/Api.dart';
 import 'package:gsy_github_app_flutter/common/redux/UserRedux.dart';
@@ -316,4 +317,25 @@ class UserDao {
     }
     return new DataResult(null, false);
   }
+
+  /**
+   * 获取用户组织
+   */
+  static getUserOrgsDao(userName, page, {needDb = false}) async {
+    String url = Address.getUserOrgs(userName) + Address.getPageParams("?", page);
+    var res = await HttpManager.netFetch(url, null, null, null);
+    if (res != null && res.result) {
+      List<UserOrg> list = new List();
+      var data = res.data;
+      if (data == null || data.length == 0) {
+        return new DataResult(null, false);
+      }
+      for (int i = 0; i < data.length; i++) {
+        list.add(new UserOrg.fromJson(data[i]));
+      }
+      return new DataResult(list, true);
+    } else {
+      return new DataResult(null, false);
+    }
+  }
 }
diff --git a/lib/common/style/GSYStyle.dart b/lib/common/style/GSYStyle.dart
@@ -316,6 +316,7 @@ class GSYStrings {
   static const String user_un_focus = "关注";
   static const String user_focus_no_support = "不支持关注组织。";
   static const String user_create_at = "创建于：";
+  static const String user_orgs_title = "所在组织";
 
   static const String repos_tab_readme = "详情";
   static const String repos_tab_info = "动态";
diff --git a/lib/page/CommonListPage.dart b/lib/page/CommonListPage.dart
@@ -57,10 +57,12 @@ class _CommonListPageState extends GSYListState<CommonListPage> {
         });
       case 'user':
         return new UserItem(UserItemViewModel.fromMap(data), onPressed: () {
-          NavigatorUtils.goPerson(context, data.userName);
+          NavigatorUtils.goPerson(context, data.login);
         });
       case 'org':
-        return null;
+        return new UserItem(UserItemViewModel.fromOrgMap(data), onPressed: () {
+          NavigatorUtils.goPerson(context, data.login);
+        });
       case 'issue':
         return null;
       case 'release':
@@ -99,7 +101,7 @@ class _CommonListPageState extends GSYListState<CommonListPage> {
       case 'user_be_stared':
         return null;
       case 'user_orgs':
-        return null;
+        return await UserDao.getUserOrgsDao(userName, page, needDb: page <= 1);
     }
   }
 
diff --git a/lib/page/PersonPage.dart b/lib/page/PersonPage.dart
@@ -7,6 +7,7 @@ import 'package:gsy_github_app_flutter/common/dao/ReposDao.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';
 import 'package:gsy_github_app_flutter/common/style/GSYStyle.dart';
 import 'package:gsy_github_app_flutter/common/utils/CommonUtils.dart';
 import 'package:gsy_github_app_flutter/common/utils/EventUtils.dart';
@@ -46,6 +47,8 @@ class _PersonState extends GSYListState<PersonPage> {
 
   User userInfo = User.empty();
 
+  final List<UserOrg> orgList = new List();
+
   final OptionControl titleOptionControl = new OptionControl();
 
   _PersonState(this.userName);
@@ -117,7 +120,7 @@ class _PersonState extends GSYListState<PersonPage> {
 
   _renderEventItem(index) {
     if (index == 0) {
-      return new UserHeaderItem(userInfo, beStaredCount);
+      return new UserHeaderItem(userInfo, beStaredCount, orgList: orgList);
     }
     if (userInfo.type == "Organization") {
       return new UserItem(UserItemViewModel.fromMap(pullLoadWidgetControl.dataList[index - 1]), onPressed: () {
@@ -138,10 +141,24 @@ class _PersonState extends GSYListState<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);
+          });
+        }
+      });
+    }
+  }
+
   _getDataLogic() async {
     if (userInfo.type == "Organization") {
       return await UserDao.getMemberDao(_getUserName(), page);
     }
+    _getUserOrg();
     return await EventDao.getEventDao(_getUserName(), page: page, needDb: page <= 1);
   }
 
diff --git a/lib/widget/UserHeader.dart b/lib/widget/UserHeader.dart
@@ -2,11 +2,13 @@ import 'package:flutter/material.dart';
 import 'package:flutter_spinkit/flutter_spinkit.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:gsy_github_app_flutter/common/model/User.dart';
+import 'package:gsy_github_app_flutter/common/model/UserOrg.dart';
 import 'package:gsy_github_app_flutter/common/style/GSYStyle.dart';
 import 'package:gsy_github_app_flutter/common/utils/CommonUtils.dart';
 import 'package:gsy_github_app_flutter/common/utils/NavigatorUtils.dart';
 import 'package:gsy_github_app_flutter/widget/GSYCardItem.dart';
 import 'package:gsy_github_app_flutter/widget/GSYIConText.dart';
+import 'package:gsy_github_app_flutter/widget/GSYUserIconWidget.dart';
 
 /**
  * 用户详情头部
@@ -22,12 +24,16 @@ class UserHeaderItem extends StatelessWidget {
 
   final VoidCallback refreshCallBack;
 
-  UserHeaderItem(this.userInfo, this.beStaredCount, {this.notifyColor, this.refreshCallBack});
+  final List<UserOrg> orgList;
+
+  UserHeaderItem(this.userInfo, this.beStaredCount, {this.notifyColor, this.refreshCallBack, this.orgList});
 
   ///底部状态栏
   _getBottomItem(String title, var value, onPressed) {
     String data = value == null ? "" : value.toString();
-    TextStyle valueStyle = (value != null && value.toString().length > 4) ? GSYConstant.minSmallText : GSYConstant.subSmallText;
+    TextStyle valueStyle = (value != null && value
+        .toString()
+        .length > 4) ? GSYConstant.minSmallText : GSYConstant.subSmallText;
     return new Expanded(
       child: new Center(
         child: new FlatButton(
@@ -70,46 +76,92 @@ class UserHeaderItem extends StatelessWidget {
         });
   }
 
+  ///用户组织
+  _renderOrgs(BuildContext context, List<UserOrg> orgList) {
+    if (orgList == null || orgList.length == 0) {
+      return new Container();
+    }
+    List<Widget> list = new List();
+
+    renderOrgsItem(UserOrg orgs) {
+      return GSYUserIconWidget(
+          padding: const EdgeInsets.only(right: 5.0, left: 5.0),
+          width: 30.0,
+          height: 30.0,
+          image: orgs.avatarUrl ?? GSYICons.DEFAULT_REMOTE_PIC,
+          onPressed: () {
+            NavigatorUtils.goPerson(context, orgs.login);
+          });
+    }
+
+    int length = orgList.length > 3 ? 3 : orgList.length;
+
+    list.add(new Text(GSYStrings.user_orgs_title + ":", style: GSYConstant.subLightSmallText));
+
+    for (int i = 0; i < length; i++) {
+      list.add(renderOrgsItem(orgList[i]));
+    }
+    if (orgList.length > 3) {
+      list.add(new RawMaterialButton(
+          onPressed: () {
+            NavigatorUtils.gotoCommonList(context, userInfo.login + " " + GSYStrings.user_orgs_title, "org", "user_orgs", userName: userInfo.login);
+          },
+          materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
+          padding: const EdgeInsets.only(right: 5.0, left: 5.0),
+          constraints: const BoxConstraints(minWidth: 0.0, minHeight: 0.0),
+          child: Icon(
+            Icons.more_horiz,
+            color: Color(GSYColors.white),
+            size: 18.0,
+          )));
+    }
+    return Row(children: list);
+  }
+
   _renderChart(context) {
     double height = 140.0;
-    double width = 3 * MediaQuery.of(context).size.width / 2;
-    if(userInfo.login != null && userInfo.type == "Organization") {
+    double width = 3 * MediaQuery
+        .of(context)
+        .size
+        .width / 2;
+    if (userInfo.login != null && userInfo.type == "Organization") {
       return new Container();
     }
     return (userInfo.login != null)
         ? new Card(
-            margin: EdgeInsets.only(top: 0.0, left: 10.0, right: 10.0, bottom: 10.0),
-            color: Colors.white,
-            child: new SingleChildScrollView(
-              scrollDirection: Axis.horizontal,
-              child: new Container(
-                padding: EdgeInsets.only(left: 10.0, right: 10.0),
-                width: width,
-                height: height,
+      margin: EdgeInsets.only(top: 0.0, left: 10.0, right: 10.0, bottom: 10.0),
+      color: Colors.white,
+      child: new SingleChildScrollView(
+        scrollDirection: Axis.horizontal,
+        child: new Container(
+          padding: EdgeInsets.only(left: 10.0, right: 10.0),
+          width: width,
+          height: height,
 
-                ///svg chart
-                child: new SvgPicture.network(
-                  CommonUtils.getUserChartAddress(userInfo.login),
-                  width: width,
-                  height: height - 10,
-                  allowDrawingOutsideViewBox: true,
-                  placeholderBuilder: (BuildContext context) => new Container(
-                        height: height,
-                        width: width,
-                        child: Center(
-                          child: const SpinKitRipple(color: Color(GSYColors.primaryValue)),
-                        ),
-                      ),
-                ),
+          ///svg chart
+          child: new SvgPicture.network(
+            CommonUtils.getUserChartAddress(userInfo.login),
+            width: width,
+            height: height - 10,
+            allowDrawingOutsideViewBox: true,
+            placeholderBuilder: (BuildContext context) =>
+            new Container(
+              height: height,
+              width: width,
+              child: Center(
+                child: const SpinKitRipple(color: Color(GSYColors.primaryValue)),
               ),
             ),
-          )
+          ),
+        ),
+      ),
+    )
         : new Container(
-            height: height,
-            child: Center(
-              child: const SpinKitRipple(color: Color(GSYColors.primaryValue)),
-            ),
-          );
+      height: height,
+      child: Center(
+        child: const SpinKitRipple(color: Color(GSYColors.primaryValue)),
+      ),
+    );
   }
 
   @override
@@ -129,6 +181,7 @@ class UserHeaderItem extends StatelessWidget {
                   new Row(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: <Widget>[
+
                       ///用户头像
                       new RawMaterialButton(
                           onPressed: () {
@@ -156,6 +209,7 @@ class UserHeaderItem extends StatelessWidget {
                           children: <Widget>[
                             new Row(
                               children: <Widget>[
+
                                 ///用户名
                                 new Text(userInfo.login ?? "", style: GSYConstant.largeTextWhiteBold),
                                 _getNotifyIcon(context, notifyColor),
@@ -189,7 +243,7 @@ class UserHeaderItem extends StatelessWidget {
                   ),
                   new Container(
 
-                      ///用户博客
+                    ///用户博客
                       child: new RawMaterialButton(
                         onPressed: () {
                           if (userInfo.blog != null) {
@@ -211,6 +265,9 @@ class UserHeaderItem extends StatelessWidget {
                       margin: new EdgeInsets.only(top: 6.0, bottom: 2.0),
                       alignment: Alignment.topLeft),
 
+                  ///组织
+                  _renderOrgs(context, orgList),
+
                   ///用户描述
                   new Container(
                       child: new Text(
@@ -233,39 +290,40 @@ class UserHeaderItem extends StatelessWidget {
                       _getBottomItem(
                         GSYStrings.user_tab_repos,
                         userInfo.public_repos,
-                        () {
+                            () {
                           NavigatorUtils.gotoCommonList(context, userInfo.login, "repository", "user_repos", userName: userInfo.login);
                         },
                       ),
                       new Container(width: 0.3, height: 40.0, color: Color(GSYColors.subLightTextColor)),
                       _getBottomItem(
                         GSYStrings.user_tab_fans,
                         userInfo.followers,
-                        () {
+                            () {
                           NavigatorUtils.gotoCommonList(context, userInfo.login, "user", "follower", userName: userInfo.login);
                         },
                       ),
                       new Container(width: 0.3, height: 40.0, color: Color(GSYColors.subLightTextColor)),
                       _getBottomItem(
                         GSYStrings.user_tab_focus,
                         userInfo.following,
-                        () {
+                            () {
                           NavigatorUtils.gotoCommonList(context, userInfo.login, "user", "followed", userName: userInfo.login);
                         },
                       ),
                       new Container(width: 0.3, height: 40.0, color: Color(GSYColors.subLightTextColor)),
                       _getBottomItem(
                         GSYStrings.user_tab_star,
                         userInfo.starred,
-                        () {
+                            () {
                           NavigatorUtils.gotoCommonList(context, userInfo.login, "repository", "user_star", userName: userInfo.login);
                         },
                       ),
                       new Container(width: 0.3, height: 40.0, color: Color(GSYColors.subLightTextColor)),
                       _getBottomItem(
                         GSYStrings.user_tab_honor,
                         beStaredCount,
-                        () {},
+                            () {
+                        },
                       ),
                     ],
                   ),
diff --git a/lib/widget/UserItem.dart b/lib/widget/UserItem.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:gsy_github_app_flutter/common/model/User.dart';
+import 'package:gsy_github_app_flutter/common/model/UserOrg.dart';
 import 'package:gsy_github_app_flutter/common/style/GSYStyle.dart';
 import 'package:gsy_github_app_flutter/widget/GSYCardItem.dart';
 
@@ -58,4 +59,9 @@ class UserItemViewModel {
     userName = user.login;
     userPic = user.avatar_url;
   }
+
+  UserItemViewModel.fromOrgMap(UserOrg org) {
+    userName = org.login;
+    userPic = org.avatarUrl;
+  }
 }
