diff --git a/lib/app/api/github/issues_api.dart b/lib/app/api/issues_api.dart similarity index 84% rename from lib/app/api/github/issues_api.dart rename to lib/app/api/issues_api.dart index d52629c..73f0588 100644 --- a/lib/app/api/github/issues_api.dart +++ b/lib/app/api/issues_api.dart @@ -1,7 +1,7 @@ import 'dart:convert'; import 'package:dio/dio.dart'; -import 'package:flutter_unit/model/github/IssueComment.dart'; +import 'package:flutter_unit/model/github/issue_comment.dart'; import 'package:flutter_unit/model/github/issue.dart'; import 'package:flutter_unit/model/github/repository.dart'; @@ -14,7 +14,6 @@ const kBaseUrl= 'http://119.45.173.197:8080/api/v1'; class IssuesApi { - static var dio = Dio( BaseOptions( baseUrl: kBaseUrl @@ -38,9 +37,3 @@ class IssuesApi { } } -main() async{ - var rep = await IssuesApi.getRepoFlutterUnit(); - var i = await IssuesApi.getIssues(); - print(rep); - print(i); -} diff --git a/lib/app/router.dart b/lib/app/router.dart index 75f8628..9dd3ab9 100644 --- a/lib/app/router.dart +++ b/lib/app/router.dart @@ -5,8 +5,8 @@ import 'package:flutter_unit/views/pages/about/about_app_page.dart'; import 'package:flutter_unit/views/pages/about/version_info.dart'; import 'package:flutter_unit/views/pages/category/category_detail.dart'; import 'package:flutter_unit/views/pages/category/collect_page.dart'; -import 'package:flutter_unit/views/pages/issues/issues_detail.dart'; -import 'package:flutter_unit/views/pages/issues/point_page.dart'; +import 'package:flutter_unit/views/pages/issues_point/issues_detail.dart'; +import 'package:flutter_unit/views/pages/issues_point/issues_point_page.dart'; import 'package:flutter_unit/views/pages/login/login_page.dart'; import 'package:flutter_unit/views/pages/search/serach_page.dart'; import 'package:flutter_unit/views/pages/setting/code_style_setting.dart'; diff --git a/lib/app/convert.dart b/lib/app/utils/convert.dart similarity index 100% rename from lib/app/convert.dart rename to lib/app/utils/convert.dart diff --git a/lib/blocs/point/point_bloc.dart b/lib/blocs/point/point_bloc.dart index cb84201..3f47bb0 100644 --- a/lib/blocs/point/point_bloc.dart +++ b/lib/blocs/point/point_bloc.dart @@ -1,13 +1,13 @@ import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:flutter_unit/app/api/github/issues_api.dart'; +import 'package:flutter_unit/app/api/issues_api.dart'; import 'package:flutter_unit/blocs/point/point_state.dart'; import 'point_event.dart'; -/// create by 张风捷特烈 on 2020-03-03 +/// create by 张风捷特烈 on 2020-09-03 /// contact me by email 1981462002@qq.com /// 说明: diff --git a/lib/blocs/point_comment/point_comment_bloc.dart b/lib/blocs/point_comment/point_comment_bloc.dart index 1f9e545..904bf50 100644 --- a/lib/blocs/point_comment/point_comment_bloc.dart +++ b/lib/blocs/point_comment/point_comment_bloc.dart @@ -1,6 +1,6 @@ import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:flutter_unit/app/api/github/issues_api.dart'; +import 'package:flutter_unit/app/api/issues_api.dart'; import 'package:flutter_unit/blocs/point/point_state.dart'; @@ -8,7 +8,7 @@ import 'point_comment_event.dart'; import 'point_comment_state.dart'; -/// create by 张风捷特烈 on 2020-03-03 +/// create by 张风捷特烈 on 2020-09-03 /// contact me by email 1981462002@qq.com /// 说明: diff --git a/lib/blocs/point_comment/point_comment_state.dart b/lib/blocs/point_comment/point_comment_state.dart index 68452b0..0edcedb 100644 --- a/lib/blocs/point_comment/point_comment_state.dart +++ b/lib/blocs/point_comment/point_comment_state.dart @@ -1,5 +1,5 @@ import 'package:equatable/equatable.dart'; -import 'package:flutter_unit/model/github/IssueComment.dart'; +import 'package:flutter_unit/model/github/issue_comment.dart'; import 'package:flutter_unit/model/github/issue.dart'; /// create by 张风捷特烈 on 2020/9/3 diff --git a/lib/model/github/g/IssueComment.g.dart b/lib/model/github/g/issue_comment.g.dart similarity index 97% rename from lib/model/github/g/IssueComment.g.dart rename to lib/model/github/g/issue_comment.g.dart index 5b505c9..65c20fd 100644 --- a/lib/model/github/g/IssueComment.g.dart +++ b/lib/model/github/g/issue_comment.g.dart @@ -1,6 +1,6 @@ // GENERATED CODE - DO NOT MODIFY BY HAND -part of '../IssueComment.dart'; +part of '../issue_comment.dart'; // ************************************************************************** // JsonSerializableGenerator diff --git a/lib/model/github/IssueComment.dart b/lib/model/github/issue_comment.dart similarity index 95% rename from lib/model/github/IssueComment.dart rename to lib/model/github/issue_comment.dart index 3d0849c..c426f2d 100644 --- a/lib/model/github/IssueComment.dart +++ b/lib/model/github/issue_comment.dart @@ -1,6 +1,6 @@ import 'package:flutter_unit/model/github/github_user.dart'; -part 'g/IssueComment.g.dart'; +part 'g/issue_comment.g.dart'; class IssueComment{ diff --git a/lib/model/widget_model.dart b/lib/model/widget_model.dart index 16c36a0..8690399 100644 --- a/lib/model/widget_model.dart +++ b/lib/model/widget_model.dart @@ -1,6 +1,6 @@ import 'package:equatable/equatable.dart'; import 'package:flutter/cupertino.dart'; -import 'package:flutter_unit/app/convert.dart'; +import 'package:flutter_unit/app/utils/convert.dart'; import 'package:flutter_unit/app/enums.dart'; import 'package:flutter_unit/app/res/cons.dart'; import 'package:flutter_unit/storage/po/widget_po.dart'; diff --git a/lib/views/pages/home/home_page.dart b/lib/views/pages/home/home_page.dart index 2b10361..298a765 100644 --- a/lib/views/pages/home/home_page.dart +++ b/lib/views/pages/home/home_page.dart @@ -1,7 +1,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:flutter_unit/app/convert.dart'; +import 'package:flutter_unit/app/utils/convert.dart'; import 'package:flutter_unit/app/res/cons.dart'; import 'package:flutter_unit/app/router.dart'; import 'package:flutter_unit/blocs/bloc_exp.dart'; diff --git a/lib/views/pages/issues/issue_item.dart b/lib/views/pages/issues_point/issue_item.dart similarity index 100% rename from lib/views/pages/issues/issue_item.dart rename to lib/views/pages/issues_point/issue_item.dart diff --git a/lib/views/pages/issues/issues_detail.dart b/lib/views/pages/issues_point/issues_detail.dart similarity index 98% rename from lib/views/pages/issues/issues_detail.dart rename to lib/views/pages/issues_point/issues_detail.dart index a8ddec2..ac15b09 100644 --- a/lib/views/pages/issues/issues_detail.dart +++ b/lib/views/pages/issues_point/issues_detail.dart @@ -7,7 +7,7 @@ import 'package:flutter_unit/components/permanent/circle_image.dart'; import 'package:flutter_unit/components/permanent/color_wrapper.dart'; import 'package:flutter_unit/components/permanent/markdown/markdown_widget.dart'; import 'package:flutter_unit/components/permanent/panel.dart'; -import 'package:flutter_unit/model/github/IssueComment.dart'; +import 'package:flutter_unit/model/github/issue_comment.dart'; import 'package:flutter_unit/model/github/issue.dart'; /// create by 张风捷特烈 on 2020/9/3 diff --git a/lib/views/pages/issues/point_page.dart b/lib/views/pages/issues_point/issues_point_page.dart similarity index 91% rename from lib/views/pages/issues/point_page.dart rename to lib/views/pages/issues_point/issues_point_page.dart index 7954832..8dd14e2 100644 --- a/lib/views/pages/issues/point_page.dart +++ b/lib/views/pages/issues_point/issues_point_page.dart @@ -10,18 +10,13 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_spinkit/flutter_spinkit.dart'; -import 'package:flutter_unit/app/api/github/issues_api.dart'; +import 'package:flutter_unit/app/api/issues_api.dart'; import 'package:flutter_unit/app/router.dart'; -import 'package:flutter_unit/app/res/toly_icon.dart'; -import 'package:flutter_unit/app/utils/convert_man.dart'; import 'package:flutter_unit/blocs/point/point_bloc.dart'; import 'package:flutter_unit/blocs/point/point_event.dart'; import 'package:flutter_unit/blocs/point/point_state.dart'; import 'package:flutter_unit/blocs/point_comment/point_comment_bloc.dart'; import 'package:flutter_unit/blocs/point_comment/point_comment_event.dart'; -import 'package:flutter_unit/components/permanent/circle_image.dart'; -import 'package:flutter_unit/components/permanent/color_wrapper.dart'; -import 'package:flutter_unit/model/github/issue.dart'; import 'package:flutter_unit/model/github/repository.dart'; import 'issue_item.dart'; diff --git a/lib/views/pages/issues/repo_widget.dart b/lib/views/pages/issues_point/repo_widget.dart similarity index 100% rename from lib/views/pages/issues/repo_widget.dart rename to lib/views/pages/issues_point/repo_widget.dart