Skip to content

Commit 516f8ad

Browse files
committed
fix something
1 parent 6528e7e commit 516f8ad

File tree

2 files changed

+28
-23
lines changed

2 files changed

+28
-23
lines changed

lib/page/MyPage.dart

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -36,24 +36,25 @@ class _MyPageState extends BasePersonState<MyPage> {
3636

3737
Color notifyColor = const Color(GSYColors.subTextColor);
3838

39-
40-
4139
Store<GSYState> _getStore() {
40+
if (context == null) {
41+
return null;
42+
}
4243
return StoreProvider.of(context);
4344
}
4445

4546
_getUserName() {
46-
if (_getStore().state.userInfo == null) {
47+
if (_getStore()?.state?.userInfo == null) {
4748
return null;
4849
}
49-
return _getStore().state.userInfo.login;
50+
return _getStore()?.state?.userInfo?.login;
5051
}
5152

5253
getUserType() {
53-
if (_getStore().state.userInfo == null) {
54+
if (_getStore()?.state?.userInfo == null) {
5455
return null;
5556
}
56-
return _getStore().state.userInfo.type;
57+
return _getStore()?.state?.userInfo?.type;
5758
}
5859

5960
_refreshNotify() {
@@ -72,7 +73,6 @@ class _MyPageState extends BasePersonState<MyPage> {
7273
});
7374
}
7475

75-
7676
@override
7777
bool get wantKeepAlive => true;
7878

@@ -83,6 +83,9 @@ class _MyPageState extends BasePersonState<MyPage> {
8383
}
8484

8585
_getDataLogic() async {
86+
if (_getUserName() == null) {
87+
return [];
88+
}
8689
if (getUserType() == "Organization") {
8790
return await UserDao.getMemberDao(_getUserName(), page);
8891
}
@@ -91,22 +94,24 @@ class _MyPageState extends BasePersonState<MyPage> {
9194

9295
@override
9396
requestRefresh() async {
94-
UserDao.getUserInfo(null).then((res) {
95-
if (res != null && res.result) {
96-
_getStore().dispatch(UpdateUserAction(res.data));
97-
getUserOrg(_getUserName());
98-
}
99-
});
100-
ReposDao.getUserRepository100StatusDao(_getUserName()).then((res) {
101-
if (res != null && res.result) {
102-
if (isShow) {
103-
setState(() {
104-
beStaredCount = res.data.toString();
105-
});
97+
if (_getUserName() != null) {
98+
UserDao.getUserInfo(null).then((res) {
99+
if (res != null && res.result) {
100+
_getStore()?.dispatch(UpdateUserAction(res.data));
101+
getUserOrg(_getUserName());
106102
}
107-
}
108-
});
109-
_refreshNotify();
103+
});
104+
ReposDao.getUserRepository100StatusDao(_getUserName()).then((res) {
105+
if (res != null && res.result) {
106+
if (isShow) {
107+
setState(() {
108+
beStaredCount = res.data.toString();
109+
});
110+
}
111+
}
112+
});
113+
_refreshNotify();
114+
}
110115
return await _getDataLogic();
111116
}
112117

lib/widget/BasePersonState.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ abstract class BasePersonState<T extends StatefulWidget> extends State<T> with A
4949

5050
@protected
5151
getUserOrg(String userName) {
52-
if (page <= 1) {
52+
if (page <= 1 && userName != null) {
5353
UserDao.getUserOrgsDao(userName, page, needDb: true).then((res) {
5454
if (res != null && res.result) {
5555
setState(() {

0 commit comments

Comments
 (0)