diff --git a/lib/main.dart b/lib/main.dart index 15bfa97..6af84ae 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,13 +1,10 @@ // Flutter imports: -import 'package:aku_community_manager/style/apptheme.dart'; -import 'package:aku_community_manager/utils/dev_util.dart'; -import 'package:aku_community_manager/utils/jpush_message_parse.dart'; -import 'package:firebase_core/firebase_core.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; // Package imports: import 'package:bot_toast/bot_toast.dart'; +import 'package:firebase_core/firebase_core.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; @@ -20,7 +17,10 @@ import 'package:aku_community_manager/provider/app_provider.dart'; import 'package:aku_community_manager/provider/fix_provider.dart'; import 'package:aku_community_manager/provider/manage_provider.dart'; import 'package:aku_community_manager/provider/user_provider.dart'; +import 'package:aku_community_manager/style/apptheme.dart'; import 'package:aku_community_manager/ui/splash/splash_page.dart'; +import 'package:aku_community_manager/utils/dev_util.dart'; +import 'package:aku_community_manager/utils/jpush_message_parse.dart'; void main() async { WidgetsFlutterBinding.ensureInitialized(); diff --git a/lib/mock_models/fix/fix_model.dart b/lib/mock_models/fix/fix_model.dart index 1b4134a..dd2f60c 100644 --- a/lib/mock_models/fix/fix_model.dart +++ b/lib/mock_models/fix/fix_model.dart @@ -17,6 +17,7 @@ enum FIX_ENUM { ///已处理 DONE, } + @deprecated class FixModel { static Map managerRoleMap = { @@ -206,6 +207,7 @@ Map fixDateLimitStringMap = { '12小时内处理': FIX_DATE_LIMIT.HOUR_12, '8小时内处理': FIX_DATE_LIMIT.HOUR_8, }; + @deprecated class FixDetailModel { ///报修人 diff --git a/lib/mock_models/users/user_info_model.dart b/lib/mock_models/users/user_info_model.dart index 944acb0..892d8c3 100644 --- a/lib/mock_models/users/user_info_model.dart +++ b/lib/mock_models/users/user_info_model.dart @@ -1,5 +1,6 @@ // Dart imports: import 'dart:io'; + @Deprecated('use ‘canOpertion/canSendTicket/canPickUpTicke/canPass’ instead') enum USER_ROLE { ///管家角色 @@ -17,6 +18,7 @@ enum USER_ROLE { ///无角色 EMPTY, } + @Deprecated('use infoModel instead') class UserInfoModel { String nickName; diff --git a/lib/models/manager/activity_detail_model.dart b/lib/models/manager/activity_detail_model.dart index b2747ad..dd87dd2 100644 --- a/lib/models/manager/activity_detail_model.dart +++ b/lib/models/manager/activity_detail_model.dart @@ -1,6 +1,9 @@ -import 'package:aku_community_manager/models/common/img_model.dart'; +// Package imports: import 'package:common_utils/common_utils.dart'; +// Project imports: +import 'package:aku_community_manager/models/common/img_model.dart'; + class ActivityDetailModel { int id; String title; diff --git a/lib/models/manager/activity_item_model.dart b/lib/models/manager/activity_item_model.dart index 52f0738..4528546 100644 --- a/lib/models/manager/activity_item_model.dart +++ b/lib/models/manager/activity_item_model.dart @@ -1,6 +1,9 @@ -import 'package:aku_community_manager/models/common/img_model.dart'; +// Package imports: import 'package:common_utils/common_utils.dart'; +// Project imports: +import 'package:aku_community_manager/models/common/img_model.dart'; + class ActivityItemModel { int id; String title; diff --git a/lib/models/manager/borrow/borrow_check_item_model.dart b/lib/models/manager/borrow/borrow_check_item_model.dart index 12fc6d1..1b02c8d 100644 --- a/lib/models/manager/borrow/borrow_check_item_model.dart +++ b/lib/models/manager/borrow/borrow_check_item_model.dart @@ -1,3 +1,4 @@ +// Project imports: import 'package:aku_community_manager/models/common/img_model.dart'; class BorrowCheckItemModel { diff --git a/lib/models/manager/borrow/borrow_detail_item_model.dart b/lib/models/manager/borrow/borrow_detail_item_model.dart index 9ebee2e..6430764 100644 --- a/lib/models/manager/borrow/borrow_detail_item_model.dart +++ b/lib/models/manager/borrow/borrow_detail_item_model.dart @@ -1,3 +1,4 @@ +// Project imports: import 'package:aku_community_manager/models/common/img_model.dart'; class BorrowDetailItemModel { diff --git a/lib/models/manager/borrow/borrow_item_detail_model.dart b/lib/models/manager/borrow/borrow_item_detail_model.dart index 0c5db33..4472ca5 100644 --- a/lib/models/manager/borrow/borrow_item_detail_model.dart +++ b/lib/models/manager/borrow/borrow_item_detail_model.dart @@ -1,3 +1,4 @@ +// Project imports: import 'package:aku_community_manager/models/common/img_model.dart'; class BorrowItemDetailModel { diff --git a/lib/models/manager/borrow/borrow_item_model.dart b/lib/models/manager/borrow/borrow_item_model.dart index 6bbff25..4e158f2 100644 --- a/lib/models/manager/borrow/borrow_item_model.dart +++ b/lib/models/manager/borrow/borrow_item_model.dart @@ -1,3 +1,4 @@ +// Project imports: import 'package:aku_community_manager/models/common/img_model.dart'; class BorrowItemModel { diff --git a/lib/models/manager/borrow/borrow_status_item_model.dart b/lib/models/manager/borrow/borrow_status_item_model.dart index 78ae7a7..5a80e81 100644 --- a/lib/models/manager/borrow/borrow_status_item_model.dart +++ b/lib/models/manager/borrow/borrow_status_item_model.dart @@ -1,7 +1,12 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:common_utils/common_utils.dart'; + +// Project imports: import 'package:aku_community_manager/models/common/img_model.dart'; import 'package:aku_community_manager/style/app_style.dart'; -import 'package:common_utils/common_utils.dart'; -import 'package:flutter/material.dart'; class BorrowStatusItemModel { int id; diff --git a/lib/models/manager/bussiness_and_fix/dispatch_detail_model.dart b/lib/models/manager/bussiness_and_fix/dispatch_detail_model.dart index 6ba1219..dddbced 100644 --- a/lib/models/manager/bussiness_and_fix/dispatch_detail_model.dart +++ b/lib/models/manager/bussiness_and_fix/dispatch_detail_model.dart @@ -18,4 +18,4 @@ class DispatchDetialModel { data['remarks'] = this.remarks; return data; } -} \ No newline at end of file +} diff --git a/lib/models/manager/bussiness_and_fix/work_order_type_model.dart b/lib/models/manager/bussiness_and_fix/work_order_type_model.dart index e174288..88c3430 100644 --- a/lib/models/manager/bussiness_and_fix/work_order_type_model.dart +++ b/lib/models/manager/bussiness_and_fix/work_order_type_model.dart @@ -15,4 +15,4 @@ class WorkOrderTypeModel { data['name'] = this.name; return data; } -} \ No newline at end of file +} diff --git a/lib/models/manager/bussiness_and_fix/work_time_limit_model.dart b/lib/models/manager/bussiness_and_fix/work_time_limit_model.dart index c060915..4fe41fb 100644 --- a/lib/models/manager/bussiness_and_fix/work_time_limit_model.dart +++ b/lib/models/manager/bussiness_and_fix/work_time_limit_model.dart @@ -15,4 +15,4 @@ class WorkTimeLimitModel { data['name'] = this.name; return data; } -} \ No newline at end of file +} diff --git a/lib/models/manager/facilities/facilities_card.dart b/lib/models/manager/facilities/facilities_card.dart index 938f537..08cf085 100644 --- a/lib/models/manager/facilities/facilities_card.dart +++ b/lib/models/manager/facilities/facilities_card.dart @@ -1,13 +1,18 @@ -import 'package:aku_community_manager/models/manager/facilities/facilities_inspect_report_page.dart'; -import 'package:aku_community_manager/models/manager/facilities/facilities_map.dart'; -import 'package:aku_community_manager/style/app_style.dart'; -import 'package:aku_community_manager/tools/aku_divider.dart'; -import 'package:aku_ui/common_widgets/aku_material_button.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:aku_ui/common_widgets/aku_material_button.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:velocity_x/velocity_x.dart'; +// Project imports: +import 'package:aku_community_manager/models/manager/facilities/facilities_inspect_report_page.dart'; +import 'package:aku_community_manager/models/manager/facilities/facilities_map.dart'; +import 'package:aku_community_manager/style/app_style.dart'; +import 'package:aku_community_manager/tools/aku_divider.dart'; + class FacilitiesCard extends StatefulWidget { final int index; FacilitiesCard({Key key, this.index}) : super(key: key); diff --git a/lib/models/manager/facilities/facilities_inspect_report_page.dart b/lib/models/manager/facilities/facilities_inspect_report_page.dart index 42a07a3..c31bf1a 100644 --- a/lib/models/manager/facilities/facilities_inspect_report_page.dart +++ b/lib/models/manager/facilities/facilities_inspect_report_page.dart @@ -1,14 +1,20 @@ +// Dart imports: import 'dart:io'; +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:aku_ui/common_widgets/aku_button.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:velocity_x/velocity_x.dart'; + +// Project imports: import 'package:aku_community_manager/models/manager/facilities/facilities_map.dart'; import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/ui/widgets/app_widgets/aku_pick_image_widget.dart'; import 'package:aku_community_manager/ui/widgets/app_widgets/aku_single_check_button.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; -import 'package:aku_ui/common_widgets/aku_button.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:velocity_x/velocity_x.dart'; class FacilitiesInspectReportPage extends StatefulWidget { FacilitiesInspectReportPage({Key key}) : super(key: key); diff --git a/lib/models/manager/facilities/facilities_map.dart b/lib/models/manager/facilities/facilities_map.dart index 32c32a5..3b939ae 100644 --- a/lib/models/manager/facilities/facilities_map.dart +++ b/lib/models/manager/facilities/facilities_map.dart @@ -1,8 +1,11 @@ +// Flutter imports: import 'package:flutter/material.dart'; + ///设施检查相关map class FacilitiesMap { ///设施检查状态 static Map inspectStatus = {1: '待检查', 2: '未完成', 3: '已检查'}; + ///设施检查状态的文字颜色 static Map insepectColor = { 1: Color(0xFFF49F02), diff --git a/lib/models/manager/facilities/facilities_page.dart b/lib/models/manager/facilities/facilities_page.dart index f181efa..5ab3e79 100644 --- a/lib/models/manager/facilities/facilities_page.dart +++ b/lib/models/manager/facilities/facilities_page.dart @@ -1,10 +1,15 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:velocity_x/velocity_x.dart'; + +// Project imports: import 'package:aku_community_manager/models/manager/facilities/facilities_view.dart'; import 'package:aku_community_manager/tools/user_tool.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; import 'package:aku_community_manager/ui/widgets/inner/aku_tab_bar.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:velocity_x/velocity_x.dart'; class FacilitiesPage extends StatefulWidget { FacilitiesPage({Key key}) : super(key: key); @@ -45,7 +50,11 @@ class _FacilitiesPageState extends State ), body: TabBarView( controller: _tabController, - children: List.generate(_tabs.length, (index) => FacilitiesView(index: index,)), + children: List.generate( + _tabs.length, + (index) => FacilitiesView( + index: index, + )), ), ); } diff --git a/lib/models/manager/facilities/facilities_view.dart b/lib/models/manager/facilities/facilities_view.dart index 701279e..b235266 100644 --- a/lib/models/manager/facilities/facilities_view.dart +++ b/lib/models/manager/facilities/facilities_view.dart @@ -1,7 +1,12 @@ -import 'package:aku_community_manager/models/manager/facilities/facilities_card.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_screenutil/flutter_screenutil.dart'; +// Project imports: +import 'package:aku_community_manager/models/manager/facilities/facilities_card.dart'; + class FacilitiesView extends StatefulWidget { final int index; FacilitiesView({Key key, this.index}) : super(key: key); diff --git a/lib/models/manager/goods_out/goods_out_detail_model.dart b/lib/models/manager/goods_out/goods_out_detail_model.dart index 27a22d9..18d5d74 100644 --- a/lib/models/manager/goods_out/goods_out_detail_model.dart +++ b/lib/models/manager/goods_out/goods_out_detail_model.dart @@ -1,7 +1,12 @@ -import 'package:aku_community_manager/models/common/img_model.dart'; -import 'package:common_utils/common_utils.dart'; +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: +import 'package:common_utils/common_utils.dart'; + +// Project imports: +import 'package:aku_community_manager/models/common/img_model.dart'; + // * id 物品出户主键id // * status 状态(1.待出门，2.已出门，3.驳回申请) // * roomName 详细地址（房产名称） diff --git a/lib/models/manager/goods_out/goods_out_item_model.dart b/lib/models/manager/goods_out/goods_out_item_model.dart index 4bedeac..8fdcad2 100644 --- a/lib/models/manager/goods_out/goods_out_item_model.dart +++ b/lib/models/manager/goods_out/goods_out_item_model.dart @@ -1,6 +1,9 @@ -import 'package:common_utils/common_utils.dart'; +// Flutter imports: import 'package:flutter/material.dart'; +// Package imports: +import 'package:common_utils/common_utils.dart'; + /// * id 物品出户主键id /// * status 状态(1.待出门，2.已出门，3.驳回申请) /// * roomName 详细地址（房产名称） diff --git a/lib/models/manager/inspection/inspection_check_detail_model.dart b/lib/models/manager/inspection/inspection_check_detail_model.dart index 9c170a4..4af5097 100644 --- a/lib/models/manager/inspection/inspection_check_detail_model.dart +++ b/lib/models/manager/inspection/inspection_check_detail_model.dart @@ -1,3 +1,4 @@ +// Project imports: import 'package:aku_community_manager/models/common/img_model.dart'; class InspectionCheckDetialModel { diff --git a/lib/models/manager/inspection/inspection_point_submit_model.dart b/lib/models/manager/inspection/inspection_point_submit_model.dart index a658d8f..6e1273b 100644 --- a/lib/models/manager/inspection/inspection_point_submit_model.dart +++ b/lib/models/manager/inspection/inspection_point_submit_model.dart @@ -1,3 +1,4 @@ +// Dart imports: import 'dart:io'; class InspectionPointSubmitModel { @@ -6,9 +7,7 @@ class InspectionPointSubmitModel { List inspectionFaceImgPath; List inspectionSpaceImgPath; InspectionPointSubmitModel(this.executePointId, this.executeCheckList, - { - this.inspectionFaceImgPath, - this.inspectionSpaceImgPath}); + {this.inspectionFaceImgPath, this.inspectionSpaceImgPath}); Map executeCheckListToJson() { final Map data = new Map(); diff --git a/lib/models/manager/rules_manage/rules_manage_list_model.dart b/lib/models/manager/rules_manage/rules_manage_list_model.dart index 0750a4b..b02f5fd 100644 --- a/lib/models/manager/rules_manage/rules_manage_list_model.dart +++ b/lib/models/manager/rules_manage/rules_manage_list_model.dart @@ -21,4 +21,4 @@ class RulesManageListModel { data['releaseDate'] = this.releaseDate; return data; } -} \ No newline at end of file +} diff --git a/lib/models/manager/visitor_item_model.dart b/lib/models/manager/visitor_item_model.dart index b27ae96..d0b326a 100644 --- a/lib/models/manager/visitor_item_model.dart +++ b/lib/models/manager/visitor_item_model.dart @@ -1,3 +1,4 @@ +// Package imports: import 'package:common_utils/common_utils.dart'; class VisitorItemModel { diff --git a/lib/models/message/system_message_detail_model.dart b/lib/models/message/system_message_detail_model.dart index ebab18b..3c6a5db 100644 --- a/lib/models/message/system_message_detail_model.dart +++ b/lib/models/message/system_message_detail_model.dart @@ -21,4 +21,4 @@ class SystemMessageDetailModel { data['type'] = this.type; return data; } -} \ No newline at end of file +} diff --git a/lib/models/message/system_message_item_model.dart b/lib/models/message/system_message_item_model.dart index 261911f..d6bccf0 100644 --- a/lib/models/message/system_message_item_model.dart +++ b/lib/models/message/system_message_item_model.dart @@ -1,3 +1,4 @@ +// Package imports: import 'package:common_utils/common_utils.dart'; class SystemMessageItemModel { diff --git a/lib/models/todo_bussiness/todo_model.dart b/lib/models/todo_bussiness/todo_model.dart index b760095..38063b0 100644 --- a/lib/models/todo_bussiness/todo_model.dart +++ b/lib/models/todo_bussiness/todo_model.dart @@ -1,3 +1,4 @@ +// Project imports: import 'package:aku_community_manager/models/manager/bussiness_and_fix/bussiness_and_fix_model.dart'; import 'package:aku_community_manager/models/todo_bussiness/todo_outdoor_model.dart'; diff --git a/lib/models/todo_bussiness/todo_outdoor_model.dart b/lib/models/todo_bussiness/todo_outdoor_model.dart index 0585fe6..1b76870 100644 --- a/lib/models/todo_bussiness/todo_outdoor_model.dart +++ b/lib/models/todo_bussiness/todo_outdoor_model.dart @@ -1,3 +1,4 @@ +// Flutter imports: import 'package:flutter/material.dart'; class ToDoOutDoorModel { @@ -58,7 +59,7 @@ class ToDoOutDoorModel { } } - Color get statusColor { + Color get statusColor { switch (status) { case 2: return Color(0xFF999999); @@ -67,7 +68,7 @@ class ToDoOutDoorModel { } } - ///identity 身份（1业主，2亲属，3租客） + ///identity 身份（1业主，2亲属，3租客） String get identityValue { switch (identity) { case 1: @@ -80,6 +81,4 @@ class ToDoOutDoorModel { return '未知'; } } - - } diff --git a/lib/provider/app_provider.dart b/lib/provider/app_provider.dart index b2dbc0e..0adf46c 100644 --- a/lib/provider/app_provider.dart +++ b/lib/provider/app_provider.dart @@ -1,13 +1,15 @@ // Flutter imports: -import 'package:aku_community_manager/const/api.dart'; -import 'package:aku_community_manager/utils/network/net_util.dart'; +import 'package:flutter/material.dart'; + +// Package imports: import 'package:amap_flutter_location/amap_flutter_location.dart'; import 'package:amap_flutter_location/amap_location_option.dart'; -import 'package:flutter/material.dart'; +import 'package:dio/dio.dart'; // Project imports: +import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/ui/home/application/applications_page.dart'; -import 'package:dio/dio.dart'; +import 'package:aku_community_manager/utils/network/net_util.dart'; class AppProvider extends ChangeNotifier { List _recentUsedApp = []; diff --git a/lib/provider/outdoor_provider.dart b/lib/provider/outdoor_provider.dart index e69de29..8b13789 100644 --- a/lib/provider/outdoor_provider.dart +++ b/lib/provider/outdoor_provider.dart @@ -0,0 +1 @@ + diff --git a/lib/provider/user_provider.dart b/lib/provider/user_provider.dart index 20d8268..6c72d5e 100644 --- a/lib/provider/user_provider.dart +++ b/lib/provider/user_provider.dart @@ -2,24 +2,26 @@ import 'dart:io'; // Flutter imports: -import 'package:aku_community_manager/provider/app_provider.dart'; -import 'package:aku_community_manager/utils/network/base_file_model.dart'; -import 'package:bot_toast/bot_toast.dart'; import 'package:flutter/material.dart'; +// Package imports: +import 'package:bot_toast/bot_toast.dart'; +import 'package:get/get.dart'; +import 'package:jpush_flutter/jpush_flutter.dart'; +import 'package:provider/provider.dart'; + // Project imports: import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/mock_models/users/user_info_model.dart'; import 'package:aku_community_manager/models/user/user_profile_model.dart'; +import 'package:aku_community_manager/provider/app_provider.dart'; import 'package:aku_community_manager/utils/hive_store.dart'; +import 'package:aku_community_manager/utils/network/base_file_model.dart'; import 'package:aku_community_manager/utils/network/base_model.dart'; import 'package:aku_community_manager/utils/network/net_util.dart'; import 'package:aku_community_manager/models/user/user_info_model.dart' as USER_INFO; -import 'package:get/get.dart'; -import 'package:jpush_flutter/jpush_flutter.dart'; -import 'package:provider/provider.dart'; //登录状态管理 class UserProvider extends ChangeNotifier { diff --git a/lib/style/apptheme.dart b/lib/style/apptheme.dart index d96b50f..6a04140 100644 --- a/lib/style/apptheme.dart +++ b/lib/style/apptheme.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_screenutil/flutter_screenutil.dart'; class AppTheme { diff --git a/lib/tools/aku_divider.dart b/lib/tools/aku_divider.dart index ed1260a..fe0ad33 100644 --- a/lib/tools/aku_divider.dart +++ b/lib/tools/aku_divider.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_screenutil/flutter_screenutil.dart'; class AkuDivider extends StatelessWidget { diff --git a/lib/tools/extensions/list_extension_tool.dart b/lib/tools/extensions/list_extension_tool.dart index fc3e9d7..f845d6d 100644 --- a/lib/tools/extensions/list_extension_tool.dart +++ b/lib/tools/extensions/list_extension_tool.dart @@ -1,6 +1,9 @@ +// Flutter imports: import 'package:flutter/material.dart'; -import 'package:velocity_x/velocity_x.dart'; + +// Package imports: import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:velocity_x/velocity_x.dart'; extension WidgetListExt on List { List sepWidget({Widget separate}) { @@ -12,4 +15,4 @@ extension WidgetListExt on List { return separate ?? 10.w.heightBox; }); } -} \ No newline at end of file +} diff --git a/lib/tools/extensions/router_extension_tool.dart b/lib/tools/extensions/router_extension_tool.dart index 5275c59..97b6e6a 100644 --- a/lib/tools/extensions/router_extension_tool.dart +++ b/lib/tools/extensions/router_extension_tool.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:get/get.dart'; extension PageExt on Widget { diff --git a/lib/tools/user_tool.dart b/lib/tools/user_tool.dart index fed0e9a..828e6f9 100644 --- a/lib/tools/user_tool.dart +++ b/lib/tools/user_tool.dart @@ -1,12 +1,17 @@ -import 'package:aku_community_manager/provider/app_provider.dart'; -import 'package:aku_community_manager/provider/user_provider.dart'; +// Package imports: import 'package:get/get.dart'; import 'package:provider/provider.dart'; + +// Project imports: +import 'package:aku_community_manager/provider/app_provider.dart'; +import 'package:aku_community_manager/provider/user_provider.dart'; + ///获取应用或用户状态 class UserTool { ///应用信息 static AppProvider get appProvider => Provider.of(Get.context, listen: false); + ///用户信息 static UserProvider get userProvider => Provider.of(Get.context, listen: false); diff --git a/lib/ui/home/announcement/All_anouncement.dart b/lib/ui/home/announcement/All_anouncement.dart index 429d44e..219df3c 100644 --- a/lib/ui/home/announcement/All_anouncement.dart +++ b/lib/ui/home/announcement/All_anouncement.dart @@ -2,13 +2,6 @@ import 'dart:ui'; // Flutter imports: -import 'package:aku_community_manager/const/api.dart'; -import 'package:aku_community_manager/models/announce/announcement_detail_model.dart'; -import 'package:aku_community_manager/models/announce/announcement_list_model.dart'; -import 'package:aku_community_manager/tools/widget_tool.dart'; -import 'package:aku_community_manager/ui/widgets/common/bee_list_view.dart'; -import 'package:aku_community_manager/utils/network/base_model.dart'; -import 'package:aku_community_manager/utils/network/net_util.dart'; import 'package:flutter/material.dart'; // Package imports: @@ -18,10 +11,17 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; // Project imports: +import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/const/resource.dart'; +import 'package:aku_community_manager/models/announce/announcement_detail_model.dart'; +import 'package:aku_community_manager/models/announce/announcement_list_model.dart'; import 'package:aku_community_manager/style/app_style.dart'; +import 'package:aku_community_manager/tools/widget_tool.dart'; import 'package:aku_community_manager/ui/home/announcement/anouncement_details.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; +import 'package:aku_community_manager/ui/widgets/common/bee_list_view.dart'; +import 'package:aku_community_manager/utils/network/base_model.dart'; +import 'package:aku_community_manager/utils/network/net_util.dart'; class AllAnouncement extends StatefulWidget { AllAnouncement({Key key}) : super(key: key); diff --git a/lib/ui/home/announcement/anouncement_details.dart b/lib/ui/home/announcement/anouncement_details.dart index a63be68..44c7cda 100644 --- a/lib/ui/home/announcement/anouncement_details.dart +++ b/lib/ui/home/announcement/anouncement_details.dart @@ -1,11 +1,11 @@ // Flutter imports: -import 'package:aku_community_manager/models/announce/announcement_detail_model.dart'; import 'package:flutter/material.dart'; // Package imports: import 'package:flutter_screenutil/flutter_screenutil.dart'; // Project imports: +import 'package:aku_community_manager/models/announce/announcement_detail_model.dart'; import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; diff --git a/lib/ui/home/application/applications_page.dart b/lib/ui/home/application/applications_page.dart index f7a2088..825a88a 100644 --- a/lib/ui/home/application/applications_page.dart +++ b/lib/ui/home/application/applications_page.dart @@ -1,8 +1,4 @@ // Flutter imports: -import 'package:aku_community_manager/models/manager/facilities/facilities_page.dart'; -import 'package:aku_community_manager/ui/manage_pages/key_manage/key_manage_page.dart'; -import 'package:aku_community_manager/ui/manage_pages/packages_manage/packages_manage_page.dart'; -import 'package:aku_community_manager/ui/manage_pages/rules_manage/rules_manage_page.dart'; import 'package:flutter/material.dart'; // Package imports: @@ -12,12 +8,16 @@ import 'package:provider/provider.dart'; // Project imports: import 'package:aku_community_manager/const/resource.dart'; +import 'package:aku_community_manager/models/manager/facilities/facilities_page.dart'; import 'package:aku_community_manager/provider/app_provider.dart'; import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/tools/screen_tool.dart'; import 'package:aku_community_manager/tools/widget_tool.dart'; import 'package:aku_community_manager/ui/manage_pages/green_manage/green_manage_page.dart'; import 'package:aku_community_manager/ui/manage_pages/inspection_manage/inspection_manage_page.dart'; +import 'package:aku_community_manager/ui/manage_pages/key_manage/key_manage_page.dart'; +import 'package:aku_community_manager/ui/manage_pages/packages_manage/packages_manage_page.dart'; +import 'package:aku_community_manager/ui/manage_pages/rules_manage/rules_manage_page.dart'; import 'package:aku_community_manager/ui/sub_pages/activity_manager/activity_manager_page.dart'; import 'package:aku_community_manager/ui/sub_pages/borrow_manager/borrow_manager_page.dart'; import 'package:aku_community_manager/ui/sub_pages/business_and_fix/business_and_fix_page.dart'; @@ -54,27 +54,37 @@ class _ApplicationPageState extends State List _recommandApplications = [ AppApplication( - '活动管理', R.ASSETS_HOME_IC_ACTIVITY_PNG, ()=>ActivityManagerPage()), - AppApplication('访客管理', R.ASSETS_HOME_IC_VISITORS_PNG, ()=>VisitorManagerPage()), - AppApplication('借还管理', R.ASSETS_HOME_IC_BORROW_PNG, ()=>BorrowManagerPage()), - AppApplication('一键报警', R.ASSETS_HOME_IC_POLICE_PNG, ()=>WarningPage()), + '活动管理', R.ASSETS_HOME_IC_ACTIVITY_PNG, () => ActivityManagerPage()), + AppApplication( + '访客管理', R.ASSETS_HOME_IC_VISITORS_PNG, () => VisitorManagerPage()), + AppApplication( + '借还管理', R.ASSETS_HOME_IC_BORROW_PNG, () => BorrowManagerPage()), + AppApplication('一键报警', R.ASSETS_HOME_IC_POLICE_PNG, () => WarningPage()), ]; List _wisdomApplications = [ - AppApplication('一键报警', R.ASSETS_HOME_IC_POLICE_PNG, ()=>WarningPage()), - AppApplication('访客管理', R.ASSETS_HOME_IC_VISITORS_PNG, ()=>VisitorManagerPage()), - AppApplication('报事报修', R.ASSETS_HOME_IC_SERVICE_PNG, ()=>BusinessAndFixPage()), - AppApplication('物品出户', R.ASSETS_HOME_IC_ARTICLE_PNG, ()=>ItemsOutdoorPage()), + AppApplication('一键报警', R.ASSETS_HOME_IC_POLICE_PNG, () => WarningPage()), + AppApplication( + '访客管理', R.ASSETS_HOME_IC_VISITORS_PNG, () => VisitorManagerPage()), + AppApplication( + '报事报修', R.ASSETS_HOME_IC_SERVICE_PNG, () => BusinessAndFixPage()), + AppApplication( + '物品出户', R.ASSETS_HOME_IC_ARTICLE_PNG, () => ItemsOutdoorPage()), + AppApplication( + '装修管理', R.ASSETS_HOME_IC_DECORATION_PNG, () => DecorationManagerPage()), + AppApplication( + '活动管理', R.ASSETS_HOME_IC_ACTIVITY_PNG, () => ActivityManagerPage()), + AppApplication( + '借还管理', R.ASSETS_HOME_IC_BORROW_PNG, () => BorrowManagerPage()), + AppApplication( + '巡检管理', R.ASSETS_HOME_IC_PATROL_PNG, () => InspectionManagePage()), + AppApplication( + '绿化管理', R.ASSETS_HOME_IC_GREENING_PNG, () => GreenManagePage()), AppApplication( - '装修管理', R.ASSETS_HOME_IC_DECORATION_PNG, ()=> DecorationManagerPage()), + '设施检查', R.ASSETS_HOME_IC_FACILITIES_PNG, () => FacilitiesPage()), AppApplication( - '活动管理', R.ASSETS_HOME_IC_ACTIVITY_PNG, ()=> ActivityManagerPage()), - AppApplication('借还管理', R.ASSETS_HOME_IC_BORROW_PNG, ()=>BorrowManagerPage()), - AppApplication('巡检管理', R.ASSETS_HOME_IC_PATROL_PNG, ()=>InspectionManagePage()), - AppApplication('绿化管理', R.ASSETS_HOME_IC_GREENING_PNG, ()=>GreenManagePage()), - AppApplication('设施检查', R.ASSETS_HOME_IC_FACILITIES_PNG, ()=> FacilitiesPage()), - AppApplication('包裹管理', R.ASSETS_HOME_PACKAGE_PNG, ()=> PackagesManagePage()), - AppApplication('钥匙管理', R.ASSETS_HOME_KEY_PNG, ()=> KeyManagePage()), - AppApplication('规程管理', R.ASSETS_HOME_RULES_PNG, ()=> RulesManagePage()) + '包裹管理', R.ASSETS_HOME_PACKAGE_PNG, () => PackagesManagePage()), + AppApplication('钥匙管理', R.ASSETS_HOME_KEY_PNG, () => KeyManagePage()), + AppApplication('规程管理', R.ASSETS_HOME_RULES_PNG, () => RulesManagePage()) ]; @override diff --git a/lib/ui/home/business/business_page.dart b/lib/ui/home/business/business_page.dart index a2807c4..a74098d 100644 --- a/lib/ui/home/business/business_page.dart +++ b/lib/ui/home/business/business_page.dart @@ -1,13 +1,13 @@ // Flutter imports: -import 'package:aku_community_manager/models/manager/bussiness_and_fix/bussiness_and_fix_model.dart'; -import 'package:aku_community_manager/models/manager/decoration/decoration_list_model.dart'; -import 'package:aku_community_manager/ui/home/business/business_view.dart'; import 'package:flutter/material.dart'; // Project imports: import 'package:aku_community_manager/mock_models/all_model.dart'; +import 'package:aku_community_manager/models/manager/bussiness_and_fix/bussiness_and_fix_model.dart'; +import 'package:aku_community_manager/models/manager/decoration/decoration_list_model.dart'; import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/tools/screen_tool.dart'; +import 'package:aku_community_manager/ui/home/business/business_view.dart'; import 'package:aku_community_manager/ui/sub_pages/business_and_fix/business_fix_card.dart'; import 'package:aku_community_manager/ui/sub_pages/decoration_manager/decoration_manager_card.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; diff --git a/lib/ui/home/business/business_view.dart b/lib/ui/home/business/business_view.dart index 7fe71be..75b128f 100644 --- a/lib/ui/home/business/business_view.dart +++ b/lib/ui/home/business/business_view.dart @@ -1,3 +1,12 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:dio/dio.dart'; +import 'package:flutter_easyrefresh/easy_refresh.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; + +// Project imports: import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/models/manager/bussiness_and_fix/bussiness_and_fix_model.dart'; import 'package:aku_community_manager/models/todo_bussiness/todo_model.dart'; @@ -6,10 +15,6 @@ import 'package:aku_community_manager/ui/home/business/bussiness_func.dart'; import 'package:aku_community_manager/ui/home/business/todo_outdoor_card.dart'; import 'package:aku_community_manager/ui/sub_pages/business_and_fix/business_fix_card.dart'; import 'package:aku_community_manager/utils/network/net_util.dart'; -import 'package:dio/dio.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; class BussinessView extends StatefulWidget { final int backlogStatus; diff --git a/lib/ui/home/business/bussiness_func.dart b/lib/ui/home/business/bussiness_func.dart index 049d47f..485873a 100644 --- a/lib/ui/home/business/bussiness_func.dart +++ b/lib/ui/home/business/bussiness_func.dart @@ -1,8 +1,11 @@ +// Package imports: +import 'package:dio/dio.dart'; + +// Project imports: import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/utils/network/net_util.dart'; -import 'package:dio/dio.dart'; -class BussinessFunc{ +class BussinessFunc { static Future getBussinessModelList(int backlogStatus) async { Response response = await NetUtil().dio.get(API.manage.backlogList, queryParameters: { @@ -10,4 +13,4 @@ class BussinessFunc{ }); return response.data['data'] as List; } -} \ No newline at end of file +} diff --git a/lib/ui/home/business/todo_outdoor_card.dart b/lib/ui/home/business/todo_outdoor_card.dart index 35427b8..b5e1f16 100644 --- a/lib/ui/home/business/todo_outdoor_card.dart +++ b/lib/ui/home/business/todo_outdoor_card.dart @@ -1,12 +1,17 @@ -import 'package:aku_community_manager/models/todo_bussiness/todo_outdoor_model.dart'; -import 'package:aku_community_manager/style/app_style.dart'; -import 'package:aku_community_manager/ui/sub_pages/items_outdoor/items_outdoor_details_page.dart'; -import 'package:aku_ui/aku_ui.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:aku_ui/aku_ui.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:velocity_x/velocity_x.dart'; +// Project imports: +import 'package:aku_community_manager/models/todo_bussiness/todo_outdoor_model.dart'; +import 'package:aku_community_manager/style/app_style.dart'; +import 'package:aku_community_manager/ui/sub_pages/items_outdoor/items_outdoor_details_page.dart'; + class ToDoOutDoorCard extends StatefulWidget { final ToDoOutDoorModel model; final VoidCallback callRefresh; diff --git a/lib/ui/home/home_page.dart b/lib/ui/home/home_page.dart index f12898b..adbd5b5 100644 --- a/lib/ui/home/home_page.dart +++ b/lib/ui/home/home_page.dart @@ -1,42 +1,40 @@ // Flutter imports: -import 'package:aku_community_manager/const/api.dart'; -import 'package:aku_community_manager/models/announce/announcement_list_model.dart'; -import 'package:aku_community_manager/models/manager/bussiness_and_fix/bussiness_and_fix_model.dart'; -import 'package:aku_community_manager/models/manager/item_num_model.dart'; -import 'package:aku_community_manager/models/todo_bussiness/todo_model.dart'; -import 'package:aku_community_manager/models/todo_bussiness/todo_outdoor_model.dart'; -import 'package:aku_community_manager/tools/user_tool.dart'; -import 'package:aku_community_manager/ui/home/business/bussiness_func.dart'; -import 'package:aku_community_manager/ui/home/business/todo_outdoor_card.dart'; -import 'package:aku_community_manager/utils/network/base_list_model.dart'; -import 'package:aku_community_manager/utils/network/net_util.dart'; -import 'package:badges/badges.dart'; -import 'package:dio/dio.dart'; -import 'package:firebase_crashlytics/firebase_crashlytics.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; -import 'package:shimmer/shimmer.dart'; -import 'package:velocity_x/velocity_x.dart'; // Package imports: import 'package:aku_ui/aku_ui.dart'; import 'package:aku_ui/common_widgets/aku_material_button.dart'; +import 'package:badges/badges.dart'; import 'package:carousel_slider/carousel_slider.dart'; +import 'package:dio/dio.dart'; +import 'package:firebase_crashlytics/firebase_crashlytics.dart'; +import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart' hide Response; import 'package:provider/provider.dart'; +import 'package:shimmer/shimmer.dart'; +import 'package:velocity_x/velocity_x.dart'; // Project imports: +import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/const/resource.dart'; +import 'package:aku_community_manager/models/announce/announcement_list_model.dart'; +import 'package:aku_community_manager/models/manager/bussiness_and_fix/bussiness_and_fix_model.dart'; +import 'package:aku_community_manager/models/manager/item_num_model.dart'; +import 'package:aku_community_manager/models/todo_bussiness/todo_model.dart'; +import 'package:aku_community_manager/models/todo_bussiness/todo_outdoor_model.dart'; import 'package:aku_community_manager/provider/app_provider.dart'; import 'package:aku_community_manager/provider/user_provider.dart'; import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/tools/screen_tool.dart'; +import 'package:aku_community_manager/tools/user_tool.dart'; import 'package:aku_community_manager/tools/widget_tool.dart'; import 'package:aku_community_manager/ui/home/announcement/All_anouncement.dart'; import 'package:aku_community_manager/ui/home/application/applications_page.dart'; import 'package:aku_community_manager/ui/home/business/business_page.dart'; +import 'package:aku_community_manager/ui/home/business/bussiness_func.dart'; +import 'package:aku_community_manager/ui/home/business/todo_outdoor_card.dart'; import 'package:aku_community_manager/ui/home/messages/message.dart'; import 'package:aku_community_manager/ui/home/personal_draw.dart'; import 'package:aku_community_manager/ui/home/search_workorder_page.dart'; @@ -47,6 +45,8 @@ import 'package:aku_community_manager/ui/sub_pages/business_and_fix/business_fix import 'package:aku_community_manager/ui/sub_pages/visitor_manager/visitor_manager_page.dart'; import 'package:aku_community_manager/ui/tool_pages/warning/warning_page.dart'; import 'package:aku_community_manager/ui/widgets/app_widgets/aku_avatar.dart'; +import 'package:aku_community_manager/utils/network/base_list_model.dart'; +import 'package:aku_community_manager/utils/network/net_util.dart'; class HomePage extends StatefulWidget { HomePage({ @@ -181,8 +181,8 @@ class _HomePageState extends State { final userProvider = Provider.of(context); final appProvider = Provider.of(context); var loadingWidget = Center( - // child: CircularProgressIndicator(), - ); + // child: CircularProgressIndicator(), + ); return AnnotatedRegion( child: Scaffold( drawer: PersonalDraw(), diff --git a/lib/ui/home/messages/comment_message.dart b/lib/ui/home/messages/comment_message.dart index 4e211e7..53c83b8 100644 --- a/lib/ui/home/messages/comment_message.dart +++ b/lib/ui/home/messages/comment_message.dart @@ -1,18 +1,18 @@ // Flutter imports: -import 'package:aku_community_manager/const/api.dart'; -import 'package:aku_community_manager/models/message/comment_message_item_model.dart'; -import 'package:aku_community_manager/ui/home/messages/comment_message_card.dart'; -import 'package:aku_community_manager/ui/widgets/common/bee_list_view.dart'; import 'package:flutter/material.dart'; -import 'package:velocity_x/velocity_x.dart'; // Package imports: import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:velocity_x/velocity_x.dart'; // Project imports: +import 'package:aku_community_manager/const/api.dart'; +import 'package:aku_community_manager/models/message/comment_message_item_model.dart'; import 'package:aku_community_manager/style/app_style.dart'; +import 'package:aku_community_manager/ui/home/messages/comment_message_card.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; +import 'package:aku_community_manager/ui/widgets/common/bee_list_view.dart'; class CommentMessage extends StatefulWidget { CommentMessage({Key key}) : super(key: key); @@ -36,7 +36,7 @@ class _CommentMessageState extends State { .toList(), builder: (items) { return ListView.separated( - padding: EdgeInsets.symmetric(horizontal: 32.w), + padding: EdgeInsets.symmetric(horizontal: 32.w), itemBuilder: (context, index) { return CommentMessageCard(itemModel: items[index]); }, diff --git a/lib/ui/home/messages/comment_message_card.dart b/lib/ui/home/messages/comment_message_card.dart index be47dbd..7a03ad5 100644 --- a/lib/ui/home/messages/comment_message_card.dart +++ b/lib/ui/home/messages/comment_message_card.dart @@ -1,14 +1,19 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:aku_ui/aku_ui.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:shimmer/shimmer.dart'; +import 'package:velocity_x/velocity_x.dart'; + +// Project imports: import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/models/message/comment_message_detail_model.dart'; import 'package:aku_community_manager/models/message/comment_message_item_model.dart'; import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/utils/network/base_model.dart'; import 'package:aku_community_manager/utils/network/net_util.dart'; -import 'package:aku_ui/aku_ui.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:shimmer/shimmer.dart'; -import 'package:velocity_x/velocity_x.dart'; class CommentMessageCard extends StatefulWidget { final CommentMessageItemModel itemModel; diff --git a/lib/ui/home/messages/message.dart b/lib/ui/home/messages/message.dart index f6527c2..dac5b8c 100644 --- a/lib/ui/home/messages/message.dart +++ b/lib/ui/home/messages/message.dart @@ -1,22 +1,22 @@ // Flutter imports: -import 'package:aku_community_manager/provider/app_provider.dart'; -import 'package:dio/dio.dart'; import 'package:flutter/material.dart'; // Package imports: import 'package:aku_ui/aku_ui.dart'; +import 'package:dio/dio.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart' hide Response; import 'package:get/instance_manager.dart'; +import 'package:provider/provider.dart'; // Project imports: import 'package:aku_community_manager/const/resource.dart'; +import 'package:aku_community_manager/provider/app_provider.dart'; import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/ui/home/messages/comment_message.dart'; import 'package:aku_community_manager/ui/home/messages/system_message.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; -import 'package:provider/provider.dart'; class Message extends StatefulWidget { Message({Key key}) : super(key: key); diff --git a/lib/ui/home/messages/system_message.dart b/lib/ui/home/messages/system_message.dart index 2653b98..915e2d6 100644 --- a/lib/ui/home/messages/system_message.dart +++ b/lib/ui/home/messages/system_message.dart @@ -1,18 +1,18 @@ // Flutter imports: -import 'package:aku_community_manager/const/api.dart'; -import 'package:aku_community_manager/models/message/system_message_item_model.dart'; -import 'package:aku_community_manager/ui/home/messages/systen_message_card.dart'; -import 'package:aku_community_manager/ui/widgets/common/bee_list_view.dart'; import 'package:flutter/material.dart'; -import 'package:velocity_x/velocity_x.dart'; // Package imports: import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:velocity_x/velocity_x.dart'; // Project imports: +import 'package:aku_community_manager/const/api.dart'; +import 'package:aku_community_manager/models/message/system_message_item_model.dart'; import 'package:aku_community_manager/style/app_style.dart'; +import 'package:aku_community_manager/ui/home/messages/systen_message_card.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; +import 'package:aku_community_manager/ui/widgets/common/bee_list_view.dart'; class SystemMessage extends StatefulWidget { SystemMessage({Key key}) : super(key: key); @@ -24,7 +24,6 @@ class SystemMessage extends StatefulWidget { class _SystemMessageState extends State { EasyRefreshController _refreshController = EasyRefreshController(); - @override Widget build(BuildContext context) { return AkuScaffold( @@ -33,9 +32,11 @@ class _SystemMessageState extends State { controller: _refreshController, builder: (items) { return ListView.separated( - padding: EdgeInsets.symmetric(horizontal: 32.w), + padding: EdgeInsets.symmetric(horizontal: 32.w), itemBuilder: (context, index) { - return SystemMessageCard(model: items[index],); + return SystemMessageCard( + model: items[index], + ); }, separatorBuilder: (context, index) { return 10.w.heightBox; diff --git a/lib/ui/home/messages/systen_message_card.dart b/lib/ui/home/messages/systen_message_card.dart index 778d014..20ef69d 100644 --- a/lib/ui/home/messages/systen_message_card.dart +++ b/lib/ui/home/messages/systen_message_card.dart @@ -1,3 +1,14 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:aku_ui/aku_ui.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:get/get.dart'; +import 'package:shimmer/shimmer.dart'; +import 'package:velocity_x/velocity_x.dart'; + +// Project imports: import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/models/message/system_message_detail_model.dart'; import 'package:aku_community_manager/models/message/system_message_item_model.dart'; @@ -5,12 +16,6 @@ import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/ui/sub_pages/business_and_fix/business_and_fix_page.dart'; import 'package:aku_community_manager/utils/network/base_model.dart'; import 'package:aku_community_manager/utils/network/net_util.dart'; -import 'package:aku_ui/aku_ui.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; -import 'package:velocity_x/velocity_x.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:shimmer/shimmer.dart'; class SystemMessageCard extends StatefulWidget { final SystemMessageItemModel model; diff --git a/lib/ui/home/search_workorder_page.dart b/lib/ui/home/search_workorder_page.dart index a3f3657..811ac9d 100644 --- a/lib/ui/home/search_workorder_page.dart +++ b/lib/ui/home/search_workorder_page.dart @@ -1,5 +1,17 @@ // Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:aku_ui/common_widgets/aku_material_button.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:get/get.dart'; +import 'package:provider/provider.dart'; + +// Project imports: +import 'package:aku_community_manager/const/resource.dart'; import 'package:aku_community_manager/provider/app_provider.dart'; +import 'package:aku_community_manager/style/app_style.dart'; +import 'package:aku_community_manager/tools/widget_tool.dart'; import 'package:aku_community_manager/ui/home/application/applications_page.dart'; import 'package:aku_community_manager/ui/manage_pages/green_manage/green_manage_page.dart'; import 'package:aku_community_manager/ui/manage_pages/inspection_manage/inspection_manage_page.dart'; @@ -10,18 +22,6 @@ import 'package:aku_community_manager/ui/sub_pages/decoration_manager/decoration import 'package:aku_community_manager/ui/sub_pages/items_outdoor/items_outdoor_page.dart'; import 'package:aku_community_manager/ui/sub_pages/visitor_manager/visitor_manager_page.dart'; import 'package:aku_community_manager/ui/tool_pages/warning/warning_page.dart'; -import 'package:aku_ui/common_widgets/aku_material_button.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; -import 'package:provider/provider.dart'; - -// Package imports: -import 'package:flutter_screenutil/flutter_screenutil.dart'; - -// Project imports: -import 'package:aku_community_manager/const/resource.dart'; -import 'package:aku_community_manager/style/app_style.dart'; -import 'package:aku_community_manager/tools/widget_tool.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_back_button.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; diff --git a/lib/ui/manage_pages/inspection_manage/inspection_manage_card.dart b/lib/ui/manage_pages/inspection_manage/inspection_manage_card.dart index 5be41b2..2f12360 100644 --- a/lib/ui/manage_pages/inspection_manage/inspection_manage_card.dart +++ b/lib/ui/manage_pages/inspection_manage/inspection_manage_card.dart @@ -1,13 +1,18 @@ -import 'package:aku_community_manager/models/manager/inspection/inspection_list_model.dart'; -import 'package:aku_community_manager/provider/user_provider.dart'; -import 'package:aku_community_manager/style/app_style.dart'; -import 'package:aku_community_manager/ui/manage_pages/inspection_manage/inspection_manage_details_page.dart'; +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: import 'package:aku_ui/aku_ui.dart'; import 'package:common_utils/common_utils.dart'; -import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:provider/provider.dart'; import 'package:velocity_x/velocity_x.dart'; + +// Project imports: +import 'package:aku_community_manager/models/manager/inspection/inspection_list_model.dart'; +import 'package:aku_community_manager/provider/user_provider.dart'; +import 'package:aku_community_manager/style/app_style.dart'; +import 'package:aku_community_manager/ui/manage_pages/inspection_manage/inspection_manage_details_page.dart'; import 'package:aku_community_manager/utils/extension/aku_date.dart'; class InspectionManageCard extends StatefulWidget { diff --git a/lib/ui/manage_pages/inspection_manage/inspection_manage_details_page.dart b/lib/ui/manage_pages/inspection_manage/inspection_manage_details_page.dart index 8c8241a..1231cb2 100644 --- a/lib/ui/manage_pages/inspection_manage/inspection_manage_details_page.dart +++ b/lib/ui/manage_pages/inspection_manage/inspection_manage_details_page.dart @@ -1,38 +1,40 @@ -// Flutter imports: +// Dart imports: import 'dart:async'; -import 'package:aku_community_manager/const/api.dart'; -import 'package:aku_community_manager/models/manager/inspection/inspection_detail_model.dart'; -import 'package:aku_community_manager/models/manager/inspection/inspection_point_model.dart'; -import 'package:aku_community_manager/models/manager/inspection/inspection_qrcode_model.dart'; -import 'package:aku_community_manager/provider/app_provider.dart'; -import 'package:aku_community_manager/ui/manage_pages/inspection_manage/inspection_point_detail_page.dart'; -import 'package:aku_community_manager/ui/manage_pages/inspection_manage/inspection_point_input_page.dart'; -import 'package:aku_community_manager/ui/manage_pages/inspection_manage/qr_code_parase.dart'; -import 'package:aku_community_manager/ui/manage_pages/inspection_manage/qr_scanner_page.dart'; -import 'package:aku_community_manager/ui/sub_pages/manage_func.dart'; -import 'package:aku_community_manager/ui/tool_pages/warning/warning_page.dart'; -import 'package:aku_community_manager/utils/network/base_model.dart'; -import 'package:aku_community_manager/utils/network/net_util.dart'; +// Flutter imports: +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +// Package imports: import 'package:aku_ui/aku_ui.dart'; import 'package:amap_flutter_base/amap_flutter_base.dart'; import 'package:amap_flutter_map/amap_flutter_map.dart'; import 'package:bot_toast/bot_toast.dart'; import 'package:common_utils/common_utils.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:provider/provider.dart'; import 'package:qr_code_scanner/qr_code_scanner.dart'; import 'package:velocity_x/velocity_x.dart'; -import 'package:aku_community_manager/utils/extension/list_extension.dart'; -import 'package:aku_community_manager/style/app_style.dart'; -// Package imports: -import 'package:flutter_screenutil/flutter_screenutil.dart'; // Project imports: +import 'package:aku_community_manager/const/api.dart'; +import 'package:aku_community_manager/models/manager/inspection/inspection_detail_model.dart'; +import 'package:aku_community_manager/models/manager/inspection/inspection_point_model.dart'; +import 'package:aku_community_manager/models/manager/inspection/inspection_qrcode_model.dart'; +import 'package:aku_community_manager/provider/app_provider.dart'; +import 'package:aku_community_manager/style/app_style.dart'; +import 'package:aku_community_manager/ui/manage_pages/inspection_manage/inspection_point_detail_page.dart'; +import 'package:aku_community_manager/ui/manage_pages/inspection_manage/inspection_point_input_page.dart'; +import 'package:aku_community_manager/ui/manage_pages/inspection_manage/qr_code_parase.dart'; +import 'package:aku_community_manager/ui/manage_pages/inspection_manage/qr_scanner_page.dart'; +import 'package:aku_community_manager/ui/sub_pages/manage_func.dart'; +import 'package:aku_community_manager/ui/tool_pages/warning/warning_page.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; +import 'package:aku_community_manager/utils/extension/list_extension.dart'; +import 'package:aku_community_manager/utils/network/base_model.dart'; +import 'package:aku_community_manager/utils/network/net_util.dart'; class InspectionManageDetailsPage extends StatefulWidget { final int executeId; diff --git a/lib/ui/manage_pages/inspection_manage/inspection_manage_page.dart b/lib/ui/manage_pages/inspection_manage/inspection_manage_page.dart index 44f145c..10de19d 100644 --- a/lib/ui/manage_pages/inspection_manage/inspection_manage_page.dart +++ b/lib/ui/manage_pages/inspection_manage/inspection_manage_page.dart @@ -1,15 +1,17 @@ // Flutter imports: -import 'package:aku_community_manager/provider/user_provider.dart'; -import 'package:aku_community_manager/ui/manage_pages/inspection_manage/inspection_manage_view.dart'; -import 'package:aku_community_manager/ui/widgets/inner/aku_tab_bar.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:provider/provider.dart'; // Package imports: +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:provider/provider.dart'; // Project imports: +import 'package:aku_community_manager/provider/user_provider.dart'; +import 'package:aku_community_manager/ui/manage_pages/inspection_manage/inspection_manage_view.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; +import 'package:aku_community_manager/ui/widgets/inner/aku_tab_bar.dart'; + +// Package imports: class InspectionManagePage extends StatefulWidget { InspectionManagePage({Key key}) : super(key: key); diff --git a/lib/ui/manage_pages/inspection_manage/inspection_manage_view.dart b/lib/ui/manage_pages/inspection_manage/inspection_manage_view.dart index ae4363f..6509d74 100644 --- a/lib/ui/manage_pages/inspection_manage/inspection_manage_view.dart +++ b/lib/ui/manage_pages/inspection_manage/inspection_manage_view.dart @@ -1,12 +1,17 @@ -import 'package:aku_community_manager/const/api.dart'; -import 'package:aku_community_manager/models/manager/inspection/inspection_list_model.dart'; -import 'package:aku_community_manager/ui/manage_pages/inspection_manage/inspection_manage_card.dart'; -import 'package:aku_community_manager/ui/widgets/common/bee_list_view.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:velocity_x/velocity_x.dart'; +// Project imports: +import 'package:aku_community_manager/const/api.dart'; +import 'package:aku_community_manager/models/manager/inspection/inspection_list_model.dart'; +import 'package:aku_community_manager/ui/manage_pages/inspection_manage/inspection_manage_card.dart'; +import 'package:aku_community_manager/ui/widgets/common/bee_list_view.dart'; + class InspectionMangeView extends StatefulWidget { final int inspectionStatus; InspectionMangeView({Key key, this.inspectionStatus}) : super(key: key); diff --git a/lib/ui/manage_pages/inspection_manage/inspection_point_detail_page.dart b/lib/ui/manage_pages/inspection_manage/inspection_point_detail_page.dart index 9ea24ef..a49cf1c 100644 --- a/lib/ui/manage_pages/inspection_manage/inspection_point_detail_page.dart +++ b/lib/ui/manage_pages/inspection_manage/inspection_point_detail_page.dart @@ -1,3 +1,14 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:common_utils/common_utils.dart'; +import 'package:dotted_border/dotted_border.dart'; +import 'package:flutter_easyrefresh/easy_refresh.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:velocity_x/velocity_x.dart'; + +// Project imports: import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/models/common/img_model.dart'; import 'package:aku_community_manager/models/manager/inspection/inspection_check_detail_model.dart'; @@ -6,12 +17,6 @@ import 'package:aku_community_manager/ui/manage_pages/inspection_manage/inspecti import 'package:aku_community_manager/ui/sub_pages/manage_func.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; import 'package:aku_community_manager/utils/network/base_model.dart'; -import 'package:common_utils/common_utils.dart'; -import 'package:dotted_border/dotted_border.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:velocity_x/velocity_x.dart'; class InspectionPointDetailPage extends StatefulWidget { final int executePointId; diff --git a/lib/ui/manage_pages/inspection_manage/inspection_point_input_page.dart b/lib/ui/manage_pages/inspection_manage/inspection_point_input_page.dart index d20cd09..564f8d6 100644 --- a/lib/ui/manage_pages/inspection_manage/inspection_point_input_page.dart +++ b/lib/ui/manage_pages/inspection_manage/inspection_point_input_page.dart @@ -1,5 +1,17 @@ +// Dart imports: import 'dart:io'; +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:aku_ui/aku_ui.dart'; +import 'package:bot_toast/bot_toast.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:get/get.dart'; +import 'package:velocity_x/velocity_x.dart'; + +// Project imports: import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/models/manager/inspection/inspection_point_submit_model.dart'; import 'package:aku_community_manager/models/manager/inspection/inspection_qrcode_model.dart'; @@ -11,12 +23,6 @@ import 'package:aku_community_manager/ui/widgets/app_widgets/aku_single_check_bu import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; import 'package:aku_community_manager/utils/network/base_model.dart'; import 'package:aku_community_manager/utils/network/net_util.dart'; -import 'package:aku_ui/aku_ui.dart'; -import 'package:bot_toast/bot_toast.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:get/get.dart'; -import 'package:velocity_x/velocity_x.dart'; class InspectionPointInputPage extends StatefulWidget { final InspectionQRCodeModel qrModel; @@ -35,8 +41,7 @@ class _InspectionPointInputPageState extends State { List _selfPhotos; List _scenePhots; bool get canSubmit { - if (_selfPhotos == null && - _scenePhots == null) { + if (_selfPhotos == null && _scenePhots == null) { return false; } else { if (_submitModel.executeCheckList.isNotEmpty) { diff --git a/lib/ui/manage_pages/inspection_manage/inspection_point_submit_page.dart b/lib/ui/manage_pages/inspection_manage/inspection_point_submit_page.dart index 3a07af1..2269524 100644 --- a/lib/ui/manage_pages/inspection_manage/inspection_point_submit_page.dart +++ b/lib/ui/manage_pages/inspection_manage/inspection_point_submit_page.dart @@ -1,11 +1,16 @@ -import 'package:aku_community_manager/style/app_style.dart'; -import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; -import 'package:aku_ui/aku_ui.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: +import 'package:aku_ui/aku_ui.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:velocity_x/velocity_x.dart'; +// Project imports: +import 'package:aku_community_manager/style/app_style.dart'; +import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; + class InspectionPointSubmitPage extends StatefulWidget { InspectionPointSubmitPage({Key key}) : super(key: key); diff --git a/lib/ui/manage_pages/inspection_manage/inspection_utils.dart b/lib/ui/manage_pages/inspection_manage/inspection_utils.dart index adc1aaa..e67c128 100644 --- a/lib/ui/manage_pages/inspection_manage/inspection_utils.dart +++ b/lib/ui/manage_pages/inspection_manage/inspection_utils.dart @@ -1,7 +1,12 @@ -import 'package:aku_community_manager/style/app_style.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_screenutil/flutter_screenutil.dart'; +// Project imports: +import 'package:aku_community_manager/style/app_style.dart'; + class InspectionUtils { static TextStyle textstyle = TextStyle(color: AppStyle.minorTextColor, fontSize: 28.sp); diff --git a/lib/ui/manage_pages/inspection_manage/qr_scanner_page.dart b/lib/ui/manage_pages/inspection_manage/qr_scanner_page.dart index df0ed92..66b019f 100644 --- a/lib/ui/manage_pages/inspection_manage/qr_scanner_page.dart +++ b/lib/ui/manage_pages/inspection_manage/qr_scanner_page.dart @@ -1,9 +1,14 @@ -import 'package:aku_community_manager/style/app_style.dart'; -import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:get/get.dart'; import 'package:qr_code_scanner/qr_code_scanner.dart'; +// Project imports: +import 'package:aku_community_manager/style/app_style.dart'; +import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; + class QrScannerPage extends StatefulWidget { QrScannerPage({Key key}) : super(key: key); diff --git a/lib/ui/manage_pages/key_manage/key_aplly_input_page.dart b/lib/ui/manage_pages/key_manage/key_aplly_input_page.dart index a8dc11f..a5b8a07 100644 --- a/lib/ui/manage_pages/key_manage/key_aplly_input_page.dart +++ b/lib/ui/manage_pages/key_manage/key_aplly_input_page.dart @@ -1,13 +1,18 @@ -import 'package:aku_community_manager/style/app_style.dart'; -import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; -import 'package:aku_community_manager/ui/widgets/inner/aku_bottom_button.dart'; -import 'package:bot_toast/bot_toast.dart'; -import 'package:common_utils/common_utils.dart'; +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; + +// Package imports: +import 'package:bot_toast/bot_toast.dart'; +import 'package:common_utils/common_utils.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:velocity_x/velocity_x.dart'; +// Project imports: +import 'package:aku_community_manager/style/app_style.dart'; +import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; +import 'package:aku_community_manager/ui/widgets/inner/aku_bottom_button.dart'; + class KeyApplyInputPage extends StatefulWidget { KeyApplyInputPage({Key key}) : super(key: key); @@ -89,8 +94,7 @@ class _KeyApplyInputPageState extends State { ), bottom: AkuBottomButton( title: '确认提交', - onTap: () async { - }, + onTap: () async {}, ), ); } diff --git a/lib/ui/manage_pages/key_manage/key_apply_record_card.dart b/lib/ui/manage_pages/key_manage/key_apply_record_card.dart index 35354b8..7f9f48b 100644 --- a/lib/ui/manage_pages/key_manage/key_apply_record_card.dart +++ b/lib/ui/manage_pages/key_manage/key_apply_record_card.dart @@ -1,10 +1,16 @@ -import 'package:aku_community_manager/style/app_style.dart'; -import 'package:aku_community_manager/tools/aku_divider.dart'; -import 'package:aku_community_manager/ui/manage_pages/key_manage/key_manage_map.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:velocity_x/velocity_x.dart'; + +// Project imports: +import 'package:aku_community_manager/style/app_style.dart'; +import 'package:aku_community_manager/tools/aku_divider.dart'; import 'package:aku_community_manager/tools/extensions/list_extension_tool.dart'; +import 'package:aku_community_manager/ui/manage_pages/key_manage/key_manage_map.dart'; + class KeyApplyRecordCard extends StatefulWidget { final int index; KeyApplyRecordCard({Key key, this.index}) : super(key: key); @@ -57,7 +63,7 @@ class _KeyApplyRecordCardState extends State { ); } - Widget _getBottomButtons(int status) { + Widget _getBottomButtons(int status) { MaterialButton button; switch (status) { case 1: @@ -124,4 +130,3 @@ class _KeyApplyRecordCardState extends State { ); } } - diff --git a/lib/ui/manage_pages/key_manage/key_apply_record_page.dart b/lib/ui/manage_pages/key_manage/key_apply_record_page.dart index f1474c2..1fc085d 100644 --- a/lib/ui/manage_pages/key_manage/key_apply_record_page.dart +++ b/lib/ui/manage_pages/key_manage/key_apply_record_page.dart @@ -1,10 +1,15 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_screenutil/flutter_screenutil.dart'; + +// Project imports: import 'package:aku_community_manager/ui/manage_pages/key_manage/key_apply_record_view.dart'; import 'package:aku_community_manager/ui/manage_pages/key_manage/select_place_page.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; import 'package:aku_community_manager/ui/widgets/inner/aku_bottom_button.dart'; import 'package:aku_community_manager/ui/widgets/inner/aku_tab_bar.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; class KeyApplyRecordPage extends StatefulWidget { KeyApplyRecordPage({Key key}) : super(key: key); diff --git a/lib/ui/manage_pages/key_manage/key_apply_record_view.dart b/lib/ui/manage_pages/key_manage/key_apply_record_view.dart index e889736..d11a32e 100644 --- a/lib/ui/manage_pages/key_manage/key_apply_record_view.dart +++ b/lib/ui/manage_pages/key_manage/key_apply_record_view.dart @@ -1,7 +1,12 @@ -import 'package:aku_community_manager/ui/manage_pages/key_manage/key_apply_record_card.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_screenutil/flutter_screenutil.dart'; +// Project imports: +import 'package:aku_community_manager/ui/manage_pages/key_manage/key_apply_record_card.dart'; + class KeyApplyRecordView extends StatefulWidget { final int index; KeyApplyRecordView({Key key, this.index}) : super(key: key); @@ -14,7 +19,7 @@ class _KeyApplyRecordViewState extends State { @override Widget build(BuildContext context) { return ListView( - padding: EdgeInsets.symmetric(vertical: 24.w,horizontal: 32.w), + padding: EdgeInsets.symmetric(vertical: 24.w, horizontal: 32.w), children: [ KeyApplyRecordCard( index: widget.index, diff --git a/lib/ui/manage_pages/key_manage/key_manage_card.dart b/lib/ui/manage_pages/key_manage/key_manage_card.dart index 26a042f..84daa3f 100644 --- a/lib/ui/manage_pages/key_manage/key_manage_card.dart +++ b/lib/ui/manage_pages/key_manage/key_manage_card.dart @@ -1,10 +1,15 @@ -import 'package:aku_community_manager/style/app_style.dart'; -import 'package:aku_community_manager/tools/aku_divider.dart'; -import 'package:aku_community_manager/ui/manage_pages/key_manage/key_manage_map.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:velocity_x/velocity_x.dart'; + +// Project imports: +import 'package:aku_community_manager/style/app_style.dart'; +import 'package:aku_community_manager/tools/aku_divider.dart'; import 'package:aku_community_manager/tools/extensions/list_extension_tool.dart'; +import 'package:aku_community_manager/ui/manage_pages/key_manage/key_manage_map.dart'; class KeyManageCard extends StatefulWidget { final int index; diff --git a/lib/ui/manage_pages/key_manage/key_manage_map.dart b/lib/ui/manage_pages/key_manage/key_manage_map.dart index 103de30..d2c6e35 100644 --- a/lib/ui/manage_pages/key_manage/key_manage_map.dart +++ b/lib/ui/manage_pages/key_manage/key_manage_map.dart @@ -1,3 +1,4 @@ +// Flutter imports: import 'package:flutter/material.dart'; class KeyManageMap { @@ -17,5 +18,4 @@ class KeyManageMap { 5: Color(0xFFE60E0E), 6: Color(0xFF999999), }; - } diff --git a/lib/ui/manage_pages/key_manage/key_manage_page.dart b/lib/ui/manage_pages/key_manage/key_manage_page.dart index 096602f..dffb018 100644 --- a/lib/ui/manage_pages/key_manage/key_manage_page.dart +++ b/lib/ui/manage_pages/key_manage/key_manage_page.dart @@ -1,3 +1,12 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:get/get.dart'; +import 'package:velocity_x/velocity_x.dart'; + +// Project imports: import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/ui/manage_pages/key_manage/key_apply_record_page.dart'; import 'package:aku_community_manager/ui/manage_pages/key_manage/key_manage_view.dart'; @@ -6,10 +15,6 @@ import 'package:aku_community_manager/ui/manage_pages/packages_manage/add_packag import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; import 'package:aku_community_manager/ui/widgets/inner/aku_bottom_button.dart'; import 'package:aku_community_manager/ui/widgets/inner/aku_tab_bar.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:get/get.dart'; -import 'package:velocity_x/velocity_x.dart'; class KeyManagePage extends StatefulWidget { KeyManagePage({Key key}) : super(key: key); diff --git a/lib/ui/manage_pages/key_manage/key_manage_view.dart b/lib/ui/manage_pages/key_manage/key_manage_view.dart index eeed5b4..28ca0d6 100644 --- a/lib/ui/manage_pages/key_manage/key_manage_view.dart +++ b/lib/ui/manage_pages/key_manage/key_manage_view.dart @@ -1,7 +1,12 @@ -import 'package:aku_community_manager/ui/manage_pages/key_manage/key_manage_card.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_screenutil/flutter_screenutil.dart'; +// Project imports: +import 'package:aku_community_manager/ui/manage_pages/key_manage/key_manage_card.dart'; + class KeyManageView extends StatefulWidget { final int index; KeyManageView({Key key, this.index}) : super(key: key); diff --git a/lib/ui/manage_pages/key_manage/select_place_page.dart b/lib/ui/manage_pages/key_manage/select_place_page.dart index 617a9f1..619cb30 100644 --- a/lib/ui/manage_pages/key_manage/select_place_page.dart +++ b/lib/ui/manage_pages/key_manage/select_place_page.dart @@ -1,13 +1,18 @@ -import 'package:aku_community_manager/style/app_style.dart'; -import 'package:aku_community_manager/ui/manage_pages/key_manage/key_aplly_input_page.dart'; -import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; +// Flutter imports: import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:aku_community_manager/const/resource.dart'; import 'package:get/get.dart'; import 'package:velocity_x/velocity_x.dart'; + +// Project imports: +import 'package:aku_community_manager/const/resource.dart'; +import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/tools/extensions/list_extension_tool.dart'; +import 'package:aku_community_manager/ui/manage_pages/key_manage/key_aplly_input_page.dart'; +import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; class SelectPlacePage extends StatefulWidget { SelectPlacePage({Key key}) : super(key: key); diff --git a/lib/ui/manage_pages/packages_manage/add_package_page.dart b/lib/ui/manage_pages/packages_manage/add_package_page.dart index c600139..8a1a3b8 100644 --- a/lib/ui/manage_pages/packages_manage/add_package_page.dart +++ b/lib/ui/manage_pages/packages_manage/add_package_page.dart @@ -1,18 +1,23 @@ -import 'package:aku_community_manager/const/api.dart'; -import 'package:aku_community_manager/style/app_style.dart'; -import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; -import 'package:aku_community_manager/ui/widgets/inner/aku_bottom_button.dart'; -import 'package:aku_community_manager/utils/network/base_model.dart'; -import 'package:aku_community_manager/utils/network/net_util.dart'; +// Flutter imports: +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; + +// Package imports: import 'package:bot_toast/bot_toast.dart'; import 'package:common_utils/common_utils.dart'; import 'package:dio/dio.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:velocity_x/velocity_x.dart'; +// Project imports: +import 'package:aku_community_manager/const/api.dart'; +import 'package:aku_community_manager/style/app_style.dart'; +import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; +import 'package:aku_community_manager/ui/widgets/inner/aku_bottom_button.dart'; +import 'package:aku_community_manager/utils/network/base_model.dart'; +import 'package:aku_community_manager/utils/network/net_util.dart'; + class AddPackagePage extends StatefulWidget { AddPackagePage({Key key}) : super(key: key); @@ -101,7 +106,9 @@ class _AddPackagePageState extends State { ), ), ), - bottom: AkuBottomButton(title: '确认提交',onTap: () async { + bottom: AkuBottomButton( + title: '确认提交', + onTap: () async { canSubmit ? await addPackage( code: _codeController.text, @@ -110,11 +117,11 @@ class _AddPackagePageState extends State { address: _addressController.text, placePosition: _placeController.text) : null; - },), + }, + ), ); } - Future addPackage( {@required String code, @required String addresseeName, diff --git a/lib/ui/manage_pages/packages_manage/packages_manage_card.dart b/lib/ui/manage_pages/packages_manage/packages_manage_card.dart index 7ef3f9d..2df27b6 100644 --- a/lib/ui/manage_pages/packages_manage/packages_manage_card.dart +++ b/lib/ui/manage_pages/packages_manage/packages_manage_card.dart @@ -1,18 +1,24 @@ +// Dart imports: import 'dart:math'; -import 'package:aku_community_manager/const/api.dart'; -import 'package:aku_community_manager/models/manager/package_manage/package_manage_list_model.dart'; -import 'package:aku_community_manager/style/app_style.dart'; -import 'package:aku_community_manager/tools/aku_divider.dart'; -import 'package:aku_community_manager/utils/network/base_model.dart'; -import 'package:aku_community_manager/utils/network/net_util.dart'; +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: import 'package:bot_toast/bot_toast.dart'; import 'package:common_utils/common_utils.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:velocity_x/velocity_x.dart'; + +// Project imports: +import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/const/resource.dart'; +import 'package:aku_community_manager/models/manager/package_manage/package_manage_list_model.dart'; +import 'package:aku_community_manager/style/app_style.dart'; +import 'package:aku_community_manager/tools/aku_divider.dart'; import 'package:aku_community_manager/tools/extensions/list_extension_tool.dart'; +import 'package:aku_community_manager/utils/network/base_model.dart'; +import 'package:aku_community_manager/utils/network/net_util.dart'; class PackageManageCard extends StatefulWidget { final int index; diff --git a/lib/ui/manage_pages/packages_manage/packages_manage_page.dart b/lib/ui/manage_pages/packages_manage/packages_manage_page.dart index e84a917..b106128 100644 --- a/lib/ui/manage_pages/packages_manage/packages_manage_page.dart +++ b/lib/ui/manage_pages/packages_manage/packages_manage_page.dart @@ -1,12 +1,17 @@ -import 'package:aku_community_manager/ui/manage_pages/packages_manage/add_package_page.dart'; -import 'package:aku_community_manager/ui/manage_pages/packages_manage/packages_manage_view.dart'; -import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; -import 'package:aku_community_manager/ui/widgets/inner/aku_tab_bar.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:velocity_x/velocity_x.dart'; + +// Project imports: import 'package:aku_community_manager/const/resource.dart'; +import 'package:aku_community_manager/ui/manage_pages/packages_manage/add_package_page.dart'; +import 'package:aku_community_manager/ui/manage_pages/packages_manage/packages_manage_view.dart'; +import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; +import 'package:aku_community_manager/ui/widgets/inner/aku_tab_bar.dart'; class PackagesManagePage extends StatefulWidget { PackagesManagePage({Key key}) : super(key: key); diff --git a/lib/ui/manage_pages/packages_manage/packages_manage_view.dart b/lib/ui/manage_pages/packages_manage/packages_manage_view.dart index 6b1f459..0aef756 100644 --- a/lib/ui/manage_pages/packages_manage/packages_manage_view.dart +++ b/lib/ui/manage_pages/packages_manage/packages_manage_view.dart @@ -1,12 +1,17 @@ -import 'package:aku_community_manager/const/api.dart'; -import 'package:aku_community_manager/models/manager/package_manage/package_manage_list_model.dart'; -import 'package:aku_community_manager/ui/manage_pages/packages_manage/packages_manage_card.dart'; -import 'package:aku_community_manager/ui/widgets/common/bee_list_view.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:velocity_x/velocity_x.dart'; +// Project imports: +import 'package:aku_community_manager/const/api.dart'; +import 'package:aku_community_manager/models/manager/package_manage/package_manage_list_model.dart'; +import 'package:aku_community_manager/ui/manage_pages/packages_manage/packages_manage_card.dart'; +import 'package:aku_community_manager/ui/widgets/common/bee_list_view.dart'; + class PackagesManageView extends StatefulWidget { final int index; PackagesManageView({Key key, this.index}) : super(key: key); @@ -17,9 +22,10 @@ class PackagesManageView extends StatefulWidget { class _PackagesManageViewState extends State { EasyRefreshController _refreshController; - void callRefresh(){ + void callRefresh() { _refreshController.callRefresh(); } + @override void initState() { super.initState(); @@ -47,7 +53,7 @@ class _PackagesManageViewState extends State { }, builder: (items) { return ListView.separated( - padding: EdgeInsets.symmetric(vertical: 24.w,horizontal: 32.w), + padding: EdgeInsets.symmetric(vertical: 24.w, horizontal: 32.w), itemBuilder: (context, index) { return PackageManageCard( index: widget.index, diff --git a/lib/ui/manage_pages/rules_manage/rules_manage_page.dart b/lib/ui/manage_pages/rules_manage/rules_manage_page.dart index 768e156..6870de7 100644 --- a/lib/ui/manage_pages/rules_manage/rules_manage_page.dart +++ b/lib/ui/manage_pages/rules_manage/rules_manage_page.dart @@ -1,13 +1,18 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:common_utils/common_utils.dart'; +import 'package:flutter_easyrefresh/easy_refresh.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:velocity_x/velocity_x.dart'; + +// Project imports: import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/models/manager/rules_manage/rules_manage_list_model.dart'; import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; import 'package:aku_community_manager/ui/widgets/common/bee_list_view.dart'; -import 'package:common_utils/common_utils.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:velocity_x/velocity_x.dart'; class RulesManagePage extends StatefulWidget { RulesManagePage({Key key}) : super(key: key); @@ -34,7 +39,7 @@ class _RulesManagePageState extends State { Widget build(BuildContext context) { return AkuScaffold( title: '规程管理', - body: BeeListView( + body: BeeListView( path: API.manage.rulesManageList, controller: _refreshController, convert: (models) { diff --git a/lib/ui/settings/nick_name_change_page.dart b/lib/ui/settings/nick_name_change_page.dart index f2c95df..07cd3d9 100644 --- a/lib/ui/settings/nick_name_change_page.dart +++ b/lib/ui/settings/nick_name_change_page.dart @@ -1,14 +1,19 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:bot_toast/bot_toast.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:get/get.dart'; +import 'package:provider/provider.dart'; +import 'package:velocity_x/velocity_x.dart'; + +// Project imports: import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/provider/user_provider.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; import 'package:aku_community_manager/utils/network/base_model.dart'; import 'package:aku_community_manager/utils/network/net_util.dart'; -import 'package:bot_toast/bot_toast.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; -import 'package:provider/provider.dart'; -import 'package:velocity_x/velocity_x.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; class NickNameChangePage extends StatefulWidget { NickNameChangePage({Key key}) : super(key: key); diff --git a/lib/ui/settings/setting_feedback_page.dart b/lib/ui/settings/setting_feedback_page.dart index e97bbab..d753f7b 100644 --- a/lib/ui/settings/setting_feedback_page.dart +++ b/lib/ui/settings/setting_feedback_page.dart @@ -1,21 +1,22 @@ -// Flutter imports: +// Dart imports: import 'dart:io'; -import 'package:aku_community_manager/const/api.dart'; -import 'package:aku_community_manager/ui/widgets/app_widgets/aku_pick_image_widget.dart'; -import 'package:aku_community_manager/utils/network/base_model.dart'; -import 'package:aku_community_manager/utils/network/net_util.dart'; -import 'package:bot_toast/bot_toast.dart'; +// Flutter imports: import 'package:flutter/material.dart'; // Package imports: import 'package:aku_ui/common_widgets/aku_material_button.dart'; +import 'package:bot_toast/bot_toast.dart'; +import 'package:get/get.dart'; // Project imports: +import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/tools/screen_tool.dart'; +import 'package:aku_community_manager/ui/widgets/app_widgets/aku_pick_image_widget.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; -import 'package:get/get.dart'; +import 'package:aku_community_manager/utils/network/base_model.dart'; +import 'package:aku_community_manager/utils/network/net_util.dart'; class SettingFeedBackPage extends StatefulWidget { SettingFeedBackPage({Key key}) : super(key: key); diff --git a/lib/ui/settings/tel_change_page.dart b/lib/ui/settings/tel_change_page.dart index 1e5db3b..8b03176 100644 --- a/lib/ui/settings/tel_change_page.dart +++ b/lib/ui/settings/tel_change_page.dart @@ -1,17 +1,23 @@ +// Dart imports: import 'dart:async'; -import 'package:aku_community_manager/provider/user_provider.dart'; -import 'package:aku_community_manager/ui/settings/update_userinfo_func.dart'; -import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; -import 'package:aku_community_manager/utils/network/base_model.dart'; -import 'package:bot_toast/bot_toast.dart'; -import 'package:common_utils/common_utils.dart'; +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; + +// Package imports: +import 'package:bot_toast/bot_toast.dart'; +import 'package:common_utils/common_utils.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:provider/provider.dart'; import 'package:velocity_x/velocity_x.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; + +// Project imports: +import 'package:aku_community_manager/provider/user_provider.dart'; +import 'package:aku_community_manager/ui/settings/update_userinfo_func.dart'; +import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; +import 'package:aku_community_manager/utils/network/base_model.dart'; class TelChangePage extends StatefulWidget { TelChangePage({Key key}) : super(key: key); diff --git a/lib/ui/settings/update_userinfo_func.dart b/lib/ui/settings/update_userinfo_func.dart index b1a1172..37b7b38 100644 --- a/lib/ui/settings/update_userinfo_func.dart +++ b/lib/ui/settings/update_userinfo_func.dart @@ -1,3 +1,4 @@ +// Project imports: import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/utils/network/base_model.dart'; import 'package:aku_community_manager/utils/network/net_util.dart'; diff --git a/lib/ui/settings/user_info_page.dart b/lib/ui/settings/user_info_page.dart index f821789..385725b 100644 --- a/lib/ui/settings/user_info_page.dart +++ b/lib/ui/settings/user_info_page.dart @@ -1,9 +1,7 @@ -// Flutter imports: +// Dart imports: import 'dart:io'; -import 'package:aku_community_manager/tools/aku_divider.dart'; -import 'package:aku_community_manager/ui/settings/nick_name_change_page.dart'; -import 'package:aku_community_manager/ui/settings/tel_change_page.dart'; +// Flutter imports: import 'package:flutter/material.dart'; // Package imports: @@ -12,13 +10,16 @@ import 'package:provider/provider.dart'; // Project imports: import 'package:aku_community_manager/provider/user_provider.dart'; +import 'package:aku_community_manager/tools/aku_divider.dart'; +import 'package:aku_community_manager/tools/extensions/list_extension_tool.dart'; +import 'package:aku_community_manager/tools/extensions/router_extension_tool.dart'; import 'package:aku_community_manager/tools/screen_tool.dart'; +import 'package:aku_community_manager/ui/settings/nick_name_change_page.dart'; +import 'package:aku_community_manager/ui/settings/tel_change_page.dart'; import 'package:aku_community_manager/ui/widgets/app_widgets/aku_avatar.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_tile.dart'; import 'package:aku_community_manager/ui/widgets/inner/pick_image.dart'; -import 'package:aku_community_manager/tools/extensions/list_extension_tool.dart'; -import 'package:aku_community_manager/tools/extensions/router_extension_tool.dart'; class UserInfoPage extends StatefulWidget { UserInfoPage({Key key}) : super(key: key); diff --git a/lib/ui/splash/splash_page.dart b/lib/ui/splash/splash_page.dart index 9c8488f..1919606 100644 --- a/lib/ui/splash/splash_page.dart +++ b/lib/ui/splash/splash_page.dart @@ -1,24 +1,24 @@ // Flutter imports: -import 'package:aku_community_manager/provider/app_provider.dart'; -import 'package:aku_community_manager/provider/user_provider.dart'; -import 'package:aku_community_manager/style/app_style.dart'; -import 'package:aku_community_manager/utils/dev_util.dart'; -import 'package:firebase_core/firebase_core.dart'; -import 'package:firebase_crashlytics/firebase_crashlytics.dart'; import 'package:flutter/material.dart'; // Package imports: +import 'package:firebase_core/firebase_core.dart'; +import 'package:firebase_crashlytics/firebase_crashlytics.dart'; import 'package:get/get.dart' hide Response; import 'package:hive/hive.dart'; import 'package:hive_flutter/hive_flutter.dart'; import 'package:jpush_flutter/jpush_flutter.dart'; import 'package:permission_handler/permission_handler.dart'; import 'package:power_logger/power_logger.dart'; +import 'package:provider/provider.dart'; // Project imports: +import 'package:aku_community_manager/provider/app_provider.dart'; +import 'package:aku_community_manager/provider/user_provider.dart'; +import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/ui/home/home_page.dart'; +import 'package:aku_community_manager/utils/dev_util.dart'; import 'package:aku_community_manager/utils/hive_store.dart'; -import 'package:provider/provider.dart'; class SplashPage extends StatefulWidget { SplashPage({Key key}) : super(key: key); @@ -64,7 +64,7 @@ class _SplashPageState extends State { }); Future.delayed(Duration(milliseconds: 2000), () async { await _initOp(); - + Get.off(HomePage()); }); } diff --git a/lib/ui/sub_pages/activity_manager/activity_detail_page.dart b/lib/ui/sub_pages/activity_manager/activity_detail_page.dart index ac8f9d3..2f57719 100644 --- a/lib/ui/sub_pages/activity_manager/activity_detail_page.dart +++ b/lib/ui/sub_pages/activity_manager/activity_detail_page.dart @@ -1,8 +1,4 @@ // Flutter imports: -import 'package:aku_community_manager/const/api.dart'; -import 'package:aku_community_manager/models/manager/activity_detail_model.dart'; -import 'package:aku_community_manager/utils/network/base_model.dart'; -import 'package:aku_community_manager/utils/network/net_util.dart'; import 'package:flutter/material.dart'; // Package imports: @@ -10,10 +6,14 @@ import 'package:common_utils/common_utils.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; // Project imports: +import 'package:aku_community_manager/const/api.dart'; +import 'package:aku_community_manager/models/manager/activity_detail_model.dart'; import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/tools/screen_tool.dart'; import 'package:aku_community_manager/tools/widget_tool.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; +import 'package:aku_community_manager/utils/network/base_model.dart'; +import 'package:aku_community_manager/utils/network/net_util.dart'; class ActivityDetailPage extends StatefulWidget { final int id; diff --git a/lib/ui/sub_pages/activity_manager/activity_manager_card.dart b/lib/ui/sub_pages/activity_manager/activity_manager_card.dart index 2a6fc43..8203b01 100644 --- a/lib/ui/sub_pages/activity_manager/activity_manager_card.dart +++ b/lib/ui/sub_pages/activity_manager/activity_manager_card.dart @@ -1,7 +1,4 @@ // Flutter imports: -import 'package:aku_community_manager/const/api.dart'; -import 'package:aku_community_manager/models/manager/activity_item_model.dart'; -import 'package:aku_community_manager/ui/sub_pages/activity_manager/activity_detail_page.dart'; import 'package:flutter/material.dart'; // Package imports: @@ -9,9 +6,12 @@ import 'package:common_utils/common_utils.dart'; import 'package:get/route_manager.dart'; // Project imports: +import 'package:aku_community_manager/const/api.dart'; +import 'package:aku_community_manager/models/manager/activity_item_model.dart'; import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/tools/screen_tool.dart'; import 'package:aku_community_manager/tools/widget_tool.dart'; +import 'package:aku_community_manager/ui/sub_pages/activity_manager/activity_detail_page.dart'; class ActivityManagerCard extends StatelessWidget { final ActivityItemModel model; diff --git a/lib/ui/sub_pages/activity_manager/activity_manager_page.dart b/lib/ui/sub_pages/activity_manager/activity_manager_page.dart index a28be4f..1ad4f39 100644 --- a/lib/ui/sub_pages/activity_manager/activity_manager_page.dart +++ b/lib/ui/sub_pages/activity_manager/activity_manager_page.dart @@ -1,14 +1,16 @@ // Flutter imports: -import 'package:aku_community_manager/const/api.dart'; -import 'package:aku_community_manager/models/manager/activity_item_model.dart'; -import 'package:aku_community_manager/ui/widgets/common/bee_list_view.dart'; -import 'package:aku_community_manager/utils/network/base_list_model.dart'; import 'package:flutter/material.dart'; +// Package imports: +import 'package:flutter_easyrefresh/easy_refresh.dart'; + // Project imports: +import 'package:aku_community_manager/const/api.dart'; +import 'package:aku_community_manager/models/manager/activity_item_model.dart'; import 'package:aku_community_manager/ui/sub_pages/activity_manager/activity_manager_card.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; +import 'package:aku_community_manager/ui/widgets/common/bee_list_view.dart'; +import 'package:aku_community_manager/utils/network/base_list_model.dart'; class ActivityManagerPage extends StatefulWidget { ActivityManagerPage({Key key}) : super(key: key); diff --git a/lib/ui/sub_pages/borrow_manager/add_borrow_item_page.dart b/lib/ui/sub_pages/borrow_manager/add_borrow_item_page.dart index e3244ab..c71fc15 100644 --- a/lib/ui/sub_pages/borrow_manager/add_borrow_item_page.dart +++ b/lib/ui/sub_pages/borrow_manager/add_borrow_item_page.dart @@ -2,23 +2,23 @@ import 'dart:io'; // Flutter imports: -import 'package:aku_community_manager/const/api.dart'; -import 'package:aku_community_manager/utils/network/base_file_model.dart'; -import 'package:aku_community_manager/utils/network/net_util.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:get/get.dart'; // Package imports: import 'package:aku_ui/common_widgets/aku_material_button.dart'; import 'package:bot_toast/bot_toast.dart'; +import 'package:get/get.dart'; +import 'package:get/instance_manager.dart'; // Project imports: +import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/tools/widget_tool.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; import 'package:aku_community_manager/ui/widgets/inner/pick_image.dart'; -import 'package:get/instance_manager.dart'; +import 'package:aku_community_manager/utils/network/base_file_model.dart'; +import 'package:aku_community_manager/utils/network/net_util.dart'; class AddBorrowItemPage extends StatefulWidget { final int articleId; diff --git a/lib/ui/sub_pages/borrow_manager/add_borrow_object_page.dart b/lib/ui/sub_pages/borrow_manager/add_borrow_object_page.dart index 0106922..4121399 100644 --- a/lib/ui/sub_pages/borrow_manager/add_borrow_object_page.dart +++ b/lib/ui/sub_pages/borrow_manager/add_borrow_object_page.dart @@ -2,10 +2,6 @@ import 'dart:io'; // Flutter imports: -import 'package:aku_community_manager/const/api.dart'; -import 'package:aku_community_manager/utils/network/base_file_model.dart'; -import 'package:aku_community_manager/utils/network/base_model.dart'; -import 'package:aku_community_manager/utils/network/net_util.dart'; import 'package:flutter/material.dart'; // Package imports: @@ -16,6 +12,7 @@ import 'package:get/get.dart'; import 'package:provider/provider.dart'; // Project imports: +import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/mock_models/borrow/borrow_data.dart'; import 'package:aku_community_manager/mock_models/borrow/borrow_model.dart'; import 'package:aku_community_manager/mock_models/users/user_info_model.dart'; @@ -25,6 +22,9 @@ import 'package:aku_community_manager/tools/widget_tool.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; import 'package:aku_community_manager/ui/widgets/inner/aku_bottom_button.dart'; import 'package:aku_community_manager/ui/widgets/inner/pick_image.dart'; +import 'package:aku_community_manager/utils/network/base_file_model.dart'; +import 'package:aku_community_manager/utils/network/base_model.dart'; +import 'package:aku_community_manager/utils/network/net_util.dart'; class AddBorrowObjectPage extends StatefulWidget { AddBorrowObjectPage({Key key}) : super(key: key); diff --git a/lib/ui/sub_pages/borrow_manager/all_borrow_goods.dart b/lib/ui/sub_pages/borrow_manager/all_borrow_goods.dart index a86eb25..dcfecdc 100644 --- a/lib/ui/sub_pages/borrow_manager/all_borrow_goods.dart +++ b/lib/ui/sub_pages/borrow_manager/all_borrow_goods.dart @@ -1,23 +1,23 @@ // Flutter imports: -import 'package:aku_community_manager/const/api.dart'; -import 'package:aku_community_manager/models/manager/borrow/borrow_item_model.dart'; -import 'package:aku_community_manager/provider/user_provider.dart'; -import 'package:aku_community_manager/ui/sub_pages/borrow_manager/add_borrow_object_page.dart'; -import 'package:aku_community_manager/ui/widgets/common/bee_list_view.dart'; -import 'package:aku_ui/common_widgets/aku_material_button.dart'; import 'package:flutter/material.dart'; // Package imports: +import 'package:aku_ui/common_widgets/aku_material_button.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:get/get.dart'; +import 'package:provider/provider.dart'; // Project imports: +import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/const/resource.dart'; +import 'package:aku_community_manager/models/manager/borrow/borrow_item_model.dart'; +import 'package:aku_community_manager/provider/user_provider.dart'; import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/tools/widget_tool.dart'; +import 'package:aku_community_manager/ui/sub_pages/borrow_manager/add_borrow_object_page.dart'; import 'package:aku_community_manager/ui/sub_pages/borrow_manager/borrow_items_page.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; -import 'package:provider/provider.dart'; +import 'package:aku_community_manager/ui/widgets/common/bee_list_view.dart'; class AllBorrowGoods extends StatefulWidget { AllBorrowGoods({Key key}) : super(key: key); diff --git a/lib/ui/sub_pages/borrow_manager/borrow_item_detail_page.dart b/lib/ui/sub_pages/borrow_manager/borrow_item_detail_page.dart index caf0861..dba7939 100644 --- a/lib/ui/sub_pages/borrow_manager/borrow_item_detail_page.dart +++ b/lib/ui/sub_pages/borrow_manager/borrow_item_detail_page.dart @@ -1,23 +1,23 @@ // Flutter imports: -import 'package:aku_community_manager/const/api.dart'; -import 'package:aku_community_manager/models/manager/borrow/borrow_item_detail_model.dart'; -import 'package:aku_community_manager/utils/network/base_model.dart'; -import 'package:aku_community_manager/utils/network/net_util.dart'; -import 'package:bot_toast/bot_toast.dart'; import 'package:flutter/material.dart'; // Package imports: import 'package:aku_ui/common_widgets/aku_material_button.dart'; +import 'package:bot_toast/bot_toast.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:provider/provider.dart'; // Project imports: +import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/mock_models/borrow/borrow_model.dart'; import 'package:aku_community_manager/mock_models/users/user_info_model.dart'; +import 'package:aku_community_manager/models/manager/borrow/borrow_item_detail_model.dart'; import 'package:aku_community_manager/provider/user_provider.dart'; import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/tools/widget_tool.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; +import 'package:aku_community_manager/utils/network/base_model.dart'; +import 'package:aku_community_manager/utils/network/net_util.dart'; class BorrowItemDetailPage extends StatefulWidget { final int id; diff --git a/lib/ui/sub_pages/borrow_manager/borrow_items_page.dart b/lib/ui/sub_pages/borrow_manager/borrow_items_page.dart index 8c62e74..8c50b9e 100644 --- a/lib/ui/sub_pages/borrow_manager/borrow_items_page.dart +++ b/lib/ui/sub_pages/borrow_manager/borrow_items_page.dart @@ -1,24 +1,24 @@ // Flutter imports: -import 'package:aku_community_manager/const/api.dart'; -import 'package:aku_community_manager/models/manager/borrow/borrow_detail_item_model.dart'; -import 'package:aku_community_manager/ui/sub_pages/borrow_manager/add_borrow_item_page.dart'; -import 'package:aku_community_manager/ui/sub_pages/borrow_manager/borrow_item_detail_page.dart'; -import 'package:aku_community_manager/ui/widgets/common/bee_list_view.dart'; -import 'package:aku_community_manager/utils/network/net_util.dart'; -import 'package:aku_ui/common_widgets/aku_material_button.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; // Package imports: +import 'package:aku_ui/common_widgets/aku_material_button.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:get/get.dart'; import 'package:provider/provider.dart'; // Project imports: +import 'package:aku_community_manager/const/api.dart'; +import 'package:aku_community_manager/models/manager/borrow/borrow_detail_item_model.dart'; import 'package:aku_community_manager/provider/user_provider.dart'; import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/tools/widget_tool.dart'; +import 'package:aku_community_manager/ui/sub_pages/borrow_manager/add_borrow_item_page.dart'; +import 'package:aku_community_manager/ui/sub_pages/borrow_manager/borrow_item_detail_page.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; +import 'package:aku_community_manager/ui/widgets/common/bee_list_view.dart'; +import 'package:aku_community_manager/utils/network/net_util.dart'; class BorrowItemPage extends StatefulWidget { final int id; diff --git a/lib/ui/sub_pages/borrow_manager/borrow_manager_card.dart b/lib/ui/sub_pages/borrow_manager/borrow_manager_card.dart index 971c9dc..be4b583 100644 --- a/lib/ui/sub_pages/borrow_manager/borrow_manager_card.dart +++ b/lib/ui/sub_pages/borrow_manager/borrow_manager_card.dart @@ -1,8 +1,4 @@ // Flutter imports: -import 'package:aku_community_manager/const/api.dart'; -import 'package:aku_community_manager/models/manager/borrow/borrow_status_item_model.dart'; -import 'package:aku_community_manager/ui/sub_pages/borrow_manager/borrow_manager_check_page.dart'; -import 'package:aku_community_manager/utils/network/net_util.dart'; import 'package:flutter/material.dart'; // Package imports: @@ -13,11 +9,16 @@ import 'package:get/get.dart'; import 'package:provider/provider.dart'; import 'package:url_launcher/url_launcher.dart'; +// Project imports: +import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/mock_models/users/user_info_model.dart'; +import 'package:aku_community_manager/models/manager/borrow/borrow_status_item_model.dart'; import 'package:aku_community_manager/provider/user_provider.dart'; import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/tools/widget_tool.dart'; +import 'package:aku_community_manager/ui/sub_pages/borrow_manager/borrow_manager_check_page.dart'; import 'package:aku_community_manager/ui/widgets/inner/aku_chip_box.dart'; +import 'package:aku_community_manager/utils/network/net_util.dart'; class BorrowManagerCard extends StatefulWidget { final BorrowStatusItemModel model; diff --git a/lib/ui/sub_pages/borrow_manager/borrow_manager_check_page.dart b/lib/ui/sub_pages/borrow_manager/borrow_manager_check_page.dart index da96e8c..82a162d 100644 --- a/lib/ui/sub_pages/borrow_manager/borrow_manager_check_page.dart +++ b/lib/ui/sub_pages/borrow_manager/borrow_manager_check_page.dart @@ -1,21 +1,21 @@ // Flutter imports: -import 'package:aku_community_manager/const/api.dart'; -import 'package:aku_community_manager/models/manager/borrow/borrow_check_item_model.dart'; -import 'package:aku_community_manager/utils/network/base_model.dart'; -import 'package:aku_community_manager/utils/network/net_util.dart'; -import 'package:bot_toast/bot_toast.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; // Package imports: +import 'package:bot_toast/bot_toast.dart'; +import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:get/get.dart'; // Project imports: +import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/mock_models/borrow/borrow_model.dart'; +import 'package:aku_community_manager/models/manager/borrow/borrow_check_item_model.dart'; import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/tools/widget_tool.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; import 'package:aku_community_manager/ui/widgets/inner/aku_bottom_button.dart'; +import 'package:aku_community_manager/utils/network/base_model.dart'; +import 'package:aku_community_manager/utils/network/net_util.dart'; class BorrowManagerCheckPage extends StatefulWidget { final int id; diff --git a/lib/ui/sub_pages/borrow_manager/borrow_manager_page.dart b/lib/ui/sub_pages/borrow_manager/borrow_manager_page.dart index 4a6cb96..84b658d 100644 --- a/lib/ui/sub_pages/borrow_manager/borrow_manager_page.dart +++ b/lib/ui/sub_pages/borrow_manager/borrow_manager_page.dart @@ -1,5 +1,4 @@ // Flutter imports: -import 'package:aku_community_manager/ui/sub_pages/borrow_manager/borrow_manager_view.dart'; import 'package:flutter/material.dart'; // Package imports: @@ -15,6 +14,7 @@ import 'package:aku_community_manager/provider/user_provider.dart'; import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/ui/sub_pages/borrow_manager/all_borrow_goods.dart'; import 'package:aku_community_manager/ui/sub_pages/borrow_manager/borrow_manager_card.dart'; +import 'package:aku_community_manager/ui/sub_pages/borrow_manager/borrow_manager_view.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; import 'package:aku_community_manager/ui/widgets/inner/aku_tab_bar.dart'; diff --git a/lib/ui/sub_pages/borrow_manager/borrow_manager_view.dart b/lib/ui/sub_pages/borrow_manager/borrow_manager_view.dart index c420636..0afe066 100644 --- a/lib/ui/sub_pages/borrow_manager/borrow_manager_view.dart +++ b/lib/ui/sub_pages/borrow_manager/borrow_manager_view.dart @@ -1,9 +1,14 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_easyrefresh/easy_refresh.dart'; + +// Project imports: import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/models/manager/borrow/borrow_status_item_model.dart'; import 'package:aku_community_manager/ui/sub_pages/borrow_manager/borrow_manager_card.dart'; import 'package:aku_community_manager/ui/widgets/common/bee_list_view.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; class BorrowManagerView extends StatefulWidget { final int status; diff --git a/lib/ui/sub_pages/business_and_fix/business_and_fix_detail_page.dart b/lib/ui/sub_pages/business_and_fix/business_and_fix_detail_page.dart index 1483e07..02fa2e8 100644 --- a/lib/ui/sub_pages/business_and_fix/business_and_fix_detail_page.dart +++ b/lib/ui/sub_pages/business_and_fix/business_and_fix_detail_page.dart @@ -1,36 +1,36 @@ // Flutter imports: -import 'package:aku_community_manager/const/api.dart'; -import 'package:aku_community_manager/models/manager/bussiness_and_fix/bussiness_and_fix_model.dart'; -import 'package:aku_community_manager/models/manager/bussiness_and_fix/dispatch_detail_model.dart'; -import 'package:aku_community_manager/models/manager/bussiness_and_fix/dispatch_report_model.dart'; -import 'package:aku_community_manager/models/manager/bussiness_and_fix/fixed_detail_model.dart'; -import 'package:aku_community_manager/models/manager/bussiness_and_fix/work_order_type_model.dart'; -import 'package:aku_community_manager/models/manager/bussiness_and_fix/work_time_limit_model.dart'; -import 'package:aku_community_manager/tools/aku_map.dart'; -import 'package:aku_community_manager/ui/sub_pages/business_and_fix/fix_more_time_page.dart'; -import 'package:aku_community_manager/ui/sub_pages/business_and_fix/fix_work_finish_page.dart'; -import 'package:aku_community_manager/ui/sub_pages/business_and_fix/fixer_department_page.dart'; -import 'package:aku_community_manager/utils/network/base_model.dart'; -import 'package:aku_community_manager/utils/network/manage_func.dart'; -import 'package:bot_toast/bot_toast.dart'; import 'package:flutter/material.dart'; // Package imports: import 'package:aku_ui/common_widgets/aku_material_button.dart'; +import 'package:bot_toast/bot_toast.dart'; import 'package:common_utils/common_utils.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:get/get.dart'; import 'package:provider/provider.dart'; // Project imports: +import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/const/resource.dart'; +import 'package:aku_community_manager/models/manager/bussiness_and_fix/bussiness_and_fix_model.dart'; +import 'package:aku_community_manager/models/manager/bussiness_and_fix/dispatch_detail_model.dart'; +import 'package:aku_community_manager/models/manager/bussiness_and_fix/dispatch_report_model.dart'; +import 'package:aku_community_manager/models/manager/bussiness_and_fix/fixed_detail_model.dart'; +import 'package:aku_community_manager/models/manager/bussiness_and_fix/work_order_type_model.dart'; +import 'package:aku_community_manager/models/manager/bussiness_and_fix/work_time_limit_model.dart'; import 'package:aku_community_manager/provider/user_provider.dart'; import 'package:aku_community_manager/style/app_style.dart'; +import 'package:aku_community_manager/tools/aku_map.dart'; import 'package:aku_community_manager/tools/screen_tool.dart'; import 'package:aku_community_manager/tools/widget_tool.dart'; +import 'package:aku_community_manager/ui/sub_pages/business_and_fix/fix_more_time_page.dart'; +import 'package:aku_community_manager/ui/sub_pages/business_and_fix/fix_work_finish_page.dart'; +import 'package:aku_community_manager/ui/sub_pages/business_and_fix/fixer_department_page.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; import 'package:aku_community_manager/ui/widgets/inner/aku_title_box.dart'; import 'package:aku_community_manager/ui/widgets/inner/show_bottom_sheet.dart'; +import 'package:aku_community_manager/utils/network/base_model.dart'; +import 'package:aku_community_manager/utils/network/manage_func.dart'; class BusinessAndFixDetailPage extends StatefulWidget { final BussinessAndFixModel model; diff --git a/lib/ui/sub_pages/business_and_fix/business_and_fix_page.dart b/lib/ui/sub_pages/business_and_fix/business_and_fix_page.dart index 94e2022..8273e7b 100644 --- a/lib/ui/sub_pages/business_and_fix/business_and_fix_page.dart +++ b/lib/ui/sub_pages/business_and_fix/business_and_fix_page.dart @@ -1,5 +1,4 @@ // Flutter imports: -import 'package:aku_community_manager/ui/sub_pages/business_and_fix/bussiness_and_fix_view.dart'; import 'package:flutter/material.dart'; // Package imports: @@ -8,6 +7,7 @@ import 'package:provider/provider.dart'; // Project imports: import 'package:aku_community_manager/provider/user_provider.dart'; import 'package:aku_community_manager/tools/screen_tool.dart'; +import 'package:aku_community_manager/ui/sub_pages/business_and_fix/bussiness_and_fix_view.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; import 'package:aku_community_manager/ui/widgets/inner/aku_tab_bar.dart'; diff --git a/lib/ui/sub_pages/business_and_fix/business_fix_card.dart b/lib/ui/sub_pages/business_and_fix/business_fix_card.dart index 93ca892..52dfad7 100644 --- a/lib/ui/sub_pages/business_and_fix/business_fix_card.dart +++ b/lib/ui/sub_pages/business_and_fix/business_fix_card.dart @@ -1,13 +1,4 @@ // Flutter imports: -import 'package:aku_community_manager/const/api.dart'; -import 'package:aku_community_manager/models/manager/bussiness_and_fix/bussiness_and_fix_model.dart'; -import 'package:aku_community_manager/models/user/user_info_model.dart'; -import 'package:aku_community_manager/provider/user_provider.dart'; -import 'package:aku_community_manager/tools/aku_divider.dart'; -import 'package:aku_community_manager/tools/aku_map.dart'; -import 'package:aku_community_manager/ui/sub_pages/business_and_fix/business_and_fix_detail_page.dart'; -import 'package:aku_community_manager/ui/sub_pages/business_and_fix/fix_more_time_page.dart'; -import 'package:aku_community_manager/ui/sub_pages/business_and_fix/fix_work_finish_page.dart'; import 'package:flutter/material.dart'; // Package imports: @@ -17,9 +8,18 @@ import 'package:get/get.dart'; import 'package:provider/provider.dart'; // Project imports: +import 'package:aku_community_manager/const/api.dart'; +import 'package:aku_community_manager/models/manager/bussiness_and_fix/bussiness_and_fix_model.dart'; +import 'package:aku_community_manager/models/user/user_info_model.dart'; +import 'package:aku_community_manager/provider/user_provider.dart'; import 'package:aku_community_manager/style/app_style.dart'; +import 'package:aku_community_manager/tools/aku_divider.dart'; +import 'package:aku_community_manager/tools/aku_map.dart'; import 'package:aku_community_manager/tools/screen_tool.dart'; import 'package:aku_community_manager/tools/widget_tool.dart'; +import 'package:aku_community_manager/ui/sub_pages/business_and_fix/business_and_fix_detail_page.dart'; +import 'package:aku_community_manager/ui/sub_pages/business_and_fix/fix_more_time_page.dart'; +import 'package:aku_community_manager/ui/sub_pages/business_and_fix/fix_work_finish_page.dart'; import 'package:aku_community_manager/ui/widgets/inner/aku_chip_box.dart'; class BusinessFixCard extends StatefulWidget { diff --git a/lib/ui/sub_pages/business_and_fix/bussiness_and_fix_view.dart b/lib/ui/sub_pages/business_and_fix/bussiness_and_fix_view.dart index b1761c7..74d393e 100644 --- a/lib/ui/sub_pages/business_and_fix/bussiness_and_fix_view.dart +++ b/lib/ui/sub_pages/business_and_fix/bussiness_and_fix_view.dart @@ -1,11 +1,16 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_easyrefresh/easy_refresh.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:velocity_x/velocity_x.dart'; + +// Project imports: import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/models/manager/bussiness_and_fix/bussiness_and_fix_model.dart'; import 'package:aku_community_manager/ui/sub_pages/business_and_fix/business_fix_card.dart'; import 'package:aku_community_manager/ui/widgets/common/bee_list_view.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; -import 'package:velocity_x/velocity_x.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; class BussinessAndFixView extends StatefulWidget { final int status; diff --git a/lib/ui/sub_pages/business_and_fix/fix_more_time_page.dart b/lib/ui/sub_pages/business_and_fix/fix_more_time_page.dart index 81e8f5d..e91ac7f 100644 --- a/lib/ui/sub_pages/business_and_fix/fix_more_time_page.dart +++ b/lib/ui/sub_pages/business_and_fix/fix_more_time_page.dart @@ -1,11 +1,10 @@ // Flutter imports: -import 'package:aku_community_manager/utils/network/base_model.dart'; -import 'package:aku_community_manager/utils/network/manage_func.dart'; -import 'package:bot_toast/bot_toast.dart'; import 'package:flutter/material.dart'; // Package imports: import 'package:aku_ui/common_widgets/aku_material_button.dart'; +import 'package:bot_toast/bot_toast.dart'; +import 'package:get/get.dart'; // Project imports: import 'package:aku_community_manager/const/resource.dart'; @@ -13,7 +12,8 @@ import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/tools/screen_tool.dart'; import 'package:aku_community_manager/tools/widget_tool.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; -import 'package:get/get.dart'; +import 'package:aku_community_manager/utils/network/base_model.dart'; +import 'package:aku_community_manager/utils/network/manage_func.dart'; class FixMoreTimePage extends StatefulWidget { final int dispatchId; diff --git a/lib/ui/sub_pages/business_and_fix/fix_submit_finish_page.dart b/lib/ui/sub_pages/business_and_fix/fix_submit_finish_page.dart index a000003..b21895a 100644 --- a/lib/ui/sub_pages/business_and_fix/fix_submit_finish_page.dart +++ b/lib/ui/sub_pages/business_and_fix/fix_submit_finish_page.dart @@ -1,11 +1,16 @@ -import 'package:aku_community_manager/models/manager/bussiness_and_fix/bussiness_and_fix_model.dart'; -import 'package:aku_community_manager/ui/sub_pages/business_and_fix/business_fix_card.dart'; -import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; +// Flutter imports: import 'package:flutter/material.dart'; -import 'package:aku_community_manager/const/resource.dart'; + +// Package imports: import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:velocity_x/velocity_x.dart'; +// Project imports: +import 'package:aku_community_manager/const/resource.dart'; +import 'package:aku_community_manager/models/manager/bussiness_and_fix/bussiness_and_fix_model.dart'; +import 'package:aku_community_manager/ui/sub_pages/business_and_fix/business_fix_card.dart'; +import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; + class FixSubmitFinishPage extends StatelessWidget { final BussinessAndFixModel model; const FixSubmitFinishPage({Key key, this.model}) : super(key: key); diff --git a/lib/ui/sub_pages/business_and_fix/fix_work_finish_page.dart b/lib/ui/sub_pages/business_and_fix/fix_work_finish_page.dart index 47b99ef..99ce5ef 100644 --- a/lib/ui/sub_pages/business_and_fix/fix_work_finish_page.dart +++ b/lib/ui/sub_pages/business_and_fix/fix_work_finish_page.dart @@ -2,30 +2,30 @@ import 'dart:io'; // Flutter imports: -import 'package:aku_community_manager/const/api.dart'; -import 'package:aku_community_manager/models/manager/bussiness_and_fix/bussiness_and_fix_model.dart'; -import 'package:aku_community_manager/models/manager/bussiness_and_fix/fixed_detail_model.dart'; -import 'package:aku_community_manager/ui/sub_pages/business_and_fix/fix_submit_finish_page.dart'; -import 'package:aku_community_manager/utils/network/base_model.dart'; -import 'package:aku_community_manager/utils/network/manage_func.dart'; -import 'package:aku_community_manager/utils/network/net_util.dart'; -import 'package:bot_toast/bot_toast.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; // Package imports: import 'package:aku_ui/common_widgets/aku_material_button.dart'; +import 'package:bot_toast/bot_toast.dart'; import 'package:common_utils/common_utils.dart'; +import 'package:get/get.dart'; // Project imports: +import 'package:aku_community_manager/const/api.dart'; +import 'package:aku_community_manager/models/manager/bussiness_and_fix/bussiness_and_fix_model.dart'; +import 'package:aku_community_manager/models/manager/bussiness_and_fix/fixed_detail_model.dart'; import 'package:aku_community_manager/style/app_style.dart'; +import 'package:aku_community_manager/tools/extensions/router_extension_tool.dart'; import 'package:aku_community_manager/tools/screen_tool.dart'; import 'package:aku_community_manager/tools/widget_tool.dart'; +import 'package:aku_community_manager/ui/sub_pages/business_and_fix/fix_submit_finish_page.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; import 'package:aku_community_manager/ui/widgets/inner/aku_title_box.dart'; import 'package:aku_community_manager/ui/widgets/inner/pick_image.dart'; -import 'package:get/get.dart'; -import 'package:aku_community_manager/tools/extensions/router_extension_tool.dart'; +import 'package:aku_community_manager/utils/network/base_model.dart'; +import 'package:aku_community_manager/utils/network/manage_func.dart'; +import 'package:aku_community_manager/utils/network/net_util.dart'; class FixWorkFinishPage extends StatefulWidget { final FixedDetailModel model; @@ -430,7 +430,6 @@ class _FixWorkFinishPageState extends State { if (baseModel.status) { FixSubmitFinishPage( model: widget.fixModel, - ).to(); } else { BotToast.showText(text: baseModel.message); diff --git a/lib/ui/sub_pages/business_and_fix/fixer_department_page.dart b/lib/ui/sub_pages/business_and_fix/fixer_department_page.dart index e7cb0fe..6534266 100644 --- a/lib/ui/sub_pages/business_and_fix/fixer_department_page.dart +++ b/lib/ui/sub_pages/business_and_fix/fixer_department_page.dart @@ -1,32 +1,34 @@ // Flutter imports: -import 'package:aku_community_manager/const/api.dart'; -import 'package:aku_community_manager/models/manager/bussiness_and_fix/dispatch_report_model.dart'; -import 'package:aku_community_manager/models/manager/fixer_item_model.dart'; -import 'package:aku_community_manager/utils/network/base_model.dart'; -import 'package:aku_community_manager/utils/network/manage_func.dart'; -import 'package:aku_community_manager/utils/network/net_util.dart'; -import 'package:bot_toast/bot_toast.dart'; import 'package:flutter/material.dart'; // Package imports: import 'package:aku_ui/common_widgets/aku_material_button.dart'; +import 'package:bot_toast/bot_toast.dart'; import 'package:expandable/expandable.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:get/get.dart'; // Project imports: +import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/const/resource.dart'; +import 'package:aku_community_manager/models/manager/bussiness_and_fix/dispatch_report_model.dart'; +import 'package:aku_community_manager/models/manager/fixer_item_model.dart'; import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/tools/screen_tool.dart'; import 'package:aku_community_manager/tools/widget_tool.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; +import 'package:aku_community_manager/utils/network/base_model.dart'; +import 'package:aku_community_manager/utils/network/manage_func.dart'; +import 'package:aku_community_manager/utils/network/net_util.dart'; class FixerDepartmentPage extends StatefulWidget { final DispatchReportModel model; final bool changeType; - FixerDepartmentPage( - {Key key, @required this.model, this.changeType = false,}) - : super(key: key); + FixerDepartmentPage({ + Key key, + @required this.model, + this.changeType = false, + }) : super(key: key); @override _FixerDepartmentPageState createState() => _FixerDepartmentPageState(); @@ -91,9 +93,8 @@ class _FixerDepartmentPageState extends State { BotToast.showText(text: baseModel.message); } } else { - BaseModel baseModel = await ManageFunc.repairDispatch( - _reportModel - ); + BaseModel baseModel = + await ManageFunc.repairDispatch(_reportModel); if (baseModel.status) { Get.back(); Get.back(); diff --git a/lib/ui/sub_pages/decoration_manager/decoration_manager_card.dart b/lib/ui/sub_pages/decoration_manager/decoration_manager_card.dart index f7c248e..11f51ff 100644 --- a/lib/ui/sub_pages/decoration_manager/decoration_manager_card.dart +++ b/lib/ui/sub_pages/decoration_manager/decoration_manager_card.dart @@ -1,5 +1,4 @@ // Flutter imports: -import 'package:aku_community_manager/models/manager/decoration/decoration_list_model.dart'; import 'package:flutter/material.dart'; // Package imports: @@ -12,6 +11,7 @@ import 'package:provider/provider.dart'; import 'package:aku_community_manager/const/resource.dart'; import 'package:aku_community_manager/mock_models/decoration/decoration_model.dart'; import 'package:aku_community_manager/mock_models/users/user_info_model.dart'; +import 'package:aku_community_manager/models/manager/decoration/decoration_list_model.dart'; import 'package:aku_community_manager/provider/user_provider.dart'; import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/tools/screen_tool.dart'; diff --git a/lib/ui/sub_pages/decoration_manager/decoration_manager_detail_page.dart b/lib/ui/sub_pages/decoration_manager/decoration_manager_detail_page.dart index 2b8c416..a03b784 100644 --- a/lib/ui/sub_pages/decoration_manager/decoration_manager_detail_page.dart +++ b/lib/ui/sub_pages/decoration_manager/decoration_manager_detail_page.dart @@ -2,7 +2,6 @@ import 'dart:math'; // Flutter imports: -import 'package:aku_community_manager/tools/user_tool.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -20,6 +19,7 @@ import 'package:aku_community_manager/mock_models/users/user_info_model.dart'; import 'package:aku_community_manager/provider/user_provider.dart'; import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/tools/screen_tool.dart'; +import 'package:aku_community_manager/tools/user_tool.dart'; import 'package:aku_community_manager/tools/widget_tool.dart'; import 'package:aku_community_manager/ui/sub_pages/decoration_manager/decoration_check_row.dart'; import 'package:aku_community_manager/ui/sub_pages/decoration_manager/decoration_checkbox.dart'; diff --git a/lib/ui/sub_pages/decoration_manager/decoration_manager_page.dart b/lib/ui/sub_pages/decoration_manager/decoration_manager_page.dart index 0a10fcc..4485818 100644 --- a/lib/ui/sub_pages/decoration_manager/decoration_manager_page.dart +++ b/lib/ui/sub_pages/decoration_manager/decoration_manager_page.dart @@ -1,21 +1,21 @@ // Flutter imports: -import 'package:aku_community_manager/const/api.dart'; -import 'package:aku_community_manager/models/manager/decoration/decoration_list_model.dart'; -import 'package:aku_community_manager/ui/widgets/common/bee_list_view.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; // Package imports: +import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:provider/provider.dart'; // Project imports: +import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/mock_models/decoration/decoration_data.dart'; import 'package:aku_community_manager/mock_models/decoration/decoration_model.dart'; import 'package:aku_community_manager/mock_models/users/user_info_model.dart'; +import 'package:aku_community_manager/models/manager/decoration/decoration_list_model.dart'; import 'package:aku_community_manager/provider/user_provider.dart'; import 'package:aku_community_manager/tools/screen_tool.dart'; import 'package:aku_community_manager/ui/sub_pages/decoration_manager/decoration_manager_card.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; +import 'package:aku_community_manager/ui/widgets/common/bee_list_view.dart'; import 'package:aku_community_manager/ui/widgets/inner/aku_tab_bar.dart'; class DecorationManagerPage extends StatefulWidget { diff --git a/lib/ui/sub_pages/items_outdoor/items_outdoor_card.dart b/lib/ui/sub_pages/items_outdoor/items_outdoor_card.dart index 1163396..33019ca 100644 --- a/lib/ui/sub_pages/items_outdoor/items_outdoor_card.dart +++ b/lib/ui/sub_pages/items_outdoor/items_outdoor_card.dart @@ -1,18 +1,18 @@ // Flutter imports: -import 'package:aku_community_manager/models/manager/goods_out/goods_out_item_model.dart'; -import 'package:aku_community_manager/ui/sub_pages/items_outdoor/items_outdoor_details_page.dart'; import 'package:flutter/material.dart'; // Package imports: import 'package:aku_ui/common_widgets/aku_common_widgets.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:get/get.dart'; +import 'package:velocity_x/velocity_x.dart'; // Project imports: import 'package:aku_community_manager/const/resource.dart'; +import 'package:aku_community_manager/models/manager/goods_out/goods_out_item_model.dart'; import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/tools/widget_tool.dart'; -import 'package:get/get.dart'; -import 'package:velocity_x/velocity_x.dart'; +import 'package:aku_community_manager/ui/sub_pages/items_outdoor/items_outdoor_details_page.dart'; class ItemsOutdoorCard extends StatefulWidget { final GoodsOutItemModel model; diff --git a/lib/ui/sub_pages/items_outdoor/items_outdoor_details_page.dart b/lib/ui/sub_pages/items_outdoor/items_outdoor_details_page.dart index 67cc698..516461b 100644 --- a/lib/ui/sub_pages/items_outdoor/items_outdoor_details_page.dart +++ b/lib/ui/sub_pages/items_outdoor/items_outdoor_details_page.dart @@ -1,29 +1,29 @@ // Flutter imports: -import 'package:aku_community_manager/const/api.dart'; -import 'package:aku_community_manager/models/manager/goods_out/goods_out_detail_model.dart'; -import 'package:aku_community_manager/utils/network/base_model.dart'; -import 'package:aku_community_manager/utils/network/net_util.dart'; -import 'package:common_utils/common_utils.dart'; import 'package:flutter/material.dart'; -import 'package:aku_community_manager/tools/extensions/list_extension_tool.dart'; // Package imports: import 'package:aku_ui/aku_ui.dart'; import 'package:aku_ui/common_widgets/aku_material_button.dart'; +import 'package:common_utils/common_utils.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:provider/provider.dart'; +import 'package:url_launcher/url_launcher.dart'; // Project imports: +import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/const/resource.dart'; +import 'package:aku_community_manager/models/manager/goods_out/goods_out_detail_model.dart'; import 'package:aku_community_manager/provider/user_provider.dart'; import 'package:aku_community_manager/style/app_style.dart'; +import 'package:aku_community_manager/tools/extensions/list_extension_tool.dart'; import 'package:aku_community_manager/tools/widget_tool.dart'; import 'package:aku_community_manager/ui/sub_pages/items_outdoor/outdoor_notpass_page.dart'; import 'package:aku_community_manager/ui/sub_pages/items_outdoor/outdoor_pass_page.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; -import 'package:url_launcher/url_launcher.dart'; +import 'package:aku_community_manager/utils/network/base_model.dart'; +import 'package:aku_community_manager/utils/network/net_util.dart'; class ItemsOutdoorDetailsPage extends StatefulWidget { final int id; diff --git a/lib/ui/sub_pages/items_outdoor/items_outdoor_page.dart b/lib/ui/sub_pages/items_outdoor/items_outdoor_page.dart index cf336f2..f9a0ea2 100644 --- a/lib/ui/sub_pages/items_outdoor/items_outdoor_page.dart +++ b/lib/ui/sub_pages/items_outdoor/items_outdoor_page.dart @@ -1,12 +1,12 @@ - -import 'package:aku_community_manager/ui/sub_pages/items_outdoor/items_outdoor_view.dart'; +// Flutter imports: import 'package:flutter/material.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; // Package imports: +import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; // Project imports: +import 'package:aku_community_manager/ui/sub_pages/items_outdoor/items_outdoor_view.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; import 'package:aku_community_manager/ui/widgets/inner/aku_tab_bar.dart'; diff --git a/lib/ui/sub_pages/items_outdoor/items_outdoor_view.dart b/lib/ui/sub_pages/items_outdoor/items_outdoor_view.dart index 2bc709f..273f77c 100644 --- a/lib/ui/sub_pages/items_outdoor/items_outdoor_view.dart +++ b/lib/ui/sub_pages/items_outdoor/items_outdoor_view.dart @@ -1,10 +1,15 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_easyrefresh/easy_refresh.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; + +// Project imports: import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/models/manager/goods_out/goods_out_item_model.dart'; import 'package:aku_community_manager/ui/sub_pages/items_outdoor/items_outdoor_card.dart'; import 'package:aku_community_manager/ui/widgets/common/bee_list_view.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; class ItemsOutdoorView extends StatefulWidget { final int status; diff --git a/lib/ui/sub_pages/items_outdoor/outdoor_notpass_page.dart b/lib/ui/sub_pages/items_outdoor/outdoor_notpass_page.dart index 3b58514..f9ef084 100644 --- a/lib/ui/sub_pages/items_outdoor/outdoor_notpass_page.dart +++ b/lib/ui/sub_pages/items_outdoor/outdoor_notpass_page.dart @@ -1,19 +1,19 @@ // Flutter imports: -import 'package:aku_community_manager/const/api.dart'; -import 'package:aku_community_manager/utils/network/net_util.dart'; -import 'package:bot_toast/bot_toast.dart'; import 'package:flutter/material.dart'; // Package imports: import 'package:aku_ui/common_widgets/aku_common_widgets.dart'; +import 'package:bot_toast/bot_toast.dart'; import 'package:common_utils/common_utils.dart'; import 'package:get/get.dart'; // Project imports: +import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/tools/widget_tool.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_radio.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; +import 'package:aku_community_manager/utils/network/net_util.dart'; class OutdoorNotpassPage extends StatefulWidget { final int id; diff --git a/lib/ui/sub_pages/items_outdoor/outdoor_pass_page.dart b/lib/ui/sub_pages/items_outdoor/outdoor_pass_page.dart index c6944bd..3842e46 100644 --- a/lib/ui/sub_pages/items_outdoor/outdoor_pass_page.dart +++ b/lib/ui/sub_pages/items_outdoor/outdoor_pass_page.dart @@ -1,6 +1,4 @@ // Flutter imports: -import 'package:aku_community_manager/const/api.dart'; -import 'package:aku_community_manager/utils/network/net_util.dart'; import 'package:flutter/material.dart'; // Package imports: @@ -11,9 +9,11 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; // Project imports: +import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/tools/widget_tool.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; +import 'package:aku_community_manager/utils/network/net_util.dart'; class OutdoorPassPage extends StatefulWidget { final int id; diff --git a/lib/ui/sub_pages/manage_func.dart b/lib/ui/sub_pages/manage_func.dart index 01634a1..cb4e77a 100644 --- a/lib/ui/sub_pages/manage_func.dart +++ b/lib/ui/sub_pages/manage_func.dart @@ -1,5 +1,13 @@ +// Dart imports: import 'dart:io'; +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:dio/dio.dart'; + +// Project imports: import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/models/manager/decoration/decoration_detail_model.dart'; import 'package:aku_community_manager/models/manager/inspection/inspection_detail_model.dart'; @@ -7,8 +15,6 @@ import 'package:aku_community_manager/models/manager/inspection/inspection_point import 'package:aku_community_manager/models/manager/inspection/inspection_point_submit_model.dart'; import 'package:aku_community_manager/utils/network/base_model.dart'; import 'package:aku_community_manager/utils/network/net_util.dart'; -import 'package:dio/dio.dart'; -import 'package:flutter/material.dart'; class ManageFunc { static Future getDetcorationDetail(int id) async { @@ -83,8 +89,7 @@ class ManageFunc { return baseModel; } - static Future getInspectionPointCheckDetail( - int executePointId) async { + static Future getInspectionPointCheckDetail(int executePointId) async { BaseModel baseModel = await NetUtil().get(API.manage.inspectionPointCheckDetail, params: { "executePointId": executePointId, diff --git a/lib/ui/sub_pages/visitor_manager/visitor_manager_card.dart b/lib/ui/sub_pages/visitor_manager/visitor_manager_card.dart index 11b8fa7..cba1b37 100644 --- a/lib/ui/sub_pages/visitor_manager/visitor_manager_card.dart +++ b/lib/ui/sub_pages/visitor_manager/visitor_manager_card.dart @@ -2,15 +2,15 @@ import 'dart:math'; // Flutter imports: -import 'package:aku_community_manager/models/manager/visitor_item_model.dart'; -import 'package:common_utils/common_utils.dart'; import 'package:flutter/material.dart'; // Package imports: +import 'package:common_utils/common_utils.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; // Project imports: import 'package:aku_community_manager/const/resource.dart'; +import 'package:aku_community_manager/models/manager/visitor_item_model.dart'; import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/tools/widget_tool.dart'; import 'package:aku_community_manager/ui/sub_pages/visitor_manager/visitor_manager_page.dart'; diff --git a/lib/ui/sub_pages/visitor_manager/visitor_manager_page.dart b/lib/ui/sub_pages/visitor_manager/visitor_manager_page.dart index 547b8a9..ecdc6b1 100644 --- a/lib/ui/sub_pages/visitor_manager/visitor_manager_page.dart +++ b/lib/ui/sub_pages/visitor_manager/visitor_manager_page.dart @@ -1,5 +1,4 @@ // Flutter imports: -import 'package:aku_community_manager/ui/sub_pages/visitor_manager/visitor_manager_view.dart'; import 'package:flutter/material.dart'; // Package imports: @@ -7,6 +6,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; // Project imports: import 'package:aku_community_manager/style/app_style.dart'; +import 'package:aku_community_manager/ui/sub_pages/visitor_manager/visitor_manager_view.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; import 'package:aku_community_manager/ui/widgets/inner/aku_tab_bar.dart'; diff --git a/lib/ui/sub_pages/visitor_manager/visitor_manager_view.dart b/lib/ui/sub_pages/visitor_manager/visitor_manager_view.dart index 8a48404..827fc6d 100644 --- a/lib/ui/sub_pages/visitor_manager/visitor_manager_view.dart +++ b/lib/ui/sub_pages/visitor_manager/visitor_manager_view.dart @@ -1,10 +1,15 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_easyrefresh/easy_refresh.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; + +// Project imports: import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/models/manager/visitor_item_model.dart'; import 'package:aku_community_manager/ui/sub_pages/visitor_manager/visitor_manager_card.dart'; import 'package:aku_community_manager/ui/widgets/common/bee_list_view.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; class VisitorManagerView extends StatefulWidget { final int status; diff --git a/lib/ui/tool_pages/warning/warning_page.dart b/lib/ui/tool_pages/warning/warning_page.dart index 7d486a7..051d63f 100644 --- a/lib/ui/tool_pages/warning/warning_page.dart +++ b/lib/ui/tool_pages/warning/warning_page.dart @@ -1,24 +1,25 @@ -// Flutter imports: +// Dart imports: import 'dart:ui'; -import 'package:aku_community_manager/provider/app_provider.dart'; +// Flutter imports: import 'package:flutter/material.dart'; // Package imports: import 'package:aku_ui/common_widgets/aku_cupertino_button.dart'; import 'package:aku_ui/common_widgets/aku_material_button.dart'; +import 'package:amap_flutter_base/amap_flutter_base.dart'; +import 'package:amap_flutter_map/amap_flutter_map.dart'; import 'package:get/get.dart'; +import 'package:permission_handler/permission_handler.dart'; +import 'package:provider/provider.dart'; +import 'package:url_launcher/url_launcher.dart'; // Project imports: +import 'package:aku_community_manager/provider/app_provider.dart'; import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/tools/widget_tool.dart'; import 'package:aku_community_manager/ui/tool_pages/warning/warning_detail_page.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; -import 'package:permission_handler/permission_handler.dart'; -import 'package:provider/provider.dart'; -import 'package:url_launcher/url_launcher.dart'; -import 'package:amap_flutter_base/amap_flutter_base.dart'; -import 'package:amap_flutter_map/amap_flutter_map.dart'; class PermissonUtil { static Future getLocationPermisson() async { diff --git a/lib/ui/widgets/app_widgets/aku_pick_image_widget.dart b/lib/ui/widgets/app_widgets/aku_pick_image_widget.dart index 7b1f05b..e0b37e6 100644 --- a/lib/ui/widgets/app_widgets/aku_pick_image_widget.dart +++ b/lib/ui/widgets/app_widgets/aku_pick_image_widget.dart @@ -1,13 +1,19 @@ +// Dart imports: import 'dart:io'; -import 'package:aku_community_manager/style/app_style.dart'; -import 'package:aku_community_manager/ui/widgets/inner/pick_image.dart'; -import 'package:dotted_border/dotted_border.dart'; +// Flutter imports: import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:dotted_border/dotted_border.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:aku_community_manager/const/resource.dart'; import 'package:velocity_x/velocity_x.dart'; + +// Project imports: +import 'package:aku_community_manager/const/resource.dart'; +import 'package:aku_community_manager/style/app_style.dart'; +import 'package:aku_community_manager/ui/widgets/inner/pick_image.dart'; import 'package:aku_community_manager/utils/extension/list_extension.dart'; class AkuPickImageWidget extends StatefulWidget { diff --git a/lib/ui/widgets/app_widgets/aku_single_check_button.dart b/lib/ui/widgets/app_widgets/aku_single_check_button.dart index 19115f7..4f174cc 100644 --- a/lib/ui/widgets/app_widgets/aku_single_check_button.dart +++ b/lib/ui/widgets/app_widgets/aku_single_check_button.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:velocity_x/velocity_x.dart'; diff --git a/lib/ui/widgets/common/aku_radio.dart b/lib/ui/widgets/common/aku_radio.dart index f9f90cb..4f59514 100644 --- a/lib/ui/widgets/common/aku_radio.dart +++ b/lib/ui/widgets/common/aku_radio.dart @@ -1,5 +1,3 @@ - - // Flutter imports: import 'package:flutter/material.dart'; diff --git a/lib/ui/widgets/common/bee_list_view.dart b/lib/ui/widgets/common/bee_list_view.dart index 69f95f8..fa599ed 100644 --- a/lib/ui/widgets/common/bee_list_view.dart +++ b/lib/ui/widgets/common/bee_list_view.dart @@ -1,12 +1,14 @@ // Flutter imports: -import 'package:aku_community_manager/style/app_style.dart'; -import 'package:aku_community_manager/utils/network/base_list_model.dart'; -import 'package:aku_community_manager/utils/network/net_util.dart'; import 'package:flutter/material.dart'; // Package imports: import 'package:flutter_easyrefresh/easy_refresh.dart'; +// Project imports: +import 'package:aku_community_manager/style/app_style.dart'; +import 'package:aku_community_manager/utils/network/base_list_model.dart'; +import 'package:aku_community_manager/utils/network/net_util.dart'; + /// ## BeeListView ///```dart ///BeeListView( diff --git a/lib/ui/widgets/inner/show_bottom_sheet.dart b/lib/ui/widgets/inner/show_bottom_sheet.dart index 0f6f029..db98177 100644 --- a/lib/ui/widgets/inner/show_bottom_sheet.dart +++ b/lib/ui/widgets/inner/show_bottom_sheet.dart @@ -77,7 +77,7 @@ Future showItemSheet({ style: TextStyle( fontWeight: FontWeight.bold, fontSize: 32.sp, - color: items.indexOf(e)==ids.indexOf(selectItem) + color: items.indexOf(e) == ids.indexOf(selectItem) ? AppStyle.secondaryColor : AppStyle.primaryTextColor, ), diff --git a/lib/utils/extension/aku_date.dart b/lib/utils/extension/aku_date.dart index 367e168..47338dc 100644 --- a/lib/utils/extension/aku_date.dart +++ b/lib/utils/extension/aku_date.dart @@ -1,3 +1,4 @@ +// Package imports: import 'package:common_utils/common_utils.dart'; extension DateExt on String { diff --git a/lib/utils/extension/list_extension.dart b/lib/utils/extension/list_extension.dart index e17d3cd..20d4cb0 100644 --- a/lib/utils/extension/list_extension.dart +++ b/lib/utils/extension/list_extension.dart @@ -1,6 +1,9 @@ +// Flutter imports: import 'package:flutter/material.dart'; -import 'package:velocity_x/velocity_x.dart'; + +// Package imports: import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:velocity_x/velocity_x.dart'; extension SeparateExt on List { List sepWidget({Widget separate}) { diff --git a/lib/utils/jpush_message_parse.dart b/lib/utils/jpush_message_parse.dart index b29d34c..69d7e4a 100644 --- a/lib/utils/jpush_message_parse.dart +++ b/lib/utils/jpush_message_parse.dart @@ -1,10 +1,14 @@ +// Dart imports: import 'dart:convert'; +// Flutter imports: import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:velocity_x/velocity_x.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; class JpushMessageParse { final Map message; diff --git a/lib/utils/network/manage_func.dart b/lib/utils/network/manage_func.dart index 21dcc65..d2348a9 100644 --- a/lib/utils/network/manage_func.dart +++ b/lib/utils/network/manage_func.dart @@ -1,10 +1,15 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:dio/dio.dart'; + +// Project imports: import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/models/manager/bussiness_and_fix/dispatch_report_model.dart'; import 'package:aku_community_manager/models/manager/bussiness_and_fix/fixed_detail_model.dart'; import 'package:aku_community_manager/utils/network/base_model.dart'; import 'package:aku_community_manager/utils/network/net_util.dart'; -import 'package:dio/dio.dart'; -import 'package:flutter/material.dart'; class ManageFunc { ///报事报修详情 diff --git a/lib/utils/network/net_util.dart b/lib/utils/network/net_util.dart index 0be030f..5ef961c 100644 --- a/lib/utils/network/net_util.dart +++ b/lib/utils/network/net_util.dart @@ -2,19 +2,19 @@ import 'dart:io'; // Package imports: -import 'package:aku_community_manager/provider/user_provider.dart'; -import 'package:aku_community_manager/ui/login/login_page.dart'; import 'package:bot_toast/bot_toast.dart'; import 'package:dio/dio.dart'; import 'package:get/get.dart' hide Response, FormData, MultipartFile; import 'package:power_logger/power_logger.dart'; +import 'package:provider/provider.dart'; // Project imports: import 'package:aku_community_manager/const/api.dart'; +import 'package:aku_community_manager/provider/user_provider.dart'; +import 'package:aku_community_manager/ui/login/login_page.dart'; import 'package:aku_community_manager/utils/network/base_file_model.dart'; import 'package:aku_community_manager/utils/network/base_list_model.dart'; import 'package:aku_community_manager/utils/network/base_model.dart'; -import 'package:provider/provider.dart'; class NetUtil { Dio _dio; @@ -34,12 +34,15 @@ class NetUtil { ); if (_dio == null) _dio = Dio(options); dio.interceptors.add(InterceptorsWrapper( - onRequest: (RequestOptions options,RequestInterceptorHandler handler) async => handler.next(options), - onResponse: (Response response,ResponseInterceptorHandler handler) async { + onRequest: + (RequestOptions options, RequestInterceptorHandler handler) async => + handler.next(options), + onResponse: + (Response response, ResponseInterceptorHandler handler) async { LoggerData.addData(response); return handler.next(response); }, - onError: (DioError error,ErrorInterceptorHandler handler) async { + onError: (DioError error, ErrorInterceptorHandler handler) async { _parseErr(error); return handler.next(error); },