Skip to content

Commit 6b2d55c

Browse files
committed
repos info activity
1 parent 1f15cbd commit 6b2d55c

6 files changed

Lines changed: 125 additions & 21 deletions

File tree

‎lib/common/dao/ReposDao.dart‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import 'package:gsy_github_app_flutter/common/dao/DaoResult.dart';
22
import 'package:gsy_github_app_flutter/common/net/Address.dart';
33
import 'package:gsy_github_app_flutter/common/net/Api.dart';
44
import 'package:gsy_github_app_flutter/common/net/trending/GithubTrending.dart';
5+
import 'package:gsy_github_app_flutter/widget/EventItem.dart';
56
import 'package:gsy_github_app_flutter/widget/ReposHeaderItem.dart';
67
import 'package:gsy_github_app_flutter/widget/ReposItem.dart';
78

@@ -63,4 +64,25 @@ class ReposDao {
6364
return new DataResult(null, false);
6465
}
6566
}
67+
68+
/**
69+
* 仓库活动事件
70+
*/
71+
static getRepositoryEventDao(userName, reposName, {page = 0}) async {
72+
String url = Address.getReposEvent(userName, reposName) + Address.getPageParams("?", page);
73+
var res = await HttpManager.netFetch(url, null, null, null);
74+
if (res != null && res.result) {
75+
List<EventViewModel> list = new List();
76+
var data = res.data;
77+
if (data == null || data.length == 0) {
78+
return new DataResult(null, false);
79+
}
80+
for (int i = 0; i < data.length; i++) {
81+
list.add(EventViewModel.fromEventMap(data[i]));
82+
}
83+
return new DataResult(list, true);
84+
} else {
85+
return new DataResult(null, false);
86+
}
87+
}
6688
}

‎lib/common/utils/EventUtils.dart‎

Lines changed: 64 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1+
import 'package:flutter/material.dart';
2+
import 'package:gsy_github_app_flutter/common/utils/NavigatorUtils.dart';
3+
14
/**
25
* 事件逻辑
36
* Created by guoshuyu
47
* Date: 2018-07-16
58
*/
69
class EventUtils {
7-
810
///事件描述与动作
911
static getActionAndDes(event) {
1012
String actionStr;
@@ -119,4 +121,65 @@ class EventUtils {
119121

120122
return {"actionStr": actionStr, "des": des != null ? des : ""};
121123
}
124+
125+
///跳转
126+
static ActionUtils(BuildContext context, event, currentRepository) {
127+
if (event["repo"] == null) {
128+
NavigatorUtils.goPerson(context, event["actor"]["login"]);
129+
return;
130+
}
131+
String owner = event["repo"]["name"].split("/")[0];
132+
String repositoryName = event["repo"]["name"].split("/")[1];
133+
String fullName = owner + '/' + repositoryName;
134+
switch (event["type"]) {
135+
case 'ForkEvent':
136+
String forkName = event["actor"]["login"] + "/" + repositoryName;
137+
if (forkName == currentRepository) {
138+
return;
139+
}
140+
NavigatorUtils.goReposDetail(context, event["actor"]["login"], repositoryName);
141+
break;
142+
case 'PushEvent':
143+
if (event["payload"]["commits"] == null) {
144+
if (fullName == currentRepository) {
145+
return;
146+
}
147+
NavigatorUtils.goReposDetail(context, owner, repositoryName);
148+
} else if (event["payload"]["commits"].length == 1) {
149+
//goToPush(repositoryName, owner, event.payload.commits[0].sha)
150+
} else {
151+
//Actions.OptionModal({dataList: getOptionItem(repositoryName, owner, event.payload.commits)});
152+
}
153+
break;
154+
case 'ReleaseEvent':
155+
String url = event["payload"]["release"]["html_url"];
156+
//launchUrl(url);
157+
break;
158+
case 'IssueCommentEvent':
159+
case 'IssuesEvent':
160+
// 去issue
161+
/*Actions.IssueDetail({
162+
issue: event.payload.issue,
163+
title: fullName,
164+
repositoryName: repositoryName,
165+
userName: owner,
166+
needRightBtn: true,
167+
iconType:1,
168+
rightBtn: 'home',
169+
rightBtnPress: () => {
170+
Actions.RepositoryDetail({
171+
repositoryName: repositoryName, ownerName: owner
172+
, title: repositoryName
173+
});
174+
}
175+
});*/
176+
break;
177+
default:
178+
if (fullName == currentRepository) {
179+
return;
180+
}
181+
NavigatorUtils.goReposDetail(context, owner, repositoryName);
182+
break;
183+
}
184+
}
122185
}

‎lib/page/DynamicPage.dart‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import 'package:flutter_redux/flutter_redux.dart';
55
import 'package:gsy_github_app_flutter/common/config/Config.dart';
66
import 'package:gsy_github_app_flutter/common/dao/EventDao.dart';
77
import 'package:gsy_github_app_flutter/common/redux/GSYState.dart';
8+
import 'package:gsy_github_app_flutter/common/utils/EventUtils.dart';
89
import 'package:gsy_github_app_flutter/common/utils/NavigatorUtils.dart';
910
import 'package:gsy_github_app_flutter/widget/EventItem.dart';
1011
import 'package:gsy_github_app_flutter/widget/GSYPullLoadWidget.dart';
@@ -62,7 +63,7 @@ class _DynamicPageState extends State<DynamicPage> with AutomaticKeepAliveClient
6263
return new EventItem(
6364
e,
6465
onPressed: () {
65-
NavigatorUtils.goReposDetail(context, "Carguo", "GSYGithubApp");
66+
EventUtils.ActionUtils(context, e.eventMap, "");
6667
},
6768
);
6869
}

‎lib/page/RepositoryDetailPage.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@ class _RepositoryDetailPageState extends State<RepositoryDetailPage> with Automa
6565
],
6666
tabViews: [
6767
new RepositoryDetailReadmePage(),
68-
new ReposDetailInfoPage(reposDetailInfoPageControl),
68+
new ReposDetailInfoPage(reposDetailInfoPageControl, userName, reposName),
6969
new Icon(GSYICons.MAIN_DT),
7070
new Icon(GSYICons.MAIN_DT),
7171
],
7272
backgroundColor: GSYColors.primarySwatch,
7373
indicatorColor: Colors.white,
74-
title: GSYStrings.app_name);
74+
title: userName + "/" + reposName);
7575
}
7676
}

‎lib/page/RepostoryDetailInfoPage.dart‎

Lines changed: 33 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ import 'dart:async';
22

33
import 'package:flutter/material.dart';
44
import 'package:gsy_github_app_flutter/common/config/Config.dart';
5+
import 'package:gsy_github_app_flutter/common/dao/ReposDao.dart';
6+
import 'package:gsy_github_app_flutter/common/utils/EventUtils.dart';
7+
import 'package:gsy_github_app_flutter/widget/EventItem.dart';
58
import 'package:gsy_github_app_flutter/widget/GSYPullLoadWidget.dart';
69
import 'package:gsy_github_app_flutter/widget/ReposHeaderItem.dart';
710

@@ -11,16 +14,23 @@ import 'package:gsy_github_app_flutter/widget/ReposHeaderItem.dart';
1114
* Date: 2018-07-18
1215
*/
1316
class ReposDetailInfoPage extends StatefulWidget {
17+
final String userName;
18+
19+
final String reposName;
1420
final ReposDetailInfoPageControl reposDetailInfoPageControl;
1521

16-
ReposDetailInfoPage(this.reposDetailInfoPageControl);
22+
ReposDetailInfoPage(this.reposDetailInfoPageControl, this.userName, this.reposName);
1723

1824
@override
19-
_ReposDetailInfoPageState createState() => _ReposDetailInfoPageState(reposDetailInfoPageControl);
25+
_ReposDetailInfoPageState createState() => _ReposDetailInfoPageState(reposDetailInfoPageControl, userName, reposName);
2026
}
2127

2228
// ignore: mixin_inherits_from_not_object
2329
class _ReposDetailInfoPageState extends State<ReposDetailInfoPage> with AutomaticKeepAliveClientMixin {
30+
final String userName;
31+
32+
final String reposName;
33+
2434
bool isLoading = false;
2535

2636
int page = 1;
@@ -31,51 +41,59 @@ class _ReposDetailInfoPageState extends State<ReposDetailInfoPage> with Automati
3141

3242
final GSYPullLoadWidgetControl pullLoadWidgetControl = new GSYPullLoadWidgetControl();
3343

34-
_ReposDetailInfoPageState(this.reposDetailInfoPageControl);
44+
_ReposDetailInfoPageState(this.reposDetailInfoPageControl, this.userName, this.reposName);
3545

3646
Future<Null> _handleRefresh() async {
37-
/* if (isLoading) {
47+
if (isLoading) {
3848
return null;
3949
}
4050
isLoading = true;
4151
page = 1;
42-
var result = await EventDao.getEventDao(_getUserName(), page: page);
43-
if (result != null && result.length > 0) {
52+
var res = await ReposDao.getRepositoryEventDao(userName, reposName, page: page);
53+
if (res != null && res.result) {
4454
pullLoadWidgetControl.dataList.clear();
4555
setState(() {
46-
pullLoadWidgetControl.dataList.addAll(result);
56+
pullLoadWidgetControl.dataList.addAll(res.data);
4757
});
4858
}
4959
setState(() {
50-
pullLoadWidgetControl.needLoadMore = (result != null && result.length == Config.PAGE_SIZE);
60+
pullLoadWidgetControl.needLoadMore = (res != null && res.data != null && res.data.length == Config.PAGE_SIZE);
5161
});
52-
isLoading = false;*/
62+
isLoading = false;
5363
return null;
5464
}
5565

5666
Future<Null> _onLoadMore() async {
57-
/*if (isLoading) {
67+
if (isLoading) {
5868
return null;
5969
}
6070
isLoading = true;
6171
page++;
62-
var result = await EventDao.getEventDao(_getUserName(), page: page);
63-
if (result != null && result.length > 0) {
72+
var res = await ReposDao.getRepositoryEventDao(userName, reposName, page: page);
73+
if (res != null && res.result) {
6474
setState(() {
65-
pullLoadWidgetControl.dataList.addAll(result);
75+
pullLoadWidgetControl.dataList.addAll(res.data);
6676
});
6777
}
6878
setState(() {
69-
pullLoadWidgetControl.needLoadMore = (result != null);
79+
pullLoadWidgetControl.needLoadMore = (res != null && res.data != null && res.data.length == Config.PAGE_SIZE);
7080
});
71-
isLoading = false;*/
81+
isLoading = false;
7282
return null;
7383
}
7484

7585
_renderEventItem(index) {
7686
if (index == 0) {
7787
return new ReposHeaderItem(reposDetailInfoPageControl.reposHeaderViewModel);
7888
}
89+
90+
EventViewModel eventViewModel = pullLoadWidgetControl.dataList[index - 1];
91+
return new EventItem(
92+
pullLoadWidgetControl.dataList[index - 1],
93+
onPressed: () {
94+
EventUtils.ActionUtils(context, eventViewModel.eventMap, "");
95+
},
96+
);
7997
}
8098

8199
@override

‎lib/widget/EventItem.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import 'package:gsy_github_app_flutter/common/style/GSYStyle.dart';
33
import 'package:gsy_github_app_flutter/common/utils/CommonUtils.dart';
44
import 'package:gsy_github_app_flutter/common/utils/EventUtils.dart';
55
import 'package:gsy_github_app_flutter/common/utils/NavigatorUtils.dart';
6-
import 'package:gsy_github_app_flutter/page/PersonPage.dart';
76
import 'package:gsy_github_app_flutter/widget/GSYCardItem.dart';
87

98
/**
@@ -12,7 +11,6 @@ import 'package:gsy_github_app_flutter/widget/GSYCardItem.dart';
1211
* Date: 2018-07-16
1312
*/
1413
class EventItem extends StatelessWidget {
15-
1614
final EventViewModel eventViewModel;
1715

1816
final VoidCallback onPressed;
@@ -75,6 +73,7 @@ class EventViewModel {
7573
String actionDes;
7674
String actionTime;
7775
String actionTarget;
76+
var eventMap;
7877

7978
EventViewModel.fromEventMap(eventMap) {
8079
actionTime = CommonUtils.getNewsTimeStr(DateTime.parse(eventMap["created_at"]));
@@ -83,5 +82,6 @@ class EventViewModel {
8382
var other = EventUtils.getActionAndDes(eventMap);
8483
actionDes = other["des"];
8584
actionTarget = other["actionStr"];
85+
this.eventMap = eventMap;
8686
}
8787
}

0 commit comments

Comments
 (0)