Skip to content

Commit 72a4649

Browse files
committed
增加本地数据库模块
增加动态event的数据库
1 parent d4c4265 commit 72a4649

6 files changed

Lines changed: 76 additions & 29 deletions

File tree

‎lib/common/ab/SqlProvider.dart‎

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -838,6 +838,8 @@ class ReceivedEventDbProvider extends BaseDbProvider {
838838
///插入到数据库
839839
Future insert(String eventMapString) async {
840840
Database db = await getDataBase();
841+
///清空后再插入,因为只保存第一页面
842+
db.execute("delete from $name");
841843
return await db.insert(name, toMap(eventMapString));
842844
}
843845

@@ -875,8 +877,8 @@ class UserEventDbProvider extends BaseDbProvider {
875877

876878
UserEventDbProvider();
877879

878-
Map toMap() {
879-
Map map = {columnUserName: userName, columnData: data};
880+
Map toMap(String userName, String eventMapString) {
881+
Map map = {columnUserName: userName, columnData: eventMapString};
880882
if (id != null) {
881883
map[columnId] = id;
882884
}
@@ -902,6 +904,33 @@ class UserEventDbProvider extends BaseDbProvider {
902904
tableName() {
903905
return name;
904906
}
907+
908+
///插入到数据库
909+
Future insert(String userName, String eventMapString) async {
910+
Database db = await getDataBase();
911+
///清空后再插入,因为只保存第一页面
912+
db.execute("delete from $name");
913+
return await db.insert(name, toMap(userName, eventMapString));
914+
}
915+
916+
///获取事件数据
917+
Future<List<Event>> getEvents() async {
918+
Database db = await getDataBase();
919+
List<Map> maps = await db.query(name, columns: [columnId, columnData]);
920+
List<Event> list = new List();
921+
if (maps.length > 0) {
922+
ReceivedEventDbProvider provider = ReceivedEventDbProvider.fromMap(maps.first);
923+
List<dynamic> eventMap = json.decode(provider.data);
924+
if (eventMap.length > 0) {
925+
for (var item in eventMap) {
926+
list.add(Event.fromJson(item));
927+
}
928+
}
929+
}
930+
return list;
931+
}
932+
933+
905934
}
906935

907936
/**

‎lib/common/dao/DaoResult.dart‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1+
import 'dart:async';
2+
13
class DataResult {
24
var data;
35
bool result;
6+
Future next;
47

5-
DataResult(this.data, this.result);
8+
DataResult(this.data, this.result, {this.next});
69
}

‎lib/common/dao/EventDao.dart‎

Lines changed: 36 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
import 'dart:convert';
32

43
import 'package:gsy_github_app_flutter/common/ab/SqlProvider.dart';
@@ -12,19 +11,20 @@ import 'package:gsy_github_app_flutter/common/redux/GSYState.dart';
1211
import 'package:redux/redux.dart';
1312

1413
class EventDao {
15-
static getEventReceived(Store<GSYState> store, {page = 1}) async {
14+
static getEventReceived(Store<GSYState> store, {page = 1, bool needDb = false}) async {
1615
User user = store.state.userInfo;
1716
if (user == null || user.login == null) {
1817
return null;
1918
}
20-
String userName = user.login;
21-
String url = Address.getEventReceived(userName) + Address.getPageParams("?", page);
2219
ReceivedEventDbProvider provider = new ReceivedEventDbProvider();
23-
24-
List<Event> dbList = await provider.getEvents();
25-
if(dbList.length > 0) {
26-
store.dispatch(new RefreshEventAction(dbList));
20+
if(needDb) {
21+
List<Event> dbList = await provider.getEvents();
22+
if (dbList.length > 0) {
23+
store.dispatch(new RefreshEventAction(dbList));
24+
}
2725
}
26+
String userName = user.login;
27+
String url = Address.getEventReceived(userName) + Address.getPageParams("?", page);
2828

2929
var res = await HttpManager.netFetch(url, null, null, null);
3030
if (res != null && res.result) {
@@ -33,7 +33,9 @@ class EventDao {
3333
if (data == null || data.length == 0) {
3434
return null;
3535
}
36-
await provider.insert(json.encode(data));
36+
if(needDb) {
37+
await provider.insert(json.encode(data));
38+
}
3739
for (int i = 0; i < data.length; i++) {
3840
list.add(Event.fromJson(data[i]));
3941
}
@@ -51,28 +53,38 @@ class EventDao {
5153
/**
5254
* 用户行为事件
5355
*/
54-
static getEventDao(userName, {page = 0}) async {
55-
new UserEventDbProvider().open();
56-
String url = Address.getEvent(userName) + Address.getPageParams("?", page);
57-
var res = await HttpManager.netFetch(url, null, null, null);
58-
if (res != null && res.result) {
59-
List<Event> list = new List();
60-
var data = res.data;
61-
if (data == null || data.length == 0) {
56+
static getEventDao(userName, {page = 0, bool needDb = false}) async {
57+
UserEventDbProvider provider = new UserEventDbProvider();
58+
next() async {
59+
String url = Address.getEvent(userName) + Address.getPageParams("?", page);
60+
var res = await HttpManager.netFetch(url, null, null, null);
61+
if (res != null && res.result) {
62+
List<Event> list = new List();
63+
var data = res.data;
64+
if (data == null || data.length == 0) {
65+
return null;
66+
}
67+
if(needDb) {
68+
provider.insert(userName, json.encode(data));
69+
}
70+
for (int i = 0; i < data.length; i++) {
71+
list.add(Event.fromJson(data[i]));
72+
}
73+
return new DataResult(list, true);
74+
} else {
6275
return null;
6376
}
64-
for (int i = 0; i < data.length; i++) {
65-
list.add(Event.fromJson(data[i]));
66-
}
67-
return new DataResult(list, true);
68-
} else {
69-
return null;
7077
}
78+
if(needDb) {
79+
List<Event> dbList = await provider.getEvents();
80+
DataResult dataResult = new DataResult(dbList, true, next: next());
81+
return dataResult;
82+
}
83+
return await next();
7184
}
7285

7386
static clearEvent(Store store) {
7487
store.state.eventList.clear();
7588
store.dispatch(new RefreshEventAction([]));
7689
}
77-
7890
}

‎lib/page/MyPage.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ class _MyPageState extends GSYListState<MyPage> {
9797

9898
@override
9999
requestLoadMore() async {
100-
return await EventDao.getEventDao(_getUserName(), page: page);
100+
return await EventDao.getEventDao(_getUserName(), page: page, needDb: false);
101101
}
102102

103103
@override

‎lib/page/PersonPage.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ class _PersonState extends GSYListState<PersonPage> {
122122
if (userInfo.type == "Organization") {
123123
return await UserDao.getMemberDao(_getUserName(), page);
124124
}
125-
return await EventDao.getEventDao(_getUserName(), page: page);
125+
return await EventDao.getEventDao(_getUserName(), page: page, needDb: page <= 1);
126126
}
127127

128128
@override

‎lib/widget/GSYListState.dart‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ abstract class GSYListState<T extends StatefulWidget> extends State<T> with Auto
4444
pullLoadWidgetControl.dataList.addAll(res.data);
4545
});
4646
}
47+
}
48+
if(res.next != null) {
49+
4750
}
4851
resolveDataResult(res);
4952
isLoading = false;

0 commit comments

Comments
 (0)