@@ -7,17 +7,17 @@ import 'package:get_version/get_version.dart';
77import 'package:gsy_github_app_flutter/common/config/Config.dart' ;
88import 'package:gsy_github_app_flutter/common/dao/DaoResult.dart' ;
99import 'package:gsy_github_app_flutter/common/model/Event.dart' ;
10+ import 'package:gsy_github_app_flutter/common/model/FileModel.dart' ;
1011import 'package:gsy_github_app_flutter/common/model/PushCommit.dart' ;
1112import 'package:gsy_github_app_flutter/common/model/Release.dart' ;
1213import 'package:gsy_github_app_flutter/common/model/RepoCommit.dart' ;
1314import 'package:gsy_github_app_flutter/common/model/Repository.dart' ;
15+ import 'package:gsy_github_app_flutter/common/model/User.dart' ;
1416import 'package:gsy_github_app_flutter/common/net/Address.dart' ;
1517import 'package:gsy_github_app_flutter/common/net/Api.dart' ;
1618import 'package:gsy_github_app_flutter/common/net/trending/GithubTrending.dart' ;
1719import 'package:gsy_github_app_flutter/common/style/GSYStyle.dart' ;
1820import 'package:gsy_github_app_flutter/common/utils/CommonUtils.dart' ;
19- import 'package:gsy_github_app_flutter/page/RepositoryFileListPage.dart' ;
20- import 'package:gsy_github_app_flutter/widget/UserItem.dart' ;
2121import 'package:pub_semver/pub_semver.dart' ;
2222
2323/**
@@ -138,15 +138,15 @@ class ReposDao {
138138 if (text) {
139139 return new DataResult (res.data, true );
140140 }
141- List <FileItemViewModel > list = new List ();
141+ List <FileModel > list = new List ();
142142 var data = res.data;
143143 if (data == null || data.length == 0 ) {
144144 return new DataResult (null , false );
145145 }
146- List <FileItemViewModel > dirs = [];
147- List <FileItemViewModel > files = [];
146+ List <FileModel > dirs = [];
147+ List <FileModel > files = [];
148148 for (int i = 0 ; i < data.length; i++ ) {
149- FileItemViewModel file = FileItemViewModel . fromMap (data[i]);
149+ FileModel file = FileModel . fromJson (data[i]);
150150 if (file.type == 'file' ) {
151151 files.add (file);
152152 } else {
@@ -188,13 +188,13 @@ class ReposDao {
188188 String url = Address .getReposWatcher (userName, reposName) + Address .getPageParams ("?" , page);
189189 var res = await HttpManager .netFetch (url, null , null , null );
190190 if (res != null && res.result) {
191- List <UserItemViewModel > list = new List ();
191+ List <User > list = new List ();
192192 var data = res.data;
193193 if (data == null || data.length == 0 ) {
194194 return new DataResult (null , false );
195195 }
196196 for (int i = 0 ; i < data.length; i++ ) {
197- list.add (new UserItemViewModel (data[i][ 'login' ], data[i][ "avatar_url" ]));
197+ list.add (new User . fromJson (data[i]));
198198 }
199199 return new DataResult (list, true );
200200 } else {
@@ -209,13 +209,13 @@ class ReposDao {
209209 String url = Address .getReposStar (userName, reposName) + Address .getPageParams ("?" , page);
210210 var res = await HttpManager .netFetch (url, null , null , null );
211211 if (res != null && res.result) {
212- List <UserItemViewModel > list = new List ();
212+ List <User > list = new List ();
213213 var data = res.data;
214214 if (data == null || data.length == 0 ) {
215215 return new DataResult (null , false );
216216 }
217217 for (int i = 0 ; i < data.length; i++ ) {
218- list.add (new UserItemViewModel (data[i][ 'login' ], data[i][ "avatar_url" ]));
218+ list.add (new User . fromJson (data[i]));
219219 }
220220 return new DataResult (list, true );
221221 } else {
@@ -382,13 +382,13 @@ class ReposDao {
382382 }
383383 } else {
384384 if (res != null && res.result && res.data["items" ] != null ) {
385- List <UserItemViewModel > list = new List ();
385+ List <User > list = new List ();
386386 var data = res.data["items" ];
387387 if (data == null || data.length == 0 ) {
388388 return new DataResult (null , false );
389389 }
390390 for (int i = 0 ; i < data.length; i++ ) {
391- list.add (new UserItemViewModel (data[i][ 'login' ], data[i][ "avatar_url" ]));
391+ list.add (new User . fromJson (data[i]));
392392 }
393393 return new DataResult (list, true );
394394 } else {
0 commit comments