增加用户组织数据库

Author: CarGuo

VERSION.md

@@ -2,7 +2,6 @@
 ###（待处理）
 
 * 仓库Pulse。
-* 个人组织列表。
 * 多语言、主题。
 * markdown点击跳转。
 * webview点击跳转。
@@ -12,6 +11,7 @@
 * readme图片解析优化
 * readme图片增加点击查看
 * 组织账号不显示活跃记录Item
+* 增加用户组织显示
 
 
 

lib/common/ab/provider/user/UserOrgsDbProvider.dart

@@ -1,4 +1,9 @@
+import 'dart:async';
+import 'dart:convert';
+
 import 'package:gsy_github_app_flutter/common/ab/SqlProvider.dart';
+import 'package:gsy_github_app_flutter/common/model/UserOrg.dart';
+import 'package:sqflite/sqflite.dart';
 
 /**
  * 用户组织表
@@ -17,7 +22,9 @@ class UserOrgsDbProvider extends BaseDbProvider {
   String userName;
   String data;
 
-  Map<String, dynamic> toMap() {
+  UserOrgsDbProvider();
+
+  Map<String, dynamic> toMap(String userName, String data) {
     Map<String, dynamic> map = {columnUserName: userName, columnData: data};
     if (id != null) {
       map[columnId] = id;
@@ -32,10 +39,54 @@ class UserOrgsDbProvider extends BaseDbProvider {
   }
 
   @override
-  tableSqlString() {}
+  tableSqlString() {
+    return tableBaseString(name, columnId) +
+        '''
+        $columnUserName text not null,
+        $columnData text not null)
+      ''';
+  }
 
   @override
   tableName() {
     return name;
   }
-}
+
+  Future _getProvider(Database db, String userName) async {
+    List<Map<String, dynamic>> maps =
+        await db.query(name, columns: [columnId, columnUserName, columnData], where: "$columnUserName = ?", whereArgs: [userName]);
+    if (maps.length > 0) {
+      UserOrgsDbProvider provider = UserOrgsDbProvider.fromMap(maps.first);
+      return provider;
+    }
+    return null;
+  }
+
+  ///插入到数据库
+  Future insert(String userName, String dataMapString) async {
+    Database db = await getDataBase();
+    var provider = await _getProvider(db, userName);
+    if (provider != null) {
+      await db.delete(name, where: "$columnUserName = ?", whereArgs: [userName]);
+    }
+    return await db.insert(name, toMap(userName, dataMapString));
+  }
+
+  ///获取数据
+  Future<List<UserOrg>> geData(String userName) async {
+    Database db = await getDataBase();
+
+    var provider = await _getProvider(db, userName);
+    if (provider != null) {
+      List<UserOrg> list = new List();
+      List<dynamic> eventMap = json.decode(provider.data);
+      if (eventMap.length > 0) {
+        for (var item in eventMap) {
+          list.add(UserOrg.fromJson(item));
+        }
+      }
+      return list;
+    }
+    return null;
+  }
+}

lib/common/dao/UserDao.dart

@@ -5,6 +5,7 @@ import 'package:dio/dio.dart';
 import 'package:gsy_github_app_flutter/common/ab/provider/user/UserFollowedDbProvider.dart';
 import 'package:gsy_github_app_flutter/common/ab/provider/user/UserFollowerDbProvider.dart';
 import 'package:gsy_github_app_flutter/common/ab/provider/user/UserInfoDbProvider.dart';
+import 'package:gsy_github_app_flutter/common/ab/provider/user/UserOrgsDbProvider.dart';
 import 'package:gsy_github_app_flutter/common/config/Config.dart';
 import 'package:gsy_github_app_flutter/common/config/ignoreConfig.dart';
 import 'package:gsy_github_app_flutter/common/dao/DaoResult.dart';
@@ -322,20 +323,36 @@ class UserDao {
    * 获取用户组织
    */
   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) {
+    UserOrgsDbProvider provider = new UserOrgsDbProvider();
+    next() 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]));
+        }
+        if (needDb) {
+          provider.insert(userName, json.encode(data));
+        }
+        return new DataResult(list, true);
+      } else {
         return new DataResult(null, false);
       }
-      for (int i = 0; i < data.length; i++) {
-        list.add(new UserOrg.fromJson(data[i]));
+    }
+
+    if (needDb) {
+      List<UserOrg> list = await provider.geData(userName);
+      if (list == null) {
+        return await next();
       }
-      return new DataResult(list, true);
-    } else {
-      return new DataResult(null, false);
+      DataResult dataResult = new DataResult(list, true, next: next());
+      return dataResult;
     }
+    return await next();
   }
 }

lib/page/MyPage.dart

@@ -1,9 +1,12 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_redux/flutter_redux.dart';
 import 'package:gsy_github_app_flutter/common/dao/EventDao.dart';
 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/UserOrg.dart';
 import 'package:gsy_github_app_flutter/common/redux/GSYState.dart';
 import 'package:gsy_github_app_flutter/common/redux/UserRedux.dart';
 import 'package:gsy_github_app_flutter/common/style/GSYStyle.dart';
@@ -30,6 +33,8 @@ class _MyPageState extends GSYListState<MyPage> {
 
   Color notifyColor = const Color(GSYColors.subTextColor);
 
+  final List<UserOrg> orgList = new List();
+
   _renderEventItem(userInfo, index) {
     if (index == 0) {
       return new UserHeaderItem(
@@ -39,6 +44,7 @@ class _MyPageState extends GSYListState<MyPage> {
         refreshCallBack: () {
           _refreshNotify();
         },
+        orgList: orgList,
       );
     }
     Event event = pullLoadWidgetControl.dataList[index - 1];
@@ -68,6 +74,28 @@ class _MyPageState extends GSYListState<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;
 
@@ -82,11 +110,12 @@ class _MyPageState extends GSYListState<MyPage> {
     UserDao.getUserInfo(null).then((res) {
       if (res != null && res.result) {
         _getStore().dispatch(UpdateUserAction(res.data));
+        _getUserOrg(_getUserName());
       }
     });
     ReposDao.getUserRepository100StatusDao(_getUserName()).then((res) {
       if (res != null && res.result) {
-        if(isShow) {
+        if (isShow) {
           setState(() {
             beStaredCount = res.data.toString();
           });

lib/page/PersonPage.dart

@@ -144,6 +144,15 @@ class _PersonState extends GSYListState<PersonPage> {
   _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();