Skip to content

Commit a2761ad

Browse files
committed
change to event model
1 parent ec13fe9 commit a2761ad

20 files changed

Lines changed: 132 additions & 135 deletions

‎lib/common/dao/EventDao.dart‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11

22
import 'package:gsy_github_app_flutter/common/dao/DaoResult.dart';
3+
import 'package:gsy_github_app_flutter/common/model/Event.dart';
34
import 'package:gsy_github_app_flutter/common/model/User.dart';
45
import 'package:gsy_github_app_flutter/common/net/Address.dart';
56
import 'package:gsy_github_app_flutter/common/net/Api.dart';
67
import 'package:gsy_github_app_flutter/common/redux/EventRedux.dart';
78
import 'package:gsy_github_app_flutter/common/redux/GSYState.dart';
8-
import 'package:gsy_github_app_flutter/widget/EventItem.dart';
99
import 'package:redux/redux.dart';
1010

1111
class EventDao {
@@ -18,13 +18,13 @@ class EventDao {
1818
String url = Address.getEventReceived(userName) + Address.getPageParams("?", page);
1919
var res = await HttpManager.netFetch(url, null, null, null);
2020
if (res != null && res.result) {
21-
List<EventViewModel> list = new List();
21+
List<Event> list = new List();
2222
var data = res.data;
2323
if (data == null || data.length == 0) {
2424
return null;
2525
}
2626
for (int i = 0; i < data.length; i++) {
27-
list.add(EventViewModel.fromEventMap(data[i]));
27+
list.add(Event.fromJson(data[i]));
2828
}
2929
if (page == 1) {
3030
store.dispatch(new RefreshEventAction(list));
@@ -44,13 +44,13 @@ class EventDao {
4444
String url = Address.getEvent(userName) + Address.getPageParams("?", page);
4545
var res = await HttpManager.netFetch(url, null, null, null);
4646
if (res != null && res.result) {
47-
List<EventViewModel> list = new List();
47+
List<Event> list = new List();
4848
var data = res.data;
4949
if (data == null || data.length == 0) {
5050
return null;
5151
}
5252
for (int i = 0; i < data.length; i++) {
53-
list.add(EventViewModel.fromEventMap(data[i]));
53+
list.add(Event.fromJson(data[i]));
5454
}
5555
return new DataResult(list, true);
5656
} else {

‎lib/common/dao/ReposDao.dart‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@ import 'package:fluttertoast/fluttertoast.dart';
66
import 'package:get_version/get_version.dart';
77
import 'package:gsy_github_app_flutter/common/config/Config.dart';
88
import 'package:gsy_github_app_flutter/common/dao/DaoResult.dart';
9+
import 'package:gsy_github_app_flutter/common/model/Event.dart';
10+
import 'package:gsy_github_app_flutter/common/model/RepoCommit.dart';
911
import 'package:gsy_github_app_flutter/common/net/Address.dart';
1012
import 'package:gsy_github_app_flutter/common/net/Api.dart';
1113
import 'package:gsy_github_app_flutter/common/net/trending/GithubTrending.dart';
1214
import 'package:gsy_github_app_flutter/common/style/GSYStyle.dart';
1315
import 'package:gsy_github_app_flutter/common/utils/CommonUtils.dart';
1416
import 'package:gsy_github_app_flutter/page/RepositoryFileListPage.dart';
15-
import 'package:gsy_github_app_flutter/widget/EventItem.dart';
1617
import 'package:gsy_github_app_flutter/widget/PushCoedItem.dart';
1718
import 'package:gsy_github_app_flutter/widget/PushHeader.dart';
1819
import 'package:gsy_github_app_flutter/widget/ReleaseItem.dart';
@@ -85,13 +86,13 @@ class ReposDao {
8586
String url = Address.getReposEvent(userName, reposName) + Address.getPageParams("?", page);
8687
var res = await HttpManager.netFetch(url, null, null, null);
8788
if (res != null && res.result) {
88-
List<EventViewModel> list = new List();
89+
List<Event> list = new List();
8990
var data = res.data;
9091
if (data == null || data.length == 0) {
9192
return new DataResult(null, false);
9293
}
9394
for (int i = 0; i < data.length; i++) {
94-
list.add(EventViewModel.fromEventMap(data[i]));
95+
list.add(Event.fromJson(data[i]));
9596
}
9697
return new DataResult(list, true);
9798
} else {
@@ -118,13 +119,13 @@ class ReposDao {
118119
String url = Address.getReposCommits(userName, reposName) + Address.getPageParams("?", page) + "&sha=" + branch;
119120
var res = await HttpManager.netFetch(url, null, null, null);
120121
if (res != null && res.result) {
121-
List<EventViewModel> list = new List();
122+
List<RepoCommit> list = new List();
122123
var data = res.data;
123124
if (data == null || data.length == 0) {
124125
return new DataResult(null, false);
125126
}
126127
for (int i = 0; i < data.length; i++) {
127-
list.add(EventViewModel.fromCommitMap(data[i]));
128+
list.add(RepoCommit.fromJson(data[i]));
128129
}
129130
return new DataResult(list, true);
130131
} else {

‎lib/common/model/EventPayload.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ part 'EventPayload.g.dart';
1515
class EventPayload extends Object with _$EventPayloadSerializerMixin {
1616

1717
@JsonKey(name: "push_id")
18-
String pushId;
18+
int pushId;
1919
int size;
2020
@JsonKey(name: "distinct_size")
2121
int distinctSize;

‎lib/common/model/EventPayload.g.dart‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/common/model/Issue.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ part 'Issue.g.dart';
1010

1111
@JsonSerializable()
1212
class Issue extends Object with _$IssueSerializerMixin {
13-
String id;
13+
int id;
1414
int number;
1515
String title;
1616
String state;

‎lib/common/model/Issue.g.dart‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/common/model/IssueEvent.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ part 'IssueEvent.g.dart';
1010

1111
@JsonSerializable()
1212
class IssueEvent extends Object with _$IssueEventSerializerMixin {
13-
String id;
13+
int id;
1414
User user;
1515
@JsonKey(name: "created_at")
1616
DateTime createdAt;

‎lib/common/model/IssueEvent.g.dart‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/common/model/Release.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ part 'Release.g.dart';
1111

1212
@JsonSerializable()
1313
class Release extends Object with _$ReleaseSerializerMixin {
14-
String id;
14+
int id;
1515
@JsonKey(name: "tag_name")
1616
String tagName;
1717
@JsonKey(name: "target_commitish")

‎lib/common/model/Release.g.dart‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)