Skip to content

Commit 4f6c4ed

Browse files
committed
push commit model
1 parent 8e4b489 commit 4f6c4ed

5 files changed

Lines changed: 74 additions & 31 deletions

File tree

‎lib/common/dao/ReposDao.dart‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ 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';
99
import 'package:gsy_github_app_flutter/common/model/Event.dart';
10+
import 'package:gsy_github_app_flutter/common/model/PushCommit.dart';
1011
import 'package:gsy_github_app_flutter/common/model/Release.dart';
1112
import 'package:gsy_github_app_flutter/common/model/RepoCommit.dart';
1213
import 'package:gsy_github_app_flutter/common/model/Repository.dart';
@@ -16,8 +17,6 @@ import 'package:gsy_github_app_flutter/common/net/trending/GithubTrending.dart';
1617
import 'package:gsy_github_app_flutter/common/style/GSYStyle.dart';
1718
import 'package:gsy_github_app_flutter/common/utils/CommonUtils.dart';
1819
import 'package:gsy_github_app_flutter/page/RepositoryFileListPage.dart';
19-
import 'package:gsy_github_app_flutter/widget/PushCoedItem.dart';
20-
import 'package:gsy_github_app_flutter/widget/PushHeader.dart';
2120
import 'package:gsy_github_app_flutter/widget/UserItem.dart';
2221
import 'package:pub_semver/pub_semver.dart';
2322

@@ -405,12 +404,8 @@ class ReposDao {
405404
String url = Address.getReposCommitsInfo(userName, reposName, sha);
406405
var res = await HttpManager.netFetch(url, null, null, null);
407406
if (res != null && res.result) {
408-
PushHeaderViewModel pushHeaderViewModel = PushHeaderViewModel.forMap(res.data);
409-
var files = res.data["files"];
410-
for (int i = 0; i < files.length; i++) {
411-
pushHeaderViewModel.files.add(PushCodeItemViewModel.fromMap(files[i]));
412-
}
413-
return new DataResult(pushHeaderViewModel, true);
407+
PushCommit pushCommit = PushCommit.fromJson(res.data);
408+
return new DataResult(pushCommit, true);
414409
} else {
415410
return new DataResult(null, false);
416411
}

‎lib/common/model/PushCommit.dart‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
import 'package:gsy_github_app_flutter/common/model/CommitFile.dart';
2+
import 'package:gsy_github_app_flutter/common/model/CommitGitInfo.dart';
3+
import 'package:gsy_github_app_flutter/common/model/CommitStats.dart';
4+
import 'package:gsy_github_app_flutter/common/model/RepoCommit.dart';
5+
import 'package:gsy_github_app_flutter/common/model/User.dart';
6+
import 'package:json_annotation/json_annotation.dart';
7+
8+
/**
9+
* Created by guoshuyu
10+
* Date: 2018-07-31
11+
*/
12+
13+
part 'PushCommit.g.dart';
14+
15+
@JsonSerializable()
16+
class PushCommit extends Object with _$PushCommitSerializerMixin {
17+
List<CommitFile> files;
18+
19+
CommitStats stats;
20+
21+
String sha;
22+
String url;
23+
@JsonKey(name: "html_url")
24+
String htmlUrl;
25+
@JsonKey(name: "comments_url")
26+
String commentsUrl;
27+
28+
CommitGitInfo commit;
29+
User author;
30+
User committer;
31+
List<RepoCommit> parents;
32+
33+
PushCommit(
34+
this.files,
35+
this.stats,
36+
this.sha,
37+
this.url,
38+
this.htmlUrl,
39+
this.commentsUrl,
40+
this.commit,
41+
this.author,
42+
this.committer,
43+
this.parents,
44+
);
45+
46+
factory PushCommit.fromJson(Map<String, dynamic> json) => _$PushCommitFromJson(json);
47+
}

‎lib/page/PushDetailPage.dart‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import 'dart:io';
33

44
import 'package:flutter/material.dart';
55
import 'package:gsy_github_app_flutter/common/dao/ReposDao.dart';
6+
import 'package:gsy_github_app_flutter/common/model/PushCommit.dart';
67
import 'package:gsy_github_app_flutter/common/net/Address.dart';
78
import 'package:gsy_github_app_flutter/common/style/GSYStyle.dart';
89
import 'package:gsy_github_app_flutter/common/utils/CommonUtils.dart';
@@ -57,12 +58,12 @@ class _PushDetailPageState extends GSYListState<PushDetailPage> {
5758
page = 1;
5859
var res = await _getDataLogic();
5960
if (res != null && res.result) {
60-
PushHeaderViewModel headerViewModel = res.data;
61+
PushCommit pushCommit = res.data;
6162
pullLoadWidgetControl.dataList.clear();
6263
if (isShow) {
6364
setState(() {
64-
pushHeaderViewModel = headerViewModel;
65-
pullLoadWidgetControl.dataList.addAll(pushHeaderViewModel.files);
65+
pushHeaderViewModel = PushHeaderViewModel.forMap(pushCommit);
66+
pullLoadWidgetControl.dataList.addAll(pushCommit.files);
6667
pullLoadWidgetControl.needLoadMore = false;
6768
});
6869
}
@@ -75,7 +76,7 @@ class _PushDetailPageState extends GSYListState<PushDetailPage> {
7576
if (index == 0) {
7677
return new PushHeader(pushHeaderViewModel);
7778
}
78-
PushCodeItemViewModel itemViewModel = pullLoadWidgetControl.dataList[index - 1];
79+
PushCodeItemViewModel itemViewModel = PushCodeItemViewModel.fromMap(pullLoadWidgetControl.dataList[index - 1]);
7980
return new PushCodeItem(itemViewModel, () {
8081
if (Platform.isIOS) {
8182
NavigatorUtils.gotoCodeDetailPage(

‎lib/widget/PushCoedItem.dart‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import 'package:flutter/material.dart';
2+
import 'package:gsy_github_app_flutter/common/model/CommitFile.dart';
23
import 'package:gsy_github_app_flutter/common/style/GSYStyle.dart';
34
import 'package:gsy_github_app_flutter/widget/GSYCardItem.dart';
45

@@ -49,12 +50,12 @@ class PushCodeItemViewModel {
4950

5051
PushCodeItemViewModel();
5152

52-
PushCodeItemViewModel.fromMap(map) {
53-
String filename = map["filename"];
53+
PushCodeItemViewModel.fromMap(CommitFile map) {
54+
String filename = map.fileName;
5455
List<String> nameSplit = filename.split("/");
5556
name = nameSplit[nameSplit.length - 1];
5657
path = filename;
57-
patch = map["patch"];
58-
blob_url = map["blob_url"];
58+
patch = map.patch;
59+
blob_url = map.blobUrl;
5960
}
6061
}

‎lib/widget/PushHeader.dart‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import 'package:flutter/material.dart';
2+
import 'package:gsy_github_app_flutter/common/model/CommitFile.dart';
3+
import 'package:gsy_github_app_flutter/common/model/PushCommit.dart';
24
import 'package:gsy_github_app_flutter/common/style/GSYStyle.dart';
35
import 'package:gsy_github_app_flutter/common/utils/CommonUtils.dart';
46
import 'package:gsy_github_app_flutter/common/utils/NavigatorUtils.dart';
57
import 'package:gsy_github_app_flutter/widget/GSYCardItem.dart';
68
import 'package:gsy_github_app_flutter/widget/GSYIConText.dart';
79
import 'package:gsy_github_app_flutter/widget/GSYUserIconWidget.dart';
8-
import 'package:gsy_github_app_flutter/widget/PushCoedItem.dart';
910

1011
/**
1112
* 提交详情的头
@@ -105,28 +106,26 @@ class PushHeaderViewModel {
105106
String editCount = "---";
106107
String addCount = "---";
107108
String deleteCount = "---";
108-
List<PushCodeItemViewModel> files = new List();
109109

110110
PushHeaderViewModel();
111111

112-
PushHeaderViewModel.forMap(pushMap) {
112+
PushHeaderViewModel.forMap(PushCommit pushMap) {
113113
String name = "---";
114114
String pic = "---";
115-
if (pushMap["committer"] != null) {
116-
name = pushMap["committer"]["login"];
117-
} else if (pushMap["commit"] != null && pushMap["commit"]["author"] != null) {
118-
name = pushMap["commit"]["author"]["name"];
115+
if (pushMap.committer != null) {
116+
name = pushMap.committer.login;
117+
} else if (pushMap.commit != null && pushMap.commit.author != null) {
118+
name = pushMap.commit.author.name;
119119
}
120-
if (pushMap["committer"] != null && pushMap["committer"]["avatar_url"] != null) {
121-
pic = pushMap["committer"]["avatar_url"];
120+
if (pushMap.committer != null && pushMap.committer.avatar_url != null) {
121+
pic = pushMap.committer.avatar_url;
122122
}
123123
actionUser = name;
124124
actionUserPic = pic;
125-
pushDes = "Push at " + pushMap["commit"]["message"];
126-
pushTime = CommonUtils.getNewsTimeStr(DateTime.parse(pushMap["commit"]["committer"]["date"]));
127-
;
128-
editCount = pushMap["files"].length.toString() + "";
129-
addCount = pushMap["stats"]["additions"].toString() + "";
130-
deleteCount = pushMap["stats"]["deletions"].toString() + "";
125+
pushDes = "Push at " + pushMap.commit.message;
126+
pushTime = CommonUtils.getNewsTimeStr(pushMap.commit.committer.date);
127+
editCount = pushMap.files.length.toString() + "";
128+
addCount = pushMap.stats.additions.toString() + "";
129+
deleteCount = pushMap.stats.deletions.toString() + "";
131130
}
132131
}

0 commit comments

Comments
 (0)