Merge branch 'newHost' of https://git.oa00.com/1281228557/aku_new_community into newHost

# Conflicts:
#	lib/ui/community/facility/facility_preorder_date_picker.dart
#	lib/ui/community/facility/facility_preorder_page.dart

.fvm/fvm_config.json

@@ -1,4 +1,4 @@
 {
-  "flutterSdkVersion": "2.8.1",
+  "flutterSdkVersion": "2.10.2",
   "flavors": {}
 }

lib/constants/app_theme.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
 class AppTheme {

lib/constants/application_objects.dart

@@ -1,5 +1,9 @@
 // import 'package:aku_new_community/widget/bee_scaffold.dart';
 
+import 'package:flutter/material.dart';
+
+import 'package:get/get.dart';
+
 import 'package:aku_new_community/const/resource.dart';
 import 'package:aku_new_community/gen/assets.gen.dart';
 import 'package:aku_new_community/pages/community_introduce/community_introduce_page.dart';
@@ -31,9 +35,6 @@ import 'package:aku_new_community/ui/manager/questionnaire/questionnaire_page.da
 import 'package:aku_new_community/ui/profile/car/car_manage_page.dart';
 import 'package:aku_new_community/ui/profile/car_parking/car_parking_page.dart';
 import 'package:aku_new_community/ui/profile/house/house_owners_page.dart';
-import 'package:bot_toast/bot_toast.dart';
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
 
 ///应用对象
 ///Application Object

lib/constants/config.dart

@@ -4,4 +4,7 @@ class AppConfig {
 
   ///微信AppID
   static const wechatAppId = 'wxd7bdef0d4849ddb8';
+
+  ///极光推送key
+  static const jpushKey = '5f42cbb15abcdda6f8aeb925';
 }

lib/main.dart

@@ -1,4 +1,3 @@
-import 'package:aku_new_community/provider/clock_timer_provider.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
@@ -8,9 +7,9 @@ import 'package:get/get.dart';
 import 'package:provider/provider.dart';
 
 import 'package:aku_new_community/constants/app_theme.dart';
-import 'package:aku_new_community/main_initialize.dart';
 import 'package:aku_new_community/pages/splash/splash_page.dart';
 import 'package:aku_new_community/provider/app_provider.dart';
+import 'package:aku_new_community/provider/clock_timer_provider.dart';
 import 'package:aku_new_community/provider/data_provider.dart';
 import 'package:aku_new_community/provider/sign_up_provider.dart';
 import 'package:aku_new_community/provider/user_provider.dart';

lib/main_initialize.dart

@@ -66,7 +66,7 @@ class MainInitialize {
       });
     } on PlatformException {}
     jpush.setup(
-      appKey: "5f42cbb15abcdda6f8aeb925",
+      appKey: AppConfig.jpushKey,
       channel: "developer-default",
       production: false,
       debug: true,
@@ -82,7 +82,12 @@ class MainInitialize {
 
   static initWechat() {
     if (kIsWeb || Platform.isMacOS) return;
-    registerWxApi(appId: AppConfig.wechatAppId);
+    var isAndroid = Platform.isAndroid;
+    registerWxApi(
+        appId: AppConfig.wechatAppId,
+        doOnIOS: !isAndroid,
+        doOnAndroid: isAndroid,
+        universalLink: '');
   }
 
   static initWebSocket() {

lib/model/community/activity_item_model.dart

@@ -1,7 +1,9 @@
+import 'package:flutter/material.dart';
+
+import 'package:common_utils/common_utils.dart';
+
 import 'package:aku_new_community/base/base_style.dart';
 import 'package:aku_new_community/model/common/img_model.dart';
-import 'package:common_utils/common_utils.dart';
-import 'package:flutter/material.dart';
 
 @Deprecated('弃用')
 class ActivityItemModel {

lib/model/community/my_event_item_model.dart

@@ -1,6 +1,7 @@
-import 'package:aku_new_community/model/common/img_model.dart';
 import 'package:common_utils/common_utils.dart';
 
+import 'package:aku_new_community/model/common/img_model.dart';
+
 @Deprecated('old model to deprecate')
 class MyEventItemModel {
   int? id;

lib/model/manager/event_voting_model.dart

@@ -1,6 +1,7 @@
-import 'package:aku_new_community/model/common/img_model.dart';
 import 'package:common_utils/common_utils.dart';
 
+import 'package:aku_new_community/model/common/img_model.dart';
+
 class EventVotingModel {
   int? id;
   String? title;

lib/model/manager/voting_detail_model.dart

@@ -1,6 +1,7 @@
-import 'package:aku_new_community/model/common/img_model.dart';
 import 'package:common_utils/common_utils.dart';
 
+import 'package:aku_new_community/model/common/img_model.dart';
+
 class VotingDetailModel {
   int? id;
   String? title;

lib/model/user/committee_item_model.dart

@@ -1,7 +1,8 @@
-import 'package:aku_new_community/model/common/img_model.dart';
 import 'package:common_utils/common_utils.dart';
 import 'package:json_annotation/json_annotation.dart';
 
+import 'package:aku_new_community/model/common/img_model.dart';
+
 @JsonSerializable()
 class CommitteeItemModel {
   final int? id;
@@ -50,4 +51,4 @@ CommitteeItemModel _$CommitteeItemModel(Map<String, dynamic> json) =>
       imgList: (json['imgList'] as List<dynamic>)
           .map((e) => ImgModel.fromJson(e as Map<String, dynamic>))
           .toList(),
-    );
+    );

lib/models/community/comment_list_model.dart

@@ -1,6 +1,7 @@
-import 'package:aku_new_community/model/common/img_model.dart';
 import 'package:json_annotation/json_annotation.dart';
 
+import 'package:aku_new_community/model/common/img_model.dart';
+
 part 'comment_list_model.g.dart';
 
 @JsonSerializable()

lib/models/community/dynamic_my_list_body.dart

@@ -1,8 +1,9 @@
-import 'package:aku_new_community/model/common/img_model.dart';
-import 'package:aku_new_community/models/community/all_dynamic_list_model.dart';
 import 'package:common_utils/common_utils.dart';
 import 'package:json_annotation/json_annotation.dart';
 
+import 'package:aku_new_community/model/common/img_model.dart';
+import 'package:aku_new_community/models/community/all_dynamic_list_model.dart';
+
 part 'dynamic_my_list_body.g.dart';
 
 @JsonSerializable()

lib/models/community/dynamic_my_list_head.dart

@@ -1,6 +1,7 @@
-import 'package:aku_new_community/model/common/img_model.dart';
 import 'package:json_annotation/json_annotation.dart';
 
+import 'package:aku_new_community/model/common/img_model.dart';
+
 part 'dynamic_my_list_head.g.dart';
 
 @JsonSerializable()

lib/models/community/information_list_model.dart

@@ -1,7 +1,8 @@
-import 'package:aku_new_community/model/common/img_model.dart';
 import 'package:common_utils/common_utils.dart';
 import 'package:json_annotation/json_annotation.dart';
 
+import 'package:aku_new_community/model/common/img_model.dart';
+
 part 'information_list_model.g.dart';
 
 @JsonSerializable()

lib/models/community/recommend_read_model.dart

@@ -1,7 +1,8 @@
-import 'package:aku_new_community/model/common/img_model.dart';
 import 'package:common_utils/common_utils.dart';
 import 'package:json_annotation/json_annotation.dart';
 
+import 'package:aku_new_community/model/common/img_model.dart';
+
 part 'recommend_read_model.g.dart';
 
 @JsonSerializable()

lib/models/convenience_phone/convenience_phone_model.dart

@@ -1,5 +1,5 @@
-import 'package:json_annotation/json_annotation.dart';
 import 'package:equatable/equatable.dart';
+import 'package:json_annotation/json_annotation.dart';
 
 part 'convenience_phone_model.g.dart';
 
@@ -23,4 +23,4 @@ class ConveniencePhoneModel extends Equatable {
 
   @override
   List<Object?> get props => [id, name, tel, type,];
-}
+}

lib/models/facility/facility_appointment_model.g.dart

@@ -13,7 +13,7 @@ FacilityAppointmentModel _$FacilityAppointmentModelFromJson(
       code: json['code'] as String,
       status: json['status'] as int,
       address: json['address'] as String,
-      reserveStartDate: json['reserveStartDate'] as String,
       reserveEndDate: json['reserveEndDate'] as String,
+      reserveStartDate: json['reserveStartDate'] as String,
       nullifyReason: json['nullifyReason'] as String?,
     );

lib/models/facility/facility_type_model.g.dart

@@ -13,7 +13,7 @@ FacilityTypeModel _$FacilityTypeModelFromJson(Map<String, dynamic> json) =>
       name: json['name'] as String,
       type: json['type'] as int,
       num_: json['num'] as int,
-      imgUrls: (json['imgList'] as List<dynamic>?)
+      imgUrls: (json['imgUrls'] as List<dynamic>?)
           ?.map((e) => ImgModel.fromJson(e as Map<String, dynamic>))
           .toList(),
     );

lib/models/home/activity_detail_model.dart

@@ -1,7 +1,8 @@
-import 'package:aku_new_community/model/common/img_model.dart';
 import 'package:common_utils/common_utils.dart';
 import 'package:json_annotation/json_annotation.dart';
 
+import 'package:aku_new_community/model/common/img_model.dart';
+
 part 'activity_detail_model.g.dart';
 
 @JsonSerializable()

lib/models/home/announce_detail_model.dart

@@ -1,6 +1,7 @@
-import 'package:aku_new_community/model/common/img_model.dart';
 import 'package:json_annotation/json_annotation.dart';
 
+import 'package:aku_new_community/model/common/img_model.dart';
+
 part 'announce_detail_model.g.dart';
 
 @JsonSerializable()

lib/models/home/home_activity_model.dart

@@ -1,10 +1,12 @@
-import 'package:aku_new_community/base/base_style.dart';
+import 'package:flutter/material.dart';
-import 'package:aku_new_community/model/common/img_model.dart';
+
 import 'package:common_utils/common_utils.dart';
 import 'package:equatable/equatable.dart';
-import 'package:flutter/material.dart';
 import 'package:json_annotation/json_annotation.dart';
 
+import 'package:aku_new_community/base/base_style.dart';
+import 'package:aku_new_community/model/common/img_model.dart';
+
 part 'home_activity_model.g.dart';
 
 @JsonSerializable()

lib/models/home/home_announce_model.dart

@@ -1,7 +1,8 @@
-import 'package:aku_new_community/model/common/img_model.dart';
 import 'package:common_utils/common_utils.dart';
 import 'package:json_annotation/json_annotation.dart';
 
+import 'package:aku_new_community/model/common/img_model.dart';
+
 part 'home_announce_model.g.dart';
 
 @JsonSerializable()

lib/models/home/home_swiper_model.dart

@@ -1,6 +1,7 @@
-import 'package:aku_new_community/model/common/img_model.dart';
 import 'package:json_annotation/json_annotation.dart';
 
+import 'package:aku_new_community/model/common/img_model.dart';
+
 part 'home_swiper_model.g.dart';
 
 @JsonSerializable()

lib/models/market/good_detail_model.dart

@@ -1,7 +1,8 @@
-import 'package:aku_new_community/ui/market/shop_car/shop_car_func.dart';
 import 'package:equatable/equatable.dart';
 import 'package:json_annotation/json_annotation.dart';
 
+import 'package:aku_new_community/ui/market/shop_car/shop_car_func.dart';
+
 part 'good_detail_model.g.dart';
 
 @JsonSerializable()

lib/models/market/integral_goods_list_model.dart

@@ -1,5 +1,5 @@
-import 'package:json_annotation/json_annotation.dart';
 import 'package:equatable/equatable.dart';
+import 'package:json_annotation/json_annotation.dart';
 
 part 'integral_goods_list_model.g.dart';
 

lib/models/market/market_all_category_model.dart

@@ -1,6 +1,7 @@
-import 'package:aku_new_community/model/common/img_model.dart';
 import 'package:json_annotation/json_annotation.dart';
 
+import 'package:aku_new_community/model/common/img_model.dart';
+
 part 'market_all_category_model.g.dart';
 
 @JsonSerializable()

lib/models/market/market_category_model.dart

@@ -1,7 +1,8 @@
-import 'package:aku_new_community/model/common/img_model.dart';
 import 'package:equatable/equatable.dart';
 import 'package:json_annotation/json_annotation.dart';
 
+import 'package:aku_new_community/model/common/img_model.dart';
+
 part 'market_category_model.g.dart';
 
 @JsonSerializable()

lib/models/market/shop_car/shop_car_list_model.dart

@@ -1,6 +1,7 @@
-import 'package:aku_new_community/ui/market/shop_car/shop_car_func.dart';
 import 'package:json_annotation/json_annotation.dart';
 
+import 'package:aku_new_community/ui/market/shop_car/shop_car_func.dart';
+
 part 'shop_car_list_model.g.dart';
 
 @JsonSerializable()

lib/models/message/thumbs_up_list_model.dart

@@ -1,6 +1,7 @@
-import 'package:aku_new_community/model/common/img_model.dart';
 import 'package:json_annotation/json_annotation.dart';
 
+import 'package:aku_new_community/model/common/img_model.dart';
+
 part 'thumbs_up_list_model.g.dart';
 
 @JsonSerializable()

lib/models/pay/wx_pay_model.dart

@@ -0,0 +1,37 @@
+import 'package:equatable/equatable.dart';
+import 'package:json_annotation/json_annotation.dart';
+
+part 'wx_pay_model.g.dart';
+
+@JsonSerializable()
+class WxPayModel extends Equatable {
+  final String prepayId;
+  final String partnerId;
+  final String timeStamp;
+  final String nonceStr;
+  final String package;
+  final String sign;
+
+  factory WxPayModel.fromJson(Map<String, dynamic> json) =>
+      _$WxPayModelFromJson(json);
+
+
+  const WxPayModel({
+    required this.prepayId,
+    required this.partnerId,
+    required this.timeStamp,
+    required this.nonceStr,
+    required this.package,
+    required this.sign,
+  });
+
+  @override
+  List<Object?> get props => [
+    prepayId,
+    partnerId,
+    timeStamp,
+    nonceStr,
+    package,
+    sign,
+  ];
+}

lib/models/pay/wx_pay_model.g.dart

@@ -0,0 +1,16 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'wx_pay_model.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+WxPayModel _$WxPayModelFromJson(Map<String, dynamic> json) => WxPayModel(
+      prepayId: json['prepayId'] as String,
+      partnerId: json['partnerId'] as String,
+      timeStamp: json['timeStamp'] as String,
+      nonceStr: json['nonceStr'] as String,
+      package: json['package'] as String,
+      sign: json['sign'] as String,
+    );

lib/models/user/user_info_model.dart

@@ -1,6 +1,7 @@
-import 'package:aku_new_community/model/common/img_model.dart';
 import 'package:json_annotation/json_annotation.dart';
 
+import 'package:aku_new_community/model/common/img_model.dart';
+
 part 'user_info_model.g.dart';
 
 @JsonSerializable()

lib/models/wallet/trade_record_list_model.dart

@@ -1,5 +1,5 @@
-import 'package:json_annotation/json_annotation.dart';
 import 'package:equatable/equatable.dart';
+import 'package:json_annotation/json_annotation.dart';
 
 part 'trade_record_list_model.g.dart';
 

lib/pages/community_introduce/community_introduce_page.dart

@@ -1,16 +1,17 @@
+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_new_community/base/base_style.dart';
 import 'package:aku_new_community/const/resource.dart';
-import 'package:aku_new_community/constants/api.dart';
 import 'package:aku_new_community/constants/saas_api.dart';
 import 'package:aku_new_community/model/common/img_model.dart';
 import 'package:aku_new_community/models/community_introduce/community_introduce_model.dart';
 import 'package:aku_new_community/utils/network/base_model.dart';
 import 'package:aku_new_community/utils/network/net_util.dart';
 import 'package:aku_new_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 CommunityIntroducePage extends StatefulWidget {
   CommunityIntroducePage({Key? key}) : super(key: key);

lib/pages/convenient_phone/convenient_phone_page.dart

@@ -1,16 +1,18 @@
-import 'package:aku_new_community/const/resource.dart';
-import 'package:aku_new_community/constants/saas_api.dart';
-import 'package:aku_new_community/models/convenience_phone/convenience_phone_model.dart';
-import 'package:aku_new_community/utils/network/net_util.dart';
-import 'package:aku_new_community/widget/bee_scaffold.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:url_launcher/url_launcher.dart';
 import 'package:velocity_x/velocity_x.dart';
 
+import 'package:aku_new_community/const/resource.dart';
+import 'package:aku_new_community/constants/saas_api.dart';
+import 'package:aku_new_community/models/convenience_phone/convenience_phone_model.dart';
+import 'package:aku_new_community/utils/network/net_util.dart';
+import 'package:aku_new_community/widget/bee_scaffold.dart';
+
 class ConvenientPhonePage extends StatefulWidget {
   ConvenientPhonePage({Key? key}) : super(key: key);
 

lib/pages/electronic_commerc/electronic_commerc_card.dart

@@ -1,14 +1,16 @@
+import 'package:flutter/material.dart';
+
+import 'package:common_utils/common_utils.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
+import 'package:velocity_x/velocity_x.dart';
+
 import 'package:aku_new_community/base/base_style.dart';
 import 'package:aku_new_community/const/resource.dart';
 import 'package:aku_new_community/constants/saas_api.dart';
 import 'package:aku_new_community/model/common/img_model.dart';
 import 'package:aku_new_community/models/electronic_commerc/electronic_commerc_list_model.dart';
 import 'package:aku_new_community/pages/electronic_commerc/electronic_commerc_detail_page.dart';
-import 'package:common_utils/common_utils.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:get/get.dart';
-import 'package:velocity_x/velocity_x.dart';
 
 class ElectronicCommercCard extends StatefulWidget {
   final ElectronicCommercListModel model;

lib/pages/electronic_commerc/electronic_commerc_detail_page.dart

@@ -1,15 +1,17 @@
+import 'package:flutter/material.dart';
+
+import 'package:bot_toast/bot_toast.dart';
+import 'package:common_utils/common_utils.dart';
+import 'package:flutter_easyrefresh/easy_refresh.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:velocity_x/velocity_x.dart';
+
 import 'package:aku_new_community/base/base_style.dart';
 import 'package:aku_new_community/constants/api.dart';
 import 'package:aku_new_community/models/electronic_commerc/electronic_commerc_detail_model.dart';
 import 'package:aku_new_community/utils/network/base_model.dart';
 import 'package:aku_new_community/utils/network/net_util.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
-import 'package:bot_toast/bot_toast.dart';
-import 'package:common_utils/common_utils.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_easyrefresh/easy_refresh.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:velocity_x/velocity_x.dart';
 
 class ElectronicCommercDetailPage extends StatefulWidget {
   final int id;

lib/pages/electronic_commerc/electronic_commerc_page.dart

@@ -1,3 +1,10 @@
+import 'package:flutter/material.dart';
+
+import 'package:bot_toast/bot_toast.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:shimmer/shimmer.dart';
+import 'package:velocity_x/velocity_x.dart';
+
 import 'package:aku_new_community/constants/api.dart';
 import 'package:aku_new_community/extensions/num_ext.dart';
 import 'package:aku_new_community/models/electronic_commerc/electronic_commerc_category_model.dart';
@@ -8,11 +15,6 @@ import 'package:aku_new_community/utils/network/net_util.dart';
 import 'package:aku_new_community/utils/websocket/tips_dialog.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
 import 'package:aku_new_community/widget/tab_bar/bee_tab_bar.dart';
-import 'package:bot_toast/bot_toast.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:shimmer/shimmer.dart';
-import 'package:velocity_x/velocity_x.dart';
 
 class ElectronicCommercPage extends StatefulWidget {
   ElectronicCommercPage({Key? key}) : super(key: key);

lib/pages/electronic_commerc/electronic_commerc_view.dart

@@ -1,12 +1,14 @@
-import 'package:aku_new_community/constants/api.dart';
-import 'package:aku_new_community/models/electronic_commerc/electronic_commerc_list_model.dart';
-import 'package:aku_new_community/pages/electronic_commerc/electronic_commerc_card.dart';
-import 'package:aku_new_community/pages/things_page/widget/bee_list_view.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';
 
+import 'package:aku_new_community/constants/api.dart';
+import 'package:aku_new_community/models/electronic_commerc/electronic_commerc_list_model.dart';
+import 'package:aku_new_community/pages/electronic_commerc/electronic_commerc_card.dart';
+import 'package:aku_new_community/pages/things_page/widget/bee_list_view.dart';
+
 class ElectronicCommercView extends StatefulWidget {
   final int id;
 

lib/pages/event_activity/event_voting_page.dart

@@ -1,5 +1,10 @@
+import 'package:flutter/material.dart';
+
+import 'package:common_utils/common_utils.dart';
+import 'package:flutter_easyrefresh/easy_refresh.dart';
+import 'package:get/get.dart';
+
 import 'package:aku_new_community/base/base_style.dart';
-import 'package:aku_new_community/constants/api.dart';
 import 'package:aku_new_community/constants/saas_api.dart';
 import 'package:aku_new_community/model/common/img_model.dart';
 import 'package:aku_new_community/model/manager/event_voting_model.dart';
@@ -8,10 +13,6 @@ import 'package:aku_new_community/pages/things_page/widget/bee_list_view.dart';
 import 'package:aku_new_community/utils/headers.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
 import 'package:aku_new_community/widget/others/stack_avatar.dart';
-import 'package:common_utils/common_utils.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_easyrefresh/easy_refresh.dart';
-import 'package:get/get.dart';
 
 class EventVotingPage extends StatefulWidget {
   EventVotingPage({Key? key}) : super(key: key);

lib/pages/event_activity/voting_detail_page.dart

@@ -1,3 +1,10 @@
+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';
+
 import 'package:aku_new_community/base/base_style.dart';
 import 'package:aku_new_community/constants/app_theme.dart';
 import 'package:aku_new_community/constants/saas_api.dart';
@@ -10,11 +17,6 @@ import 'package:aku_new_community/widget/bee_divider.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
 import 'package:aku_new_community/widget/buttons/bee_single_check.dart';
 import 'package:aku_new_community/widget/buttons/bottom_button.dart';
-import 'package:bot_toast/bot_toast.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_easyrefresh/easy_refresh.dart';
-import 'package:get/get.dart';
 
 class VotingDetailPage extends StatefulWidget {
   final int? id;

lib/pages/express_packages/express_package_card.dart

@@ -1,3 +1,9 @@
+import 'package:flutter/material.dart';
+
+import 'package:bot_toast/bot_toast.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:velocity_x/velocity_x.dart';
+
 import 'package:aku_new_community/base/base_style.dart';
 import 'package:aku_new_community/const/resource.dart';
 import 'package:aku_new_community/constants/api.dart';
@@ -6,10 +12,6 @@ import 'package:aku_new_community/models/express_package/express_package_list_mo
 import 'package:aku_new_community/utils/network/base_model.dart';
 import 'package:aku_new_community/utils/network/net_util.dart';
 import 'package:aku_new_community/widget/bee_divider.dart';
-import 'package:bot_toast/bot_toast.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:velocity_x/velocity_x.dart';
 
 class ExpressPackageCard extends StatefulWidget {
   final int index;

lib/pages/express_packages/express_package_view.dart

@@ -1,12 +1,14 @@
-import 'package:aku_new_community/constants/api.dart';
-import 'package:aku_new_community/models/express_package/express_package_list_model.dart';
-import 'package:aku_new_community/pages/express_packages/express_package_card.dart';
-import 'package:aku_new_community/pages/things_page/widget/bee_list_view.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';
 
+import 'package:aku_new_community/constants/api.dart';
+import 'package:aku_new_community/models/express_package/express_package_list_model.dart';
+import 'package:aku_new_community/pages/express_packages/express_package_card.dart';
+import 'package:aku_new_community/pages/things_page/widget/bee_list_view.dart';
+
 class ExpressPackageView extends StatefulWidget {
   final int index;
 

lib/pages/geographic_information/geographic_information_page.dart

@@ -1,32 +1,15 @@
-import 'dart:io';
 
-import 'package:aku_new_community/constants/api.dart';
+import 'package:flutter/material.dart';
-import 'package:aku_new_community/pages/one_alarm/alarm_detail_page.dart';
+
-import 'package:aku_new_community/pages/one_alarm/widget/alarm_page.dart';
-import 'package:aku_new_community/provider/app_provider.dart';
-import 'package:aku_new_community/utils/headers.dart';
-import 'package:aku_new_community/utils/network/net_util.dart';
-import 'package:aku_new_community/widget/bee_scaffold.dart';
 import 'package:amap_flutter_base/amap_flutter_base.dart';
-import 'package:amap_flutter_location/amap_flutter_location.dart';
 import 'package:amap_flutter_map/amap_flutter_map.dart';
-import 'package:equatable/equatable.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:flutter_icons/flutter_icons.dart';
-import 'package:get/get.dart';
-import 'package:hive/hive.dart';
-import 'package:hive_flutter/adapters.dart';
-import 'package:permission_handler/permission_handler.dart';
-import 'package:power_logger/power_logger.dart';
 import 'package:provider/provider.dart';
-import 'package:url_launcher/url_launcher.dart';
 
-import '../../main_initialize.dart';
+import 'package:aku_new_community/pages/one_alarm/widget/alarm_page.dart';
-import '../../utils/hive_store.dart';
+import 'package:aku_new_community/provider/app_provider.dart';
+import 'package:aku_new_community/widget/bee_scaffold.dart';
 import '../../widget/others/user_tool.dart';
 
-
 class GeographicInformationPage extends StatefulWidget {
   GeographicInformationPage({Key? key}) : super(key: key);
 

lib/pages/goods_deto_page/deto_create_page/deto_create_page.dart

@@ -2,6 +2,14 @@
 
 import 'dart:io';
 
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+
+import 'package:bot_toast/bot_toast.dart';
+import 'package:common_utils/common_utils.dart';
+import 'package:get/get.dart';
+import 'package:provider/provider.dart';
+
 import 'package:aku_new_community/base/base_style.dart';
 import 'package:aku_new_community/constants/api.dart';
 import 'package:aku_new_community/constants/app_theme.dart';
@@ -20,12 +28,6 @@ import 'package:aku_new_community/widget/buttons/bee_check_button.dart';
 import 'package:aku_new_community/widget/buttons/bottom_button.dart';
 import 'package:aku_new_community/widget/picker/bee_date_picker.dart';
 import 'package:aku_new_community/widget/picker/grid_image_picker.dart';
-import 'package:bot_toast/bot_toast.dart';
-import 'package:common_utils/common_utils.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:provider/provider.dart';
 
 class DetoCreatePage extends StatefulWidget {
   DetoCreatePage({Key? key}) : super(key: key);

lib/pages/goods_deto_page/goods_deto_page.dart

@@ -1,3 +1,10 @@
+import 'package:flutter/material.dart';
+
+import 'package:bot_toast/bot_toast.dart';
+import 'package:flutter_easyrefresh/easy_refresh.dart';
+import 'package:get/get.dart';
+import 'package:provider/provider.dart';
+
 import 'package:aku_new_community/constants/api.dart';
 import 'package:aku_new_community/constants/app_theme.dart';
 import 'package:aku_new_community/model/manager/goods_out_model.dart';
@@ -9,12 +16,6 @@ import 'package:aku_new_community/utils/headers.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
 import 'package:aku_new_community/widget/buttons/bottom_button.dart';
 import 'package:aku_new_community/widget/buttons/radio_button.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:provider/provider.dart';
-
 import 'widget/goods_info_card.dart';
 
 class GoodsDetoPage extends StatefulWidget {

lib/pages/goods_manage_page/borrow/borrow_goods_detail_page.dart

@@ -1,3 +1,10 @@
+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_new_community/base/base_style.dart';
 import 'package:aku_new_community/const/resource.dart';
 import 'package:aku_new_community/constants/api.dart';
@@ -8,11 +15,6 @@ import 'package:aku_new_community/utils/network/base_model.dart';
 import 'package:aku_new_community/utils/network/net_util.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
 import 'package:aku_new_community/widget/buttons/radio_button.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';
 
 class BorrowGoodsDetailPage extends StatefulWidget {
   final int articleId;

lib/pages/goods_manage_page/borrow/borrow_goods_page.dart

@@ -1,3 +1,12 @@
+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:velocity_x/velocity_x.dart';
+
 import 'package:aku_new_community/base/base_style.dart';
 import 'package:aku_new_community/const/resource.dart';
 import 'package:aku_new_community/constants/api.dart';
@@ -9,14 +18,6 @@ import 'package:aku_new_community/utils/network/base_list_model.dart';
 import 'package:aku_new_community/utils/network/base_model.dart';
 import 'package:aku_new_community/utils/network/net_util.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
-import 'package:bot_toast/bot_toast.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:power_logger/power_logger.dart';
-import 'package:velocity_x/velocity_x.dart';
-
 import 'borrow_examine_page.dart';
 
 class BorrowGoodsSubmitModel {

lib/pages/goods_manage_page/goods_manage_page.dart

@@ -1,3 +1,8 @@
+import 'package:flutter/material.dart';
+
+import 'package:flutter_easyrefresh/easy_refresh.dart';
+import 'package:get/get.dart';
+
 import 'package:aku_new_community/constants/api.dart';
 import 'package:aku_new_community/constants/saas_api.dart';
 import 'package:aku_new_community/model/common/img_model.dart';
@@ -9,9 +14,6 @@ import 'package:aku_new_community/pages/things_page/widget/bee_list_view.dart';
 import 'package:aku_new_community/utils/headers.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
 import 'package:aku_new_community/widget/buttons/bottom_button.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_easyrefresh/easy_refresh.dart';
-import 'package:get/get.dart';
 
 class GoodsManagePage extends StatefulWidget {
   final bool isBorrow;

lib/pages/goods_manage_page/mine_goods_page/mine_goods_page.dart

@@ -1,3 +1,8 @@
+import 'package:flutter/material.dart';
+
+import 'package:flutter_easyrefresh/easy_refresh.dart';
+import 'package:get/get.dart';
+
 import 'package:aku_new_community/constants/api.dart';
 import 'package:aku_new_community/model/manager/mine_goods_model.dart';
 import 'package:aku_new_community/pages/goods_manage_page/borrow/borrow_examine_page.dart';
@@ -8,9 +13,6 @@ import 'package:aku_new_community/utils/headers.dart';
 import 'package:aku_new_community/utils/network/base_model.dart';
 import 'package:aku_new_community/utils/network/net_util.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_easyrefresh/easy_refresh.dart';
-import 'package:get/get.dart';
 
 class MineGoodsPage extends StatefulWidget {
   MineGoodsPage({Key? key}) : super(key: key);

lib/pages/goods_manage_page/retrun/return_goods_detail_page.dart

@@ -1,3 +1,11 @@
+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_new_community/base/base_style.dart';
 import 'package:aku_new_community/const/resource.dart';
 import 'package:aku_new_community/constants/api.dart';
@@ -9,12 +17,6 @@ import 'package:aku_new_community/utils/network/base_model.dart';
 import 'package:aku_new_community/utils/network/net_util.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
 import 'package:aku_new_community/widget/buttons/radio_button.dart';
-import 'package:bot_toast/bot_toast.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';
 
 class ReturnGoodsDetailPage extends StatefulWidget {
   ReturnGoodsDetailPage({Key? key}) : super(key: key);

lib/pages/home/home_page.dart

@@ -1,5 +1,18 @@
 // Dart imports:
 
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+
+import 'package:badges/badges.dart';
+import 'package:bot_toast/bot_toast.dart';
+import 'package:card_swiper/card_swiper.dart';
+import 'package:flutter_easyrefresh/easy_refresh.dart';
+import 'package:get/get.dart';
+import 'package:jpush_flutter/jpush_flutter.dart';
+import 'package:power_logger/power_logger.dart';
+import 'package:provider/provider.dart';
+import 'package:url_launcher/url_launcher.dart';
+
 import 'package:aku_new_community/constants/application_objects.dart';
 import 'package:aku_new_community/extensions/color_ext.dart';
 import 'package:aku_new_community/gen/assets.gen.dart';
@@ -20,23 +33,11 @@ import 'package:aku_new_community/ui/home/public_infomation/public_information_d
 import 'package:aku_new_community/ui/market/search/good_detail_page.dart';
 import 'package:aku_new_community/utils/headers.dart';
 import 'package:aku_new_community/utils/login_util.dart';
-import 'package:aku_new_community/widget/bee_image_network.dart';
 import 'package:aku_new_community/widget/bee_divider.dart';
+import 'package:aku_new_community/widget/bee_image_network.dart';
 import 'package:aku_new_community/widget/others/rectIndicator.dart';
 import 'package:aku_new_community/widget/others/user_tool.dart';
 import 'package:aku_new_community/widget/views/bee_gradient_divider.dart';
-import 'package:badges/badges.dart';
-import 'package:bot_toast/bot_toast.dart';
-import 'package:card_swiper/card_swiper.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:flutter_easyrefresh/easy_refresh.dart';
-import 'package:get/get.dart';
-import 'package:jpush_flutter/jpush_flutter.dart';
-import 'package:power_logger/power_logger.dart';
-import 'package:provider/provider.dart';
-import 'package:url_launcher/url_launcher.dart';
-
 import '../../ui/manager/advice/advice_page.dart';
 
 class HomePage extends StatefulWidget {

lib/pages/house_introduce/house_detail_page.dart

@@ -1,12 +1,14 @@
+import 'package:flutter/material.dart';
+
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:velocity_x/velocity_x.dart';
+
 import 'package:aku_new_community/base/base_style.dart';
 import 'package:aku_new_community/const/resource.dart';
 import 'package:aku_new_community/constants/api.dart';
 import 'package:aku_new_community/model/common/img_model.dart';
 import 'package:aku_new_community/models/house_introduce/house_introduce_model.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:velocity_x/velocity_x.dart';
 
 class HouseDetailPage extends StatefulWidget {
   final HouseIntroduceModel houseIntroduceModel;

lib/pages/house_introduce/house_introduce.dart

@@ -1,3 +1,8 @@
+import 'package:flutter/material.dart';
+
+import 'package:flutter_easyrefresh/easy_refresh.dart';
+import 'package:get/get.dart';
+
 import 'package:aku_new_community/base/base_style.dart';
 import 'package:aku_new_community/constants/api.dart';
 import 'package:aku_new_community/constants/app_theme.dart';
@@ -7,10 +12,6 @@ import 'package:aku_new_community/models/house_introduce/house_introduce_model.d
 import 'package:aku_new_community/pages/things_page/widget/bee_list_view.dart';
 import 'package:aku_new_community/utils/headers.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_easyrefresh/easy_refresh.dart';
-import 'package:get/get.dart';
-
 import 'house_detail_page.dart';
 
 class HouseIntroducePage extends StatefulWidget {

lib/pages/industry_committee/industry_committee_page.dart

@@ -1,21 +1,18 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+
+import 'package:common_utils/common_utils.dart';
+import 'package:flutter_easyrefresh/easy_refresh.dart';
+import 'package:get/get.dart';
+import 'package:url_launcher/url_launcher.dart';
+
 import 'package:aku_new_community/base/base_style.dart';
-import 'package:aku_new_community/constants/api.dart';
 import 'package:aku_new_community/constants/app_theme.dart';
 import 'package:aku_new_community/constants/saas_api.dart';
 import 'package:aku_new_community/model/common/img_model.dart';
 import 'package:aku_new_community/model/user/committee_item_model.dart';
-import 'package:aku_new_community/pages/things_page/widget/bee_list_view.dart';
 import 'package:aku_new_community/utils/headers.dart';
-import 'package:aku_new_community/utils/hive_store.dart';
-import 'package:aku_new_community/utils/websocket/tips_dialog.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
-import 'package:common_utils/common_utils.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_easyrefresh/easy_refresh.dart';
-import 'package:get/get.dart';
-import 'package:url_launcher/url_launcher.dart';
-
 import '../../utils/network/net_util.dart';
 
 class IndustryCommitteePage extends StatefulWidget {

lib/pages/life_pay/life_pay_bill_page/life_pay_bill_page.dart

@@ -1,11 +1,11 @@
-import 'package:aku_new_community/base/base_style.dart';
-import 'package:aku_new_community/models/life_pay/life_pay_record_model.dart';
-import 'package:common_utils/common_utils.dart';
 import 'package:flutter/material.dart';
 
+import 'package:common_utils/common_utils.dart';
+
+import 'package:aku_new_community/base/base_style.dart';
+import 'package:aku_new_community/models/life_pay/life_pay_record_model.dart';
 import 'package:aku_new_community/utils/headers.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
-import 'widget/bill_card.dart';
 
 class LifePayBillPage extends StatefulWidget {
   final LifePayRecordModel model;

lib/pages/life_pay/life_pay_page.dart

@@ -1,5 +1,13 @@
 import 'dart:convert';
 
+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';
+
 import 'package:aku_new_community/base/base_style.dart';
 import 'package:aku_new_community/constants/api.dart';
 import 'package:aku_new_community/models/life_pay/life_pay_list_model.dart';
@@ -19,12 +27,6 @@ import 'package:aku_new_community/widget/bee_scaffold.dart';
 import 'package:aku_new_community/widget/buttons/bee_check_radio.dart';
 import 'package:aku_new_community/widget/others/house_head_card.dart';
 import 'package:aku_new_community/widget/others/user_tool.dart';
-import 'package:bot_toast/bot_toast.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_easyrefresh/easy_refresh.dart';
-import 'package:get/get.dart' hide Response;
-import 'package:provider/provider.dart';
 
 class LifePayPage extends StatefulWidget {
   LifePayPage({Key? key}) : super(key: key);

lib/pages/life_pay/life_pay_page_new.dart

@@ -1,3 +1,12 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+
+import 'package:bot_toast/bot_toast.dart';
+import 'package:common_utils/common_utils.dart';
+import 'package:flutter_easyrefresh/easy_refresh.dart';
+import 'package:get/get.dart' hide Response;
+import 'package:provider/provider.dart';
+
 import 'package:aku_new_community/base/base_style.dart';
 import 'package:aku_new_community/constants/saas_api.dart';
 import 'package:aku_new_community/gen/assets.gen.dart';
@@ -17,13 +26,6 @@ import 'package:aku_new_community/widget/bee_scaffold.dart';
 import 'package:aku_new_community/widget/buttons/bee_check_radio.dart';
 import 'package:aku_new_community/widget/others/house_head_card.dart';
 import 'package:aku_new_community/widget/others/user_tool.dart';
-import 'package:bot_toast/bot_toast.dart';
-import 'package:common_utils/common_utils.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_easyrefresh/easy_refresh.dart';
-import 'package:get/get.dart' hide Response;
-import 'package:provider/provider.dart';
 
 class LifePayPageNew extends StatefulWidget {
   LifePayPageNew({Key? key}) : super(key: key);

lib/pages/life_pay/life_pay_record_page.dart

@@ -1,16 +1,16 @@
+import 'package:flutter/material.dart';
+
+import 'package:common_utils/common_utils.dart';
+import 'package:flutter_easyrefresh/easy_refresh.dart';
+import 'package:get/get.dart';
+
 import 'package:aku_new_community/base/base_style.dart';
-import 'package:aku_new_community/constants/api.dart';
 import 'package:aku_new_community/constants/saas_api.dart';
 import 'package:aku_new_community/models/life_pay/life_pay_record_model.dart';
 import 'package:aku_new_community/pages/things_page/widget/bee_list_view.dart';
 import 'package:aku_new_community/utils/headers.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
 import 'package:aku_new_community/widget/others/user_tool.dart';
-import 'package:common_utils/common_utils.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_easyrefresh/easy_refresh.dart';
-import 'package:get/get.dart';
-
 import 'life_pay_bill_page/life_pay_bill_page.dart';
 
 class LifePayRecordPage extends StatefulWidget {

lib/pages/life_pay/life_pre_pay_page.dart

@@ -1,3 +1,11 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+
+import 'package:bot_toast/bot_toast.dart';
+import 'package:get/get.dart';
+import 'package:power_logger/power_logger.dart';
+
 import 'package:aku_new_community/base/base_style.dart';
 import 'package:aku_new_community/constants/saas_api.dart';
 import 'package:aku_new_community/pages/life_pay/pay_finish_page.dart';
@@ -11,12 +19,6 @@ import 'package:aku_new_community/widget/bottom_sheets/pay_mothod_bottom_sheet.d
 import 'package:aku_new_community/widget/buttons/bottom_button.dart';
 import 'package:aku_new_community/widget/others/house_head_card.dart';
 import 'package:aku_new_community/widget/others/user_tool.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:power_logger/power_logger.dart';
 
 class LifePrePayPage extends StatefulWidget {
   final double prePay;

lib/pages/life_pay/pay_util.dart

@@ -1,12 +1,18 @@
+import 'dart:async';
 import 'dart:convert';
 
-import 'package:aku_new_community/models/pay/pay_model.dart';
+import 'package:flutter/foundation.dart';
-import 'package:aku_new_community/utils/network/base_model.dart';
+
-import 'package:aku_new_community/utils/network/net_util.dart';
 import 'package:bot_toast/bot_toast.dart';
+import 'package:fluwx/fluwx.dart';
 import 'package:power_logger/power_logger.dart';
 import 'package:tobias/tobias.dart';
 
+import 'package:aku_new_community/models/pay/pay_model.dart';
+import 'package:aku_new_community/models/pay/wx_pay_model.dart';
+import 'package:aku_new_community/utils/network/base_model.dart';
+import 'package:aku_new_community/utils/network/net_util.dart';
+
 enum PAYTYPE {
   ///支付宝
   ALI,
@@ -22,6 +28,12 @@ enum PAYTYPE {
 }
 
 class PayUtil {
+  static final PayUtil _instance = PayUtil._();
+
+  factory PayUtil() => _instance;
+
+  PayUtil._();
+///支付宝支付状态
   void resultSatus(String status) {
     switch (status) {
       case '8000':
@@ -49,7 +61,7 @@ class PayUtil {
   }
 
   String _resultStatus = '';
-
+  ///支付宝支付
   ///传入订单信息和确认订单请求地址
   Future<bool> callAliPay(String order, String apiPath) async {
     var install = await isAliPayInstalled();
@@ -75,7 +87,7 @@ class PayUtil {
       return false;
     }
   }
-
+//支付宝支付确认查询方法
   Future<bool> _confirmPayResult(String path, String code) async {
     try {
       late BaseModel base;
@@ -102,4 +114,43 @@ class PayUtil {
       return false;
     }
   }
+
+  ///微信支付
+
+  StreamSubscription? _wxPayStream;
+  ///添加微信支付结果监听
+  void wxPayAddListener(
+      {required VoidCallback paySuccess,
+      Function(BaseWeChatResponse)? payError}) {
+    _wxPayStream = weChatResponseEventHandler.listen((event) {
+      if (kDebugMode) {
+        print('errorCode:${event.errCode}    errorStr:${event.errStr}');
+      }
+      if (event.errCode == 0) {
+        paySuccess();
+      } else {
+        LoggerData.addData(
+            'errorCode:${event.errCode}    errorStr:${event.errStr ?? '支付失败'}');
+        BotToast.showText(text: event.errStr ?? '支付失败');
+        payError == null ? null : payError(event);
+      }
+    });
+  }
+///移除微信支付监听
+  void removeWxPayListener() {
+    _wxPayStream?.cancel();
+  }
+
+  Future callWxPay({
+    required WxPayModel payModel,
+  }) async {
+    await payWithWeChat(
+        appId: 'wx9bc3ffb23a749254',
+        partnerId: payModel.partnerId,
+        prepayId: payModel.prepayId,
+        packageValue: payModel.package,
+        nonceStr: payModel.nonceStr,
+        timeStamp: int.parse(payModel.timeStamp),
+        sign: payModel.sign);
+  }
 }

lib/pages/life_pay/widget/life_pay_detail_page.dart

@@ -1,3 +1,10 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+
+import 'package:expandable/expandable.dart';
+import 'package:get/get.dart';
+import 'package:provider/provider.dart';
+
 import 'package:aku_new_community/base/base_style.dart';
 import 'package:aku_new_community/models/life_pay/life_pay_list_model.dart';
 import 'package:aku_new_community/pages/life_pay/life_pay_page.dart';
@@ -6,11 +13,6 @@ import 'package:aku_new_community/utils/bee_parse.dart';
 import 'package:aku_new_community/utils/headers.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
 import 'package:aku_new_community/widget/buttons/bee_check_radio.dart';
-import 'package:expandable/expandable.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:provider/provider.dart';
 
 class LifePayDetailPage extends StatefulWidget {
   final LifePayListModel model;

lib/pages/life_pay/widget/life_pay_detail_page_new.dart

@@ -1,3 +1,9 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+
+import 'package:common_utils/common_utils.dart';
+import 'package:get/get.dart';
+
 import 'package:aku_new_community/base/base_style.dart';
 import 'package:aku_new_community/models/life_pay/life_pay_model.dart';
 import 'package:aku_new_community/pages/life_pay/life_pay_page.dart';
@@ -6,10 +12,6 @@ import 'package:aku_new_community/utils/headers.dart';
 import 'package:aku_new_community/widget/bee_divider.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
 import 'package:aku_new_community/widget/buttons/bee_check_radio.dart';
-import 'package:common_utils/common_utils.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
 
 class LifePayDetailPageNew extends StatefulWidget {
   final MonthPay model;

lib/pages/manager_func.dart

@@ -1,3 +1,7 @@
+import 'package:bot_toast/bot_toast.dart';
+import 'package:common_utils/common_utils.dart';
+import 'package:dio/dio.dart';
+
 import 'package:aku_new_community/constants/api.dart';
 import 'package:aku_new_community/constants/new_api.dart';
 import 'package:aku_new_community/constants/saas_api.dart';
@@ -9,9 +13,6 @@ import 'package:aku_new_community/model/manager/voting_detail_model.dart';
 import 'package:aku_new_community/models/manage/fix_report/fix_detail_model.dart';
 import 'package:aku_new_community/utils/network/base_model.dart';
 import 'package:aku_new_community/utils/network/net_util.dart';
-import 'package:bot_toast/bot_toast.dart';
-import 'package:common_utils/common_utils.dart';
-import 'package:dio/dio.dart';
 
 class ManagerFunc {
   @Deprecated('')

lib/pages/message_center_page/announce/announce_card.dart

@@ -1,16 +1,17 @@
-import 'package:aku_new_community/base/base_style.dart';
-import 'package:aku_new_community/extensions/widget_list_ext.dart';
-import 'package:aku_new_community/models/home/home_announce_model.dart';
-import 'package:aku_new_community/pages/message_center_page/announce/announce_view.dart';
-import 'package:aku_new_community/ui/community/notice/notice_detail_page.dart';
-import 'package:aku_new_community/widget/bee_image_network.dart';
-import 'package:common_utils/common_utils.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+
+import 'package:common_utils/common_utils.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:velocity_x/velocity_x.dart';
 
+import 'package:aku_new_community/base/base_style.dart';
+import 'package:aku_new_community/models/home/home_announce_model.dart';
+import 'package:aku_new_community/pages/message_center_page/announce/announce_view.dart';
+import 'package:aku_new_community/ui/community/notice/notice_detail_page.dart';
+import 'package:aku_new_community/widget/bee_image_network.dart';
+
 class AnnounceCard extends StatelessWidget {
   final ListDateModel modelList;
   final int index;

lib/pages/message_center_page/announce/announce_view.dart

@@ -1,13 +1,15 @@
-import 'package:aku_new_community/constants/saas_api.dart';
-import 'package:aku_new_community/models/home/home_announce_model.dart';
-import 'package:aku_new_community/pages/message_center_page/announce/announce_card.dart';
-import 'package:aku_new_community/utils/network/net_util.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:scroll_to_index/scroll_to_index.dart';
 
+import 'package:aku_new_community/constants/saas_api.dart';
+import 'package:aku_new_community/models/home/home_announce_model.dart';
+import 'package:aku_new_community/pages/message_center_page/announce/announce_card.dart';
+import 'package:aku_new_community/utils/network/net_util.dart';
+
 class ListDateModel {
   final String month;
   final int index;

lib/pages/message_center_page/comment_message/comment_message_page.dart

@@ -1,3 +1,8 @@
+import 'package:flutter/cupertino.dart';
+
+import 'package:common_utils/common_utils.dart';
+import 'package:flutter_easyrefresh/easy_refresh.dart';
+
 import 'package:aku_new_community/constants/api.dart';
 import 'package:aku_new_community/constants/saas_api.dart';
 import 'package:aku_new_community/model/common/img_model.dart';
@@ -7,9 +12,6 @@ import 'package:aku_new_community/utils/bee_date_util.dart';
 import 'package:aku_new_community/utils/headers.dart';
 import 'package:aku_new_community/widget/bee_divider.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
-import 'package:common_utils/common_utils.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter_easyrefresh/easy_refresh.dart';
 
 class CommentMessagePage extends StatefulWidget {
   CommentMessagePage({Key? key}) : super(key: key);

lib/pages/message_center_page/message_center_page.dart

@@ -1,15 +1,16 @@
+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:velocity_x/src/extensions/string_ext.dart';
+
 import 'package:aku_new_community/constants/saas_api.dart';
 import 'package:aku_new_community/pages/message_center_page/announce/announce_view.dart';
 import 'package:aku_new_community/pages/message_center_page/reply/replay_view.dart';
 import 'package:aku_new_community/pages/message_center_page/thumbs_up/thumbs_up_view.dart';
 import 'package:aku_new_community/utils/network/net_util.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
-import 'package:aku_new_community/widget/tab_bar/bee_tab_bar.dart';
-import 'package:bot_toast/bot_toast.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_easyrefresh/easy_refresh.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:velocity_x/src/extensions/string_ext.dart';
 
 class MessageCenterPage extends StatefulWidget {
   MessageCenterPage({Key? key}) : super(key: key);

lib/pages/message_center_page/message_func.dart

@@ -1,9 +1,10 @@
+import 'package:bot_toast/bot_toast.dart';
+
 import 'package:aku_new_community/constants/api.dart';
 import 'package:aku_new_community/constants/saas_api.dart';
 import 'package:aku_new_community/model/message/system_message_detail_model.dart';
 import 'package:aku_new_community/utils/network/base_model.dart';
 import 'package:aku_new_community/utils/network/net_util.dart';
-import 'package:bot_toast/bot_toast.dart';
 
 class MessageFunc {
   static Future<SystemMessageDetailModel> getSystemMessageDetial(

lib/pages/message_center_page/reply/replay_view.dart

@@ -1,11 +1,12 @@
+import 'package:flutter/material.dart';
+
+import 'package:flutter_easyrefresh/easy_refresh.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
 import 'package:aku_new_community/constants/saas_api.dart';
 import 'package:aku_new_community/models/message/reply_list_model.dart';
 import 'package:aku_new_community/pages/message_center_page/reply/reply_card.dart';
 import 'package:aku_new_community/pages/things_page/widget/bee_list_view.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 ReplayView extends StatefulWidget {
   final EasyRefreshController controller;

lib/pages/message_center_page/reply/reply_card.dart

@@ -1,12 +1,14 @@
+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_new_community/base/base_style.dart';
 import 'package:aku_new_community/models/message/reply_list_model.dart';
 import 'package:aku_new_community/pages/message_center_page/message_func.dart';
 import 'package:aku_new_community/ui/community/community_views/event_detail_page.dart';
 import 'package:aku_new_community/widget/bee_image_network.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:get/get.dart';
-import 'package:velocity_x/velocity_x.dart';
 
 class ReplyCard extends StatelessWidget {
   final ReplyListModel model;

lib/pages/message_center_page/system_message/system_message_page.dart

@@ -1,3 +1,9 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+
+import 'package:flutter_easyrefresh/easy_refresh.dart';
+import 'package:get/get.dart';
+
 import 'package:aku_new_community/base/base_style.dart';
 import 'package:aku_new_community/constants/api.dart';
 import 'package:aku_new_community/model/message/system_message_model.dart';
@@ -8,10 +14,6 @@ import 'package:aku_new_community/utils/headers.dart';
 import 'package:aku_new_community/utils/network/net_util.dart';
 import 'package:aku_new_community/widget/bee_divider.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_easyrefresh/easy_refresh.dart';
-import 'package:get/get.dart';
 
 class SystemMessagePage extends StatefulWidget {
   SystemMessagePage({Key? key}) : super(key: key);

lib/pages/message_center_page/thumbs_up/thumbs_up_card.dart

@@ -1,12 +1,13 @@
+import 'package:flutter/material.dart';
+
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:velocity_x/velocity_x.dart';
+
 import 'package:aku_new_community/base/base_style.dart';
 import 'package:aku_new_community/gen/assets.gen.dart';
 import 'package:aku_new_community/models/message/reply_list_model.dart';
-import 'package:aku_new_community/models/message/thumbs_up_list_model.dart';
 import 'package:aku_new_community/pages/message_center_page/message_func.dart';
 import 'package:aku_new_community/widget/bee_image_network.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:velocity_x/velocity_x.dart';
 
 class ThumbsUpCard extends StatelessWidget {
   final ReplyListModel model;

lib/pages/message_center_page/thumbs_up/thumbs_up_view.dart

@@ -1,11 +1,12 @@
+import 'package:flutter/material.dart';
+
+import 'package:flutter_easyrefresh/easy_refresh.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
 import 'package:aku_new_community/constants/saas_api.dart';
 import 'package:aku_new_community/models/message/reply_list_model.dart';
 import 'package:aku_new_community/pages/message_center_page/thumbs_up/thumbs_up_card.dart';
 import 'package:aku_new_community/pages/things_page/widget/bee_list_view.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 ThumbsUpView extends StatefulWidget {
   final EasyRefreshController controller;

lib/pages/one_alarm/widget/alarm_page.dart

@@ -1,18 +1,19 @@
-import 'package:aku_new_community/constants/api.dart';
+import 'package:flutter/material.dart';
-import 'package:aku_new_community/pages/one_alarm/alarm_detail_page.dart';
+
-import 'package:aku_new_community/provider/app_provider.dart';
-import 'package:aku_new_community/utils/headers.dart';
-import 'package:aku_new_community/utils/network/net_util.dart';
-import 'package:aku_new_community/widget/bee_scaffold.dart';
 import 'package:amap_flutter_base/amap_flutter_base.dart';
 import 'package:amap_flutter_map/amap_flutter_map.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_icons/flutter_icons.dart';
 import 'package:get/get.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:provider/provider.dart';
 import 'package:url_launcher/url_launcher.dart';
 
+import 'package:aku_new_community/constants/api.dart';
+import 'package:aku_new_community/pages/one_alarm/alarm_detail_page.dart';
+import 'package:aku_new_community/provider/app_provider.dart';
+import 'package:aku_new_community/utils/headers.dart';
+import 'package:aku_new_community/utils/network/net_util.dart';
+import 'package:aku_new_community/widget/bee_scaffold.dart';
 import '../../../widget/others/user_tool.dart';
 
 class PermissionUtil {

lib/pages/opening_code_page/opening_code_page.dart

@@ -1,21 +1,23 @@
 import 'dart:async';
 
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+
+import 'package:bot_toast/bot_toast.dart';
+import 'package:common_utils/common_utils.dart';
+import 'package:flutter_easyrefresh/easy_refresh.dart';
+import 'package:get/get.dart';
+import 'package:qr_flutter/qr_flutter.dart';
+
 import 'package:aku_new_community/constants/api.dart';
 import 'package:aku_new_community/ui/profile/new_house/certification/certification_page.dart';
 import 'package:aku_new_community/utils/headers.dart';
 import 'package:aku_new_community/utils/network/base_model.dart';
 import 'package:aku_new_community/utils/network/net_util.dart';
-import 'package:aku_new_community/widget/bee_image_network.dart';
 import 'package:aku_new_community/widget/bee_divider.dart';
+import 'package:aku_new_community/widget/bee_image_network.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
 import 'package:aku_new_community/widget/others/user_tool.dart';
-import 'package:bot_toast/bot_toast.dart';
-import 'package:common_utils/common_utils.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_easyrefresh/easy_refresh.dart';
-import 'package:get/get.dart';
-import 'package:qr_flutter/qr_flutter.dart';
 
 class OpeningCodePage extends StatefulWidget {
   OpeningCodePage({Key? key}) : super(key: key);

lib/pages/personal/address/address_list_page.dart

@@ -1,4 +1,3 @@
-import 'package:aku_new_community/widget/others/user_tool.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
@@ -8,8 +7,8 @@ import 'package:get/get.dart';
 import 'package:aku_new_community/model/user/adress_model.dart';
 import 'package:aku_new_community/utils/headers.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
+import 'package:aku_new_community/widget/others/user_tool.dart';
 import '../item_my_address.dart';
-import '../user_func.dart';
 import 'new_address_page.dart';
 
 class AddressListPage extends StatefulWidget {

lib/pages/personal/address/address_selector.dart

@@ -7,11 +7,12 @@
  * ====================================================
  */
 
+import 'package:flutter/material.dart';
+
 import 'package:aku_new_community/base/base_style.dart';
 import 'package:aku_new_community/model/user/province_model.dart';
 import 'package:aku_new_community/utils/headers.dart';
 import 'package:aku_new_community/utils/text_utils.dart';
-import 'package:flutter/material.dart';
 
 typedef AddressSelectorCallback = Function(
     String province, String city, String disctrict, int? locationId);
@@ -142,7 +143,7 @@ class _AddressSelectorState extends State<AddressSelector>
     // for (int i = 0; i < _items.length; ++i) {
     for (int i = 0; i < _tabController.length; ++i) {
       List addressModels = _items[i];
-      if (addressModels == null || addressModels.length == 0) {
+      if (addressModels.length == 0) {
         list.add(Container());
         continue;
       }

lib/pages/personal/address/editView.dart

@@ -42,7 +42,7 @@ class EditTile extends StatefulWidget {
     required this.constraints,
     this.maxLength = 100,
     this.maxLines = 1,
-  }) : assert(textChanged != null);
+  });
 
   @override
   _EditTileState createState() => _EditTileState();

lib/pages/personal/address/new_address_page.dart

@@ -1,3 +1,10 @@
+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';
+
 import 'package:aku_new_community/base/base_style.dart';
 import 'package:aku_new_community/model/user/adress_model.dart';
 import 'package:aku_new_community/model/user/province_model.dart';
@@ -7,12 +14,6 @@ import 'package:aku_new_community/utils/hive_store.dart';
 import 'package:aku_new_community/utils/text_utils.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
 import 'package:aku_new_community/widget/picker/bee_city_picker.dart';
-import 'package:bot_toast/bot_toast.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_easyrefresh/easy_refresh.dart';
-import 'package:get/get.dart';
-
 import 'address_selector.dart';
 import 'editView.dart';
 

lib/pages/personal/change_nick_name_page.dart

@@ -1,11 +1,13 @@
-import 'package:aku_new_community/provider/user_provider.dart';
-import 'package:aku_new_community/widget/bee_scaffold.dart';
 import 'package:flutter/material.dart';
+
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:provider/provider.dart';
 import 'package:velocity_x/velocity_x.dart';
 
+import 'package:aku_new_community/provider/user_provider.dart';
+import 'package:aku_new_community/widget/bee_scaffold.dart';
+
 class ChangeNickName extends StatefulWidget {
   ChangeNickName({Key? key}) : super(key: key);
 

lib/pages/personal/clock_in/clock_in_page.dart

@@ -1,3 +1,11 @@
+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_new_community/base/base_style.dart';
 import 'package:aku_new_community/constants/saas_api.dart';
 import 'package:aku_new_community/extensions/num_ext.dart';
@@ -11,12 +19,6 @@ import 'package:aku_new_community/utils/network/net_util.dart';
 import 'package:aku_new_community/widget/bee_avatar_widget.dart';
 import 'package:aku_new_community/widget/bee_back_button.dart';
 import 'package:aku_new_community/widget/others/user_tool.dart';
-import 'package:bot_toast/bot_toast.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';
 
 class ClockInPage extends StatefulWidget {
   const ClockInPage({Key? key}) : super(key: key);

lib/pages/personal/intergral/integral_center_page.dart

@@ -1,13 +1,15 @@
-import 'package:aku_new_community/gen/assets.gen.dart';
-import 'package:aku_new_community/pages/personal/intergral/progress_paint.dart';
-import 'package:aku_new_community/pages/personal/intergral/rule_explain_page.dart';
-import 'package:aku_new_community/widget/bee_back_button.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_new_community/gen/assets.gen.dart';
+import 'package:aku_new_community/pages/personal/intergral/progress_paint.dart';
+import 'package:aku_new_community/pages/personal/intergral/rule_explain_page.dart';
+import 'package:aku_new_community/widget/bee_back_button.dart';
+
 class integralCenterPage extends StatefulWidget {
   const integralCenterPage({Key? key}) : super(key: key);
 

lib/pages/personal/item_my_address.dart

@@ -7,17 +7,18 @@
  * ====================================================
  */
 
-import 'package:aku_new_community/base/base_style.dart';
-import 'package:aku_new_community/model/user/adress_model.dart';
-import 'package:aku_new_community/pages/personal/user_func.dart';
-import 'package:aku_new_community/provider/app_provider.dart';
-import 'package:aku_new_community/utils/headers.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+
 import 'package:flutter_easyrefresh/easy_refresh.dart';
 import 'package:get/get.dart';
 import 'package:provider/provider.dart';
 
+import 'package:aku_new_community/base/base_style.dart';
+import 'package:aku_new_community/model/user/adress_model.dart';
+import 'package:aku_new_community/pages/personal/user_func.dart';
+import 'package:aku_new_community/provider/app_provider.dart';
+import 'package:aku_new_community/utils/headers.dart';
 import 'address/new_address_page.dart';
 
 // ignore: must_be_immutable
@@ -31,8 +32,7 @@ class MyAddressItem extends StatefulWidget {
   MyAddressItem(
       {required this.addressModel,
       this.refreshController,
-      required this.canBack})
+      required this.canBack});
-      : assert(addressModel != null);
 
   _MyAddressItemState createState() => _MyAddressItemState();
 }

lib/pages/personal/personal_page.dart

@@ -1,3 +1,12 @@
+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_easyrefresh/easy_refresh.dart';
+import 'package:get/get.dart';
+import 'package:provider/provider.dart';
+
 import 'package:aku_new_community/constants/saas_api.dart';
 import 'package:aku_new_community/gen/assets.gen.dart';
 import 'package:aku_new_community/pages/personal/user_profile_page.dart';
@@ -14,14 +23,6 @@ import 'package:aku_new_community/utils/network/net_util.dart';
 import 'package:aku_new_community/widget/bee_avatar_widget.dart';
 import 'package:aku_new_community/widget/bee_divider.dart';
 import 'package:aku_new_community/widget/others/user_tool.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:flutter_easyrefresh/easy_refresh.dart';
-import 'package:get/get.dart';
-import 'package:provider/provider.dart';
-
 import 'address/address_list_page.dart';
 import 'clock_in/clock_in_page.dart';
 import 'clock_in/clock_success_dialog.dart';

lib/pages/personal/user_func.dart

@@ -1,3 +1,5 @@
+import 'package:bot_toast/bot_toast.dart';
+
 import 'package:aku_new_community/constants/api.dart';
 import 'package:aku_new_community/constants/saas_api.dart';
 import 'package:aku_new_community/model/community/board_model.dart';
@@ -6,7 +8,6 @@ import 'package:aku_new_community/model/user/adress_model.dart';
 import 'package:aku_new_community/utils/network/base_list_model.dart';
 import 'package:aku_new_community/utils/network/base_model.dart';
 import 'package:aku_new_community/utils/network/net_util.dart';
-import 'package:bot_toast/bot_toast.dart';
 
 class Userfunc {
   ///查询我的收货地址列表

lib/pages/personal/user_profile_page.dart

@@ -1,5 +1,13 @@
 import 'dart:io';
 
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+
+import 'package:bot_toast/bot_toast.dart';
+import 'package:common_utils/common_utils.dart';
+import 'package:get/get.dart';
+import 'package:provider/provider.dart';
+
 import 'package:aku_new_community/base/base_style.dart';
 import 'package:aku_new_community/constants/saas_api.dart';
 import 'package:aku_new_community/pages/personal/change_nick_name_page.dart';
@@ -13,12 +21,6 @@ import 'package:aku_new_community/widget/bee_scaffold.dart';
 import 'package:aku_new_community/widget/others/user_tool.dart';
 import 'package:aku_new_community/widget/picker/bee_custom_picker.dart';
 import 'package:aku_new_community/widget/picker/bee_image_picker.dart';
-import 'package:bot_toast/bot_toast.dart';
-import 'package:common_utils/common_utils.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:provider/provider.dart';
 
 class UserProfilePage extends StatefulWidget {
   UserProfilePage({Key? key}) : super(key: key);

lib/pages/personal/wallet/balance_record_view.dart

@@ -1,17 +1,19 @@
-import 'package:aku_new_community/constants/saas_api.dart';
-import 'package:aku_new_community/extensions/num_ext.dart';
-import 'package:aku_new_community/models/wallet/trade_record_list_model.dart';
-import 'package:aku_new_community/utils/network/net_util.dart';
-import 'package:aku_new_community/widget/picker/bee_date_picker.dart';
-import 'package:aku_new_community/widget/picker/bee_picker_box.dart';
-import 'package:common_utils/common_utils.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+
+import 'package:common_utils/common_utils.dart';
 import 'package:flutter_easyrefresh/easy_refresh.dart';
 import 'package:flutter_screenutil/src/size_extension.dart';
 import 'package:get/get.dart';
 import 'package:velocity_x/src/extensions/string_ext.dart';
 
+import 'package:aku_new_community/constants/saas_api.dart';
+import 'package:aku_new_community/extensions/num_ext.dart';
+import 'package:aku_new_community/models/wallet/trade_record_list_model.dart';
+import 'package:aku_new_community/utils/network/net_util.dart';
+import 'package:aku_new_community/widget/picker/bee_date_picker.dart';
+import 'package:aku_new_community/widget/picker/bee_picker_box.dart';
+
 class BalanceRecordView extends StatefulWidget {
   const BalanceRecordView({Key? key}) : super(key: key);
 

lib/pages/personal/wallet/input_pay_password_dialog.dart

@@ -1,14 +1,13 @@
-import 'package:aku_new_community/constants/saas_api.dart';
-import 'package:aku_new_community/extensions/num_ext.dart';
-import 'package:aku_new_community/utils/network/net_util.dart';
-import 'package:bot_toast/bot_toast.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+
 import 'package:flutter_screenutil/src/size_extension.dart';
 import 'package:get/get.dart';
 import 'package:sms_autofill/sms_autofill.dart';
 import 'package:velocity_x/src/extensions/string_ext.dart';
 
+import 'package:aku_new_community/extensions/num_ext.dart';
+
 class InputPayPasswordDialog extends StatefulWidget {
   const InputPayPasswordDialog({
     Key? key,

lib/pages/personal/wallet/pay_way_dialog.dart

@@ -1,4 +1,11 @@
-import 'dart:ui';
+
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+
+import 'package:bot_toast/bot_toast.dart';
+import 'package:flutter_screenutil/src/size_extension.dart';
+import 'package:get/get.dart';
+import 'package:velocity_x/src/extensions/string_ext.dart';
 
 import 'package:aku_new_community/constants/saas_api.dart';
 import 'package:aku_new_community/extensions/num_ext.dart';
@@ -10,12 +17,6 @@ import 'package:aku_new_community/utils/network/net_util.dart';
 import 'package:aku_new_community/widget/buttons/bee_check_radio.dart';
 import 'package:aku_new_community/widget/buttons/bee_long_button.dart';
 import 'package:aku_new_community/widget/others/user_tool.dart';
-import 'package:bot_toast/bot_toast.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_screenutil/src/size_extension.dart';
-import 'package:get/get.dart';
-import 'package:velocity_x/src/extensions/string_ext.dart';
 
 class PayWayDialog extends StatefulWidget {
   final bool isBalance;

lib/pages/personal/wallet/point_record_view.dart

@@ -1,17 +1,19 @@
-import 'package:aku_new_community/constants/saas_api.dart';
-import 'package:aku_new_community/extensions/num_ext.dart';
-import 'package:aku_new_community/models/wallet/trade_record_list_model.dart';
-import 'package:aku_new_community/utils/network/net_util.dart';
-import 'package:aku_new_community/widget/picker/bee_date_picker.dart';
-import 'package:aku_new_community/widget/picker/bee_picker_box.dart';
-import 'package:common_utils/common_utils.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+
+import 'package:common_utils/common_utils.dart';
 import 'package:flutter_easyrefresh/easy_refresh.dart';
 import 'package:flutter_screenutil/src/size_extension.dart';
 import 'package:get/get.dart';
 import 'package:velocity_x/src/extensions/string_ext.dart';
 
+import 'package:aku_new_community/constants/saas_api.dart';
+import 'package:aku_new_community/extensions/num_ext.dart';
+import 'package:aku_new_community/models/wallet/trade_record_list_model.dart';
+import 'package:aku_new_community/utils/network/net_util.dart';
+import 'package:aku_new_community/widget/picker/bee_date_picker.dart';
+import 'package:aku_new_community/widget/picker/bee_picker_box.dart';
+
 class PointRecordView extends StatefulWidget {
   const PointRecordView({Key? key}) : super(key: key);
 

lib/pages/personal/wallet/set_pay_password_dialog.dart

@@ -1,12 +1,14 @@
-import 'package:aku_new_community/extensions/num_ext.dart';
-import 'package:aku_new_community/pages/personal/wallet/set_pay_password_verify_dialog.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+
 import 'package:flutter_screenutil/src/size_extension.dart';
 import 'package:get/get.dart';
 import 'package:sms_autofill/sms_autofill.dart';
 import 'package:velocity_x/src/extensions/string_ext.dart';
 
+import 'package:aku_new_community/extensions/num_ext.dart';
+import 'package:aku_new_community/pages/personal/wallet/set_pay_password_verify_dialog.dart';
+
 class SetPayPasswordDialog extends StatefulWidget {
   const SetPayPasswordDialog({Key? key, }) : super(key: key);
 

lib/pages/personal/wallet/set_pay_password_verify_dialog.dart

@@ -1,17 +1,17 @@
-import 'package:aku_new_community/constants/saas_api.dart';
-import 'package:aku_new_community/extensions/num_ext.dart';
-import 'package:aku_new_community/pages/personal/wallet/input_pay_password_dialog.dart';
-import 'package:aku_new_community/pages/sign/login/psd_verify.dart';
-import 'package:aku_new_community/utils/network/net_util.dart';
-import 'package:aku_new_community/widget/others/user_tool.dart';
-import 'package:bot_toast/bot_toast.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+
+import 'package:bot_toast/bot_toast.dart';
 import 'package:flutter_screenutil/src/size_extension.dart';
 import 'package:get/get.dart';
 import 'package:sms_autofill/sms_autofill.dart';
 import 'package:velocity_x/src/extensions/string_ext.dart';
 
+import 'package:aku_new_community/constants/saas_api.dart';
+import 'package:aku_new_community/extensions/num_ext.dart';
+import 'package:aku_new_community/utils/network/net_util.dart';
+import 'package:aku_new_community/widget/others/user_tool.dart';
+
 class SetPayVerifyPasswordDialog extends StatefulWidget {
   final String firstCode;
 

lib/pages/personal/wallet/wallet_recharge_page.dart

@@ -1,3 +1,14 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+
+import 'package:bot_toast/bot_toast.dart';
+import 'package:collection/src/iterable_extensions.dart';
+import 'package:flutter_screenutil/src/size_extension.dart';
+import 'package:get/get.dart';
+import 'package:velocity_x/src/extensions/num_ext.dart';
+import 'package:velocity_x/src/extensions/string_ext.dart';
+
 import 'package:aku_new_community/extensions/num_ext.dart';
 import 'package:aku_new_community/extensions/widget_list_ext.dart';
 import 'package:aku_new_community/gen/assets.gen.dart';
@@ -6,15 +17,6 @@ import 'package:aku_new_community/pages/personal/wallet/wallet_trade_record_page
 import 'package:aku_new_community/widget/bee_scaffold.dart';
 import 'package:aku_new_community/widget/buttons/bee_long_button.dart';
 import 'package:aku_new_community/widget/others/user_tool.dart';
-import 'package:bot_toast/bot_toast.dart';
-import 'package:collection/src/iterable_extensions.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:flutter_screenutil/src/size_extension.dart';
-import 'package:get/get.dart';
-import 'package:velocity_x/src/extensions/num_ext.dart';
-import 'package:velocity_x/src/extensions/string_ext.dart';
 
 class WalletRechargePage extends StatefulWidget {
   final initIndex;

lib/pages/personal/wallet/wallet_trade_record_page.dart

@@ -1,9 +1,8 @@
+import 'package:flutter/material.dart';
+
 import 'package:aku_new_community/pages/personal/wallet/point_record_view.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
 import 'package:aku_new_community/widget/tab_bar/bee_tab_bar.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-
 import 'balance_record_view.dart';
 
 class WalletTradeRecordPage extends StatefulWidget {

lib/pages/renovation_manage/new_renovation/new_renovation_add_page.dart

@@ -1,3 +1,10 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+
+import 'package:bot_toast/bot_toast.dart';
+import 'package:common_utils/common_utils.dart';
+import 'package:get/get.dart';
+
 import 'package:aku_new_community/base/base_style.dart';
 import 'package:aku_new_community/constants/api.dart';
 import 'package:aku_new_community/utils/headers.dart';
@@ -9,11 +16,6 @@ import 'package:aku_new_community/widget/buttons/bottom_button.dart';
 import 'package:aku_new_community/widget/others/bee_input_row.dart';
 import 'package:aku_new_community/widget/others/user_tool.dart';
 import 'package:aku_new_community/widget/picker/bee_date_picker.dart';
-import 'package:bot_toast/bot_toast.dart';
-import 'package:common_utils/common_utils.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
 
 class NewRenovationAddPage extends StatefulWidget {
   NewRenovationAddPage({Key? key}) : super(key: key);

lib/pages/renovation_manage/new_renovation/new_renovation_card.dart

@@ -1,3 +1,7 @@
+import 'package:flutter/material.dart';
+
+import 'package:get/get.dart';
+
 import 'package:aku_new_community/base/base_style.dart';
 import 'package:aku_new_community/constants/api.dart';
 import 'package:aku_new_community/models/new_renovation/new_renovation_list_model.dart';
@@ -7,8 +11,6 @@ import 'package:aku_new_community/utils/network/base_model.dart';
 import 'package:aku_new_community/utils/network/net_util.dart';
 import 'package:aku_new_community/widget/bee_divider.dart';
 import 'package:aku_new_community/widget/buttons/card_bottom_button.dart';
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
 
 class NewRenovationCard extends StatefulWidget {
   final NewRenovationListModel model;

lib/pages/renovation_manage/new_renovation/new_renovation_view.dart

@@ -1,10 +1,12 @@
+import 'package:flutter/material.dart';
+
+import 'package:flutter_easyrefresh/easy_refresh.dart';
+
 import 'package:aku_new_community/constants/api.dart';
 import 'package:aku_new_community/models/new_renovation/new_renovation_list_model.dart';
 import 'package:aku_new_community/pages/renovation_manage/new_renovation/new_renovation_card.dart';
 import 'package:aku_new_community/pages/things_page/widget/bee_list_view.dart';
 import 'package:aku_new_community/utils/headers.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_easyrefresh/easy_refresh.dart';
 
 class NewRenovationView extends StatefulWidget {
   final int index;

lib/pages/service_browse/service_browse_page.dart

@@ -1,15 +1,17 @@
+import 'package:flutter/material.dart';
+
+import 'package:common_utils/common_utils.dart';
+import 'package:flutter_easyrefresh/easy_refresh.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
+import 'package:velocity_x/velocity_x.dart';
+
 import 'package:aku_new_community/base/base_style.dart';
 import 'package:aku_new_community/constants/api.dart';
 import 'package:aku_new_community/models/service_browse/service_browse_list_mode.dart';
 import 'package:aku_new_community/pages/service_browse/service_browse_detail_page.dart';
 import 'package:aku_new_community/pages/things_page/widget/bee_list_view.dart';
 import 'package:aku_new_community/widget/bee_scaffold.dart';
-import 'package:common_utils/common_utils.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_easyrefresh/easy_refresh.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:get/get.dart';
-import 'package:velocity_x/velocity_x.dart';
 
 class ServiceBrowsePage extends StatefulWidget {
   ServiceBrowsePage({Key? key}) : super(key: key);