sort/format code

lib/constants/application_objects.dart

@@ -1,8 +1,5 @@
 // import 'package:aku_community/widget/bee_scaffold.dart';
 
-import 'package:aku_community/pages/opening_code_page/opening_code_page.dart';
-import 'package:aku_community/pages/renovation_manage/new_renovation/new_renovation_page.dart';
-import 'package:aku_community/widget/others/user_tool.dart';
 import 'package:flutter/material.dart';
 
 import 'package:aku_community/const/resource.dart';
@@ -16,6 +13,8 @@ import 'package:aku_community/pages/goods_manage_page/select_borrow_return_page.
 import 'package:aku_community/pages/industry_committee/industry_committee_page.dart';
 import 'package:aku_community/pages/life_pay/life_pay_page.dart';
 import 'package:aku_community/pages/one_alarm/widget/alarm_page.dart';
+import 'package:aku_community/pages/opening_code_page/opening_code_page.dart';
+import 'package:aku_community/pages/renovation_manage/new_renovation/new_renovation_page.dart';
 import 'package:aku_community/pages/service_browse/service_browse_page.dart';
 import 'package:aku_community/pages/setting_page/settings_page.dart';
 import 'package:aku_community/pages/things_page/fixed_submit_page.dart';
@@ -28,6 +27,7 @@ import 'package:aku_community/ui/manager/questionnaire/questionnaire_page.dart';
 import 'package:aku_community/ui/profile/car/car_manage_page.dart';
 import 'package:aku_community/ui/profile/car_parking/car_parking_page.dart';
 import 'package:aku_community/ui/profile/house/house_owners_page.dart';
+import 'package:aku_community/widget/others/user_tool.dart';
 
 ///应用对象
 ///Application Object
@@ -82,8 +82,7 @@ List<AO> appObjects = [
   AO('投诉表扬', R.ASSETS_APPLICATIONS_COMPLAINT_PNG,
       () => AdvicePage(type: AdviceType.COMPLAIN)),
   AO('问卷调查', R.ASSETS_APPLICATIONS_QUESTION_PNG, () => QuestionnairePage()),
-  AO('装修管理', R.ASSETS_APPLICATIONS_DECORATION_PNG,
+  AO('装修管理', R.ASSETS_APPLICATIONS_DECORATION_PNG, () => NewRenovationPage()),
-      () => NewRenovationPage()),
   AO('借还管理', R.ASSETS_APPLICATIONS_BORROW_PNG, () => SelectBorrowReturnPage()),
   AO('一键报警', R.ASSETS_APPLICATIONS_POLICE_PNG, () => AlarmPage()),
   AO('设施预约', R.ASSETS_ICONS_TOOL_FACILITY_PNG, () => FacilityAppointmentPage()),
@@ -119,7 +118,12 @@ List<AO> appObjects = [
 ];
 
 List<AO> userAppObjects = [
-  AO('我的房屋', R.ASSETS_ICONS_USER_ICON_WDFW_PNG, () => HouseOwnersPage(identify: UserTool.userProvider.userDetailModel!.type??4,)),
+  AO(
+      '我的房屋',
+      R.ASSETS_ICONS_USER_ICON_WDFW_PNG,
+      () => HouseOwnersPage(
+            identify: UserTool.userProvider.userDetailModel!.type ?? 4,
+          )),
   AO('我的车位', R.ASSETS_ICONS_USER_ICON_WDCW_PNG, () => CarParkingPage()),
   AO('我的车', R.ASSETS_ICONS_USER_ICON_WDC_PNG, () => CarManagePage()),
   AO('社区活动', R.ASSETS_ICONS_USER_ICON_WDSQHD_PNG, () => ActivityListPage()),

lib/generated_plugin_registrant.dart

@@ -6,13 +6,12 @@
 
 import 'package:device_info_plus_web/device_info_plus_web.dart';
 import 'package:firebase_core_web/firebase_core_web.dart';
+import 'package:flutter_web_plugins/flutter_web_plugins.dart';
 import 'package:image_picker_for_web/image_picker_for_web.dart';
 import 'package:package_info_plus_web/package_info_plus_web.dart';
 import 'package:shared_preferences_web/shared_preferences_web.dart';
 import 'package:url_launcher_web/url_launcher_web.dart';
 
-import 'package:flutter_web_plugins/flutter_web_plugins.dart';
-
 // ignore: public_member_api_docs
 void registerPlugins(Registrar registrar) {
   DeviceInfoPlusPlugin.registerWith(registrar);

lib/main_initialize.dart

@@ -1,7 +1,5 @@
 import 'dart:io';
 
-import 'package:aku_community/utils/websocket/fire_dialog.dart';
-import 'package:aku_community/utils/websocket/web_socket_util.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
@@ -19,6 +17,8 @@ import 'package:aku_community/constants/app_theme.dart';
 import 'package:aku_community/constants/config.dart';
 import 'package:aku_community/provider/app_provider.dart';
 import 'package:aku_community/utils/message_parser.dart';
+import 'package:aku_community/utils/websocket/fire_dialog.dart';
+import 'package:aku_community/utils/websocket/web_socket_util.dart';
 
 class MainInitialize {
   ///初始化firebase

lib/model/user/house_model.dart

@@ -51,7 +51,6 @@ class HouseModel {
   ///我的房屋页面背景颜色
   ///
   List<Color> get backgroundColor {
-    
     if (status != 4)
       return [
         Color(0xFFF5F5F5),

lib/models/house/lease_echo_model.dart

@@ -1,5 +1,6 @@
 import 'package:equatable/equatable.dart';
 import 'package:json_annotation/json_annotation.dart';
+
 part 'lease_echo_model.g.dart';
 
 @JsonSerializable()

lib/models/house/lease_list_model.dart

@@ -1,5 +1,6 @@
 import 'package:equatable/equatable.dart';
 import 'package:json_annotation/json_annotation.dart';
+
 part 'lease_list_model.g.dart';
 
 @JsonSerializable()

lib/models/house/submit_model.dart

@@ -1,5 +1,3 @@
-
-
 import 'dart:io';
 
 class SubmitModel {
@@ -40,5 +38,7 @@ class SubmitModel {
       bankAccountName: '',
       bankAccount: '',
       idCardFrontImgUrl: [],
-      idCardBackImgUrl: [], idCardBackFile: null, idCardFrontFile: null);
+      idCardBackImgUrl: [],
+      idCardBackFile: null,
+      idCardFrontFile: null);
 }

lib/models/new_renovation/new_renovation_list_model.dart

@@ -1,6 +1,7 @@
+import 'package:flutter/material.dart';
+
 import 'package:equatable/equatable.dart';
 import 'package:flustars/flustars.dart';
-import 'package:flutter/material.dart';
 import 'package:json_annotation/json_annotation.dart';
 
 import 'package:aku_community/base/base_style.dart';

lib/models/user/passed_house_list_model.dart

@@ -1,6 +1,8 @@
-import 'package:equatable/equatable.dart';
 import 'package:flutter/material.dart';
+
+import 'package:equatable/equatable.dart';
 import 'package:json_annotation/json_annotation.dart';
+
 part 'passed_house_list_model.g.dart';
 
 @JsonSerializable()
@@ -41,6 +43,7 @@ class PassedHouseListModel extends Equatable {
     if (type == 3) return '租客';
     return '';
   }
+
   Color get houseStatusColor {
     // if (status != 4) return Color(0xFF666666);
     if (type == 1) return Color(0xFF333333);
@@ -50,7 +53,6 @@ class PassedHouseListModel extends Equatable {
   ///我的房屋页面背景颜色
   ///
   List<Color> get backgroundColor {
-    
     // if (status != 4)
     //   return [
     //     Color(0xFFF5F5F5),

lib/pages/life_pay/life_pay_page.dart

@@ -1,10 +1,7 @@
-import 'package:aku_community/pages/life_pay/pay_util.dart';
-import 'package:aku_community/utils/network/base_model.dart';
-import 'package:aku_community/widget/others/house_head_card.dart';
-import 'package:bot_toast/bot_toast.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
+import 'package:bot_toast/bot_toast.dart';
 import 'package:flutter_easyrefresh/easy_refresh.dart';
 import 'package:get/get.dart' hide Response;
 import 'package:provider/provider.dart';
@@ -15,15 +12,18 @@ import 'package:aku_community/constants/api.dart';
 import 'package:aku_community/model/manager/life_pay_model.dart';
 import 'package:aku_community/pages/life_pay/life_pay_record_page.dart';
 import 'package:aku_community/pages/life_pay/pay_finish_page.dart';
+import 'package:aku_community/pages/life_pay/pay_util.dart';
 import 'package:aku_community/pages/life_pay/widget/life_pay_detail_page.dart';
 import 'package:aku_community/pages/things_page/widget/bee_list_view.dart';
 import 'package:aku_community/provider/app_provider.dart';
 import 'package:aku_community/utils/bee_parse.dart';
 import 'package:aku_community/utils/headers.dart';
+import 'package:aku_community/utils/network/base_model.dart';
 import 'package:aku_community/utils/network/net_util.dart';
 import 'package:aku_community/widget/bee_divider.dart';
 import 'package:aku_community/widget/bee_scaffold.dart';
 import 'package:aku_community/widget/buttons/bee_check_radio.dart';
+import 'package:aku_community/widget/others/house_head_card.dart';
 
 class LifePayPage extends StatefulWidget {
   LifePayPage({Key? key}) : super(key: key);
@@ -382,5 +382,3 @@ class _LifePayPageState extends State<LifePayPage> {
     );
   }
 }
-
-

lib/pages/life_pay/pay_util.dart

@@ -1,12 +1,13 @@
 import 'dart:convert';
 
-import 'package:aku_community/models/pay/pay_model.dart';
-import 'package:aku_community/utils/network/net_util.dart';
 import 'package:bot_toast/bot_toast.dart';
 import 'package:dio/dio.dart';
 import 'package:power_logger/power_logger.dart';
 import 'package:tobias/tobias.dart';
 
+import 'package:aku_community/models/pay/pay_model.dart';
+import 'package:aku_community/utils/network/net_util.dart';
+
 enum PAYTYPE {
   ///支付宝
   ALI,

lib/pages/manager_func.dart

@@ -1,4 +1,3 @@
-import 'package:aku_community/models/manage/fix_report/fix_detail_model.dart';
 import 'package:bot_toast/bot_toast.dart';
 import 'package:dio/dio.dart';
 import 'package:flustars/flustars.dart';
@@ -9,6 +8,7 @@ import 'package:aku_community/model/manager/moving_company_model.dart';
 import 'package:aku_community/model/manager/questionnaire_detail_model.dart';
 import 'package:aku_community/model/manager/quetionnaire_submit_model.dart';
 import 'package:aku_community/model/manager/voting_detail_model.dart';
+import 'package:aku_community/models/manage/fix_report/fix_detail_model.dart';
 import 'package:aku_community/utils/network/base_model.dart';
 import 'package:aku_community/utils/network/net_util.dart';
 

lib/pages/message_center_page/system_message/system_message_detail_page.dart

@@ -37,12 +37,12 @@ class _SystemMessageDetailPageState extends State<SystemMessageDetailPage> {
           setState(() {});
         },
         child: _onload
-            ? _empty():Container(
+            ? _empty()
+            : Container(
                 margin: EdgeInsets.all(32.w),
                 padding: EdgeInsets.all(32.w),
                 decoration: BoxDecoration(
                   color: Colors.white,
-
                 ),
                 child: Column(
                   crossAxisAlignment: CrossAxisAlignment.start,

lib/pages/opening_code_page/opening_code_page.dart

@@ -1,18 +1,18 @@
 import 'dart:async';
 
-import 'package:aku_community/constants/api.dart';
-import 'package:aku_community/utils/network/base_model.dart';
-import 'package:aku_community/utils/network/net_util.dart';
-import 'package:bot_toast/bot_toast.dart';
-import 'package:flustars/flustars.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_easyrefresh/easy_refresh.dart';
 
+import 'package:bot_toast/bot_toast.dart';
+import 'package:flustars/flustars.dart';
+import 'package:flutter_easyrefresh/easy_refresh.dart';
 import 'package:flutter_icons/flutter_icons.dart';
 import 'package:qr_flutter/qr_flutter.dart';
 
+import 'package:aku_community/constants/api.dart';
 import 'package:aku_community/utils/headers.dart';
+import 'package:aku_community/utils/network/base_model.dart';
+import 'package:aku_community/utils/network/net_util.dart';
 import 'package:aku_community/widget/bee_scaffold.dart';
 
 class OpeningCodePage extends StatefulWidget {

lib/pages/renovation_manage/new_renovation/new_renovation_add_page.dart

@@ -1,5 +1,14 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+
+import 'package:bot_toast/bot_toast.dart';
+import 'package:flustars/flustars.dart';
+import 'package:get/get.dart';
+
 import 'package:aku_community/base/base_style.dart';
 import 'package:aku_community/constants/api.dart';
+import 'package:aku_community/extensions/widget_list_ext.dart';
+import 'package:aku_community/utils/headers.dart';
 import 'package:aku_community/utils/network/base_model.dart';
 import 'package:aku_community/utils/network/net_util.dart';
 import 'package:aku_community/widget/bee_divider.dart';
@@ -8,13 +17,6 @@ import 'package:aku_community/widget/buttons/bottom_button.dart';
 import 'package:aku_community/widget/others/bee_input_row.dart';
 import 'package:aku_community/widget/others/user_tool.dart';
 import 'package:aku_community/widget/picker/bee_date_picker.dart';
-import 'package:bot_toast/bot_toast.dart';
-import 'package:flustars/flustars.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:aku_community/utils/headers.dart';
-import 'package:aku_community/extensions/widget_list_ext.dart';
-import 'package:get/get.dart';
 
 class NewRenovationAddPage extends StatefulWidget {
   NewRenovationAddPage({Key? key}) : super(key: key);

lib/pages/renovation_manage/new_renovation/new_renovation_card.dart

@@ -1,14 +1,16 @@
+import 'package:flutter/material.dart';
+
+import 'package:get/get.dart';
+
 import 'package:aku_community/base/base_style.dart';
 import 'package:aku_community/constants/api.dart';
 import 'package:aku_community/models/new_renovation/new_renovation_list_model.dart';
 import 'package:aku_community/pages/renovation_manage/new_renovation/new_renovation_detail_page.dart';
+import 'package:aku_community/utils/headers.dart';
 import 'package:aku_community/utils/network/base_model.dart';
 import 'package:aku_community/utils/network/net_util.dart';
 import 'package:aku_community/widget/bee_divider.dart';
 import 'package:aku_community/widget/buttons/card_bottom_button.dart';
-import 'package:flutter/material.dart';
-import 'package:aku_community/utils/headers.dart';
-import 'package:get/get.dart';
 
 class NewRenovationCard extends StatefulWidget {
   final NewRenovationListModel model;

lib/pages/renovation_manage/new_renovation/new_renovation_detail_page.dart

@@ -1,9 +1,10 @@
+import 'package:flutter/material.dart';
+
 import 'package:aku_community/base/base_style.dart';
 import 'package:aku_community/models/new_renovation/new_renovation_list_model.dart';
+import 'package:aku_community/utils/headers.dart';
 import 'package:aku_community/widget/bee_divider.dart';
 import 'package:aku_community/widget/bee_scaffold.dart';
-import 'package:flutter/material.dart';
-import 'package:aku_community/utils/headers.dart';
 
 class NewRenovationDetailPage extends StatefulWidget {
   final NewRenovationListModel model;

lib/pages/renovation_manage/new_renovation/new_renovation_page.dart

@@ -1,11 +1,13 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+
+import 'package:get/get.dart';
+
 import 'package:aku_community/pages/renovation_manage/new_renovation/new_renovation_add_page.dart';
 import 'package:aku_community/pages/renovation_manage/new_renovation/new_renovation_view.dart';
+import 'package:aku_community/utils/headers.dart';
 import 'package:aku_community/widget/bee_scaffold.dart';
 import 'package:aku_community/widget/tab_bar/bee_tab_bar.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:aku_community/utils/headers.dart';
-import 'package:get/get.dart';
 
 class NewRenovationPage extends StatefulWidget {
   NewRenovationPage({Key? key}) : super(key: key);

lib/pages/renovation_manage/new_renovation/new_renovation_view.dart

@@ -1,9 +1,11 @@
+import 'package:flutter/material.dart';
+
+import 'package:flutter_easyrefresh/easy_refresh.dart';
+
 import 'package:aku_community/constants/api.dart';
 import 'package:aku_community/models/new_renovation/new_renovation_list_model.dart';
 import 'package:aku_community/pages/renovation_manage/new_renovation/new_renovation_card.dart';
 import 'package:aku_community/pages/things_page/widget/bee_list_view.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_easyrefresh/easy_refresh.dart';
 import 'package:aku_community/utils/headers.dart';
 
 class NewRenovationView extends StatefulWidget {

lib/pages/setting_page/feedback_page/feedback_page.dart

@@ -68,8 +68,7 @@ class _FeedBackPageState extends State<FeedBackPage> {
     return InkWell(
       onTap: () async {
         if (_formKey.currentState!.validate()) {
-          if (_files.isNotEmpty) {
+          if (_files.isNotEmpty) {}
-          }
           var cancelAction = BotToast.showLoading();
           await NetUtil().post(
             API.user.feedback,

lib/pages/setting_page/settings_page.dart

@@ -1,6 +1,3 @@
-import 'package:aku_community/utils/developer_util.dart';
-import 'package:aku_community/utils/websocket/web_socket_util.dart';
-import 'package:aku_community/widget/others/user_tool.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
@@ -19,7 +16,10 @@ import 'package:aku_community/pages/setting_page/agreement_page/privacy_page.dar
 import 'package:aku_community/pages/setting_page/feedback_page/feedback_page.dart';
 import 'package:aku_community/pages/tab_navigator.dart';
 import 'package:aku_community/provider/user_provider.dart';
+import 'package:aku_community/utils/developer_util.dart';
+import 'package:aku_community/utils/websocket/web_socket_util.dart';
 import 'package:aku_community/widget/bee_scaffold.dart';
+import 'package:aku_community/widget/others/user_tool.dart';
 
 class SettingsPage extends StatefulWidget {
   SettingsPage({Key? key}) : super(key: key);

lib/pages/tab_navigator.dart

@@ -1,4 +1,3 @@
-import 'package:aku_community/utils/websocket/web_socket_util.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
@@ -8,6 +7,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:aku_community/const/resource.dart';
 import 'package:aku_community/ui/community/community_views/community_page.dart';
 import 'package:aku_community/ui/market/market_page.dart';
+import 'package:aku_community/utils/websocket/web_socket_util.dart';
 import 'package:aku_community/widget/bee_scaffold.dart';
 import 'home/home_page.dart';
 import 'personal/personal_page.dart';

lib/pages/things_page/widget/finish_fixed_submit_page.dart

@@ -1,4 +1,3 @@
-import 'package:aku_community/widget/others/finish_result_image.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
@@ -7,6 +6,7 @@ import 'package:velocity_x/velocity_x.dart';
 
 import 'package:aku_community/base/base_style.dart';
 import 'package:aku_community/widget/bee_scaffold.dart';
+import 'package:aku_community/widget/others/finish_result_image.dart';
 
 class FinishFixedSubmitPage extends StatelessWidget {
   const FinishFixedSubmitPage({Key? key}) : super(key: key);

lib/pages/things_page/widget/fixed_detail_page.dart

@@ -1,7 +1,3 @@
-import 'package:aku_community/constants/api.dart';
-import 'package:aku_community/models/manage/fix_report/fix_detail_model.dart';
-import 'package:aku_community/pages/life_pay/pay_finish_page.dart';
-import 'package:aku_community/pages/life_pay/pay_util.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
@@ -14,6 +10,10 @@ import 'package:velocity_x/velocity_x.dart';
 
 import 'package:aku_community/base/base_style.dart';
 import 'package:aku_community/const/resource.dart';
+import 'package:aku_community/constants/api.dart';
+import 'package:aku_community/models/manage/fix_report/fix_detail_model.dart';
+import 'package:aku_community/pages/life_pay/pay_finish_page.dart';
+import 'package:aku_community/pages/life_pay/pay_util.dart';
 import 'package:aku_community/pages/manager_func.dart';
 import 'package:aku_community/pages/things_page/widget/fixed_evaluate_page.dart';
 import 'package:aku_community/utils/bee_map.dart';

lib/pages/things_page/widget/fixed_evaluate_page.dart

@@ -1,4 +1,3 @@
-import 'package:aku_community/models/manage/fix_report/fix_detail_model.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
@@ -8,6 +7,7 @@ import 'package:get/get.dart';
 import 'package:velocity_x/velocity_x.dart';
 
 import 'package:aku_community/base/base_style.dart';
+import 'package:aku_community/models/manage/fix_report/fix_detail_model.dart';
 import 'package:aku_community/pages/manager_func.dart';
 import 'package:aku_community/utils/headers.dart';
 import 'package:aku_community/utils/network/base_model.dart';

lib/pages/visitor_access_page/visitor_access_page.dart

@@ -256,7 +256,8 @@ class _VisitorAccessPageState extends State<VisitorAccessPage> {
           tel: tel,
         );
         if (result != null)
-          Share.share('${API.host}/static/dist/index.html#/visitor?code=$result');
+          Share.share(
+              '${API.host}/static/dist/index.html#/visitor?code=$result');
       },
       minWidth: double.infinity,
       height: 96.w,

lib/painters/as_numberic_painter.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
 class ASNUmericPainter extends CustomPainter {

lib/painters/contact_manager_painter.dart

@@ -1,6 +1,7 @@
 import 'dart:math';
 
 import 'package:flutter/material.dart';
+
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
 class ContactManagerPainter extends CustomPainter {

lib/painters/upload_painter.dart

@@ -1,6 +1,7 @@
 import 'dart:math';
 
 import 'package:flutter/material.dart';
+
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
 class UploadPainter extends CustomPainter {

lib/provider/app_provider.dart

@@ -1,6 +1,5 @@
 import 'dart:io';
 
-import 'package:aku_community/models/user/passed_house_list_model.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
@@ -17,6 +16,7 @@ import 'package:aku_community/model/common/real_time_weather_model.dart';
 import 'package:aku_community/model/community/hot_topic_model.dart';
 import 'package:aku_community/model/message/message_center_model.dart';
 import 'package:aku_community/model/user/car_parking_model.dart';
+import 'package:aku_community/models/user/passed_house_list_model.dart';
 import 'package:aku_community/utils/hive_store.dart';
 import 'package:aku_community/utils/network/base_model.dart';
 import 'package:aku_community/utils/network/net_util.dart';
@@ -250,6 +250,7 @@ class AppProvider extends ChangeNotifier {
         .toList();
     notifyListeners();
   }
+
   //设置火灾报警开关
   bool _fireAlert = true;
   bool get fireAlert => _fireAlert;

lib/provider/user_provider.dart

@@ -1,6 +1,5 @@
 import 'dart:io';
 
-import 'package:aku_community/utils/websocket/web_socket_util.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
@@ -19,6 +18,7 @@ import 'package:aku_community/ui/profile/house/house_func.dart';
 import 'package:aku_community/utils/hive_store.dart';
 import 'package:aku_community/utils/network/base_model.dart';
 import 'package:aku_community/utils/network/net_util.dart';
+import 'package:aku_community/utils/websocket/web_socket_util.dart';
 
 class UserProvider extends ChangeNotifier {
   bool _isLogin = false;

lib/ui/community/notice/notice_detail_page.dart

@@ -1,5 +1,3 @@
-import 'package:aku_community/widget/views/%20bee_download_view.dart';
-import 'package:aku_community/widget/views/doc_view.dart';
 import 'package:flutter/material.dart';
 
 import 'package:flutter_easyrefresh/easy_refresh.dart';
@@ -15,6 +13,8 @@ import 'package:aku_community/utils/network/base_model.dart';
 import 'package:aku_community/utils/network/net_util.dart';
 import 'package:aku_community/widget/bee_scaffold.dart';
 import 'package:aku_community/widget/picker/bee_image_preview.dart';
+import 'package:aku_community/widget/views/%20bee_download_view.dart';
+import 'package:aku_community/widget/views/doc_view.dart';
 
 class NoticeDetailPage extends StatefulWidget {
   final int? id;
@@ -95,7 +95,6 @@ class _NoticeDetailPageState extends State<NoticeDetailPage> {
                         file: model!.fileDocUrl,
                       ));
                       if (result != null) OpenFile.open(result);
-                      
                     },
                   ),
                 ],

lib/ui/manager/questionnaire/submit_complish_page.dart

@@ -1,4 +1,3 @@
-import 'package:aku_community/widget/others/finish_result_image.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
@@ -8,6 +7,7 @@ import 'package:velocity_x/velocity_x.dart';
 import 'package:aku_community/base/base_style.dart';
 import 'package:aku_community/utils/headers.dart';
 import 'package:aku_community/widget/bee_scaffold.dart';
+import 'package:aku_community/widget/others/finish_result_image.dart';
 
 class SubmitComplishPage extends StatelessWidget {
   final bool? status;

lib/ui/manager/visitor/visitor_list_item.dart

@@ -1,17 +1,17 @@
-import 'package:aku_community/constants/api.dart';
-import 'package:aku_community/utils/network/base_model.dart';
-import 'package:aku_community/utils/network/net_util.dart';
-import 'package:bot_toast/bot_toast.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
+import 'package:bot_toast/bot_toast.dart';
 import 'package:flustars/flustars.dart';
 import 'package:get/get.dart';
 import 'package:velocity_x/velocity_x.dart';
 
+import 'package:aku_community/constants/api.dart';
 import 'package:aku_community/model/manager/visitor_list_item_model.dart';
 import 'package:aku_community/ui/manager/visitor/visitor_passport_page.dart';
 import 'package:aku_community/utils/headers.dart';
+import 'package:aku_community/utils/network/base_model.dart';
+import 'package:aku_community/utils/network/net_util.dart';
 
 class VisitorListItem extends StatefulWidget {
   final VisitorListItemModel model;

lib/ui/manager/visitor/visitor_passport_page.dart

@@ -9,7 +9,6 @@ import 'package:bot_toast/bot_toast.dart';
 import 'package:flustars/flustars.dart';
 import 'package:fluwx/fluwx.dart';
 import 'package:qr_flutter/qr_flutter.dart';
-// import 'package:qr_flutter/qr_flutter.dart';
 import 'package:velocity_x/velocity_x.dart';
 
 import 'package:aku_community/base/base_style.dart';
@@ -20,6 +19,8 @@ import 'package:aku_community/utils/headers.dart';
 import 'package:aku_community/widget/bee_back_button.dart';
 import 'package:aku_community/widget/buttons/bottom_button.dart';
 
+// import 'package:qr_flutter/qr_flutter.dart';
+
 class VisitorPassportPage extends StatefulWidget {
   final VisitorListItemModel model;
   final String? code;

lib/ui/market/goods/goods_detail_page.dart

@@ -1,6 +1,3 @@
-import 'package:aku_community/pages/sign/sign_in_page.dart';
-import 'package:aku_community/ui/market/goods/goods_order_detail_page.dart';
-import 'package:aku_community/widget/others/user_tool.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
@@ -18,8 +15,10 @@ import 'package:aku_community/constants/api.dart';
 import 'package:aku_community/model/common/img_model.dart';
 import 'package:aku_community/models/market/goods_detail_model.dart';
 import 'package:aku_community/models/market/goods_item.dart';
+import 'package:aku_community/pages/sign/sign_in_page.dart';
 import 'package:aku_community/provider/user_provider.dart';
 import 'package:aku_community/ui/market/goods/goods_card.dart';
+import 'package:aku_community/ui/market/goods/goods_order_detail_page.dart';
 import 'package:aku_community/ui/market/search/search_goods_page.dart';
 import 'package:aku_community/utils/headers.dart';
 import 'package:aku_community/utils/network/base_model.dart';
@@ -27,6 +26,7 @@ import 'package:aku_community/utils/network/net_util.dart';
 import 'package:aku_community/widget/bee_back_button.dart';
 import 'package:aku_community/widget/bee_scaffold.dart';
 import 'package:aku_community/widget/buttons/bottom_button.dart';
+import 'package:aku_community/widget/others/user_tool.dart';
 
 ///商品详情页面
 class GoodsDetailPage extends StatefulWidget {

lib/ui/market/goods/goods_order_detail_page.dart

@@ -1,5 +1,15 @@
+import 'package:flutter/material.dart';
+
+import 'package:bot_toast/bot_toast.dart';
+import 'package:flutter_easyrefresh/easy_refresh.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
+import 'package:velocity_x/velocity_x.dart';
+
 import 'package:aku_community/base/base_style.dart';
+import 'package:aku_community/const/resource.dart';
 import 'package:aku_community/constants/api.dart';
+import 'package:aku_community/extensions/widget_list_ext.dart';
 import 'package:aku_community/model/common/img_model.dart';
 import 'package:aku_community/models/market/goods_detail_model.dart';
 import 'package:aku_community/pages/life_pay/pay_finish_page.dart';
@@ -12,14 +22,6 @@ import 'package:aku_community/widget/bee_scaffold.dart';
 import 'package:aku_community/widget/buttons/bee_numberic_button.dart';
 import 'package:aku_community/widget/buttons/bottom_button.dart';
 import 'package:aku_community/widget/others/user_tool.dart';
-import 'package:bot_toast/bot_toast.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_easyrefresh/easy_refresh.dart';
-import 'package:get/get.dart';
-import 'package:velocity_x/velocity_x.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:aku_community/const/resource.dart';
-import 'package:aku_community/extensions/widget_list_ext.dart';
 
 class GoodsOrderDetailPage extends StatefulWidget {
   final GoodsDetailModel model;
@@ -58,7 +60,9 @@ class _GoodsOrderDetailPageState extends State<GoodsOrderDetailPage> {
       actions: [
         TextButton(
             onPressed: () {
-              Get.to(() => HouseOwnersPage(identify: UserTool.userProvider.userDetailModel!.type??4,));
+              Get.to(() => HouseOwnersPage(
+                    identify: UserTool.userProvider.userDetailModel!.type ?? 4,
+                  ));
             },
             child: '切换房屋'.text.size(28.sp).color(ktextPrimary).make())
       ],

lib/ui/market/goods/goods_tab_list_view.dart

@@ -34,10 +34,7 @@ class _GoodsTabListViewState extends State<GoodsTabListView>
         return WaterfallFlow.builder(
           padding: EdgeInsets.all(32.w),
           gridDelegate: SliverWaterfallFlowDelegateWithFixedCrossAxisCount(
-            crossAxisCount: 2,
+              crossAxisCount: 2, crossAxisSpacing: 24.w, mainAxisSpacing: 24.w),
-            crossAxisSpacing: 24.w,
-            mainAxisSpacing: 24.w
-          ),
           itemBuilder: (context, index) {
             final GoodsItem item = items[index];
             return GoodsCard(item: item);

lib/ui/market/market_page.dart

@@ -1,6 +1,5 @@
 // import 'package:aku_community/base/base_style.dart';
 
-import 'package:aku_community/utils/network/base_list_model.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
@@ -20,6 +19,7 @@ import 'package:aku_community/ui/market/goods/goods_card.dart';
 import 'package:aku_community/ui/market/order/my_order_page.dart';
 import 'package:aku_community/ui/market/search/search_goods_page.dart';
 import 'package:aku_community/utils/headers.dart';
+import 'package:aku_community/utils/network/base_list_model.dart';
 import 'package:aku_community/utils/network/net_util.dart';
 import 'package:aku_community/widget/bee_scaffold.dart';
 

lib/ui/market/order/my_order_detail_page.dart

@@ -1,4 +1,3 @@
-import 'package:aku_community/models/market/order/order_detail_model.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
@@ -15,6 +14,7 @@ import 'package:aku_community/extensions/widget_list_ext.dart';
 import 'package:aku_community/model/common/img_model.dart';
 import 'package:aku_community/models/market/goods_item.dart';
 import 'package:aku_community/models/market/order/my_order_list_model.dart';
+import 'package:aku_community/models/market/order/order_detail_model.dart';
 import 'package:aku_community/ui/market/goods/goods_card.dart';
 import 'package:aku_community/ui/market/order/my_order_func.dart';
 import 'package:aku_community/widget/bee_divider.dart';

lib/ui/market/order/my_order_func.dart

@@ -12,9 +12,14 @@ class MyOrderFunc {
   }
 
   ///申请退换
-  static Future refundOrder(int goodsAppointmentId, String reson,int type) async {
+  static Future refundOrder(
+      int goodsAppointmentId, String reson, int type) async {
     BaseModel baseModel = await NetUtil().get(API.market.refundOrder,
-        params: {"goodsAppointmentId": goodsAppointmentId, "backReason": reson,"backType":type},
+        params: {
+          "goodsAppointmentId": goodsAppointmentId,
+          "backReason": reson,
+          "backType": type
+        },
         showMessage: true);
     return baseModel;
   }

lib/ui/market/order/my_order_refund_page.dart

@@ -1,4 +1,3 @@
-import 'package:aku_community/utils/network/base_model.dart';
 import 'package:flutter/material.dart';
 
 import 'package:flutter_screenutil/flutter_screenutil.dart';
@@ -11,6 +10,7 @@ import 'package:aku_community/constants/api.dart';
 import 'package:aku_community/model/common/img_model.dart';
 import 'package:aku_community/models/market/order/my_order_list_model.dart';
 import 'package:aku_community/ui/market/order/my_order_func.dart';
+import 'package:aku_community/utils/network/base_model.dart';
 import 'package:aku_community/widget/bee_divider.dart';
 import 'package:aku_community/widget/bee_scaffold.dart';
 import 'package:aku_community/widget/buttons/aku_single_check_button.dart';

lib/ui/profile/house/contract_pay_page.dart

@@ -1,5 +1,13 @@
+import 'package:flutter/cupertino.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';
+
 import 'package:aku_community/base/base_style.dart';
 import 'package:aku_community/constants/api.dart';
+import 'package:aku_community/extensions/widget_list_ext.dart';
 import 'package:aku_community/models/house/lease_detail_model.dart';
 import 'package:aku_community/pages/life_pay/pay_finish_page.dart';
 import 'package:aku_community/pages/life_pay/pay_util.dart';
@@ -7,12 +15,6 @@ import 'package:aku_community/ui/profile/house/house_func.dart';
 import 'package:aku_community/widget/bee_scaffold.dart';
 import 'package:aku_community/widget/buttons/bottom_button.dart';
 import 'package:aku_community/widget/others/bee_input_row.dart';
-import 'package:flutter/cupertino.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';
-import 'package:aku_community/extensions/widget_list_ext.dart';
 
 class ContractPayPage extends StatefulWidget {
   final int id;

lib/ui/profile/house/contract_preview_page.dart

@@ -1,6 +1,15 @@
 import 'dart:typed_data';
 
+import 'package:flutter/material.dart';
+
 import 'package:advance_pdf_viewer/advance_pdf_viewer.dart';
+import 'package:bot_toast/bot_toast.dart';
+import 'package:dotted_border/dotted_border.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
+import 'package:power_logger/power_logger.dart';
+import 'package:velocity_x/velocity_x.dart';
+
 import 'package:aku_community/base/base_style.dart';
 import 'package:aku_community/constants/api.dart';
 import 'package:aku_community/ui/profile/house/download_contract_page.dart';
@@ -8,13 +17,6 @@ import 'package:aku_community/ui/profile/house/house_func.dart';
 import 'package:aku_community/widget/bee_scaffold.dart';
 import 'package:aku_community/widget/buttons/bottom_button.dart';
 import 'package:aku_community/widget/others/sign_name_board.dart';
-import 'package:bot_toast/bot_toast.dart';
-import 'package:dotted_border/dotted_border.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:get/get.dart';
-import 'package:power_logger/power_logger.dart';
-import 'package:velocity_x/velocity_x.dart';
 
 class ContractPreviewPage extends StatefulWidget {
   final String url;

lib/ui/profile/house/download_contract_page.dart

@@ -1,14 +1,16 @@
-import 'package:aku_community/base/base_style.dart';
-import 'package:aku_community/ui/profile/house/upload_contracts_page.dart';
-import 'package:aku_community/widget/bee_scaffold.dart';
-import 'package:aku_community/widget/others/finish_result_image.dart';
-import 'package:aku_community/widget/views/%20bee_download_view.dart';
 import 'package:flutter/material.dart';
+
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:open_file/open_file.dart';
 import 'package:velocity_x/velocity_x.dart';
 
+import 'package:aku_community/base/base_style.dart';
+import 'package:aku_community/ui/profile/house/upload_contracts_page.dart';
+import 'package:aku_community/widget/bee_scaffold.dart';
+import 'package:aku_community/widget/others/finish_result_image.dart';
+import 'package:aku_community/widget/views/%20bee_download_view.dart';
+
 class DownLoadContractPage extends StatefulWidget {
   final String path;
   final int id;

lib/ui/profile/house/house_card.dart

@@ -1,10 +1,10 @@
-import 'package:aku_community/models/user/passed_house_list_model.dart';
-import 'package:flustars/flustars.dart';
 import 'package:flutter/material.dart';
 
+import 'package:flustars/flustars.dart';
 import 'package:get/get.dart';
 
 import 'package:aku_community/const/resource.dart';
+import 'package:aku_community/models/user/passed_house_list_model.dart';
 import 'package:aku_community/ui/profile/house/pick_my_house_page.dart';
 import 'package:aku_community/utils/headers.dart';
 

lib/ui/profile/house/house_func.dart

@@ -1,6 +1,8 @@
 import 'dart:io';
 import 'dart:typed_data';
 
+import 'package:bot_toast/bot_toast.dart';
+
 import 'package:aku_community/constants/api.dart';
 import 'package:aku_community/model/user/house_model.dart';
 import 'package:aku_community/models/house/lease_detail_model.dart';
@@ -10,7 +12,6 @@ import 'package:aku_community/models/user/passed_house_list_model.dart';
 import 'package:aku_community/utils/network/base_file_model.dart';
 import 'package:aku_community/utils/network/base_model.dart';
 import 'package:aku_community/utils/network/net_util.dart';
-import 'package:bot_toast/bot_toast.dart';
 
 class HouseFunc {
   ///查询所有的房屋审核信息

lib/ui/profile/house/house_information_check_page.dart

@@ -1,3 +1,11 @@
+import 'package:flutter/material.dart';
+
+import 'package:bot_toast/bot_toast.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
+import 'package:power_logger/power_logger.dart';
+import 'package:velocity_x/velocity_x.dart';
+
 import 'package:aku_community/base/base_style.dart';
 import 'package:aku_community/const/resource.dart';
 import 'package:aku_community/models/house/lease_detail_model.dart';
@@ -8,12 +16,6 @@ import 'package:aku_community/utils/headers.dart';
 import 'package:aku_community/widget/bee_divider.dart';
 import 'package:aku_community/widget/bee_scaffold.dart';
 import 'package:aku_community/widget/buttons/bottom_button.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:power_logger/power_logger.dart';
-import 'package:velocity_x/velocity_x.dart';
 
 class HouseInformationCheckPage extends StatefulWidget {
   final SubmitModel submitModel;

lib/ui/profile/house/house_owners_page.dart

@@ -1,26 +1,26 @@
-import 'package:aku_community/base/base_style.dart';
-import 'package:aku_community/ui/profile/house/identify_selection_page.dart';
-import 'package:aku_community/ui/profile/house/my_house_list.dart';
-import 'package:aku_community/ui/profile/house/tenant_house_list_page.dart';
-import 'package:aku_community/ui/profile/house/upload_empty_form_page.dart';
-import 'package:aku_community/widget/buttons/bottom_button.dart';
-import 'package:aku_community/widget/others/user_tool.dart';
-import 'package:bot_toast/bot_toast.dart';
 import 'package:flutter/material.dart';
 
+import 'package:bot_toast/bot_toast.dart';
 import 'package:flutter_easyrefresh/easy_refresh.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:power_logger/power_logger.dart';
 import 'package:provider/provider.dart';
 
+import 'package:aku_community/base/base_style.dart';
 import 'package:aku_community/const/resource.dart';
 import 'package:aku_community/provider/app_provider.dart';
 import 'package:aku_community/ui/profile/house/add_house_page.dart';
 import 'package:aku_community/ui/profile/house/house_card.dart';
 import 'package:aku_community/ui/profile/house/house_func.dart';
+import 'package:aku_community/ui/profile/house/identify_selection_page.dart';
+import 'package:aku_community/ui/profile/house/my_house_list.dart';
+import 'package:aku_community/ui/profile/house/tenant_house_list_page.dart';
+import 'package:aku_community/ui/profile/house/upload_empty_form_page.dart';
 import 'package:aku_community/utils/headers.dart';
 import 'package:aku_community/widget/bee_scaffold.dart';
+import 'package:aku_community/widget/buttons/bottom_button.dart';
+import 'package:aku_community/widget/others/user_tool.dart';
 
 class HouseOwnersPage extends StatefulWidget {
   final int identify;
@@ -173,7 +173,8 @@ class _HouseOwnersPageState extends State<HouseOwnersPage> {
                               child: Text('添加房屋'),
                             ),
                           ),
-                        if (!isOwner && !_emptyHouse) _contractRelevant().expand()
+                        if (!isOwner && !_emptyHouse)
+                          _contractRelevant().expand()
                       ],
                     ),
                   ),

lib/ui/profile/house/identify_selection_page.dart

@@ -1,13 +1,15 @@
-import 'package:aku_community/const/resource.dart';
-import 'package:aku_community/ui/profile/house/my_house_list.dart';
-import 'package:aku_community/ui/profile/house/user_identify_page.dart';
-import 'package:aku_community/widget/bee_scaffold.dart';
 import 'package:flutter/cupertino.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';
+
+import 'package:aku_community/const/resource.dart';
 import 'package:aku_community/extensions/widget_list_ext.dart';
+import 'package:aku_community/ui/profile/house/my_house_list.dart';
+import 'package:aku_community/ui/profile/house/user_identify_page.dart';
+import 'package:aku_community/widget/bee_scaffold.dart';
 
 class IdentifySelectionPage extends StatelessWidget {
   const IdentifySelectionPage({Key? key}) : super(key: key);

lib/ui/profile/house/lease_house_card.dart

@@ -1,17 +1,17 @@
+import 'package:flutter/material.dart';
+
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
+import 'package:velocity_x/velocity_x.dart';
 
 import 'package:aku_community/base/base_style.dart';
+import 'package:aku_community/const/resource.dart';
 import 'package:aku_community/models/house/lease_list_model.dart';
 import 'package:aku_community/ui/profile/house/contract_pay_page.dart';
 import 'package:aku_community/ui/profile/house/supplement_information_page.dart';
 import 'package:aku_community/ui/profile/house/upload_contracts_page.dart';
 import 'package:aku_community/utils/headers.dart';
 import 'package:aku_community/widget/buttons/card_bottom_button.dart';
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:velocity_x/velocity_x.dart';
-import 'package:aku_community/const/resource.dart';
-
 
 class LeaseHouseCard extends StatelessWidget {
   final LeaseListModel model;
@@ -55,7 +55,14 @@ class LeaseHouseCard extends StatelessWidget {
                 height: 40.w,
               ),
               16.w.widthBox,
-              S.of(context)!.tempPlotName.text.size(32.sp).color(ktextPrimary).make().expand(),
+              S
+                  .of(context)!
+                  .tempPlotName
+                  .text
+                  .size(32.sp)
+                  .color(ktextPrimary)
+                  .make()
+                  .expand(),
               model.statusString.text
                   .size(32.sp)
                   .color(ktextPrimary)
@@ -89,7 +96,9 @@ class LeaseHouseCard extends StatelessWidget {
             CardBottomButton.yellow(
                 text: '填写信息',
                 onPressed: () {
-                  Get.to(() => SupplementInformationPage(leaseId: model.id,));
+                  Get.to(() => SupplementInformationPage(
+                        leaseId: model.id,
+                      ));
                 })
           ],
         );
@@ -99,12 +108,16 @@ class LeaseHouseCard extends StatelessWidget {
             CardBottomButton.yellow(
                 text: '重新填写',
                 onPressed: () {
-                  Get.to(() => SupplementInformationPage(leaseId: model.id,));
+                  Get.to(() => SupplementInformationPage(
+                        leaseId: model.id,
+                      ));
                 }),
             CardBottomButton.yellow(
                 text: '上传合同',
                 onPressed: () {
-                  Get.to(() => UploadContractsPage(id: model.id,));
+                  Get.to(() => UploadContractsPage(
+                        id: model.id,
+                      ));
                 }),
             CardBottomButton.white(
                 text: '下载合同',
@@ -114,7 +127,6 @@ class LeaseHouseCard extends StatelessWidget {
                   //         file:
                   //       ));
                   //       if (result != null) OpenFile.open(result);
-                      
                 }),
           ],
         );
@@ -129,12 +141,16 @@ class LeaseHouseCard extends StatelessWidget {
             CardBottomButton.yellow(
                 text: '重新上传',
                 onPressed: () {
-                  Get.to(() => UploadContractsPage(id: model.id,));
+                  Get.to(() => UploadContractsPage(
+                        id: model.id,
+                      ));
                 }),
             CardBottomButton.white(
                 text: '修改信息',
                 onPressed: () {
-                  Get.to(() => SupplementInformationPage(leaseId: model.id,));
+                  Get.to(() => SupplementInformationPage(
+                        leaseId: model.id,
+                      ));
                 }),
           ],
         );
@@ -144,7 +160,9 @@ class LeaseHouseCard extends StatelessWidget {
             CardBottomButton.yellow(
                 text: '去支付',
                 onPressed: () {
-                  Get.to(() => ContractPayPage(id: model.id,));
+                  Get.to(() => ContractPayPage(
+                        id: model.id,
+                      ));
                 })
           ],
         );
@@ -162,6 +180,7 @@ class LeaseHouseCard extends StatelessWidget {
         return Row();
     }
   }
+
   List<Color> _getColors(int type) {
     switch (type) {
       case 1:

lib/ui/profile/house/my_house_list.dart

@@ -1,17 +1,19 @@
+import 'package:flutter/material.dart';
+
+import 'package:flustars/flustars.dart';
+import 'package:flutter_easyrefresh/easy_refresh.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
+import 'package:velocity_x/velocity_x.dart';
+
 import 'package:aku_community/base/base_style.dart';
+import 'package:aku_community/const/resource.dart';
 import 'package:aku_community/model/user/house_model.dart';
 import 'package:aku_community/ui/profile/house/add_house_page.dart';
 import 'package:aku_community/ui/profile/house/house_func.dart';
 import 'package:aku_community/widget/bee_divider.dart';
 import 'package:aku_community/widget/bee_scaffold.dart';
 import 'package:aku_community/widget/others/bee_row_tile.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:get/get.dart';
-import 'package:velocity_x/velocity_x.dart';
-import 'package:aku_community/const/resource.dart';
 
 class MyHouseList extends StatefulWidget {
   MyHouseList({Key? key}) : super(key: key);

lib/ui/profile/house/pick_my_house_page.dart

@@ -1,4 +1,3 @@
-import 'package:aku_community/models/user/passed_house_list_model.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
@@ -10,6 +9,7 @@ import 'package:provider/provider.dart';
 
 import 'package:aku_community/constants/api.dart';
 import 'package:aku_community/constants/app_theme.dart';
+import 'package:aku_community/models/user/passed_house_list_model.dart';
 import 'package:aku_community/provider/app_provider.dart';
 import 'package:aku_community/ui/profile/house/add_house_page.dart';
 import 'package:aku_community/ui/profile/house/house_func.dart';

lib/ui/profile/house/supplement_information_page.dart

@@ -1,6 +1,15 @@
 import 'dart:io';
 
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.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';
+
 import 'package:aku_community/base/base_style.dart';
+import 'package:aku_community/extensions/widget_list_ext.dart';
 import 'package:aku_community/models/house/lease_detail_model.dart';
 import 'package:aku_community/models/house/submit_model.dart';
 import 'package:aku_community/ui/profile/house/house_func.dart';
@@ -10,13 +19,6 @@ import 'package:aku_community/widget/buttons/bottom_button.dart';
 import 'package:aku_community/widget/others/bee_input_row.dart';
 import 'package:aku_community/widget/others/user_tool.dart';
 import 'package:aku_community/widget/picker/identify_card_picker.dart';
-import 'package:bot_toast/bot_toast.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:aku_community/extensions/widget_list_ext.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:get/get.dart';
-import 'package:velocity_x/velocity_x.dart';
 
 class SupplementInformationPage extends StatefulWidget {
   final int leaseId;

lib/ui/profile/house/tenant_house_list_page.dart

@@ -1,12 +1,14 @@
+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';
+
 import 'package:aku_community/constants/api.dart';
 import 'package:aku_community/models/house/lease_list_model.dart';
 import 'package:aku_community/pages/things_page/widget/bee_list_view.dart';
 import 'package:aku_community/ui/profile/house/lease_house_card.dart';
 import 'package:aku_community/widget/bee_scaffold.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 TenantHouseListPage extends StatefulWidget {
   TenantHouseListPage({Key? key}) : super(key: key);
@@ -54,6 +56,4 @@ class _TenantHouseListPageState extends State<TenantHouseListPage> {
           }),
     );
   }
-
-
 }

lib/ui/profile/house/upload_contracts_page.dart

@@ -1,19 +1,21 @@
 import 'dart:io';
 
-import 'package:aku_community/base/base_style.dart';
-import 'package:aku_community/ui/profile/house/house_func.dart';
-import 'package:aku_community/widget/bee_scaffold.dart';
-import 'package:aku_community/widget/buttons/bottom_button.dart';
-import 'package:aku_community/widget/others/upload_widget.dart';
-import 'package:aku_community/widget/views/doc_view.dart';
-import 'package:bot_toast/bot_toast.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+
+import 'package:bot_toast/bot_toast.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:open_file/open_file.dart';
 import 'package:velocity_x/velocity_x.dart';
+
+import 'package:aku_community/base/base_style.dart';
 import 'package:aku_community/extensions/widget_list_ext.dart';
+import 'package:aku_community/ui/profile/house/house_func.dart';
+import 'package:aku_community/widget/bee_scaffold.dart';
+import 'package:aku_community/widget/buttons/bottom_button.dart';
+import 'package:aku_community/widget/others/upload_widget.dart';
+import 'package:aku_community/widget/views/doc_view.dart';
 
 class UploadContractsPage extends StatefulWidget {
   final int id;

lib/ui/profile/house/upload_empty_form_page.dart

@@ -1,6 +1,7 @@
+import 'package:flutter/material.dart';
+
 import 'package:aku_community/painters/contact_manager_painter.dart';
 import 'package:aku_community/widget/bee_scaffold.dart';
-import 'package:flutter/material.dart';
 
 class UploadEmptyFormPage extends StatefulWidget {
   UploadEmptyFormPage({Key? key}) : super(key: key);

lib/ui/profile/house/user_identify_page.dart

@@ -1,18 +1,20 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.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';
+
 import 'package:aku_community/base/base_style.dart';
+import 'package:aku_community/extensions/widget_list_ext.dart';
 import 'package:aku_community/models/house/lease_echo_model.dart';
 import 'package:aku_community/ui/profile/house/house_func.dart';
 import 'package:aku_community/ui/profile/house/tenant_house_list_page.dart';
 import 'package:aku_community/widget/bee_scaffold.dart';
 import 'package:aku_community/widget/buttons/bottom_button.dart';
 import 'package:aku_community/widget/others/bee_input_row.dart';
-import 'package:bot_toast/bot_toast.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:get/get.dart';
-import 'package:velocity_x/velocity_x.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:aku_community/extensions/widget_list_ext.dart';
 
 class UserIdentifyPage extends StatefulWidget {
   UserIdentifyPage({Key? key}) : super(key: key);

lib/ui/search/bee_search.dart

@@ -1,5 +1,3 @@
-import 'package:aku_community/ui/community/activity/activity_detail_page.dart';
-import 'package:aku_community/ui/community/community_views/topic/topic_detail_page.dart';
 import 'package:flutter/material.dart';
 
 import 'package:flutter_easyrefresh/easy_refresh.dart';
@@ -13,6 +11,8 @@ import 'package:aku_community/model/common/img_model.dart';
 import 'package:aku_community/model/community/activity_item_model.dart';
 import 'package:aku_community/model/community/community_topic_model.dart';
 import 'package:aku_community/models/search/search_model.dart';
+import 'package:aku_community/ui/community/activity/activity_detail_page.dart';
+import 'package:aku_community/ui/community/community_views/topic/topic_detail_page.dart';
 import 'package:aku_community/utils/headers.dart';
 import 'package:aku_community/utils/login_util.dart';
 import 'package:aku_community/utils/network/base_model.dart';

lib/utils/login_util.dart

@@ -1,5 +1,3 @@
-import 'package:aku_community/ui/profile/house/house_owners_page.dart';
-import 'package:aku_community/widget/others/user_tool.dart';
 import 'package:bot_toast/bot_toast.dart';
 import 'package:get/get.dart';
 import 'package:provider/provider.dart';
@@ -8,6 +6,8 @@ import 'package:aku_community/pages/sign/sign_in_page.dart';
 import 'package:aku_community/provider/app_provider.dart';
 import 'package:aku_community/provider/user_provider.dart';
 import 'package:aku_community/ui/profile/house/add_house_page.dart';
+import 'package:aku_community/ui/profile/house/house_owners_page.dart';
+import 'package:aku_community/widget/others/user_tool.dart';
 
 /// | 名称 | 函数 |
 /// |-----|------|
@@ -43,7 +43,9 @@ class LoginUtil {
     }
     if (appProvider.selectedHouse == null) {
       BotToast.showText(text: '房屋审核中或审核失败');
-      Get.to(() => HouseOwnersPage(identify: UserTool.userProvider.userDetailModel!.type??4,));
+      Get.to(() => HouseOwnersPage(
+            identify: UserTool.userProvider.userDetailModel!.type ?? 4,
+          ));
       return false;
     }
     return true;

lib/utils/message_parser.dart

@@ -2,8 +2,6 @@ import 'dart:convert';
 
 import 'package:aku_community/utils/websocket/fire_dialog.dart';
 
-
-
 class MessageParser {
   final Map<String, dynamic> message;
   String subTitle = '';

lib/utils/network/net_util.dart

@@ -128,7 +128,8 @@ class NetUtil {
     try {
       Response res = await _dio!.post(path,
           data: FormData.fromMap({
-            'file': await MultipartFile.fromBytes(bytes,filename: 'signName.png'),
+            'file':
+                await MultipartFile.fromBytes(bytes, filename: 'signName.png'),
           }));
       BaseFileModel baseListModel = BaseFileModel.fromJson(res.data);
       return baseListModel;

lib/utils/websocket/fire_dialog.dart

@@ -1,10 +1,12 @@
-import 'package:aku_community/pages/tab_navigator.dart';
-import 'package:aku_community/utils/developer_util.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:get/get.dart';
+
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
+
 import 'package:aku_community/extensions/num_ext.dart';
+import 'package:aku_community/pages/tab_navigator.dart';
+import 'package:aku_community/utils/developer_util.dart';
 
 class FireDialog {
   static fireAlarm(String content) async {

lib/utils/websocket/web_socket_util.dart

@@ -1,10 +1,12 @@
 import 'dart:async';
-import 'package:aku_community/widget/others/user_tool.dart';
+
 import 'package:bot_toast/bot_toast.dart';
 import 'package:power_logger/power_logger.dart';
 import 'package:web_socket_channel/io.dart';
 import 'package:web_socket_channel/web_socket_channel.dart';
 
+import 'package:aku_community/widget/others/user_tool.dart';
+
 const String baseUri = 'wss://test.kaidalai.cn/websocket/app';
 enum SOCKETSTATUS {
   CONNECTED, //已连接

lib/widget/buttons/bee_numberic_button.dart

@@ -1,9 +1,11 @@
-import 'package:aku_community/base/base_style.dart';
-import 'package:aku_community/painters/as_numberic_painter.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
+import 'package:aku_community/base/base_style.dart';
+import 'package:aku_community/painters/as_numberic_painter.dart';
+
 ///## 数量选择组件
 class BeeNumberPickerButton extends StatefulWidget {
   ///初始值
@@ -136,7 +138,8 @@ class _ASNumericButtonState extends State<BeeNumberPickerButton> {
                 ? CustomPaint(
                     painter: ASNUmericPainter.minus(),
                   )
-                : Icon(CupertinoIcons.minus,size: 20.w, color: Color(0xFFC4C4C4)),
+                : Icon(CupertinoIcons.minus,
+                    size: 20.w, color: Color(0xFFC4C4C4)),
             onPressed: () {
               _focusNode.unfocus();
               if (_displayValue > widget.minValue) {

lib/widget/buttons/card_bottom_button.dart

@@ -4,6 +4,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:velocity_x/velocity_x.dart';
 
 import 'package:aku_community/base/base_style.dart';
+
 //各种卡片下方的button组
 class CardBottomButton extends StatelessWidget {
   final String text;

lib/widget/buttons/column_action_button.dart

@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:velocity_x/velocity_x.dart';
 
 import 'package:aku_community/utils/headers.dart';
+
 ///上图片 下文字 的button
 class ColumnActionButton extends StatelessWidget {
   final VoidCallback? onPressed;

lib/widget/others/bee_input_row.dart

@@ -1,9 +1,10 @@
-import 'package:aku_community/base/base_style.dart';
-import 'package:aku_community/widget/bee_divider.dart';
 import 'package:flutter/material.dart';
-import 'package:aku_community/utils/headers.dart';
 import 'package:flutter/services.dart';
 
+import 'package:aku_community/base/base_style.dart';
+import 'package:aku_community/utils/headers.dart';
+import 'package:aku_community/widget/bee_divider.dart';
+
 class BeeInputRow extends StatefulWidget {
   final String title;
   final TextEditingController? controller;

lib/widget/others/bee_row_tile.dart

@@ -1,8 +1,10 @@
-import 'package:aku_community/base/base_style.dart';
 import 'package:flutter/material.dart';
+
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:velocity_x/velocity_x.dart';
 
+import 'package:aku_community/base/base_style.dart';
+
 class BeeRowTile extends StatelessWidget {
   final String assetPath;
   final String titile;

lib/widget/others/finish_result_image.dart

@@ -1,8 +1,10 @@
-import 'package:aku_community/base/base_style.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
+import 'package:aku_community/base/base_style.dart';
+
 class FinishResultImage extends StatelessWidget {
   const FinishResultImage({
     Key? key,
@@ -22,9 +24,7 @@ class FinishResultImage extends StatelessWidget {
         color: this.status! ? kPrimaryColor : kDangerColor,
       ),
       child: Icon(
-        this.status!
+        this.status! ? CupertinoIcons.checkmark : CupertinoIcons.multiply,
-            ? CupertinoIcons.checkmark
-            : CupertinoIcons.multiply,
         size: 70.w,
         color: Colors.white,
       ),

lib/widget/others/house_head_card.dart

@@ -1,22 +1,25 @@
-import 'package:aku_community/base/base_style.dart';
-import 'package:aku_community/const/resource.dart';
-import 'package:aku_community/provider/app_provider.dart';
-import 'package:aku_community/ui/profile/house/pick_my_house_page.dart';
-import 'package:aku_community/utils/headers.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:flutter_screenutil/flutter_screenutil.dart';
 import 'package:velocity_x/velocity_x.dart';
 
+import 'package:aku_community/base/base_style.dart';
+import 'package:aku_community/const/resource.dart';
+import 'package:aku_community/provider/app_provider.dart';
+import 'package:aku_community/ui/profile/house/pick_my_house_page.dart';
+import 'package:aku_community/utils/headers.dart';
+
 class HouseHeadCard extends StatelessWidget {
   const HouseHeadCard({
     Key? key,
     required this.context,
     required EasyRefreshController? controller,
-  }) : controller = controller, super(key: key);
+  })  : controller = controller,
+        super(key: key);
 
   final BuildContext context;
   final EasyRefreshController? controller;

lib/widget/others/sign_name_board.dart

@@ -1,9 +1,10 @@
 import 'package:flutter/cupertino.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:signature/signature.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:velocity_x/velocity_x.dart';
 
 class SignNameBoard extends StatefulWidget {
@@ -39,7 +40,8 @@ class SignNameBoard extends StatefulWidget {
       {Key? key,
       required this.signatureController,
       this.forceToHorizontal = true,
-      required this.width, required this.height})
+      required this.width,
+      required this.height})
       : super(key: key);
 
   @override

lib/widget/others/upload_widget.dart

@@ -1,12 +1,14 @@
 import 'dart:io';
 
-import 'package:aku_community/painters/upload_painter.dart';
-import 'package:aku_community/widget/picker/bee_image_picker.dart';
-import 'package:dotted_border/dotted_border.dart';
 import 'package:flutter/material.dart';
+
+import 'package:dotted_border/dotted_border.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:velocity_x/velocity_x.dart';
 
+import 'package:aku_community/painters/upload_painter.dart';
+import 'package:aku_community/widget/picker/bee_image_picker.dart';
+
 class UploadWidget extends StatelessWidget {
   final String sheetTitle;
   final Function(File file) onPressed;

lib/widget/others/user_tool.dart

@@ -1,10 +1,12 @@
-import 'package:aku_community/provider/app_provider.dart';
-import 'package:aku_community/provider/user_provider.dart';
 import 'package:get/get.dart';
 import 'package:provider/provider.dart';
 
+import 'package:aku_community/provider/app_provider.dart';
+import 'package:aku_community/provider/user_provider.dart';
+
 class UserTool {
   static UserProvider get userProvider =>
       Provider.of<UserProvider>(Get.context!, listen: false);
- static AppProvider get appProveider => Provider.of<AppProvider>(Get.context!,listen: false);
+  static AppProvider get appProveider =>
+      Provider.of<AppProvider>(Get.context!, listen: false);
 }

lib/widget/picker/bee_image_preview.dart

@@ -6,6 +6,7 @@ import 'package:get/get.dart';
 
 import 'package:aku_community/const/resource.dart';
 import 'package:aku_community/constants/api.dart';
+
 ///图片点击放大预览
 class BeeImagePreview extends StatefulWidget {
   static Future<T?> toFile<T>({required File file, String? tag}) async {

lib/widget/picker/identify_card_picker.dart

@@ -1,12 +1,14 @@
 import 'dart:io';
 
-import 'package:aku_community/base/base_style.dart';
-import 'package:aku_community/const/resource.dart';
-import 'package:aku_community/widget/picker/bee_image_picker.dart';
 import 'package:flutter/material.dart';
+
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:velocity_x/velocity_x.dart';
 
+import 'package:aku_community/base/base_style.dart';
+import 'package:aku_community/const/resource.dart';
+import 'package:aku_community/widget/picker/bee_image_picker.dart';
+
 class IdentifyCardPicker extends StatefulWidget {
   static Widget front(Function(File? file) onChange) {
     return Column(

lib/widget/views/application_view.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:get/get.dart';
 
+import 'package:get/get.dart';
 import 'package:provider/provider.dart';
 import 'package:velocity_x/velocity_x.dart';
 

lib/widget/views/doc_view.dart

@@ -1,14 +1,17 @@
-import 'package:aku_community/const/resource.dart';
 import 'package:flutter/material.dart';
+
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:velocity_x/velocity_x.dart';
 
+import 'package:aku_community/const/resource.dart';
+
 class DocViw extends StatelessWidget {
   const DocViw({
     Key? key,
     required this.title,
     required this.onPressed,
-    this.margin, this.onLongPress,
+    this.margin,
+    this.onLongPress,
   }) : super(key: key);
 
   final String title;