Skip to content

Commit

Permalink
优化代码结构
Browse files Browse the repository at this point in the history
  • Loading branch information
toly1994328 committed Jan 20, 2023
1 parent 215306b commit e4b6123
Show file tree
Hide file tree
Showing 60 changed files with 531 additions and 508 deletions.
10 changes: 4 additions & 6 deletions lib/app/bloc_wrapper.dart
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
import 'package:app_config/app_config.dart';
import 'package:app_update/app_update.dart';
import 'package:authentication/authentication.dart';
import 'package:db_storage/db_storage.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_unit/app/update_part/bloc_exp.dart';
import 'package:flutter_unit/painter_system/bloc/gallery_unit/bloc.dart';
import 'package:flutter_unit/user_system/bloc/authentic/bloc.dart';
import 'package:flutter_unit/user_system/bloc/authentic/event.dart';

import 'package:widget_module/blocs/blocs.dart';

import 'package:widget_repository/widget_repository.dart';


Expand All @@ -32,6 +29,7 @@ class _BlocWrapperState extends State<BlocWrapper> {
final WidgetRepository repository = const WidgetDbRepository();

final CategoryBloc categoryBloc= CategoryBloc(repository: CategoryDbRepository());
final AuthRepository authRepository = HttpAuthRepository();

@override
Widget build(BuildContext context) {
Expand All @@ -40,7 +38,7 @@ class _BlocWrapperState extends State<BlocWrapper> {
// 全局 bloc : 维护应用存储状态、更新、认证
BlocProvider<AppBloc>(create: (_) => AppBloc(AppStateRepository())..initApp()),
BlocProvider<UpdateBloc>(create: (_) => UpdateBloc()),
BlocProvider<AuthenticBloc>(create: (_) => AuthenticBloc()..add(const AppStarted())),
BlocProvider<AuthBloc>(create: (_) => AuthBloc(repository: authRepository)..add(const AppStarted())),

BlocProvider<WidgetsBloc>(create: (_) => WidgetsBloc(repository: repository)),
BlocProvider<CategoryBloc>(create: (_) => categoryBloc),
Expand Down
5 changes: 2 additions & 3 deletions lib/app/navigation/unit_navigation.dart
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import 'dart:io';

import 'package:app_config/app_config.dart';
import 'package:app_update/app_update.dart';
import 'package:authentication/authentication.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_unit/app/update_part/bloc_exp.dart';
import 'package:flutter_unit/painter_system/gallery_unit.dart';
import 'package:flutter_unit/app/update_part/views/update_red_point.dart';
import 'package:flutter_unit/user_system/pages/user/user_page.dart';
import 'package:flutter_unit/widget_ui/mobile/category_page/collect_page.dart';
import 'package:flutter_unit/widget_ui/mobile/category_page/home_right_drawer.dart';
import 'package:old_fancy_mobile_ui/bloc/color_change_bloc.dart';
Expand Down
3 changes: 1 addition & 2 deletions lib/app/router/unit_router.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import 'dart:io';

import 'package:app_config/app_config.dart';
import 'package:authentication/authentication.dart';
import 'package:flutter/material.dart';
import 'package:flutter_unit/app/navigation/unit_navigation.dart';
import 'package:flutter_unit/app/views/about/about_app_page.dart';
Expand All @@ -19,8 +20,6 @@ import 'package:flutter_unit/app/views/unit_todo/layout_unit_page.dart';
import 'package:flutter_unit/app/views/unit_todo/point_unit_page.dart';
import 'package:flutter_unit/point_system/views/issues_point/issues_detail.dart';
import 'package:flutter_unit/point_system/views/issues_point/issues_point_page.dart';
import 'package:flutter_unit/user_system/pages/login/login_page.dart';
import 'package:flutter_unit/user_system/pages/register/register_page.dart';
import 'package:flutter_unit/widget_ui/desk/widget_detail/widget_detail_page.dart';
import 'package:flutter_unit/widget_ui/mobile/category_page/category_detail.dart';
import 'package:flutter_unit/widget_ui/mobile/category_page/collect_page.dart';
Expand Down
5 changes: 0 additions & 5 deletions lib/app/update_part/bloc_exp.dart

This file was deleted.

64 changes: 32 additions & 32 deletions lib/app/utils/Toast.dart
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
import 'package:flutter/material.dart';

class Toast {
static toast(BuildContext context, String msg,
{duration = const Duration(milliseconds: 600),
Color? color,
SnackBarAction? action}) {

ScaffoldMessenger.of(context).showSnackBar(SnackBar(
content: Text(msg),
duration: duration,
action: action,
backgroundColor: color??Theme.of(context).primaryColor,
));
}

static void error(BuildContext context,String msg){
toast(context,msg, color:Colors.red, );
}

static void warning(BuildContext context,String msg){
toast(context,msg, color:Colors.orange, );
}

static void success(BuildContext context,String msg){
toast(context,msg, color:Theme.of(context).primaryColor, );
}

static void green(BuildContext context,String msg){
toast(context,msg, color:Colors.green, );
}
}
// import 'package:flutter/material.dart';
//
// class Toast {
// static toast(BuildContext context, String msg,
// {duration = const Duration(milliseconds: 600),
// Color? color,
// SnackBarAction? action}) {
//
// ScaffoldMessenger.of(context).showSnackBar(SnackBar(
// content: Text(msg),
// duration: duration,
// action: action,
// backgroundColor: color??Theme.of(context).primaryColor,
// ));
// }
//
// static void error(BuildContext context,String msg){
// toast(context,msg, color:Colors.red, );
// }
//
// static void warning(BuildContext context,String msg){
// toast(context,msg, color:Colors.orange, );
// }
//
// static void success(BuildContext context,String msg){
// toast(context,msg, color:Theme.of(context).primaryColor, );
// }
//
// static void green(BuildContext context,String msg){
// toast(context,msg, color:Colors.green, );
// }
// }
36 changes: 0 additions & 36 deletions lib/app/utils/http_utils/result_bean.dart

This file was deleted.

3 changes: 1 addition & 2 deletions lib/app/views/about/version_info.dart
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@

import 'package:app_config/app_config.dart';
import 'package:app_update/app_update.dart';
import 'package:flutter/material.dart';

import 'package:components/toly_ui/toly_ui.dart';

import 'package:flutter_unit/app/update_part/views/app_update_panel.dart';
import 'package:url_launcher/url_launcher.dart';


Expand Down
12 changes: 6 additions & 6 deletions lib/app/views/data_manage/data_manage_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';

import 'package:flutter_unit/app/utils/Toast.dart';
import 'package:flutter_unit/app/utils/http_utils/result_bean.dart';
import 'package:flutter_unit/point_system/api/category_api.dart';

import 'package:flutter_unit/user_system/component/authentic_widget.dart';
import 'package:authentication/views/authentic_widget.dart';
import 'package:utils/utils.dart';
import 'package:widget_module/blocs/blocs.dart';

import 'package:path/path.dart' as path;
Expand Down Expand Up @@ -93,20 +93,20 @@ class DataManagePage extends StatelessWidget {
String json = jsonEncode(loadCategories);
String likeJson = jsonEncode(likeData);

ResultBean<bool> result =
TaskResult<bool> result =
await CategoryApi.uploadCategoryData(data: json, likeData: likeJson);

if (result.status) {
if (result.success) {
Toast.toast(context, '数据集备份成功!');
} else {
Toast.toast(context, '数据集备份失败!');
}
}

void _doSync(BuildContext context) async {
ResultBean<CategoryData> result = await CategoryApi.getCategoryData();
TaskResult<CategoryData> result = await CategoryApi.getCategoryData();

if (result.status) {
if (result.success) {
// 说明请求成功
if (result.data != null) {
//说明有后台备份数据,进行同步操作
Expand Down
16 changes: 7 additions & 9 deletions lib/point_system/api/app_info.dart
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
import 'package:app_config/app_config.dart';
import 'package:equatable/equatable.dart';

import 'package:flutter_unit/app/utils/http_utils/http_util.dart';
import 'package:flutter_unit/app/utils/http_utils/result_bean.dart';
import 'package:utils/utils.dart';

class AppInfoApi {

static Future<ResultBean<AppInfo>> getAppVersion({required String appName}) async {
static Future<TaskResult<AppInfo>> getAppVersion({required String appName}) async {
String errorMsg = "";
var result = await HttpUtil.getInstance()
var result = await HttpUtil.instance
.client
.get(PathUnit.appInfo+"/$appName")
.catchError((err) {
Expand All @@ -19,18 +17,18 @@ class AppInfoApi {
if (result.data != null && result.data['status']) {
// 说明有数据
if (result.data['data'] != null) {
return ResultBean.ok<AppInfo>(
AppInfo(
return TaskResult.success(
data: AppInfo(
appName: result.data['data']['appName'],
appVersion: result.data['data']['appVersion'],
appUrl: result.data['data']['appUrl'],
appSize: result.data['data']['appSize'],
));
} else {
return ResultBean.ok<AppInfo>(null);
return const TaskResult.success(data: null);
}
}
return ResultBean.error('请求错误: $errorMsg');
return TaskResult.error(msg: '请求错误: $errorMsg');
}
}

Expand Down
21 changes: 10 additions & 11 deletions lib/point_system/api/category_api.dart
Original file line number Diff line number Diff line change
@@ -1,33 +1,32 @@
import 'package:app_config/app_config.dart';
import 'package:utils/utils.dart';

import 'package:flutter_unit/app/utils/http_utils/http_util.dart';
import 'package:flutter_unit/app/utils/http_utils/result_bean.dart';

/// create by 张风捷特烈 on 2021/2/24
/// contact me by email [email protected]
/// 说明:
class CategoryApi {
static Future<ResultBean<bool>> uploadCategoryData(
static Future<TaskResult<bool>> uploadCategoryData(
{required String data, required String likeData}) async {
String errorMsg = "";

var result = await HttpUtil.getInstance().client.post(
var result = await HttpUtil.instance.client.post(
PathUnit.categoryDataSync,
data: {"data": data, "likeData": likeData}).catchError((err) {
errorMsg = err.toString();
});

if (result.data != null) {
return ResultBean.fromData<bool>(result.data);
return TaskResult.success(data:result.data);
}

return ResultBean.error('请求错误: $errorMsg');
return TaskResult.error(msg: '请求错误: $errorMsg');
}

static Future<ResultBean<CategoryData>> getCategoryData() async {
static Future<TaskResult<CategoryData>> getCategoryData() async {
String errorMsg = "";
var result = await HttpUtil.getInstance()
var result = await HttpUtil.instance
.client
.get(PathUnit.categoryData)
.catchError((err) {
Expand All @@ -39,13 +38,13 @@ class CategoryApi {
if (result.data != null && result.data['status']) {
// 说明有数据
if (result.data['data'] != null) {
return ResultBean.ok<CategoryData>(CategoryData.fromJson(result.data['data']));
return TaskResult.success(data:CategoryData.fromJson(result.data['data']));
} else {
return ResultBean.ok<CategoryData>(null);
return const TaskResult.success(data:null);
}
}

return ResultBean.error('请求错误: $errorMsg');
return TaskResult.error(msg: '请求错误: $errorMsg');
}
}

Expand Down
20 changes: 0 additions & 20 deletions lib/user_system/api/system_api.dart

This file was deleted.

53 changes: 0 additions & 53 deletions lib/user_system/api/user_api.dart

This file was deleted.

Loading

0 comments on commit e4b6123

Please sign in to comment.