Skip to content

Commit 6fdd074

Browse files
committed
增加用户详情和用户动态数据库
1 parent 6444886 commit 6fdd074

6 files changed

Lines changed: 170 additions & 96 deletions

File tree

‎lib/common/ab/SqlProvider.dart‎

Lines changed: 96 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import 'dart:convert';
88
*/
99
import 'package:gsy_github_app_flutter/common/ab/SqlManager.dart';
1010
import 'package:gsy_github_app_flutter/common/model/Event.dart';
11+
import 'package:gsy_github_app_flutter/common/model/User.dart';
1112
import 'package:meta/meta.dart';
1213
import 'package:sqflite/sqflite.dart';
1314

@@ -60,8 +61,8 @@ class RepositoryPulseDbProvider extends BaseDbProvider {
6061
String fullName;
6162
String data;
6263

63-
Map toMap() {
64-
Map map = {columnFullName: fullName, columnData: data};
64+
Map<String, dynamic> toMap() {
65+
Map<String, dynamic> map = {columnFullName: fullName, columnData: data};
6566
if (id != null) {
6667
map[columnId] = id;
6768
}
@@ -98,8 +99,8 @@ class ReadHistoryDbProvider extends BaseDbProvider {
9899
DateTime readDate;
99100
String data;
100101

101-
Map toMap() {
102-
Map map = {columnFullName: fullName, columnReadDate: readDate, columnData: data};
102+
Map<String, dynamic> toMap() {
103+
Map<String, dynamic> map = {columnFullName: fullName, columnReadDate: readDate, columnData: data};
103104
if (id != null) {
104105
map[columnId] = id;
105106
}
@@ -135,8 +136,8 @@ class RepositoryBranchDbProvider extends BaseDbProvider {
135136
String fullName;
136137
String data;
137138

138-
Map toMap() {
139-
Map map = {columnFullName: fullName, columnData: data};
139+
Map<String, dynamic> toMap() {
140+
Map<String, dynamic> map = {columnFullName: fullName, columnData: data};
140141
if (id != null) {
141142
map[columnId] = id;
142143
}
@@ -171,8 +172,8 @@ class RepositoryCommitsDbProvider extends BaseDbProvider {
171172
String fullName;
172173
String data;
173174

174-
Map toMap() {
175-
Map map = {columnFullName: fullName, columnData: data};
175+
Map<String, dynamic> toMap() {
176+
Map<String, dynamic> map = {columnFullName: fullName, columnData: data};
176177
if (id != null) {
177178
map[columnId] = id;
178179
}
@@ -207,8 +208,8 @@ class RepositoryWatcherDbProvider extends BaseDbProvider {
207208
String fullName;
208209
String data;
209210

210-
Map toMap() {
211-
Map map = {columnFullName: fullName, columnData: data};
211+
Map<String, dynamic> toMap() {
212+
Map<String, dynamic> map = {columnFullName: fullName, columnData: data};
212213
if (id != null) {
213214
map[columnId] = id;
214215
}
@@ -244,8 +245,8 @@ class RepositoryStarDbProvider extends BaseDbProvider {
244245
String fullName;
245246
String data;
246247

247-
Map toMap() {
248-
Map map = {columnFullName: fullName, columnData: data};
248+
Map<String, dynamic> toMap() {
249+
Map<String, dynamic> map = {columnFullName: fullName, columnData: data};
249250
if (id != null) {
250251
map[columnId] = id;
251252
}
@@ -281,8 +282,8 @@ class RepositoryForkDbProvider extends BaseDbProvider {
281282
String fullName;
282283
String data;
283284

284-
Map toMap() {
285-
Map map = {columnFullName: fullName, columnData: data};
285+
Map<String, dynamic> toMap() {
286+
Map<String, dynamic> map = {columnFullName: fullName, columnData: data};
286287
if (id != null) {
287288
map[columnId] = id;
288289
}
@@ -319,8 +320,8 @@ class RepositoryDetailDbProvider extends BaseDbProvider {
319320
final String columnBranch = "branch";
320321
final String columnData = "data";
321322

322-
Map toMap() {
323-
Map map = {columnFullName: fullName, columnBranch: branch, columnData: data};
323+
Map<String, dynamic> toMap() {
324+
Map<String, dynamic> map = {columnFullName: fullName, columnBranch: branch, columnData: data};
324325
if (id != null) {
325326
map[columnId] = id;
326327
}
@@ -358,8 +359,8 @@ class RepositoryDetailReadmeDbProvider extends BaseDbProvider {
358359
final String columnBranch = "branch";
359360
final String columnData = "data";
360361

361-
Map toMap() {
362-
Map map = {columnFullName: fullName, columnBranch: branch, columnData: data};
362+
Map<String, dynamic> toMap() {
363+
Map<String, dynamic> map = {columnFullName: fullName, columnBranch: branch, columnData: data};
363364
if (id != null) {
364365
map[columnId] = id;
365366
}
@@ -396,8 +397,8 @@ class RepositoryEventDbProvider extends BaseDbProvider {
396397
String fullName;
397398
String data;
398399

399-
Map toMap() {
400-
Map map = {columnFullName: fullName, columnData: data};
400+
Map<String, dynamic> toMap() {
401+
Map<String, dynamic> map = {columnFullName: fullName, columnData: data};
401402
if (id != null) {
402403
map[columnId] = id;
403404
}
@@ -434,8 +435,8 @@ class RepositoryIssueDbProvider extends BaseDbProvider {
434435
final String columnState = "state";
435436
final String columnData = "data";
436437

437-
Map toMap() {
438-
Map map = {columnFullName: fullName, columnState: state, columnData: data};
438+
Map<String, dynamic> toMap() {
439+
Map<String, dynamic> map = {columnFullName: fullName, columnState: state, columnData: data};
439440
if (id != null) {
440441
map[columnId] = id;
441442
}
@@ -473,8 +474,8 @@ class RepositoryCommitInfoDetailDbProvider extends BaseDbProvider {
473474
final String columnSha = "sha";
474475
final String columnData = "data";
475476

476-
Map toMap() {
477-
Map map = {columnFullName: fullName, columnSha: sha, columnData: data};
477+
Map<String, dynamic> toMap() {
478+
Map<String, dynamic> map = {columnFullName: fullName, columnSha: sha, columnData: data};
478479
if (id != null) {
479480
map[columnId] = id;
480481
}
@@ -512,8 +513,8 @@ class TrendRepositoryDbProvider extends BaseDbProvider {
512513
final String columnLanguageType = "languageType";
513514
final String columnData = "data";
514515

515-
Map toMap() {
516-
Map map = {columnFullName: fullName, columnLanguageType: languageType, columnData: data};
516+
Map<String, dynamic> toMap() {
517+
Map<String, dynamic> map = {columnFullName: fullName, columnLanguageType: languageType, columnData: data};
517518
if (id != null) {
518519
map[columnId] = id;
519520
}
@@ -550,8 +551,10 @@ class UserInfoDbProvider extends BaseDbProvider {
550551
String userName;
551552
String data;
552553

553-
Map toMap() {
554-
Map map = {columnUserName: userName, columnData: data};
554+
UserInfoDbProvider();
555+
556+
Map<String, dynamic> toMap(String userName, String data) {
557+
Map<String, dynamic> map = {columnUserName: userName, columnData: data};
555558
if (id != null) {
556559
map[columnId] = id;
557560
}
@@ -565,12 +568,53 @@ class UserInfoDbProvider extends BaseDbProvider {
565568
}
566569

567570
@override
568-
tableSqlString() {}
571+
tableSqlString() {
572+
return tableBaseString(name, columnId) +
573+
'''
574+
$columnUserName text not null,
575+
$columnData text not null)
576+
''';
577+
}
578+
569579

570580
@override
571581
tableName() {
572582
return name;
573583
}
584+
585+
Future _getUserProvider(Database db, String userName) async {
586+
List<Map<String, dynamic>> maps =
587+
await db.query(name, columns: [columnId, columnUserName, columnData], where: "$columnUserName = ?", whereArgs: [userName]);
588+
if (maps.length > 0) {
589+
UserInfoDbProvider provider = UserInfoDbProvider.fromMap(maps.first);
590+
return provider;
591+
}
592+
return null;
593+
}
594+
595+
///插入到数据库
596+
Future insert(String userName, String eventMapString) async {
597+
Database db = await getDataBase();
598+
var userProvider = await _getUserProvider(db, userName);
599+
print("-----------------");
600+
print(userProvider);
601+
if (userProvider != null) {
602+
var result = await db.delete(name, where: "$columnUserName = ?", whereArgs: [userName]);
603+
print("=================");
604+
print(result);
605+
}
606+
return await db.insert(name, toMap(userName, eventMapString));
607+
}
608+
609+
///获取事件数据
610+
Future<User> getUserInfo(String userName) async {
611+
Database db = await getDataBase();
612+
var userProvider = await _getUserProvider(db, userName);
613+
if (userProvider != null) {
614+
return User.fromJson(json.decode(userProvider.data));
615+
}
616+
return null;
617+
}
574618
}
575619

576620
/**
@@ -587,8 +631,8 @@ class UserFollowerDbProvider extends BaseDbProvider {
587631
String userName;
588632
String data;
589633

590-
Map toMap() {
591-
Map map = {columnUserName: userName, columnData: data};
634+
Map<String, dynamic> toMap() {
635+
Map<String, dynamic> map = {columnUserName: userName, columnData: data};
592636
if (id != null) {
593637
map[columnId] = id;
594638
}
@@ -624,8 +668,8 @@ class UserFollowedDbProvider extends BaseDbProvider {
624668
String userName;
625669
String data;
626670

627-
Map toMap() {
628-
Map map = {columnUserName: userName, columnData: data};
671+
Map<String, dynamic> toMap() {
672+
Map<String, dynamic> map = {columnUserName: userName, columnData: data};
629673
if (id != null) {
630674
map[columnId] = id;
631675
}
@@ -661,8 +705,8 @@ class OrgMemberDbProvider extends BaseDbProvider {
661705
String org;
662706
String data;
663707

664-
Map toMap() {
665-
Map map = {columnOrg: org, columnData: data};
708+
Map<String, dynamic> toMap() {
709+
Map<String, dynamic> map = {columnOrg: org, columnData: data};
666710
if (id != null) {
667711
map[columnId] = id;
668712
}
@@ -698,8 +742,8 @@ class UserOrgsDbProvider extends BaseDbProvider {
698742
String userName;
699743
String data;
700744

701-
Map toMap() {
702-
Map map = {columnUserName: userName, columnData: data};
745+
Map<String, dynamic> toMap() {
746+
Map<String, dynamic> map = {columnUserName: userName, columnData: data};
703747
if (id != null) {
704748
map[columnId] = id;
705749
}
@@ -735,8 +779,8 @@ class UserStaredDbProvider extends BaseDbProvider {
735779
String userName;
736780
String data;
737781

738-
Map toMap() {
739-
Map map = {columnUserName: userName, columnData: data};
782+
Map<String, dynamic> toMap() {
783+
Map<String, dynamic> map = {columnUserName: userName, columnData: data};
740784
if (id != null) {
741785
map[columnId] = id;
742786
}
@@ -772,8 +816,8 @@ class UserReposDbProvider extends BaseDbProvider {
772816
String userName;
773817
String data;
774818

775-
Map toMap() {
776-
Map map = {columnUserName: userName, columnData: data};
819+
Map<String, dynamic> toMap() {
820+
Map<String, dynamic> map = {columnUserName: userName, columnData: data};
777821
if (id != null) {
778822
map[columnId] = id;
779823
}
@@ -838,6 +882,7 @@ class ReceivedEventDbProvider extends BaseDbProvider {
838882
///插入到数据库
839883
Future insert(String eventMapString) async {
840884
Database db = await getDataBase();
885+
841886
///清空后再插入,因为只保存第一页面
842887
db.execute("delete from $name");
843888
return await db.insert(name, toMap(eventMapString));
@@ -877,8 +922,8 @@ class UserEventDbProvider extends BaseDbProvider {
877922

878923
UserEventDbProvider();
879924

880-
Map toMap(String userName, String eventMapString) {
881-
Map map = {columnUserName: userName, columnData: eventMapString};
925+
Map<String, dynamic> toMap(String userName, String eventMapString) {
926+
Map<String, dynamic> map = {columnUserName: userName, columnData: eventMapString};
882927
if (id != null) {
883928
map[columnId] = id;
884929
}
@@ -893,9 +938,9 @@ class UserEventDbProvider extends BaseDbProvider {
893938

894939
@override
895940
tableSqlString() {
896-
tableBaseString(name, columnId) +
941+
return tableBaseString(name, columnId) +
897942
'''
898-
$columnUserName text not null)=
943+
$columnUserName text not null,
899944
$columnData text not null)
900945
''';
901946
}
@@ -908,6 +953,7 @@ class UserEventDbProvider extends BaseDbProvider {
908953
///插入到数据库
909954
Future insert(String userName, String eventMapString) async {
910955
Database db = await getDataBase();
956+
911957
///清空后再插入,因为只保存第一页面
912958
db.execute("delete from $name");
913959
return await db.insert(name, toMap(userName, eventMapString));
@@ -919,7 +965,7 @@ class UserEventDbProvider extends BaseDbProvider {
919965
List<Map> maps = await db.query(name, columns: [columnId, columnData]);
920966
List<Event> list = new List();
921967
if (maps.length > 0) {
922-
ReceivedEventDbProvider provider = ReceivedEventDbProvider.fromMap(maps.first);
968+
UserEventDbProvider provider = UserEventDbProvider.fromMap(maps.first);
923969
List<dynamic> eventMap = json.decode(provider.data);
924970
if (eventMap.length > 0) {
925971
for (var item in eventMap) {
@@ -929,8 +975,6 @@ class UserEventDbProvider extends BaseDbProvider {
929975
}
930976
return list;
931977
}
932-
933-
934978
}
935979

936980
/**
@@ -948,8 +992,8 @@ class IssueDetailDbProvider extends BaseDbProvider {
948992
String number;
949993
String data;
950994

951-
Map toMap() {
952-
Map map = {columnFullName: fullName, columnData: data, columnNumber: number};
995+
Map<String, dynamic> toMap() {
996+
Map<String, dynamic> map = {columnFullName: fullName, columnData: data, columnNumber: number};
953997
if (id != null) {
954998
map[columnId] = id;
955999
}
@@ -989,8 +1033,8 @@ class IssueCommentDbProvider extends BaseDbProvider {
9891033
String number;
9901034
String data;
9911035

992-
Map toMap() {
993-
Map map = {columnFullName: fullName, columnData: data, columnNumber: number, columnCommentId: commentId};
1036+
Map<String, dynamic> toMap() {
1037+
Map<String, dynamic> map = {columnFullName: fullName, columnData: data, columnNumber: number, columnCommentId: commentId};
9941038
if (id != null) {
9951039
map[columnId] = id;
9961040
}

0 commit comments

Comments
 (0)