diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json index b8e6b4ff..99820951 100644 --- a/.fvm/fvm_config.json +++ b/.fvm/fvm_config.json @@ -1,4 +1,4 @@ { - "flutterSdkVersion": "2.8.1", + "flutterSdkVersion": "2.10.2", "flavors": {} } \ No newline at end of file diff --git a/lib/constants/app_theme.dart b/lib/constants/app_theme.dart index eac2a8af..1866ab88 100644 --- a/lib/constants/app_theme.dart +++ b/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 { diff --git a/lib/constants/application_objects.dart b/lib/constants/application_objects.dart index 94e7b022..59ba4bc0 100644 --- a/lib/constants/application_objects.dart +++ b/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 diff --git a/lib/constants/config.dart b/lib/constants/config.dart index 5b2ebb86..e147e632 100644 --- a/lib/constants/config.dart +++ b/lib/constants/config.dart @@ -4,4 +4,7 @@ class AppConfig { ///微信AppID static const wechatAppId = 'wxd7bdef0d4849ddb8'; + + ///极光推送key + static const jpushKey = '5f42cbb15abcdda6f8aeb925'; } diff --git a/lib/main.dart b/lib/main.dart index 93969a42..46763728 100644 --- a/lib/main.dart +++ b/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'; diff --git a/lib/main_initialize.dart b/lib/main_initialize.dart index 3db0f816..9165c511 100644 --- a/lib/main_initialize.dart +++ b/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() { diff --git a/lib/model/community/activity_item_model.dart b/lib/model/community/activity_item_model.dart index 02c42212..2aed9847 100644 --- a/lib/model/community/activity_item_model.dart +++ b/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 { diff --git a/lib/model/community/my_event_item_model.dart b/lib/model/community/my_event_item_model.dart index 46a9c6db..fbbb2f90 100644 --- a/lib/model/community/my_event_item_model.dart +++ b/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; diff --git a/lib/model/manager/event_voting_model.dart b/lib/model/manager/event_voting_model.dart index 2042836f..11222946 100644 --- a/lib/model/manager/event_voting_model.dart +++ b/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; diff --git a/lib/model/manager/voting_detail_model.dart b/lib/model/manager/voting_detail_model.dart index 4814f7ce..df1b270d 100644 --- a/lib/model/manager/voting_detail_model.dart +++ b/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; diff --git a/lib/model/user/committee_item_model.dart b/lib/model/user/committee_item_model.dart index 6565a1da..72b7f531 100644 --- a/lib/model/user/committee_item_model.dart +++ b/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 json) => imgList: (json['imgList'] as List) .map((e) => ImgModel.fromJson(e as Map)) .toList(), - ); \ No newline at end of file + ); diff --git a/lib/models/community/comment_list_model.dart b/lib/models/community/comment_list_model.dart index 78266c03..e41b5e05 100644 --- a/lib/models/community/comment_list_model.dart +++ b/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() diff --git a/lib/models/community/dynamic_my_list_body.dart b/lib/models/community/dynamic_my_list_body.dart index f9b12092..2cc56a4c 100644 --- a/lib/models/community/dynamic_my_list_body.dart +++ b/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() diff --git a/lib/models/community/dynamic_my_list_head.dart b/lib/models/community/dynamic_my_list_head.dart index 8bd1d7bf..ac1ef76d 100644 --- a/lib/models/community/dynamic_my_list_head.dart +++ b/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() diff --git a/lib/models/community/information_list_model.dart b/lib/models/community/information_list_model.dart index 0b37b8ed..64c20779 100644 --- a/lib/models/community/information_list_model.dart +++ b/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() diff --git a/lib/models/community/recommend_read_model.dart b/lib/models/community/recommend_read_model.dart index 72b70a1e..e2f5ab19 100644 --- a/lib/models/community/recommend_read_model.dart +++ b/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() diff --git a/lib/models/convenience_phone/convenience_phone_model.dart b/lib/models/convenience_phone/convenience_phone_model.dart index a0288753..4212f5f4 100644 --- a/lib/models/convenience_phone/convenience_phone_model.dart +++ b/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 get props => [id, name, tel, type,]; -} \ No newline at end of file +} diff --git a/lib/models/facility/facility_appointment_model.g.dart b/lib/models/facility/facility_appointment_model.g.dart index 082299b0..656ad7c9 100644 --- a/lib/models/facility/facility_appointment_model.g.dart +++ b/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?, ); diff --git a/lib/models/facility/facility_type_model.g.dart b/lib/models/facility/facility_type_model.g.dart index df3ad836..0891f93b 100644 --- a/lib/models/facility/facility_type_model.g.dart +++ b/lib/models/facility/facility_type_model.g.dart @@ -13,7 +13,7 @@ FacilityTypeModel _$FacilityTypeModelFromJson(Map json) => name: json['name'] as String, type: json['type'] as int, num_: json['num'] as int, - imgUrls: (json['imgList'] as List?) + imgUrls: (json['imgUrls'] as List?) ?.map((e) => ImgModel.fromJson(e as Map)) .toList(), ); diff --git a/lib/models/home/activity_detail_model.dart b/lib/models/home/activity_detail_model.dart index 719814cc..1cb0e4c3 100644 --- a/lib/models/home/activity_detail_model.dart +++ b/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() diff --git a/lib/models/home/announce_detail_model.dart b/lib/models/home/announce_detail_model.dart index 1703714d..e7d6de22 100644 --- a/lib/models/home/announce_detail_model.dart +++ b/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() diff --git a/lib/models/home/home_activity_model.dart b/lib/models/home/home_activity_model.dart index 93bbe807..e87bdd34 100644 --- a/lib/models/home/home_activity_model.dart +++ b/lib/models/home/home_activity_model.dart @@ -1,10 +1,12 @@ -import 'package:aku_new_community/base/base_style.dart'; -import 'package:aku_new_community/model/common/img_model.dart'; +import 'package:flutter/material.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() diff --git a/lib/models/home/home_announce_model.dart b/lib/models/home/home_announce_model.dart index bf63e842..1f4230dc 100644 --- a/lib/models/home/home_announce_model.dart +++ b/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() diff --git a/lib/models/home/home_swiper_model.dart b/lib/models/home/home_swiper_model.dart index 7c3d72f3..38bc90f2 100644 --- a/lib/models/home/home_swiper_model.dart +++ b/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() diff --git a/lib/models/market/good_detail_model.dart b/lib/models/market/good_detail_model.dart index e2d5ca79..e2df143b 100644 --- a/lib/models/market/good_detail_model.dart +++ b/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() diff --git a/lib/models/market/integral_goods_list_model.dart b/lib/models/market/integral_goods_list_model.dart index 22d16d30..a626c5b5 100644 --- a/lib/models/market/integral_goods_list_model.dart +++ b/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'; diff --git a/lib/models/market/market_all_category_model.dart b/lib/models/market/market_all_category_model.dart index 003cddcb..5e59d6a5 100644 --- a/lib/models/market/market_all_category_model.dart +++ b/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() diff --git a/lib/models/market/market_category_model.dart b/lib/models/market/market_category_model.dart index 56319200..98d845ae 100644 --- a/lib/models/market/market_category_model.dart +++ b/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() diff --git a/lib/models/market/shop_car/shop_car_list_model.dart b/lib/models/market/shop_car/shop_car_list_model.dart index 32d7c39c..e98797a8 100644 --- a/lib/models/market/shop_car/shop_car_list_model.dart +++ b/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() diff --git a/lib/models/message/thumbs_up_list_model.dart b/lib/models/message/thumbs_up_list_model.dart index 53f384a1..f14a5698 100644 --- a/lib/models/message/thumbs_up_list_model.dart +++ b/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() diff --git a/lib/models/pay/wx_pay_model.dart b/lib/models/pay/wx_pay_model.dart new file mode 100644 index 00000000..601f906c --- /dev/null +++ b/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 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 get props => [ + prepayId, + partnerId, + timeStamp, + nonceStr, + package, + sign, + ]; +} diff --git a/lib/models/pay/wx_pay_model.g.dart b/lib/models/pay/wx_pay_model.g.dart new file mode 100644 index 00000000..e94bfdc8 --- /dev/null +++ b/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 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, + ); diff --git a/lib/models/user/user_info_model.dart b/lib/models/user/user_info_model.dart index eff46d84..29144239 100644 --- a/lib/models/user/user_info_model.dart +++ b/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() diff --git a/lib/models/wallet/trade_record_list_model.dart b/lib/models/wallet/trade_record_list_model.dart index 4a763857..f964b790 100644 --- a/lib/models/wallet/trade_record_list_model.dart +++ b/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'; diff --git a/lib/pages/community_introduce/community_introduce_page.dart b/lib/pages/community_introduce/community_introduce_page.dart index 9e5a00d3..93d58a07 100644 --- a/lib/pages/community_introduce/community_introduce_page.dart +++ b/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); diff --git a/lib/pages/convenient_phone/convenient_phone_page.dart b/lib/pages/convenient_phone/convenient_phone_page.dart index bcd20e2b..afc6d29e 100644 --- a/lib/pages/convenient_phone/convenient_phone_page.dart +++ b/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); diff --git a/lib/pages/electronic_commerc/electronic_commerc_card.dart b/lib/pages/electronic_commerc/electronic_commerc_card.dart index 08c2faa9..7a976da4 100644 --- a/lib/pages/electronic_commerc/electronic_commerc_card.dart +++ b/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; diff --git a/lib/pages/electronic_commerc/electronic_commerc_detail_page.dart b/lib/pages/electronic_commerc/electronic_commerc_detail_page.dart index 51e6809f..90635afe 100644 --- a/lib/pages/electronic_commerc/electronic_commerc_detail_page.dart +++ b/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; diff --git a/lib/pages/electronic_commerc/electronic_commerc_page.dart b/lib/pages/electronic_commerc/electronic_commerc_page.dart index 5312fe3d..7878c7ec 100644 --- a/lib/pages/electronic_commerc/electronic_commerc_page.dart +++ b/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); diff --git a/lib/pages/electronic_commerc/electronic_commerc_view.dart b/lib/pages/electronic_commerc/electronic_commerc_view.dart index 0b81db3f..3e5da7a7 100644 --- a/lib/pages/electronic_commerc/electronic_commerc_view.dart +++ b/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; diff --git a/lib/pages/event_activity/event_voting_page.dart b/lib/pages/event_activity/event_voting_page.dart index d9bd7e1a..d99120ae 100644 --- a/lib/pages/event_activity/event_voting_page.dart +++ b/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); diff --git a/lib/pages/event_activity/voting_detail_page.dart b/lib/pages/event_activity/voting_detail_page.dart index dbeb2775..574b8474 100644 --- a/lib/pages/event_activity/voting_detail_page.dart +++ b/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; diff --git a/lib/pages/express_packages/express_package_card.dart b/lib/pages/express_packages/express_package_card.dart index aff4a323..f503a106 100644 --- a/lib/pages/express_packages/express_package_card.dart +++ b/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; diff --git a/lib/pages/express_packages/express_package_view.dart b/lib/pages/express_packages/express_package_view.dart index 8facdff5..993fa4c4 100644 --- a/lib/pages/express_packages/express_package_view.dart +++ b/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; diff --git a/lib/pages/geographic_information/geographic_information_page.dart b/lib/pages/geographic_information/geographic_information_page.dart index 4558e3b5..f5021406 100644 --- a/lib/pages/geographic_information/geographic_information_page.dart +++ b/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: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:flutter/material.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 '../../utils/hive_store.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/widget/bee_scaffold.dart'; import '../../widget/others/user_tool.dart'; - class GeographicInformationPage extends StatefulWidget { GeographicInformationPage({Key? key}) : super(key: key); diff --git a/lib/pages/goods_deto_page/deto_create_page/deto_create_page.dart b/lib/pages/goods_deto_page/deto_create_page/deto_create_page.dart index 02466671..ccacd15b 100644 --- a/lib/pages/goods_deto_page/deto_create_page/deto_create_page.dart +++ b/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); diff --git a/lib/pages/goods_deto_page/goods_deto_page.dart b/lib/pages/goods_deto_page/goods_deto_page.dart index 5be77d6b..a3f15df2 100644 --- a/lib/pages/goods_deto_page/goods_deto_page.dart +++ b/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 { diff --git a/lib/pages/goods_manage_page/borrow/borrow_goods_detail_page.dart b/lib/pages/goods_manage_page/borrow/borrow_goods_detail_page.dart index 013e404c..2c226a8f 100644 --- a/lib/pages/goods_manage_page/borrow/borrow_goods_detail_page.dart +++ b/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; diff --git a/lib/pages/goods_manage_page/borrow/borrow_goods_page.dart b/lib/pages/goods_manage_page/borrow/borrow_goods_page.dart index 430f9c1a..9c58b9b1 100644 --- a/lib/pages/goods_manage_page/borrow/borrow_goods_page.dart +++ b/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 { diff --git a/lib/pages/goods_manage_page/goods_manage_page.dart b/lib/pages/goods_manage_page/goods_manage_page.dart index 30d0aee5..2f0b1e1d 100644 --- a/lib/pages/goods_manage_page/goods_manage_page.dart +++ b/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; diff --git a/lib/pages/goods_manage_page/mine_goods_page/mine_goods_page.dart b/lib/pages/goods_manage_page/mine_goods_page/mine_goods_page.dart index d912cad0..dd42ccbb 100644 --- a/lib/pages/goods_manage_page/mine_goods_page/mine_goods_page.dart +++ b/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); diff --git a/lib/pages/goods_manage_page/retrun/return_goods_detail_page.dart b/lib/pages/goods_manage_page/retrun/return_goods_detail_page.dart index b513d976..ad5c9753 100644 --- a/lib/pages/goods_manage_page/retrun/return_goods_detail_page.dart +++ b/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); diff --git a/lib/pages/home/home_page.dart b/lib/pages/home/home_page.dart index ded7fe7e..b9cc9d7e 100644 --- a/lib/pages/home/home_page.dart +++ b/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 { diff --git a/lib/pages/house_introduce/house_detail_page.dart b/lib/pages/house_introduce/house_detail_page.dart index 16bf6c4c..257f16e2 100644 --- a/lib/pages/house_introduce/house_detail_page.dart +++ b/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; diff --git a/lib/pages/house_introduce/house_introduce.dart b/lib/pages/house_introduce/house_introduce.dart index ab64bb68..e508fd68 100644 --- a/lib/pages/house_introduce/house_introduce.dart +++ b/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 { diff --git a/lib/pages/industry_committee/industry_committee_page.dart b/lib/pages/industry_committee/industry_committee_page.dart index 745b43cf..a1b23d61 100644 --- a/lib/pages/industry_committee/industry_committee_page.dart +++ b/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 { diff --git a/lib/pages/life_pay/life_pay_bill_page/life_pay_bill_page.dart b/lib/pages/life_pay/life_pay_bill_page/life_pay_bill_page.dart index 31b949e7..360dfad3 100644 --- a/lib/pages/life_pay/life_pay_bill_page/life_pay_bill_page.dart +++ b/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; diff --git a/lib/pages/life_pay/life_pay_page.dart b/lib/pages/life_pay/life_pay_page.dart index 939160dd..0ee15599 100644 --- a/lib/pages/life_pay/life_pay_page.dart +++ b/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); diff --git a/lib/pages/life_pay/life_pay_page_new.dart b/lib/pages/life_pay/life_pay_page_new.dart index dbd5dc06..6f5595e6 100644 --- a/lib/pages/life_pay/life_pay_page_new.dart +++ b/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); diff --git a/lib/pages/life_pay/life_pay_record_page.dart b/lib/pages/life_pay/life_pay_record_page.dart index 917ad927..ebc88e3f 100644 --- a/lib/pages/life_pay/life_pay_record_page.dart +++ b/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 { diff --git a/lib/pages/life_pay/life_pre_pay_page.dart b/lib/pages/life_pay/life_pre_pay_page.dart index bcaca137..25a9d72d 100644 --- a/lib/pages/life_pay/life_pre_pay_page.dart +++ b/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; diff --git a/lib/pages/life_pay/pay_util.dart b/lib/pages/life_pay/pay_util.dart index f1865576..75dbd0cb 100644 --- a/lib/pages/life_pay/pay_util.dart +++ b/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:aku_new_community/utils/network/base_model.dart'; -import 'package:aku_new_community/utils/network/net_util.dart'; +import 'package:flutter/foundation.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 callAliPay(String order, String apiPath) async { var install = await isAliPayInstalled(); @@ -75,7 +87,7 @@ class PayUtil { return false; } } - +//支付宝支付确认查询方法 Future _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); + } } diff --git a/lib/pages/life_pay/widget/life_pay_detail_page.dart b/lib/pages/life_pay/widget/life_pay_detail_page.dart index 6a653930..4c0d8bfb 100644 --- a/lib/pages/life_pay/widget/life_pay_detail_page.dart +++ b/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; diff --git a/lib/pages/life_pay/widget/life_pay_detail_page_new.dart b/lib/pages/life_pay/widget/life_pay_detail_page_new.dart index d3e59fc8..85dd1bcd 100644 --- a/lib/pages/life_pay/widget/life_pay_detail_page_new.dart +++ b/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; diff --git a/lib/pages/manager_func.dart b/lib/pages/manager_func.dart index f8c53fef..85297d9c 100644 --- a/lib/pages/manager_func.dart +++ b/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('') diff --git a/lib/pages/message_center_page/announce/announce_card.dart b/lib/pages/message_center_page/announce/announce_card.dart index 1691c42c..4de72706 100644 --- a/lib/pages/message_center_page/announce/announce_card.dart +++ b/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; diff --git a/lib/pages/message_center_page/announce/announce_view.dart b/lib/pages/message_center_page/announce/announce_view.dart index 4ee74e18..0623a720 100644 --- a/lib/pages/message_center_page/announce/announce_view.dart +++ b/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; diff --git a/lib/pages/message_center_page/comment_message/comment_message_page.dart b/lib/pages/message_center_page/comment_message/comment_message_page.dart index 6c097446..c32d3677 100644 --- a/lib/pages/message_center_page/comment_message/comment_message_page.dart +++ b/lib/pages/message_center_page/comment_message/comment_message_page.dart @@ -1,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); diff --git a/lib/pages/message_center_page/message_center_page.dart b/lib/pages/message_center_page/message_center_page.dart index 2ea77b14..53b2140d 100644 --- a/lib/pages/message_center_page/message_center_page.dart +++ b/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); diff --git a/lib/pages/message_center_page/message_func.dart b/lib/pages/message_center_page/message_func.dart index 2dea3078..21439226 100644 --- a/lib/pages/message_center_page/message_func.dart +++ b/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 getSystemMessageDetial( diff --git a/lib/pages/message_center_page/reply/replay_view.dart b/lib/pages/message_center_page/reply/replay_view.dart index b8572236..8373aafa 100644 --- a/lib/pages/message_center_page/reply/replay_view.dart +++ b/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; diff --git a/lib/pages/message_center_page/reply/reply_card.dart b/lib/pages/message_center_page/reply/reply_card.dart index 416a3154..6cb29372 100644 --- a/lib/pages/message_center_page/reply/reply_card.dart +++ b/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; diff --git a/lib/pages/message_center_page/system_message/system_message_page.dart b/lib/pages/message_center_page/system_message/system_message_page.dart index a2e2f9a7..a2a0f500 100644 --- a/lib/pages/message_center_page/system_message/system_message_page.dart +++ b/lib/pages/message_center_page/system_message/system_message_page.dart @@ -1,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); diff --git a/lib/pages/message_center_page/thumbs_up/thumbs_up_card.dart b/lib/pages/message_center_page/thumbs_up/thumbs_up_card.dart index 9b70dd6d..331727d9 100644 --- a/lib/pages/message_center_page/thumbs_up/thumbs_up_card.dart +++ b/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; diff --git a/lib/pages/message_center_page/thumbs_up/thumbs_up_view.dart b/lib/pages/message_center_page/thumbs_up/thumbs_up_view.dart index 535eee6c..9bb0ef34 100644 --- a/lib/pages/message_center_page/thumbs_up/thumbs_up_view.dart +++ b/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; diff --git a/lib/pages/one_alarm/widget/alarm_page.dart b/lib/pages/one_alarm/widget/alarm_page.dart index 4e34e8e1..7aafc1f4 100644 --- a/lib/pages/one_alarm/widget/alarm_page.dart +++ b/lib/pages/one_alarm/widget/alarm_page.dart @@ -1,18 +1,19 @@ -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 'package:flutter/material.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 { diff --git a/lib/pages/opening_code_page/opening_code_page.dart b/lib/pages/opening_code_page/opening_code_page.dart index 4cb714b5..798c0053 100644 --- a/lib/pages/opening_code_page/opening_code_page.dart +++ b/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); diff --git a/lib/pages/personal/address/address_list_page.dart b/lib/pages/personal/address/address_list_page.dart index 588a7ca8..fba6c783 100644 --- a/lib/pages/personal/address/address_list_page.dart +++ b/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 { diff --git a/lib/pages/personal/address/address_selector.dart b/lib/pages/personal/address/address_selector.dart index 37b2a970..4e45163d 100644 --- a/lib/pages/personal/address/address_selector.dart +++ b/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 // 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; } diff --git a/lib/pages/personal/address/editView.dart b/lib/pages/personal/address/editView.dart index ba869e48..c950fb6f 100644 --- a/lib/pages/personal/address/editView.dart +++ b/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(); diff --git a/lib/pages/personal/address/new_address_page.dart b/lib/pages/personal/address/new_address_page.dart index 3bbe5ae6..cbd75f16 100644 --- a/lib/pages/personal/address/new_address_page.dart +++ b/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'; diff --git a/lib/pages/personal/change_nick_name_page.dart b/lib/pages/personal/change_nick_name_page.dart index b3dca890..f1fd189f 100644 --- a/lib/pages/personal/change_nick_name_page.dart +++ b/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); diff --git a/lib/pages/personal/clock_in/clock_in_page.dart b/lib/pages/personal/clock_in/clock_in_page.dart index 752fe80d..a62fee1a 100644 --- a/lib/pages/personal/clock_in/clock_in_page.dart +++ b/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); diff --git a/lib/pages/personal/intergral/integral_center_page.dart b/lib/pages/personal/intergral/integral_center_page.dart index 06a7553e..eed8f369 100644 --- a/lib/pages/personal/intergral/integral_center_page.dart +++ b/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); diff --git a/lib/pages/personal/item_my_address.dart b/lib/pages/personal/item_my_address.dart index 93330f29..49dabaa1 100644 --- a/lib/pages/personal/item_my_address.dart +++ b/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}) - : assert(addressModel != null); + required this.canBack}); _MyAddressItemState createState() => _MyAddressItemState(); } diff --git a/lib/pages/personal/personal_page.dart b/lib/pages/personal/personal_page.dart index 9f2decc7..696a505c 100644 --- a/lib/pages/personal/personal_page.dart +++ b/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'; diff --git a/lib/pages/personal/user_func.dart b/lib/pages/personal/user_func.dart index ef17f696..c69b8b81 100644 --- a/lib/pages/personal/user_func.dart +++ b/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 { ///查询我的收货地址列表 diff --git a/lib/pages/personal/user_profile_page.dart b/lib/pages/personal/user_profile_page.dart index e6104e74..71be2e18 100644 --- a/lib/pages/personal/user_profile_page.dart +++ b/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); diff --git a/lib/pages/personal/wallet/balance_record_view.dart b/lib/pages/personal/wallet/balance_record_view.dart index a637a247..5fc5fb9b 100644 --- a/lib/pages/personal/wallet/balance_record_view.dart +++ b/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); diff --git a/lib/pages/personal/wallet/input_pay_password_dialog.dart b/lib/pages/personal/wallet/input_pay_password_dialog.dart index 5c0f85aa..591bdb82 100644 --- a/lib/pages/personal/wallet/input_pay_password_dialog.dart +++ b/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, diff --git a/lib/pages/personal/wallet/pay_way_dialog.dart b/lib/pages/personal/wallet/pay_way_dialog.dart index 5e439864..40ce75b8 100644 --- a/lib/pages/personal/wallet/pay_way_dialog.dart +++ b/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; diff --git a/lib/pages/personal/wallet/point_record_view.dart b/lib/pages/personal/wallet/point_record_view.dart index f6a2d74b..ed67f767 100644 --- a/lib/pages/personal/wallet/point_record_view.dart +++ b/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); diff --git a/lib/pages/personal/wallet/set_pay_password_dialog.dart b/lib/pages/personal/wallet/set_pay_password_dialog.dart index dcc458b3..bc334229 100644 --- a/lib/pages/personal/wallet/set_pay_password_dialog.dart +++ b/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); diff --git a/lib/pages/personal/wallet/set_pay_password_verify_dialog.dart b/lib/pages/personal/wallet/set_pay_password_verify_dialog.dart index 262b9bb4..7ad47bf1 100644 --- a/lib/pages/personal/wallet/set_pay_password_verify_dialog.dart +++ b/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; diff --git a/lib/pages/personal/wallet/wallet_recharge_page.dart b/lib/pages/personal/wallet/wallet_recharge_page.dart index 3b6c4455..40b6f53c 100644 --- a/lib/pages/personal/wallet/wallet_recharge_page.dart +++ b/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; diff --git a/lib/pages/personal/wallet/wallet_trade_record_page.dart b/lib/pages/personal/wallet/wallet_trade_record_page.dart index 7018c1c0..b4ffc023 100644 --- a/lib/pages/personal/wallet/wallet_trade_record_page.dart +++ b/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 { diff --git a/lib/pages/renovation_manage/new_renovation/new_renovation_add_page.dart b/lib/pages/renovation_manage/new_renovation/new_renovation_add_page.dart index c4679b0d..09f67be8 100644 --- a/lib/pages/renovation_manage/new_renovation/new_renovation_add_page.dart +++ b/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); diff --git a/lib/pages/renovation_manage/new_renovation/new_renovation_card.dart b/lib/pages/renovation_manage/new_renovation/new_renovation_card.dart index 9cf454cc..19fa484e 100644 --- a/lib/pages/renovation_manage/new_renovation/new_renovation_card.dart +++ b/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; diff --git a/lib/pages/renovation_manage/new_renovation/new_renovation_view.dart b/lib/pages/renovation_manage/new_renovation/new_renovation_view.dart index 44e0d888..62c264e4 100644 --- a/lib/pages/renovation_manage/new_renovation/new_renovation_view.dart +++ b/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; diff --git a/lib/pages/service_browse/service_browse_page.dart b/lib/pages/service_browse/service_browse_page.dart index 92e347b9..6991f405 100644 --- a/lib/pages/service_browse/service_browse_page.dart +++ b/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); diff --git a/lib/pages/services/old_age/add_equipment_page.dart b/lib/pages/services/old_age/add_equipment_page.dart index 2654d42b..988917ed 100644 --- a/lib/pages/services/old_age/add_equipment_page.dart +++ b/lib/pages/services/old_age/add_equipment_page.dart @@ -1,11 +1,13 @@ -import 'package:aku_new_community/gen/assets.gen.dart'; -import 'package:aku_new_community/pages/services/old_age/submit_equipment_code_page.dart'; -import 'package:aku_new_community/widget/bee_back_button.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/services/old_age/submit_equipment_code_page.dart'; +import 'package:aku_new_community/widget/bee_back_button.dart'; + class AddEquipmentPage extends StatefulWidget { const AddEquipmentPage({Key? key}) : super(key: key); diff --git a/lib/pages/services/old_age/old_age_support_page_simple.dart b/lib/pages/services/old_age/old_age_support_page_simple.dart index d9ebdf1d..7dee08e2 100644 --- a/lib/pages/services/old_age/old_age_support_page_simple.dart +++ b/lib/pages/services/old_age/old_age_support_page_simple.dart @@ -1,3 +1,13 @@ +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:dio/dio.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:get/get.dart' hide Response; +import 'package:velocity_x/velocity_x.dart'; + import 'package:aku_new_community/constants/api.dart'; import 'package:aku_new_community/gen/assets.gen.dart'; import 'package:aku_new_community/models/bracelet/bracelet_model.dart'; @@ -6,14 +16,6 @@ import 'package:aku_new_community/pages/services/old_age/equipment_list_page.dar 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:bot_toast/bot_toast.dart'; -import 'package:common_utils/common_utils.dart'; -import 'package:dio/dio.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:get/get.dart' hide Response; -import 'package:velocity_x/velocity_x.dart'; class OldAgeSupportPageSimple extends StatefulWidget { const OldAgeSupportPageSimple({Key? key}) : super(key: key); diff --git a/lib/pages/setting_page/account_manager_page.dart b/lib/pages/setting_page/account_manager_page.dart index ca21cdee..a0376265 100644 --- a/lib/pages/setting_page/account_manager_page.dart +++ b/lib/pages/setting_page/account_manager_page.dart @@ -1,10 +1,12 @@ -import 'package:aku_new_community/pages/sign/login/other_login_page.dart'; -import 'package:aku_new_community/widget/bee_scaffold.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; + import 'package:get/get.dart'; import 'package:velocity_x/velocity_x.dart'; +import 'package:aku_new_community/pages/sign/login/other_login_page.dart'; +import 'package:aku_new_community/widget/bee_scaffold.dart'; + class AccountManagerPage extends StatefulWidget { AccountManagerPage({Key? key}) : super(key: key); diff --git a/lib/pages/setting_page/agreement_page/agreement_page.dart b/lib/pages/setting_page/agreement_page/agreement_page.dart index b661199c..6ca5bb40 100644 --- a/lib/pages/setting_page/agreement_page/agreement_page.dart +++ b/lib/pages/setting_page/agreement_page/agreement_page.dart @@ -1,6 +1,7 @@ +import 'package:flutter/material.dart'; + import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/widget/bee_scaffold.dart'; -import 'package:flutter/material.dart'; class AgreementPage extends StatefulWidget { @override diff --git a/lib/pages/setting_page/agreement_page/privacy_page.dart b/lib/pages/setting_page/agreement_page/privacy_page.dart index f447af24..d125e5ef 100644 --- a/lib/pages/setting_page/agreement_page/privacy_page.dart +++ b/lib/pages/setting_page/agreement_page/privacy_page.dart @@ -1,6 +1,7 @@ +import 'package:flutter/material.dart'; + import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/widget/bee_scaffold.dart'; -import 'package:flutter/material.dart'; class PrivacyPage extends StatefulWidget { PrivacyPage({Key? key}) : super(key: key); diff --git a/lib/pages/setting_page/feedback_page/feedback_page.dart b/lib/pages/setting_page/feedback_page/feedback_page.dart index 51b33785..44e45bed 100644 --- a/lib/pages/setting_page/feedback_page/feedback_page.dart +++ b/lib/pages/setting_page/feedback_page/feedback_page.dart @@ -1,13 +1,15 @@ import 'dart:io'; +import 'package:flutter/material.dart'; + +import 'package:bot_toast/bot_toast.dart'; +import 'package:get/get.dart'; + import 'package:aku_new_community/constants/api.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:aku_new_community/widget/picker/grid_image_picker.dart'; -import 'package:bot_toast/bot_toast.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; class FeedBackPage extends StatefulWidget { FeedBackPage({Key? key}) : super(key: key); diff --git a/lib/pages/setting_page/settings_page.dart b/lib/pages/setting_page/settings_page.dart index f7b81a23..135f787b 100644 --- a/lib/pages/setting_page/settings_page.dart +++ b/lib/pages/setting_page/settings_page.dart @@ -1,3 +1,11 @@ +import 'package:flutter/cupertino.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/base/base_style.dart'; import 'package:aku_new_community/extensions/num_ext.dart'; import 'package:aku_new_community/extensions/widget_list_ext.dart'; @@ -9,12 +17,6 @@ import 'package:aku_new_community/utils/developer_util.dart'; import 'package:aku_new_community/utils/websocket/web_socket_util.dart'; import 'package:aku_new_community/widget/bee_scaffold.dart'; import 'package:aku_new_community/widget/others/user_tool.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:provider/provider.dart'; -import 'package:velocity_x/velocity_x.dart'; class SettingsPage extends StatefulWidget { SettingsPage({Key? key}) : super(key: key); diff --git a/lib/pages/share_pay_page/share_pay_page.dart b/lib/pages/share_pay_page/share_pay_page.dart index 6586ef14..2352533f 100644 --- a/lib/pages/share_pay_page/share_pay_page.dart +++ b/lib/pages/share_pay_page/share_pay_page.dart @@ -1,5 +1,14 @@ 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: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/extensions/widget_list_ext.dart'; @@ -16,13 +25,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:flutter_screenutil/flutter_screenutil.dart'; -import 'package:get/get.dart'; -import 'package:velocity_x/velocity_x.dart'; class SharePayPage extends StatefulWidget { const SharePayPage({Key? key}) : super(key: key); diff --git a/lib/pages/share_pay_page/share_record_page.dart b/lib/pages/share_pay_page/share_record_page.dart index a8a04930..29c5ff85 100644 --- a/lib/pages/share_pay_page/share_record_page.dart +++ b/lib/pages/share_pay_page/share_record_page.dart @@ -5,7 +5,6 @@ import 'package:flutter_easyrefresh/easy_refresh.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/share_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'; diff --git a/lib/pages/sign/login/code_message_page.dart b/lib/pages/sign/login/code_message_page.dart index 6e321201..196d9de6 100644 --- a/lib/pages/sign/login/code_message_page.dart +++ b/lib/pages/sign/login/code_message_page.dart @@ -1,15 +1,17 @@ -import 'package:aku_new_community/pages/sign/sign_func.dart'; -import 'package:aku_new_community/provider/clock_timer_provider.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:flutter/material.dart'; import 'package:flutter/services.dart'; + +import 'package:bot_toast/bot_toast.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:provider/provider.dart'; import 'package:sms_autofill/sms_autofill.dart'; import 'package:velocity_x/velocity_x.dart'; +import 'package:aku_new_community/pages/sign/sign_func.dart'; +import 'package:aku_new_community/provider/clock_timer_provider.dart'; +import 'package:aku_new_community/widget/bee_scaffold.dart'; +import 'package:aku_new_community/widget/others/user_tool.dart'; + class CodeMessagePage extends StatefulWidget { final String tel; diff --git a/lib/pages/sign/login/forgot_psd_page.dart b/lib/pages/sign/login/forgot_psd_page.dart index 22042ee5..18b98c1f 100644 --- a/lib/pages/sign/login/forgot_psd_page.dart +++ b/lib/pages/sign/login/forgot_psd_page.dart @@ -1,17 +1,18 @@ -import 'package:aku_new_community/pages/sign/login/forgot_set_psd_page.dart'; -import 'package:aku_new_community/pages/sign/widget/login_button_widget.dart'; -import 'package:aku_new_community/pages/sign/widget/tel_text_field.dart'; -import 'package:aku_new_community/provider/clock_timer_provider.dart'; -import 'package:aku_new_community/widget/bee_scaffold.dart'; -import 'package:aku_new_community/widget/others/user_tool.dart'; +import 'package:flutter/material.dart'; + import 'package:bot_toast/bot_toast.dart'; import 'package:common_utils/common_utils.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:provider/provider.dart'; import 'package:velocity_x/velocity_x.dart'; +import 'package:aku_new_community/pages/sign/login/forgot_set_psd_page.dart'; +import 'package:aku_new_community/pages/sign/widget/login_button_widget.dart'; +import 'package:aku_new_community/pages/sign/widget/tel_text_field.dart'; +import 'package:aku_new_community/provider/clock_timer_provider.dart'; +import 'package:aku_new_community/widget/bee_scaffold.dart'; +import 'package:aku_new_community/widget/others/user_tool.dart'; import '../sign_func.dart'; class ForgotPsdPage extends StatefulWidget { diff --git a/lib/pages/sign/login/forgot_set_psd_page.dart b/lib/pages/sign/login/forgot_set_psd_page.dart index 94677ed5..331a3213 100644 --- a/lib/pages/sign/login/forgot_set_psd_page.dart +++ b/lib/pages/sign/login/forgot_set_psd_page.dart @@ -1,3 +1,12 @@ +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:provider/provider.dart'; +import 'package:velocity_x/velocity_x.dart'; + import 'package:aku_new_community/pages/sign/login/other_login_page.dart'; import 'package:aku_new_community/pages/sign/login/psd_verify.dart'; import 'package:aku_new_community/pages/sign/sign_func.dart'; @@ -6,13 +15,6 @@ import 'package:aku_new_community/pages/sign/widget/psd_text_field.dart'; import 'package:aku_new_community/provider/clock_timer_provider.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:flutter/material.dart'; -import 'package:flutter/services.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'; class ForgotSetPsdPage extends StatefulWidget { final String tel; diff --git a/lib/pages/sign/login/other_login_page.dart b/lib/pages/sign/login/other_login_page.dart index 2739d0b8..af382525 100644 --- a/lib/pages/sign/login/other_login_page.dart +++ b/lib/pages/sign/login/other_login_page.dart @@ -1,3 +1,13 @@ +import 'package:flutter/material.dart'; + +import 'package:bot_toast/bot_toast.dart'; +import 'package:common_utils/common_utils.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:get/get.dart'; +import 'package:power_logger/power_logger.dart'; +import 'package:provider/provider.dart'; +import 'package:velocity_x/velocity_x.dart'; + import 'package:aku_new_community/pages/sign/login/code_message_page.dart'; import 'package:aku_new_community/pages/sign/login/forgot_psd_page.dart'; import 'package:aku_new_community/pages/sign/login/login_page.dart'; @@ -5,18 +15,9 @@ import 'package:aku_new_community/pages/sign/sign_func.dart'; import 'package:aku_new_community/pages/sign/widget/login_button_widget.dart'; import 'package:aku_new_community/pages/sign/widget/psd_text_field.dart'; import 'package:aku_new_community/pages/sign/widget/tel_text_field.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/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/material.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:velocity_x/velocity_x.dart'; class OtherLoginPage extends StatefulWidget { const OtherLoginPage({Key? key}) : super(key: key); diff --git a/lib/pages/sign/login/select_community_page.dart b/lib/pages/sign/login/select_community_page.dart index f8646a21..6a508f50 100644 --- a/lib/pages/sign/login/select_community_page.dart +++ b/lib/pages/sign/login/select_community_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_screenutil/flutter_screenutil.dart'; +import 'package:velocity_x/velocity_x.dart'; + import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/extensions/num_ext.dart'; import 'package:aku_new_community/saas_model/login/community_model.dart'; @@ -7,12 +14,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_city_picker.dart'; import 'package:aku_new_community/widget/picker/bee_community_picker.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:velocity_x/velocity_x.dart'; - import '../../../base/base_style.dart'; class SelectCommunity extends StatefulWidget { diff --git a/lib/pages/sign/login/set_nick_name_page.dart b/lib/pages/sign/login/set_nick_name_page.dart index 95bffc89..52e17f06 100644 --- a/lib/pages/sign/login/set_nick_name_page.dart +++ b/lib/pages/sign/login/set_nick_name_page.dart @@ -1,11 +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/pages/sign/sign_func.dart'; import 'package:aku_new_community/pages/sign/widget/login_button_widget.dart'; import 'package:aku_new_community/widget/bee_scaffold.dart'; import 'package:aku_new_community/widget/others/user_tool.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:velocity_x/velocity_x.dart'; class SetNickNamePage extends StatefulWidget { const SetNickNamePage({Key? key}) : super(key: key); diff --git a/lib/pages/sign/login/set_psd_page.dart b/lib/pages/sign/login/set_psd_page.dart index 2eaf5fa8..55fd6975 100644 --- a/lib/pages/sign/login/set_psd_page.dart +++ b/lib/pages/sign/login/set_psd_page.dart @@ -1,13 +1,15 @@ +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/pages/sign/login/psd_verify.dart'; import 'package:aku_new_community/pages/sign/sign_func.dart'; import 'package:aku_new_community/pages/sign/widget/login_button_widget.dart'; import 'package:aku_new_community/pages/sign/widget/psd_text_field.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:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:velocity_x/velocity_x.dart'; class SetPsdPage extends StatefulWidget { const SetPsdPage({Key? key}) : super(key: key); diff --git a/lib/pages/sign/sign_func.dart b/lib/pages/sign/sign_func.dart index 93908842..d42d080e 100644 --- a/lib/pages/sign/sign_func.dart +++ b/lib/pages/sign/sign_func.dart @@ -1,3 +1,8 @@ +import 'package:bot_toast/bot_toast.dart'; +import 'package:dio/dio.dart'; +import 'package:get/get.dart' hide Response; +import 'package:provider/provider.dart'; + import 'package:aku_new_community/constants/api.dart'; import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/model/user/pick_building_model.dart'; @@ -11,10 +16,6 @@ import 'package:aku_new_community/provider/user_provider.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/others/user_tool.dart'; -import 'package:bot_toast/bot_toast.dart'; -import 'package:dio/dio.dart'; -import 'package:get/get.dart' hide Response; -import 'package:provider/provider.dart'; class SignFunc { //发送手机号验证码 diff --git a/lib/pages/sign/widget/psd_text_field.dart b/lib/pages/sign/widget/psd_text_field.dart index c32b3a02..02953eb6 100644 --- a/lib/pages/sign/widget/psd_text_field.dart +++ b/lib/pages/sign/widget/psd_text_field.dart @@ -1,9 +1,11 @@ -import 'package:aku_new_community/base/base_style.dart'; -import 'package:aku_new_community/extensions/num_ext.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; + import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:aku_new_community/base/base_style.dart'; +import 'package:aku_new_community/extensions/num_ext.dart'; + class PsdTextField extends StatefulWidget { final TextEditingController controller; final String? hintText; diff --git a/lib/pages/sign/widget/tel_text_field.dart b/lib/pages/sign/widget/tel_text_field.dart index f890dd45..412ae111 100644 --- a/lib/pages/sign/widget/tel_text_field.dart +++ b/lib/pages/sign/widget/tel_text_field.dart @@ -1,9 +1,11 @@ -import 'package:aku_new_community/base/base_style.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; + import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:velocity_x/velocity_x.dart'; +import 'package:aku_new_community/base/base_style.dart'; + class TelTextField extends StatefulWidget { final TextEditingController controller; final Function(String) onChange; diff --git a/lib/pages/splash/app_verify_dialog.dart b/lib/pages/splash/app_verify_dialog.dart index 61459a6b..0d642a19 100644 --- a/lib/pages/splash/app_verify_dialog.dart +++ b/lib/pages/splash/app_verify_dialog.dart @@ -1,12 +1,14 @@ +import 'package:flutter/gestures.dart'; +import 'package:flutter/material.dart'; + +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:get/get.dart'; + import 'package:aku_new_community/base/base_style.dart'; import 'package:aku_new_community/extensions/num_ext.dart'; import 'package:aku_new_community/pages/setting_page/agreement_page/agreement_page.dart'; import 'package:aku_new_community/pages/setting_page/agreement_page/privacy_page.dart'; import 'package:aku_new_community/widget/bee_divider.dart'; -import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:get/get.dart'; class AppVerifyDialog extends StatelessWidget { const AppVerifyDialog({Key? key}) : super(key: key); diff --git a/lib/pages/splash/splash_page.dart b/lib/pages/splash/splash_page.dart index e9455368..9aaa4602 100644 --- a/lib/pages/splash/splash_page.dart +++ b/lib/pages/splash/splash_page.dart @@ -1,26 +1,24 @@ -import 'dart:io'; + +import 'package:flutter/gestures.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; + +import 'package:amap_flutter_location/amap_flutter_location.dart'; +import 'package:equatable/equatable.dart'; +import 'package:get/get.dart'; +import 'package:hive_flutter/hive_flutter.dart'; +import 'package:power_logger/power_logger.dart'; import 'package:aku_new_community/gen/assets.gen.dart'; import 'package:aku_new_community/main_initialize.dart'; -import 'package:aku_new_community/pages/setting_page/agreement_page/agreement_page.dart'; -import 'package:aku_new_community/pages/setting_page/agreement_page/privacy_page.dart'; import 'package:aku_new_community/pages/sign/login/other_login_page.dart'; import 'package:aku_new_community/pages/splash/app_verify_dialog.dart'; import 'package:aku_new_community/utils/developer_util.dart'; import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/utils/hive_store.dart'; import 'package:aku_new_community/widget/others/user_tool.dart'; -import 'package:amap_flutter_location/amap_flutter_location.dart'; -import 'package:equatable/equatable.dart'; + // import 'package:amap_search_fluttify/amap_search_fluttify.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; -import 'package:get/get.dart'; -import 'package:hive_flutter/hive_flutter.dart'; -import 'package:permission_handler/permission_handler.dart'; -import 'package:power_logger/power_logger.dart'; class SplashPage extends StatefulWidget { SplashPage({Key? key}) : super(key: key); diff --git a/lib/pages/surrounding_enterprises/surrounding_enterprises_detail_page.dart b/lib/pages/surrounding_enterprises/surrounding_enterprises_detail_page.dart index d9eded83..9598e7e2 100644 --- a/lib/pages/surrounding_enterprises/surrounding_enterprises_detail_page.dart +++ b/lib/pages/surrounding_enterprises/surrounding_enterprises_detail_page.dart @@ -1,11 +1,13 @@ +import 'package:flutter/material.dart'; + +import 'package:flutter_screenutil/flutter_screenutil.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/surrounding_enterprises/surrounding_enterprises_model.dart'; import 'package:aku_new_community/widget/bee_scaffold.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; class SurroundingEnterprisesDetailPage extends StatefulWidget { final SurroundingEnterprisesModel surroundingEnterprisesModel; diff --git a/lib/pages/surrounding_enterprises/surrounding_enterprises_page.dart b/lib/pages/surrounding_enterprises/surrounding_enterprises_page.dart index 2cca7951..1988b217 100644 --- a/lib/pages/surrounding_enterprises/surrounding_enterprises_page.dart +++ b/lib/pages/surrounding_enterprises/surrounding_enterprises_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/base/base_style.dart'; import 'package:aku_new_community/constants/api.dart'; import 'package:aku_new_community/constants/app_theme.dart'; @@ -8,9 +13,6 @@ import 'package:aku_new_community/pages/surrounding_enterprises/surrounding_ente 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'; class SurroundingEnterprisesPage extends StatefulWidget { SurroundingEnterprisesPage({Key? key}) : super(key: key); diff --git a/lib/pages/tab_navigator.dart b/lib/pages/tab_navigator.dart index 56c12d21..3edf659b 100644 --- a/lib/pages/tab_navigator.dart +++ b/lib/pages/tab_navigator.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:get/get.dart'; +import 'package:provider/provider.dart'; + import 'package:aku_new_community/gen/assets.gen.dart'; import 'package:aku_new_community/pages/sign/login/other_login_page.dart'; import 'package:aku_new_community/provider/app_provider.dart'; @@ -5,14 +12,7 @@ import 'package:aku_new_community/ui/community/community_views/community_page.da import 'package:aku_new_community/ui/market/market_page.dart'; import 'package:aku_new_community/utils/websocket/web_socket_util.dart'; import 'package:aku_new_community/widget/bee_scaffold.dart'; -import 'package:aku_new_community/widget/dialog/certification_dialog.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_screenutil/flutter_screenutil.dart'; -import 'package:get/get.dart'; -import 'package:provider/provider.dart'; - import 'home/home_page.dart'; import 'opening_code_page/opening_code_page.dart'; import 'personal/personal_page.dart'; diff --git a/lib/pages/things_page/fixed_submit_page.dart b/lib/pages/things_page/fixed_submit_page.dart index b301a4b4..0fa65972 100644 --- a/lib/pages/things_page/fixed_submit_page.dart +++ b/lib/pages/things_page/fixed_submit_page.dart @@ -1,3 +1,11 @@ +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: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/constants/app_theme.dart'; @@ -12,12 +20,6 @@ import 'package:aku_new_community/utils/bee_map.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/views/horizontal_image_view.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:velocity_x/velocity_x.dart'; class FixedSubmitPage extends StatefulWidget { FixedSubmitPage({Key? key}) : super(key: key); diff --git a/lib/pages/things_page/widget/add_fixed_submit_page.dart b/lib/pages/things_page/widget/add_fixed_submit_page.dart index 39acd874..c259ba66 100644 --- a/lib/pages/things_page/widget/add_fixed_submit_page.dart +++ b/lib/pages/things_page/widget/add_fixed_submit_page.dart @@ -1,5 +1,11 @@ import 'dart:io'; +import 'package:flutter/material.dart'; + +import 'package:bot_toast/bot_toast.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'; @@ -14,10 +20,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/others/house_head_card.dart'; import 'package:aku_new_community/widget/picker/grid_image_picker.dart'; -import 'package:bot_toast/bot_toast.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; -import 'package:provider/provider.dart'; class AddFixedSubmitPage extends StatefulWidget { AddFixedSubmitPage({Key? key}) : super(key: key); diff --git a/lib/pages/things_page/widget/fixed_detail_page.dart b/lib/pages/things_page/widget/fixed_detail_page.dart index 7c24b4b4..b067c817 100644 --- a/lib/pages/things_page/widget/fixed_detail_page.dart +++ b/lib/pages/things_page/widget/fixed_detail_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_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/models/manage/fix_report/fix_detail_model.dart'; @@ -11,12 +19,6 @@ import 'package:aku_new_community/utils/network/base_model.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/views/horizontal_image_view.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 'package:url_launcher/url_launcher.dart'; class FixedDetailPage extends StatefulWidget { final int id; diff --git a/lib/pages/things_page/widget/fixed_evaluate_page.dart b/lib/pages/things_page/widget/fixed_evaluate_page.dart index 8a2cb421..d5ca805d 100644 --- a/lib/pages/things_page/widget/fixed_evaluate_page.dart +++ b/lib/pages/things_page/widget/fixed_evaluate_page.dart @@ -4,7 +4,6 @@ import 'package:flutter/material.dart'; import 'package:bot_toast/bot_toast.dart'; import 'package:flutter_rating_bar/flutter_rating_bar.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/manage/fix_report/fix_detail_model.dart'; diff --git a/lib/pages/visitor_access_page/visitor_access_page.dart b/lib/pages/visitor_access_page/visitor_access_page.dart index 056d4d4c..1d4caff2 100644 --- a/lib/pages/visitor_access_page/visitor_access_page.dart +++ b/lib/pages/visitor_access_page/visitor_access_page.dart @@ -1,3 +1,12 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +import 'package:common_utils/common_utils.dart'; +import 'package:flutter_icons/flutter_icons.dart'; +import 'package:get/get.dart'; +import 'package:provider/provider.dart'; +import 'package:share/share.dart'; + import 'package:aku_new_community/constants/api.dart'; import 'package:aku_new_community/pages/manager_func.dart'; import 'package:aku_new_community/provider/app_provider.dart'; @@ -9,14 +18,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/common_input.dart'; import 'package:aku_new_community/widget/picker/bee_date_picker.dart'; -import 'package:common_utils/common_utils.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_icons/flutter_icons.dart'; -import 'package:get/get.dart'; -import 'package:provider/provider.dart'; -import 'package:share/share.dart'; -import 'package:velocity_x/velocity_x.dart'; class VisitorAccessPage extends StatefulWidget { VisitorAccessPage({Key? key}) : super(key: key); diff --git a/lib/provider/app_provider.dart b/lib/provider/app_provider.dart index 8a409a67..9e0c21a6 100644 --- a/lib/provider/app_provider.dart +++ b/lib/provider/app_provider.dart @@ -1,6 +1,14 @@ import 'dart:async'; import 'dart:io'; +import 'package:flutter/foundation.dart'; + +import 'package:amap_flutter_location/amap_flutter_location.dart'; +import 'package:amap_flutter_location/amap_location_option.dart'; +import 'package:collection/collection.dart' show IterableExtension; +import 'package:dio/dio.dart'; +import 'package:power_logger/power_logger.dart'; + import 'package:aku_new_community/constants/api.dart'; import 'package:aku_new_community/constants/application_objects.dart'; import 'package:aku_new_community/constants/config.dart'; @@ -16,12 +24,6 @@ import 'package:aku_new_community/saas_model/login/picked_city_model.dart'; import 'package:aku_new_community/utils/hive_store.dart'; import 'package:aku_new_community/utils/network/base_model.dart'; import 'package:aku_new_community/utils/network/net_util.dart'; -import 'package:amap_flutter_location/amap_flutter_location.dart'; -import 'package:amap_flutter_location/amap_location_option.dart'; -import 'package:collection/collection.dart' show IterableExtension; -import 'package:dio/dio.dart'; -import 'package:flutter/foundation.dart'; -import 'package:power_logger/power_logger.dart'; class AppProvider extends ChangeNotifier { ///初始值为 diff --git a/lib/provider/data_provider.dart b/lib/provider/data_provider.dart index 84cb77b3..31bb40bb 100644 --- a/lib/provider/data_provider.dart +++ b/lib/provider/data_provider.dart @@ -1,10 +1,11 @@ +import 'package:flutter/material.dart'; + import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/saas_model/login/china_region_model.dart'; import 'package:aku_new_community/saas_model/login/history_login_model.dart'; import 'package:aku_new_community/utils/hive_store.dart'; import 'package:aku_new_community/utils/network/net_util.dart'; import 'package:aku_new_community/widget/others/user_tool.dart'; -import 'package:flutter/material.dart'; class DataProvider extends ChangeNotifier { Future init() async { diff --git a/lib/provider/user_provider.dart b/lib/provider/user_provider.dart index 759845a5..9a047d2a 100644 --- a/lib/provider/user_provider.dart +++ b/lib/provider/user_provider.dart @@ -1,5 +1,13 @@ import 'dart:io'; +import 'package:flutter/foundation.dart'; + +import 'package:bot_toast/bot_toast.dart'; +import 'package:common_utils/common_utils.dart'; +import 'package:get/get.dart'; +import 'package:jpush_flutter/jpush_flutter.dart'; +import 'package:provider/provider.dart'; + import 'package:aku_new_community/constants/api.dart'; import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/models/user/my_house_model.dart'; @@ -11,12 +19,6 @@ import 'package:aku_new_community/utils/hive_store.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/utils/websocket/web_socket_util.dart'; -import 'package:bot_toast/bot_toast.dart'; -import 'package:common_utils/common_utils.dart'; -import 'package:flutter/foundation.dart'; -import 'package:get/get.dart'; -import 'package:jpush_flutter/jpush_flutter.dart'; -import 'package:provider/provider.dart'; class UserProvider extends ChangeNotifier { bool _isLogin = false; diff --git a/lib/saas_model/information/information_detail_model.dart b/lib/saas_model/information/information_detail_model.dart index af75c551..b5b2edf8 100644 --- a/lib/saas_model/information/information_detail_model.dart +++ b/lib/saas_model/information/information_detail_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 'information_detail_model.g.dart'; @JsonSerializable() diff --git a/lib/saas_model/login/history_login_model.dart b/lib/saas_model/login/history_login_model.dart index 6e6e41ec..cba197b2 100644 --- a/lib/saas_model/login/history_login_model.dart +++ b/lib/saas_model/login/history_login_model.dart @@ -1,7 +1,7 @@ -import 'package:aku_new_community/saas_model/login/picked_city_model.dart'; import 'package:hive/hive.dart'; import 'package:json_annotation/json_annotation.dart'; +import 'package:aku_new_community/saas_model/login/picked_city_model.dart'; import 'community_model.dart'; part 'history_login_model.g.dart'; diff --git a/lib/saas_model/login/picked_city_model.dart b/lib/saas_model/login/picked_city_model.dart index c4ccd7a9..084e600c 100644 --- a/lib/saas_model/login/picked_city_model.dart +++ b/lib/saas_model/login/picked_city_model.dart @@ -1,8 +1,8 @@ -import 'package:aku_new_community/utils/hive_store.dart'; import 'package:equatable/equatable.dart'; import 'package:hive/hive.dart'; import 'package:json_annotation/json_annotation.dart'; +import 'package:aku_new_community/utils/hive_store.dart'; import 'china_region_model.dart'; part 'picked_city_model.g.dart'; diff --git a/lib/saas_model/my_house/my_family_member_list_model.g.dart b/lib/saas_model/my_house/my_family_member_list_model.g.dart index 4448b7e5..c1d940ba 100644 --- a/lib/saas_model/my_house/my_family_member_list_model.g.dart +++ b/lib/saas_model/my_house/my_family_member_list_model.g.dart @@ -23,7 +23,7 @@ Member _$MemberFromJson(Map json) => Member( id: json['id'] as int, name: json['name'] as String, identity: json['identity'] as int, - avatarImgList: (json['imgList'] as List) + avatarImgList: (json['avatarImgList'] as List) .map((e) => ImgModel.fromJson(e as Map)) .toList(), ); diff --git a/lib/saas_model/task/hall_list_model.dart b/lib/saas_model/task/hall_list_model.dart index 9ea3baf5..79bcfc5e 100644 --- a/lib/saas_model/task/hall_list_model.dart +++ b/lib/saas_model/task/hall_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 'hall_list_model.g.dart'; @JsonSerializable() diff --git a/lib/saas_model/task/my_take_task_list_model.dart b/lib/saas_model/task/my_take_task_list_model.dart index b0b12576..ff09c4a8 100644 --- a/lib/saas_model/task/my_take_task_list_model.dart +++ b/lib/saas_model/task/my_take_task_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 'my_take_task_list_model.g.dart'; @JsonSerializable() diff --git a/lib/saas_model/task/my_task_list_model.dart b/lib/saas_model/task/my_task_list_model.dart index 269b5a78..3c268644 100644 --- a/lib/saas_model/task/my_task_list_model.dart +++ b/lib/saas_model/task/my_task_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 'my_task_list_model.g.dart'; @JsonSerializable() diff --git a/lib/saas_model/work_order/work_order_detail_model.dart b/lib/saas_model/work_order/work_order_detail_model.dart index 37b98ec9..59ef6255 100644 --- a/lib/saas_model/work_order/work_order_detail_model.dart +++ b/lib/saas_model/work_order/work_order_detail_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 'work_order_detail_model.g.dart'; @JsonSerializable() diff --git a/lib/saas_model/work_order/work_order_list_model.dart b/lib/saas_model/work_order/work_order_list_model.dart index 57b30eab..20bb101d 100644 --- a/lib/saas_model/work_order/work_order_list_model.dart +++ b/lib/saas_model/work_order/work_order_list_model.dart @@ -1,8 +1,9 @@ -import 'package:aku_new_community/model/common/img_model.dart'; import 'package:common_utils/common_utils.dart'; import 'package:equatable/equatable.dart'; import 'package:json_annotation/json_annotation.dart'; +import 'package:aku_new_community/model/common/img_model.dart'; + part 'work_order_list_model.g.dart'; @JsonSerializable() diff --git a/lib/saas_model/work_order/work_order_report_model.dart b/lib/saas_model/work_order/work_order_report_model.dart index 0bfb3c4a..6a1430dc 100644 --- a/lib/saas_model/work_order/work_order_report_model.dart +++ b/lib/saas_model/work_order/work_order_report_model.dart @@ -1,9 +1,10 @@ import 'dart:core'; -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 'work_order_report_model.g.dart'; @JsonSerializable() diff --git a/lib/ui/community/activity/activity_card.dart b/lib/ui/community/activity/activity_card.dart index 017317d2..3c2d97d6 100644 --- a/lib/ui/community/activity/activity_card.dart +++ b/lib/ui/community/activity/activity_card.dart @@ -1,11 +1,12 @@ +import 'package:flutter/material.dart'; + +import 'package:get/get.dart'; + import 'package:aku_new_community/model/common/img_model.dart'; import 'package:aku_new_community/models/home/home_activity_model.dart'; import 'package:aku_new_community/ui/community/activity/activity_func.dart'; import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/widget/bee_image_network.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; - import 'activity_detail_page.dart'; class ActivityCard extends StatelessWidget { diff --git a/lib/ui/community/activity/activity_detail_page.dart b/lib/ui/community/activity/activity_detail_page.dart index d51a16c4..93e088ed 100644 --- a/lib/ui/community/activity/activity_detail_page.dart +++ b/lib/ui/community/activity/activity_detail_page.dart @@ -1,23 +1,22 @@ -import 'package:aku_new_community/base/base_style.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:get/get.dart'; +import 'package:url_launcher/url_launcher.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/home/activity_detail_model.dart'; -import 'package:aku_new_community/models/home/home_activity_model.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/buttons/bottom_button.dart'; import 'package:aku_new_community/widget/others/stack_avatar.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 'activity_func.dart'; import 'activity_people_list_page.dart'; diff --git a/lib/ui/community/activity/activity_detail_page_old.dart b/lib/ui/community/activity/activity_detail_page_old.dart index 24e8cb90..2a246900 100644 --- a/lib/ui/community/activity/activity_detail_page_old.dart +++ b/lib/ui/community/activity/activity_detail_page_old.dart @@ -1,23 +1,22 @@ -import 'package:aku_new_community/const/resource.dart'; +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:shimmer/shimmer.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/community/activity_detail_model.dart'; -import 'package:aku_new_community/ui/community/activity/activity_people_list_page.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:aku_new_community/widget/buttons/bottom_button.dart'; import 'package:aku_new_community/widget/others/stack_avatar.dart'; import 'package:aku_new_community/widget/picker/bee_image_preview.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:shimmer/shimmer.dart'; @Deprecated('旧页面 酌情删除') class ActivityDetailPage extends StatefulWidget { diff --git a/lib/ui/community/activity/activity_list_page.dart b/lib/ui/community/activity/activity_list_page.dart index 60a270e1..c52e30da 100644 --- a/lib/ui/community/activity/activity_list_page.dart +++ b/lib/ui/community/activity/activity_list_page.dart @@ -1,11 +1,13 @@ +import 'package:flutter/material.dart'; + +import 'package:flutter_easyrefresh/easy_refresh.dart'; + import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/models/home/home_activity_model.dart'; import 'package:aku_new_community/pages/things_page/widget/bee_list_view.dart'; import 'package:aku_new_community/ui/community/activity/activity_card.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'; class ActivityListPage extends StatefulWidget { ActivityListPage({Key? key}) : super(key: key); diff --git a/lib/ui/community/activity/activity_people_list_page.dart b/lib/ui/community/activity/activity_people_list_page.dart index a470357e..b6f22357 100644 --- a/lib/ui/community/activity/activity_people_list_page.dart +++ b/lib/ui/community/activity/activity_people_list_page.dart @@ -1,13 +1,10 @@ +import 'package:flutter/material.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/home/activity_detail_model.dart'; - import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/widget/bee_scaffold.dart'; -import 'package:flutter/material.dart'; - class ActivityPeopleListPage extends StatefulWidget { final List? registrationList; diff --git a/lib/ui/community/community_func.dart b/lib/ui/community/community_func.dart index 9be46071..8761b69d 100644 --- a/lib/ui/community/community_func.dart +++ b/lib/ui/community/community_func.dart @@ -1,3 +1,5 @@ +import 'package:bot_toast/bot_toast.dart'; + import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/model/good/market_swiper_model.dart'; import 'package:aku_new_community/models/community/dynamic_my_list_body.dart'; @@ -14,7 +16,6 @@ import 'package:aku_new_community/models/market/market_statistics_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 CommunityFunc { ///查询热门话题 diff --git a/lib/ui/community/community_views/add_new_event_page.dart b/lib/ui/community/community_views/add_new_event_page.dart index dc6e0a17..940b9f93 100644 --- a/lib/ui/community/community_views/add_new_event_page.dart +++ b/lib/ui/community/community_views/add_new_event_page.dart @@ -1,5 +1,11 @@ import 'dart:io'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +import 'package:bot_toast/bot_toast.dart'; +import 'package:get/get.dart'; + import 'package:aku_new_community/base/base_style.dart'; import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/models/community/all_dynamic_list_model.dart'; @@ -10,10 +16,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/picker/grid_image_picker.dart'; -import 'package:bot_toast/bot_toast.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; class AddNewEventPage extends StatefulWidget { final int? initTopic; diff --git a/lib/ui/community/community_views/community_page.dart b/lib/ui/community/community_views/community_page.dart index 3f9f4625..94a9f4b8 100644 --- a/lib/ui/community/community_views/community_page.dart +++ b/lib/ui/community/community_views/community_page.dart @@ -1,5 +1,14 @@ import 'dart:math'; +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/base/base_style.dart'; import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/model/common/img_model.dart'; @@ -25,13 +34,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/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'; class CommunityPage extends StatefulWidget { CommunityPage({Key? key}) : super(key: key); diff --git a/lib/ui/community/community_views/event_detail_page.dart b/lib/ui/community/community_views/event_detail_page.dart index db1701c8..10e1aca5 100644 --- a/lib/ui/community/community_views/event_detail_page.dart +++ b/lib/ui/community/community_views/event_detail_page.dart @@ -1,5 +1,14 @@ import 'dart:math'; +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: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/model/common/img_model.dart'; @@ -16,13 +25,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/bee_scaffold.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:provider/provider.dart'; class EventDetailPage extends StatefulWidget { final int dynamicId; diff --git a/lib/ui/community/community_views/my_community_view.dart b/lib/ui/community/community_views/my_community_view.dart index b10b7d9e..a5a2a85c 100644 --- a/lib/ui/community/community_views/my_community_view.dart +++ b/lib/ui/community/community_views/my_community_view.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/constants/saas_api.dart'; import 'package:aku_new_community/model/common/img_model.dart'; import 'package:aku_new_community/models/community/dynamic_my_list_body.dart'; @@ -11,11 +17,6 @@ import 'package:aku_new_community/widget/line/vertical_line_painter.dart'; import 'package:aku_new_community/widget/others/user_tool.dart'; import 'package:aku_new_community/widget/picker/bee_image_preview.dart'; import 'package:aku_new_community/widget/views/bee_grid_image_view.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; -import 'package:get/get.dart'; - import '../community_func.dart'; class MyCommunityView extends StatefulWidget { diff --git a/lib/ui/community/community_views/new_community_view.dart b/lib/ui/community/community_views/new_community_view.dart index 63a4f472..e14fc344 100644 --- a/lib/ui/community/community_views/new_community_view.dart +++ b/lib/ui/community/community_views/new_community_view.dart @@ -1,9 +1,11 @@ +import 'package:flutter/material.dart'; + +import 'package:flutter_easyrefresh/easy_refresh.dart'; + import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/models/community/all_dynamic_list_model.dart'; import 'package:aku_new_community/pages/things_page/widget/bee_list_view.dart'; import 'package:aku_new_community/ui/community/community_views/widgets/chat_card.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; class NewCommunityView extends StatefulWidget { NewCommunityView({Key? key}) : super(key: key); diff --git a/lib/ui/community/community_views/topic/topic_community_view.dart b/lib/ui/community/community_views/topic/topic_community_view.dart index fd203d57..93874ac3 100644 --- a/lib/ui/community/community_views/topic/topic_community_view.dart +++ b/lib/ui/community/community_views/topic/topic_community_view.dart @@ -1,4 +1,8 @@ -import 'dart:ui'; + +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/saas_api.dart'; @@ -8,9 +12,6 @@ import 'package:aku_new_community/ui/community/community_views/topic/topic_detai import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/widget/bee_image_network.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 TopicCommunityView extends StatefulWidget { TopicCommunityView({Key? key}) : super(key: key); diff --git a/lib/ui/community/community_views/topic/topic_detail_page.dart b/lib/ui/community/community_views/topic/topic_detail_page.dart index 9ce4e94b..9f3630c4 100644 --- a/lib/ui/community/community_views/topic/topic_detail_page.dart +++ b/lib/ui/community/community_views/topic/topic_detail_page.dart @@ -1,3 +1,11 @@ +import 'package:flutter/material.dart'; +import 'package:flutter/services.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/constants/app_theme.dart'; import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/extensions/widget_list_ext.dart'; @@ -10,12 +18,6 @@ import 'package:aku_new_community/ui/community/community_views/widgets/chat_card import 'package:aku_new_community/utils/login_util.dart'; import 'package:aku_new_community/utils/network/base_list_model.dart'; import 'package:aku_new_community/utils/network/net_util.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/services.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 TopicDetailPage extends StatefulWidget { final int? topicId; diff --git a/lib/ui/community/community_views/topic/topic_search_page.dart b/lib/ui/community/community_views/topic/topic_search_page.dart index d6e57bda..8365d70d 100644 --- a/lib/ui/community/community_views/topic/topic_search_page.dart +++ b/lib/ui/community/community_views/topic/topic_search_page.dart @@ -1,15 +1,17 @@ -import 'package:aku_new_community/constants/saas_api.dart'; -import 'package:aku_new_community/extensions/widget_list_ext.dart'; -import 'package:aku_new_community/models/community/topic_list_model.dart'; -import 'package:aku_new_community/utils/network/net_util.dart'; -import 'package:aku_new_community/widget/bee_divider.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/src/extensions/num_ext.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/widget_list_ext.dart'; +import 'package:aku_new_community/models/community/topic_list_model.dart'; +import 'package:aku_new_community/utils/network/net_util.dart'; +import 'package:aku_new_community/widget/bee_divider.dart'; + class TopicSearchPage extends StatefulWidget { const TopicSearchPage({ Key? key, diff --git a/lib/ui/community/community_views/topic/topic_sliver_header.dart b/lib/ui/community/community_views/topic/topic_sliver_header.dart index 479881d6..83606835 100644 --- a/lib/ui/community/community_views/topic/topic_sliver_header.dart +++ b/lib/ui/community/community_views/topic/topic_sliver_header.dart @@ -1,8 +1,9 @@ +import 'package:flutter/material.dart'; + + import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/widget/bee_back_button.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; class TopicSliverHeader extends SliverPersistentHeaderDelegate { final String? imgPath; diff --git a/lib/ui/community/community_views/widgets/chat_card.dart b/lib/ui/community/community_views/widgets/chat_card.dart index 609115e2..8f9370f0 100644 --- a/lib/ui/community/community_views/widgets/chat_card.dart +++ b/lib/ui/community/community_views/widgets/chat_card.dart @@ -1,5 +1,13 @@ import 'dart:math'; +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/model/common/img_model.dart'; @@ -14,13 +22,6 @@ import 'package:aku_new_community/utils/login_util.dart'; import 'package:aku_new_community/utils/network/net_util.dart'; import 'package:aku_new_community/widget/picker/bee_image_preview.dart'; import 'package:aku_new_community/widget/views/bee_grid_image_view.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'; -import 'package:velocity_x/velocity_x.dart'; class ChatCard extends StatefulWidget { final AllDynamicListModel model; diff --git a/lib/ui/community/community_views/widgets/chat_card_detail.dart b/lib/ui/community/community_views/widgets/chat_card_detail.dart index fb3045e2..45b0d130 100644 --- a/lib/ui/community/community_views/widgets/chat_card_detail.dart +++ b/lib/ui/community/community_views/widgets/chat_card_detail.dart @@ -1,3 +1,11 @@ +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:like_button/like_button.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/gen/assets.gen.dart'; @@ -10,14 +18,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/picker/bee_image_preview.dart'; import 'package:aku_new_community/widget/views/bee_grid_image_view.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:like_button/like_button.dart'; -import 'package:provider/provider.dart'; -import 'package:velocity_x/velocity_x.dart'; class ChatCardDetail extends StatefulWidget { final DynamicDetailModel model; @@ -169,6 +169,7 @@ class _ChatCardDetailState extends State { } else { BotToast.showText(text: res.msg); } + return null; }, likeBuilder: (bool isLiked) { return Image.asset( diff --git a/lib/ui/community/community_views/widgets/send_a_chat.dart b/lib/ui/community/community_views/widgets/send_a_chat.dart index 546b2220..d4e84377 100644 --- a/lib/ui/community/community_views/widgets/send_a_chat.dart +++ b/lib/ui/community/community_views/widgets/send_a_chat.dart @@ -1,9 +1,10 @@ +import 'package:flutter/material.dart'; + +import 'package:get/get.dart'; + import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/utils/network/net_util.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; -import 'package:velocity_x/velocity_x.dart'; class SendAChat extends StatefulWidget { final FocusNode? node; diff --git a/lib/ui/community/facility/facility_appointment_card.dart b/lib/ui/community/facility/facility_appointment_card.dart index 69cbbdea..2aaf7ec0 100644 --- a/lib/ui/community/facility/facility_appointment_card.dart +++ b/lib/ui/community/facility/facility_appointment_card.dart @@ -1,15 +1,15 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +import 'package:bot_toast/bot_toast.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/facility/facility_appointment_model.dart'; import 'package:aku_new_community/ui/common/qr_scan.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_divider.dart'; -import 'package:bot_toast/bot_toast.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; - import '../../../constants/saas_api.dart'; class FacilityAppointmentCard extends StatelessWidget { diff --git a/lib/ui/community/facility/facility_appointment_view.dart b/lib/ui/community/facility/facility_appointment_view.dart index fbf809a7..f742a31b 100644 --- a/lib/ui/community/facility/facility_appointment_view.dart +++ b/lib/ui/community/facility/facility_appointment_view.dart @@ -1,11 +1,12 @@ -import 'package:aku_new_community/constants/api.dart'; +import 'package:flutter/material.dart'; + +import 'package:flutter_easyrefresh/easy_refresh.dart'; + import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/models/facility/facility_appointment_model.dart'; import 'package:aku_new_community/pages/things_page/widget/bee_list_view.dart'; import 'package:aku_new_community/ui/community/facility/facility_appointment_card.dart'; import 'package:aku_new_community/utils/headers.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; enum FacilityAppointmentType { MY, diff --git a/lib/ui/community/facility/facility_order_date_list_page.dart b/lib/ui/community/facility/facility_order_date_list_page.dart index 91f0caec..55fdf55b 100644 --- a/lib/ui/community/facility/facility_order_date_list_page.dart +++ b/lib/ui/community/facility/facility_order_date_list_page.dart @@ -5,7 +5,6 @@ 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/constants/saas_api.dart'; import 'package:aku_new_community/models/facility/facility_order_date_list_model.dart'; import 'package:aku_new_community/pages/things_page/widget/bee_list_view.dart'; diff --git a/lib/ui/community/facility/facility_preorder_date_picker.dart b/lib/ui/community/facility/facility_preorder_date_picker.dart index dc7bb09b..44b978b9 100644 --- a/lib/ui/community/facility/facility_preorder_date_picker.dart +++ b/lib/ui/community/facility/facility_preorder_date_picker.dart @@ -1,3 +1,5 @@ +import 'package:flutter/cupertino.dart'; + import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/models/facility/facility_type_detail_model.dart'; import 'package:aku_new_community/utils/headers.dart'; diff --git a/lib/ui/community/facility/facility_preorder_page.dart b/lib/ui/community/facility/facility_preorder_page.dart index d7b5b234..f76b0016 100644 --- a/lib/ui/community/facility/facility_preorder_page.dart +++ b/lib/ui/community/facility/facility_preorder_page.dart @@ -1,26 +1,25 @@ +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'; import 'package:aku_new_community/models/facility/facility_type_detail_model.dart'; -import 'package:aku_new_community/provider/app_provider.dart'; import 'package:aku_new_community/provider/user_provider.dart'; import 'package:aku_new_community/ui/community/facility/facility_preorder_date_picker.dart'; import 'package:aku_new_community/ui/community/facility/facility_type_detail_page.dart'; import 'package:aku_new_community/ui/community/facility/facility_order_date_list_page.dart'; -import 'package:aku_new_community/ui/profile/house/pick_my_house_page.dart'; +import 'package:aku_new_community/ui/community/facility/facility_type_detail_page.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_divider.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/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'; -import 'package:provider/provider.dart'; - import '../../../constants/saas_api.dart'; import '../../../models/facility/facility_type_model.dart'; import '../../../widget/picker/bee_choose_date_picker.dart'; diff --git a/lib/ui/community/facility/facility_type_card.dart b/lib/ui/community/facility/facility_type_card.dart index 6fb25b86..606d2ab7 100644 --- a/lib/ui/community/facility/facility_type_card.dart +++ b/lib/ui/community/facility/facility_type_card.dart @@ -1,12 +1,12 @@ +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/saas_api.dart'; import 'package:aku_new_community/model/common/img_model.dart'; import 'package:aku_new_community/models/facility/facility_type_model.dart'; -import 'package:aku_new_community/ui/community/facility/facility_preorder_page.dart'; import 'package:aku_new_community/utils/headers.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; - import 'facility_type_detail_page.dart'; class FacilityTypeCard extends StatelessWidget { diff --git a/lib/ui/community/facility/facility_type_detail_card.dart b/lib/ui/community/facility/facility_type_detail_card.dart index dbd2c37e..88b883c7 100644 --- a/lib/ui/community/facility/facility_type_detail_card.dart +++ b/lib/ui/community/facility/facility_type_detail_card.dart @@ -1,15 +1,14 @@ +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/saas_api.dart'; import 'package:aku_new_community/model/common/img_model.dart'; import 'package:aku_new_community/utils/headers.dart'; -import 'package:common_utils/common_utils.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; - import '../../../models/facility/facility_type_detail_model.dart'; import '../../../models/facility/facility_type_model.dart'; import 'facility_preorder_page.dart'; -import 'facility_type_detail_page.dart'; class FacilityTypeDetailCard extends StatelessWidget { final FacilityTypeDetailModel model; diff --git a/lib/ui/community/facility/facility_type_detail_page.dart b/lib/ui/community/facility/facility_type_detail_page.dart index 79ce42e2..7f542e29 100644 --- a/lib/ui/community/facility/facility_type_detail_page.dart +++ b/lib/ui/community/facility/facility_type_detail_page.dart @@ -1,18 +1,15 @@ -import 'package:aku_new_community/constants/api.dart'; +import 'package:flutter/material.dart'; + +import 'package:flutter_easyrefresh/easy_refresh.dart'; +import 'package:get/get.dart'; + import 'package:aku_new_community/models/facility/facility_type_detail_model.dart'; import 'package:aku_new_community/utils/headers.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:aku_new_community/widget/bee_divider.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 '../../../constants/saas_api.dart'; import '../../../models/facility/facility_type_model.dart'; -import 'facility_type_card.dart'; import 'facility_type_detail_card.dart'; class FacilityTypeDetailPage extends StatefulWidget { diff --git a/lib/ui/community/facility/pick_facility_page.dart b/lib/ui/community/facility/pick_facility_page.dart index 532df788..82826e41 100644 --- a/lib/ui/community/facility/pick_facility_page.dart +++ b/lib/ui/community/facility/pick_facility_page.dart @@ -1,22 +1,14 @@ -import 'package:aku_new_community/constants/api.dart'; +import 'package:flutter/material.dart'; + +import 'package:flutter_easyrefresh/easy_refresh.dart'; + import 'package:aku_new_community/models/facility/facility_type_model.dart'; import 'package:aku_new_community/pages/things_page/widget/bee_list_view.dart'; import 'package:aku_new_community/ui/community/facility/facility_type_card.dart'; import 'package:aku_new_community/utils/headers.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'; -import 'package:get/get_core/src/get_main.dart'; - import '../../../constants/saas_api.dart'; -import '../../../utils/network/base_list_model.dart'; -import '../../../utils/network/net_util.dart'; import '../../../widget/tab_bar/bee_tab_bar.dart'; -import '../../market/market_home_goods_card.dart'; -import 'facility_appointment_page.dart'; -import 'facility_appointment_view.dart'; class PickFacilityPage extends StatefulWidget { PickFacilityPage({Key? key}) : super(key: key); diff --git a/lib/ui/community/notice/notice_card.dart b/lib/ui/community/notice/notice_card.dart index 711f5506..19dd4096 100644 --- a/lib/ui/community/notice/notice_card.dart +++ b/lib/ui/community/notice/notice_card.dart @@ -1,13 +1,14 @@ +import 'package:flutter/material.dart'; + +import 'package:common_utils/common_utils.dart'; +import 'package:get/get.dart'; + import 'package:aku_new_community/model/common/img_model.dart'; import 'package:aku_new_community/models/home/home_announce_model.dart'; import 'package:aku_new_community/ui/community/notice/notice_detail_page.dart'; import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/widget/bee_image_network.dart'; import 'package:aku_new_community/widget/picker/bee_image_preview.dart'; -import 'package:common_utils/common_utils.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; -import 'package:velocity_x/velocity_x.dart'; @Deprecated('旧设计，暂时弃用') class NoticeCard extends StatelessWidget { diff --git a/lib/ui/community/notice/notice_detail_page.dart b/lib/ui/community/notice/notice_detail_page.dart index 98073cb1..f9b0a8ea 100644 --- a/lib/ui/community/notice/notice_detail_page.dart +++ b/lib/ui/community/notice/notice_detail_page.dart @@ -1,3 +1,9 @@ +import 'package:flutter/material.dart'; + +import 'package:flutter_easyrefresh/easy_refresh.dart'; +import 'package:get/get.dart'; +import 'package:open_file/open_file.dart'; + import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/models/home/announce_detail_model.dart'; import 'package:aku_new_community/utils/headers.dart'; @@ -8,10 +14,6 @@ import 'package:aku_new_community/widget/bee_scaffold.dart'; import 'package:aku_new_community/widget/picker/bee_image_preview.dart'; import 'package:aku_new_community/widget/views/bee_download_view.dart'; import 'package:aku_new_community/widget/views/doc_view.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; -import 'package:get/get.dart'; -import 'package:open_file/open_file.dart'; class NoticeDetailPage extends StatefulWidget { final int? id; diff --git a/lib/ui/community/notice/notice_page.dart b/lib/ui/community/notice/notice_page.dart index 74017991..ae76355d 100644 --- a/lib/ui/community/notice/notice_page.dart +++ b/lib/ui/community/notice/notice_page.dart @@ -1,11 +1,13 @@ +import 'package:flutter/material.dart'; + +import 'package:flutter_easyrefresh/easy_refresh.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/things_page/widget/bee_list_view.dart'; import 'package:aku_new_community/ui/community/notice/notice_card.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'; @Deprecated('暂时弃用') class NoticePage extends StatefulWidget { diff --git a/lib/ui/function_and_service/task/add_appointment_address_page.dart b/lib/ui/function_and_service/task/add_appointment_address_page.dart index 302bd903..635e0824 100644 --- a/lib/ui/function_and_service/task/add_appointment_address_page.dart +++ b/lib/ui/function_and_service/task/add_appointment_address_page.dart @@ -1,9 +1,11 @@ +import 'package:flutter/material.dart'; + +import 'package:get/get.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:aku_new_community/widget/buttons/bee_long_button.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; class AddAppointmentAddressPage extends StatefulWidget { final String? address; diff --git a/lib/ui/function_and_service/task/dialogs/task_cancel_dialog.dart b/lib/ui/function_and_service/task/dialogs/task_cancel_dialog.dart index 09de9664..6c6f9009 100644 --- a/lib/ui/function_and_service/task/dialogs/task_cancel_dialog.dart +++ b/lib/ui/function_and_service/task/dialogs/task_cancel_dialog.dart @@ -1,12 +1,12 @@ -import 'package:aku_new_community/base/base_style.dart'; -import 'package:aku_new_community/extensions/num_ext.dart'; -import 'package:aku_new_community/gen/assets.gen.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/src/extensions/string_ext.dart'; +import 'package:aku_new_community/base/base_style.dart'; +import 'package:aku_new_community/extensions/num_ext.dart'; +import 'package:aku_new_community/gen/assets.gen.dart'; import '../task_func.dart'; class TaskCancelDialog extends StatefulWidget { diff --git a/lib/ui/function_and_service/task/dialogs/task_evaluation_dialog.dart b/lib/ui/function_and_service/task/dialogs/task_evaluation_dialog.dart index 80b8ad99..15f7ba1b 100644 --- a/lib/ui/function_and_service/task/dialogs/task_evaluation_dialog.dart +++ b/lib/ui/function_and_service/task/dialogs/task_evaluation_dialog.dart @@ -1,13 +1,15 @@ -import 'package:aku_new_community/base/base_style.dart'; -import 'package:aku_new_community/extensions/num_ext.dart'; -import 'package:aku_new_community/gen/assets.gen.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:velocity_x/src/extensions/string_ext.dart'; +import 'package:aku_new_community/base/base_style.dart'; +import 'package:aku_new_community/extensions/num_ext.dart'; +import 'package:aku_new_community/gen/assets.gen.dart'; + class TaskEvaluationDialog extends StatefulWidget { final Future Function(int star, String content) evaluate; diff --git a/lib/ui/function_and_service/task/hall/hall_card.dart b/lib/ui/function_and_service/task/hall/hall_card.dart index e5ddfb75..01818b96 100644 --- a/lib/ui/function_and_service/task/hall/hall_card.dart +++ b/lib/ui/function_and_service/task/hall/hall_card.dart @@ -1,3 +1,10 @@ +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/extensions/num_ext.dart'; import 'package:aku_new_community/gen/assets.gen.dart'; import 'package:aku_new_community/saas_model/task/hall_list_model.dart'; @@ -6,13 +13,6 @@ import 'package:aku_new_community/widget/buttons/card_bottom_button.dart'; import 'package:aku_new_community/widget/others/user_tool.dart'; import 'package:aku_new_community/widget/views/bee_hor_image_view.dart'; import 'package:aku_new_community/widget/voice_player.dart'; -import 'package:common_utils/common_utils.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 '../task_func.dart'; import '../task_map.dart'; import 'hall_detail_page.dart'; diff --git a/lib/ui/function_and_service/task/hall/hall_detail_page.dart b/lib/ui/function_and_service/task/hall/hall_detail_page.dart index a4f92187..3012ec67 100644 --- a/lib/ui/function_and_service/task/hall/hall_detail_page.dart +++ b/lib/ui/function_and_service/task/hall/hall_detail_page.dart @@ -1,3 +1,12 @@ +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; + +import 'package:bot_toast/bot_toast.dart'; +import 'package:common_utils/common_utils.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:get/get.dart'; +import 'package:velocity_x/velocity_x.dart'; + import 'package:aku_new_community/gen/assets.gen.dart'; import 'package:aku_new_community/saas_model/task/hall_list_model.dart'; import 'package:aku_new_community/ui/function_and_service/task/dialogs/task_cancel_dialog.dart'; @@ -7,15 +16,6 @@ import 'package:aku_new_community/widget/buttons/bee_long_button.dart'; import 'package:aku_new_community/widget/others/user_tool.dart'; import 'package:aku_new_community/widget/views/bee_grid_image_view.dart'; import 'package:aku_new_community/widget/voice_player.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/services.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:get/get.dart'; -import 'package:velocity_x/velocity_x.dart'; - import '../task_func.dart'; import '../task_map.dart'; diff --git a/lib/ui/function_and_service/task/hall/hall_view.dart b/lib/ui/function_and_service/task/hall/hall_view.dart index 51d86db7..58231904 100644 --- a/lib/ui/function_and_service/task/hall/hall_view.dart +++ b/lib/ui/function_and_service/task/hall/hall_view.dart @@ -1,11 +1,12 @@ -import 'package:aku_new_community/constants/saas_api.dart'; -import 'package:aku_new_community/pages/things_page/widget/bee_list_view.dart'; -import 'package:aku_new_community/saas_model/task/hall_list_model.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/num_ext.dart'; +import 'package:aku_new_community/constants/saas_api.dart'; +import 'package:aku_new_community/pages/things_page/widget/bee_list_view.dart'; +import 'package:aku_new_community/saas_model/task/hall_list_model.dart'; import 'hall_card.dart'; class HallView extends StatefulWidget { diff --git a/lib/ui/function_and_service/task/location_view.dart b/lib/ui/function_and_service/task/location_view.dart index d242753b..c9c88236 100644 --- a/lib/ui/function_and_service/task/location_view.dart +++ b/lib/ui/function_and_service/task/location_view.dart @@ -1,11 +1,14 @@ +import 'package:flutter/material.dart'; + +import 'package:amap_flutter_base/amap_flutter_base.dart'; +import 'package:amap_flutter_map/amap_flutter_map.dart'; +import 'package:permission_handler/permission_handler.dart'; + import 'package:aku_new_community/widget/bee_scaffold.dart'; import 'package:aku_new_community/widget/others/bee_search_text_field.dart'; import 'package:aku_new_community/widget/others/user_tool.dart'; -import 'package:amap_flutter_base/amap_flutter_base.dart'; -import 'package:amap_flutter_map/amap_flutter_map.dart'; + // import 'package:amap_search_fluttify/amap_search_fluttify.dart' as search; -import 'package:flutter/material.dart'; -import 'package:permission_handler/permission_handler.dart'; class LocationView extends StatefulWidget { const LocationView({Key? key}) : super(key: key); diff --git a/lib/ui/function_and_service/task/my_take_task/my_take_task_card.dart b/lib/ui/function_and_service/task/my_take_task/my_take_task_card.dart index 3dd4297d..f587715c 100644 --- a/lib/ui/function_and_service/task/my_take_task/my_take_task_card.dart +++ b/lib/ui/function_and_service/task/my_take_task/my_take_task_card.dart @@ -1,3 +1,10 @@ +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/extensions/widget_list_ext.dart'; import 'package:aku_new_community/gen/assets.gen.dart'; import 'package:aku_new_community/saas_model/task/my_take_task_list_model.dart'; @@ -5,12 +12,6 @@ import 'package:aku_new_community/widget/bee_divider.dart'; import 'package:aku_new_community/widget/buttons/card_bottom_button.dart'; import 'package:aku_new_community/widget/views/bee_hor_image_view.dart'; import 'package:aku_new_community/widget/voice_player.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'; - import '../task_func.dart'; import '../task_map.dart'; import 'my_take_task_detail_page.dart'; diff --git a/lib/ui/function_and_service/task/my_take_task/my_take_task_detail_page.dart b/lib/ui/function_and_service/task/my_take_task/my_take_task_detail_page.dart index 7c812113..b678fb8a 100644 --- a/lib/ui/function_and_service/task/my_take_task/my_take_task_detail_page.dart +++ b/lib/ui/function_and_service/task/my_take_task/my_take_task_detail_page.dart @@ -1,3 +1,12 @@ +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; + +import 'package:bot_toast/bot_toast.dart'; +import 'package:common_utils/common_utils.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:get/get.dart'; +import 'package:velocity_x/velocity_x.dart'; + import 'package:aku_new_community/gen/assets.gen.dart'; import 'package:aku_new_community/saas_model/task/my_take_task_list_model.dart'; import 'package:aku_new_community/widget/bee_divider.dart'; @@ -5,14 +14,6 @@ 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/views/bee_grid_image_view.dart'; import 'package:aku_new_community/widget/voice_player.dart'; -import 'package:bot_toast/bot_toast.dart'; -import 'package:common_utils/common_utils.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:get/get.dart'; -import 'package:velocity_x/velocity_x.dart'; - import '../task_func.dart'; import '../task_map.dart'; diff --git a/lib/ui/function_and_service/task/my_take_task/my_take_task_view.dart b/lib/ui/function_and_service/task/my_take_task/my_take_task_view.dart index 90d810b5..8e967fe3 100644 --- a/lib/ui/function_and_service/task/my_take_task/my_take_task_view.dart +++ b/lib/ui/function_and_service/task/my_take_task/my_take_task_view.dart @@ -1,11 +1,12 @@ -import 'package:aku_new_community/constants/saas_api.dart'; -import 'package:aku_new_community/pages/things_page/widget/bee_list_view.dart'; -import 'package:aku_new_community/saas_model/task/my_take_task_list_model.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/saas_api.dart'; +import 'package:aku_new_community/pages/things_page/widget/bee_list_view.dart'; +import 'package:aku_new_community/saas_model/task/my_take_task_list_model.dart'; import 'my_take_task_card.dart'; class MyTakeTaskView extends StatefulWidget { diff --git a/lib/ui/function_and_service/task/my_task/my_task_card.dart b/lib/ui/function_and_service/task/my_task/my_task_card.dart index 020b7887..f922fd10 100644 --- a/lib/ui/function_and_service/task/my_task/my_task_card.dart +++ b/lib/ui/function_and_service/task/my_task/my_task_card.dart @@ -1,15 +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/extensions/num_ext.dart'; import 'package:aku_new_community/gen/assets.gen.dart'; import 'package:aku_new_community/saas_model/task/my_task_list_model.dart'; import 'package:aku_new_community/widget/buttons/card_bottom_button.dart'; import 'package:aku_new_community/widget/views/bee_hor_image_view.dart'; import 'package:aku_new_community/widget/voice_player.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'; - import '../task_func.dart'; import '../task_map.dart'; import 'my_task_detail_page.dart'; diff --git a/lib/ui/function_and_service/task/my_task/my_task_detail_page.dart b/lib/ui/function_and_service/task/my_task/my_task_detail_page.dart index 70ccdcb6..a696feaa 100644 --- a/lib/ui/function_and_service/task/my_task/my_task_detail_page.dart +++ b/lib/ui/function_and_service/task/my_task/my_task_detail_page.dart @@ -1,3 +1,12 @@ +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; + +import 'package:bot_toast/bot_toast.dart'; +import 'package:common_utils/common_utils.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:get/get.dart'; +import 'package:velocity_x/velocity_x.dart'; + import 'package:aku_new_community/gen/assets.gen.dart'; import 'package:aku_new_community/saas_model/task/my_task_list_model.dart'; import 'package:aku_new_community/ui/function_and_service/task/dialogs/task_cancel_dialog.dart'; @@ -7,14 +16,6 @@ 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/views/bee_grid_image_view.dart'; import 'package:aku_new_community/widget/voice_player.dart'; -import 'package:bot_toast/bot_toast.dart'; -import 'package:common_utils/common_utils.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:get/get.dart'; -import 'package:velocity_x/velocity_x.dart'; - import '../task_func.dart'; import '../task_map.dart'; diff --git a/lib/ui/function_and_service/task/my_task/my_task_view.dart b/lib/ui/function_and_service/task/my_task/my_task_view.dart index d092b406..9d1af517 100644 --- a/lib/ui/function_and_service/task/my_task/my_task_view.dart +++ b/lib/ui/function_and_service/task/my_task/my_task_view.dart @@ -1,11 +1,12 @@ -import 'package:aku_new_community/constants/saas_api.dart'; -import 'package:aku_new_community/pages/things_page/widget/bee_list_view.dart'; -import 'package:aku_new_community/saas_model/task/my_task_list_model.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/saas_api.dart'; +import 'package:aku_new_community/pages/things_page/widget/bee_list_view.dart'; +import 'package:aku_new_community/saas_model/task/my_task_list_model.dart'; import 'my_task_card.dart'; class MyTaskView extends StatefulWidget { diff --git a/lib/ui/function_and_service/task/publish_task_page.dart b/lib/ui/function_and_service/task/publish_task_page.dart index 739d959b..b6956c3b 100644 --- a/lib/ui/function_and_service/task/publish_task_page.dart +++ b/lib/ui/function_and_service/task/publish_task_page.dart @@ -1,5 +1,14 @@ import 'dart:io'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; + +import 'package:bot_toast/bot_toast.dart'; +import 'package:common_utils/common_utils.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/gen/assets.gen.dart'; @@ -19,14 +28,6 @@ import 'package:aku_new_community/widget/picker/bee_date_picker.dart'; import 'package:aku_new_community/widget/picker/bee_pick_image_widget.dart'; import 'package:aku_new_community/widget/picker/bee_picker_box.dart'; import 'package:aku_new_community/widget/voice_player.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/services.dart'; -import 'package:get/get.dart'; -import 'package:power_logger/power_logger.dart'; - import 'add_appointment_address_page.dart'; class PublishTaskPage extends StatefulWidget { diff --git a/lib/ui/function_and_service/task/task_page.dart b/lib/ui/function_and_service/task/task_page.dart index a28d7388..15a1b165 100644 --- a/lib/ui/function_and_service/task/task_page.dart +++ b/lib/ui/function_and_service/task/task_page.dart @@ -1,13 +1,14 @@ -import 'package:aku_new_community/ui/function_and_service/task/publish_task_page.dart'; -import 'package:aku_new_community/ui/function_and_service/task/task_map.dart'; -import 'package:aku_new_community/widget/bee_scaffold.dart'; -import 'package:aku_new_community/widget/painter/tab_indicator.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_new_community/ui/function_and_service/task/publish_task_page.dart'; +import 'package:aku_new_community/ui/function_and_service/task/task_map.dart'; +import 'package:aku_new_community/widget/bee_scaffold.dart'; +import 'package:aku_new_community/widget/painter/tab_indicator.dart'; import 'hall/hall_view.dart'; import 'my_take_task/my_take_task_view.dart'; import 'my_task/my_task_view.dart'; diff --git a/lib/ui/function_and_service/task/task_remark_page.dart b/lib/ui/function_and_service/task/task_remark_page.dart index 044f8ca7..9227d60c 100644 --- a/lib/ui/function_and_service/task/task_remark_page.dart +++ b/lib/ui/function_and_service/task/task_remark_page.dart @@ -1,12 +1,14 @@ -import 'package:aku_new_community/utils/hive_store.dart'; -import 'package:aku_new_community/widget/bee_scaffold.dart'; -import 'package:aku_new_community/widget/buttons/bee_long_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/utils/hive_store.dart'; +import 'package:aku_new_community/widget/bee_scaffold.dart'; +import 'package:aku_new_community/widget/buttons/bee_long_button.dart'; + class TaskRemarkPage extends StatefulWidget { final String? text; const TaskRemarkPage({Key? key, this.text}) : super(key: key); diff --git a/lib/ui/function_and_service/work_order/all_order/all_order_view.dart b/lib/ui/function_and_service/work_order/all_order/all_order_view.dart index db3259d4..8063ae6b 100644 --- a/lib/ui/function_and_service/work_order/all_order/all_order_view.dart +++ b/lib/ui/function_and_service/work_order/all_order/all_order_view.dart @@ -1,12 +1,13 @@ -import 'package:aku_new_community/constants/saas_api.dart'; -import 'package:aku_new_community/saas_model/work_order/work_order_list_model.dart'; -import 'package:aku_new_community/utils/network/net_util.dart'; import 'package:flutter/material.dart'; + import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:power_logger/power_logger.dart'; import 'package:velocity_x/src/extensions/num_ext.dart'; +import 'package:aku_new_community/constants/saas_api.dart'; +import 'package:aku_new_community/saas_model/work_order/work_order_list_model.dart'; +import 'package:aku_new_community/utils/network/net_util.dart'; import '../work_order_card.dart'; class AllOrderView extends StatefulWidget { diff --git a/lib/ui/function_and_service/work_order/dialogs/cancel_dialog.dart b/lib/ui/function_and_service/work_order/dialogs/cancel_dialog.dart index 2cc03ad3..e7bae98e 100644 --- a/lib/ui/function_and_service/work_order/dialogs/cancel_dialog.dart +++ b/lib/ui/function_and_service/work_order/dialogs/cancel_dialog.dart @@ -1,9 +1,11 @@ -import 'package:aku_new_community/extensions/num_ext.dart'; -import 'package:aku_new_community/widget/buttons/bee_long_button.dart'; import 'package:flutter/material.dart'; + import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:velocity_x/src/extensions/string_ext.dart'; +import 'package:aku_new_community/extensions/num_ext.dart'; +import 'package:aku_new_community/widget/buttons/bee_long_button.dart'; + class CancelDialog extends StatelessWidget { final VoidCallback onCancel; diff --git a/lib/ui/function_and_service/work_order/dialogs/urge_dialog.dart b/lib/ui/function_and_service/work_order/dialogs/urge_dialog.dart index 57d7d312..1d7a0dd7 100644 --- a/lib/ui/function_and_service/work_order/dialogs/urge_dialog.dart +++ b/lib/ui/function_and_service/work_order/dialogs/urge_dialog.dart @@ -1,9 +1,11 @@ -import 'package:aku_new_community/extensions/num_ext.dart'; -import 'package:aku_new_community/widget/buttons/bee_long_button.dart'; import 'package:flutter/material.dart'; + import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:velocity_x/src/extensions/string_ext.dart'; +import 'package:aku_new_community/extensions/num_ext.dart'; +import 'package:aku_new_community/widget/buttons/bee_long_button.dart'; + class UrgeDialog extends StatelessWidget { final VoidCallback onConfirm; diff --git a/lib/ui/function_and_service/work_order/dialogs/work_order_bill_dialog.dart b/lib/ui/function_and_service/work_order/dialogs/work_order_bill_dialog.dart index 1813f698..6acf1266 100644 --- a/lib/ui/function_and_service/work_order/dialogs/work_order_bill_dialog.dart +++ b/lib/ui/function_and_service/work_order/dialogs/work_order_bill_dialog.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/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/saas_model/work_order/work_order_bill_model.dart'; import 'package:aku_new_community/widget/bee_divider.dart'; import 'package:aku_new_community/widget/buttons/bee_long_button.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:get/get.dart'; -import 'package:velocity_x/src/extensions/string_ext.dart'; class WorkOrderBillDialog extends StatelessWidget { final List models; diff --git a/lib/ui/function_and_service/work_order/dialogs/work_order_finish_dialog.dart b/lib/ui/function_and_service/work_order/dialogs/work_order_finish_dialog.dart index fd6c0d68..1042b094 100644 --- a/lib/ui/function_and_service/work_order/dialogs/work_order_finish_dialog.dart +++ b/lib/ui/function_and_service/work_order/dialogs/work_order_finish_dialog.dart @@ -1,11 +1,13 @@ -import 'package:aku_new_community/extensions/num_ext.dart'; -import 'package:aku_new_community/gen/assets.gen.dart'; -import 'package:aku_new_community/widget/buttons/card_bottom_button.dart'; import 'package:flutter/material.dart'; + import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:velocity_x/src/extensions/string_ext.dart'; +import 'package:aku_new_community/extensions/num_ext.dart'; +import 'package:aku_new_community/gen/assets.gen.dart'; +import 'package:aku_new_community/widget/buttons/card_bottom_button.dart'; + class WorkOrderFinishDialog extends StatelessWidget { final VoidCallback onConfirm; diff --git a/lib/ui/function_and_service/work_order/dialogs/work_order_progress_dialog.dart b/lib/ui/function_and_service/work_order/dialogs/work_order_progress_dialog.dart index ca20aa36..73629390 100644 --- a/lib/ui/function_and_service/work_order/dialogs/work_order_progress_dialog.dart +++ b/lib/ui/function_and_service/work_order/dialogs/work_order_progress_dialog.dart @@ -1,12 +1,13 @@ -import 'package:aku_new_community/extensions/num_ext.dart'; -import 'package:aku_new_community/saas_model/work_order/work_order_progress_model.dart'; -import 'package:aku_new_community/widget/bee_divider.dart'; -import 'package:common_utils/common_utils.dart'; import 'package:flutter/material.dart'; + +import 'package:common_utils/common_utils.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:velocity_x/src/extensions/string_ext.dart'; import 'package:velocity_x/velocity_x.dart'; +import 'package:aku_new_community/extensions/num_ext.dart'; +import 'package:aku_new_community/saas_model/work_order/work_order_progress_model.dart'; +import 'package:aku_new_community/widget/bee_divider.dart'; + class WorkOrderProgressDialog extends StatelessWidget { final List models; diff --git a/lib/ui/function_and_service/work_order/history_report_page.dart b/lib/ui/function_and_service/work_order/history_report_page.dart index a31cff62..20ef1037 100644 --- a/lib/ui/function_and_service/work_order/history_report_page.dart +++ b/lib/ui/function_and_service/work_order/history_report_page.dart @@ -1,3 +1,11 @@ +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/flutter_screenutil.dart'; +import 'package:velocity_x/velocity_x.dart'; + import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/extensions/num_ext.dart'; import 'package:aku_new_community/extensions/widget_list_ext.dart'; @@ -7,12 +15,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/dotted_line.dart'; import 'package:aku_new_community/widget/views/bee_grid_image_view.dart'; -import 'package:common_utils/common_utils.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:velocity_x/velocity_x.dart'; class HistoryReportPage extends StatefulWidget { final int id; diff --git a/lib/ui/function_and_service/work_order/publish_work_order_page.dart b/lib/ui/function_and_service/work_order/publish_work_order_page.dart index 9ed313b6..f0fd538a 100644 --- a/lib/ui/function_and_service/work_order/publish_work_order_page.dart +++ b/lib/ui/function_and_service/work_order/publish_work_order_page.dart @@ -1,5 +1,15 @@ 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:flutter_screenutil/flutter_screenutil.dart'; +import 'package:get/get.dart'; +import 'package:provider/provider.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/provider/user_provider.dart'; @@ -8,22 +18,14 @@ import 'package:aku_new_community/ui/function_and_service/work_order/work_order_ import 'package:aku_new_community/ui/function_and_service/work_order/work_order_remark_page.dart'; import 'package:aku_new_community/ui/profile/new_house/my_house_page.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/buttons/bee_long_button.dart'; import 'package:aku_new_community/widget/others/user_tool.dart'; import 'package:aku_new_community/widget/picker/bee_date_picker.dart'; import 'package:aku_new_community/widget/picker/bee_pick_image_widget.dart'; import 'package:aku_new_community/widget/picker/bee_picker_box.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_screenutil/flutter_screenutil.dart'; -import 'package:get/get.dart'; -import 'package:provider/provider.dart'; -import 'package:velocity_x/src/extensions/string_ext.dart'; class PublishWorkOrderPage extends StatefulWidget { const PublishWorkOrderPage({Key? key}) : super(key: key); diff --git a/lib/ui/function_and_service/work_order/team_list_page.dart b/lib/ui/function_and_service/work_order/team_list_page.dart index f8d0b425..a7500ffd 100644 --- a/lib/ui/function_and_service/work_order/team_list_page.dart +++ b/lib/ui/function_and_service/work_order/team_list_page.dart @@ -1,14 +1,16 @@ +import 'package:flutter/material.dart'; + +import 'package:flutter_easyrefresh/easy_refresh.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:url_launcher/url_launcher.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/gen/assets.gen.dart'; import 'package:aku_new_community/saas_model/work_order/team_list_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:url_launcher/url_launcher.dart'; -import 'package:velocity_x/src/extensions/string_ext.dart'; class TeamListPage extends StatefulWidget { final int workOderId; @@ -30,6 +32,7 @@ class _TeamListPageState extends State { return null; } } + return null; } @override diff --git a/lib/ui/function_and_service/work_order/work_order_card.dart b/lib/ui/function_and_service/work_order/work_order_card.dart index a8bb0b7b..00b81e00 100644 --- a/lib/ui/function_and_service/work_order/work_order_card.dart +++ b/lib/ui/function_and_service/work_order/work_order_card.dart @@ -1,3 +1,10 @@ +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/src/extensions/string_ext.dart'; + import 'package:aku_new_community/base/base_style.dart'; import 'package:aku_new_community/extensions/num_ext.dart'; import 'package:aku_new_community/gen/assets.gen.dart'; @@ -8,11 +15,6 @@ import 'package:aku_new_community/ui/function_and_service/work_order/work_order_ import 'package:aku_new_community/utils/bee_date_util.dart'; import 'package:aku_new_community/widget/buttons/card_bottom_button.dart'; import 'package:aku_new_community/widget/views/bee_hor_image_view.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/src/extensions/string_ext.dart'; class WorkOrderCard extends StatelessWidget { final WorkOrderListModel model; diff --git a/lib/ui/function_and_service/work_order/work_order_detail_page.dart b/lib/ui/function_and_service/work_order/work_order_detail_page.dart index 3fbef45b..f1d1fa9b 100644 --- a/lib/ui/function_and_service/work_order/work_order_detail_page.dart +++ b/lib/ui/function_and_service/work_order/work_order_detail_page.dart @@ -1,3 +1,16 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/services.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:get/get.dart'; +import 'package:url_launcher/url_launcher.dart'; +import 'package:velocity_x/src/extensions/num_ext.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/gen/assets.gen.dart'; @@ -15,17 +28,6 @@ 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/stack_avatar.dart'; import 'package:aku_new_community/widget/views/bee_grid_image_view.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/services.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/src/extensions/num_ext.dart'; -import 'package:velocity_x/src/extensions/string_ext.dart'; class WorkOrderDetailPage extends StatefulWidget { final int id; diff --git a/lib/ui/function_and_service/work_order/work_order_func.dart b/lib/ui/function_and_service/work_order/work_order_func.dart index 009b3d49..c87ce208 100644 --- a/lib/ui/function_and_service/work_order/work_order_func.dart +++ b/lib/ui/function_and_service/work_order/work_order_func.dart @@ -1,12 +1,12 @@ +import 'package:bot_toast/bot_toast.dart'; +import 'package:get/get_core/src/get_main.dart'; +import 'package:get/get_navigation/src/extension_navigation.dart'; + import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/saas_model/work_order/work_order_bill_model.dart'; import 'package:aku_new_community/saas_model/work_order/work_order_progress_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:get/get_core/src/get_main.dart'; -import 'package:get/get_navigation/src/extension_navigation.dart'; - import 'dialogs/work_order_bill_dialog.dart'; import 'dialogs/work_order_progress_dialog.dart'; diff --git a/lib/ui/function_and_service/work_order/work_order_page.dart b/lib/ui/function_and_service/work_order/work_order_page.dart index e525e28b..393deb63 100644 --- a/lib/ui/function_and_service/work_order/work_order_page.dart +++ b/lib/ui/function_and_service/work_order/work_order_page.dart @@ -1,15 +1,17 @@ -import 'package:aku_new_community/saas_model/work_order/work_order_list_model.dart'; -import 'package:aku_new_community/ui/function_and_service/work_order/publish_work_order_page.dart'; -import 'package:aku_new_community/ui/function_and_service/work_order/work_order_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 '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/saas_model/work_order/work_order_list_model.dart'; +import 'package:aku_new_community/ui/function_and_service/work_order/publish_work_order_page.dart'; +import 'package:aku_new_community/ui/function_and_service/work_order/work_order_view.dart'; +import 'package:aku_new_community/widget/bee_scaffold.dart'; +import 'package:aku_new_community/widget/tab_bar/bee_tab_bar.dart'; + class WorkOrderPage extends StatefulWidget { const WorkOrderPage({Key? key}) : super(key: key); diff --git a/lib/ui/function_and_service/work_order/work_order_remark_page.dart b/lib/ui/function_and_service/work_order/work_order_remark_page.dart index fdb659f9..630644b5 100644 --- a/lib/ui/function_and_service/work_order/work_order_remark_page.dart +++ b/lib/ui/function_and_service/work_order/work_order_remark_page.dart @@ -1,12 +1,14 @@ -import 'package:aku_new_community/utils/hive_store.dart'; -import 'package:aku_new_community/widget/bee_scaffold.dart'; -import 'package:aku_new_community/widget/buttons/bee_long_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/utils/hive_store.dart'; +import 'package:aku_new_community/widget/bee_scaffold.dart'; +import 'package:aku_new_community/widget/buttons/bee_long_button.dart'; + class WorkOrderRemarkPage extends StatefulWidget { final String? text; diff --git a/lib/ui/function_and_service/work_order/work_order_view.dart b/lib/ui/function_and_service/work_order/work_order_view.dart index c41c4ec7..299cfee6 100644 --- a/lib/ui/function_and_service/work_order/work_order_view.dart +++ b/lib/ui/function_and_service/work_order/work_order_view.dart @@ -1,13 +1,15 @@ -import 'package:aku_new_community/constants/saas_api.dart'; -import 'package:aku_new_community/saas_model/work_order/work_order_list_model.dart'; -import 'package:aku_new_community/ui/function_and_service/work_order/work_order_card.dart'; -import 'package:aku_new_community/utils/network/net_util.dart'; import 'package:flutter/material.dart'; + import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:power_logger/power_logger.dart'; import 'package:velocity_x/src/extensions/num_ext.dart'; +import 'package:aku_new_community/constants/saas_api.dart'; +import 'package:aku_new_community/saas_model/work_order/work_order_list_model.dart'; +import 'package:aku_new_community/ui/function_and_service/work_order/work_order_card.dart'; +import 'package:aku_new_community/utils/network/net_util.dart'; + class WorkOrderView extends StatefulWidget { final EasyRefreshController refreshController; final int index; diff --git a/lib/ui/home/application/all_application.dart b/lib/ui/home/application/all_application.dart index 5e7fe458..a6da1d13 100644 --- a/lib/ui/home/application/all_application.dart +++ b/lib/ui/home/application/all_application.dart @@ -1,16 +1,15 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +import 'package:bot_toast/bot_toast.dart'; +import 'package:provider/provider.dart'; + import 'package:aku_new_community/base/base_style.dart'; import 'package:aku_new_community/constants/application_objects.dart'; import 'package:aku_new_community/provider/app_provider.dart'; -import 'package:aku_new_community/ui/search/bee_search.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_back_button.dart'; -import 'package:bot_toast/bot_toast.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; -import 'package:provider/provider.dart'; -import 'package:velocity_x/velocity_x.dart'; class AllApplicationPage extends StatefulWidget { AllApplicationPage({Key? key}) : super(key: key); diff --git a/lib/ui/home/application/all_application_new.dart b/lib/ui/home/application/all_application_new.dart index b243a94e..0a5ec6af 100644 --- a/lib/ui/home/application/all_application_new.dart +++ b/lib/ui/home/application/all_application_new.dart @@ -1,12 +1,14 @@ -import 'package:aku_new_community/extensions/num_ext.dart'; -import 'package:aku_new_community/extensions/widget_list_ext.dart'; -import 'package:aku_new_community/utils/application_utils.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/src/extensions/iterable_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/utils/application_utils.dart'; +import 'package:aku_new_community/widget/bee_scaffold.dart'; + class AllApplicationNewPage extends StatefulWidget { const AllApplicationNewPage({Key? key}) : super(key: key); diff --git a/lib/ui/home/home_notification.dart b/lib/ui/home/home_notification.dart index 3a274a8f..98a90b95 100644 --- a/lib/ui/home/home_notification.dart +++ b/lib/ui/home/home_notification.dart @@ -1,13 +1,15 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +import 'package:carousel_slider/carousel_slider.dart'; +import 'package:common_utils/common_utils.dart'; +import 'package:get/get.dart'; + import 'package:aku_new_community/gen/assets.gen.dart'; import 'package:aku_new_community/models/home/home_announce_model.dart'; import 'package:aku_new_community/ui/community/notice/notice_detail_page.dart'; import 'package:aku_new_community/utils/bee_date_util.dart'; import 'package:aku_new_community/utils/headers.dart'; -import 'package:carousel_slider/carousel_slider.dart'; -import 'package:common_utils/common_utils.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; class HomeNotification extends StatefulWidget { final List items; diff --git a/lib/ui/home/home_title.dart b/lib/ui/home/home_title.dart index 2452f6d9..34b1f787 100644 --- a/lib/ui/home/home_title.dart +++ b/lib/ui/home/home_title.dart @@ -1,7 +1,7 @@ -import 'package:aku_new_community/utils/headers.dart'; import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; -import 'package:velocity_x/velocity_x.dart'; + + +import 'package:aku_new_community/utils/headers.dart'; class HomeTitle extends StatelessWidget { final String title; diff --git a/lib/ui/home/public_infomation/public_infomation_card.dart b/lib/ui/home/public_infomation/public_infomation_card.dart index c5d4be98..70be967d 100644 --- a/lib/ui/home/public_infomation/public_infomation_card.dart +++ b/lib/ui/home/public_infomation/public_infomation_card.dart @@ -1,11 +1,12 @@ +import 'package:flutter/material.dart'; + +import 'package:get/get.dart'; + import 'package:aku_new_community/base/base_style.dart'; import 'package:aku_new_community/models/community/information_list_model.dart'; import 'package:aku_new_community/ui/home/public_infomation/public_information_detail_page.dart'; import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/widget/bee_image_network.dart'; -import 'package:common_utils/common_utils.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; class PublicInfomationCard extends StatelessWidget { final InformationListModel model; diff --git a/lib/ui/home/public_infomation/public_infomation_page.dart b/lib/ui/home/public_infomation/public_infomation_page.dart index fea8968c..54eae477 100644 --- a/lib/ui/home/public_infomation/public_infomation_page.dart +++ b/lib/ui/home/public_infomation/public_infomation_page.dart @@ -1,8 +1,9 @@ +import 'package:flutter/material.dart'; + import 'package:aku_new_community/models/community/information_category_list_model.dart'; import 'package:aku_new_community/ui/home/public_infomation/public_infomation_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/material.dart'; class PublicInfomationPage extends StatefulWidget { final List models; diff --git a/lib/ui/home/public_infomation/public_infomation_view.dart b/lib/ui/home/public_infomation/public_infomation_view.dart index a2d21e46..4c75fa81 100644 --- a/lib/ui/home/public_infomation/public_infomation_view.dart +++ b/lib/ui/home/public_infomation/public_infomation_view.dart @@ -1,11 +1,13 @@ +import 'package:flutter/material.dart'; + +import 'package:flutter_easyrefresh/easy_refresh.dart'; + import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/models/community/information_category_list_model.dart'; import 'package:aku_new_community/models/community/information_list_model.dart'; import 'package:aku_new_community/pages/things_page/widget/bee_list_view.dart'; import 'package:aku_new_community/ui/home/public_infomation/public_infomation_card.dart'; import 'package:aku_new_community/utils/headers.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; class PublicInfomationView extends StatefulWidget { final InformationCategoryListModel model; diff --git a/lib/ui/home/public_infomation/public_information_detail_page.dart b/lib/ui/home/public_infomation/public_information_detail_page.dart index 1e08e8ce..fac7cd0d 100644 --- a/lib/ui/home/public_infomation/public_information_detail_page.dart +++ b/lib/ui/home/public_infomation/public_information_detail_page.dart @@ -1,3 +1,15 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter/gestures.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: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/base/base_style.dart'; import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/models/community/recommend_read_model.dart'; @@ -8,16 +20,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_image_network.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/cupertino.dart'; -import 'package:flutter/gestures.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'; class PublicInformationDetailPage extends StatefulWidget { final int id; diff --git a/lib/ui/manager/advice/advice_add_comment_page.dart b/lib/ui/manager/advice/advice_add_comment_page.dart index 3ae83c06..08de1f0c 100644 --- a/lib/ui/manager/advice/advice_add_comment_page.dart +++ b/lib/ui/manager/advice/advice_add_comment_page.dart @@ -2,9 +2,7 @@ import 'package:flutter/material.dart'; import 'package:common_utils/common_utils.dart'; import 'package:get/get.dart'; -import 'package:velocity_x/velocity_x.dart'; -import 'package:aku_new_community/constants/api.dart'; import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/utils/network/base_model.dart'; diff --git a/lib/ui/manager/advice/advice_card.dart b/lib/ui/manager/advice/advice_card.dart index 70063e86..a35360ce 100644 --- a/lib/ui/manager/advice/advice_card.dart +++ b/lib/ui/manager/advice/advice_card.dart @@ -3,7 +3,6 @@ import 'package:flutter/material.dart'; import 'package:common_utils/common_utils.dart'; import 'package:flutter_rating_bar/flutter_rating_bar.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/model/manager/suggestion_or_complain_model.dart'; diff --git a/lib/ui/manager/advice/advice_detail_page.dart b/lib/ui/manager/advice/advice_detail_page.dart index 3abb7dce..4856d358 100644 --- a/lib/ui/manager/advice/advice_detail_page.dart +++ b/lib/ui/manager/advice/advice_detail_page.dart @@ -6,10 +6,8 @@ import 'package:dio/dio.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:get/get.dart' hide Response; import 'package:shimmer/shimmer.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/constants/app_theme.dart'; import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/model/manager/advice_detail_model.dart'; diff --git a/lib/ui/manager/advice/advice_evaluate_page.dart b/lib/ui/manager/advice/advice_evaluate_page.dart index 2612ec12..c204de28 100644 --- a/lib/ui/manager/advice/advice_evaluate_page.dart +++ b/lib/ui/manager/advice/advice_evaluate_page.dart @@ -1,13 +1,14 @@ +import 'package:flutter/material.dart'; + +import 'package:flutter_rating_bar/flutter_rating_bar.dart'; +import 'package:get/get.dart'; + import 'package:aku_new_community/base/base_style.dart'; import 'package:aku_new_community/constants/saas_api.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_scaffold.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_rating_bar/flutter_rating_bar.dart'; -import 'package:get/get.dart'; -import 'package:velocity_x/velocity_x.dart'; class AdviceEvaluatePage extends StatefulWidget { final int? id; diff --git a/lib/ui/manager/advice/advice_house_page.dart b/lib/ui/manager/advice/advice_house_page.dart index 1918089b..d4353ec8 100644 --- a/lib/ui/manager/advice/advice_house_page.dart +++ b/lib/ui/manager/advice/advice_house_page.dart @@ -1,24 +1,19 @@ -import 'package:aku_new_community/utils/headers.dart'; -import 'package:aku_new_community/widget/bee_scaffold.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'; -import 'package:get/get_core/src/get_main.dart'; +import 'package:aku_new_community/utils/headers.dart'; +import 'package:aku_new_community/widget/bee_scaffold.dart'; import '../../../base/base_style.dart'; import '../../../constants/saas_api.dart'; -import '../../../gen/assets.gen.dart'; import '../../../models/user/my_house_model.dart'; import '../../../utils/network/net_util.dart'; import '../../../widget/bee_divider.dart'; import '../../../widget/others/user_tool.dart'; import '../../../widget/tag/bee_tag.dart'; -import '../../profile/house/add_house_page.dart'; -import '../../profile/new_house/apply_record_page.dart'; import '../../profile/new_house/my_house_page.dart'; -import '../../profile/new_house/widgets/add_house_button.dart'; class AdviceHousePage extends StatefulWidget { const AdviceHousePage({Key? key}) : super(key: key); diff --git a/lib/ui/manager/advice/advice_page.dart b/lib/ui/manager/advice/advice_page.dart index ed695f46..07b33d3e 100644 --- a/lib/ui/manager/advice/advice_page.dart +++ b/lib/ui/manager/advice/advice_page.dart @@ -3,7 +3,6 @@ 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:aku_new_community/constants/app_theme.dart'; import 'package:aku_new_community/constants/saas_api.dart'; diff --git a/lib/ui/manager/advice/new_advice_page.dart b/lib/ui/manager/advice/new_advice_page.dart index 951efbfb..3245b202 100644 --- a/lib/ui/manager/advice/new_advice_page.dart +++ b/lib/ui/manager/advice/new_advice_page.dart @@ -1,20 +1,15 @@ import 'dart:io'; -import 'package:aku_new_community/ui/manager/advice/advice_house_page.dart'; -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_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/const/resource.dart'; import 'package:aku_new_community/constants/app_theme.dart'; import 'package:aku_new_community/constants/saas_api.dart'; -import 'package:aku_new_community/provider/app_provider.dart'; +import 'package:aku_new_community/ui/manager/advice/advice_house_page.dart'; import 'package:aku_new_community/ui/manager/advice/advice_page.dart'; import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/utils/network/base_model.dart'; @@ -22,7 +17,6 @@ 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/bottom_button.dart'; import 'package:aku_new_community/widget/picker/grid_image_picker.dart'; - import '../../../provider/user_provider.dart'; import '../../../widget/others/user_tool.dart'; diff --git a/lib/ui/manager/house_keeping/add_house_keeping_page.dart b/lib/ui/manager/house_keeping/add_house_keeping_page.dart index f78e2d2a..ee1eade1 100644 --- a/lib/ui/manager/house_keeping/add_house_keeping_page.dart +++ b/lib/ui/manager/house_keeping/add_house_keeping_page.dart @@ -1,5 +1,13 @@ import 'dart:io'; +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_new_community/base/base_style.dart'; import 'package:aku_new_community/constants/api.dart'; import 'package:aku_new_community/extensions/widget_list_ext.dart'; @@ -12,12 +20,6 @@ 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:aku_new_community/widget/picker/grid_image_picker.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 AddHouseKeepingPage extends StatefulWidget { AddHouseKeepingPage({Key? key}) : super(key: key); diff --git a/lib/ui/manager/house_keeping/house_keeping_card.dart b/lib/ui/manager/house_keeping/house_keeping_card.dart index a30d53fa..db51fe67 100644 --- a/lib/ui/manager/house_keeping/house_keeping_card.dart +++ b/lib/ui/manager/house_keeping/house_keeping_card.dart @@ -1,5 +1,10 @@ +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/const/resource.dart'; import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/models/house_keeping/house_keeping_list_model.dart'; import 'package:aku_new_community/models/house_keeping/house_keeping_process_model.dart'; @@ -8,12 +13,6 @@ import 'package:aku_new_community/ui/manager/house_keeping/house_keeping_func.da import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/widget/buttons/card_bottom_button.dart'; import 'package:aku_new_community/widget/others/aku_chip_box.dart'; -import 'package:bot_toast/bot_toast.dart'; -import 'package:common_utils/common_utils.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:get/get.dart'; -import 'package:velocity_x/velocity_x.dart'; class HouseKeepingCard extends StatelessWidget { final HouseKeepingListModel model; diff --git a/lib/ui/manager/house_keeping/house_keeping_detail_page.dart b/lib/ui/manager/house_keeping/house_keeping_detail_page.dart index cd179d76..45798203 100644 --- a/lib/ui/manager/house_keeping/house_keeping_detail_page.dart +++ b/lib/ui/manager/house_keeping/house_keeping_detail_page.dart @@ -4,15 +4,11 @@ import 'package:flutter/material.dart'; import 'package:bot_toast/bot_toast.dart'; import 'package:common_utils/common_utils.dart'; import 'package:flutter_rating_bar/flutter_rating_bar.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'; -import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/models/house_keeping/house_keeping_list_model.dart'; import 'package:aku_new_community/models/house_keeping/house_keeping_process_model.dart'; import 'package:aku_new_community/pages/life_pay/pay_finish_page.dart'; diff --git a/lib/ui/manager/house_keeping/house_keeping_func.dart b/lib/ui/manager/house_keeping/house_keeping_func.dart index 6c51f8a5..0f6654ab 100644 --- a/lib/ui/manager/house_keeping/house_keeping_func.dart +++ b/lib/ui/manager/house_keeping/house_keeping_func.dart @@ -1,10 +1,11 @@ import 'dart:io'; +import 'package:bot_toast/bot_toast.dart'; + import 'package:aku_new_community/constants/api.dart'; import 'package:aku_new_community/models/house_keeping/house_keeping_process_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 HouseKeepingFunc { ///提交新增家政服务 diff --git a/lib/ui/manager/house_keeping/house_keeping_page.dart b/lib/ui/manager/house_keeping/house_keeping_page.dart index f0b3638a..438627b5 100644 --- a/lib/ui/manager/house_keeping/house_keeping_page.dart +++ b/lib/ui/manager/house_keeping/house_keeping_page.dart @@ -1,4 +1,3 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; diff --git a/lib/ui/manager/house_keeping/house_keeping_view.dart b/lib/ui/manager/house_keeping/house_keeping_view.dart index 8546d898..1a653e11 100644 --- a/lib/ui/manager/house_keeping/house_keeping_view.dart +++ b/lib/ui/manager/house_keeping/house_keeping_view.dart @@ -5,7 +5,6 @@ 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/constants/saas_api.dart'; import 'package:aku_new_community/models/house_keeping/house_keeping_list_model.dart'; import 'package:aku_new_community/pages/things_page/widget/bee_list_view.dart'; import 'package:aku_new_community/ui/manager/house_keeping/house_keeping_card.dart'; diff --git a/lib/ui/manager/questionnaire/questionnaire_detail_page.dart b/lib/ui/manager/questionnaire/questionnaire_detail_page.dart index c18bcd68..f5757a50 100644 --- a/lib/ui/manager/questionnaire/questionnaire_detail_page.dart +++ b/lib/ui/manager/questionnaire/questionnaire_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'; @@ -14,11 +21,6 @@ import 'package:aku_new_community/utils/network/base_model.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/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 QuestionnaireDetailPage extends StatefulWidget { final int? id; diff --git a/lib/ui/manager/questionnaire/questionnaire_page.dart b/lib/ui/manager/questionnaire/questionnaire_page.dart index c499f22e..6bb0d772 100644 --- a/lib/ui/manager/questionnaire/questionnaire_page.dart +++ b/lib/ui/manager/questionnaire/questionnaire_page.dart @@ -1,5 +1,11 @@ +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:aku_new_community/base/base_style.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'; import 'package:aku_new_community/model/common/img_model.dart'; @@ -8,14 +14,8 @@ import 'package:aku_new_community/pages/things_page/widget/bee_list_view.dart'; import 'package:aku_new_community/ui/manager/questionnaire/questionnaire_detail_page.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:aku_new_community/widget/others/stack_avatar.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:get/get.dart'; class QuestionnairePage extends StatefulWidget { QuestionnairePage({Key? key}) : super(key: key); diff --git a/lib/ui/manager/questionnaire/questionnaire_truefalse.dart b/lib/ui/manager/questionnaire/questionnaire_truefalse.dart index d438007c..406e1cea 100644 --- a/lib/ui/manager/questionnaire/questionnaire_truefalse.dart +++ b/lib/ui/manager/questionnaire/questionnaire_truefalse.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:velocity_x/velocity_x.dart'; import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/widget/buttons/bee_single_check.dart'; diff --git a/lib/ui/manager/questionnaire/submit_complish_page.dart b/lib/ui/manager/questionnaire/submit_complish_page.dart index 34fd29bb..f8e542ec 100644 --- a/lib/ui/manager/questionnaire/submit_complish_page.dart +++ b/lib/ui/manager/questionnaire/submit_complish_page.dart @@ -1,8 +1,6 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.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/utils/headers.dart'; diff --git a/lib/ui/manager/visitor/visitor_list_item.dart b/lib/ui/manager/visitor/visitor_list_item.dart index b4d3cd97..9fa4ff02 100644 --- a/lib/ui/manager/visitor/visitor_list_item.dart +++ b/lib/ui/manager/visitor/visitor_list_item.dart @@ -1,15 +1,16 @@ +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/constants/api.dart'; import 'package:aku_new_community/model/manager/visitor_list_item_model.dart'; import 'package:aku_new_community/ui/manager/visitor/visitor_passport_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: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:velocity_x/velocity_x.dart'; class VisitorListItem extends StatefulWidget { final VisitorListItemModel model; diff --git a/lib/ui/manager/visitor/visitor_passport_page.dart b/lib/ui/manager/visitor/visitor_passport_page.dart index d03363a5..56fae2f7 100644 --- a/lib/ui/manager/visitor/visitor_passport_page.dart +++ b/lib/ui/manager/visitor/visitor_passport_page.dart @@ -9,10 +9,8 @@ import 'package:bot_toast/bot_toast.dart'; import 'package:common_utils/common_utils.dart'; import 'package:fluwx/fluwx.dart'; import 'package:qr_flutter/qr_flutter.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/app_theme.dart'; import 'package:aku_new_community/model/manager/visitor_list_item_model.dart'; import 'package:aku_new_community/utils/headers.dart'; @@ -41,12 +39,11 @@ class _VisitorPassportPageState extends State { child: Scaffold( backgroundColor: Color(0xFF333333), appBar: AppBar( - brightness: Brightness.dark, leading: BeeBackButton(color: Colors.white), backgroundColor: Color(0xFF333333), elevation: 0, centerTitle: true, - title: '访客通行证'.text.white.make(), + title: '访客通行证'.text.white.make(), systemOverlayStyle: SystemUiOverlayStyle.light, ), body: RepaintBoundary( key: _repaintKey, diff --git a/lib/ui/manager/visitor/visitor_record_page.dart b/lib/ui/manager/visitor/visitor_record_page.dart index 26cbe4d8..0cb11b6d 100644 --- a/lib/ui/manager/visitor/visitor_record_page.dart +++ b/lib/ui/manager/visitor/visitor_record_page.dart @@ -1,4 +1,3 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:aku_new_community/ui/manager/visitor/visitor_record_view.dart'; diff --git a/lib/ui/manager/visitor/visitor_record_view.dart b/lib/ui/manager/visitor/visitor_record_view.dart index 4421d1cf..6224eb89 100644 --- a/lib/ui/manager/visitor/visitor_record_view.dart +++ b/lib/ui/manager/visitor/visitor_record_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/model/manager/visitor_list_item_model.dart'; import 'package:aku_new_community/pages/things_page/widget/bee_list_view.dart'; import 'package:aku_new_community/ui/manager/visitor/visitor_list_item.dart'; import 'package:aku_new_community/utils/headers.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; class VisitorRecordView extends StatefulWidget { ///访客状态（1.已分享，2.已提交，3.已到期） diff --git a/lib/ui/market/category/new_category_page.dart b/lib/ui/market/category/new_category_page.dart index fd86fa89..3a475ccc 100644 --- a/lib/ui/market/category/new_category_page.dart +++ b/lib/ui/market/category/new_category_page.dart @@ -1,4 +1,3 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:aku_new_community/base/base_style.dart'; diff --git a/lib/ui/market/category/new_category_sub_card.dart b/lib/ui/market/category/new_category_sub_card.dart index 42ea5e46..71da13c7 100644 --- a/lib/ui/market/category/new_category_sub_card.dart +++ b/lib/ui/market/category/new_category_sub_card.dart @@ -1,9 +1,11 @@ +import 'package:flutter/material.dart'; + +import 'package:get/get.dart'; + import 'package:aku_new_community/models/market/market_all_category_model.dart'; import 'package:aku_new_community/ui/market/search/search_goods_page.dart'; import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/widget/bee_image_network.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; class NewCategorySubCard extends StatelessWidget { final MarketAllCategoryModel subModels; diff --git a/lib/ui/market/integral/integral_exchange_page.dart b/lib/ui/market/integral/integral_exchange_page.dart index e36d701b..e11dedcd 100644 --- a/lib/ui/market/integral/integral_exchange_page.dart +++ b/lib/ui/market/integral/integral_exchange_page.dart @@ -1,15 +1,15 @@ -import 'package:aku_new_community/constants/saas_api.dart'; -import 'package:aku_new_community/models/market/integral_goods_list_model.dart'; -import 'package:aku_new_community/utils/network/net_util.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_easyrefresh/easy_refresh.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/constants/saas_api.dart'; import 'package:aku_new_community/gen/assets.gen.dart'; +import 'package:aku_new_community/models/market/integral_goods_list_model.dart'; import 'package:aku_new_community/ui/market/search/good_detail_page.dart'; +import 'package:aku_new_community/utils/network/net_util.dart'; import 'package:aku_new_community/widget/bee_scaffold.dart'; class IntegralExchangePage extends StatefulWidget { diff --git a/lib/ui/market/market_page.dart b/lib/ui/market/market_page.dart index 8b7f49c4..42ea5964 100644 --- a/lib/ui/market/market_page.dart +++ b/lib/ui/market/market_page.dart @@ -2,6 +2,14 @@ import 'dart:ui' as ui; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +import 'package:card_swiper/card_swiper.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/constants/saas_api.dart'; import 'package:aku_new_community/gen/assets.gen.dart'; @@ -25,13 +33,6 @@ 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/home/home_sliver_app_bar.dart'; import 'package:aku_new_community/widget/others/rectIndicator.dart'; -import 'package:card_swiper/card_swiper.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 'category/new_category_page.dart'; import 'market_home_goods_card.dart'; import 'order/order_page.dart'; diff --git a/lib/ui/market/order/logistics_page.dart b/lib/ui/market/order/logistics_page.dart index ec4463ca..2924b0e3 100644 --- a/lib/ui/market/order/logistics_page.dart +++ b/lib/ui/market/order/logistics_page.dart @@ -1,6 +1,4 @@ -import 'dart:ui'; -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:aku_new_community/base/base_style.dart'; diff --git a/lib/ui/market/order/order_card.dart b/lib/ui/market/order/order_card.dart index 68d8ca5e..f27f92f7 100644 --- a/lib/ui/market/order/order_card.dart +++ b/lib/ui/market/order/order_card.dart @@ -1,3 +1,9 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +import 'package:bot_toast/bot_toast.dart'; +import 'package:get/get.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'; @@ -11,13 +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/buttons/line_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'; - import 'order_detail_page.dart'; class OrderCard extends StatefulWidget { diff --git a/lib/ui/market/order/order_detail_page.dart b/lib/ui/market/order/order_detail_page.dart index 2fb8fe44..bc64827c 100644 --- a/lib/ui/market/order/order_detail_page.dart +++ b/lib/ui/market/order/order_detail_page.dart @@ -1,7 +1,12 @@ import 'dart:async'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +import 'package:bot_toast/bot_toast.dart'; +import 'package:get/get.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/gen/assets.gen.dart'; @@ -14,13 +19,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/line_button.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'; - import 'logistics_page.dart'; import 'order_page.dart'; diff --git a/lib/ui/market/order/order_view.dart b/lib/ui/market/order/order_view.dart index 01eaa82f..27e2ff6e 100644 --- a/lib/ui/market/order/order_view.dart +++ b/lib/ui/market/order/order_view.dart @@ -1,10 +1,11 @@ -import 'package:aku_new_community/constants/saas_api.dart'; -import 'package:aku_new_community/model/order/order_list_model.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:aku_new_community/constants/saas_api.dart'; +import 'package:aku_new_community/model/order/order_list_model.dart'; +import 'package:aku_new_community/pages/things_page/widget/bee_list_view.dart'; import 'order_card.dart'; class OrderView extends StatefulWidget { diff --git a/lib/ui/market/search/good_detail_bottomSheet.dart b/lib/ui/market/search/good_detail_bottomSheet.dart index 037b279a..660135d8 100644 --- a/lib/ui/market/search/good_detail_bottomSheet.dart +++ b/lib/ui/market/search/good_detail_bottomSheet.dart @@ -9,7 +9,6 @@ import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:aku_new_community/base/base_style.dart'; import 'package:aku_new_community/models/market/good_detail_model.dart'; diff --git a/lib/ui/market/search/good_detail_page.dart b/lib/ui/market/search/good_detail_page.dart index 85480236..9a15d2eb 100644 --- a/lib/ui/market/search/good_detail_page.dart +++ b/lib/ui/market/search/good_detail_page.dart @@ -1,5 +1,13 @@ import 'dart:async'; +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:provider/provider.dart'; + import 'package:aku_new_community/base/base_style.dart'; import 'package:aku_new_community/gen/assets.gen.dart'; import 'package:aku_new_community/model/user/adress_model.dart'; @@ -12,13 +20,6 @@ import 'package:aku_new_community/ui/market/shop_car/shop_car_page.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: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 'package:provider/provider.dart'; - import 'good_detail_bottomSheet.dart'; class GoodDetailPage extends StatefulWidget { diff --git a/lib/ui/market/search/goods_list_card.dart b/lib/ui/market/search/goods_list_card.dart index 4114d66b..46bf6a43 100644 --- a/lib/ui/market/search/goods_list_card.dart +++ b/lib/ui/market/search/goods_list_card.dart @@ -1,10 +1,11 @@ -import 'package:aku_new_community/base/base_style.dart'; -import 'package:aku_new_community/models/search/search_goods_model.dart'; -import 'package:aku_new_community/utils/headers.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/models/search/search_goods_model.dart'; +import 'package:aku_new_community/utils/headers.dart'; import 'good_detail_page.dart'; class GoodsListCard extends StatefulWidget { diff --git a/lib/ui/market/search/search_func.dart b/lib/ui/market/search/search_func.dart index 6eb48612..6f46abaa 100644 --- a/lib/ui/market/search/search_func.dart +++ b/lib/ui/market/search/search_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/models/market/good_detail_model.dart'; @@ -7,7 +9,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/utils/text_utils.dart'; -import 'package:bot_toast/bot_toast.dart'; class SearchFunc { /// 搜索商品 根据关键字 diff --git a/lib/ui/market/search/search_goods_page.dart b/lib/ui/market/search/search_goods_page.dart index c46f35bd..ee96153e 100644 --- a/lib/ui/market/search/search_goods_page.dart +++ b/lib/ui/market/search/search_goods_page.dart @@ -1,3 +1,10 @@ +import 'package:flutter/material.dart'; + +import 'package:flutter_easyrefresh/easy_refresh.dart'; +import 'package:get/get.dart'; +import 'package:provider/provider.dart'; +import 'package:waterfall_flow/waterfall_flow.dart'; + import 'package:aku_new_community/base/base_style.dart'; import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/models/market/goods_popular_model.dart'; @@ -10,13 +17,6 @@ import 'package:aku_new_community/utils/headers.dart'; 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: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:waterfall_flow/waterfall_flow.dart'; - import '../search_goods_card.dart'; import 'good_detail_page.dart'; import 'goods_list_card.dart'; @@ -722,7 +722,7 @@ class SearchGoodsPageState extends State { ), ), Spacer(), - (_searchHistory != null && _searchHistory.length > 0) + (_searchHistory.length > 0) ? GestureDetector( onTap: () { _searchHistory = []; diff --git a/lib/ui/market/search/submit_order_page.dart b/lib/ui/market/search/submit_order_page.dart index 0ac75b72..9790176e 100644 --- a/lib/ui/market/search/submit_order_page.dart +++ b/lib/ui/market/search/submit_order_page.dart @@ -1,5 +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:get/get.dart'; +import 'package:provider/provider.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/order/create_order_model.dart'; @@ -16,14 +23,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/end_button.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_screenutil/flutter_screenutil.dart'; -import 'package:get/get.dart'; -import 'package:provider/provider.dart'; -import 'package:velocity_x/velocity_x.dart'; class SubmitOrderPage extends StatefulWidget { final List models; diff --git a/lib/ui/market/search/submit_order_page_normal.dart b/lib/ui/market/search/submit_order_page_normal.dart index ab88a100..5d3f604c 100644 --- a/lib/ui/market/search/submit_order_page_normal.dart +++ b/lib/ui/market/search/submit_order_page_normal.dart @@ -1,5 +1,13 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/services.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/saas_api.dart'; import 'package:aku_new_community/gen/assets.gen.dart'; import 'package:aku_new_community/model/order/create_order_model.dart'; @@ -18,13 +26,6 @@ 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/end_button.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/services.dart'; -import 'package:get/get.dart'; -import 'package:provider/provider.dart'; class SubmitOrderNormalPage extends StatefulWidget { final GoodDetailModel goodModel; diff --git a/lib/ui/market/shop_car/shop_car_page.dart b/lib/ui/market/shop_car/shop_car_page.dart index 9f2f5f7a..7ece0f71 100644 --- a/lib/ui/market/shop_car/shop_car_page.dart +++ b/lib/ui/market/shop_car/shop_car_page.dart @@ -1,5 +1,13 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/services.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: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/models/market/shop_car/shop_car_list_model.dart'; import 'package:aku_new_community/ui/market/search/submit_order_page.dart'; @@ -10,15 +18,6 @@ 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/bee_check_radio.dart'; import 'package:aku_new_community/widget/buttons/end_button.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/services.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 ShopCarPage extends StatefulWidget { const ShopCarPage({Key? key}) : super(key: key); @@ -252,11 +251,9 @@ class _ShopCarPageState extends State { }, showMessage: true, ); - if (model.success != null) { - if (model.success) { - _selectIndex.clear(); - _refreshController.callRefresh(); - } + if (model.success) { + _selectIndex.clear(); + _refreshController.callRefresh(); } } ; @@ -646,11 +643,9 @@ class _ShopCarPageState extends State { }, showMessage: true, ); - if (model.success != null) { - if (model.success) { - _selectIndex.clear(); - _refreshController.callRefresh(); - } + if (model.success) { + _selectIndex.clear(); + _refreshController.callRefresh(); } } ; diff --git a/lib/ui/market/widget/market_app_bar.dart b/lib/ui/market/widget/market_app_bar.dart index a7c8b980..528a3bee 100644 --- a/lib/ui/market/widget/market_app_bar.dart +++ b/lib/ui/market/widget/market_app_bar.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:provider/provider.dart'; import 'package:aku_new_community/provider/app_provider.dart'; diff --git a/lib/ui/market/widget/market_success_page.dart b/lib/ui/market/widget/market_success_page.dart index 1bc10fff..5a4b7ade 100644 --- a/lib/ui/market/widget/market_success_page.dart +++ b/lib/ui/market/widget/market_success_page.dart @@ -1,4 +1,8 @@ -import 'dart:ui'; + +import 'package:flutter/material.dart'; + +import 'package:flutter_easyrefresh/easy_refresh.dart'; +import 'package:waterfall_flow/waterfall_flow.dart'; import 'package:aku_new_community/base/base_style.dart'; import 'package:aku_new_community/constants/api.dart'; @@ -10,11 +14,6 @@ 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/end_button.dart'; import 'package:aku_new_community/widget/buttons/line_button.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; -import 'package:waterfall_flow/waterfall_flow.dart'; - import '../market_home_goods_card.dart'; class MarketSuccessPage extends StatefulWidget { diff --git a/lib/ui/profile/house/add_house_page.dart b/lib/ui/profile/house/add_house_page.dart index 3c98c9db..4c372d24 100644 --- a/lib/ui/profile/house/add_house_page.dart +++ b/lib/ui/profile/house/add_house_page.dart @@ -1,5 +1,11 @@ +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/constants/api.dart'; -import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/ui/profile/house/house_item.dart'; import 'package:aku_new_community/ui/profile/house/pick_building_page.dart'; import 'package:aku_new_community/ui/profile/house/pick_role_page.dart'; @@ -7,12 +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: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_screenutil/flutter_screenutil.dart'; -import 'package:get/get.dart'; class AddHousePage extends StatefulWidget { AddHousePage({Key? key}) : super(key: key); diff --git a/lib/ui/profile/house/contract_stop/pay_surplus_rent_page.dart b/lib/ui/profile/house/contract_stop/pay_surplus_rent_page.dart index 5d0af137..f0b1f6ca 100644 --- a/lib/ui/profile/house/contract_stop/pay_surplus_rent_page.dart +++ b/lib/ui/profile/house/contract_stop/pay_surplus_rent_page.dart @@ -9,7 +9,6 @@ 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/constants/saas_api.dart'; import 'package:aku_new_community/extensions/widget_list_ext.dart'; import 'package:aku_new_community/pages/life_pay/pay_finish_page.dart'; import 'package:aku_new_community/pages/life_pay/pay_util.dart'; diff --git a/lib/ui/profile/house/contract_stop/upload_empty_list_page.dart b/lib/ui/profile/house/contract_stop/upload_empty_list_page.dart index 859ab06c..c5674b22 100644 --- a/lib/ui/profile/house/contract_stop/upload_empty_list_page.dart +++ b/lib/ui/profile/house/contract_stop/upload_empty_list_page.dart @@ -1,5 +1,15 @@ 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: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_new_community/base/base_style.dart'; import 'package:aku_new_community/extensions/widget_list_ext.dart'; import 'package:aku_new_community/ui/profile/house/house_func.dart'; @@ -11,14 +21,6 @@ import 'package:aku_new_community/widget/others/upload_widget.dart'; import 'package:aku_new_community/widget/others/user_tool.dart'; import 'package:aku_new_community/widget/picker/bee_date_picker.dart'; import 'package:aku_new_community/widget/views/doc_view.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_screenutil/flutter_screenutil.dart'; -import 'package:get/get.dart'; -import 'package:open_file/open_file.dart'; -import 'package:velocity_x/velocity_x.dart'; class UploadEmptyListPage extends StatefulWidget { UploadEmptyListPage({Key? key}) : super(key: key); diff --git a/lib/ui/profile/house/house_card.dart b/lib/ui/profile/house/house_card.dart index c389700d..af18ef54 100644 --- a/lib/ui/profile/house/house_card.dart +++ b/lib/ui/profile/house/house_card.dart @@ -3,7 +3,6 @@ import 'package:flutter/material.dart'; import 'package:common_utils/common_utils.dart'; import 'package:get/get.dart'; -import 'package:aku_new_community/const/resource.dart'; import 'package:aku_new_community/models/user/passed_house_list_model.dart'; import 'package:aku_new_community/ui/profile/house/pick_my_house_page.dart'; import 'package:aku_new_community/utils/headers.dart'; diff --git a/lib/ui/profile/house/house_func.dart b/lib/ui/profile/house/house_func.dart index fc3aeeeb..fb74c570 100644 --- a/lib/ui/profile/house/house_func.dart +++ b/lib/ui/profile/house/house_func.dart @@ -4,7 +4,6 @@ import 'dart:typed_data'; 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/models/house/lease_detail_model.dart'; import 'package:aku_new_community/models/house/lease_echo_model.dart'; import 'package:aku_new_community/models/house/submit_model.dart'; diff --git a/lib/ui/profile/house/house_owners_page.dart b/lib/ui/profile/house/house_owners_page.dart index d1b195b8..b2cf3f13 100644 --- a/lib/ui/profile/house/house_owners_page.dart +++ b/lib/ui/profile/house/house_owners_page.dart @@ -1,5 +1,13 @@ +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:power_logger/power_logger.dart'; +import 'package:provider/provider.dart'; + import 'package:aku_new_community/base/base_style.dart'; -import 'package:aku_new_community/const/resource.dart'; import 'package:aku_new_community/models/house/lease_detail_model.dart'; import 'package:aku_new_community/provider/app_provider.dart'; import 'package:aku_new_community/ui/profile/house/add_house_page.dart'; @@ -16,14 +24,6 @@ import 'package:aku_new_community/ui/profile/house/my_house_list.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: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:get/get.dart'; -import 'package:power_logger/power_logger.dart'; -import 'package:provider/provider.dart'; class HouseOwnersPage extends StatefulWidget { final int identify; diff --git a/lib/ui/profile/house/lease_pay_query/lease_pay_query_detail_page.dart b/lib/ui/profile/house/lease_pay_query/lease_pay_query_detail_page.dart index be9f5403..5fc00427 100644 --- a/lib/ui/profile/house/lease_pay_query/lease_pay_query_detail_page.dart +++ b/lib/ui/profile/house/lease_pay_query/lease_pay_query_detail_page.dart @@ -1,3 +1,10 @@ +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:power_logger/power_logger.dart'; + import 'package:aku_new_community/base/base_style.dart'; import 'package:aku_new_community/constants/api.dart'; import 'package:aku_new_community/models/house/lease_fee_list_model.dart'; @@ -9,11 +16,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/bottom_button.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/material.dart'; -import 'package:get/get.dart'; -import 'package:power_logger/power_logger.dart'; class LeasePayQueryDetailPage extends StatefulWidget { final LeaseFeeListModel model; diff --git a/lib/ui/profile/house/lease_pay_query/lease_pay_query_page.dart b/lib/ui/profile/house/lease_pay_query/lease_pay_query_page.dart index 4759985d..6d94c4fb 100644 --- a/lib/ui/profile/house/lease_pay_query/lease_pay_query_page.dart +++ b/lib/ui/profile/house/lease_pay_query/lease_pay_query_page.dart @@ -1,3 +1,10 @@ +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:aku_new_community/base/base_style.dart'; import 'package:aku_new_community/constants/api.dart'; import 'package:aku_new_community/models/house/lease_fee_list_model.dart'; @@ -8,13 +15,6 @@ 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:aku_new_community/widget/others/user_tool.dart'; -import 'package:common_utils/common_utils.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:get/get.dart'; -import 'package:velocity_x/velocity_x.dart'; class LeasePayQueryPage extends StatefulWidget { final int id; diff --git a/lib/ui/profile/house/lease_relevation/contract_pay_page.dart b/lib/ui/profile/house/lease_relevation/contract_pay_page.dart index 086ab1c7..2a515dbe 100644 --- a/lib/ui/profile/house/lease_relevation/contract_pay_page.dart +++ b/lib/ui/profile/house/lease_relevation/contract_pay_page.dart @@ -1,3 +1,12 @@ +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: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/constants/api.dart'; import 'package:aku_new_community/extensions/widget_list_ext.dart'; @@ -9,13 +18,6 @@ import 'package:aku_new_community/widget/bee_scaffold.dart'; import 'package:aku_new_community/widget/bottom_sheets/pay_mothod_bottom_sheet.dart'; import 'package:aku_new_community/widget/buttons/bottom_button.dart'; import 'package:aku_new_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_screenutil/flutter_screenutil.dart'; -import 'package:get/get.dart'; -import 'package:power_logger/power_logger.dart'; -import 'package:velocity_x/velocity_x.dart'; class ContractPayPage extends StatefulWidget { final int id; diff --git a/lib/ui/profile/house/lease_relevation/contract_preview_page.dart b/lib/ui/profile/house/lease_relevation/contract_preview_page.dart index f07953af..9f673d9d 100644 --- a/lib/ui/profile/house/lease_relevation/contract_preview_page.dart +++ b/lib/ui/profile/house/lease_relevation/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_new_community/base/base_style.dart'; import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/ui/profile/house/house_func.dart'; @@ -8,13 +17,6 @@ import 'package:aku_new_community/ui/profile/house/lease_relevation/download_con 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/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; diff --git a/lib/ui/profile/house/lease_relevation/house_information_check_page.dart b/lib/ui/profile/house/lease_relevation/house_information_check_page.dart index 0f61f45d..615ed1f4 100644 --- a/lib/ui/profile/house/lease_relevation/house_information_check_page.dart +++ b/lib/ui/profile/house/lease_relevation/house_information_check_page.dart @@ -1,13 +1,10 @@ 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_new_community/base/base_style.dart'; -import 'package:aku_new_community/const/resource.dart'; import 'package:aku_new_community/models/house/lease_detail_model.dart'; import 'package:aku_new_community/models/house/submit_model.dart'; import 'package:aku_new_community/ui/profile/house/house_func.dart'; diff --git a/lib/ui/profile/house/lease_relevation/lease_house_card.dart b/lib/ui/profile/house/lease_relevation/lease_house_card.dart index 241c0935..fddb3963 100644 --- a/lib/ui/profile/house/lease_relevation/lease_house_card.dart +++ b/lib/ui/profile/house/lease_relevation/lease_house_card.dart @@ -1,11 +1,8 @@ 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/const/resource.dart'; import 'package:aku_new_community/models/house/lease_list_model.dart'; import 'package:aku_new_community/ui/profile/house/lease_relevation/contract_pay_page.dart'; import 'package:aku_new_community/ui/profile/house/lease_relevation/supplement_information_page.dart'; diff --git a/lib/ui/profile/house/lease_relevation/supplement_information_page.dart b/lib/ui/profile/house/lease_relevation/supplement_information_page.dart index d706082c..662519e1 100644 --- a/lib/ui/profile/house/lease_relevation/supplement_information_page.dart +++ b/lib/ui/profile/house/lease_relevation/supplement_information_page.dart @@ -1,6 +1,5 @@ import 'dart:io'; -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:bot_toast/bot_toast.dart'; diff --git a/lib/ui/profile/house/lease_relevation/tenant_house_list_page.dart b/lib/ui/profile/house/lease_relevation/tenant_house_list_page.dart index afe25b90..fdee1a7f 100644 --- a/lib/ui/profile/house/lease_relevation/tenant_house_list_page.dart +++ b/lib/ui/profile/house/lease_relevation/tenant_house_list_page.dart @@ -5,7 +5,6 @@ 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/constants/saas_api.dart'; import 'package:aku_new_community/models/house/lease_list_model.dart'; import 'package:aku_new_community/pages/things_page/widget/bee_list_view.dart'; import 'package:aku_new_community/ui/profile/house/lease_relevation/lease_house_card.dart'; diff --git a/lib/ui/profile/house/lease_relevation/upload_contracts_page.dart b/lib/ui/profile/house/lease_relevation/upload_contracts_page.dart index 1c1ad2c8..3110034b 100644 --- a/lib/ui/profile/house/lease_relevation/upload_contracts_page.dart +++ b/lib/ui/profile/house/lease_relevation/upload_contracts_page.dart @@ -1,7 +1,6 @@ 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'; diff --git a/lib/ui/profile/house/pick_role_page.dart b/lib/ui/profile/house/pick_role_page.dart index 96c2457b..21903c1b 100644 --- a/lib/ui/profile/house/pick_role_page.dart +++ b/lib/ui/profile/house/pick_role_page.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:aku_new_community/utils/headers.dart'; diff --git a/lib/ui/profile/new_house/add_house_page.dart b/lib/ui/profile/new_house/add_house_page.dart index ec9c6041..5a7b3103 100644 --- a/lib/ui/profile/new_house/add_house_page.dart +++ b/lib/ui/profile/new_house/add_house_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/constants/saas_api.dart'; import 'package:aku_new_community/extensions/int_ext.dart'; import 'package:aku_new_community/extensions/widget_list_ext.dart'; @@ -12,12 +20,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_house_cascade_picker.dart'; import 'package:aku_new_community/widget/picker/bee_identify_picker.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 AddHousePage extends StatefulWidget { const AddHousePage({Key? key}) : super(key: key); diff --git a/lib/ui/profile/new_house/apply_record_page.dart b/lib/ui/profile/new_house/apply_record_page.dart index c4ec73da..9342fcc1 100644 --- a/lib/ui/profile/new_house/apply_record_page.dart +++ b/lib/ui/profile/new_house/apply_record_page.dart @@ -1,3 +1,9 @@ +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/saas_api.dart'; import 'package:aku_new_community/extensions/widget_list_ext.dart'; import 'package:aku_new_community/gen/assets.gen.dart'; @@ -6,10 +12,6 @@ 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:aku_new_community/widget/tag/bee_tag.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 ApplyRecordPage extends StatefulWidget { const ApplyRecordPage({Key? key}) : super(key: key); diff --git a/lib/ui/profile/new_house/certification/certification_page.dart b/lib/ui/profile/new_house/certification/certification_page.dart index 941865f7..e666ffe1 100644 --- a/lib/ui/profile/new_house/certification/certification_page.dart +++ b/lib/ui/profile/new_house/certification/certification_page.dart @@ -1,3 +1,11 @@ +import 'package:flutter/material.dart'; + +import 'package:bot_toast/bot_toast.dart'; +import 'package:common_utils/common_utils.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:get/get.dart'; +import 'package:velocity_x/velocity_x.dart'; + import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/gen/assets.gen.dart'; import 'package:aku_new_community/ui/profile/new_house/certification/certification_success_page.dart'; @@ -6,12 +14,6 @@ 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: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/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:get/get.dart'; -import 'package:velocity_x/velocity_x.dart'; class CertificationPage extends StatefulWidget { const CertificationPage({Key? key}) : super(key: key); diff --git a/lib/ui/profile/new_house/certification/certification_success_page.dart b/lib/ui/profile/new_house/certification/certification_success_page.dart index fb56d9fb..31dc061c 100644 --- a/lib/ui/profile/new_house/certification/certification_success_page.dart +++ b/lib/ui/profile/new_house/certification/certification_success_page.dart @@ -1,4 +1,3 @@ -import 'package:aku_new_community/ui/profile/house/add_house_page.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; @@ -7,6 +6,7 @@ import 'package:velocity_x/velocity_x.dart'; import 'package:aku_new_community/gen/assets.gen.dart'; import 'package:aku_new_community/pages/tab_navigator.dart'; +import 'package:aku_new_community/ui/profile/house/add_house_page.dart'; import 'package:aku_new_community/ui/profile/new_house/widgets/add_house_button.dart'; import 'package:aku_new_community/widget/bee_scaffold.dart'; diff --git a/lib/ui/profile/new_house/examine_view.dart b/lib/ui/profile/new_house/examine_view.dart index fb1dc657..3e034b56 100644 --- a/lib/ui/profile/new_house/examine_view.dart +++ b/lib/ui/profile/new_house/examine_view.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:flutter_screenutil/flutter_screenutil.dart'; +import 'package:velocity_x/velocity_x.dart'; + import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/extensions/widget_list_ext.dart'; import 'package:aku_new_community/gen/assets.gen.dart'; @@ -6,11 +13,6 @@ import 'package:aku_new_community/utils/bee_map.dart'; import 'package:aku_new_community/utils/enum/identify.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_easyrefresh/easy_refresh.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:velocity_x/velocity_x.dart'; class ExamineView extends StatefulWidget { const ExamineView({Key? key}) : super(key: key); diff --git a/lib/ui/profile/new_house/member_view.dart b/lib/ui/profile/new_house/member_view.dart index 1a3e8347..bcd11ec3 100644 --- a/lib/ui/profile/new_house/member_view.dart +++ b/lib/ui/profile/new_house/member_view.dart @@ -1,17 +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/constants/saas_api.dart'; -import 'package:aku_new_community/gen/assets.gen.dart'; import 'package:aku_new_community/saas_model/my_house/my_family_member_list_model.dart'; import 'package:aku_new_community/ui/profile/new_house/my_house_page.dart'; import 'package:aku_new_community/utils/bee_map.dart'; import 'package:aku_new_community/utils/enum/identify.dart'; import 'package:aku_new_community/utils/network/net_util.dart'; import 'package:aku_new_community/widget/bee_divider.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 '../../../model/common/img_model.dart'; import '../../../widget/bee_avatar_widget.dart'; diff --git a/lib/ui/profile/new_house/my_family_page.dart b/lib/ui/profile/new_house/my_family_page.dart index 4628f2a2..055b7d77 100644 --- a/lib/ui/profile/new_house/my_family_page.dart +++ b/lib/ui/profile/new_house/my_family_page.dart @@ -10,7 +10,6 @@ import 'package:aku_new_community/ui/profile/new_house/examine_view.dart'; import 'package:aku_new_community/ui/profile/new_house/member_view.dart'; import 'package:aku_new_community/ui/profile/new_house/widgets/add_house_button.dart'; import 'package:aku_new_community/widget/bee_scaffold.dart'; -import 'package:aku_new_community/widget/dialog/certification_dialog.dart'; import 'package:aku_new_community/widget/others/user_tool.dart'; import 'add_house_page.dart'; diff --git a/lib/ui/profile/new_house/my_house_page.dart b/lib/ui/profile/new_house/my_house_page.dart index 42650ef2..12b9847f 100644 --- a/lib/ui/profile/new_house/my_house_page.dart +++ b/lib/ui/profile/new_house/my_house_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/constants/saas_api.dart'; import 'package:aku_new_community/extensions/widget_list_ext.dart'; @@ -9,15 +17,8 @@ import 'package:aku_new_community/ui/profile/new_house/widgets/add_house_button. 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:aku_new_community/widget/dialog/certification_dialog.dart'; import 'package:aku_new_community/widget/others/user_tool.dart'; import 'package:aku_new_community/widget/tag/bee_tag.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 MyHousePage extends StatefulWidget { const MyHousePage({Key? key}) : super(key: key); diff --git a/lib/ui/search/bee_search.dart b/lib/ui/search/bee_search.dart index 16a6c348..b22b746c 100644 --- a/lib/ui/search/bee_search.dart +++ b/lib/ui/search/bee_search.dart @@ -1,3 +1,9 @@ +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/api.dart'; import 'package:aku_new_community/constants/application_objects.dart'; @@ -13,11 +19,6 @@ import 'package:aku_new_community/utils/login_util.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_back_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:velocity_x/velocity_x.dart'; class BeeSearch extends StatefulWidget { BeeSearch({Key? key}) : super(key: key); diff --git a/lib/utils/application_utils.dart b/lib/utils/application_utils.dart index 83ab67f6..98ce55f0 100644 --- a/lib/utils/application_utils.dart +++ b/lib/utils/application_utils.dart @@ -1,5 +1,9 @@ import 'dart:ui'; +import 'package:bot_toast/bot_toast.dart'; +import 'package:equatable/equatable.dart'; +import 'package:get/get.dart'; + import 'package:aku_new_community/gen/assets.gen.dart'; import 'package:aku_new_community/pages/community_introduce/community_introduce_page.dart'; import 'package:aku_new_community/pages/convenient_phone/convenient_phone_page.dart'; @@ -23,9 +27,6 @@ import 'package:aku_new_community/ui/function_and_service/work_order/work_order_ import 'package:aku_new_community/ui/home/application/all_application.dart'; import 'package:aku_new_community/ui/manager/advice/advice_page.dart'; import 'package:aku_new_community/ui/manager/questionnaire/questionnaire_page.dart'; -import 'package:bot_toast/bot_toast.dart'; -import 'package:equatable/equatable.dart'; -import 'package:get/get.dart'; class ApplicationUtil { ApplicationUtil(this.titles); @@ -51,6 +52,7 @@ class ApplicationUtil { return item; } } + return null; } List get allApplications => [ diff --git a/lib/utils/hive_store.dart b/lib/utils/hive_store.dart index 5910cf1c..a0ee2605 100644 --- a/lib/utils/hive_store.dart +++ b/lib/utils/hive_store.dart @@ -1,12 +1,14 @@ +import 'package:flutter/foundation.dart'; + +import 'package:hive/hive.dart'; +import 'package:path_provider/path_provider.dart'; + import 'package:aku_new_community/model/user/province_model.dart'; import 'package:aku_new_community/models/user/user_config_model.dart'; import 'package:aku_new_community/saas_model/login/china_region_model.dart'; import 'package:aku_new_community/saas_model/login/community_model.dart'; import 'package:aku_new_community/saas_model/login/history_login_model.dart'; import 'package:aku_new_community/saas_model/login/picked_city_model.dart'; -import 'package:flutter/foundation.dart'; -import 'package:hive/hive.dart'; -import 'package:path_provider/path_provider.dart'; class HiveStore { static Box? _appBox; diff --git a/lib/utils/login_util.dart b/lib/utils/login_util.dart index 6b42186c..af3907ae 100644 --- a/lib/utils/login_util.dart +++ b/lib/utils/login_util.dart @@ -1,11 +1,11 @@ -import 'package:aku_new_community/pages/sign/login/other_login_page.dart'; -import 'package:aku_new_community/provider/user_provider.dart'; -import 'package:aku_new_community/ui/profile/new_house/my_house_page.dart'; -import 'package:aku_new_community/widget/dialog/certification_dialog.dart'; import 'package:bot_toast/bot_toast.dart'; import 'package:get/get.dart'; import 'package:provider/provider.dart'; +import 'package:aku_new_community/pages/sign/login/other_login_page.dart'; +import 'package:aku_new_community/provider/user_provider.dart'; +import 'package:aku_new_community/ui/profile/new_house/my_house_page.dart'; + /// | 名称 | 函数 | /// |-----|------| /// | 验证登录（登录状态）| LoginnUtil.isLogin | diff --git a/lib/utils/network/net_util.dart b/lib/utils/network/net_util.dart index 10bdc07c..ebe411de 100644 --- a/lib/utils/network/net_util.dart +++ b/lib/utils/network/net_util.dart @@ -1,20 +1,20 @@ import 'dart:io'; import 'dart:typed_data'; +import 'package:bot_toast/bot_toast.dart'; +import 'package:common_utils/common_utils.dart'; +import 'package:dio/dio.dart'; +import 'package:get/get.dart' hide Response, FormData, MultipartFile; +import 'package:power_logger/power_logger.dart'; +import 'package:provider/provider.dart'; + import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/pages/sign/login/other_login_page.dart'; -import 'package:aku_new_community/pages/splash/app_verify_dialog.dart'; import 'package:aku_new_community/provider/user_provider.dart'; import 'package:aku_new_community/utils/developer_util.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/widget/dialog/certification_dialog.dart'; -import 'package:bot_toast/bot_toast.dart'; -import 'package:common_utils/common_utils.dart'; -import 'package:dio/dio.dart'; -import 'package:get/get.dart' hide Response, FormData, MultipartFile; -import 'package:power_logger/power_logger.dart'; -import 'package:provider/provider.dart'; class NetUtil { Dio? _dio; diff --git a/lib/utils/text_utils.dart b/lib/utils/text_utils.dart index 9a8f9a99..fd5dbfb2 100644 --- a/lib/utils/text_utils.dart +++ b/lib/utils/text_utils.dart @@ -4,9 +4,9 @@ class TextUtils { ///white 全空格是否算空字符串 static bool isEmpty(String str, {bool whiteSpace = false}) { if (whiteSpace) { - return str == null || str.trim().length == 0; + return str.trim().length == 0; } - return str == null || str.length == 0; + return str.length == 0; } static bool isNotEmpty(String str, {bool whiteSpace = false}) { diff --git a/lib/utils/websocket/tips_dialog.dart b/lib/utils/websocket/tips_dialog.dart index 2e0f9587..6e4aa76d 100644 --- a/lib/utils/websocket/tips_dialog.dart +++ b/lib/utils/websocket/tips_dialog.dart @@ -1,5 +1,4 @@ import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; diff --git a/lib/utils/websocket/web_socket_util.dart b/lib/utils/websocket/web_socket_util.dart index cbc0ec35..8cdbc200 100644 --- a/lib/utils/websocket/web_socket_util.dart +++ b/lib/utils/websocket/web_socket_util.dart @@ -1,11 +1,12 @@ import 'dart:async'; -import 'package:aku_new_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_new_community/widget/others/user_tool.dart'; + const String baseUri = 'wss://shop.kaidalai.cn/websocket/app'; enum SOCKETSTATUS { CONNECTED, //已连接 diff --git a/lib/widget/animated/OverlayWidget.dart b/lib/widget/animated/OverlayWidget.dart index 1d1083b0..250f2577 100644 --- a/lib/widget/animated/OverlayWidget.dart +++ b/lib/widget/animated/OverlayWidget.dart @@ -1,10 +1,10 @@ -import 'package:aku_new_community/const/resource.dart'; -import 'package:aku_new_community/pages/opening_code_page/opening_code_page.dart'; -import 'package:aku_new_community/utils/headers.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; + import 'package:get/get.dart'; +import 'package:aku_new_community/pages/opening_code_page/opening_code_page.dart'; +import 'package:aku_new_community/utils/headers.dart'; + class OverlayLivingBtnWidget extends StatefulWidget { OverlayLivingBtnWidget({ Key? key, diff --git a/lib/widget/bee_avatar_widget.dart b/lib/widget/bee_avatar_widget.dart index df7213e3..9ed79020 100644 --- a/lib/widget/bee_avatar_widget.dart +++ b/lib/widget/bee_avatar_widget.dart @@ -1,8 +1,10 @@ +import 'package:flutter/material.dart'; + +import 'package:flutter_screenutil/flutter_screenutil.dart'; + import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/gen/assets.gen.dart'; import 'package:aku_new_community/model/common/img_model.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; class BeeAvatarWidget extends StatelessWidget { final List? imgs; diff --git a/lib/widget/bee_image_network.dart b/lib/widget/bee_image_network.dart index 50b36fa7..d795078b 100644 --- a/lib/widget/bee_image_network.dart +++ b/lib/widget/bee_image_network.dart @@ -1,8 +1,10 @@ +import 'package:flutter/material.dart'; + +import 'package:flutter_screenutil/flutter_screenutil.dart'; + import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/gen/assets.gen.dart'; import 'package:aku_new_community/model/common/img_model.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; class BeeImageNetwork extends StatelessWidget { final List? imgs; diff --git a/lib/widget/bee_record_voice_widget.dart b/lib/widget/bee_record_voice_widget.dart index 81c939ae..e8498e62 100644 --- a/lib/widget/bee_record_voice_widget.dart +++ b/lib/widget/bee_record_voice_widget.dart @@ -1,16 +1,18 @@ import 'dart:async'; -import 'package:aku_new_community/base/base_style.dart'; -import 'package:aku_new_community/extensions/num_ext.dart'; -import 'package:aku_new_community/widget/bee_divider.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; + import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_sound/flutter_sound.dart'; import 'package:get/get.dart'; import 'package:permission_handler/permission_handler.dart'; import 'package:velocity_x/src/extensions/string_ext.dart'; +import 'package:aku_new_community/base/base_style.dart'; +import 'package:aku_new_community/extensions/num_ext.dart'; +import 'package:aku_new_community/widget/bee_divider.dart'; + class BeeRecordVoiceWidget extends StatefulWidget { const BeeRecordVoiceWidget({Key? key}) : super(key: key); diff --git a/lib/widget/bee_scaffold.dart b/lib/widget/bee_scaffold.dart index 1aedb100..5282fba8 100644 --- a/lib/widget/bee_scaffold.dart +++ b/lib/widget/bee_scaffold.dart @@ -1,8 +1,9 @@ -import 'package:aku_new_community/constants/app_theme.dart'; -import 'package:aku_new_community/widget/bee_back_button.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:aku_new_community/constants/app_theme.dart'; +import 'package:aku_new_community/widget/bee_back_button.dart'; + class BeeScaffold extends StatelessWidget { final dynamic title; final Widget? body; diff --git a/lib/widget/bottom_sheets/pay_mothod_bottom_sheet.dart b/lib/widget/bottom_sheets/pay_mothod_bottom_sheet.dart index e0533b85..71bb6833 100644 --- a/lib/widget/bottom_sheets/pay_mothod_bottom_sheet.dart +++ b/lib/widget/bottom_sheets/pay_mothod_bottom_sheet.dart @@ -1,5 +1,4 @@ import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:velocity_x/velocity_x.dart'; diff --git a/lib/widget/buttons/bee_long_button.dart b/lib/widget/buttons/bee_long_button.dart index e7cb7c98..ec372dfa 100644 --- a/lib/widget/buttons/bee_long_button.dart +++ b/lib/widget/buttons/bee_long_button.dart @@ -1,8 +1,10 @@ -import 'package:aku_new_community/base/base_style.dart'; import 'package:flutter/material.dart'; + import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:velocity_x/src/extensions/string_ext.dart'; +import 'package:aku_new_community/base/base_style.dart'; + class BeeLongButton extends StatelessWidget { final VoidCallback? onPressed; final String text; diff --git a/lib/widget/buttons/bottom_button.dart b/lib/widget/buttons/bottom_button.dart index 420d8a62..45f88f86 100644 --- a/lib/widget/buttons/bottom_button.dart +++ b/lib/widget/buttons/bottom_button.dart @@ -1,7 +1,9 @@ -import 'package:aku_new_community/base/base_style.dart'; import 'package:flutter/material.dart'; + import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:aku_new_community/base/base_style.dart'; + class BottomButton extends StatelessWidget { final VoidCallback? onPressed; final Widget child; diff --git a/lib/widget/buttons/card_bottom_button.dart b/lib/widget/buttons/card_bottom_button.dart index f31ce103..21196615 100644 --- a/lib/widget/buttons/card_bottom_button.dart +++ b/lib/widget/buttons/card_bottom_button.dart @@ -1,8 +1,10 @@ -import 'package:aku_new_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_new_community/base/base_style.dart'; + //各种卡片下方的button组 class CardBottomButton extends StatelessWidget { final String text; diff --git a/lib/widget/buttons/column_action_button.dart b/lib/widget/buttons/column_action_button.dart index 7a5bbeec..c36ee3a7 100644 --- a/lib/widget/buttons/column_action_button.dart +++ b/lib/widget/buttons/column_action_button.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:velocity_x/velocity_x.dart'; import 'package:aku_new_community/utils/headers.dart'; diff --git a/lib/widget/common_input.dart b/lib/widget/common_input.dart index 1453edfc..0cb92985 100644 --- a/lib/widget/common_input.dart +++ b/lib/widget/common_input.dart @@ -1,4 +1,3 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:aku_new_community/base/base_style.dart'; diff --git a/lib/widget/home/home_sliver_app_bar.dart b/lib/widget/home/home_sliver_app_bar.dart index 26908575..9c99efc8 100644 --- a/lib/widget/home/home_sliver_app_bar.dart +++ b/lib/widget/home/home_sliver_app_bar.dart @@ -1,6 +1,7 @@ -import 'package:aku_new_community/utils/headers.dart'; import 'package:flutter/material.dart'; +import 'package:aku_new_community/utils/headers.dart'; + class HomeSliverAppBar extends StatefulWidget { final List? actions; final Widget? title; diff --git a/lib/widget/line/vertical_line_painter.dart b/lib/widget/line/vertical_line_painter.dart index d98c7b2b..c6d5507a 100644 --- a/lib/widget/line/vertical_line_painter.dart +++ b/lib/widget/line/vertical_line_painter.dart @@ -1,4 +1,3 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; /// 竖线 diff --git a/lib/widget/others/house_head_card.dart b/lib/widget/others/house_head_card.dart index 8255feb3..3c27b224 100644 --- a/lib/widget/others/house_head_card.dart +++ b/lib/widget/others/house_head_card.dart @@ -1,15 +1,14 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.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/const/resource.dart'; import 'package:aku_new_community/provider/user_provider.dart'; import 'package:aku_new_community/ui/profile/new_house/my_house_page.dart'; import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/widget/others/user_tool.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:provider/provider.dart'; -import 'package:velocity_x/velocity_x.dart'; class HouseHeadCard extends StatelessWidget { const HouseHeadCard({ diff --git a/lib/widget/others/rectIndicator.dart b/lib/widget/others/rectIndicator.dart index 00f10a14..fed3cb7e 100644 --- a/lib/widget/others/rectIndicator.dart +++ b/lib/widget/others/rectIndicator.dart @@ -1,4 +1,3 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; class RectIndicator extends StatelessWidget { @@ -21,8 +20,7 @@ class RectIndicator extends StatelessWidget { this.color: Colors.white, required this.radius, this.activeColor: const Color(0xFF3E4750), - }) : assert(count != null && position != null), - super(key: key); + }) : super(key: key); _indicator(bool isActive) { return AnimatedContainer( diff --git a/lib/widget/others/stack_avatar.dart b/lib/widget/others/stack_avatar.dart index efb01df8..3d82dbfa 100644 --- a/lib/widget/others/stack_avatar.dart +++ b/lib/widget/others/stack_avatar.dart @@ -1,6 +1,7 @@ +import 'package:flutter/material.dart'; + import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/widget/bee_image_network.dart'; -import 'package:flutter/material.dart'; class StackAvatar extends StatelessWidget { final List avatars; diff --git a/lib/widget/others/user_tool.dart b/lib/widget/others/user_tool.dart index b6637532..9a410530 100644 --- a/lib/widget/others/user_tool.dart +++ b/lib/widget/others/user_tool.dart @@ -1,8 +1,9 @@ +import 'package:get/get.dart'; +import 'package:provider/provider.dart'; + import 'package:aku_new_community/provider/app_provider.dart'; import 'package:aku_new_community/provider/data_provider.dart'; import 'package:aku_new_community/provider/user_provider.dart'; -import 'package:get/get.dart'; -import 'package:provider/provider.dart'; class UserTool { static UserProvider get userProvider => diff --git a/lib/widget/picker/bee_city_picker.dart b/lib/widget/picker/bee_city_picker.dart index 492fb52d..9a573278 100644 --- a/lib/widget/picker/bee_city_picker.dart +++ b/lib/widget/picker/bee_city_picker.dart @@ -1,10 +1,11 @@ -import 'package:aku_new_community/saas_model/login/china_region_model.dart'; -import 'package:aku_new_community/saas_model/login/picked_city_model.dart'; -import 'package:aku_new_community/utils/hive_store.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; + import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:aku_new_community/saas_model/login/china_region_model.dart'; +import 'package:aku_new_community/saas_model/login/picked_city_model.dart'; +import 'package:aku_new_community/utils/hive_store.dart'; import 'bee_picker_box.dart'; class BeeCityPicker extends StatefulWidget { diff --git a/lib/widget/picker/bee_community_picker.dart b/lib/widget/picker/bee_community_picker.dart index cccefb20..f9bd24f2 100644 --- a/lib/widget/picker/bee_community_picker.dart +++ b/lib/widget/picker/bee_community_picker.dart @@ -1,10 +1,12 @@ -import 'package:aku_new_community/saas_model/login/community_model.dart'; -import 'package:aku_new_community/widget/others/bee_search_text_field.dart'; -import 'package:aku_new_community/widget/picker/bee_picker_box.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; + import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:aku_new_community/saas_model/login/community_model.dart'; +import 'package:aku_new_community/widget/others/bee_search_text_field.dart'; +import 'package:aku_new_community/widget/picker/bee_picker_box.dart'; + class BeeCommunityPicker extends StatefulWidget { static Future pick( BuildContext context, List communities) async { diff --git a/lib/widget/picker/bee_date_picker.dart b/lib/widget/picker/bee_date_picker.dart index cd10cc87..134c5ed1 100644 --- a/lib/widget/picker/bee_date_picker.dart +++ b/lib/widget/picker/bee_date_picker.dart @@ -1,12 +1,10 @@ -import 'package:aku_new_community/widget/picker/bee_month_pick_body.dart'; import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:velocity_x/velocity_x.dart'; import 'package:aku_new_community/widget/picker/bee_custom_picker.dart'; - +import 'package:aku_new_community/widget/picker/bee_month_pick_body.dart'; class BeeDatePicker { static Future pick(DateTime initDate, { diff --git a/lib/widget/picker/bee_day_picker.dart b/lib/widget/picker/bee_day_picker.dart index 23109655..a944735d 100644 --- a/lib/widget/picker/bee_day_picker.dart +++ b/lib/widget/picker/bee_day_picker.dart @@ -1,14 +1,9 @@ -import 'package:aku_new_community/models/facility/facility_type_detail_model.dart'; -import 'package:aku_new_community/ui/community/facility/facility_preorder_date_picker.dart'; -import 'package:aku_new_community/widget/picker/bee_choose_date_picker.dart'; -import 'package:aku_new_community/widget/picker/bee_month_pick_body.dart'; import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:velocity_x/velocity_x.dart'; -import 'package:aku_new_community/widget/picker/bee_custom_picker.dart'; +import 'package:aku_new_community/widget/picker/bee_choose_date_picker.dart'; class BeeDayPicker { diff --git a/lib/widget/picker/bee_house_cascade_picker.dart b/lib/widget/picker/bee_house_cascade_picker.dart index c3dfc950..3e49f6cc 100644 --- a/lib/widget/picker/bee_house_cascade_picker.dart +++ b/lib/widget/picker/bee_house_cascade_picker.dart @@ -1,11 +1,13 @@ -import 'package:aku_new_community/saas_model/my_house/estate_cascade_model.dart'; -import 'package:aku_new_community/saas_model/my_house/picked_house.dart'; -import 'package:aku_new_community/widget/picker/bee_picker_box.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:aku_new_community/saas_model/my_house/estate_cascade_model.dart'; +import 'package:aku_new_community/saas_model/my_house/picked_house.dart'; +import 'package:aku_new_community/widget/picker/bee_picker_box.dart'; + class BeeHouseCascadePicker extends StatefulWidget { final List buildings; diff --git a/lib/widget/picker/bee_house_picker.dart b/lib/widget/picker/bee_house_picker.dart index de927f84..80a3891c 100644 --- a/lib/widget/picker/bee_house_picker.dart +++ b/lib/widget/picker/bee_house_picker.dart @@ -3,7 +3,6 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:provider/provider.dart'; -import 'package:velocity_x/velocity_x.dart'; import 'package:aku_new_community/provider/app_provider.dart'; import 'package:aku_new_community/ui/profile/house/pick_my_house_page.dart'; diff --git a/lib/widget/picker/bee_image_picker.dart b/lib/widget/picker/bee_image_picker.dart index b85b6145..b492ccc9 100644 --- a/lib/widget/picker/bee_image_picker.dart +++ b/lib/widget/picker/bee_image_picker.dart @@ -1,10 +1,11 @@ import 'dart:io'; -import 'package:aku_new_community/utils/headers.dart'; import 'package:flutter/cupertino.dart'; + import 'package:get/get.dart'; import 'package:image_picker/image_picker.dart'; -import 'package:velocity_x/velocity_x.dart'; + +import 'package:aku_new_community/utils/headers.dart'; class BeeImagePicker { static Future pick( diff --git a/lib/widget/picker/bee_image_preview.dart b/lib/widget/picker/bee_image_preview.dart index 700932c7..4d22fc34 100644 --- a/lib/widget/picker/bee_image_preview.dart +++ b/lib/widget/picker/bee_image_preview.dart @@ -1,10 +1,12 @@ import 'dart:io'; -import 'package:aku_new_community/constants/saas_api.dart'; -import 'package:aku_new_community/gen/assets.gen.dart'; import 'package:flutter/material.dart'; + import 'package:get/get.dart'; +import 'package:aku_new_community/constants/saas_api.dart'; +import 'package:aku_new_community/gen/assets.gen.dart'; + ///图片点击放大预览 class BeeImagePreview extends StatefulWidget { static Future toFile({required File file, String? tag}) async { diff --git a/lib/widget/picker/bee_month_pick_body.dart b/lib/widget/picker/bee_month_pick_body.dart index 17b8244d..f04e8dff 100644 --- a/lib/widget/picker/bee_month_pick_body.dart +++ b/lib/widget/picker/bee_month_pick_body.dart @@ -1,13 +1,7 @@ -import 'package:aku_new_community/saas_model/login/china_region_model.dart'; -import 'package:aku_new_community/saas_model/login/picked_city_model.dart'; -import 'package:aku_new_community/utils/hive_store.dart'; import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; + import 'package:flutter_screenutil/flutter_screenutil.dart'; -import '../../constants/saas_api.dart'; -import '../../utils/network/base_list_model.dart'; -import '../../utils/network/net_util.dart'; import 'bee_picker_box.dart'; class BeeMonthPickBody extends StatefulWidget { diff --git a/lib/widget/picker/bee_pick_image_widget.dart b/lib/widget/picker/bee_pick_image_widget.dart index 708adda1..2a5f88f6 100644 --- a/lib/widget/picker/bee_pick_image_widget.dart +++ b/lib/widget/picker/bee_pick_image_widget.dart @@ -1,16 +1,16 @@ -// Dart imports: import 'dart:io'; -import 'package:aku_new_community/gen/assets.gen.dart'; -import 'package:aku_new_community/widget/picker/bee_image_picker.dart'; -import 'package:aku_new_community/widget/picker/bee_image_preview.dart'; -// Package imports: -import 'package:dotted_border/dotted_border.dart'; import 'package:flutter/cupertino.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_new_community/gen/assets.gen.dart'; +import 'package:aku_new_community/widget/picker/bee_image_picker.dart'; +import 'package:aku_new_community/widget/picker/bee_image_preview.dart'; + class BeePickImageWidget extends StatefulWidget { final double? size; final Function(List files) onChanged; diff --git a/lib/widget/views/application_box.dart b/lib/widget/views/application_box.dart index 5c6e8025..ecd4d07d 100644 --- a/lib/widget/views/application_box.dart +++ b/lib/widget/views/application_box.dart @@ -1,7 +1,5 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:aku_new_community/utils/headers.dart'; diff --git a/lib/widget/views/application_view.dart b/lib/widget/views/application_view.dart index d3536472..cf4d6bf1 100644 --- a/lib/widget/views/application_view.dart +++ b/lib/widget/views/application_view.dart @@ -1,11 +1,12 @@ +import 'package:flutter/material.dart'; + +import 'package:bot_toast/bot_toast.dart'; +import 'package:provider/provider.dart'; + import 'package:aku_new_community/constants/application_objects.dart'; import 'package:aku_new_community/provider/app_provider.dart'; import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/utils/login_util.dart'; -import 'package:bot_toast/bot_toast.dart'; -import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; -import 'package:velocity_x/velocity_x.dart'; class ApplicationView extends StatefulWidget { final List? items; diff --git a/lib/widget/views/bee_download_view.dart b/lib/widget/views/bee_download_view.dart index 3aaa4750..bfa61a0d 100644 --- a/lib/widget/views/bee_download_view.dart +++ b/lib/widget/views/bee_download_view.dart @@ -1,11 +1,13 @@ import 'dart:io'; -import 'package:aku_new_community/constants/api.dart'; -import 'package:dio/dio.dart'; import 'package:flutter/material.dart'; + +import 'package:dio/dio.dart'; import 'package:get/get.dart'; import 'package:path_provider/path_provider.dart'; +import 'package:aku_new_community/constants/api.dart'; + class BeeDownloadView extends StatefulWidget { final String? file; diff --git a/lib/widget/views/bee_gradient_divider.dart b/lib/widget/views/bee_gradient_divider.dart index 321502d5..35cb2c63 100644 --- a/lib/widget/views/bee_gradient_divider.dart +++ b/lib/widget/views/bee_gradient_divider.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; + import 'package:flutter_screenutil/flutter_screenutil.dart'; class BeeGradientDivider extends StatelessWidget { diff --git a/lib/widget/views/bee_grid_image_view.dart b/lib/widget/views/bee_grid_image_view.dart index 78b4557f..1a0318e0 100644 --- a/lib/widget/views/bee_grid_image_view.dart +++ b/lib/widget/views/bee_grid_image_view.dart @@ -1,7 +1,8 @@ +import 'package:flutter/material.dart'; + import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/widget/picker/bee_image_preview.dart'; -import 'package:flutter/material.dart'; class BeeGridImageView extends StatelessWidget { final List urls; diff --git a/lib/widget/views/bee_hor_image_view.dart b/lib/widget/views/bee_hor_image_view.dart index b9162a50..0aa12bf4 100644 --- a/lib/widget/views/bee_hor_image_view.dart +++ b/lib/widget/views/bee_hor_image_view.dart @@ -1,12 +1,13 @@ +import 'package:flutter/material.dart'; + +import 'package:flutter_screenutil/flutter_screenutil.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/model/common/img_model.dart'; import 'package:aku_new_community/widget/bee_image_network.dart'; import 'package:aku_new_community/widget/picker/bee_image_preview.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:velocity_x/src/extensions/string_ext.dart'; class BeeHorImageView extends StatefulWidget { final EdgeInsets? padding; diff --git a/lib/widget/views/horizontal_image_view.dart b/lib/widget/views/horizontal_image_view.dart index 44d72a30..37782b0d 100644 --- a/lib/widget/views/horizontal_image_view.dart +++ b/lib/widget/views/horizontal_image_view.dart @@ -1,10 +1,9 @@ -import 'package:aku_new_community/const/resource.dart'; +import 'package:flutter/material.dart'; + + import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/widget/picker/bee_image_preview.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/rendering.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; class HorizontalImageView extends StatelessWidget { final List urls; diff --git a/lib/widget/voice_player.dart b/lib/widget/voice_player.dart index db8bbad7..cdd541a7 100644 --- a/lib/widget/voice_player.dart +++ b/lib/widget/voice_player.dart @@ -1,13 +1,15 @@ import 'dart:async'; import 'dart:math'; -import 'package:aku_new_community/constants/saas_api.dart'; -import 'package:aku_new_community/extensions/num_ext.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; + import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:just_audio/just_audio.dart'; +import 'package:aku_new_community/constants/saas_api.dart'; +import 'package:aku_new_community/extensions/num_ext.dart'; + class VoicePlayer extends StatefulWidget { final String? url; final VoidCallback? onDelete; diff --git a/pubspec.lock b/pubspec.lock index f8605156..81551d49 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -381,6 +381,20 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "5.0.1" + extended_image: + dependency: "direct main" + description: + name: extended_image + url: "https://pub.dartlang.org" + source: hosted + version: "6.1.0" + extended_image_library: + dependency: transitive + description: + name: extended_image_library + url: "https://pub.dartlang.org" + source: hosted + version: "3.2.0" extended_list_library: dependency: transitive description: @@ -613,6 +627,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.13.4" + http_client_helper: + dependency: transitive + description: + name: http_client_helper + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.2" http_multi_server: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 1cba7e5d..e064c77f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -55,7 +55,7 @@ dependencies: #支付宝支付功能 tobias: ^2.4.0+2 #微信支付 - fluwx: ^3.4.2 + fluwx: ^3.8.3 #路由相关 get: ^4.1.4 #各种扩展 @@ -122,6 +122,8 @@ dependencies: flutter_sound: ^9.1.3 #点赞 like_button: ^2.0.4 + #图片扩展 + extended_image: ^6.1.0 dev_dependencies: flutter_test: diff --git a/tool/_project_manage.dart b/tool/_project_manage.dart index 26c077d8..69108ca1 100644 --- a/tool/_project_manage.dart +++ b/tool/_project_manage.dart @@ -1,8 +1,9 @@ part of 'grind.dart'; @Task('import 排序') -void sort() { - Pub.run('import_sorter:main'); +sort() async { + await runAsync('fvm', + arguments: ['flutter', 'pub', 'run', 'import_sorter:main','lib\/*']); } @Task('格式化dart代码')