Skip to content

Commit 8e4b489

Browse files
committed
release model
1 parent 8d98254 commit 8e4b489

3 files changed

Lines changed: 12 additions & 11 deletions

File tree

‎lib/common/dao/ReposDao.dart‎

Lines changed: 3 additions & 3 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/Release.dart';
1011
import 'package:gsy_github_app_flutter/common/model/RepoCommit.dart';
1112
import 'package:gsy_github_app_flutter/common/model/Repository.dart';
1213
import 'package:gsy_github_app_flutter/common/net/Address.dart';
@@ -17,7 +18,6 @@ import 'package:gsy_github_app_flutter/common/utils/CommonUtils.dart';
1718
import 'package:gsy_github_app_flutter/page/RepositoryFileListPage.dart';
1819
import 'package:gsy_github_app_flutter/widget/PushCoedItem.dart';
1920
import 'package:gsy_github_app_flutter/widget/PushHeader.dart';
20-
import 'package:gsy_github_app_flutter/widget/ReleaseItem.dart';
2121
import 'package:gsy_github_app_flutter/widget/UserItem.dart';
2222
import 'package:pub_semver/pub_semver.dart';
2323

@@ -431,14 +431,14 @@ class ReposDao {
431431
null,
432432
);
433433
if (res != null && res.result && res.data.length > 0) {
434-
List<ReleaseItemViewModel> list = new List();
434+
List<Release> list = new List();
435435
var dataList = res.data;
436436
if (dataList == null || dataList.length == 0) {
437437
return new DataResult(null, false);
438438
}
439439
for (int i = 0; i < dataList.length; i++) {
440440
var data = dataList[i];
441-
list.add(ReleaseItemViewModel.fromMap(data));
441+
list.add(Release.fromJson(data));
442442
}
443443
return new DataResult(list, true);
444444
} else {

‎lib/page/ReleasePage.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class _ReleasePageState extends GSYListState<ReleasePage> {
4444
_ReleasePageState(this.userName, this.reposName);
4545

4646
_renderEventItem(index) {
47-
ReleaseItemViewModel releaseItemViewModel = pullLoadWidgetControl.dataList[index];
47+
ReleaseItemViewModel releaseItemViewModel = ReleaseItemViewModel.fromMap(pullLoadWidgetControl.dataList[index]);
4848
return new ReleaseItem(
4949
releaseItemViewModel,
5050
onPressed: () {

‎lib/widget/ReleaseItem.dart‎

Lines changed: 8 additions & 7 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/Release.dart';
23
import 'package:gsy_github_app_flutter/common/style/GSYStyle.dart';
34
import 'package:gsy_github_app_flutter/common/utils/CommonUtils.dart';
45
import 'package:gsy_github_app_flutter/widget/GSYCardItem.dart';
@@ -49,13 +50,13 @@ class ReleaseItemViewModel {
4950

5051
ReleaseItemViewModel();
5152

52-
ReleaseItemViewModel.fromMap(map) {
53-
if (map["published_at"] != null) {
54-
actionTime = CommonUtils.getNewsTimeStr(DateTime.parse(map["published_at"]));
53+
ReleaseItemViewModel.fromMap(Release map) {
54+
if (map.publishedAt != null) {
55+
actionTime = CommonUtils.getNewsTimeStr(map.publishedAt);
5556
}
56-
actionTitle = map["name"] ?? map["tag_name"];
57-
actionTarget = map["target_commitish"];
58-
actionTargetHtml = map["body_html"];
59-
body = map["body"] ?? "";
57+
actionTitle = map.name ?? map.tagName;
58+
actionTarget = map.targetCommitish;
59+
actionTargetHtml = map.bodyHtml;
60+
body = map.body ?? "";
6061
}
6162
}

0 commit comments

Comments
 (0)