diff --git a/lib/constants/application_objects.dart b/lib/constants/application_objects.dart index 6a9033c6..3d515f8b 100644 --- a/lib/constants/application_objects.dart +++ b/lib/constants/application_objects.dart @@ -1,5 +1,5 @@ // import 'package:aku_community/widget/bee_scaffold.dart'; -import 'package:aku_community/ui/community/facility/facility_appointment_page.dart'; + import 'package:flutter/material.dart'; import 'package:aku_community/const/resource.dart'; @@ -15,6 +15,7 @@ import 'package:aku_community/pages/setting_page/settings_page.dart'; import 'package:aku_community/pages/things_page/fixed_submit_page.dart'; import 'package:aku_community/pages/visitor_access_page/visitor_access_page.dart'; import 'package:aku_community/ui/community/activity/activity_list_page.dart'; +import 'package:aku_community/ui/community/facility/facility_appointment_page.dart'; import 'package:aku_community/ui/home/application/all_application.dart'; import 'package:aku_community/ui/manager/advice/advice_page.dart'; import 'package:aku_community/ui/manager/questionnaire/questionnaire_page.dart'; diff --git a/lib/generated_plugin_registrant.dart b/lib/generated_plugin_registrant.dart index 222a4e7a..8e0b1cb0 100644 --- a/lib/generated_plugin_registrant.dart +++ b/lib/generated_plugin_registrant.dart @@ -6,13 +6,12 @@ import 'package:device_info_plus_web/device_info_plus_web.dart'; import 'package:firebase_core_web/firebase_core_web.dart'; +import 'package:flutter_web_plugins/flutter_web_plugins.dart'; import 'package:image_picker_for_web/image_picker_for_web.dart'; import 'package:package_info_plus_web/package_info_plus_web.dart'; import 'package:shared_preferences_web/shared_preferences_web.dart'; import 'package:url_launcher_web/url_launcher_web.dart'; -import 'package:flutter_web_plugins/flutter_web_plugins.dart'; - // ignore: public_member_api_docs void registerPlugins(Registrar registrar) { DeviceInfoPlusPlugin.registerWith(registrar); diff --git a/lib/model/manager/article_borrow_detail_model.dart b/lib/model/manager/article_borrow_detail_model.dart index e4f4ad7f..1601e44d 100644 --- a/lib/model/manager/article_borrow_detail_model.dart +++ b/lib/model/manager/article_borrow_detail_model.dart @@ -9,7 +9,7 @@ class ArticleBorrowDetailModel { String get borrowStatus { switch (this.status) { case 1: - return '正常'; + return '正常'; case 2: return '破损'; case 3: diff --git a/lib/models/facility/facility_appointment_model.dart b/lib/models/facility/facility_appointment_model.dart index 6af0eb58..ddb30072 100644 --- a/lib/models/facility/facility_appointment_model.dart +++ b/lib/models/facility/facility_appointment_model.dart @@ -1,4 +1,5 @@ import 'package:json_annotation/json_annotation.dart'; + part 'facility_appointment_model.g.dart'; @JsonSerializable() diff --git a/lib/pages/goods_deto_page/widget/goods_info_card.dart b/lib/pages/goods_deto_page/widget/goods_info_card.dart index f0f93c0f..4b9ee484 100644 --- a/lib/pages/goods_deto_page/widget/goods_info_card.dart +++ b/lib/pages/goods_deto_page/widget/goods_info_card.dart @@ -120,7 +120,8 @@ class GoodsInfoCard extends StatelessWidget { _builTile('物品重量', BeeMap.goodsOutweight[model!.weight!]!), _builTile('出户时间', model!.expectedTime!), _builTile('物品名称', model!.name!), - _builTile('搬运方式', BeeMap.goodsOutApproach[model!.approach!]!), + _builTile( + '搬运方式', BeeMap.goodsOutApproach[model!.approach!]!), ]), ), Container( 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 d118dd5e..faa3aba3 100644 --- a/lib/pages/life_pay/widget/life_pay_detail_page.dart +++ b/lib/pages/life_pay/widget/life_pay_detail_page.dart @@ -157,8 +157,8 @@ class _LifePayDetailPageState extends State { i++) { for (var j = 0; j < - widget.model!.dailyPaymentTypeVos![i].detailedVoList! - .length; + widget.model!.dailyPaymentTypeVos![i] + .detailedVoList!.length; j++) { String id = widget.model!.dailyPaymentTypeVos![i].id.toString() + diff --git a/lib/pages/message_center_page/message_func.dart b/lib/pages/message_center_page/message_func.dart index 91b1c89f..4baabbe0 100644 --- a/lib/pages/message_center_page/message_func.dart +++ b/lib/pages/message_center_page/message_func.dart @@ -4,7 +4,8 @@ import 'package:aku_community/utils/network/base_model.dart'; import 'package:aku_community/utils/network/net_util.dart'; class MessageFunc { - static Future getSystemMessageDetial(int? id) async { + static Future getSystemMessageDetial( + int? id) async { BaseModel baseModel = await NetUtil().get(API.message.getSystemMessageDetial, params: { 'sysMessageId': id, diff --git a/lib/pages/one_alarm/widget/alarm_page.dart b/lib/pages/one_alarm/widget/alarm_page.dart index f93725c5..b8edc0f8 100644 --- a/lib/pages/one_alarm/widget/alarm_page.dart +++ b/lib/pages/one_alarm/widget/alarm_page.dart @@ -125,7 +125,8 @@ class _AlarmPageState extends State { child: Text( (appProvider.location == null) ? '加载中……' - : appProvider.location!['address'] as String, + : appProvider.location!['address'] + as String, style: TextStyle( color: Color(0xff666666), fontSize: 28.sp, diff --git a/lib/pages/personal/personal_page.dart b/lib/pages/personal/personal_page.dart index 15850a5d..edcf57c3 100644 --- a/lib/pages/personal/personal_page.dart +++ b/lib/pages/personal/personal_page.dart @@ -1,4 +1,3 @@ -import 'package:aku_community/ui/profile/order/order_page.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -15,6 +14,7 @@ import 'package:aku_community/pages/personal/user_profile_page.dart'; import 'package:aku_community/pages/sign/sign_in_page.dart'; import 'package:aku_community/painters/user_bottom_bar_painter.dart'; import 'package:aku_community/provider/user_provider.dart'; +import 'package:aku_community/ui/profile/order/order_page.dart'; import 'package:aku_community/utils/headers.dart'; import 'package:aku_community/widget/views/application_view.dart'; diff --git a/lib/pages/sign/sign_in_page.dart b/lib/pages/sign/sign_in_page.dart index b0cc8084..24f24e5e 100644 --- a/lib/pages/sign/sign_in_page.dart +++ b/lib/pages/sign/sign_in_page.dart @@ -1,8 +1,6 @@ import 'dart:async'; import 'dart:ui'; -import 'package:aku_community/widget/bee_back_button.dart'; -import 'package:aku_community/widget/bee_scaffold.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; @@ -28,6 +26,8 @@ import 'package:aku_community/pages/tab_navigator.dart'; import 'package:aku_community/provider/sign_up_provider.dart'; import 'package:aku_community/provider/user_provider.dart'; import 'package:aku_community/utils/headers.dart'; +import 'package:aku_community/widget/bee_back_button.dart'; +import 'package:aku_community/widget/bee_scaffold.dart'; class SignInPage extends StatefulWidget { SignInPage({Key? key}) : super(key: key); diff --git a/lib/pages/tab_navigator.dart b/lib/pages/tab_navigator.dart index 83f06721..cbc4c0a4 100644 --- a/lib/pages/tab_navigator.dart +++ b/lib/pages/tab_navigator.dart @@ -1,12 +1,12 @@ -import 'package:aku_community/ui/market/market_page.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:aku_community/const/resource.dart'; import 'package:aku_community/ui/community/community_views/community_page.dart'; +import 'package:aku_community/ui/market/market_page.dart'; import 'package:aku_community/widget/bee_scaffold.dart'; import 'home/home_page.dart'; import 'personal/personal_page.dart'; diff --git a/lib/pages/things_page/widget/fixed_detail_page.dart b/lib/pages/things_page/widget/fixed_detail_page.dart index 8fcaf755..674dc194 100644 --- a/lib/pages/things_page/widget/fixed_detail_page.dart +++ b/lib/pages/things_page/widget/fixed_detail_page.dart @@ -99,7 +99,8 @@ class _FixedDetailPageState extends State { borderRadius: BorderRadius.circular(36.w), color: Colors.transparent, ), - child: BeeMap.fixTag[model.appReportRepairVo!.type!]!.text.black + child: BeeMap + .fixTag[model.appReportRepairVo!.type!]!.text.black .size(20.sp) .make(), ), diff --git a/lib/provider/app_provider.dart b/lib/provider/app_provider.dart index 314f0dab..6965bd40 100644 --- a/lib/provider/app_provider.dart +++ b/lib/provider/app_provider.dart @@ -1,8 +1,8 @@ -import 'package:collection/collection.dart' show IterableExtension; import 'package:flutter/material.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'; diff --git a/lib/ui/community/activity/activity_card.dart b/lib/ui/community/activity/activity_card.dart index 447f0085..c5817bf0 100644 --- a/lib/ui/community/activity/activity_card.dart +++ b/lib/ui/community/activity/activity_card.dart @@ -77,7 +77,8 @@ class ActivityCard extends StatelessWidget { .make(), ].row().pSymmetric(h: 24.w), [ - StackAvatar(avatars: model!.headImgURls!.map((e) => e.url).toList()), + StackAvatar( + avatars: model!.headImgURls!.map((e) => e.url).toList()), Spacer(), MaterialButton( elevation: 0, diff --git a/lib/ui/community/activity/activity_detail_page.dart b/lib/ui/community/activity/activity_detail_page.dart index 49e7603e..9cacef58 100644 --- a/lib/ui/community/activity/activity_detail_page.dart +++ b/lib/ui/community/activity/activity_detail_page.dart @@ -163,7 +163,8 @@ class _ActivityDetailPageState extends State { child: Row( children: [ StackAvatar( - avatars: model!.headImgURls!.map((e) => e.url).toList(), + avatars: + model!.headImgURls!.map((e) => e.url).toList(), ), Spacer(), '已有${model!.countRegistration}人参加' diff --git a/lib/ui/community/community_views/widgets/chat_card.dart b/lib/ui/community/community_views/widgets/chat_card.dart index 18fe1163..2992981c 100644 --- a/lib/ui/community/community_views/widgets/chat_card.dart +++ b/lib/ui/community/community_views/widgets/chat_card.dart @@ -133,9 +133,10 @@ class _ChatCardState extends State { ), ); } else { - widget.model!.likeNames!.removeWhere((element) => - element.name == - userProvider.userInfoModel!.nickName); + widget.model!.likeNames!.removeWhere( + (element) => + element.name == + userProvider.userInfoModel!.nickName); } widget.model!.isLike = (widget.model!.isLike == 1) ? 0 : 1; @@ -298,8 +299,8 @@ class _ChatCardState extends State { clipBehavior: Clip.antiAlias, child: FadeInImage.assetNetwork( placeholder: R.ASSETS_IMAGES_PLACEHOLDER_WEBP, - image: - API.image(ImgModel.first(widget.model!.headSculptureImgUrl)), + image: API + .image(ImgModel.first(widget.model!.headSculptureImgUrl)), height: 86.w, width: 86.w, fit: BoxFit.cover, diff --git a/lib/ui/community/facility/facility_appointment_page.dart b/lib/ui/community/facility/facility_appointment_page.dart index 624d8c12..77638af7 100644 --- a/lib/ui/community/facility/facility_appointment_page.dart +++ b/lib/ui/community/facility/facility_appointment_page.dart @@ -1,6 +1,7 @@ +import 'package:flutter/material.dart'; + import 'package:aku_community/widget/bee_scaffold.dart'; import 'package:aku_community/widget/tab_bar/bee_tab_bar.dart'; -import 'package:flutter/material.dart'; class FacilityAppointmentPage extends StatefulWidget { FacilityAppointmentPage({Key? key}) : super(key: key); diff --git a/lib/ui/community/facility/facility_type_card.dart b/lib/ui/community/facility/facility_type_card.dart index 91625b7c..597adb30 100644 --- a/lib/ui/community/facility/facility_type_card.dart +++ b/lib/ui/community/facility/facility_type_card.dart @@ -1,7 +1,8 @@ +import 'package:flutter/material.dart'; + import 'package:aku_community/base/base_style.dart'; import 'package:aku_community/constants/api.dart'; import 'package:aku_community/model/common/img_model.dart'; -import 'package:flutter/material.dart'; import 'package:aku_community/models/facility/facility_type_model.dart'; import 'package:aku_community/utils/headers.dart'; diff --git a/lib/ui/community/facility/pick_facility_page.dart b/lib/ui/community/facility/pick_facility_page.dart index cb0ab063..d520e976 100644 --- a/lib/ui/community/facility/pick_facility_page.dart +++ b/lib/ui/community/facility/pick_facility_page.dart @@ -1,12 +1,13 @@ -import 'package:aku_community/constants/api.dart'; -import 'package:aku_community/pages/things_page/widget/bee_list_view.dart'; -import 'package:aku_community/ui/community/facility/facility_type_card.dart'; import 'package:flutter/material.dart'; -import 'package:aku_community/widget/bee_scaffold.dart'; -import 'package:aku_community/models/facility/facility_type_model.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; + +import 'package:aku_community/constants/api.dart'; +import 'package:aku_community/models/facility/facility_type_model.dart'; +import 'package:aku_community/pages/things_page/widget/bee_list_view.dart'; +import 'package:aku_community/ui/community/facility/facility_type_card.dart'; import 'package:aku_community/utils/headers.dart'; +import 'package:aku_community/widget/bee_scaffold.dart'; class PickFacilityPage extends StatefulWidget { PickFacilityPage({Key? key}) : super(key: key); diff --git a/lib/ui/manager/advice/advice_card.dart b/lib/ui/manager/advice/advice_card.dart index bd5cc639..dc1ae8ef 100644 --- a/lib/ui/manager/advice/advice_card.dart +++ b/lib/ui/manager/advice/advice_card.dart @@ -79,8 +79,13 @@ class _AdviceCardState extends State { thickness: 1.w, color: Color(0xFFE8E8E8), ), - widget.model!.content!.text.size(28.w).black.make().pSymmetric(h: 28.w), - HorizontalImageView(widget.model!.imgUrls!.map((e) => e.url).toList()), + widget.model!.content!.text + .size(28.w) + .black + .make() + .pSymmetric(h: 28.w), + HorizontalImageView( + widget.model!.imgUrls!.map((e) => e.url).toList()), widget.model!.score == null ? SizedBox() : Divider( diff --git a/lib/ui/market/_market_data.dart b/lib/ui/market/_market_data.dart index f7002703..1805052e 100644 --- a/lib/ui/market/_market_data.dart +++ b/lib/ui/market/_market_data.dart @@ -1,9 +1,11 @@ -import 'package:aku_community/utils/headers.dart'; -import 'package:aku_community/widget/bee_scaffold.dart'; import 'package:flutter/material.dart'; + import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:get/get.dart'; +import 'package:aku_community/utils/headers.dart'; +import 'package:aku_community/widget/bee_scaffold.dart'; + @Deprecated('NO NEED THIS CLASS IN FUTURE') class MarketData { final String name; diff --git a/lib/ui/market/market_page.dart b/lib/ui/market/market_page.dart index dfe8007b..05826abf 100644 --- a/lib/ui/market/market_page.dart +++ b/lib/ui/market/market_page.dart @@ -1,8 +1,10 @@ +import 'package:flutter/material.dart'; + +import 'package:flutter_screenutil/flutter_screenutil.dart'; + import 'package:aku_community/ui/market/_market_data.dart'; import 'package:aku_community/widget/bee_scaffold.dart'; import 'package:aku_community/widget/tab_bar/bee_tab_bar.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; class MarketPage extends StatefulWidget { MarketPage({Key? key}) : super(key: key); diff --git a/lib/ui/profile/house/add_house_page.dart b/lib/ui/profile/house/add_house_page.dart index 26832544..a595a908 100644 --- a/lib/ui/profile/house/add_house_page.dart +++ b/lib/ui/profile/house/add_house_page.dart @@ -185,7 +185,8 @@ class _AddHousePageState extends State { text: _item?.houseName, hintText: '请选择楼栋、单元、室', onTap: () async { - HouseItem? tempItem = await Get.to(() => PickBuildingPage()); + HouseItem? tempItem = + await Get.to(() => PickBuildingPage()); if (tempItem != null) _item = tempItem; setState(() {}); }, @@ -271,7 +272,8 @@ class _AddHousePageState extends State { if (_roleType == 3) { params.putIfAbsent( 'effectiveTimeStart', () => NetUtil.getDate(_range!.start)); - params.putIfAbsent('effectiveTimeEnd', () => NetUtil.getDate(_range!.end)); + params.putIfAbsent( + 'effectiveTimeEnd', () => NetUtil.getDate(_range!.end)); } VoidCallback cancel = BotToast.showLoading(); BaseModel model = await NetUtil().post( diff --git a/lib/ui/profile/house/house_card.dart b/lib/ui/profile/house/house_card.dart index 70fde43e..a50ffedc 100644 --- a/lib/ui/profile/house/house_card.dart +++ b/lib/ui/profile/house/house_card.dart @@ -24,12 +24,12 @@ class HouseCard extends StatelessWidget { const HouseCard.fail({ Key? key, required this.model, - }) : type = CardAuthType.FAIL, + }) : type = CardAuthType.FAIL, super(key: key); const HouseCard.success({ Key? key, required this.model, - }) : type = CardAuthType.SUCCESS, + }) : type = CardAuthType.SUCCESS, super(key: key); String get _assetPath { diff --git a/lib/ui/profile/house/house_item.dart b/lib/ui/profile/house/house_item.dart index 8a47f8ee..6c94a23e 100644 --- a/lib/ui/profile/house/house_item.dart +++ b/lib/ui/profile/house/house_item.dart @@ -1,4 +1,3 @@ - import 'package:aku_community/model/user/pick_building_model.dart'; class HouseItem { diff --git a/lib/ui/profile/order/order_page.dart b/lib/ui/profile/order/order_page.dart index e26a699c..a17ff6d1 100644 --- a/lib/ui/profile/order/order_page.dart +++ b/lib/ui/profile/order/order_page.dart @@ -1,6 +1,7 @@ +import 'package:flutter/material.dart'; + import 'package:aku_community/widget/bee_scaffold.dart'; import 'package:aku_community/widget/tab_bar/bee_tab_bar.dart'; -import 'package:flutter/material.dart'; class OrderPage extends StatefulWidget { final int initIndex; diff --git a/lib/widget/picker/bee_image_picker.dart b/lib/widget/picker/bee_image_picker.dart index eca5cbfd..0e80875b 100644 --- a/lib/widget/picker/bee_image_picker.dart +++ b/lib/widget/picker/bee_image_picker.dart @@ -10,7 +10,9 @@ import 'package:aku_community/utils/headers.dart'; class BeeImagePicker { static Future pick( - {required String title, double maxWidth = 1000, double maxHeight = 1000}) async { + {required String title, + double maxWidth = 1000, + double maxHeight = 1000}) async { PickedFile? file = await Get.bottomSheet(CupertinoActionSheet( title: title.text.isIntrinsic.make(), actions: [