From 2565623a6eaf9d00c2cabf028b984d2a4b872700 Mon Sep 17 00:00:00 2001 From: zhang <494089941@qq.com> Date: Wed, 24 Feb 2021 17:46:38 +0800 Subject: [PATCH] =?UTF-8?q?import=E5=AF=BC=E5=85=A5=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/constants/application_objects.dart | 12 ++++++------ lib/model/user/committee_item_model.dart | 1 + lib/pages/home/home_page.dart | 6 +++--- lib/pages/home/widget/animate_app_bar.dart | 4 +++- lib/pages/home/widget/home_search.dart | 8 +++++--- lib/pages/life_pay/life_pay_page.dart | 6 +++--- lib/pages/manager_func.dart | 11 ++++++----- .../comment_message/comment_message_page.dart | 17 +++++++++++------ .../message_center_page.dart | 15 ++++++++++----- .../message_center_page/message_func.dart | 1 + .../system_message_detail_page.dart | 11 ++++++++--- .../system_message/system_message_page.dart | 13 +++++++++---- lib/pages/personal/personal_page.dart | 4 ++-- lib/pages/personal/user_profile_page.dart | 4 ++-- lib/pages/property/property_index.dart | 2 +- lib/pages/splash/splash_page.dart | 4 ++-- lib/pages/things_page/fixed_submit_page.dart | 2 +- .../widget/add_fixed_submit_page.dart | 2 +- .../visitor_access_page.dart | 8 ++++---- lib/provider/app_provider.dart | 10 ++++++---- lib/provider/user_provider.dart | 2 +- .../community_views/community_page.dart | 2 +- .../community_views/widgets/chat_card.dart | 3 ++- .../questionnaire_detail_page.dart | 15 ++++++++++----- .../questionnaire/questionnaire_page.dart | 4 ++-- .../questionnaire_siglecheck.dart | 7 +++++-- .../questionnaire_truefalse.dart | 7 ++++++- .../questionnarie_raido_check.dart | 7 +++++-- .../questionnaire/submit_complish_page.dart | 11 ++++++++--- lib/ui/message/message_center.dart | 19 ++++++++++++------- lib/utils/weather/weather_util.dart | 5 ++++- lib/widget/app_bar_action.dart | 2 +- lib/widget/others/bee_header_house.dart | 15 ++++++++++----- lib/widget/picker/bee_date_picker.dart | 4 +++- lib/widget/views/application_box.dart | 4 +++- lib/widget/views/application_view.dart | 6 +++--- 36 files changed, 161 insertions(+), 93 deletions(-) diff --git a/lib/constants/application_objects.dart b/lib/constants/application_objects.dart index c5c33107..22709154 100644 --- a/lib/constants/application_objects.dart +++ b/lib/constants/application_objects.dart @@ -1,15 +1,10 @@ // Flutter imports: -import 'package:akuCommunity/pages/address_page/address_page.dart'; -import 'package:akuCommunity/pages/mine_car_page/mine_car_page.dart'; -import 'package:akuCommunity/pages/mine_house_page/mine_house_page.dart'; -import 'package:akuCommunity/pages/setting_page/settings_page.dart'; -import 'package:akuCommunity/ui/community/activity/activity_list_page.dart'; -import 'package:akuCommunity/ui/manager/questionnaire/questionnaire_page.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; // Project imports: import 'package:akuCommunity/const/resource.dart'; +import 'package:akuCommunity/pages/address_page/address_page.dart'; import 'package:akuCommunity/pages/convenient_phone/convenient_phone_page.dart'; import 'package:akuCommunity/pages/event_activity/event_voting_page.dart'; import 'package:akuCommunity/pages/fitup_manage/fitup_manage_page.dart'; @@ -17,13 +12,18 @@ import 'package:akuCommunity/pages/goods_deto_page/goods_deto_page.dart'; import 'package:akuCommunity/pages/goods_manage_page/goods_manage_page.dart'; import 'package:akuCommunity/pages/industry_committee/industry_committee_page.dart'; import 'package:akuCommunity/pages/life_pay/life_pay_page.dart'; +import 'package:akuCommunity/pages/mine_car_page/mine_car_page.dart'; +import 'package:akuCommunity/pages/mine_house_page/mine_house_page.dart'; import 'package:akuCommunity/pages/one_alarm/widget/alarm_page.dart'; import 'package:akuCommunity/pages/open_door_page/open_door_page.dart'; import 'package:akuCommunity/pages/opening_code_page/opening_code_page.dart'; +import 'package:akuCommunity/pages/setting_page/settings_page.dart'; import 'package:akuCommunity/pages/things_page/fixed_submit_page.dart'; import 'package:akuCommunity/pages/visitor_access_page/visitor_access_page.dart'; +import 'package:akuCommunity/ui/community/activity/activity_list_page.dart'; import 'package:akuCommunity/ui/home/application/all_application.dart'; import 'package:akuCommunity/ui/manager/advice/advice_page.dart'; +import 'package:akuCommunity/ui/manager/questionnaire/questionnaire_page.dart'; ///应用对象 ///Application Object diff --git a/lib/model/user/committee_item_model.dart b/lib/model/user/committee_item_model.dart index 08e7f6e1..533d992e 100644 --- a/lib/model/user/committee_item_model.dart +++ b/lib/model/user/committee_item_model.dart @@ -1,3 +1,4 @@ +// Project imports: import 'package:akuCommunity/model/common/img_model.dart'; class CommitteeItemModel { diff --git a/lib/pages/home/home_page.dart b/lib/pages/home/home_page.dart index e7590d23..6e33b809 100644 --- a/lib/pages/home/home_page.dart +++ b/lib/pages/home/home_page.dart @@ -1,13 +1,11 @@ // Dart imports: // Flutter imports: -import 'package:akuCommunity/pages/message_center_page/message_center_page.dart'; -import 'package:akuCommunity/provider/app_provider.dart'; -import 'package:badges/badges.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; // Package imports: +import 'package:badges/badges.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:provider/provider.dart'; @@ -20,6 +18,8 @@ import 'package:akuCommunity/model/aku_shop_model.dart'; import 'package:akuCommunity/model/community/activity_item_model.dart'; import 'package:akuCommunity/model/community/board_model.dart'; import 'package:akuCommunity/pages/home/widget/animate_app_bar.dart'; +import 'package:akuCommunity/pages/message_center_page/message_center_page.dart'; +import 'package:akuCommunity/provider/app_provider.dart'; import 'package:akuCommunity/ui/community/activity/activity_card.dart'; import 'package:akuCommunity/ui/community/activity/activity_list_page.dart'; import 'package:akuCommunity/ui/community/community_func.dart'; diff --git a/lib/pages/home/widget/animate_app_bar.dart b/lib/pages/home/widget/animate_app_bar.dart index 29b86b23..c6f4dbae 100644 --- a/lib/pages/home/widget/animate_app_bar.dart +++ b/lib/pages/home/widget/animate_app_bar.dart @@ -1,5 +1,4 @@ // Flutter imports: -import 'package:akuCommunity/provider/app_provider.dart'; import 'package:flutter/material.dart'; // Package imports: @@ -7,6 +6,9 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:provider/provider.dart'; import 'package:velocity_x/velocity_x.dart'; +// Project imports: +import 'package:akuCommunity/provider/app_provider.dart'; + class AnimateAppBar extends StatefulWidget with PreferredSizeWidget { final ScrollController scrollController; final List actions; diff --git a/lib/pages/home/widget/home_search.dart b/lib/pages/home/widget/home_search.dart index 2f7ea95f..a6eb0125 100644 --- a/lib/pages/home/widget/home_search.dart +++ b/lib/pages/home/widget/home_search.dart @@ -1,12 +1,14 @@ // Flutter imports: -import 'package:akuCommunity/base/base_style.dart'; -import 'package:akuCommunity/ui/search/bee_search.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +// Package imports: +import 'package:get/get.dart'; + // Project imports: +import 'package:akuCommunity/base/base_style.dart'; +import 'package:akuCommunity/ui/search/bee_search.dart'; import 'package:akuCommunity/utils/headers.dart'; -import 'package:get/get.dart'; class HomeSearch extends StatefulWidget { HomeSearch({Key key}) : super(key: key); diff --git a/lib/pages/life_pay/life_pay_page.dart b/lib/pages/life_pay/life_pay_page.dart index 080be60a..20f26a17 100644 --- a/lib/pages/life_pay/life_pay_page.dart +++ b/lib/pages/life_pay/life_pay_page.dart @@ -1,7 +1,4 @@ // Flutter imports: -import 'package:akuCommunity/pages/life_pay/widget/my_house_page.dart'; -import 'package:akuCommunity/widget/bee_divider.dart'; -import 'package:akuCommunity/widget/others/bee_header_house.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -16,12 +13,15 @@ import 'package:akuCommunity/constants/api.dart'; import 'package:akuCommunity/model/manager/life_pay_model.dart'; import 'package:akuCommunity/pages/life_pay/life_pay_record_page/life_pay_record_page.dart'; import 'package:akuCommunity/pages/life_pay/widget/life_pay_detail_page.dart'; +import 'package:akuCommunity/pages/life_pay/widget/my_house_page.dart'; import 'package:akuCommunity/pages/things_page/widget/bee_list_view.dart'; import 'package:akuCommunity/provider/user_provider.dart'; import 'package:akuCommunity/utils/bee_parse.dart'; import 'package:akuCommunity/utils/headers.dart'; +import 'package:akuCommunity/widget/bee_divider.dart'; import 'package:akuCommunity/widget/bee_scaffold.dart'; import 'package:akuCommunity/widget/buttons/bee_check_radio.dart'; +import 'package:akuCommunity/widget/others/bee_header_house.dart'; class LifePayPage extends StatefulWidget { LifePayPage({Key key}) : super(key: key); diff --git a/lib/pages/manager_func.dart b/lib/pages/manager_func.dart index 979ba295..988d7b7b 100644 --- a/lib/pages/manager_func.dart +++ b/lib/pages/manager_func.dart @@ -1,16 +1,17 @@ // Package imports: -import 'package:akuCommunity/model/manager/article_QR_code_model.dart'; -import 'package:akuCommunity/model/manager/moving_company_model.dart'; -import 'package:akuCommunity/model/manager/questionnaire_detail_model.dart'; -import 'package:akuCommunity/model/manager/quetionnaire_submit_model.dart'; -import 'package:akuCommunity/model/manager/voting_detail_model.dart'; +// Package imports: import 'package:dio/dio.dart'; import 'package:flustars/flustars.dart'; // Project imports: import 'package:akuCommunity/constants/api.dart'; +import 'package:akuCommunity/model/manager/article_QR_code_model.dart'; import 'package:akuCommunity/model/manager/fixed_detail_model.dart'; +import 'package:akuCommunity/model/manager/moving_company_model.dart'; +import 'package:akuCommunity/model/manager/questionnaire_detail_model.dart'; +import 'package:akuCommunity/model/manager/quetionnaire_submit_model.dart'; +import 'package:akuCommunity/model/manager/voting_detail_model.dart'; import 'package:akuCommunity/utils/network/base_model.dart'; import 'package:akuCommunity/utils/network/net_util.dart'; diff --git a/lib/pages/message_center_page/comment_message/comment_message_page.dart b/lib/pages/message_center_page/comment_message/comment_message_page.dart index 7433beba..267999ee 100644 --- a/lib/pages/message_center_page/comment_message/comment_message_page.dart +++ b/lib/pages/message_center_page/comment_message/comment_message_page.dart @@ -1,15 +1,20 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flustars/flustars.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:akuCommunity/const/resource.dart'; import 'package:akuCommunity/constants/api.dart'; import 'package:akuCommunity/model/message/comment_message_model.dart'; import 'package:akuCommunity/pages/things_page/widget/bee_list_view.dart'; import 'package:akuCommunity/utils/bee_date_util.dart'; import 'package:akuCommunity/widget/bee_divider.dart'; import 'package:akuCommunity/widget/bee_scaffold.dart'; -import 'package:flustars/flustars.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:akuCommunity/const/resource.dart'; -import 'package:velocity_x/velocity_x.dart'; class CommentMessagePage extends StatefulWidget { CommentMessagePage({Key key}) : super(key: key); diff --git a/lib/pages/message_center_page/message_center_page.dart b/lib/pages/message_center_page/message_center_page.dart index 49735956..23fe2038 100644 --- a/lib/pages/message_center_page/message_center_page.dart +++ b/lib/pages/message_center_page/message_center_page.dart @@ -1,15 +1,20 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:badges/badges.dart'; +import 'package:flutter_easyrefresh/easy_refresh.dart'; +import 'package:provider/provider.dart'; + +// Project imports: import 'package:akuCommunity/constants/api.dart'; import 'package:akuCommunity/pages/message_center_page/comment_message/comment_message_page.dart'; import 'package:akuCommunity/pages/message_center_page/system_message/system_message_page.dart'; import 'package:akuCommunity/provider/app_provider.dart'; +import 'package:akuCommunity/utils/headers.dart'; import 'package:akuCommunity/utils/network/net_util.dart'; import 'package:akuCommunity/widget/bee_scaffold.dart'; import 'package:akuCommunity/widget/buttons/column_action_button.dart'; -import 'package:badges/badges.dart'; -import 'package:flutter/material.dart'; -import 'package:akuCommunity/utils/headers.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; -import 'package:provider/provider.dart'; class MessageCenterPage extends StatefulWidget { MessageCenterPage({Key key}) : super(key: key); diff --git a/lib/pages/message_center_page/message_func.dart b/lib/pages/message_center_page/message_func.dart index 9f3ae565..fc2ce3f6 100644 --- a/lib/pages/message_center_page/message_func.dart +++ b/lib/pages/message_center_page/message_func.dart @@ -1,3 +1,4 @@ +// Project imports: import 'package:akuCommunity/constants/api.dart'; import 'package:akuCommunity/model/message/system_message_detail_model.dart'; import 'package:akuCommunity/utils/network/base_model.dart'; diff --git a/lib/pages/message_center_page/system_message/system_message_detail_page.dart b/lib/pages/message_center_page/system_message/system_message_detail_page.dart index 28c669a5..5ea50e18 100644 --- a/lib/pages/message_center_page/system_message/system_message_detail_page.dart +++ b/lib/pages/message_center_page/system_message/system_message_detail_page.dart @@ -1,10 +1,15 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_easyrefresh/easy_refresh.dart'; + +// Project imports: import 'package:akuCommunity/model/message/system_message_detail_model.dart'; import 'package:akuCommunity/model/message/system_message_model.dart'; import 'package:akuCommunity/pages/message_center_page/message_func.dart'; -import 'package:akuCommunity/widget/bee_scaffold.dart'; -import 'package:flutter/material.dart'; import 'package:akuCommunity/utils/headers.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; +import 'package:akuCommunity/widget/bee_scaffold.dart'; class SystemMessageDetailPage extends StatefulWidget { final int id; diff --git a/lib/pages/message_center_page/system_message/system_message_page.dart b/lib/pages/message_center_page/system_message/system_message_page.dart index 8b21d313..cb85d443 100644 --- a/lib/pages/message_center_page/system_message/system_message_page.dart +++ b/lib/pages/message_center_page/system_message/system_message_page.dart @@ -1,16 +1,21 @@ +// Flutter imports: +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_easyrefresh/easy_refresh.dart'; + +// Project imports: import 'package:akuCommunity/base/base_style.dart'; import 'package:akuCommunity/constants/api.dart'; import 'package:akuCommunity/model/message/system_message_model.dart'; import 'package:akuCommunity/pages/message_center_page/system_message/system_message_detail_page.dart'; import 'package:akuCommunity/pages/things_page/widget/bee_list_view.dart'; import 'package:akuCommunity/utils/bee_map.dart'; +import 'package:akuCommunity/utils/headers.dart'; import 'package:akuCommunity/utils/network/net_util.dart'; import 'package:akuCommunity/widget/bee_divider.dart'; import 'package:akuCommunity/widget/bee_scaffold.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; -import 'package:akuCommunity/utils/headers.dart'; class SystemMessagePage extends StatefulWidget { SystemMessagePage({Key key}) : super(key: key); diff --git a/lib/pages/personal/personal_page.dart b/lib/pages/personal/personal_page.dart index 43a15fd8..78c2dbc4 100644 --- a/lib/pages/personal/personal_page.dart +++ b/lib/pages/personal/personal_page.dart @@ -1,6 +1,4 @@ // Flutter imports: -import 'package:akuCommunity/constants/application_objects.dart'; -import 'package:akuCommunity/widget/views/application_view.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -14,12 +12,14 @@ import 'package:akuCommunity/base/assets_image.dart'; import 'package:akuCommunity/base/base_style.dart'; import 'package:akuCommunity/const/resource.dart'; import 'package:akuCommunity/constants/api.dart'; +import 'package:akuCommunity/constants/application_objects.dart'; import 'package:akuCommunity/pages/personal/order_page.dart'; import 'package:akuCommunity/pages/personal/user_profile_page.dart'; import 'package:akuCommunity/pages/sign/sign_in_page.dart'; import 'package:akuCommunity/painters/user_bottom_bar_painter.dart'; import 'package:akuCommunity/provider/user_provider.dart'; import 'package:akuCommunity/utils/headers.dart'; +import 'package:akuCommunity/widget/views/application_view.dart'; class PersonalIndex extends StatefulWidget { final bool isSign; diff --git a/lib/pages/personal/user_profile_page.dart b/lib/pages/personal/user_profile_page.dart index e36b9a32..ff4bc6be 100644 --- a/lib/pages/personal/user_profile_page.dart +++ b/lib/pages/personal/user_profile_page.dart @@ -2,8 +2,6 @@ import 'dart:io'; // Flutter imports: -import 'package:akuCommunity/widget/picker/bee_custom_picker.dart'; -import 'package:akuCommunity/widget/picker/bee_date_picker.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -25,6 +23,8 @@ import 'package:akuCommunity/utils/headers.dart'; import 'package:akuCommunity/utils/network/base_file_model.dart'; import 'package:akuCommunity/utils/network/net_util.dart'; import 'package:akuCommunity/widget/bee_scaffold.dart'; +import 'package:akuCommunity/widget/picker/bee_custom_picker.dart'; +import 'package:akuCommunity/widget/picker/bee_date_picker.dart'; import 'package:akuCommunity/widget/picker/bee_image_picker.dart'; class UserProfilePage extends StatefulWidget { diff --git a/lib/pages/property/property_index.dart b/lib/pages/property/property_index.dart index 9371a6a1..d9b0eb67 100644 --- a/lib/pages/property/property_index.dart +++ b/lib/pages/property/property_index.dart @@ -1,5 +1,4 @@ // Flutter imports: -import 'package:akuCommunity/widget/views/application_box.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -15,6 +14,7 @@ import 'package:akuCommunity/utils/headers.dart'; import 'package:akuCommunity/utils/network/base_list_model.dart'; import 'package:akuCommunity/utils/network/net_util.dart'; import 'package:akuCommunity/widget/bee_scaffold.dart'; +import 'package:akuCommunity/widget/views/application_box.dart'; import 'package:akuCommunity/widget/views/application_view.dart'; import 'widget/property_card.dart'; diff --git a/lib/pages/splash/splash_page.dart b/lib/pages/splash/splash_page.dart index b3ee2e63..7e8851c0 100644 --- a/lib/pages/splash/splash_page.dart +++ b/lib/pages/splash/splash_page.dart @@ -1,6 +1,4 @@ // Flutter imports: -import 'package:akuCommunity/const/resource.dart'; -import 'package:akuCommunity/utils/weather/weather_util.dart'; import 'package:flutter/material.dart'; // Package imports: @@ -14,10 +12,12 @@ import 'package:provider/provider.dart'; import 'package:velocity_x/velocity_x.dart'; // Project imports: +import 'package:akuCommunity/const/resource.dart'; import 'package:akuCommunity/pages/tab_navigator.dart'; import 'package:akuCommunity/provider/app_provider.dart'; import 'package:akuCommunity/provider/user_provider.dart'; import 'package:akuCommunity/utils/hive_store.dart'; +import 'package:akuCommunity/utils/weather/weather_util.dart'; //TODO splashPage class SplashPage extends StatefulWidget { diff --git a/lib/pages/things_page/fixed_submit_page.dart b/lib/pages/things_page/fixed_submit_page.dart index b01a3af9..6abc1204 100644 --- a/lib/pages/things_page/fixed_submit_page.dart +++ b/lib/pages/things_page/fixed_submit_page.dart @@ -1,5 +1,4 @@ // Flutter imports: -import 'package:akuCommunity/widget/buttons/bottom_button.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -25,6 +24,7 @@ import 'package:akuCommunity/pages/things_page/widget/fixed_detail_page.dart'; import 'package:akuCommunity/provider/user_provider.dart'; import 'package:akuCommunity/utils/bee_map.dart'; import 'package:akuCommunity/widget/bee_scaffold.dart'; +import 'package:akuCommunity/widget/buttons/bottom_button.dart'; import 'package:akuCommunity/widget/views/horizontal_image_view.dart'; class FixedSubmitPage extends StatefulWidget { diff --git a/lib/pages/things_page/widget/add_fixed_submit_page.dart b/lib/pages/things_page/widget/add_fixed_submit_page.dart index 30d8b4c7..6b18375e 100644 --- a/lib/pages/things_page/widget/add_fixed_submit_page.dart +++ b/lib/pages/things_page/widget/add_fixed_submit_page.dart @@ -2,7 +2,6 @@ import 'dart:io'; // Flutter imports: -import 'package:akuCommunity/widget/others/bee_header_house.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -29,6 +28,7 @@ import 'package:akuCommunity/utils/network/net_util.dart'; import 'package:akuCommunity/widget/bee_divider.dart'; import 'package:akuCommunity/widget/bee_scaffold.dart'; import 'package:akuCommunity/widget/buttons/bottom_button.dart'; +import 'package:akuCommunity/widget/others/bee_header_house.dart'; import 'package:akuCommunity/widget/picker/grid_image_picker.dart'; class AddFixedSubmitPage extends StatefulWidget { diff --git a/lib/pages/visitor_access_page/visitor_access_page.dart b/lib/pages/visitor_access_page/visitor_access_page.dart index fd801cec..006289f2 100644 --- a/lib/pages/visitor_access_page/visitor_access_page.dart +++ b/lib/pages/visitor_access_page/visitor_access_page.dart @@ -1,8 +1,4 @@ // Flutter imports: -import 'package:akuCommunity/base/base_style.dart'; -import 'package:akuCommunity/pages/life_pay/widget/my_house_page.dart'; -import 'package:akuCommunity/utils/bee_parse.dart'; -import 'package:akuCommunity/widget/bee_divider.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -15,10 +11,14 @@ import 'package:velocity_x/velocity_x.dart'; // Project imports: import 'package:akuCommunity/base/assets_image.dart'; +import 'package:akuCommunity/base/base_style.dart'; +import 'package:akuCommunity/pages/life_pay/widget/my_house_page.dart'; import 'package:akuCommunity/pages/manager_func.dart'; import 'package:akuCommunity/provider/user_provider.dart'; import 'package:akuCommunity/ui/manager/visitor/visitor_record_page.dart'; +import 'package:akuCommunity/utils/bee_parse.dart'; import 'package:akuCommunity/utils/headers.dart'; +import 'package:akuCommunity/widget/bee_divider.dart'; import 'package:akuCommunity/widget/bee_scaffold.dart'; import 'package:akuCommunity/widget/common_input.dart'; import 'package:akuCommunity/widget/picker/bee_date_picker.dart'; diff --git a/lib/provider/app_provider.dart b/lib/provider/app_provider.dart index 5da0e90c..90eb628f 100644 --- a/lib/provider/app_provider.dart +++ b/lib/provider/app_provider.dart @@ -1,18 +1,20 @@ // Flutter imports: -import 'package:akuCommunity/model/common/real_time_weather_model.dart'; -import 'package:akuCommunity/model/message/message_center_model.dart'; +import 'package:flutter/material.dart'; + +// Package imports: import 'package:amap_location_fluttify/amap_location_fluttify.dart'; import 'package:dio/dio.dart'; -import 'package:flutter/material.dart'; +import 'package:power_logger/power_logger.dart'; // Project imports: import 'package:akuCommunity/constants/api.dart'; import 'package:akuCommunity/constants/application_objects.dart'; +import 'package:akuCommunity/model/common/real_time_weather_model.dart'; import 'package:akuCommunity/model/community/hot_topic_model.dart'; +import 'package:akuCommunity/model/message/message_center_model.dart'; import 'package:akuCommunity/utils/hive_store.dart'; import 'package:akuCommunity/utils/network/base_model.dart'; import 'package:akuCommunity/utils/network/net_util.dart'; -import 'package:power_logger/power_logger.dart'; class AppProvider extends ChangeNotifier { ///初始值为 diff --git a/lib/provider/user_provider.dart b/lib/provider/user_provider.dart index a7aa3f79..2c44811f 100644 --- a/lib/provider/user_provider.dart +++ b/lib/provider/user_provider.dart @@ -1,5 +1,4 @@ // Flutter imports: -import 'package:akuCommunity/utils/bee_parse.dart'; import 'package:flutter/material.dart'; // Package imports: @@ -10,6 +9,7 @@ import 'package:akuCommunity/constants/api.dart'; import 'package:akuCommunity/model/user/user_detail_model.dart'; import 'package:akuCommunity/model/user/user_info_model.dart'; import 'package:akuCommunity/pages/sign/sign_func.dart'; +import 'package:akuCommunity/utils/bee_parse.dart'; import 'package:akuCommunity/utils/hive_store.dart'; import 'package:akuCommunity/utils/network/base_model.dart'; import 'package:akuCommunity/utils/network/net_util.dart'; diff --git a/lib/ui/community/community_views/community_page.dart b/lib/ui/community/community_views/community_page.dart index 33437b04..b4c83dff 100644 --- a/lib/ui/community/community_views/community_page.dart +++ b/lib/ui/community/community_views/community_page.dart @@ -1,5 +1,4 @@ // Flutter imports: -import 'package:akuCommunity/ui/message/message_center.dart'; import 'package:flutter/material.dart'; // Package imports: @@ -10,6 +9,7 @@ import 'package:akuCommunity/ui/community/community_views/add_new_event_page.dar import 'package:akuCommunity/ui/community/community_views/my_community_view.dart'; import 'package:akuCommunity/ui/community/community_views/new_community_view.dart'; import 'package:akuCommunity/ui/community/community_views/topic/topic_community_view.dart'; +import 'package:akuCommunity/ui/message/message_center.dart'; import 'package:akuCommunity/utils/headers.dart'; import 'package:akuCommunity/widget/bee_scaffold.dart'; import 'package:akuCommunity/widget/buttons/column_action_button.dart'; diff --git a/lib/ui/community/community_views/widgets/chat_card.dart b/lib/ui/community/community_views/widgets/chat_card.dart index dcd00792..bf1b55cb 100644 --- a/lib/ui/community/community_views/widgets/chat_card.dart +++ b/lib/ui/community/community_views/widgets/chat_card.dart @@ -1,6 +1,7 @@ -// Flutter imports: +// Dart imports: import 'dart:math'; +// Flutter imports: import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; diff --git a/lib/ui/manager/questionnaire/questionnaire_detail_page.dart b/lib/ui/manager/questionnaire/questionnaire_detail_page.dart index 202e2c7b..c8be9b35 100644 --- a/lib/ui/manager/questionnaire/questionnaire_detail_page.dart +++ b/lib/ui/manager/questionnaire/questionnaire_detail_page.dart @@ -1,3 +1,12 @@ +// Flutter imports: +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_easyrefresh/easy_refresh.dart'; +import 'package:get/get.dart'; + +// Project imports: import 'package:akuCommunity/base/base_style.dart'; import 'package:akuCommunity/constants/api.dart'; import 'package:akuCommunity/model/manager/questionnaire_detail_model.dart'; @@ -7,15 +16,11 @@ import 'package:akuCommunity/ui/manager/questionnaire/questionnaire_siglecheck.d import 'package:akuCommunity/ui/manager/questionnaire/questionnaire_truefalse.dart'; import 'package:akuCommunity/ui/manager/questionnaire/questionnarie_raido_check.dart'; import 'package:akuCommunity/ui/manager/questionnaire/submit_complish_page.dart'; +import 'package:akuCommunity/utils/headers.dart'; import 'package:akuCommunity/utils/network/base_model.dart'; import 'package:akuCommunity/widget/bee_divider.dart'; import 'package:akuCommunity/widget/bee_scaffold.dart'; import 'package:akuCommunity/widget/buttons/bottom_button.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; -import 'package:akuCommunity/utils/headers.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; -import 'package:get/get.dart'; class QuestionnaireDetailPage extends StatefulWidget { final int id; diff --git a/lib/ui/manager/questionnaire/questionnaire_page.dart b/lib/ui/manager/questionnaire/questionnaire_page.dart index 37f7090b..b6b03343 100644 --- a/lib/ui/manager/questionnaire/questionnaire_page.dart +++ b/lib/ui/manager/questionnaire/questionnaire_page.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; // Package imports: +import 'package:common_utils/common_utils.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; // Project imports: @@ -9,11 +10,10 @@ import 'package:akuCommunity/base/base_style.dart'; import 'package:akuCommunity/constants/api.dart'; import 'package:akuCommunity/model/manager/questinnaire_model.dart'; import 'package:akuCommunity/pages/things_page/widget/bee_list_view.dart'; -import 'package:akuCommunity/utils/headers.dart'; import 'package:akuCommunity/ui/manager/questionnaire/questionnaire_detail_page.dart'; +import 'package:akuCommunity/utils/headers.dart'; import 'package:akuCommunity/widget/bee_scaffold.dart'; import 'package:akuCommunity/widget/others/stack_avatar.dart'; -import 'package:common_utils/common_utils.dart'; class QuestionnairePage extends StatefulWidget { QuestionnairePage({Key key}) : super(key: key); diff --git a/lib/ui/manager/questionnaire/questionnaire_siglecheck.dart b/lib/ui/manager/questionnaire/questionnaire_siglecheck.dart index e86e4663..d54d34af 100644 --- a/lib/ui/manager/questionnaire/questionnaire_siglecheck.dart +++ b/lib/ui/manager/questionnaire/questionnaire_siglecheck.dart @@ -1,7 +1,10 @@ -import 'package:akuCommunity/model/manager/questionnaire_detail_model.dart'; -import 'package:akuCommunity/widget/buttons/bee_single_check.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: +import 'package:akuCommunity/model/manager/questionnaire_detail_model.dart'; import 'package:akuCommunity/utils/headers.dart'; +import 'package:akuCommunity/widget/buttons/bee_single_check.dart'; class QuestionnaireSingleCheck extends StatefulWidget { final String title; diff --git a/lib/ui/manager/questionnaire/questionnaire_truefalse.dart b/lib/ui/manager/questionnaire/questionnaire_truefalse.dart index 8fad657a..f3fd5007 100644 --- a/lib/ui/manager/questionnaire/questionnaire_truefalse.dart +++ b/lib/ui/manager/questionnaire/questionnaire_truefalse.dart @@ -1,7 +1,12 @@ -import 'package:akuCommunity/widget/buttons/bee_single_check.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:velocity_x/velocity_x.dart'; + +// Project imports: import 'package:akuCommunity/utils/headers.dart'; +import 'package:akuCommunity/widget/buttons/bee_single_check.dart'; class QuestionnaireTruefalse extends StatefulWidget { final String title; diff --git a/lib/ui/manager/questionnaire/questionnarie_raido_check.dart b/lib/ui/manager/questionnaire/questionnarie_raido_check.dart index 17252f82..c0fb48c7 100644 --- a/lib/ui/manager/questionnaire/questionnarie_raido_check.dart +++ b/lib/ui/manager/questionnaire/questionnarie_raido_check.dart @@ -1,7 +1,10 @@ -import 'package:akuCommunity/model/manager/questionnaire_detail_model.dart'; -import 'package:akuCommunity/widget/buttons/bee_check_radio.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Project imports: +import 'package:akuCommunity/model/manager/questionnaire_detail_model.dart'; import 'package:akuCommunity/utils/headers.dart'; +import 'package:akuCommunity/widget/buttons/bee_check_radio.dart'; class QuestionnaireRadioCheck extends StatefulWidget { final String title; diff --git a/lib/ui/manager/questionnaire/submit_complish_page.dart b/lib/ui/manager/questionnaire/submit_complish_page.dart index 0412dd21..0cd76f19 100644 --- a/lib/ui/manager/questionnaire/submit_complish_page.dart +++ b/lib/ui/manager/questionnaire/submit_complish_page.dart @@ -1,11 +1,16 @@ -import 'package:akuCommunity/base/base_style.dart'; -import 'package:akuCommunity/widget/bee_scaffold.dart'; +// Flutter imports: import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:akuCommunity/utils/headers.dart'; + +// Package imports: import 'package:get/get.dart'; import 'package:velocity_x/velocity_x.dart'; +// Project imports: +import 'package:akuCommunity/base/base_style.dart'; +import 'package:akuCommunity/utils/headers.dart'; +import 'package:akuCommunity/widget/bee_scaffold.dart'; + class SubmitComplishPage extends StatelessWidget { final bool status; final String message; diff --git a/lib/ui/message/message_center.dart b/lib/ui/message/message_center.dart index 6d45c388..c6a3346e 100644 --- a/lib/ui/message/message_center.dart +++ b/lib/ui/message/message_center.dart @@ -1,16 +1,21 @@ +// Flutter imports: +import 'package:flutter/material.dart'; +import 'package:flutter/rendering.dart'; + +// Package imports: +import 'package:badges/badges.dart'; +import 'package:common_utils/common_utils.dart'; +import 'package:dio/dio.dart'; +import 'package:flutter_easyrefresh/easy_refresh.dart'; +import 'package:velocity_x/velocity_x.dart'; + +// Project imports: import 'package:akuCommunity/constants/api.dart'; import 'package:akuCommunity/model/message/message_center_model.dart'; import 'package:akuCommunity/utils/headers.dart'; import 'package:akuCommunity/utils/network/base_model.dart'; import 'package:akuCommunity/utils/network/net_util.dart'; import 'package:akuCommunity/widget/bee_scaffold.dart'; -import 'package:badges/badges.dart'; -import 'package:common_utils/common_utils.dart'; -import 'package:dio/dio.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/rendering.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; -import 'package:velocity_x/velocity_x.dart'; class MessageCenter extends StatefulWidget { MessageCenter({Key key}) : super(key: key); diff --git a/lib/utils/weather/weather_util.dart b/lib/utils/weather/weather_util.dart index 8dae4300..53a85fbc 100644 --- a/lib/utils/weather/weather_util.dart +++ b/lib/utils/weather/weather_util.dart @@ -1,7 +1,10 @@ -import 'package:akuCommunity/model/common/real_time_weather_model.dart'; +// Package imports: import 'package:amap_map_fluttify/amap_map_fluttify.dart'; import 'package:dio/dio.dart'; +// Project imports: +import 'package:akuCommunity/model/common/real_time_weather_model.dart'; + class WeatherUtil { static Location _location; static String baseURL = 'https://api.caiyunapp.com/v2.5/Rl2lmppO9q15q8W6'; diff --git a/lib/widget/app_bar_action.dart b/lib/widget/app_bar_action.dart index bdfad0e2..9f837184 100644 --- a/lib/widget/app_bar_action.dart +++ b/lib/widget/app_bar_action.dart @@ -1,11 +1,11 @@ // Flutter imports: -import 'package:akuCommunity/pages/message_center_page/message_center_page.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; // Project imports: import 'package:akuCommunity/pages/market/market_cart_page/market_cart_page.dart'; import 'package:akuCommunity/pages/market_class/market_class_page.dart'; +import 'package:akuCommunity/pages/message_center_page/message_center_page.dart'; import 'package:akuCommunity/utils/headers.dart'; class AppBarAction extends StatefulWidget { diff --git a/lib/widget/others/bee_header_house.dart b/lib/widget/others/bee_header_house.dart index 6c17c7d9..936881ed 100644 --- a/lib/widget/others/bee_header_house.dart +++ b/lib/widget/others/bee_header_house.dart @@ -1,13 +1,18 @@ -import 'package:akuCommunity/base/base_style.dart'; -import 'package:akuCommunity/pages/life_pay/widget/my_house_page.dart'; -import 'package:akuCommunity/provider/user_provider.dart'; -import 'package:akuCommunity/utils/bee_parse.dart'; -import 'package:akuCommunity/widget/bee_divider.dart'; +// Flutter imports: import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; + +// Package imports: import 'package:provider/provider.dart'; import 'package:velocity_x/velocity_x.dart'; + +// Project imports: +import 'package:akuCommunity/base/base_style.dart'; +import 'package:akuCommunity/pages/life_pay/widget/my_house_page.dart'; +import 'package:akuCommunity/provider/user_provider.dart'; +import 'package:akuCommunity/utils/bee_parse.dart'; import 'package:akuCommunity/utils/headers.dart'; +import 'package:akuCommunity/widget/bee_divider.dart'; class BeeHeaderHouse extends StatefulWidget { BeeHeaderHouse({Key key}) : super(key: key); diff --git a/lib/widget/picker/bee_date_picker.dart b/lib/widget/picker/bee_date_picker.dart index 0657fa48..a031cff4 100644 --- a/lib/widget/picker/bee_date_picker.dart +++ b/lib/widget/picker/bee_date_picker.dart @@ -1,5 +1,4 @@ // Flutter imports: -import 'package:akuCommunity/widget/picker/bee_custom_picker.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -7,6 +6,9 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:velocity_x/velocity_x.dart'; +// Project imports: +import 'package:akuCommunity/widget/picker/bee_custom_picker.dart'; + class BeeDatePicker { static Future pick(DateTime initDate) async { return await Get.bottomSheet(_BeeDatePicker(date: initDate)); diff --git a/lib/widget/views/application_box.dart b/lib/widget/views/application_box.dart index 43316c72..b76d2a86 100644 --- a/lib/widget/views/application_box.dart +++ b/lib/widget/views/application_box.dart @@ -1,11 +1,13 @@ // Flutter imports: -import 'package:akuCommunity/utils/headers.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; // Package imports: import 'package:flutter_screenutil/flutter_screenutil.dart'; +// Project imports: +import 'package:akuCommunity/utils/headers.dart'; + class ApplicationBox extends StatelessWidget { final Widget child; ApplicationBox({Key key, this.child}) : super(key: key); diff --git a/lib/widget/views/application_view.dart b/lib/widget/views/application_view.dart index 8afdeef8..c6a900b4 100644 --- a/lib/widget/views/application_view.dart +++ b/lib/widget/views/application_view.dart @@ -1,17 +1,17 @@ // Flutter imports: -import 'package:akuCommunity/pages/sign/sign_in_page.dart'; -import 'package:akuCommunity/provider/user_provider.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:provider/provider.dart'; import 'package:velocity_x/velocity_x.dart'; // Project imports: import 'package:akuCommunity/constants/application_objects.dart'; +import 'package:akuCommunity/pages/sign/sign_in_page.dart'; import 'package:akuCommunity/provider/app_provider.dart'; +import 'package:akuCommunity/provider/user_provider.dart'; import 'package:akuCommunity/utils/headers.dart'; class ApplicationView extends StatefulWidget {