Skip to content

Commit 1fec60c

Browse files
Asher.Guo@barcoverse.comAsher.Guo@barcoverse.com
[email protected]
authored and
[email protected]
committed
fix issue error
1 parent 3064e79 commit 1fec60c

File tree

12 files changed

+78
-68
lines changed

12 files changed

+78
-68
lines changed

‎lib/common/net/address.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class Address {
7272
}
7373

7474
///仓库Issue get
75-
static getReposIssue(reposOwner, reposName, state, sort, direction) {
75+
static getReposIssue(String reposOwner, String reposName, state, sort, direction) {
7676
state ??= 'all';
7777
sort ??= 'created';
7878
direction ??= 'desc';

‎lib/common/repositories/event_repository.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class EventRepository {
5050
}
5151

5252
/// 用户行为事件
53-
static getEventRequest(userName, {page = 0, bool needDb = false}) async {
53+
static getEventRequest(String userName, {page = 0, bool needDb = false}) async {
5454
UserEventDbProvider provider = UserEventDbProvider();
5555
next() async {
5656
String url =

‎lib/common/repositories/issue_repository.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class IssueRepository {
2121
/// @param state issue状态
2222
/// @param sort 排序类型 created updated等
2323
/// @param direction 正序或者倒序
24-
static getRepositoryIssueRequest(userName, repository, state,
24+
static getRepositoryIssueRequest(String userName, String repository, state,
2525
{sort, direction, page = 0, needDb = false}) async {
2626
String? fullName = "$userName/$repository";
2727
String dbState = state ?? "*";

‎lib/common/repositories/repos_repository.dart‎

Lines changed: 39 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class ReposRepository {
5858
url, null, {"api-token": Config.API_TOKEN}, null,
5959
noTip: true);
6060
if (result != null && result.result && result.data is List) {
61-
List<TrendingRepoModel> list =[];
61+
List<TrendingRepoModel> list = [];
6262
var data = result.data;
6363
if (data == null || data.length == 0) {
6464
return DataResult(null, false);
@@ -107,9 +107,9 @@ class ReposRepository {
107107
}
108108

109109
/// 仓库的详情数据
110-
static getRepositoryDetailRequest(userName, reposName, branch,
110+
static getRepositoryDetailRequest(String userName, String reposName, branch,
111111
{needDb = true}) async {
112-
String? fullName = userName + "/$reposName" + "v3";
112+
String? fullName = "$userName/${reposName}v3";
113113
RepositoryDetailDbProvider provider = RepositoryDetailDbProvider();
114114

115115
next() async {
@@ -142,9 +142,9 @@ class ReposRepository {
142142
}
143143

144144
/// 仓库活动事件
145-
static getRepositoryEventRequest(userName, reposName,
145+
static getRepositoryEventRequest(String userName, String reposName,
146146
{page = 0, branch = "master", needDb = false}) async {
147-
String? fullName = userName + "/$reposName";
147+
String? fullName = "$userName/$reposName";
148148
RepositoryEventDbProvider provider = RepositoryEventDbProvider();
149149

150150
next() async {
@@ -181,7 +181,7 @@ class ReposRepository {
181181
}
182182

183183
/// 获取用户对当前仓库的star、watcher状态
184-
static getRepositoryStatusRequest(userName, reposName) async {
184+
static getRepositoryStatusRequest(String userName, String reposName) async {
185185
String urls = Address.resolveStarRepos(userName, reposName);
186186
String urlw = Address.resolveWatcherRepos(userName, reposName);
187187
var resS = await httpManager.netFetch(urls, null, null, null, noTip: true);
@@ -191,9 +191,9 @@ class ReposRepository {
191191
}
192192

193193
/// 获取仓库的提交列表
194-
static getReposCommitsRequest(userName, reposName,
194+
static getReposCommitsRequest(String userName, String reposName,
195195
{page = 0, branch = "master", needDb = false}) async {
196-
String? fullName = userName + "/$reposName";
196+
String? fullName = "$userName/$reposName";
197197

198198
RepositoryCommitsDbProvider provider = RepositoryCommitsDbProvider();
199199

@@ -233,7 +233,7 @@ class ReposRepository {
233233

234234
/// *
235235
/// 获取仓库的文件列表
236-
static getReposFileDirRequest(userName, reposName,
236+
static getReposFileDirRequest(String userName, String reposName,
237237
{path = '', branch, text = false, isHtml = false}) async {
238238
String url = Address.reposDataDir(userName, reposName, path, branch);
239239
var res = await httpManager.netFetch(
@@ -274,7 +274,7 @@ class ReposRepository {
274274

275275
/// star仓库
276276
static Future<DataResult> doRepositoryStarRequest(
277-
userName, reposName, star) async {
277+
String userName, String reposName, star) async {
278278
String url = Address.resolveStarRepos(userName, reposName);
279279
var res = await httpManager.netFetch(
280280
url, null, null, Options(method: !star ? 'PUT' : 'DELETE'));
@@ -284,17 +284,18 @@ class ReposRepository {
284284
}
285285

286286
/// watcher仓库
287-
static doRepositoryWatchRequest(userName, reposName, watch) async {
287+
static doRepositoryWatchRequest(
288+
String userName, String reposName, watch) async {
288289
String url = Address.resolveWatcherRepos(userName, reposName);
289290
var res = await httpManager.netFetch(
290291
url, null, null, Options(method: !watch ? 'PUT' : 'DELETE'));
291292
return DataResult(null, res!.result);
292293
}
293294

294295
/// 获取当前仓库所有订阅用户
295-
static getRepositoryWatcherRequest(userName, reposName, page,
296+
static getRepositoryWatcherRequest(String userName, String reposName, page,
296297
{needDb = false}) async {
297-
String? fullName = "$userName/$reposName";
298+
String? fullName = "$userName/$reposName";
298299
RepositoryWatcherDbProvider provider = RepositoryWatcherDbProvider();
299300

300301
next() async {
@@ -331,9 +332,9 @@ class ReposRepository {
331332
}
332333

333334
/// 获取当前仓库所有star用户
334-
static getRepositoryStarRequest(userName, reposName, page,
335+
static getRepositoryStarRequest(String userName, String reposName, page,
335336
{needDb = false}) async {
336-
String? fullName = "$userName/$reposName";
337+
String? fullName = "$userName/$reposName";
337338
RepositoryStarDbProvider provider = RepositoryStarDbProvider();
338339
next() async {
339340
String url = Address.getReposStar(userName, reposName) +
@@ -369,9 +370,9 @@ class ReposRepository {
369370
}
370371

371372
/// 获取仓库的fork分支
372-
static getRepositoryForksRequest(userName, reposName, page,
373+
static getRepositoryForksRequest(String userName, String reposName, page,
373374
{needDb = false}) async {
374-
String? fullName = "$userName/$reposName";
375+
String? fullName = "$userName/$reposName";
375376
RepositoryForkDbProvider provider = RepositoryForkDbProvider();
376377
next() async {
377378
String url = Address.getReposForks(userName, reposName) +
@@ -408,7 +409,8 @@ class ReposRepository {
408409
}
409410

410411
/// 获取用户所有star
411-
static getStarRepositoryRequest(userName, page, sort, {needDb = false}) async {
412+
static getStarRepositoryRequest(String userName, page, sort,
413+
{needDb = false}) async {
412414
UserStaredDbProvider provider = UserStaredDbProvider();
413415
next() async {
414416
String url =
@@ -445,7 +447,8 @@ class ReposRepository {
445447
}
446448

447449
/// 用户的仓库
448-
static getUserRepositoryRequest(userName, page, sort, {needDb = false}) async {
450+
static getUserRepositoryRequest(String userName, page, sort,
451+
{needDb = false}) async {
449452
UserReposDbProvider provider = UserReposDbProvider();
450453
next() async {
451454
String url =
@@ -482,10 +485,10 @@ class ReposRepository {
482485
}
483486

484487
/// 创建仓库的fork分支
485-
static createForkRequest(userName, reposName) async {
488+
static createForkRequest(String userName, String reposName) async {
486489
String url = Address.createFork(userName, reposName);
487-
var res = await httpManager.netFetch(
488-
url, null, null, Options(method: "POST"));
490+
var res =
491+
await httpManager.netFetch(url, null, null, Options(method: "POST"));
489492
return DataResult(null, res!.result);
490493
}
491494

@@ -505,10 +508,12 @@ class ReposRepository {
505508
///测试代码
506509
Serializer<Branch?> serializerForType =
507510
serializers.serializerForType(Branch) as Serializer<Branch?>;
508-
var test = serializers.deserializeWith<Branch?>(serializerForType, data);
511+
var test =
512+
serializers.deserializeWith<Branch?>(serializerForType, data);
509513

510514
/// 反序列化
511-
Map result = serializers.serializeWith(serializerForType, test) as Map<dynamic, dynamic>;
515+
Map result = serializers.serializeWith(serializerForType, test)
516+
as Map<dynamic, dynamic>;
512517
if (kDebugMode) {
513518
print("###### $test $result");
514519
}
@@ -522,7 +527,7 @@ class ReposRepository {
522527
}
523528

524529
/// 用户的前100仓库
525-
static getUserRepository100StatusRequest(userName) async {
530+
static getUserRepository100StatusRequest(String userName) async {
526531
String url = Address.userRepos(userName, 'pushed') + "&page=1&per_page=100";
527532
var res = await httpManager.netFetch(url, null, null, null);
528533
List<Repository> honorList = [];
@@ -542,7 +547,8 @@ class ReposRepository {
542547
}
543548

544549
/// 详情的remde数据
545-
static getRepositoryDetailReadmeRequest(userName, reposName, branch,
550+
static getRepositoryDetailReadmeRequest(
551+
String userName, String reposName, branch,
546552
{needDb = true}) async {
547553
String? fullName = "$userName/$reposName";
548554
RepositoryDetailReadmeDbProvider provider =
@@ -623,7 +629,8 @@ class ReposRepository {
623629
}
624630

625631
/// 获取仓库的单个提交详情
626-
static getReposCommitsInfoRequest(userName, reposName, sha) async {
632+
static getReposCommitsInfoRequest(
633+
String userName, String reposName, sha) async {
627634
String url = Address.getReposCommitsInfo(userName, reposName, sha);
628635
var res = await httpManager.netFetch(url, null, null, null);
629636
if (res != null && res.result) {
@@ -635,7 +642,7 @@ class ReposRepository {
635642
}
636643

637644
/// 获取仓库的release列表
638-
static getRepositoryReleaseRequest(userName, reposName, page,
645+
static getRepositoryReleaseRequest(String userName, String reposName, page,
639646
{needHtml = true, release = true}) async {
640647
String url = release
641648
? Address.getReposRelease(userName, reposName) +
@@ -673,7 +680,8 @@ class ReposRepository {
673680
if (Platform.isIOS) {
674681
return;
675682
}
676-
var res = await getRepositoryReleaseRequest("CarGuo", 'gsy_github_app_flutter', 1,
683+
var res = await getRepositoryReleaseRequest(
684+
"CarGuo", 'gsy_github_app_flutter', 1,
677685
needHtml: false);
678686
if (res != null && res.result && res.data.length > 0) {
679687
Release release = res.data[0];
@@ -720,7 +728,8 @@ class ReposRepository {
720728
}
721729

722730
/// 获取issue总数
723-
static getRepositoryIssueStatusRequest(userName, repository) async {
731+
static getRepositoryIssueStatusRequest(
732+
String userName, String repository) async {
724733
String url = Address.getReposIssue(userName, repository, null, null, null) +
725734
"&per_page=1";
726735
var res = await httpManager.netFetch(url, null, null, null);

‎lib/common/repositories/user_repository.dart‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class UserRepository {
5959
return DataResult(resultData, res!.result);
6060
}
6161

62-
static login(userName, password, store) async {
62+
static login(String userName, String password, store) async {
6363
String type = "$userName:$password";
6464
var bytes = utf8.encode(type);
6565
var base64Str = base64.encode(bytes);
@@ -130,7 +130,7 @@ class UserRepository {
130130
}
131131

132132
///获取用户详细信息
133-
static getUserInfo(userName, {needDb = false}) async {
133+
static getUserInfo(String? userName, {needDb = false}) async {
134134
UserInfoDbProvider provider = UserInfoDbProvider();
135135
next() async {
136136
dynamic res;
@@ -182,7 +182,7 @@ class UserRepository {
182182
}
183183

184184
/// 在header中提起stared count
185-
static getUserStaredCountNet(userName) async {
185+
static getUserStaredCountNet(String userName) async {
186186
String url = Address.userStar(userName, null) + "&per_page=1";
187187
var res = await httpManager.netFetch(url, null, null, null);
188188
if (res != null && res.result && res.headers != null) {
@@ -207,7 +207,7 @@ class UserRepository {
207207
}
208208

209209
/// 获取用户粉丝列表
210-
static getFollowerListRequest(userName, page, {needDb = false}) async {
210+
static getFollowerListRequest(String userName, page, {needDb = false}) async {
211211
UserFollowerDbProvider provider = UserFollowerDbProvider();
212212

213213
next() async {
@@ -244,7 +244,7 @@ class UserRepository {
244244
}
245245

246246
/// 获取用户关注列表
247-
static getFollowedListRequest(userName, page, {needDb = false}) async {
247+
static getFollowedListRequest(String userName, page, {needDb = false}) async {
248248
UserFollowedDbProvider provider = UserFollowedDbProvider();
249249
next() async {
250250
String url =
@@ -317,14 +317,14 @@ class UserRepository {
317317
}
318318

319319
/// 检查用户关注状态
320-
static checkFollowRequest(name) async {
320+
static checkFollowRequest(String name) async {
321321
String url = Address.doFollow(name);
322322
var res = await httpManager.netFetch(url, null, null, null, noTip: true);
323323
return DataResult(res!.data, res.result);
324324
}
325325

326326
/// 关注用户
327-
static doFollowRequest(name, bool followed) async {
327+
static doFollowRequest(String name, bool followed) async {
328328
String url = Address.doFollow(name);
329329
var res = await httpManager.netFetch(
330330
url, null, null, Options(method: !followed ? "PUT" : "DELETE"),
@@ -333,7 +333,7 @@ class UserRepository {
333333
}
334334

335335
/// 组织成员
336-
static getMemberRequest(userName, page) async {
336+
static getMemberRequest(String userName, page) async {
337337
String url = Address.getMember(userName) + Address.getPageParams("?", page);
338338
var res = await httpManager.netFetch(url, null, null, null);
339339
if (res != null && res.result) {
@@ -368,7 +368,7 @@ class UserRepository {
368368
}
369369

370370
/// 获取用户组织
371-
static getUserOrgsRequest(userName, page, {needDb = false}) async {
371+
static getUserOrgsRequest(String userName, page, {needDb = false}) async {
372372
UserOrgsDbProvider provider = UserOrgsDbProvider();
373373
next() async {
374374
String url =

‎lib/page/code_detail_page_web.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ class _CodeDetailPageState extends State<CodeDetailPageWeb> {
6464
mimeType: 'text/html', encoding: Encoding.getByName("utf-8"));
6565
}
6666
var res = await ReposRepository.getReposFileDirRequest(
67-
widget.userName, widget.reposName,
67+
widget.userName!, widget.reposName!,
6868
path: widget.path, branch: widget.branch, text: true, isHtml: true);
6969
if (res != null && res.result) {
7070
String data2 = HtmlUtils.resolveHtmlFile(res, widget.lang ?? "java");

‎lib/page/common_list_page.dart‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,31 +74,31 @@ class _CommonListPageState extends State<CommonListPage>
7474
_getDataLogic() async {
7575
return switch (widget.dataType) {
7676
CommonListDataType.follower => await UserRepository.getFollowerListRequest(
77-
widget.userName, page,
77+
widget.userName!, page,
7878
needDb: page <= 1),
7979
CommonListDataType.followed => await UserRepository.getFollowedListRequest(
80-
widget.userName, page,
80+
widget.userName!, page,
8181
needDb: page <= 1),
8282
CommonListDataType.userRepos => await ReposRepository.getUserRepositoryRequest(
83-
widget.userName, page, null,
83+
widget.userName!, page, null,
8484
needDb: page <= 1),
8585
CommonListDataType.userStar => await ReposRepository.getStarRepositoryRequest(
86-
widget.userName, page, null,
86+
widget.userName!, page, null,
8787
needDb: page <= 1),
8888
CommonListDataType.repoStar => await ReposRepository.getRepositoryStarRequest(
89-
widget.userName, widget.reposName, page,
89+
widget.userName!, widget.reposName!, page,
9090
needDb: page <= 1),
9191
CommonListDataType.repoWatcher => await ReposRepository.getRepositoryWatcherRequest(
92-
widget.userName, widget.reposName, page,
92+
widget.userName!, widget.reposName!, page,
9393
needDb: page <= 1),
9494
CommonListDataType.repoFork => await ReposRepository.getRepositoryForksRequest(
95-
widget.userName, widget.reposName, page,
95+
widget.userName!, widget.reposName!, page,
9696
needDb: page <= 1),
9797
CommonListDataType.history => await ReposRepository.getHistoryRequest(page),
9898
CommonListDataType.topics =>
9999
await ReposRepository.searchTopicRepositoryRequest(widget.userName, page: page),
100100
CommonListDataType.userOrgs =>
101-
await UserRepository.getUserOrgsRequest(widget.userName, page, needDb: page <= 1),
101+
await UserRepository.getUserOrgsRequest(widget.userName!, page, needDb: page <= 1),
102102
_ => null,
103103
};
104104
}

‎lib/page/push/push_detail_page.dart‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import 'dart:async';
2-
import 'dart:convert';
32

43
import 'package:flutter/material.dart';
54
import 'package:gsy_github_app_flutter/common/repositories/repos_repository.dart';
@@ -96,7 +95,7 @@ class _PushDetailPageState extends State<PushDetailPage>
9695

9796
_getDataLogic() async {
9897
return await ReposRepository.getReposCommitsInfoRequest(
99-
widget.userName, widget.reposName, widget.sha);
98+
widget.userName!, widget.reposName!, widget.sha);
10099
}
101100

102101
@override

0 commit comments

Comments
 (0)