From 591174f409d1ebf314ab2bfd22cef3cee78aa3d2 Mon Sep 17 00:00:00 2001 From: zhangmeng <494089941@qq.com> Date: Fri, 24 Dec 2021 14:14:21 +0800 Subject: [PATCH] message center --- .fvm/fvm_config.json | 2 +- android/app/build.gradle | 6 +- ios/Runner/Info.plist | 2 + lib/gen/assets.gen.dart | 1143 +++++++++++++++++ lib/generated_plugin_registrant.dart | 1 + lib/main.dart | 6 - .../community_introduce_model.g.dart | 21 +- .../electronic_commerc_category_model.g.dart | 11 +- .../electronic_commerc_detail_model.g.dart | 23 +- .../electronic_commerc_list_model.g.dart | 19 +- .../express_package_list_model.g.dart | 25 +- .../facility_appointment_model.g.dart | 25 +- .../facility_order_date_list_model.g.dart | 15 +- .../facility_type_detail_model.g.dart | 11 +- .../facility/facility_type_model.g.dart | 23 +- lib/models/house/lease_detail_model.g.dart | 75 +- lib/models/house/lease_echo_model.g.dart | 15 +- lib/models/house/lease_fee_list_model.g.dart | 17 +- lib/models/house/lease_list_model.g.dart | 17 +- .../house_keeping_list_model.g.dart | 59 +- .../house_keeping_process_model.g.dart | 21 +- .../life_pay/life_pay_list_model.g.dart | 88 +- .../life_pay/life_pay_record_model.g.dart | 25 +- .../life_pay/share_pay_list_model.g.dart | 52 +- .../life_pay/share_pay_record_model.g.dart | 25 +- .../manage/fix_report/fix_detail_model.g.dart | 105 +- lib/models/market/goods_detail_model.g.dart | 47 +- lib/models/market/goods_item.g.dart | 24 +- .../market/market_category_model.g.dart | 17 +- .../market/order/my_order_list_model.g.dart | 61 +- .../market/order/order_detail_model.g.dart | 61 +- .../shop_car/shop_car_list_model.g.dart | 29 +- lib/models/message/announce_list_model.dart | 41 + lib/models/message/announce_list_model.g.dart | 15 + lib/models/message/reply_list_model.dart | 27 + lib/models/message/reply_list_model.g.dart | 18 + .../new_renovation_list_model.g.dart | 70 +- lib/models/news/news_category_model.g.dart | 11 +- lib/models/news/news_detail_model.g.dart | 21 +- lib/models/news/news_item_model.g.dart | 19 +- lib/models/pay/pay_model.g.dart | 39 +- lib/models/search/search_model.g.dart | 26 +- .../service_browse_list_mode.g.dart | 15 +- .../user/passed_house_list_model.g.dart | 22 +- lib/models/user/user_info_model.g.dart | 25 +- .../event_activity/voting_detail_page.dart | 1 - .../deto_create_page/widget/common_radio.dart | 2 +- .../borrow/borrow_goods_detail_page.dart | 2 +- .../retrun/return_goods_detail_page.dart | 2 +- .../announce/announce_card.dart | 85 ++ .../announce/announce_view.dart | 190 +++ .../message_center_page.dart | 151 +-- .../reply/replay_view.dart | 46 + .../message_center_page/reply/reply_card.dart | 54 + .../thumbs_up/thumbs_up_card.dart | 51 + .../thumbs_up/thumbs_up_view.dart | 39 + lib/pages/one_alarm/widget/alarm_page.dart | 2 + lib/pages/sign/login_page.dart | 62 + .../sign/sign_up/sign_up_verify_page.dart | 1 - lib/pages/splash/splash_page.dart | 5 +- lib/pages/tab_navigator.dart | 1 - lib/widget/buttons/all_select_button.dart | 51 + lib/widget/buttons/radio_button.dart | 2 +- pubspec.lock | 76 +- pubspec.yaml | 13 +- tool/_project_manage.dart | 25 +- tool/config.dart | 6 +- 67 files changed, 2533 insertions(+), 754 deletions(-) create mode 100644 lib/gen/assets.gen.dart create mode 100644 lib/models/message/announce_list_model.dart create mode 100644 lib/models/message/announce_list_model.g.dart create mode 100644 lib/models/message/reply_list_model.dart create mode 100644 lib/models/message/reply_list_model.g.dart create mode 100644 lib/pages/message_center_page/announce/announce_card.dart create mode 100644 lib/pages/message_center_page/announce/announce_view.dart create mode 100644 lib/pages/message_center_page/reply/replay_view.dart create mode 100644 lib/pages/message_center_page/reply/reply_card.dart create mode 100644 lib/pages/message_center_page/thumbs_up/thumbs_up_card.dart create mode 100644 lib/pages/message_center_page/thumbs_up/thumbs_up_view.dart create mode 100644 lib/pages/sign/login_page.dart create mode 100644 lib/widget/buttons/all_select_button.dart diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json index de7d3977..af9d3d51 100644 --- a/.fvm/fvm_config.json +++ b/.fvm/fvm_config.json @@ -1,4 +1,4 @@ { - "flutterSdkVersion": "2.0.2", + "flutterSdkVersion": "2.8.0", "flavors": {} } \ No newline at end of file diff --git a/android/app/build.gradle b/android/app/build.gradle index 0648f79b..0c8dcf6d 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -51,8 +51,8 @@ android { versionName flutterVersionName manifestPlaceholders = [ JPUSH_PKGNAME : applicationId, - JPUSH_APPKEY : "00e20fef79ee804d5c9abb54", - JPUSH_CHANNEL : "developer-default", + JPUSH_APPKEY : "5f42cbb15abcdda6f8aeb925", + JPUSH_CHANNEL : "developer-default", ] } @@ -95,7 +95,7 @@ flutter { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - //implementation 'com.amap.api:3dmap:latest.integration' + implementation 'com.amap.api:3dmap:latest.integration' implementation 'com.amap.api:location:5.2.0' implementation 'com.android.support:multidex:2.0.1' diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 66a2c5ff..11e37ee6 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -4,6 +4,8 @@ CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + 小蜜蜂 CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier diff --git a/lib/gen/assets.gen.dart b/lib/gen/assets.gen.dart new file mode 100644 index 00000000..01077e8f --- /dev/null +++ b/lib/gen/assets.gen.dart @@ -0,0 +1,1143 @@ +/// GENERATED CODE - DO NOT MODIFY BY HAND +/// ***************************************************** +/// FlutterGen +/// ***************************************************** + +// ignore_for_file: directives_ordering,unnecessary_import + +import 'package:flutter/widgets.dart'; + +class $AssetsApplicationsGen { + const $AssetsApplicationsGen(); + + /// File path: assets/applications/advice.png + AssetGenImage get advice => + const AssetGenImage('assets/applications/advice.png'); + + /// File path: assets/applications/all_app.png + AssetGenImage get allApp => + const AssetGenImage('assets/applications/all_app.png'); + + /// File path: assets/applications/borrow.png + AssetGenImage get borrow => + const AssetGenImage('assets/applications/borrow.png'); + + /// File path: assets/applications/box.png + AssetGenImage get box => const AssetGenImage('assets/applications/box.png'); + + /// File path: assets/applications/committee.png + AssetGenImage get committee => + const AssetGenImage('assets/applications/committee.png'); + + /// File path: assets/applications/community_phone.png + AssetGenImage get communityPhone => + const AssetGenImage('assets/applications/community_phone.png'); + + /// File path: assets/applications/complaint.png + AssetGenImage get complaint => + const AssetGenImage('assets/applications/complaint.png'); + + /// File path: assets/applications/decoration.png + AssetGenImage get decoration => + const AssetGenImage('assets/applications/decoration.png'); + + /// File path: assets/applications/digital.png + AssetGenImage get digital => + const AssetGenImage('assets/applications/digital.png'); + + /// File path: assets/applications/door_code.png + AssetGenImage get doorCode => + const AssetGenImage('assets/applications/door_code.png'); + + /// File path: assets/applications/fix.png + AssetGenImage get fix => const AssetGenImage('assets/applications/fix.png'); + + /// File path: assets/applications/goods_out.png + AssetGenImage get goodsOut => + const AssetGenImage('assets/applications/goods_out.png'); + + /// File path: assets/applications/home_live.png + AssetGenImage get homeLive => + const AssetGenImage('assets/applications/home_live.png'); + + /// File path: assets/applications/hospital.png + AssetGenImage get hospital => + const AssetGenImage('assets/applications/hospital.png'); + + /// File path: assets/applications/makeup.png + AssetGenImage get makeup => + const AssetGenImage('assets/applications/makeup.png'); + + /// File path: assets/applications/oepn_door.png + AssetGenImage get oepnDoor => + const AssetGenImage('assets/applications/oepn_door.png'); + + /// File path: assets/applications/payment.png + AssetGenImage get payment => + const AssetGenImage('assets/applications/payment.png'); + + /// File path: assets/applications/police.png + AssetGenImage get police => + const AssetGenImage('assets/applications/police.png'); + + /// File path: assets/applications/question.png + AssetGenImage get question => + const AssetGenImage('assets/applications/question.png'); + + /// File path: assets/applications/snack.png + AssetGenImage get snack => + const AssetGenImage('assets/applications/snack.png'); + + /// File path: assets/applications/tool_bmts.png + AssetGenImage get toolBmts => + const AssetGenImage('assets/applications/tool_bmts.png'); + + /// File path: assets/applications/toy.png + AssetGenImage get toy => const AssetGenImage('assets/applications/toy.png'); + + /// File path: assets/applications/transfer.png + AssetGenImage get transfer => + const AssetGenImage('assets/applications/transfer.png'); + + /// File path: assets/applications/visitor_invite.png + AssetGenImage get visitorInvite => + const AssetGenImage('assets/applications/visitor_invite.png'); + + /// File path: assets/applications/vote.png + AssetGenImage get vote => const AssetGenImage('assets/applications/vote.png'); + + /// File path: assets/applications/wine.png + AssetGenImage get wine => const AssetGenImage('assets/applications/wine.png'); +} + +class $AssetsIconsGen { + const $AssetsIconsGen(); + + /// File path: assets/icons/add.png + AssetGenImage get add => const AssetGenImage('assets/icons/add.png'); + + /// File path: assets/icons/alarm.png + AssetGenImage get alarm => const AssetGenImage('assets/icons/alarm.png'); + + /// File path: assets/icons/alipay_round.png + AssetGenImage get alipayRound => + const AssetGenImage('assets/icons/alipay_round.png'); + + /// File path: assets/icons/app_add.png + AssetGenImage get appAdd => const AssetGenImage('assets/icons/app_add.png'); + + /// File path: assets/icons/app_alarm.png + AssetGenImage get appAlarm => + const AssetGenImage('assets/icons/app_alarm.png'); + + /// File path: assets/icons/app_reduce.png + AssetGenImage get appReduce => + const AssetGenImage('assets/icons/app_reduce.png'); + + /// File path: assets/icons/appointment-address.png + AssetGenImage get appointmentAddress => + const AssetGenImage('assets/icons/appointment-address.png'); + + /// File path: assets/icons/appointment-code.png + AssetGenImage get appointmentCode => + const AssetGenImage('assets/icons/appointment-code.png'); + + /// File path: assets/icons/appointment_date.png + AssetGenImage get appointmentDate => + const AssetGenImage('assets/icons/appointment_date.png'); + + /// File path: assets/icons/article_count.png + AssetGenImage get articleCount => + const AssetGenImage('assets/icons/article_count.png'); + + /// File path: assets/icons/article_name.png + AssetGenImage get articleName => + const AssetGenImage('assets/icons/article_name.png'); + + /// File path: assets/icons/borrow_failure.png + AssetGenImage get borrowFailure => + const AssetGenImage('assets/icons/borrow_failure.png'); + + /// File path: assets/icons/borrow_status.png + AssetGenImage get borrowStatus => + const AssetGenImage('assets/icons/borrow_status.png'); + + /// File path: assets/icons/borrow_success.png + AssetGenImage get borrowSuccess => + const AssetGenImage('assets/icons/borrow_success.png'); + + /// File path: assets/icons/change.png + AssetGenImage get change => const AssetGenImage('assets/icons/change.png'); + + /// File path: assets/icons/collect.png + AssetGenImage get collect => const AssetGenImage('assets/icons/collect.png'); + + /// File path: assets/icons/collection_setting.png + AssetGenImage get collectionSetting => + const AssetGenImage('assets/icons/collection_setting.png'); + + /// File path: assets/icons/collection_share.png + AssetGenImage get collectionShare => + const AssetGenImage('assets/icons/collection_share.png'); + + /// File path: assets/icons/comment_notice.png + AssetGenImage get commentNotice => + const AssetGenImage('assets/icons/comment_notice.png'); + + /// File path: assets/icons/commerc.png + AssetGenImage get commerc => const AssetGenImage('assets/icons/commerc.png'); + + /// File path: assets/icons/community_comment.png + AssetGenImage get communityComment => + const AssetGenImage('assets/icons/community_comment.png'); + + /// File path: assets/icons/community_comment_is.png + AssetGenImage get communityCommentIs => + const AssetGenImage('assets/icons/community_comment_is.png'); + + /// File path: assets/icons/community_like.png + AssetGenImage get communityLike => + const AssetGenImage('assets/icons/community_like.png'); + + /// File path: assets/icons/community_like_is.png + AssetGenImage get communityLikeIs => + const AssetGenImage('assets/icons/community_like_is.png'); + + /// File path: assets/icons/complaint.png + AssetGenImage get complaint => + const AssetGenImage('assets/icons/complaint.png'); + + /// File path: assets/icons/consult.png + AssetGenImage get consult => const AssetGenImage('assets/icons/consult.png'); + + /// File path: assets/icons/contract.png + AssetGenImage get contract => + const AssetGenImage('assets/icons/contract.png'); + + /// File path: assets/icons/delete.png + AssetGenImage get delete => const AssetGenImage('assets/icons/delete.png'); + + /// File path: assets/icons/device_alarm.png + AssetGenImage get deviceAlarm => + const AssetGenImage('assets/icons/device_alarm.png'); + + /// File path: assets/icons/examine.png + AssetGenImage get examine => const AssetGenImage('assets/icons/examine.png'); + + /// File path: assets/icons/eye_close.png + AssetGenImage get eyeClose => + const AssetGenImage('assets/icons/eye_close.png'); + + /// File path: assets/icons/facility.png + AssetGenImage get facility => + const AssetGenImage('assets/icons/facility.png'); + + /// File path: assets/icons/file.png + AssetGenImage get file => const AssetGenImage('assets/icons/file.png'); + + /// File path: assets/icons/filter.png + AssetGenImage get filter => const AssetGenImage('assets/icons/filter.png'); + + /// File path: assets/icons/finish.png + AssetGenImage get finish => const AssetGenImage('assets/icons/finish.png'); + + /// File path: assets/icons/fire_alarm.png + AssetGenImage get fireAlarm => + const AssetGenImage('assets/icons/fire_alarm.png'); + + /// File path: assets/icons/func_all.png + AssetGenImage get funcAll => const AssetGenImage('assets/icons/func_all.png'); + + /// File path: assets/icons/func_bmdh.png + AssetGenImage get funcBmdh => + const AssetGenImage('assets/icons/func_bmdh.png'); + + /// File path: assets/icons/func_bsbx.png + AssetGenImage get funcBsbx => + const AssetGenImage('assets/icons/func_bsbx.png'); + + /// File path: assets/icons/func_dlxx.png + AssetGenImage get funcDlxx => + const AssetGenImage('assets/icons/func_dlxx.png'); + + /// File path: assets/icons/func_dzsw.png + AssetGenImage get funcDzsw => + const AssetGenImage('assets/icons/func_dzsw.png'); + + /// File path: assets/icons/func_fkyq.png + AssetGenImage get funcFkyq => + const AssetGenImage('assets/icons/func_fkyq.png'); + + /// File path: assets/icons/func_fwll.png + AssetGenImage get funcFwll => + const AssetGenImage('assets/icons/func_fwll.png'); + + /// File path: assets/icons/func_gife.png + AssetGenImage get funcGife => + const AssetGenImage('assets/icons/func_gife.png'); + + /// File path: assets/icons/func_hdtp.png + AssetGenImage get funcHdtp => + const AssetGenImage('assets/icons/func_hdtp.png'); + + /// File path: assets/icons/func_jhgl.png + AssetGenImage get funcJhgl => + const AssetGenImage('assets/icons/func_jhgl.png'); + + /// File path: assets/icons/func_jyzx.png + AssetGenImage get funcJyzx => + const AssetGenImage('assets/icons/func_jyzx.png'); + + /// File path: assets/icons/func_jzfw.png + AssetGenImage get funcJzfw => + const AssetGenImage('assets/icons/func_jzfw.png'); + + /// File path: assets/icons/func_kdbg.png + AssetGenImage get funcKdbg => + const AssetGenImage('assets/icons/func_kdbg.png'); + + /// File path: assets/icons/func_kmm.png + AssetGenImage get funcKmm => const AssetGenImage('assets/icons/func_kmm.png'); + + /// File path: assets/icons/func_shjf.png + AssetGenImage get funcShjf => + const AssetGenImage('assets/icons/func_shjf.png'); + + /// File path: assets/icons/func_sqjs.png + AssetGenImage get funcSqjs => + const AssetGenImage('assets/icons/func_sqjs.png'); + + /// File path: assets/icons/func_ssyy.png + AssetGenImage get funcSsyy => + const AssetGenImage('assets/icons/func_ssyy.png'); + + /// File path: assets/icons/func_tsby.png + AssetGenImage get funcTsby => + const AssetGenImage('assets/icons/func_tsby.png'); + + /// File path: assets/icons/func_wjdc.png + AssetGenImage get funcWjdc => + const AssetGenImage('assets/icons/func_wjdc.png'); + + /// File path: assets/icons/func_wpch.png + AssetGenImage get funcWpch => + const AssetGenImage('assets/icons/func_wpch.png'); + + /// File path: assets/icons/func_yjbj.png + AssetGenImage get funcYjbj => + const AssetGenImage('assets/icons/func_yjbj.png'); + + /// File path: assets/icons/func_ywh.png + AssetGenImage get funcYwh => const AssetGenImage('assets/icons/func_ywh.png'); + + /// File path: assets/icons/func_zbqy.png + AssetGenImage get funcZbqy => + const AssetGenImage('assets/icons/func_zbqy.png'); + + /// File path: assets/icons/func_zfsm.png + AssetGenImage get funcZfsm => + const AssetGenImage('assets/icons/func_zfsm.png'); + + /// File path: assets/icons/func_zxgl.png + AssetGenImage get funcZxgl => + const AssetGenImage('assets/icons/func_zxgl.png'); + + /// File path: assets/icons/goods_borrow.png + AssetGenImage get goodsBorrow => + const AssetGenImage('assets/icons/goods_borrow.png'); + + /// File path: assets/icons/goods_return.png + AssetGenImage get goodsReturn => + const AssetGenImage('assets/icons/goods_return.png'); + + /// File path: assets/icons/groupbuy_tab_selected.png + AssetGenImage get groupbuyTabSelected => + const AssetGenImage('assets/icons/groupbuy_tab_selected.png'); + + /// File path: assets/icons/groupbuy_tab_unselected.png + AssetGenImage get groupbuyTabUnselected => + const AssetGenImage('assets/icons/groupbuy_tab_unselected.png'); + + /// File path: assets/icons/hot_fire.png + AssetGenImage get hotFire => const AssetGenImage('assets/icons/hot_fire.png'); + + /// File path: assets/icons/house.png + AssetGenImage get house => const AssetGenImage('assets/icons/house.png'); + + /// File path: assets/icons/house_keeping.png + AssetGenImage get houseKeeping => + const AssetGenImage('assets/icons/house_keeping.png'); + + /// File path: assets/icons/icon_address_edit.png + AssetGenImage get iconAddressEdit => + const AssetGenImage('assets/icons/icon_address_edit.png'); + + /// File path: assets/icons/icon_address_isdefault.png + AssetGenImage get iconAddressIsdefault => + const AssetGenImage('assets/icons/icon_address_isdefault.png'); + + /// File path: assets/icons/icon_address_not.png + AssetGenImage get iconAddressNot => + const AssetGenImage('assets/icons/icon_address_not.png'); + + /// File path: assets/icons/icon_back.png + AssetGenImage get iconBack => + const AssetGenImage('assets/icons/icon_back.png'); + + /// File path: assets/icons/icon_change_grid.png + AssetGenImage get iconChangeGrid => + const AssetGenImage('assets/icons/icon_change_grid.png'); + + /// File path: assets/icons/icon_change_list.png + AssetGenImage get iconChangeList => + const AssetGenImage('assets/icons/icon_change_list.png'); + + /// File path: assets/icons/icon_comment.png + AssetGenImage get iconComment => + const AssetGenImage('assets/icons/icon_comment.png'); + + /// File path: assets/icons/icon_community_push.png + AssetGenImage get iconCommunityPush => + const AssetGenImage('assets/icons/icon_community_push.png'); + + /// File path: assets/icons/icon_favor_choose.png + AssetGenImage get iconFavorChoose => + const AssetGenImage('assets/icons/icon_favor_choose.png'); + + /// File path: assets/icons/icon_good_car.png + AssetGenImage get iconGoodCar => + const AssetGenImage('assets/icons/icon_good_car.png'); + + /// File path: assets/icons/icon_good_favor.png + AssetGenImage get iconGoodFavor => + const AssetGenImage('assets/icons/icon_good_favor.png'); + + /// File path: assets/icons/icon_good_location.png + AssetGenImage get iconGoodLocation => + const AssetGenImage('assets/icons/icon_good_location.png'); + + /// File path: assets/icons/icon_good_my.png + AssetGenImage get iconGoodMy => + const AssetGenImage('assets/icons/icon_good_my.png'); + + /// File path: assets/icons/icon_logistics.png + AssetGenImage get iconLogistics => + const AssetGenImage('assets/icons/icon_logistics.png'); + + /// File path: assets/icons/icon_main_all.png + AssetGenImage get iconMainAll => + const AssetGenImage('assets/icons/icon_main_all.png'); + + /// File path: assets/icons/icon_main_consult.png + AssetGenImage get iconMainConsult => + const AssetGenImage('assets/icons/icon_main_consult.png'); + + /// File path: assets/icons/icon_main_find.png + AssetGenImage get iconMainFind => + const AssetGenImage('assets/icons/icon_main_find.png'); + + /// File path: assets/icons/icon_main_fix.png + AssetGenImage get iconMainFix => + const AssetGenImage('assets/icons/icon_main_fix.png'); + + /// File path: assets/icons/icon_main_invite.png + AssetGenImage get iconMainInvite => + const AssetGenImage('assets/icons/icon_main_invite.png'); + + /// File path: assets/icons/icon_main_location.png + AssetGenImage get iconMainLocation => + const AssetGenImage('assets/icons/icon_main_location.png'); + + /// File path: assets/icons/icon_main_message.png + AssetGenImage get iconMainMessage => + const AssetGenImage('assets/icons/icon_main_message.png'); + + /// File path: assets/icons/icon_main_open.png + AssetGenImage get iconMainOpen => + const AssetGenImage('assets/icons/icon_main_open.png'); + + /// File path: assets/icons/icon_main_pay.png + AssetGenImage get iconMainPay => + const AssetGenImage('assets/icons/icon_main_pay.png'); + + /// File path: assets/icons/icon_main_police.png + AssetGenImage get iconMainPolice => + const AssetGenImage('assets/icons/icon_main_police.png'); + + /// File path: assets/icons/icon_main_subscribe.png + AssetGenImage get iconMainSubscribe => + const AssetGenImage('assets/icons/icon_main_subscribe.png'); + + /// File path: assets/icons/icon_market_success.png + AssetGenImage get iconMarketSuccess => + const AssetGenImage('assets/icons/icon_market_success.png'); + + /// File path: assets/icons/icon_more.png + AssetGenImage get iconMore => + const AssetGenImage('assets/icons/icon_more.png'); + + /// File path: assets/icons/icon_more_black.png + AssetGenImage get iconMoreBlack => + const AssetGenImage('assets/icons/icon_more_black.png'); + + /// File path: assets/icons/icon_my_car.png + AssetGenImage get iconMyCar => + const AssetGenImage('assets/icons/icon_my_car.png'); + + /// File path: assets/icons/icon_my_carSeat.png + AssetGenImage get iconMyCarSeat => + const AssetGenImage('assets/icons/icon_my_carSeat.png'); + + /// File path: assets/icons/icon_my_edit.png + AssetGenImage get iconMyEdit => + const AssetGenImage('assets/icons/icon_my_edit.png'); + + /// File path: assets/icons/icon_my_house.png + AssetGenImage get iconMyHouse => + const AssetGenImage('assets/icons/icon_my_house.png'); + + /// File path: assets/icons/icon_my_location.png + AssetGenImage get iconMyLocation => + const AssetGenImage('assets/icons/icon_my_location.png'); + + /// File path: assets/icons/icon_my_setting.png + AssetGenImage get iconMySetting => + const AssetGenImage('assets/icons/icon_my_setting.png'); + + /// File path: assets/icons/icon_my_visitor.png + AssetGenImage get iconMyVisitor => + const AssetGenImage('assets/icons/icon_my_visitor.png'); + + /// File path: assets/icons/icon_notification.png + AssetGenImage get iconNotification => + const AssetGenImage('assets/icons/icon_notification.png'); + + /// File path: assets/icons/icon_price.png + AssetGenImage get iconPrice => + const AssetGenImage('assets/icons/icon_price.png'); + + /// File path: assets/icons/icon_price_bottom.png + AssetGenImage get iconPriceBottom => + const AssetGenImage('assets/icons/icon_price_bottom.png'); + + /// File path: assets/icons/icon_price_normal.png + AssetGenImage get iconPriceNormal => + const AssetGenImage('assets/icons/icon_price_normal.png'); + + /// File path: assets/icons/icon_price_top.png + AssetGenImage get iconPriceTop => + const AssetGenImage('assets/icons/icon_price_top.png'); + + /// File path: assets/icons/icon_property_location.png + AssetGenImage get iconPropertyLocation => + const AssetGenImage('assets/icons/icon_property_location.png'); + + /// File path: assets/icons/icon_property_message.png + AssetGenImage get iconPropertyMessage => + const AssetGenImage('assets/icons/icon_property_message.png'); + + /// File path: assets/icons/icon_property_search.png + AssetGenImage get iconPropertySearch => + const AssetGenImage('assets/icons/icon_property_search.png'); + + /// File path: assets/icons/icon_setting.png + AssetGenImage get iconSetting => + const AssetGenImage('assets/icons/icon_setting.png'); + + /// File path: assets/icons/icon_sort.png + AssetGenImage get iconSort => + const AssetGenImage('assets/icons/icon_sort.png'); + + /// File path: assets/icons/icon_thumbsUp.png + AssetGenImage get iconThumbsUp => + const AssetGenImage('assets/icons/icon_thumbsUp.png'); + + /// File path: assets/icons/icon_toTop.png + AssetGenImage get iconToTop => + const AssetGenImage('assets/icons/icon_toTop.png'); + + /// File path: assets/icons/icon_topic_first.png + AssetGenImage get iconTopicFirst => + const AssetGenImage('assets/icons/icon_topic_first.png'); + + /// File path: assets/icons/icon_topic_second.png + AssetGenImage get iconTopicSecond => + const AssetGenImage('assets/icons/icon_topic_second.png'); + + /// File path: assets/icons/icon_topic_third.png + AssetGenImage get iconTopicThird => + const AssetGenImage('assets/icons/icon_topic_third.png'); + + /// File path: assets/icons/img_add.png + AssetGenImage get imgAdd => const AssetGenImage('assets/icons/img_add.png'); + + /// File path: assets/icons/introduce.png + AssetGenImage get introduce => + const AssetGenImage('assets/icons/introduce.png'); + + /// File path: assets/icons/lease_house.png + AssetGenImage get leaseHouse => + const AssetGenImage('assets/icons/lease_house.png'); + + /// File path: assets/icons/like.png + AssetGenImage get like => const AssetGenImage('assets/icons/like.png'); + + /// File path: assets/icons/location.png + AssetGenImage get location => + const AssetGenImage('assets/icons/location.png'); + + /// File path: assets/icons/manager_order_cancel.png + AssetGenImage get managerOrderCancel => + const AssetGenImage('assets/icons/manager_order_cancel.png'); + + /// File path: assets/icons/manager_phone_call.png + AssetGenImage get managerPhoneCall => + const AssetGenImage('assets/icons/manager_phone_call.png'); + + /// File path: assets/icons/market_tab_selected.png + AssetGenImage get marketTabSelected => + const AssetGenImage('assets/icons/market_tab_selected.png'); + + /// File path: assets/icons/market_tab_unselected.png + AssetGenImage get marketTabUnselected => + const AssetGenImage('assets/icons/market_tab_unselected.png'); + + /// File path: assets/icons/pay.png + AssetGenImage get pay => const AssetGenImage('assets/icons/pay.png'); + + /// File path: assets/icons/phone.png + AssetGenImage get phone => const AssetGenImage('assets/icons/phone.png'); + + /// File path: assets/icons/property.png + AssetGenImage get property => + const AssetGenImage('assets/icons/property.png'); + + /// File path: assets/icons/proposal.png + AssetGenImage get proposal => + const AssetGenImage('assets/icons/proposal.png'); + + /// File path: assets/icons/report.png + AssetGenImage get report => const AssetGenImage('assets/icons/report.png'); + + /// File path: assets/icons/second_hand.png + AssetGenImage get secondHand => + const AssetGenImage('assets/icons/second_hand.png'); + + /// File path: assets/icons/service.png + AssetGenImage get service => const AssetGenImage('assets/icons/service.png'); + + /// File path: assets/icons/shield_content.png + AssetGenImage get shieldContent => + const AssetGenImage('assets/icons/shield_content.png'); + + /// File path: assets/icons/shield_user.png + AssetGenImage get shieldUser => + const AssetGenImage('assets/icons/shield_user.png'); + + /// File path: assets/icons/shop_car.png + AssetGenImage get shopCar => const AssetGenImage('assets/icons/shop_car.png'); + + /// File path: assets/icons/shop_close.png + AssetGenImage get shopClose => + const AssetGenImage('assets/icons/shop_close.png'); + + /// File path: assets/icons/shop_favorfill.png + AssetGenImage get shopFavorfill => + const AssetGenImage('assets/icons/shop_favorfill.png'); + + /// File path: assets/icons/shop_laba.png + AssetGenImage get shopLaba => + const AssetGenImage('assets/icons/shop_laba.png'); + + /// File path: assets/icons/shop_location.png + AssetGenImage get shopLocation => + const AssetGenImage('assets/icons/shop_location.png'); + + /// File path: assets/icons/shop_notice.png + AssetGenImage get shopNotice => + const AssetGenImage('assets/icons/shop_notice.png'); + + /// File path: assets/icons/shop_order.png + AssetGenImage get shopOrder => + const AssetGenImage('assets/icons/shop_order.png'); + + /// File path: assets/icons/shop_search.png + AssetGenImage get shopSearch => + const AssetGenImage('assets/icons/shop_search.png'); + + /// File path: assets/icons/shop_torb.png + AssetGenImage get shopTorb => + const AssetGenImage('assets/icons/shop_torb.png'); + + /// File path: assets/icons/system_notice.png + AssetGenImage get systemNotice => + const AssetGenImage('assets/icons/system_notice.png'); + + /// File path: assets/icons/tabbar_home.png + AssetGenImage get tabbarHome => + const AssetGenImage('assets/icons/tabbar_home.png'); + + /// File path: assets/icons/tabbar_home_no.png + AssetGenImage get tabbarHomeNo => + const AssetGenImage('assets/icons/tabbar_home_no.png'); + + /// File path: assets/icons/tabbar_house.png + AssetGenImage get tabbarHouse => + const AssetGenImage('assets/icons/tabbar_house.png'); + + /// File path: assets/icons/tabbar_house_no.png + AssetGenImage get tabbarHouseNo => + const AssetGenImage('assets/icons/tabbar_house_no.png'); + + /// File path: assets/icons/tabbar_market.png + AssetGenImage get tabbarMarket => + const AssetGenImage('assets/icons/tabbar_market.png'); + + /// File path: assets/icons/tabbar_market_no.png + AssetGenImage get tabbarMarketNo => + const AssetGenImage('assets/icons/tabbar_market_no.png'); + + /// File path: assets/icons/tabbar_message.png + AssetGenImage get tabbarMessage => + const AssetGenImage('assets/icons/tabbar_message.png'); + + /// File path: assets/icons/tabbar_message_no.png + AssetGenImage get tabbarMessageNo => + const AssetGenImage('assets/icons/tabbar_message_no.png'); + + /// File path: assets/icons/tabbar_user.png + AssetGenImage get tabbarUser => + const AssetGenImage('assets/icons/tabbar_user.png'); + + /// File path: assets/icons/tabbar_user_no.png + AssetGenImage get tabbarUserNo => + const AssetGenImage('assets/icons/tabbar_user_no.png'); + + /// File path: assets/icons/test_kingcion.png + AssetGenImage get testKingcion => + const AssetGenImage('assets/icons/test_kingcion.png'); + + /// File path: assets/icons/tool_bmdh.png + AssetGenImage get toolBmdh => + const AssetGenImage('assets/icons/tool_bmdh.png'); + + /// File path: assets/icons/tool_bmts.png + AssetGenImage get toolBmts => + const AssetGenImage('assets/icons/tool_bmts.png'); + + /// File path: assets/icons/tool_bsbx.png + AssetGenImage get toolBsbx => + const AssetGenImage('assets/icons/tool_bsbx.png'); + + /// File path: assets/icons/tool_czxs.png + AssetGenImage get toolCzxs => + const AssetGenImage('assets/icons/tool_czxs.png'); + + /// File path: assets/icons/tool_facility.png + AssetGenImage get toolFacility => + const AssetGenImage('assets/icons/tool_facility.png'); + + /// File path: assets/icons/tool_fkyq.png + AssetGenImage get toolFkyq => + const AssetGenImage('assets/icons/tool_fkyq.png'); + + /// File path: assets/icons/tool_fsxb.png + AssetGenImage get toolFsxb => + const AssetGenImage('assets/icons/tool_fsxb.png'); + + /// File path: assets/icons/tool_hdtp.png + AssetGenImage get toolHdtp => + const AssetGenImage('assets/icons/tool_hdtp.png'); + + /// File path: assets/icons/tool_jhgl.png + AssetGenImage get toolJhgl => + const AssetGenImage('assets/icons/tool_jhgl.png'); + + /// File path: assets/icons/tool_jjsh.png + AssetGenImage get toolJjsh => + const AssetGenImage('assets/icons/tool_jjsh.png'); + + /// File path: assets/icons/tool_jyts.png + AssetGenImage get toolJyts => + const AssetGenImage('assets/icons/tool_jyts.png'); + + /// File path: assets/icons/tool_kmm.png + AssetGenImage get toolKmm => const AssetGenImage('assets/icons/tool_kmm.png'); + + /// File path: assets/icons/tool_mywj.png + AssetGenImage get toolMywj => + const AssetGenImage('assets/icons/tool_mywj.png'); + + /// File path: assets/icons/tool_qbyy.png + AssetGenImage get toolQbyy => + const AssetGenImage('assets/icons/tool_qbyy.png'); + + /// File path: assets/icons/tool_shjf.png + AssetGenImage get toolShjf => + const AssetGenImage('assets/icons/tool_shjf.png'); + + /// File path: assets/icons/tool_smjd.png + AssetGenImage get toolSmjd => + const AssetGenImage('assets/icons/tool_smjd.png'); + + /// File path: assets/icons/tool_tsby.png + AssetGenImage get toolTsby => + const AssetGenImage('assets/icons/tool_tsby.png'); + + /// File path: assets/icons/tool_wjdc.png + AssetGenImage get toolWjdc => + const AssetGenImage('assets/icons/tool_wjdc.png'); + + /// File path: assets/icons/tool_wpcm.png + AssetGenImage get toolWpcm => + const AssetGenImage('assets/icons/tool_wpcm.png'); + + /// File path: assets/icons/tool_xxfs.png + AssetGenImage get toolXxfs => + const AssetGenImage('assets/icons/tool_xxfs.png'); + + /// File path: assets/icons/tool_yjbj.png + AssetGenImage get toolYjbj => + const AssetGenImage('assets/icons/tool_yjbj.png'); + + /// File path: assets/icons/tool_yjkm.png + AssetGenImage get toolYjkm => + const AssetGenImage('assets/icons/tool_yjkm.png'); + + /// File path: assets/icons/tool_yljs.png + AssetGenImage get toolYljs => + const AssetGenImage('assets/icons/tool_yljs.png'); + + /// File path: assets/icons/tool_ywh.png + AssetGenImage get toolYwh => const AssetGenImage('assets/icons/tool_ywh.png'); + + /// File path: assets/icons/tool_zbbj.png + AssetGenImage get toolZbbj => + const AssetGenImage('assets/icons/tool_zbbj.png'); + + /// File path: assets/icons/tool_zxgl.png + AssetGenImage get toolZxgl => + const AssetGenImage('assets/icons/tool_zxgl.png'); + + /// File path: assets/icons/user_icon_dfh.png + AssetGenImage get userIconDfh => + const AssetGenImage('assets/icons/user_icon_dfh.png'); + + /// File path: assets/icons/user_icon_dfk.png + AssetGenImage get userIconDfk => + const AssetGenImage('assets/icons/user_icon_dfk.png'); + + /// File path: assets/icons/user_icon_dpj.png + AssetGenImage get userIconDpj => + const AssetGenImage('assets/icons/user_icon_dpj.png'); + + /// File path: assets/icons/user_icon_dsh.png + AssetGenImage get userIconDsh => + const AssetGenImage('assets/icons/user_icon_dsh.png'); + + /// File path: assets/icons/user_icon_sh.png + AssetGenImage get userIconSh => + const AssetGenImage('assets/icons/user_icon_sh.png'); + + /// File path: assets/icons/user_icon_sz.png + AssetGenImage get userIconSz => + const AssetGenImage('assets/icons/user_icon_sz.png'); + + /// File path: assets/icons/user_icon_vip.png + AssetGenImage get userIconVip => + const AssetGenImage('assets/icons/user_icon_vip.png'); + + /// File path: assets/icons/user_icon_wdbx.png + AssetGenImage get userIconWdbx => + const AssetGenImage('assets/icons/user_icon_wdbx.png'); + + /// File path: assets/icons/user_icon_wdc.png + AssetGenImage get userIconWdc => + const AssetGenImage('assets/icons/user_icon_wdc.png'); + + /// File path: assets/icons/user_icon_wdcw.png + AssetGenImage get userIconWdcw => + const AssetGenImage('assets/icons/user_icon_wdcw.png'); + + /// File path: assets/icons/user_icon_wddz.png + AssetGenImage get userIconWddz => + const AssetGenImage('assets/icons/user_icon_wddz.png'); + + /// File path: assets/icons/user_icon_wdfk.png + AssetGenImage get userIconWdfk => + const AssetGenImage('assets/icons/user_icon_wdfk.png'); + + /// File path: assets/icons/user_icon_wdfw.png + AssetGenImage get userIconWdfw => + const AssetGenImage('assets/icons/user_icon_wdfw.png'); + + /// File path: assets/icons/user_icon_wdgj.png + AssetGenImage get userIconWdgj => + const AssetGenImage('assets/icons/user_icon_wdgj.png'); + + /// File path: assets/icons/user_icon_wdjf.png + AssetGenImage get userIconWdjf => + const AssetGenImage('assets/icons/user_icon_wdjf.png'); + + /// File path: assets/icons/user_icon_wdsqhd.png + AssetGenImage get userIconWdsqhd => + const AssetGenImage('assets/icons/user_icon_wdsqhd.png'); + + /// File path: assets/icons/xianshi.png + AssetGenImage get xianshi => const AssetGenImage('assets/icons/xianshi.png'); +} + +class $AssetsImagesGen { + const $AssetsImagesGen(); + + /// File path: assets/images/application.png + AssetGenImage get application => + const AssetGenImage('assets/images/application.png'); + + /// File path: assets/images/car_header.png + AssetGenImage get carHeader => + const AssetGenImage('assets/images/car_header.png'); + + /// File path: assets/images/card_blue.png + AssetGenImage get cardBlue => + const AssetGenImage('assets/images/card_blue.png'); + + /// File path: assets/images/card_pink.png + AssetGenImage get cardPink => + const AssetGenImage('assets/images/card_pink.png'); + + /// File path: assets/images/card_yellow.png + AssetGenImage get cardYellow => + const AssetGenImage('assets/images/card_yellow.png'); + + /// File path: assets/images/circle_left_bottom.png + AssetGenImage get circleLeftBottom => + const AssetGenImage('assets/images/circle_left_bottom.png'); + + /// File path: assets/images/circle_right_bottom.png + AssetGenImage get circleRightBottom => + const AssetGenImage('assets/images/circle_right_bottom.png'); + + /// File path: assets/images/circle_right_top.png + AssetGenImage get circleRightTop => + const AssetGenImage('assets/images/circle_right_top.png'); + + /// File path: assets/images/circle_text.png + AssetGenImage get circleText => + const AssetGenImage('assets/images/circle_text.png'); + + /// File path: assets/images/code_logo.png + AssetGenImage get codeLogo => + const AssetGenImage('assets/images/code_logo.png'); + + /// File path: assets/images/commitment.png + AssetGenImage get commitment => + const AssetGenImage('assets/images/commitment.png'); + + /// File path: assets/images/community_my_bg.png + AssetGenImage get communityMyBg => + const AssetGenImage('assets/images/community_my_bg.png'); + + /// File path: assets/images/contact_manager.png + AssetGenImage get contactManager => + const AssetGenImage('assets/images/contact_manager.png'); + + /// File path: assets/images/drawings.png + AssetGenImage get drawings => + const AssetGenImage('assets/images/drawings.png'); + + /// File path: assets/images/house_attestation.png + AssetGenImage get houseAttestation => + const AssetGenImage('assets/images/house_attestation.png'); + + /// File path: assets/images/house_header.png + AssetGenImage get houseHeader => + const AssetGenImage('assets/images/house_header.png'); + + /// File path: assets/images/license.png + AssetGenImage get license => const AssetGenImage('assets/images/license.png'); + + /// File path: assets/images/license_back.png + AssetGenImage get licenseBack => + const AssetGenImage('assets/images/license_back.png'); + + /// File path: assets/images/lock.png + AssetGenImage get lock => const AssetGenImage('assets/images/lock.png'); + + /// File path: assets/images/logo.png + AssetGenImage get logo => const AssetGenImage('assets/images/logo.png'); + + /// File path: assets/images/member_bg.png + AssetGenImage get memberBg => + const AssetGenImage('assets/images/member_bg.png'); + + /// File path: assets/images/mine_bg.png + AssetGenImage get mineBg => const AssetGenImage('assets/images/mine_bg.png'); + + /// File path: assets/images/my_bg.png + AssetGenImage get myBg => const AssetGenImage('assets/images/my_bg.png'); + + /// File path: assets/images/notice.png + AssetGenImage get notice => const AssetGenImage('assets/images/notice.png'); + + /// File path: assets/images/open_door.png + AssetGenImage get openDoor => + const AssetGenImage('assets/images/open_door.png'); + + /// File path: assets/images/phone_logo.png + AssetGenImage get phoneLogo => + const AssetGenImage('assets/images/phone_logo.png'); + + /// File path: assets/images/placeholder.webp + AssetGenImage get placeholder => + const AssetGenImage('assets/images/placeholder.webp'); + + /// File path: assets/images/property_bg.png + AssetGenImage get propertyBg => + const AssetGenImage('assets/images/property_bg.png'); + + /// File path: assets/images/shop_car_empty.png + AssetGenImage get shopCarEmpty => + const AssetGenImage('assets/images/shop_car_empty.png'); + + /// File path: assets/images/splash_logo.png + AssetGenImage get splashLogo => + const AssetGenImage('assets/images/splash_logo.png'); + + /// File path: assets/images/white.png + AssetGenImage get white => const AssetGenImage('assets/images/white.png'); + + /// File path: assets/images/wxpay.png + AssetGenImage get wxpay => const AssetGenImage('assets/images/wxpay.png'); +} + +class $AssetsJsonGen { + const $AssetsJsonGen(); + + /// File path: assets/json/province.json + String get province => 'assets/json/province.json'; +} + +class $AssetsStaticGen { + const $AssetsStaticGen(); + + /// File path: assets/static/car_card_grey.webp + AssetGenImage get carCardGrey => + const AssetGenImage('assets/static/car_card_grey.webp'); + + /// File path: assets/static/car_card_yellow.webp + AssetGenImage get carCardYellow => + const AssetGenImage('assets/static/car_card_yellow.webp'); + + /// File path: assets/static/car_park_empty.webp + AssetGenImage get carParkEmpty => + const AssetGenImage('assets/static/car_park_empty.webp'); + + /// File path: assets/static/house_auth_fail.webp + AssetGenImage get houseAuthFail => + const AssetGenImage('assets/static/house_auth_fail.webp'); + + /// File path: assets/static/house_auth_success.webp + AssetGenImage get houseAuthSuccess => + const AssetGenImage('assets/static/house_auth_success.webp'); + + /// File path: assets/static/id_card_back.png + AssetGenImage get idCardBack => + const AssetGenImage('assets/static/id_card_back.png'); + + /// File path: assets/static/id_card_front.png + AssetGenImage get idCardFront => + const AssetGenImage('assets/static/id_card_front.png'); + + /// File path: assets/static/parking_grey.webp + AssetGenImage get parkingGrey => + const AssetGenImage('assets/static/parking_grey.webp'); + + /// File path: assets/static/parking_yellow.webp + AssetGenImage get parkingYellow => + const AssetGenImage('assets/static/parking_yellow.webp'); + + /// File path: assets/static/review_fail.webp + AssetGenImage get reviewFail => + const AssetGenImage('assets/static/review_fail.webp'); + + /// File path: assets/static/reviewing.webp + AssetGenImage get reviewing => + const AssetGenImage('assets/static/reviewing.webp'); +} + +class $AssetsTabGen { + const $AssetsTabGen(); + + /// File path: assets/tab/bkjh.png + AssetGenImage get bkjh => const AssetGenImage('assets/tab/bkjh.png'); + + /// File path: assets/tab/kbhw.png + AssetGenImage get kbhw => const AssetGenImage('assets/tab/kbhw.png'); + + /// File path: assets/tab/nanz.png + AssetGenImage get nanz => const AssetGenImage('assets/tab/nanz.png'); + + /// File path: assets/tab/nvz.png + AssetGenImage get nvz => const AssetGenImage('assets/tab/nvz.png'); +} + +class Assets { + Assets._(); + + static const $AssetsApplicationsGen applications = $AssetsApplicationsGen(); + static const $AssetsIconsGen icons = $AssetsIconsGen(); + static const $AssetsImagesGen images = $AssetsImagesGen(); + static const $AssetsJsonGen json = $AssetsJsonGen(); + static const $AssetsStaticGen static = $AssetsStaticGen(); + static const $AssetsTabGen tab = $AssetsTabGen(); +} + +class AssetGenImage extends AssetImage { + const AssetGenImage(String assetName) : super(assetName); + + Image image({ + Key? key, + ImageFrameBuilder? frameBuilder, + ImageLoadingBuilder? loadingBuilder, + ImageErrorWidgetBuilder? errorBuilder, + String? semanticLabel, + bool excludeFromSemantics = false, + double? width, + double? height, + Color? color, + BlendMode? colorBlendMode, + BoxFit? fit, + AlignmentGeometry alignment = Alignment.center, + ImageRepeat repeat = ImageRepeat.noRepeat, + Rect? centerSlice, + bool matchTextDirection = false, + bool gaplessPlayback = false, + bool isAntiAlias = false, + FilterQuality filterQuality = FilterQuality.low, + }) { + return Image( + key: key, + image: this, + frameBuilder: frameBuilder, + loadingBuilder: loadingBuilder, + errorBuilder: errorBuilder, + semanticLabel: semanticLabel, + excludeFromSemantics: excludeFromSemantics, + width: width, + height: height, + color: color, + colorBlendMode: colorBlendMode, + fit: fit, + alignment: alignment, + repeat: repeat, + centerSlice: centerSlice, + matchTextDirection: matchTextDirection, + gaplessPlayback: gaplessPlayback, + isAntiAlias: isAntiAlias, + filterQuality: filterQuality, + ); + } + + String get path => assetName; +} diff --git a/lib/generated_plugin_registrant.dart b/lib/generated_plugin_registrant.dart index b80e143d..7d207a3c 100644 --- a/lib/generated_plugin_registrant.dart +++ b/lib/generated_plugin_registrant.dart @@ -2,6 +2,7 @@ // Generated file. Do not edit. // +// ignore_for_file: directives_ordering // ignore_for_file: lines_longer_than_80_chars import 'package:device_info_plus_web/device_info_plus_web.dart'; diff --git a/lib/main.dart b/lib/main.dart index 5aaf4efb..4f9a86f4 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -10,7 +10,6 @@ import 'package:bot_toast/bot_toast.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:provider/provider.dart'; @@ -19,11 +18,6 @@ void main() async { DeveloperUtil.setDev(!(buildType.contains('PRODUCT'))); WidgetsFlutterBinding.ensureInitialized(); - ///firebase crashlytics initalize - //await MainInitialize.initFirebase(); - MainInitialize.initTheme(); - MainInitialize.initWechat(); - MainInitialize.initWebSocket(); await MainInitialize.initJPush(); runApp(MyApp()); diff --git a/lib/models/community_introduce/community_introduce_model.g.dart b/lib/models/community_introduce/community_introduce_model.g.dart index 1b9339e9..4b874e03 100644 --- a/lib/models/community_introduce/community_introduce_model.g.dart +++ b/lib/models/community_introduce/community_introduce_model.g.dart @@ -7,14 +7,13 @@ part of 'community_introduce_model.dart'; // ************************************************************************** CommunityIontroduceModel _$CommunityIontroduceModelFromJson( - Map json) { - return CommunityIontroduceModel( - id: json['id'] as int, - name: json['name'] as String, - content: json['content'] as String, - createDate: json['createDate'] as String, - imgList: (json['imgList'] as List?) - ?.map((e) => ImgModel.fromJson(e as Map)) - .toList(), - ); -} + Map json) => + CommunityIontroduceModel( + id: json['id'] as int, + name: json['name'] as String, + content: json['content'] as String, + createDate: json['createDate'] as String, + imgList: (json['imgList'] as List?) + ?.map((e) => ImgModel.fromJson(e as Map)) + .toList(), + ); diff --git a/lib/models/electronic_commerc/electronic_commerc_category_model.g.dart b/lib/models/electronic_commerc/electronic_commerc_category_model.g.dart index 9fa732c3..77eb6dbd 100644 --- a/lib/models/electronic_commerc/electronic_commerc_category_model.g.dart +++ b/lib/models/electronic_commerc/electronic_commerc_category_model.g.dart @@ -7,9 +7,8 @@ part of 'electronic_commerc_category_model.dart'; // ************************************************************************** ElectronicCommercCategoryModel _$ElectronicCommercCategoryModelFromJson( - Map json) { - return ElectronicCommercCategoryModel( - id: json['id'] as int, - name: json['name'] as String, - ); -} + Map json) => + ElectronicCommercCategoryModel( + id: json['id'] as int, + name: json['name'] as String, + ); diff --git a/lib/models/electronic_commerc/electronic_commerc_detail_model.g.dart b/lib/models/electronic_commerc/electronic_commerc_detail_model.g.dart index 6b72f7a3..7de34e2f 100644 --- a/lib/models/electronic_commerc/electronic_commerc_detail_model.g.dart +++ b/lib/models/electronic_commerc/electronic_commerc_detail_model.g.dart @@ -7,15 +7,14 @@ part of 'electronic_commerc_detail_model.dart'; // ************************************************************************** ElectronicCommercDetailModel _$ElectronicCommercDetailModelFromJson( - Map json) { - return ElectronicCommercDetailModel( - id: json['id'] as int, - title: json['title'] as String, - code: json['code'] as String, - content: json['content'] as String, - electronicCommerceCategoryName: - json['electronicCommerceCategoryName'] as String, - createName: json['createName'] as String, - createDate: json['createDate'] as String, - ); -} + Map json) => + ElectronicCommercDetailModel( + id: json['id'] as int, + title: json['title'] as String, + code: json['code'] as String, + content: json['content'] as String, + electronicCommerceCategoryName: + json['electronicCommerceCategoryName'] as String, + createName: json['createName'] as String, + createDate: json['createDate'] as String, + ); diff --git a/lib/models/electronic_commerc/electronic_commerc_list_model.g.dart b/lib/models/electronic_commerc/electronic_commerc_list_model.g.dart index f71683be..805dcff3 100644 --- a/lib/models/electronic_commerc/electronic_commerc_list_model.g.dart +++ b/lib/models/electronic_commerc/electronic_commerc_list_model.g.dart @@ -7,13 +7,12 @@ part of 'electronic_commerc_list_model.dart'; // ************************************************************************** ElectronicCommercListModel _$ElectronicCommercListModelFromJson( - Map json) { - return ElectronicCommercListModel( - id: json['id'] as int, - title: json['title'] as String, - createDate: json['createDate'] as String, - imgList: (json['imgList'] as List) - .map((e) => ImgModel.fromJson(e as Map)) - .toList(), - ); -} + Map json) => + ElectronicCommercListModel( + id: json['id'] as int, + title: json['title'] as String, + createDate: json['createDate'] as String, + imgList: (json['imgList'] as List) + .map((e) => ImgModel.fromJson(e as Map)) + .toList(), + ); diff --git a/lib/models/express_package/express_package_list_model.g.dart b/lib/models/express_package/express_package_list_model.g.dart index 430c0e09..e19a93d3 100644 --- a/lib/models/express_package/express_package_list_model.g.dart +++ b/lib/models/express_package/express_package_list_model.g.dart @@ -7,16 +7,15 @@ part of 'express_package_list_model.dart'; // ************************************************************************** ExpressPackageListModel _$ExpressPackageListModelFromJson( - Map json) { - return ExpressPackageListModel( - id: json['id'] as int, - code: json['code'] as String, - addresseeName: json['addresseeName'] as String, - addresseeTel: json['addresseeTel'] as String, - address: json['address'] as String, - status: json['status'] as int, - receiveDate: json['receiveDate'] as String?, - createDate: json['createDate'] as String, - placePosition: json['placePosition'] as String, - ); -} + Map json) => + ExpressPackageListModel( + id: json['id'] as int, + code: json['code'] as String, + addresseeName: json['addresseeName'] as String, + addresseeTel: json['addresseeTel'] as String, + address: json['address'] as String, + status: json['status'] as int, + receiveDate: json['receiveDate'] as String?, + createDate: json['createDate'] as String, + placePosition: json['placePosition'] as String, + ); diff --git a/lib/models/facility/facility_appointment_model.g.dart b/lib/models/facility/facility_appointment_model.g.dart index 84df769d..508754f0 100644 --- a/lib/models/facility/facility_appointment_model.g.dart +++ b/lib/models/facility/facility_appointment_model.g.dart @@ -7,16 +7,15 @@ part of 'facility_appointment_model.dart'; // ************************************************************************** FacilityAppointmentModel _$FacilityAppointmentModelFromJson( - Map json) { - return FacilityAppointmentModel( - id: json['id'] as int, - code: json['code'] as String, - facilitiesName: json['facilitiesName'] as String, - status: json['status'] as int, - address: json['address'] as String, - appointmentStartDate: json['appointmentStartDate'] as String, - appointmentEndDate: json['appointmentEndDate'] as String, - nullifyReason: json['nullifyReason'] as String?, - useEndDate: json['useEndDate'] as String?, - ); -} + Map json) => + FacilityAppointmentModel( + id: json['id'] as int, + code: json['code'] as String, + facilitiesName: json['facilitiesName'] as String, + status: json['status'] as int, + address: json['address'] as String, + appointmentStartDate: json['appointmentStartDate'] as String, + appointmentEndDate: json['appointmentEndDate'] as String, + nullifyReason: json['nullifyReason'] as String?, + useEndDate: json['useEndDate'] as String?, + ); diff --git a/lib/models/facility/facility_order_date_list_model.g.dart b/lib/models/facility/facility_order_date_list_model.g.dart index d0b2932b..3b67e00b 100644 --- a/lib/models/facility/facility_order_date_list_model.g.dart +++ b/lib/models/facility/facility_order_date_list_model.g.dart @@ -7,11 +7,10 @@ part of 'facility_order_date_list_model.dart'; // ************************************************************************** FacilityOrderDateListModel _$FacilityOrderDateListModelFromJson( - Map json) { - return FacilityOrderDateListModel( - id: json['id'] as int, - appointmentStartDate: json['appointmentStartDate'] as String, - appointmentEndDate: json['appointmentEndDate'] as String, - appointmentName: json['appointmentName'] as String, - ); -} + Map json) => + FacilityOrderDateListModel( + id: json['id'] as int, + appointmentStartDate: json['appointmentStartDate'] as String, + appointmentEndDate: json['appointmentEndDate'] as String, + appointmentName: json['appointmentName'] as String, + ); diff --git a/lib/models/facility/facility_type_detail_model.g.dart b/lib/models/facility/facility_type_detail_model.g.dart index 0b36cc15..57b8d00a 100644 --- a/lib/models/facility/facility_type_detail_model.g.dart +++ b/lib/models/facility/facility_type_detail_model.g.dart @@ -7,9 +7,8 @@ part of 'facility_type_detail_model.dart'; // ************************************************************************** FacilityTypeDetailModel _$FacilityTypeDetailModelFromJson( - Map json) { - return FacilityTypeDetailModel( - id: json['id'] as int, - name: json['name'] as String, - ); -} + Map json) => + FacilityTypeDetailModel( + id: json['id'] as int, + name: json['name'] as String, + ); diff --git a/lib/models/facility/facility_type_model.g.dart b/lib/models/facility/facility_type_model.g.dart index c9cba9f9..a73eb5a9 100644 --- a/lib/models/facility/facility_type_model.g.dart +++ b/lib/models/facility/facility_type_model.g.dart @@ -6,15 +6,14 @@ part of 'facility_type_model.dart'; // JsonSerializableGenerator // ************************************************************************** -FacilityTypeModel _$FacilityTypeModelFromJson(Map json) { - return FacilityTypeModel( - id: json['id'] as int, - name: json['name'] as String, - openStartDate: json['openStartDate'] as String, - openEndDate: json['openEndDate'] as String, - num_: json['num'] as int, - imgUrls: (json['imgUrls'] as List?) - ?.map((e) => ImgModel.fromJson(e as Map)) - .toList(), - ); -} +FacilityTypeModel _$FacilityTypeModelFromJson(Map json) => + FacilityTypeModel( + id: json['id'] as int, + name: json['name'] as String, + openStartDate: json['openStartDate'] as String, + openEndDate: json['openEndDate'] as String, + num_: json['num'] as int, + imgUrls: (json['imgUrls'] as List?) + ?.map((e) => ImgModel.fromJson(e as Map)) + .toList(), + ); diff --git a/lib/models/house/lease_detail_model.g.dart b/lib/models/house/lease_detail_model.g.dart index 9b26e7c7..f5d6ec15 100644 --- a/lib/models/house/lease_detail_model.g.dart +++ b/lib/models/house/lease_detail_model.g.dart @@ -6,41 +6,40 @@ part of 'lease_detail_model.dart'; // JsonSerializableGenerator // ************************************************************************** -LeaseDetailModel _$LeaseDetailModelFromJson(Map json) { - return LeaseDetailModel( - id: json['id'] as int, - code: json['code'] as String, - name: json['name'] as String, - sex: json['sex'] as int, - idCard: json['idCard'] as String, - roomName: json['roomName'] as String, - type: json['type'] as int, - estateType: json['estateType'] as String, - estateStructure: json['estateStructure'] as String, - constructionArea: json['constructionArea'] as num, - indoorArea: json['indoorArea'] as num, - rentStandard: json['rentStandard'] as num, - margin: json['margin'] as num, - marginPayDate: json['marginPayDate'] as String?, - leaseDateStart: json['leaseDateStart'] as String, - leaseDateEnd: json['leaseDateEnd'] as String, - imgUrls: (json['imgUrls'] as List?) - ?.map((e) => ImgModel.fromJson(e as Map)) - .toList(), - status: json['status'] as int, - reviewerName: json['reviewerName'] as String?, - auditDate: json['auditDate'] as String?, - createName: json['createName'] as String, - emergencyContact: json['emergencyContact'] as String?, - emergencyContactNumber: json['emergencyContactNumber'] as String?, - correspondenceAddress: json['correspondenceAddress'] as String?, - workUnits: json['workUnits'] as String?, - payBank: json['payBank'] as String?, - bankAccountName: json['bankAccountName'] as String?, - bankAccount: json['bankAccount'] as String?, - takeDate: json['takeDate'] as String?, - notMeterRentDate: json['notMeterRentDate'] as String?, - requiredRent: json['requiredRent'] as num?, - depositRefundReviewRemake: json['depositRefundReviewRemake'] as String?, - ); -} +LeaseDetailModel _$LeaseDetailModelFromJson(Map json) => + LeaseDetailModel( + id: json['id'] as int, + code: json['code'] as String, + name: json['name'] as String, + sex: json['sex'] as int, + idCard: json['idCard'] as String, + roomName: json['roomName'] as String, + type: json['type'] as int, + estateType: json['estateType'] as String, + estateStructure: json['estateStructure'] as String, + constructionArea: json['constructionArea'] as num, + indoorArea: json['indoorArea'] as num, + rentStandard: json['rentStandard'] as num, + margin: json['margin'] as num, + marginPayDate: json['marginPayDate'] as String?, + leaseDateStart: json['leaseDateStart'] as String, + leaseDateEnd: json['leaseDateEnd'] as String, + imgUrls: (json['imgUrls'] as List?) + ?.map((e) => ImgModel.fromJson(e as Map)) + .toList(), + status: json['status'] as int, + reviewerName: json['reviewerName'] as String?, + auditDate: json['auditDate'] as String?, + createName: json['createName'] as String, + emergencyContact: json['emergencyContact'] as String?, + emergencyContactNumber: json['emergencyContactNumber'] as String?, + correspondenceAddress: json['correspondenceAddress'] as String?, + workUnits: json['workUnits'] as String?, + payBank: json['payBank'] as String?, + bankAccountName: json['bankAccountName'] as String?, + bankAccount: json['bankAccount'] as String?, + takeDate: json['takeDate'] as String?, + notMeterRentDate: json['notMeterRentDate'] as String?, + requiredRent: json['requiredRent'] as num?, + depositRefundReviewRemake: json['depositRefundReviewRemake'] as String?, + ); diff --git a/lib/models/house/lease_echo_model.g.dart b/lib/models/house/lease_echo_model.g.dart index 0e8d31f9..98b8a64c 100644 --- a/lib/models/house/lease_echo_model.g.dart +++ b/lib/models/house/lease_echo_model.g.dart @@ -6,11 +6,10 @@ part of 'lease_echo_model.dart'; // JsonSerializableGenerator // ************************************************************************** -LeaseEchoModel _$LeaseEchoModelFromJson(Map json) { - return LeaseEchoModel( - name: json['name'] as String?, - sex: json['sex'] as num?, - tel: json['tel'] as String, - idNumber: json['idNumber'] as String?, - ); -} +LeaseEchoModel _$LeaseEchoModelFromJson(Map json) => + LeaseEchoModel( + name: json['name'] as String?, + sex: json['sex'] as num?, + tel: json['tel'] as String, + idNumber: json['idNumber'] as String?, + ); diff --git a/lib/models/house/lease_fee_list_model.g.dart b/lib/models/house/lease_fee_list_model.g.dart index d2fb7bf0..98aefc2a 100644 --- a/lib/models/house/lease_fee_list_model.g.dart +++ b/lib/models/house/lease_fee_list_model.g.dart @@ -6,12 +6,11 @@ part of 'lease_fee_list_model.dart'; // JsonSerializableGenerator // ************************************************************************** -LeaseFeeListModel _$LeaseFeeListModelFromJson(Map json) { - return LeaseFeeListModel( - id: json['id'] as int, - price: json['price'] as num, - payStatus: json['payStatus'] as int, - createDate: json['createDate'] as String, - type: json['type'] as int, - ); -} +LeaseFeeListModel _$LeaseFeeListModelFromJson(Map json) => + LeaseFeeListModel( + id: json['id'] as int, + price: json['price'] as num, + payStatus: json['payStatus'] as int, + createDate: json['createDate'] as String, + type: json['type'] as int, + ); diff --git a/lib/models/house/lease_list_model.g.dart b/lib/models/house/lease_list_model.g.dart index 89c075d7..f255c4e7 100644 --- a/lib/models/house/lease_list_model.g.dart +++ b/lib/models/house/lease_list_model.g.dart @@ -6,12 +6,11 @@ part of 'lease_list_model.dart'; // JsonSerializableGenerator // ************************************************************************** -LeaseListModel _$LeaseListModelFromJson(Map json) { - return LeaseListModel( - id: json['id'] as int, - roomName: json['roomName'] as String, - type: json['type'] as int, - estateType: json['estateType'] as String, - status: json['status'] as int, - ); -} +LeaseListModel _$LeaseListModelFromJson(Map json) => + LeaseListModel( + id: json['id'] as int, + roomName: json['roomName'] as String, + type: json['type'] as int, + estateType: json['estateType'] as String, + status: json['status'] as int, + ); diff --git a/lib/models/house_keeping/house_keeping_list_model.g.dart b/lib/models/house_keeping/house_keeping_list_model.g.dart index 9e2a5c71..5ac3795c 100644 --- a/lib/models/house_keeping/house_keeping_list_model.g.dart +++ b/lib/models/house_keeping/house_keeping_list_model.g.dart @@ -7,33 +7,32 @@ part of 'house_keeping_list_model.dart'; // ************************************************************************** HouseKeepingListModel _$HouseKeepingListModelFromJson( - Map json) { - return HouseKeepingListModel( - id: json['id'] as int, - proposerName: json['proposerName'] as String, - proposerTel: json['proposerTel'] as String, - roomName: json['roomName'] as String, - type: json['type'] as int, - content: json['content'] as String, - status: json['status'] as int, - completion: json['completion'] as int?, - processDescription: json['processDescription'] as String?, - handlerName: json['handlerName'] as String?, - handlerTel: json['handlerTel'] as String?, - handlingTime: json['handlingTime'] as String?, - handlerImgList: (json['handlerImgList'] as List) - .map((e) => ImgModel.fromJson(e as Map)) - .toList(), - payFee: (json['payFee'] as num?)?.toDouble(), - evaluation: json['evaluation'] as int?, - evaluationContent: json['evaluationContent'] as String?, - evaluationTime: json['evaluationTime'] as String?, - evaluationImgList: (json['evaluationImgList'] as List) - .map((e) => ImgModel.fromJson(e as Map)) - .toList(), - createDate: json['createDate'] as String, - submitImgList: (json['submitImgList'] as List) - .map((e) => ImgModel.fromJson(e as Map)) - .toList(), - ); -} + Map json) => + HouseKeepingListModel( + id: json['id'] as int, + proposerName: json['proposerName'] as String, + proposerTel: json['proposerTel'] as String, + roomName: json['roomName'] as String, + type: json['type'] as int, + content: json['content'] as String, + status: json['status'] as int, + completion: json['completion'] as int?, + processDescription: json['processDescription'] as String?, + handlerName: json['handlerName'] as String?, + handlerTel: json['handlerTel'] as String?, + handlingTime: json['handlingTime'] as String?, + handlerImgList: (json['handlerImgList'] as List) + .map((e) => ImgModel.fromJson(e as Map)) + .toList(), + payFee: (json['payFee'] as num?)?.toDouble(), + evaluation: json['evaluation'] as int?, + evaluationContent: json['evaluationContent'] as String?, + evaluationTime: json['evaluationTime'] as String?, + evaluationImgList: (json['evaluationImgList'] as List) + .map((e) => ImgModel.fromJson(e as Map)) + .toList(), + createDate: json['createDate'] as String, + submitImgList: (json['submitImgList'] as List) + .map((e) => ImgModel.fromJson(e as Map)) + .toList(), + ); diff --git a/lib/models/house_keeping/house_keeping_process_model.g.dart b/lib/models/house_keeping/house_keeping_process_model.g.dart index f746283f..29df7720 100644 --- a/lib/models/house_keeping/house_keeping_process_model.g.dart +++ b/lib/models/house_keeping/house_keeping_process_model.g.dart @@ -7,14 +7,13 @@ part of 'house_keeping_process_model.dart'; // ************************************************************************** HouseKeepingProcessModel _$HouseKeepingProcessModelFromJson( - Map json) { - return HouseKeepingProcessModel( - id: json['id'] as int, - housekeepingServiceId: json['housekeepingServiceId'] as int, - operationDate: json['operationDate'] as String, - operationType: json['operationType'] as int, - opName: json['operator'] as int, - operatorType: json['operatorType'] as int, - operatorContent: json['operatorContent'] as String, - ); -} + Map json) => + HouseKeepingProcessModel( + id: json['id'] as int, + housekeepingServiceId: json['housekeepingServiceId'] as int, + operationDate: json['operationDate'] as String, + operationType: json['operationType'] as int, + opName: json['operator'] as int, + operatorType: json['operatorType'] as int, + operatorContent: json['operatorContent'] as String, + ); diff --git a/lib/models/life_pay/life_pay_list_model.g.dart b/lib/models/life_pay/life_pay_list_model.g.dart index 07dc8dc5..ae84ec00 100644 --- a/lib/models/life_pay/life_pay_list_model.g.dart +++ b/lib/models/life_pay/life_pay_list_model.g.dart @@ -6,15 +6,14 @@ part of 'life_pay_list_model.dart'; // JsonSerializableGenerator // ************************************************************************** -LifePayListModel _$LifePayListModelFromJson(Map json) { - return LifePayListModel( - years: json['years'] as int, - paymentNum: json['paymentNum'] as int, - dailyPaymentTypeVos: (json['dailyPaymentTypeVos'] as List) - .map((e) => DailyPaymentTypeVos.fromJson(e as Map)) - .toList(), - ); -} +LifePayListModel _$LifePayListModelFromJson(Map json) => + LifePayListModel( + years: json['years'] as int, + paymentNum: json['paymentNum'] as int, + dailyPaymentTypeVos: (json['dailyPaymentTypeVos'] as List) + .map((e) => DailyPaymentTypeVos.fromJson(e as Map)) + .toList(), + ); Map _$LifePayListModelToJson(LifePayListModel instance) => { @@ -24,15 +23,14 @@ Map _$LifePayListModelToJson(LifePayListModel instance) => instance.dailyPaymentTypeVos.map((e) => e.toJson()).toList(), }; -DailyPaymentTypeVos _$DailyPaymentTypeVosFromJson(Map json) { - return DailyPaymentTypeVos( - id: json['id'] as int, - name: json['name'] as String, - detailedVoList: (json['detailedVoList'] as List) - .map((e) => DetailedVoList.fromJson(e as Map)) - .toList(), - ); -} +DailyPaymentTypeVos _$DailyPaymentTypeVosFromJson(Map json) => + DailyPaymentTypeVos( + id: json['id'] as int, + name: json['name'] as String, + detailedVoList: (json['detailedVoList'] as List) + .map((e) => DetailedVoList.fromJson(e as Map)) + .toList(), + ); Map _$DailyPaymentTypeVosToJson( DailyPaymentTypeVos instance) => @@ -42,16 +40,15 @@ Map _$DailyPaymentTypeVosToJson( 'detailedVoList': instance.detailedVoList.map((e) => e.toJson()).toList(), }; -DetailedVoList _$DetailedVoListFromJson(Map json) { - return DetailedVoList( - groupId: json['groupId'] as int, - paymentPrice: json['paymentPrice'] as num, - overdueFine: json['overdueFine'] as num, - detailsVoList: (json['detailsVoList'] as List) - .map((e) => DetailsVoList.fromJson(e as Map)) - .toList(), - ); -} +DetailedVoList _$DetailedVoListFromJson(Map json) => + DetailedVoList( + groupId: json['groupId'] as int, + paymentPrice: json['paymentPrice'] as num, + overdueFine: json['overdueFine'] as num, + detailsVoList: (json['detailsVoList'] as List) + .map((e) => DetailsVoList.fromJson(e as Map)) + .toList(), + ); Map _$DetailedVoListToJson(DetailedVoList instance) => { @@ -61,24 +58,23 @@ Map _$DetailedVoListToJson(DetailedVoList instance) => 'detailsVoList': instance.detailsVoList.map((e) => e.toJson()).toList(), }; -DetailsVoList _$DetailsVoListFromJson(Map json) { - return DetailsVoList( - id: json['id'] as int, - month: json['month'] as String, - costPrice: json['costPrice'] as num, - paidPrice: json['paidPrice'] as num, - totalPrice: json['totalPrice'] as num, - beginDate: json['beginDate'] as String, - endDate: json['endDate'] as String, - unitPriceType: json['unitPriceType'] as String, - number: json['num'] as int, - paymentPrice: json['paymentPrice'] as num, - status: json['status'] as int, - rate: json['rate'] as num, - paymentTerm: json['paymentTerm'] as String, - overdueFine: json['overdueFine'] as num, - ); -} +DetailsVoList _$DetailsVoListFromJson(Map json) => + DetailsVoList( + id: json['id'] as int, + month: json['month'] as String, + costPrice: json['costPrice'] as num, + paidPrice: json['paidPrice'] as num, + totalPrice: json['totalPrice'] as num, + beginDate: json['beginDate'] as String, + endDate: json['endDate'] as String, + unitPriceType: json['unitPriceType'] as String, + number: json['num'] as int, + paymentPrice: json['paymentPrice'] as num, + status: json['status'] as int, + rate: json['rate'] as num, + paymentTerm: json['paymentTerm'] as String, + overdueFine: json['overdueFine'] as num, + ); Map _$DetailsVoListToJson(DetailsVoList instance) => { diff --git a/lib/models/life_pay/life_pay_record_model.g.dart b/lib/models/life_pay/life_pay_record_model.g.dart index 361eda36..f0dcef8c 100644 --- a/lib/models/life_pay/life_pay_record_model.g.dart +++ b/lib/models/life_pay/life_pay_record_model.g.dart @@ -6,16 +6,15 @@ part of 'life_pay_record_model.dart'; // JsonSerializableGenerator // ************************************************************************** -LifePayRecordModel _$LifePayRecordModelFromJson(Map json) { - return LifePayRecordModel( - id: json['id'] as int, - chargesTemplateDetailName: json['chargesTemplateDetailName'] as String, - roomName: json['roomName'] as String, - years: json['years'] as String, - paidPrice: json['paidPrice'] as num, - createName: json['createName'] as String, - createDate: json['createDate'] as String, - payType: json['payType'] as int, - code: json['code'] as String, - ); -} +LifePayRecordModel _$LifePayRecordModelFromJson(Map json) => + LifePayRecordModel( + id: json['id'] as int, + chargesTemplateDetailName: json['chargesTemplateDetailName'] as String, + roomName: json['roomName'] as String, + years: json['years'] as String, + paidPrice: json['paidPrice'] as num, + createName: json['createName'] as String, + createDate: json['createDate'] as String, + payType: json['payType'] as int, + code: json['code'] as String, + ); diff --git a/lib/models/life_pay/share_pay_list_model.g.dart b/lib/models/life_pay/share_pay_list_model.g.dart index 9dd3c668..89dfcfad 100644 --- a/lib/models/life_pay/share_pay_list_model.g.dart +++ b/lib/models/life_pay/share_pay_list_model.g.dart @@ -6,18 +6,19 @@ part of 'share_pay_list_model.dart'; // JsonSerializableGenerator // ************************************************************************** -SharePayListModel _$SharePayListModelFromJson(Map json) { - return SharePayListModel( - id: json['id'] as int, - months: json['months'] as String, - type: json['type'] as int, - num: json['num'] as int, - total: (json['total'] as num).toDouble(), - appMeterShareDetailsVos: (json['appMeterShareDetailsVos'] as List) - .map((e) => AppMeterShareDetailsVos.fromJson(e as Map)) - .toList(), - ); -} +SharePayListModel _$SharePayListModelFromJson(Map json) => + SharePayListModel( + id: json['id'] as int, + months: json['months'] as String, + type: json['type'] as int, + num: json['num'] as int, + total: (json['total'] as num).toDouble(), + appMeterShareDetailsVos: + (json['appMeterShareDetailsVos'] as List) + .map((e) => + AppMeterShareDetailsVos.fromJson(e as Map)) + .toList(), + ); Map _$SharePayListModelToJson(SharePayListModel instance) => { @@ -30,20 +31,19 @@ Map _$SharePayListModelToJson(SharePayListModel instance) => }; AppMeterShareDetailsVos _$AppMeterShareDetailsVosFromJson( - Map json) { - return AppMeterShareDetailsVos( - id: json['id'] as int, - houseArea: (json['houseArea'] as num).toDouble(), - amountPayable: (json['amountPayable'] as num).toDouble(), - paidAmount: (json['paidAmount'] as num).toDouble(), - remainingUnpaidAmount: (json['remainingUnpaidAmount'] as num).toDouble(), - status: json['status'] as int, - rate: (json['rate'] as num).toDouble(), - paymentPeriod: json['paymentPeriod'] as String, - paymentTime: json['paymentTime'] as String?, - lateFree: (json['lateFree'] as num).toDouble(), - ); -} + Map json) => + AppMeterShareDetailsVos( + id: json['id'] as int, + houseArea: (json['houseArea'] as num).toDouble(), + amountPayable: (json['amountPayable'] as num).toDouble(), + paidAmount: (json['paidAmount'] as num).toDouble(), + remainingUnpaidAmount: (json['remainingUnpaidAmount'] as num).toDouble(), + status: json['status'] as int, + rate: (json['rate'] as num).toDouble(), + paymentPeriod: json['paymentPeriod'] as String, + paymentTime: json['paymentTime'] as String?, + lateFree: (json['lateFree'] as num).toDouble(), + ); Map _$AppMeterShareDetailsVosToJson( AppMeterShareDetailsVos instance) => diff --git a/lib/models/life_pay/share_pay_record_model.g.dart b/lib/models/life_pay/share_pay_record_model.g.dart index 9ea0fc0f..ee03076f 100644 --- a/lib/models/life_pay/share_pay_record_model.g.dart +++ b/lib/models/life_pay/share_pay_record_model.g.dart @@ -6,16 +6,15 @@ part of 'share_pay_record_model.dart'; // JsonSerializableGenerator // ************************************************************************** -SharePayRecordModel _$SharePayRecordModelFromJson(Map json) { - return SharePayRecordModel( - payPrice: (json['payPrice'] as num).toDouble(), - paymentTime: json['paymentTime'] as String, - payType: json['payType'] as int, - code: json['code'] as String, - months: json['months'] as String, - effectiveTimeStart: json['effectiveTimeStart'] as String, - effectiveTimeEnd: json['effectiveTimeEnd'] as String, - shareUnitPrice: (json['shareUnitPrice'] as num).toDouble(), - indoorArea: (json['indoorArea'] as num).toDouble(), - ); -} +SharePayRecordModel _$SharePayRecordModelFromJson(Map json) => + SharePayRecordModel( + payPrice: (json['payPrice'] as num).toDouble(), + paymentTime: json['paymentTime'] as String, + payType: json['payType'] as int, + code: json['code'] as String, + months: json['months'] as String, + effectiveTimeStart: json['effectiveTimeStart'] as String, + effectiveTimeEnd: json['effectiveTimeEnd'] as String, + shareUnitPrice: (json['shareUnitPrice'] as num).toDouble(), + indoorArea: (json['indoorArea'] as num).toDouble(), + ); diff --git a/lib/models/manage/fix_report/fix_detail_model.g.dart b/lib/models/manage/fix_report/fix_detail_model.g.dart index 14472be0..aa267177 100644 --- a/lib/models/manage/fix_report/fix_detail_model.g.dart +++ b/lib/models/manage/fix_report/fix_detail_model.g.dart @@ -6,63 +6,58 @@ part of 'fix_detail_model.dart'; // JsonSerializableGenerator // ************************************************************************** -FixDetailModel _$FixDetailModelFromJson(Map json) { - return FixDetailModel( - appReportRepairVo: AppReportRepairVo.fromJson( - json['appReportRepairVo'] as Map), - appProcessRecordVo: (json['appProcessRecordVo'] as List) - .map((e) => AppProcessRecordVo.fromJson(e as Map)) - .toList(), - appMaintenanceResultVo: json['appMaintenanceResultVo'] == null - ? null - : AppMaintenanceResultVo.fromJson( - json['appMaintenanceResultVo'] as Map), - appDispatchListVo: json['appDispatchListVo'] == null - ? null - : AppDispatchListVo.fromJson( - json['appDispatchListVo'] as Map), - ); -} +FixDetailModel _$FixDetailModelFromJson(Map json) => + FixDetailModel( + appReportRepairVo: AppReportRepairVo.fromJson( + json['appReportRepairVo'] as Map), + appProcessRecordVo: (json['appProcessRecordVo'] as List) + .map((e) => AppProcessRecordVo.fromJson(e as Map)) + .toList(), + appMaintenanceResultVo: json['appMaintenanceResultVo'] == null + ? null + : AppMaintenanceResultVo.fromJson( + json['appMaintenanceResultVo'] as Map), + appDispatchListVo: json['appDispatchListVo'] == null + ? null + : AppDispatchListVo.fromJson( + json['appDispatchListVo'] as Map), + ); -AppReportRepairVo _$AppReportRepairVoFromJson(Map json) { - return AppReportRepairVo( - roomName: json['roomName'] as String, - id: json['id'] as int, - type: json['type'] as int, - status: json['status'] as int, - reportDetail: json['reportDetail'] as String, - imgUrls: (json['imgUrls'] as List) - .map((e) => ImgModel.fromJson(e as Map)) - .toList(), - ); -} +AppReportRepairVo _$AppReportRepairVoFromJson(Map json) => + AppReportRepairVo( + roomName: json['roomName'] as String, + id: json['id'] as int, + type: json['type'] as int, + status: json['status'] as int, + reportDetail: json['reportDetail'] as String, + imgUrls: (json['imgUrls'] as List) + .map((e) => ImgModel.fromJson(e as Map)) + .toList(), + ); -AppProcessRecordVo _$AppProcessRecordVoFromJson(Map json) { - return AppProcessRecordVo( - operationDate: json['operationDate'] as String, - operationType: json['operationType'] as int, - ); -} +AppProcessRecordVo _$AppProcessRecordVoFromJson(Map json) => + AppProcessRecordVo( + operationDate: json['operationDate'] as String, + operationType: json['operationType'] as int, + ); -AppDispatchListVo _$AppDispatchListVoFromJson(Map json) { - return AppDispatchListVo( - code: json['code'] as String, - orderDate: json['orderDate'] as String, - type: json['type'] as int, - operatorName: json['operatorName'] as String, - distributorName: json['distributorName'] as String, - ); -} +AppDispatchListVo _$AppDispatchListVoFromJson(Map json) => + AppDispatchListVo( + code: json['code'] as String, + orderDate: json['orderDate'] as String, + type: json['type'] as int, + operatorName: json['operatorName'] as String, + distributorName: json['distributorName'] as String, + ); AppMaintenanceResultVo _$AppMaintenanceResultVoFromJson( - Map json) { - return AppMaintenanceResultVo( - id: json['id'] as int, - laborCost: json['laborCost'] as num?, - materialCost: json['materialCost'] as num?, - totalCost: json['totalCost'] as num?, - imgUrls: (json['imgUrls'] as List) - .map((e) => ImgModel.fromJson(e as Map)) - .toList(), - ); -} + Map json) => + AppMaintenanceResultVo( + id: json['id'] as int, + laborCost: json['laborCost'] as num?, + materialCost: json['materialCost'] as num?, + totalCost: json['totalCost'] as num?, + imgUrls: (json['imgUrls'] as List) + .map((e) => ImgModel.fromJson(e as Map)) + .toList(), + ); diff --git a/lib/models/market/goods_detail_model.g.dart b/lib/models/market/goods_detail_model.g.dart index 25df0a79..bbb30bff 100644 --- a/lib/models/market/goods_detail_model.g.dart +++ b/lib/models/market/goods_detail_model.g.dart @@ -6,27 +6,26 @@ part of 'goods_detail_model.dart'; // JsonSerializableGenerator // ************************************************************************** -GoodsDetailModel _$GoodsDetailModelFromJson(Map json) { - return GoodsDetailModel( - json['id'] as int, - json['recommend'] as String, - json['title'] as String, - (json['sellingPrice'] as num).toDouble(), - (json['markingPrice'] as num).toDouble(), - json['categoryName'] as String, - json['subscribeNum'] as int, - json['detail'] as String, - json['arrivalTime'] as String?, - (json['goodsImgList'] as List) - .map((e) => ImgModel.fromJson(e as Map)) - .toList(), - json['supplierId'] as int, - json['supplierName'] as String, - json['supplierTel'] as String, - json['supplierAddress'] as String?, - (json['supplierImgList'] as List) - .map((e) => ImgModel.fromJson(e as Map)) - .toList(), - json['isSubscribe'] as int, - ); -} +GoodsDetailModel _$GoodsDetailModelFromJson(Map json) => + GoodsDetailModel( + json['id'] as int, + json['recommend'] as String, + json['title'] as String, + (json['sellingPrice'] as num).toDouble(), + (json['markingPrice'] as num).toDouble(), + json['categoryName'] as String, + json['subscribeNum'] as int, + json['detail'] as String, + json['arrivalTime'] as String?, + (json['goodsImgList'] as List) + .map((e) => ImgModel.fromJson(e as Map)) + .toList(), + json['supplierId'] as int, + json['supplierName'] as String, + json['supplierTel'] as String, + json['supplierAddress'] as String?, + (json['supplierImgList'] as List) + .map((e) => ImgModel.fromJson(e as Map)) + .toList(), + json['isSubscribe'] as int, + ); diff --git a/lib/models/market/goods_item.g.dart b/lib/models/market/goods_item.g.dart index f446023f..d06e886b 100644 --- a/lib/models/market/goods_item.g.dart +++ b/lib/models/market/goods_item.g.dart @@ -6,16 +6,14 @@ part of 'goods_item.dart'; // JsonSerializableGenerator // ************************************************************************** -GoodsItem _$GoodsItemFromJson(Map json) { - return GoodsItem( - id: json['id'] as int, - title: json['title'] as String, - recommend: json['recommend'] as String, - sellingPrice: json['sellingPrice'] as num, - markingPrice: json['markingPrice'] as num, - subscribeNum: json['subscribeNum'] as int, - imgList: (json['imgList'] as List) - .map((e) => ImgModel.fromJson(e as Map)) - .toList(), - ); -} +GoodsItem _$GoodsItemFromJson(Map json) => GoodsItem( + id: json['id'] as int, + title: json['title'] as String, + recommend: json['recommend'] as String, + sellingPrice: json['sellingPrice'] as num, + markingPrice: json['markingPrice'] as num, + subscribeNum: json['subscribeNum'] as int, + imgList: (json['imgList'] as List) + .map((e) => ImgModel.fromJson(e as Map)) + .toList(), + ); diff --git a/lib/models/market/market_category_model.g.dart b/lib/models/market/market_category_model.g.dart index a56d8934..a520fa3d 100644 --- a/lib/models/market/market_category_model.g.dart +++ b/lib/models/market/market_category_model.g.dart @@ -6,12 +6,11 @@ part of 'market_category_model.dart'; // JsonSerializableGenerator // ************************************************************************** -MarketCategoryModel _$MarketCategoryModelFromJson(Map json) { - return MarketCategoryModel( - id: json['id'] as int, - name: json['name'] as String, - imgList: (json['imgList'] as List) - .map((e) => ImgModel.fromJson(e as Map)) - .toList(), - ); -} +MarketCategoryModel _$MarketCategoryModelFromJson(Map json) => + MarketCategoryModel( + id: json['id'] as int, + name: json['name'] as String, + imgList: (json['imgList'] as List) + .map((e) => ImgModel.fromJson(e as Map)) + .toList(), + ); diff --git a/lib/models/market/order/my_order_list_model.g.dart b/lib/models/market/order/my_order_list_model.g.dart index d1a17d23..c3d7a24a 100644 --- a/lib/models/market/order/my_order_list_model.g.dart +++ b/lib/models/market/order/my_order_list_model.g.dart @@ -6,34 +6,33 @@ part of 'my_order_list_model.dart'; // JsonSerializableGenerator // ************************************************************************** -MyOrderListModel _$MyOrderListModelFromJson(Map json) { - return MyOrderListModel( - id: json['id'] as int, - code: json['code'] as String, - goodsId: json['goodsId'] as int, - goodsName: json['goodsName'] as String, - backType: json['backType'] as int?, - goodsImgList: (json['goodsImgList'] as List) - .map((e) => ImgModel.fromJson(e as Map)) - .toList(), - sellingPrice: (json['sellingPrice'] as num).toDouble(), - markingPrice: (json['markingPrice'] as num?)?.toDouble(), - num: json['num'] as int, - supplierName: json['supplierName'] as String, - levelOneCategory: json['levelOneCategory'] as String, - levelTwoCategory: json['levelTwoCategory'] as String, - status: json['status'] as int, - sendDate: json['sendDate'] as String?, - sendDetail: json['sendDetail'] as String?, - arrivalDate: json['arrivalDate'] as String?, - receivingDate: json['receivingDate'] as String?, - backDate: json['backDate'] as String?, - backReason: json['backReason'] as String?, - reason: json['reason'] as String?, - score: json['score'] as int?, - evaluationDate: json['evaluationDate'] as String?, - evaluationReason: json['evaluationReason'] as String?, - createDate: json['createDate'] as String?, - arrivalTime: json['arrivalTime'] as String, - ); -} +MyOrderListModel _$MyOrderListModelFromJson(Map json) => + MyOrderListModel( + id: json['id'] as int, + code: json['code'] as String, + goodsId: json['goodsId'] as int, + goodsName: json['goodsName'] as String, + backType: json['backType'] as int?, + goodsImgList: (json['goodsImgList'] as List) + .map((e) => ImgModel.fromJson(e as Map)) + .toList(), + sellingPrice: (json['sellingPrice'] as num).toDouble(), + markingPrice: (json['markingPrice'] as num?)?.toDouble(), + num: json['num'] as int, + supplierName: json['supplierName'] as String, + levelOneCategory: json['levelOneCategory'] as String, + levelTwoCategory: json['levelTwoCategory'] as String, + status: json['status'] as int, + sendDate: json['sendDate'] as String?, + sendDetail: json['sendDetail'] as String?, + arrivalDate: json['arrivalDate'] as String?, + receivingDate: json['receivingDate'] as String?, + backDate: json['backDate'] as String?, + backReason: json['backReason'] as String?, + reason: json['reason'] as String?, + score: json['score'] as int?, + evaluationDate: json['evaluationDate'] as String?, + evaluationReason: json['evaluationReason'] as String?, + createDate: json['createDate'] as String?, + arrivalTime: json['arrivalTime'] as String, + ); diff --git a/lib/models/market/order/order_detail_model.g.dart b/lib/models/market/order/order_detail_model.g.dart index 0126382b..e6276882 100644 --- a/lib/models/market/order/order_detail_model.g.dart +++ b/lib/models/market/order/order_detail_model.g.dart @@ -6,34 +6,33 @@ part of 'order_detail_model.dart'; // JsonSerializableGenerator // ************************************************************************** -OrderDetailModel _$OrderDetailModelFromJson(Map json) { - return OrderDetailModel( - id: json['id'] as int, - code: json['code'] as String, - goodsId: json['goodsId'] as int, - goodsName: json['goodsName'] as String, - backType: json['backType'] as int?, - goodsImgList: (json['goodsImgList'] as List) - .map((e) => ImgModel.fromJson(e as Map)) - .toList(), - sellingPrice: json['sellingPrice'] as num?, - markingPrice: json['markingPrice'] as num?, - count: json['num'] as int, - supplierId: json['supplierId'] as int?, - supplierName: json['supplierName'] as String?, - levelOneCategory: json['levelOneCategory'] as String?, - levelTwoCategory: json['levelTwoCategory'] as String?, - status: json['status'] as int?, - sendDate: json['sendDate'] as String?, - sendDetail: json['sendDetail'] as String?, - arrivalDate: json['arrivalDate'] as String?, - receivingDate: json['receivingDate'] as String?, - backDate: json['backDate'] as String?, - backReason: json['backReason'] as String?, - score: json['score'] as String?, - evaluationDate: json['evaluationDate'] as String?, - evaluationReason: json['evaluationReason'] as String?, - arrivalTime: json['arrivalTime'] as String?, - createDate: json['createDate'] as String?, - ); -} +OrderDetailModel _$OrderDetailModelFromJson(Map json) => + OrderDetailModel( + id: json['id'] as int, + code: json['code'] as String, + goodsId: json['goodsId'] as int, + goodsName: json['goodsName'] as String, + backType: json['backType'] as int?, + goodsImgList: (json['goodsImgList'] as List) + .map((e) => ImgModel.fromJson(e as Map)) + .toList(), + sellingPrice: json['sellingPrice'] as num?, + markingPrice: json['markingPrice'] as num?, + count: json['num'] as int, + supplierId: json['supplierId'] as int?, + supplierName: json['supplierName'] as String?, + levelOneCategory: json['levelOneCategory'] as String?, + levelTwoCategory: json['levelTwoCategory'] as String?, + status: json['status'] as int?, + sendDate: json['sendDate'] as String?, + sendDetail: json['sendDetail'] as String?, + arrivalDate: json['arrivalDate'] as String?, + receivingDate: json['receivingDate'] as String?, + backDate: json['backDate'] as String?, + backReason: json['backReason'] as String?, + score: json['score'] as String?, + evaluationDate: json['evaluationDate'] as String?, + evaluationReason: json['evaluationReason'] as String?, + arrivalTime: json['arrivalTime'] as String?, + createDate: json['createDate'] as String?, + ); diff --git a/lib/models/market/shop_car/shop_car_list_model.g.dart b/lib/models/market/shop_car/shop_car_list_model.g.dart index e1f84cc6..e460ff88 100644 --- a/lib/models/market/shop_car/shop_car_list_model.g.dart +++ b/lib/models/market/shop_car/shop_car_list_model.g.dart @@ -6,18 +6,17 @@ part of 'shop_car_list_model.dart'; // JsonSerializableGenerator // ************************************************************************** -ShopCarListModel _$ShopCarListModelFromJson(Map json) { - return ShopCarListModel( - id: json['id'] as int?, - skuName: json['skuName'] as String?, - mainPhoto: json['mainPhoto'] as String?, - status: json['status'] as int?, - shopStatus: json['shopStatus'] as int?, - sellPrice: (json['sellPrice'] as num?)?.toDouble(), - discountPrice: (json['discountPrice'] as num?)?.toDouble(), - unit: json['unit'] as String?, - kind: json['kind'] as int?, - weight: (json['weight'] as num?)?.toDouble(), - num: json['num'] as int?, - ); -} +ShopCarListModel _$ShopCarListModelFromJson(Map json) => + ShopCarListModel( + id: json['id'] as int?, + skuName: json['skuName'] as String?, + mainPhoto: json['mainPhoto'] as String?, + status: json['status'] as int?, + shopStatus: json['shopStatus'] as int?, + sellPrice: (json['sellPrice'] as num?)?.toDouble(), + discountPrice: (json['discountPrice'] as num?)?.toDouble(), + unit: json['unit'] as String?, + kind: json['kind'] as int?, + weight: (json['weight'] as num?)?.toDouble(), + num: json['num'] as int?, + ); diff --git a/lib/models/message/announce_list_model.dart b/lib/models/message/announce_list_model.dart new file mode 100644 index 00000000..4ac6e0d8 --- /dev/null +++ b/lib/models/message/announce_list_model.dart @@ -0,0 +1,41 @@ +import 'package:flustars/flustars.dart'; +import 'package:json_annotation/json_annotation.dart'; + +part 'announce_list_model.g.dart'; + +@JsonSerializable() +class AnnounceListModel { + final int id; + final String date; + final String title; + final String content; + + String get month { + var date = DateUtil.getDateTime(this.date); + return date!.year.toString() + '年' + date.month.toString() + '月'; + } + + factory AnnounceListModel.fromJson(Map json) => + _$AnnounceListModelFromJson(json); + + const AnnounceListModel({ + required this.id, + required this.date, + required this.title, + required this.content, + }); + + AnnounceListModel copyWith({ + int? id, + String? date, + String? title, + String? content, + }) { + return AnnounceListModel( + id: id ?? this.id, + date: date ?? this.date, + title: title ?? this.title, + content: content ?? this.content, + ); + } +} diff --git a/lib/models/message/announce_list_model.g.dart b/lib/models/message/announce_list_model.g.dart new file mode 100644 index 00000000..4d06861e --- /dev/null +++ b/lib/models/message/announce_list_model.g.dart @@ -0,0 +1,15 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'announce_list_model.dart'; + +// ************************************************************************** +// JsonSerializableGenerator +// ************************************************************************** + +AnnounceListModel _$AnnounceListModelFromJson(Map json) => + AnnounceListModel( + id: json['id'] as int, + date: json['date'] as String, + title: json['title'] as String, + content: json['content'] as String, + ); diff --git a/lib/models/message/reply_list_model.dart b/lib/models/message/reply_list_model.dart new file mode 100644 index 00000000..a54b89da --- /dev/null +++ b/lib/models/message/reply_list_model.dart @@ -0,0 +1,27 @@ +import 'package:aku_new_community/model/common/img_model.dart'; +import 'package:json_annotation/json_annotation.dart'; + +part 'reply_list_model.g.dart'; + +@JsonSerializable() +class ReplyListModel { + final int id; + final String name; + final String date; + final String content; + final ImgModel img; + final String title; + final ImgModel pic; + factory ReplyListModel.fromJson(Map json) => + _$ReplyListModelFromJson(json); + + const ReplyListModel({ + required this.id, + required this.name, + required this.date, + required this.content, + required this.img, + required this.title, + required this.pic, + }); +} diff --git a/lib/models/message/reply_list_model.g.dart b/lib/models/message/reply_list_model.g.dart new file mode 100644 index 00000000..882ccfee --- /dev/null +++ b/lib/models/message/reply_list_model.g.dart @@ -0,0 +1,18 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'reply_list_model.dart'; + +// ************************************************************************** +// JsonSerializableGenerator +// ************************************************************************** + +ReplyListModel _$ReplyListModelFromJson(Map json) => + ReplyListModel( + id: json['id'] as int, + name: json['name'] as String, + date: json['date'] as String, + content: json['content'] as String, + img: ImgModel.fromJson(json['img'] as Map), + title: json['title'] as String, + pic: ImgModel.fromJson(json['pic'] as Map), + ); diff --git a/lib/models/new_renovation/new_renovation_list_model.g.dart b/lib/models/new_renovation/new_renovation_list_model.g.dart index 43cc91ff..c4fbcb57 100644 --- a/lib/models/new_renovation/new_renovation_list_model.g.dart +++ b/lib/models/new_renovation/new_renovation_list_model.g.dart @@ -7,40 +7,38 @@ part of 'new_renovation_list_model.dart'; // ************************************************************************** NewRenovationListModel _$NewRenovationListModelFromJson( - Map json) { - return NewRenovationListModel( - id: json['id'] as int, - roomName: json['roomName'] as String, - status: json['status'] as int, - constructionUnit: json['constructionUnit'] as String, - director: json['director'] as String, - directorTel: json['directorTel'] as String, - expectedBegin: json['expectedBegin'] as String, - expectedEnd: json['expectedEnd'] as String, - actualBegin: json['actualBegin'] as String?, - actualEnd: json['actualEnd'] as String?, - rejectReason: json['rejectReason'] as String?, - reviewerName: json['reviewerName'] as String?, - auditDate: json['auditDate'] as String?, - trackerName: json['trackerName'] as String?, - applicationCheckDate: json['applicationCheckDate'] as String?, - isQualified: json['isQualified'] as int?, - createName: json['createName'] as String, - createDate: json['createDate'] as String, - checkVoList: (json['checkVoList'] as List) - .map((e) => - e == null ? null : CheckVoList.fromJson(e as Map)) - .toList(), - ); -} + Map json) => + NewRenovationListModel( + id: json['id'] as int, + roomName: json['roomName'] as String, + status: json['status'] as int, + constructionUnit: json['constructionUnit'] as String, + director: json['director'] as String, + directorTel: json['directorTel'] as String, + expectedBegin: json['expectedBegin'] as String, + expectedEnd: json['expectedEnd'] as String, + actualBegin: json['actualBegin'] as String?, + actualEnd: json['actualEnd'] as String?, + rejectReason: json['rejectReason'] as String?, + reviewerName: json['reviewerName'] as String?, + auditDate: json['auditDate'] as String?, + trackerName: json['trackerName'] as String?, + applicationCheckDate: json['applicationCheckDate'] as String?, + isQualified: json['isQualified'] as int?, + createName: json['createName'] as String, + createDate: json['createDate'] as String, + checkVoList: (json['checkVoList'] as List) + .map((e) => e == null + ? null + : CheckVoList.fromJson(e as Map)) + .toList(), + ); -CheckVoList _$CheckVoListFromJson(Map json) { - return CheckVoList( - id: json['id'] as int, - decorationNewId: json['decorationNewId'] as int, - detail: json['detail'] as String, - isQualified: json['isQualified'] as int, - createName: json['createName'] as String, - createDate: json['createDate'] as String, - ); -} +CheckVoList _$CheckVoListFromJson(Map json) => CheckVoList( + id: json['id'] as int, + decorationNewId: json['decorationNewId'] as int, + detail: json['detail'] as String, + isQualified: json['isQualified'] as int, + createName: json['createName'] as String, + createDate: json['createDate'] as String, + ); diff --git a/lib/models/news/news_category_model.g.dart b/lib/models/news/news_category_model.g.dart index 5b68fb75..c27aeaf4 100644 --- a/lib/models/news/news_category_model.g.dart +++ b/lib/models/news/news_category_model.g.dart @@ -6,9 +6,8 @@ part of 'news_category_model.dart'; // JsonSerializableGenerator // ************************************************************************** -NewsCategoryModel _$NewsCategoryModelFromJson(Map json) { - return NewsCategoryModel( - id: json['id'] as int, - name: json['name'] as String, - ); -} +NewsCategoryModel _$NewsCategoryModelFromJson(Map json) => + NewsCategoryModel( + id: json['id'] as int, + name: json['name'] as String, + ); diff --git a/lib/models/news/news_detail_model.g.dart b/lib/models/news/news_detail_model.g.dart index 3f9844b5..2e9a6549 100644 --- a/lib/models/news/news_detail_model.g.dart +++ b/lib/models/news/news_detail_model.g.dart @@ -6,14 +6,13 @@ part of 'news_detail_model.dart'; // JsonSerializableGenerator // ************************************************************************** -NewsDetailModel _$NewsDetailModelFromJson(Map json) { - return NewsDetailModel( - id: json['id'] as int, - code: json['code'] as String, - title: json['title'] as String, - content: json['content'] as String, - newsCategoryName: json['newsCategoryName'] as String, - createName: json['createName'] as String, - createDate: json['createDate'] as String, - ); -} +NewsDetailModel _$NewsDetailModelFromJson(Map json) => + NewsDetailModel( + id: json['id'] as int, + code: json['code'] as String, + title: json['title'] as String, + content: json['content'] as String, + newsCategoryName: json['newsCategoryName'] as String, + createName: json['createName'] as String, + createDate: json['createDate'] as String, + ); diff --git a/lib/models/news/news_item_model.g.dart b/lib/models/news/news_item_model.g.dart index a5c0fa91..4009ea79 100644 --- a/lib/models/news/news_item_model.g.dart +++ b/lib/models/news/news_item_model.g.dart @@ -6,13 +6,12 @@ part of 'news_item_model.dart'; // JsonSerializableGenerator // ************************************************************************** -NewsItemModel _$NewsItemModelFromJson(Map json) { - return NewsItemModel( - id: json['id'] as int, - title: json['title'] as String, - createDate: json['createDate'] as String, - imgList: (json['imgList'] as List) - .map((e) => ImgModel.fromJson(e as Map)) - .toList(), - ); -} +NewsItemModel _$NewsItemModelFromJson(Map json) => + NewsItemModel( + id: json['id'] as int, + title: json['title'] as String, + createDate: json['createDate'] as String, + imgList: (json['imgList'] as List) + .map((e) => ImgModel.fromJson(e as Map)) + .toList(), + ); diff --git a/lib/models/pay/pay_model.g.dart b/lib/models/pay/pay_model.g.dart index 751bffe5..3d147fd0 100644 --- a/lib/models/pay/pay_model.g.dart +++ b/lib/models/pay/pay_model.g.dart @@ -6,26 +6,23 @@ part of 'pay_model.dart'; // JsonSerializableGenerator // ************************************************************************** -PayModel _$PayModelFromJson(Map json) { - return PayModel( - aliPayTradeAppPayResponse: AliPayTradeAppPayResponse.fromJson( - json['alipay_trade_app_pay_response'] as Map), - sign: json['sign'] as String, - signType: json['sign_type'] as String, - ); -} +PayModel _$PayModelFromJson(Map json) => PayModel( + aliPayTradeAppPayResponse: AliPayTradeAppPayResponse.fromJson( + json['alipay_trade_app_pay_response'] as Map), + sign: json['sign'] as String, + signType: json['sign_type'] as String, + ); AliPayTradeAppPayResponse _$AliPayTradeAppPayResponseFromJson( - Map json) { - return AliPayTradeAppPayResponse( - code: json['code'] as String, - msg: json['msg'] as String, - appId: json['app_id'] as String, - outTradeNo: json['out_trade_no'] as String, - tradeNo: json['trade_no'] as String, - totalAmount: json['total_amount'] as String, - sellerId: json['seller_id'] as String, - charset: json['charset'] as String, - timestamp: json['timestamp'] as String, - ); -} + Map json) => + AliPayTradeAppPayResponse( + code: json['code'] as String, + msg: json['msg'] as String, + appId: json['app_id'] as String, + outTradeNo: json['out_trade_no'] as String, + tradeNo: json['trade_no'] as String, + totalAmount: json['total_amount'] as String, + sellerId: json['seller_id'] as String, + charset: json['charset'] as String, + timestamp: json['timestamp'] as String, + ); diff --git a/lib/models/search/search_model.g.dart b/lib/models/search/search_model.g.dart index f9ea6d63..f77e0b12 100644 --- a/lib/models/search/search_model.g.dart +++ b/lib/models/search/search_model.g.dart @@ -6,17 +6,15 @@ part of 'search_model.dart'; // JsonSerializableGenerator // ************************************************************************** -SearchModel _$SearchModelFromJson(Map json) { - return SearchModel( - activityVoList: (json['activityVoList'] as List) - .map((e) => e == null - ? null - : ActivityItemModel.fromJson(e as Map)) - .toList(), - gambitVoList: (json['gambitVoList'] as List) - .map((e) => e == null - ? null - : CommunityTopicModel.fromJson(e as Map)) - .toList(), - ); -} +SearchModel _$SearchModelFromJson(Map json) => SearchModel( + activityVoList: (json['activityVoList'] as List) + .map((e) => e == null + ? null + : ActivityItemModel.fromJson(e as Map)) + .toList(), + gambitVoList: (json['gambitVoList'] as List) + .map((e) => e == null + ? null + : CommunityTopicModel.fromJson(e as Map)) + .toList(), + ); diff --git a/lib/models/service_browse/service_browse_list_mode.g.dart b/lib/models/service_browse/service_browse_list_mode.g.dart index a9f771c3..725aa1c1 100644 --- a/lib/models/service_browse/service_browse_list_mode.g.dart +++ b/lib/models/service_browse/service_browse_list_mode.g.dart @@ -7,11 +7,10 @@ part of 'service_browse_list_mode.dart'; // ************************************************************************** ServiceBrowseListModel _$ServiceBrowseListModelFromJson( - Map json) { - return ServiceBrowseListModel( - id: json['id'] as int, - name: json['name'] as String, - content: json['content'] as String, - createDate: json['createDate'] as String, - ); -} + Map json) => + ServiceBrowseListModel( + id: json['id'] as int, + name: json['name'] as String, + content: json['content'] as String, + createDate: json['createDate'] as String, + ); diff --git a/lib/models/user/passed_house_list_model.g.dart b/lib/models/user/passed_house_list_model.g.dart index 123ff0ce..7266fc7f 100644 --- a/lib/models/user/passed_house_list_model.g.dart +++ b/lib/models/user/passed_house_list_model.g.dart @@ -6,14 +6,14 @@ part of 'passed_house_list_model.dart'; // JsonSerializableGenerator // ************************************************************************** -PassedHouseListModel _$PassedHouseListModelFromJson(Map json) { - return PassedHouseListModel( - id: json['id'] as int, - estateId: json['estateId'] as int, - roomName: json['roomName'] as String, - type: json['type'] as int, - effectiveTimeStart: json['effectiveTimeStart'] as String?, - effectiveTimeEnd: json['effectiveTimeEnd'] as String?, - sysLeaseId: json['sysLeaseId'] as int?, - ); -} +PassedHouseListModel _$PassedHouseListModelFromJson( + Map json) => + PassedHouseListModel( + id: json['id'] as int, + estateId: json['estateId'] as int, + roomName: json['roomName'] as String, + type: json['type'] as int, + effectiveTimeStart: json['effectiveTimeStart'] as String?, + effectiveTimeEnd: json['effectiveTimeEnd'] as String?, + sysLeaseId: json['sysLeaseId'] as int?, + ); diff --git a/lib/models/user/user_info_model.g.dart b/lib/models/user/user_info_model.g.dart index e2caeb9c..3c61206c 100644 --- a/lib/models/user/user_info_model.g.dart +++ b/lib/models/user/user_info_model.g.dart @@ -6,16 +6,15 @@ part of 'user_info_model.dart'; // JsonSerializableGenerator // ************************************************************************** -UserInfoModel _$UserInfoModelFromJson(Map json) { - return UserInfoModel( - id: json['id'] as int, - imgUrls: (json['imgUrls'] as List) - .map((e) => ImgModel.fromJson(e as Map)) - .toList(), - name: json['name'] as String?, - nickName: json['nickName'] as String, - tel: json['tel'] as String, - sex: json['sex'] as int?, - birthday: json['birthday'] as String?, - ); -} +UserInfoModel _$UserInfoModelFromJson(Map json) => + UserInfoModel( + id: json['id'] as int, + imgUrls: (json['imgUrls'] as List) + .map((e) => ImgModel.fromJson(e as Map)) + .toList(), + name: json['name'] as String?, + nickName: json['nickName'] as String, + tel: json['tel'] as String, + sex: json['sex'] as int?, + birthday: json['birthday'] as String?, + ); diff --git a/lib/pages/event_activity/voting_detail_page.dart b/lib/pages/event_activity/voting_detail_page.dart index 9641c4cf..d9d5aa26 100644 --- a/lib/pages/event_activity/voting_detail_page.dart +++ b/lib/pages/event_activity/voting_detail_page.dart @@ -15,7 +15,6 @@ import 'package:flutter/cupertino.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 VotingDetailPage extends StatefulWidget { final int? id; diff --git a/lib/pages/goods_deto_page/deto_create_page/widget/common_radio.dart b/lib/pages/goods_deto_page/deto_create_page/widget/common_radio.dart index b09acebc..e02f148c 100644 --- a/lib/pages/goods_deto_page/deto_create_page/widget/common_radio.dart +++ b/lib/pages/goods_deto_page/deto_create_page/widget/common_radio.dart @@ -1,6 +1,5 @@ import 'package:aku_new_community/base/base_style.dart'; import 'package:aku_new_community/utils/headers.dart'; -import 'package:aku_new_community/widget/animated/animated_scale.dart'; import 'package:flutter/material.dart'; class CommonRadio extends StatefulWidget { @@ -46,6 +45,7 @@ class _CommonRadioState extends State { opacity: _selected ? 1 : 0, child: AnimatedScale( scale: _selected ? 1 : 0, + duration: Duration(milliseconds: 500), child: Container( height: smallSize, width: smallSize, 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 85485fef..f1d30c75 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 @@ -5,7 +5,6 @@ import 'package:aku_new_community/model/common/img_model.dart'; import 'package:aku_new_community/model/manager/article_borrow_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/animated/animated_scale.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'; @@ -105,6 +104,7 @@ class _BorrowGoodsDetailPageState extends State { opacity: allSelect ? 1 : 0, child: AnimatedScale( scale: allSelect ? 1 : 0, + duration: Duration(milliseconds: 500), child: Container( height: 24.w, width: 24.w, 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 468900c7..b6152aa3 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 @@ -6,7 +6,6 @@ import 'package:aku_new_community/model/manager/article_return_list_model.dart'; import 'package:aku_new_community/pages/goods_manage_page/borrow/borrow_examine_page.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/animated/animated_scale.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'; @@ -98,6 +97,7 @@ class _ReturnGoodsDetailPageState extends State { opacity: allSelect ? 1 : 0, child: AnimatedScale( scale: allSelect ? 1 : 0, + duration: Duration(milliseconds: 500), child: Container( height: 24.w, width: 24.w, diff --git a/lib/pages/message_center_page/announce/announce_card.dart b/lib/pages/message_center_page/announce/announce_card.dart new file mode 100644 index 00000000..db89b0e5 --- /dev/null +++ b/lib/pages/message_center_page/announce/announce_card.dart @@ -0,0 +1,85 @@ +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/message/announce_list_model.dart'; +import 'package:aku_new_community/pages/message_center_page/announce/announce_view.dart'; +import 'package:flustars/flustars.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'; + +class AnnounceCard extends StatelessWidget { + final ListDateModel modelList; + final int index; + const AnnounceCard({ + Key? key, + required this.modelList, + required this.index, + }) : super(key: key); + + @override + Widget build(BuildContext context) { + return Column( + mainAxisSize: MainAxisSize.min, + children: [ + Container( + padding: EdgeInsets.symmetric(horizontal: 32.w), + alignment: Alignment.centerLeft, + width: double.infinity, + height: 98.w, + child: modelList.month.text.size(36.sp).black.make(), + ), + ...modelList.models + .map((e) => _card(e)) + .toList() + .sepWidget(separate: 10.heightBox) + ], + ); + } + + Widget _card(AnnounceListModel model) { + return Container( + color: Colors.white, + padding: EdgeInsets.symmetric(horizontal: 32.w, vertical: 24.w), + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + '${DateUtil.formatDateStr(model.date, format: 'dd日 HH:mm')}' + .text + .size(28.sp) + .color(ktextSubColor) + .make(), + 32.w.heightBox, + '${model.title}'.text.size(36.sp).black.bold.make(), + 32.w.heightBox, + '${model.content}'.text.size(28.sp).color(ktextSubColor).make(), + 40.w.heightBox, + Container( + height: 72.w, + decoration: BoxDecoration( + border: Border( + top: BorderSide( + color: Color(0xFF000000).withOpacity(0.06), + ), + ), + ), + child: InkWell( + onTap: () {}, + child: Row( + children: [ + '查看详情'.text.size(24.w).color(ktextSubColor).make(), + Spacer(), + Icon( + CupertinoIcons.chevron_down, + size: 20.w, + ) + ], + ), + ), + ), + ], + ), + ); + } +} diff --git a/lib/pages/message_center_page/announce/announce_view.dart b/lib/pages/message_center_page/announce/announce_view.dart new file mode 100644 index 00000000..a699f871 --- /dev/null +++ b/lib/pages/message_center_page/announce/announce_view.dart @@ -0,0 +1,190 @@ +import 'package:aku_new_community/models/message/announce_list_model.dart'; +import 'package:aku_new_community/pages/message_center_page/announce/announce_card.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'; + +class ListDateModel { + final String month; + final int index; + final List models; + + ListDateModel(this.month, this.models, this.index); +} + +class AnnounceView extends StatefulWidget { + const AnnounceView({ + Key? key, + }) : super(key: key); + + @override + _AnnounceViewState createState() => _AnnounceViewState(); +} + +class _AnnounceViewState extends State { + EasyRefreshController _refreshController = EasyRefreshController(); + late AutoScrollController _autoScrollController; + + List _modelLists = []; + String _headMonth = ''; + + void monthListDepart(List models) { + for (var item in models) { + var index = + _modelLists.indexWhere((element) => element.month == item.month); + if (index >= 0) { + _modelLists[index].models.add(item.copyWith()); + } else { + _modelLists.insert(_modelLists.length, + ListDateModel(item.month, [item.copyWith()], _modelLists.length)); + } + } + } + + @override + void initState() { + _autoScrollController = AutoScrollController( + viewportBoundaryGetter: () => + Rect.fromLTRB(0, 0, 0, MediaQuery.of(context).padding.top + 130.w), + axis: Axis.vertical, + ); + + super.initState(); + } + + @override + void dispose() { + _refreshController.dispose(); + _autoScrollController.dispose(); + super.dispose(); + } + + @override + Widget build(BuildContext context) { + return Column( + mainAxisSize: MainAxisSize.min, + children: [ + // Offstage( + // offstage: _modelLists.isEmpty, + // child: Container( + // padding: EdgeInsets.symmetric(horizontal: 32.w), + // width: double.infinity, + // color: Color(0xFFF9F9F9), + // height: 98.w, + // child: Row( + // children: [ + // '$_headMonth'.text.size(36.sp).color(ktextPrimary).bold.make(), + // 20.w.widthBox, + // _popupMenuButton(), + // ], + // ), + // ), + // ), + Flexible( + child: EasyRefresh( + firstRefresh: true, + header: MaterialHeader(), + footer: MaterialFooter(), + scrollController: _autoScrollController, + onRefresh: () async { + _modelLists.clear(); + monthListDepart([ + AnnounceListModel( + date: '2020-10-11 12:00:00', + id: 1, + content: 'aaaaaa', + title: '11111'), + AnnounceListModel( + date: '2020-10-11 12:00:00', + id: 2, + content: 'bbbbbbb', + title: '222222'), + AnnounceListModel( + date: '2020-11-11 12:00:00', + id: 3, + content: 'cccccccc', + title: '33333'), + AnnounceListModel( + date: '2020-11-11 12:00:00', + id: 4, + content: 'ddddddd', + title: '44444'), + AnnounceListModel( + date: '2020-12-11 12:00:00', + id: 5, + content: 'eeeeeee', + title: '555555'), + AnnounceListModel( + date: '2020-11-11 12:00:00', + id: 5, + content: 'eeeeeee', + title: '555555'), + ]); + if (_modelLists.isNotEmpty) { + _headMonth = _modelLists[0].month; + } + setState(() {}); + }, + onLoad: () async {}, + child: _modelLists.isEmpty + ? Container() + : ListView.separated( + shrinkWrap: true, + controller: _autoScrollController, + itemBuilder: (context, index) { + return AutoScrollTag( + key: ValueKey(index), + index: index, + controller: _autoScrollController, + child: AnnounceCard( + modelList: _modelLists[index], + index: index, + ), + ); + }, + separatorBuilder: (_, index) => SizedBox(), + // Container( + // padding: EdgeInsets.symmetric(horizontal: 32.w), + // alignment: Alignment.centerLeft, + // width: double.infinity, + // height: 98.w, + // child: _modelLists[index + 1] + // .month + // .text + // .size(36.sp) + // .black + // .make(), + // ), + itemCount: _modelLists.length), + ), + ), + ], + ); + } + + PopupMenuButton _popupMenuButton() { + return PopupMenuButton( + child: Icon( + CupertinoIcons.arrowtriangle_down_fill, + size: 24.w, + ), + itemBuilder: (context) { + return List.generate( + _modelLists.length, + (index) => PopupMenuItem( + child: Text(_modelLists[index].month), + value: _modelLists[index].index, + )); + }, + onSelected: (value) { + _headMonth = _modelLists[value].month; + print(value); + _autoScrollController.scrollToIndex(value, + preferPosition: AutoScrollPosition.end); + setState(() {}); + }, + ); + } +} diff --git a/lib/pages/message_center_page/message_center_page.dart b/lib/pages/message_center_page/message_center_page.dart index 89f1a2ce..03580724 100644 --- a/lib/pages/message_center_page/message_center_page.dart +++ b/lib/pages/message_center_page/message_center_page.dart @@ -1,15 +1,11 @@ -import 'package:aku_new_community/constants/api.dart'; -import 'package:aku_new_community/pages/message_center_page/comment_message/comment_message_page.dart'; -import 'package:aku_new_community/pages/message_center_page/system_message/system_message_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/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/widget/bee_scaffold.dart'; -import 'package:badges/badges.dart'; +import 'package:aku_new_community/widget/buttons/all_select_button.dart'; +import 'package:aku_new_community/widget/tab_bar/bee_tab_bar.dart'; import 'package:flutter/material.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; -import 'package:get/get.dart'; -import 'package:provider/provider.dart'; class MessageCenterPage extends StatefulWidget { MessageCenterPage({Key? key}) : super(key: key); @@ -18,8 +14,23 @@ class MessageCenterPage extends StatefulWidget { _MessageCenterPageState createState() => _MessageCenterPageState(); } -class _MessageCenterPageState extends State { +class _MessageCenterPageState extends State + with TickerProviderStateMixin { EasyRefreshController _refreshController = EasyRefreshController(); + List _tabs = ['回复我的', '收到的赞', '通知公告']; + late final TabController _tabController; + bool inEdit = false; + + @override + void initState() { + _tabController = TabController(length: _tabs.length, vsync: this); + _tabController.addListener(() { + if (_tabController.indexIsChanging) { + setState(() {}); + } + }); + super.initState(); + } @override void dispose() { @@ -27,101 +38,37 @@ class _MessageCenterPageState extends State { super.dispose(); } - Widget _buildCard({ - required String path, - required String title, - required String content, - int? count, - VoidCallback? onTap, - }) { - return InkWell( - onTap: onTap, - child: Container( - padding: EdgeInsets.fromLTRB(28.w, 32.w, 28.w, 20.w), - child: Row( - children: [ - SizedBox( - width: 90.w, - height: 90.w, - child: Badge( - child: Image.asset(path), - showBadge: count != 0, - elevation: 0, - position: BadgePosition.topEnd(top: 8.w, end: 8.w), - )), - 15.w.widthBox, - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - title.text.black.bold.size(32.sp).make(), - 5.w.heightBox, - (content).text.black.size(28.sp).make(), - ], - ).expand() - ], - ), - ), - ).material(color: Colors.transparent); - } - @override Widget build(BuildContext context) { - AppProvider appProvider = Provider.of(context); return BeeScaffold( - title: '消息中心', - actions: [ - MaterialButton( - onPressed: () async { - await NetUtil().dio!.get(API.message.allRead); - _refreshController.callRefresh(); - setState(() {}); - }, - child: '全部已读'.text.size(28.sp).black.make(), - padding: EdgeInsets.symmetric(horizontal: 32.w), - ), + title: '消息', + actions: [ + // MaterialButton( + // onPressed: () async { + // setState(() {}); + // }, + // child: '${inEdit ? '取消' : '编辑'}'.text.size(28.sp).black.make(), + // padding: EdgeInsets.symmetric(horizontal: 32.w), + // ), + ], + appBarBottom: BeeTabBar( + controller: _tabController, + tabs: _tabs, + ), + body: TabBarView( + children: [ + ReplayView(), + ThumbsUpView(), + AnnounceView(), ], - body: EasyRefresh( - header: MaterialHeader(), - firstRefresh: true, - controller: _refreshController, - onRefresh: () async { - appProvider.getMessageCenter(); - }, - child: Column( - children: [ - _buildCard( - path: R.ASSETS_ICONS_SYSTEM_NOTICE_PNG, - title: '系统通知', - content: appProvider.messageCenterModel.sysTitle ?? '无系统通知消息', - count: appProvider.messageCenterModel.sysCount ?? 0, - onTap: () async { - await NetUtil().dio!.get(API.message.allReadComment); - await Get.to(() => SystemMessagePage()); - _refreshController.callRefresh(); - setState(() {}); - }, - ), - _buildCard( - path: R.ASSETS_ICONS_COMMENT_NOTICE_PNG, - title: '评论通知', - content: - appProvider.messageCenterModel.commentTitle ?? '无评论通知消息', - count: appProvider.messageCenterModel.commentCount ?? 0, - onTap: () async { - await NetUtil().dio!.get(API.message.allReadComment); - await Get.to(() => CommentMessagePage()); - _refreshController.callRefresh(); - setState(() {}); - }, - ), - // _buildCard( - // path: R.ASSETS_ICONS_SHOP_NOTICE_PNG, - // title: '商城通知', - // content: '', - // count: 0, - // ) - ], - ), - )); + controller: _tabController, + ), + bottomNavi: Offstage( + offstage: !inEdit, + child: AllSelectButton( + onPressed: () {}, + selected: true, + )), + ); } } diff --git a/lib/pages/message_center_page/reply/replay_view.dart b/lib/pages/message_center_page/reply/replay_view.dart new file mode 100644 index 00000000..6586333d --- /dev/null +++ b/lib/pages/message_center_page/reply/replay_view.dart @@ -0,0 +1,46 @@ +import 'package:aku_new_community/constants/api.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 { + const ReplayView({Key? key}) : super(key: key); + + @override + _ReplayViewState createState() => _ReplayViewState(); +} + +class _ReplayViewState extends State { + EasyRefreshController _refreshController = EasyRefreshController(); + + @override + void initState() { + super.initState(); + } + + @override + void dispose() { + _refreshController.dispose(); + super.dispose(); + } + + @override + Widget build(BuildContext context) { + return BeeListView( + path: API.host, + controller: _refreshController, + convert: (json) { + return []; + }, + builder: (items) { + return ListView.separated( + itemBuilder: (context, index) { + return Container(); + }, + separatorBuilder: (_, __) => 20.w.heightBox, + itemCount: items.length); + }); + } +} diff --git a/lib/pages/message_center_page/reply/reply_card.dart b/lib/pages/message_center_page/reply/reply_card.dart new file mode 100644 index 00000000..3b58d42e --- /dev/null +++ b/lib/pages/message_center_page/reply/reply_card.dart @@ -0,0 +1,54 @@ +import 'package:aku_new_community/base/base_style.dart'; +import 'package:aku_new_community/constants/api.dart'; +import 'package:aku_new_community/models/message/reply_list_model.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:velocity_x/velocity_x.dart'; + +class ReplyCard extends StatelessWidget { + final ReplyListModel model; + + const ReplyCard({Key? key, required this.model}) : super(key: key); + + @override + Widget build(BuildContext context) { + return Container( + padding: EdgeInsets.symmetric(horizontal: 32.w, vertical: 48.w), + child: Row( + children: [ + ClipOval( + child: Image.network( + API.image(model.img.url), + width: 100.w, + height: 100.w, + ), + ), + 24.w.widthBox, + SizedBox( + width: 350.w, + child: Column( + children: [ + model.title.text.size(26.sp).black.bold.make(), + model.content.text + .size(24.sp) + .color(ktextSubColor) + .maxLines(1) + .ellipsis + .make(), + model.date.text.size(24.sp).color(ktextSubColor).make(), + ], + ), + ), + ClipRRect( + borderRadius: BorderRadius.circular(9.w), + child: Image.network( + API.image(model.pic.url), + width: 128.w, + height: 128.w, + ), + ), + ], + ), + ); + } +} 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 new file mode 100644 index 00000000..199d9251 --- /dev/null +++ b/lib/pages/message_center_page/thumbs_up/thumbs_up_card.dart @@ -0,0 +1,51 @@ +import 'package:aku_new_community/base/base_style.dart'; +import 'package:aku_new_community/constants/api.dart'; +import 'package:aku_new_community/gen/assets.gen.dart'; +import 'package:aku_new_community/models/message/reply_list_model.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:velocity_x/velocity_x.dart'; + +class thumbs_up_card extends StatelessWidget { + final ReplyListModel model; + + const thumbs_up_card({Key? key, required this.model}) : super(key: key); + + @override + Widget build(BuildContext context) { + return Container( + padding: EdgeInsets.symmetric(horizontal: 32.w, vertical: 48.w), + child: Row( + children: [ + ClipOval( + child: Image.network( + API.image(model.img.url), + width: 100.w, + height: 100.w, + ), + ), + 24.w.widthBox, + SizedBox( + width: 350.w, + child: Column( + children: [ + model.name.text.size(26.sp).black.bold.make(), + Assets.icons.communityLikeIs + .image(width: 28.w, height: 28.w, fit: BoxFit.contain), + model.date.text.size(24.sp).color(ktextSubColor).make(), + ], + ), + ), + ClipRRect( + borderRadius: BorderRadius.circular(9.w), + child: Image.network( + API.image(model.pic.url), + width: 128.w, + height: 128.w, + ), + ), + ], + ), + ); + } +} 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 new file mode 100644 index 00000000..c4239900 --- /dev/null +++ b/lib/pages/message_center_page/thumbs_up/thumbs_up_view.dart @@ -0,0 +1,39 @@ +import 'package:aku_new_community/constants/api.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 { + const ThumbsUpView({Key? key}) : super(key: key); + + @override + _ThumbsUpViewState createState() => _ThumbsUpViewState(); +} + +class _ThumbsUpViewState extends State { + EasyRefreshController _refreshController = EasyRefreshController(); + + @override + void dispose() { + _refreshController.dispose(); + super.dispose(); + } + + @override + Widget build(BuildContext context) { + return BeeListView( + path: API.host, + controller: _refreshController, + convert: (json) => [], + builder: (items) { + return ListView.separated( + itemBuilder: (context, index) { + return Container(); + }, + separatorBuilder: (_, __) => 20.w.heightBox, + itemCount: items.length); + }); + } +} diff --git a/lib/pages/one_alarm/widget/alarm_page.dart b/lib/pages/one_alarm/widget/alarm_page.dart index c969ff19..154becc3 100644 --- a/lib/pages/one_alarm/widget/alarm_page.dart +++ b/lib/pages/one_alarm/widget/alarm_page.dart @@ -62,6 +62,8 @@ class _AlarmPageState extends State { alignment: Alignment.topCenter, children: [ AMapWidget( + privacyStatement: AMapPrivacyStatement( + hasContains: true, hasShow: true, hasAgree: true), onMapCreated: (controller) { final appProvider = Provider.of(context, listen: false); diff --git a/lib/pages/sign/login_page.dart b/lib/pages/sign/login_page.dart new file mode 100644 index 00000000..59bd3043 --- /dev/null +++ b/lib/pages/sign/login_page.dart @@ -0,0 +1,62 @@ +import 'package:aku_new_community/base/base_style.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 LoginPage extends StatefulWidget { + const LoginPage({Key? key}) : super(key: key); + + @override + _LoginPageState createState() => _LoginPageState(); +} + +class _LoginPageState extends State { + @override + Widget build(BuildContext context) { + return BeeScaffold( + body: Column( + children: [ + '登录解锁更多功能'.text.size(36.sp).color(ktextPrimary).bold.make(), + 144.w.heightBox, + Column( + children: [ + '${'154793018'}'.text.size(36.sp).color(ktextPrimary).bold.make(), + 40.w.heightBox, + MaterialButton( + onPressed: () {}, + elevation: 0, + height: 45.w, + minWidth: 256.w, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(60.w)), + child: '本机号码一键登录'.text.size(32.sp).black.bold.make(), + ) + ], + ), + Spacer(), + RichText( + text: TextSpan( + style: TextStyle( + fontSize: 24.sp, + color: ktextSubColor, + ), + text: '注册/登记即代表同意', + children: [ + WidgetSpan( + child: InkWell( + onTap: () { + //TODO:跳转隐私政策 + }, + child: '《小蜜蜂隐私政策及用户协议》' + .text + .size(24.sp) + .color(Color(0xFF5096F1)) + .make(), + )), + ])), + ], + ), + ); + } +} diff --git a/lib/pages/sign/sign_up/sign_up_verify_page.dart b/lib/pages/sign/sign_up/sign_up_verify_page.dart index 51779bdc..ab773072 100644 --- a/lib/pages/sign/sign_up/sign_up_verify_page.dart +++ b/lib/pages/sign/sign_up/sign_up_verify_page.dart @@ -6,7 +6,6 @@ import 'package:aku_new_community/utils/headers.dart'; import 'package:flustars/flustars.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:velocity_x/velocity_x.dart'; class SignUpVerifyPage extends StatefulWidget { SignUpVerifyPage({Key? key}) : super(key: key); diff --git a/lib/pages/splash/splash_page.dart b/lib/pages/splash/splash_page.dart index 6b81461a..ddc2af60 100644 --- a/lib/pages/splash/splash_page.dart +++ b/lib/pages/splash/splash_page.dart @@ -10,6 +10,7 @@ import 'package:aku_new_community/provider/user_provider.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:amap_flutter_location/amap_flutter_location.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/gestures.dart'; @@ -90,7 +91,6 @@ class _SplashPageState extends State { // ), actions: [ - CupertinoDialogAction( child: Text('拒绝'), onPressed: () => Get.back(result: false), @@ -116,7 +116,6 @@ class _SplashPageState extends State { Future.delayed(Duration(milliseconds: 0), () async { await _originOp(); - var agreement = await HiveStore.appBox?.get('agreement') ?? false; if (!agreement) { var result = await _showLoginVerify(); @@ -133,6 +132,8 @@ class _SplashPageState extends State { await Permission.locationWhenInUse.request(); } await _initOp(); + AMapFlutterLocation.updatePrivacyShow(true, true); + AMapFlutterLocation.updatePrivacyAgree(true); MainInitialize.initTheme(); MainInitialize.initWechat(); MainInitialize.initWebSocket(); diff --git a/lib/pages/tab_navigator.dart b/lib/pages/tab_navigator.dart index 92a019e1..d1bd45a1 100644 --- a/lib/pages/tab_navigator.dart +++ b/lib/pages/tab_navigator.dart @@ -13,7 +13,6 @@ 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: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'; diff --git a/lib/widget/buttons/all_select_button.dart b/lib/widget/buttons/all_select_button.dart new file mode 100644 index 00000000..99b68cb3 --- /dev/null +++ b/lib/widget/buttons/all_select_button.dart @@ -0,0 +1,51 @@ +import 'package:aku_new_community/base/base_style.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; + +class AllSelectButton extends StatelessWidget { + final VoidCallback onPressed; + final Color? backColor; + final bool selected; + final Widget? indent; + + const AllSelectButton( + {Key? key, + required this.onPressed, + this.backColor, + required this.selected, + this.indent}) + : super(key: key); + + @override + Widget build(BuildContext context) { + return AnimatedContainer( + height: 40.w, + width: 40.w, + decoration: BoxDecoration( + color: (backColor ?? kPrimaryColor).withOpacity(selected ? 1 : 0), + border: Border.all( + color: backColor != null + ? Color(0xFFBBBBBB) + : (selected ? kPrimaryColor : Color(0xFF979797)), + width: 3.w, + ), + borderRadius: BorderRadius.circular(20.w), + ), + duration: Duration(milliseconds: 300), + curve: Curves.easeInOutCubic, + alignment: Alignment.center, + child: AnimatedOpacity( + duration: Duration(milliseconds: 500), + curve: Curves.easeInOutCubic, + opacity: selected ? 1 : 0, + child: indent ?? + Icon( + CupertinoIcons.checkmark, + color: Colors.white, + size: 28.w, + ), + ), + ); + } +} diff --git a/lib/widget/buttons/radio_button.dart b/lib/widget/buttons/radio_button.dart index 0d32f8c0..035b1586 100644 --- a/lib/widget/buttons/radio_button.dart +++ b/lib/widget/buttons/radio_button.dart @@ -1,6 +1,5 @@ import 'package:aku_new_community/base/base_style.dart'; import 'package:aku_new_community/utils/headers.dart'; -import 'package:aku_new_community/widget/animated/animated_scale.dart'; import 'package:flutter/material.dart'; class BeeRadio extends StatefulWidget { @@ -41,6 +40,7 @@ class _BeeRadioState extends State { opacity: _selected ? 1 : 0, child: AnimatedScale( scale: _selected ? 1 : 0, + duration: Duration(milliseconds: 500), child: Container( height: 24.w, width: 24.w, diff --git a/pubspec.lock b/pubspec.lock index f8523b77..b163eed2 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,7 +7,7 @@ packages: name: _fe_analyzer_shared url: "https://pub.flutter-io.cn" source: hosted - version: "22.0.0" + version: "31.0.0" advance_pdf_viewer: dependency: "direct main" description: @@ -21,28 +21,28 @@ packages: name: amap_flutter_base url: "https://pub.flutter-io.cn" source: hosted - version: "2.0.0" + version: "3.0.0" amap_flutter_location: dependency: "direct main" description: name: amap_flutter_location url: "https://pub.flutter-io.cn" source: hosted - version: "2.0.0" + version: "3.0.0" amap_flutter_map: dependency: "direct main" description: name: amap_flutter_map url: "https://pub.flutter-io.cn" source: hosted - version: "2.0.1" + version: "3.0.0" analyzer: dependency: transitive description: name: analyzer url: "https://pub.flutter-io.cn" source: hosted - version: "1.7.1" + version: "2.8.0" animated_text_kit: dependency: "direct main" description: @@ -70,7 +70,7 @@ packages: name: async url: "https://pub.flutter-io.cn" source: hosted - version: "2.5.0" + version: "2.8.2" auto_size_text_pk: dependency: transitive description: @@ -189,14 +189,14 @@ packages: name: characters url: "https://pub.flutter-io.cn" source: hosted - version: "1.1.0" + version: "1.2.0" charcode: dependency: transitive description: name: charcode url: "https://pub.flutter-io.cn" source: hosted - version: "1.2.0" + version: "1.3.1" checked_yaml: dependency: transitive description: @@ -232,6 +232,13 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "1.15.0" + color: + dependency: transitive + description: + name: color + url: "https://pub.flutter-io.cn" + source: hosted + version: "3.0.0" common_utils: dependency: transitive description: @@ -274,6 +281,13 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "2.0.3" + dartx: + dependency: transitive + description: + name: dartx + url: "https://pub.flutter-io.cn" + source: hosted + version: "0.8.0" decimal: dependency: transitive description: @@ -419,6 +433,20 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "2.2.1" + flutter_gen_core: + dependency: transitive + description: + name: flutter_gen_core + url: "https://pub.flutter-io.cn" + source: hosted + version: "4.1.3" + flutter_gen_runner: + dependency: "direct dev" + description: + name: flutter_gen_runner + url: "https://pub.flutter-io.cn" + source: hosted + version: "4.1.3" flutter_highlight: dependency: transitive description: @@ -659,16 +687,16 @@ packages: name: json_annotation url: "https://pub.flutter-io.cn" source: hosted - version: "4.0.1" + version: "4.4.0" json_serializable: dependency: "direct dev" description: name: json_serializable url: "https://pub.flutter-io.cn" source: hosted - version: "4.1.4" + version: "6.1.3" logger: - dependency: "direct main" + dependency: transitive description: name: logger url: "https://pub.flutter-io.cn" @@ -687,14 +715,14 @@ packages: name: matcher url: "https://pub.flutter-io.cn" source: hosted - version: "0.12.10" + version: "0.12.11" meta: dependency: transitive description: name: meta url: "https://pub.flutter-io.cn" source: hosted - version: "1.3.0" + version: "1.7.0" mime: dependency: transitive description: @@ -970,6 +998,13 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "0.27.1" + scroll_to_index: + dependency: "direct main" + description: + name: scroll_to_index + url: "https://pub.flutter-io.cn" + source: hosted + version: "2.1.1" share: dependency: "direct main" description: @@ -1072,7 +1107,7 @@ packages: name: source_span url: "https://pub.flutter-io.cn" source: hosted - version: "1.8.0" + version: "1.8.1" sp_util: dependency: transitive description: @@ -1142,7 +1177,14 @@ packages: name: test_api url: "https://pub.flutter-io.cn" source: hosted - version: "0.2.19" + version: "0.4.3" + time: + dependency: transitive + description: + name: time + url: "https://pub.flutter-io.cn" + source: hosted + version: "2.1.0" timing: dependency: transitive description: @@ -1233,7 +1275,7 @@ packages: name: vector_math url: "https://pub.flutter-io.cn" source: hosted - version: "2.1.0" + version: "2.1.1" velocity_x: dependency: "direct main" description: @@ -1298,5 +1340,5 @@ packages: source: hosted version: "3.1.0" sdks: - dart: ">=2.12.0 <3.0.0" + dart: ">=2.14.0 <3.0.0" flutter: ">=2.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index dfd9d2a9..78be99b7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -61,8 +61,6 @@ dependencies: #本地化存储 hive: ^2.0.4 hive_flutter: ^1.0.0 - #调试信息 - logger: ^1.0.0 #刷新组件 flutter_easyrefresh: ^2.2.1 #随机昵称 @@ -83,9 +81,9 @@ dependencies: #角标 badges: ^2.0.0-nullsafety.1 #高德地图相关 - amap_flutter_map: ^2.0.1 - amap_flutter_location: ^2.0.0 - amap_flutter_base: ^2.0.0 + amap_flutter_map: ^3.0.0 + amap_flutter_location: ^3.0.0 + amap_flutter_base: ^3.0.0 #动态文字 animated_text_kit: ^4.2.1 #分享功能 @@ -109,6 +107,8 @@ dependencies: flutter_swiper_null_safety: ^1.0.2 #划动组件 carousel_slider: ^4.0.0-nullsafety.0 + #跳转索引列表 + scroll_to_index: ^2.1.1 dev_dependencies: @@ -121,10 +121,11 @@ dev_dependencies: grinder: ^0.9.0 flutter_native_splash: ^1.1.8+4 #model自动生成 - json_serializable: ^4.1.1 + json_serializable: ^6.1.3 build_runner: ^2.0.2 yaml: ^3.1.0 pub_semver: ^2.0.0 + flutter_gen_runner: ^4.1.3 flutter: uses-material-design: true diff --git a/tool/_project_manage.dart b/tool/_project_manage.dart index 64bd0a3d..26c077d8 100644 --- a/tool/_project_manage.dart +++ b/tool/_project_manage.dart @@ -36,14 +36,29 @@ void gitPush() { @Task('build runner') void gen() async { - await Pub.runAsync( - 'build_runner', - arguments: ['build'], + await runAsync( + 'fvm', + arguments: [ + 'flutter', + 'pub', + 'run', + 'build_runner', + 'build', + ], ); } @Task('build runner clean') void genClean() async { - await Pub.runAsync('build_runner', - arguments: ['build', '--delete-conflicting-outputs']); + await runAsync( + 'fvm', + arguments: [ + 'flutter', + 'pub', + 'run', + 'build_runner', + 'build', + '--delete-conflicting-outputs' + ], + ); } diff --git a/tool/config.dart b/tool/config.dart index 366d7472..0839c522 100644 --- a/tool/config.dart +++ b/tool/config.dart @@ -1,6 +1,6 @@ class Config { ///用户根目录 - static const String homeDir = '/users/datang'; + static const String homeDir = '/users/zhangmeng'; ///包名 static const String packageName = 'aku_new_community'; @@ -11,9 +11,9 @@ class Config { ///测试包文件夹 static String get apkDevDir => - '/users/datang/team/bee/app/aku_new_community/dev'; + '/users/zhangmeng/team/bee/app/aku_new_community/dev'; ///正式包文件夹 static String get apkDir => - '/users/datang/team/bee/app/aku_new_community/release'; + '/users/zhangmeng/team/bee/app/aku_new_community/release'; }