diff --git a/assets/home/ic_bsbx.png b/assets/home/ic_bsbx.png new file mode 100644 index 00000000..8f23f878 Binary files /dev/null and b/assets/home/ic_bsbx.png differ diff --git a/assets/home/ic_gonggao.png b/assets/home/ic_gonggao.png new file mode 100644 index 00000000..46182e45 Binary files /dev/null and b/assets/home/ic_gonggao.png differ diff --git a/assets/home/ic_ljcw.png b/assets/home/ic_ljcw.png new file mode 100644 index 00000000..94445fa5 Binary files /dev/null and b/assets/home/ic_ljcw.png differ diff --git a/assets/home/ic_location.png b/assets/home/ic_location.png new file mode 100644 index 00000000..618992b1 Binary files /dev/null and b/assets/home/ic_location.png differ diff --git a/assets/home/ic_message.png b/assets/home/ic_message.png new file mode 100644 index 00000000..c1bf2e3b Binary files /dev/null and b/assets/home/ic_message.png differ diff --git a/assets/home/ic_qbyy.png b/assets/home/ic_qbyy.png new file mode 100644 index 00000000..8415d75a Binary files /dev/null and b/assets/home/ic_qbyy.png differ diff --git a/assets/home/ic_rwfb.png b/assets/home/ic_rwfb.png new file mode 100644 index 00000000..c4bcd891 Binary files /dev/null and b/assets/home/ic_rwfb.png differ diff --git a/assets/home/ic_search.png b/assets/home/ic_search.png new file mode 100644 index 00000000..26daddd1 Binary files /dev/null and b/assets/home/ic_search.png differ diff --git a/assets/home/ic_shjf.png b/assets/home/ic_shjf.png new file mode 100644 index 00000000..6b16a9fe Binary files /dev/null and b/assets/home/ic_shjf.png differ diff --git a/assets/home/ic_ssyy.png b/assets/home/ic_ssyy.png new file mode 100644 index 00000000..62d4f930 Binary files /dev/null and b/assets/home/ic_ssyy.png differ diff --git a/assets/home/ic_zbfw.png b/assets/home/ic_zbfw.png new file mode 100644 index 00000000..c7fddbb0 Binary files /dev/null and b/assets/home/ic_zbfw.png differ diff --git a/assets/home/ic_zhyl.png b/assets/home/ic_zhyl.png new file mode 100644 index 00000000..45a15cd8 Binary files /dev/null and b/assets/home/ic_zhyl.png differ diff --git a/assets/home/img_fkyq.png b/assets/home/img_fkyq.png new file mode 100644 index 00000000..f520cfdb Binary files /dev/null and b/assets/home/img_fkyq.png differ diff --git a/assets/home/img_jyzx.png b/assets/home/img_jyzx.png new file mode 100644 index 00000000..e509cd6b Binary files /dev/null and b/assets/home/img_jyzx.png differ diff --git a/assets/home/img_yjbj.png b/assets/home/img_yjbj.png new file mode 100644 index 00000000..49378501 Binary files /dev/null and b/assets/home/img_yjbj.png differ diff --git a/lib/constants/application_objects.dart b/lib/constants/application_objects.dart index 61367832..7485dd38 100644 --- a/lib/constants/application_objects.dart +++ b/lib/constants/application_objects.dart @@ -12,8 +12,6 @@ import 'package:aku_new_community/pages/goods_deto_page/goods_deto_page.dart'; import 'package:aku_new_community/pages/goods_manage_page/select_borrow_return_page.dart'; import 'package:aku_new_community/pages/house_introduce/house_introduce.dart'; import 'package:aku_new_community/pages/industry_committee/industry_committee_page.dart'; -import 'package:aku_new_community/pages/life_pay/life_pay_choose_page.dart'; -import 'package:aku_new_community/pages/life_pay/life_pay_page.dart'; import 'package:aku_new_community/pages/life_pay/life_pay_page_new.dart'; import 'package:aku_new_community/pages/one_alarm/widget/alarm_page.dart'; import 'package:aku_new_community/pages/opening_code_page/opening_code_page.dart'; @@ -76,8 +74,8 @@ List appObjects = [ AO('开门码', R.ASSETS_ICONS_FUNC_KMM_PNG, () => OpeningCodePage()), AO('访客邀请', R.ASSETS_ICONS_FUNC_FKYQ_PNG, () => VisitorAccessPage()), - AO('报事报修', R.ASSETS_ICONS_FUNC_BSBX_PNG, () => WorkOrderPage()), - AO('生活缴费', R.ASSETS_ICONS_FUNC_SHJF_PNG, () => LifePayPageNew()), + AO('报事报修', Assets.home.icBsbx.path, () => WorkOrderPage()), + AO('生活缴费', Assets.home.icShjf.path, () => LifePayPageNew()), AO('业委会', R.ASSETS_ICONS_FUNC_YWH_PNG, () => IndustryCommitteePage()), AO('建议咨询', R.ASSETS_ICONS_FUNC_JYZX_PNG, () => AdvicePage(type: AdviceType.SUGGESTION)), @@ -90,7 +88,7 @@ List appObjects = [ AO('装修管理', R.ASSETS_ICONS_FUNC_ZXGL_PNG, () => NewRenovationPage()), AO('借还管理', R.ASSETS_ICONS_FUNC_JHGL_PNG, () => SelectBorrowReturnPage()), AO('一键报警', R.ASSETS_ICONS_FUNC_YJBJ_PNG, () => AlarmPage()), - AO('设施预约', R.ASSETS_ICONS_FUNC_SSYY_PNG, () => FacilityAppointmentPage()), + AO('设施预约', Assets.home.icSsyy.path, () => FacilityAppointmentPage()), AO('快递包裹', R.ASSETS_ICONS_FUNC_KDBG_PNG, () => ExpressPackagePage()), AO('电子商务', R.ASSETS_ICONS_FUNC_DZSW_PNG, () => ElectronicCommercPage()), AO('服务浏览', R.ASSETS_ICONS_FUNC_FWLL_PNG, () => ServiceBrowsePage()), @@ -100,15 +98,15 @@ List appObjects = [ AO('地理信息', R.ASSETS_ICONS_FUNC_DLXX_PNG, () => GeographicInformationPage()), AO('周边企业', R.ASSETS_ICONS_FUNC_ZBQY_PNG, () => SurroundingEnterprisesPage()), AO('住房说明', R.ASSETS_ICONS_FUNC_ZFSM_PNG, () => HouseIntroducePage()), - AO('智慧养老', Assets.icons.provideAged.path, () => OldAgeSupportPageSimple()), - AO('周边服务', Assets.icons.nearbyService.path, null), - AO('小蜜蜂任务', Assets.icons.beeTask.path, () => TaskPage()), + AO('智慧养老', Assets.home.icZhyl.path, () => OldAgeSupportPageSimple()), + AO('周边服务', Assets.home.icZbfw.path, null), + AO('小蜜蜂任务', Assets.home.icRwfb.path, () => TaskPage()), AO('自营商城', Assets.icons.shoppingMall.path, null), - AO('邻家宠物', Assets.icons.nearbyPet.path, null), + AO('邻家宠物', Assets.home.icLjcw.path, null), AO('共享停车', Assets.icons.sharePark.path, null), AO('二手市场', Assets.icons.secondHandMarket.path, null), AO('共享投屏', Assets.icons.projectionScreen.path, null), - AO('全部应用', Assets.icons.funcAll.path, () => AllApplicationPage()), + AO('全部应用', Assets.home.icQbyy.path, () => AllApplicationPage()), // AO( // '小区教育', diff --git a/lib/gen/assets.gen.dart b/lib/gen/assets.gen.dart index b1a52229..501e9938 100644 --- a/lib/gen/assets.gen.dart +++ b/lib/gen/assets.gen.dart @@ -3,1274 +3,649 @@ /// 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 $AssetsBraceletGen { const $AssetsBraceletGen(); - /// File path: assets/bracelet/x5.png AssetGenImage get x5 => const AssetGenImage('assets/bracelet/x5.png'); - - /// File path: assets/bracelet/x8.png AssetGenImage get x8 => const AssetGenImage('assets/bracelet/x8.png'); - - /// File path: assets/bracelet/xiaomi6.png AssetGenImage get xiaomi6 => const AssetGenImage('assets/bracelet/xiaomi6.png'); } +class $AssetsHomeGen { + const $AssetsHomeGen(); + + AssetGenImage get icBsbx => const AssetGenImage('assets/home/ic_bsbx.png'); + AssetGenImage get icGonggao => + const AssetGenImage('assets/home/ic_gonggao.png'); + AssetGenImage get icLjcw => const AssetGenImage('assets/home/ic_ljcw.png'); + AssetGenImage get icLocation => + const AssetGenImage('assets/home/ic_location.png'); + AssetGenImage get icMessage => + const AssetGenImage('assets/home/ic_message.png'); + AssetGenImage get icQbyy => const AssetGenImage('assets/home/ic_qbyy.png'); + AssetGenImage get icRwfb => const AssetGenImage('assets/home/ic_rwfb.png'); + AssetGenImage get icSearch => + const AssetGenImage('assets/home/ic_search.png'); + AssetGenImage get icShjf => const AssetGenImage('assets/home/ic_shjf.png'); + AssetGenImage get icSsyy => const AssetGenImage('assets/home/ic_ssyy.png'); + AssetGenImage get icZbfw => const AssetGenImage('assets/home/ic_zbfw.png'); + AssetGenImage get icZhyl => const AssetGenImage('assets/home/ic_zhyl.png'); + AssetGenImage get imgFkyq => const AssetGenImage('assets/home/img_fkyq.png'); + AssetGenImage get imgJyzx => const AssetGenImage('assets/home/img_jyzx.png'); + AssetGenImage get imgYjbj => const AssetGenImage('assets/home/img_yjbj.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/alarm_clock.png AssetGenImage get alarmClock => const AssetGenImage('assets/icons/alarm_clock.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/bee_task.png AssetGenImage get beeTask => const AssetGenImage('assets/icons/bee_task.png'); - - /// File path: assets/icons/blood_ressure.png AssetGenImage get bloodRessure => const AssetGenImage('assets/icons/blood_ressure.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/camera.png AssetGenImage get camera => const AssetGenImage('assets/icons/camera.png'); - - /// File path: assets/icons/cancel_task.png AssetGenImage get cancelTask => const AssetGenImage('assets/icons/cancel_task.png'); - - /// File path: assets/icons/change.png AssetGenImage get change => const AssetGenImage('assets/icons/change.png'); - - /// File path: assets/icons/clock_circle.png AssetGenImage get clockCircle => const AssetGenImage('assets/icons/clock_circle.png'); - - /// File path: assets/icons/clock_success.png AssetGenImage get clockSuccess => const AssetGenImage('assets/icons/clock_success.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/connect.png AssetGenImage get connect => const AssetGenImage('assets/icons/connect.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/copy.png AssetGenImage get copy => const AssetGenImage('assets/icons/copy.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/dissatisfied.png AssetGenImage get dissatisfied => const AssetGenImage('assets/icons/dissatisfied.png'); - - /// File path: assets/icons/edit.png AssetGenImage get edit => const AssetGenImage('assets/icons/edit.png'); - - /// File path: assets/icons/environment.png AssetGenImage get environment => const AssetGenImage('assets/icons/environment.png'); - - /// File path: assets/icons/examine.png AssetGenImage get examine => const AssetGenImage('assets/icons/examine.png'); - - /// File path: assets/icons/examining.png AssetGenImage get examining => const AssetGenImage('assets/icons/examining.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/falldown.png AssetGenImage get falldown => const AssetGenImage('assets/icons/falldown.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/finish_order.png AssetGenImage get finishOrder => const AssetGenImage('assets/icons/finish_order.png'); - - /// File path: assets/icons/fire_alarm.png AssetGenImage get fireAlarm => const AssetGenImage('assets/icons/fire_alarm.png'); - - /// File path: assets/icons/foot.png AssetGenImage get foot => const AssetGenImage('assets/icons/foot.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/heartbeat.png AssetGenImage get heartbeat => const AssetGenImage('assets/icons/heartbeat.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/identify.png AssetGenImage get identify => const AssetGenImage('assets/icons/identify.png'); - - /// File path: assets/icons/img_add.png AssetGenImage get imgAdd => const AssetGenImage('assets/icons/img_add.png'); - - /// File path: assets/icons/intergral.png AssetGenImage get intergral => const AssetGenImage('assets/icons/intergral.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/life_pay_record.png AssetGenImage get lifePayRecord => const AssetGenImage('assets/icons/life_pay_record.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/nearby_pet.png AssetGenImage get nearbyPet => const AssetGenImage('assets/icons/nearby_pet.png'); - - /// File path: assets/icons/nearby_service.png AssetGenImage get nearbyService => const AssetGenImage('assets/icons/nearby_service.png'); - - /// File path: assets/icons/normal.png AssetGenImage get normal => const AssetGenImage('assets/icons/normal.png'); - - /// File path: assets/icons/oxygen.png AssetGenImage get oxygen => const AssetGenImage('assets/icons/oxygen.png'); - - /// File path: assets/icons/pass.png AssetGenImage get pass => const AssetGenImage('assets/icons/pass.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/phone_circle.png AssetGenImage get phoneCircle => const AssetGenImage('assets/icons/phone_circle.png'); - - /// File path: assets/icons/projection_screen.png AssetGenImage get projectionScreen => const AssetGenImage('assets/icons/projection_screen.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/provide_aged.png AssetGenImage get provideAged => const AssetGenImage('assets/icons/provide_aged.png'); - - /// File path: assets/icons/record.png AssetGenImage get record => const AssetGenImage('assets/icons/record.png'); - - /// File path: assets/icons/reject.png AssetGenImage get reject => const AssetGenImage('assets/icons/reject.png'); - - /// File path: assets/icons/report.png AssetGenImage get report => const AssetGenImage('assets/icons/report.png'); - - /// File path: assets/icons/reward.png AssetGenImage get reward => const AssetGenImage('assets/icons/reward.png'); - - /// File path: assets/icons/satisfied.png AssetGenImage get satisfied => const AssetGenImage('assets/icons/satisfied.png'); - - /// File path: assets/icons/second_hand.png AssetGenImage get secondHand => const AssetGenImage('assets/icons/second_hand.png'); - - /// File path: assets/icons/second_hand_market.png AssetGenImage get secondHandMarket => const AssetGenImage('assets/icons/second_hand_market.png'); - - /// File path: assets/icons/service.png AssetGenImage get service => const AssetGenImage('assets/icons/service.png'); - - /// File path: assets/icons/share_park.png AssetGenImage get sharePark => const AssetGenImage('assets/icons/share_park.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/shopping_mall.png AssetGenImage get shoppingMall => const AssetGenImage('assets/icons/shopping_mall.png'); - - /// File path: assets/icons/sos.png AssetGenImage get sos => const AssetGenImage('assets/icons/sos.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/tag.png AssetGenImage get tag => const AssetGenImage('assets/icons/tag.png'); - - /// File path: assets/icons/task_location.png AssetGenImage get taskLocation => const AssetGenImage('assets/icons/task_location.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/vip1.png AssetGenImage get vip1 => const AssetGenImage('assets/icons/vip1.png'); - - /// File path: assets/icons/vip2.png AssetGenImage get vip2 => const AssetGenImage('assets/icons/vip2.png'); - - /// File path: assets/icons/vip3.png AssetGenImage get vip3 => const AssetGenImage('assets/icons/vip3.png'); - - /// File path: assets/icons/vip4.png AssetGenImage get vip4 => const AssetGenImage('assets/icons/vip4.png'); - - /// File path: assets/icons/vip_font.png AssetGenImage get vipFont => const AssetGenImage('assets/icons/vip_font.png'); - - /// File path: assets/icons/watch.png AssetGenImage get watch => const AssetGenImage('assets/icons/watch.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/certification.png AssetGenImage get certification => const AssetGenImage('assets/images/certification.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/equipment_empty.png AssetGenImage get equipmentEmpty => const AssetGenImage('assets/images/equipment_empty.png'); - - /// File path: assets/images/good_detail_integral_back.png AssetGenImage get goodDetailIntegralBack => const AssetGenImage('assets/images/good_detail_integral_back.png'); - - /// File path: assets/images/house_attestation.png AssetGenImage get houseAttestation => const AssetGenImage('assets/images/house_attestation.png'); - - /// File path: assets/images/house_empty.png AssetGenImage get houseEmpty => const AssetGenImage('assets/images/house_empty.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/success.png AssetGenImage get success => const AssetGenImage('assets/images/success.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(); +} + class $AssetsStaticGen { const $AssetsStaticGen(); - /// File path: assets/static/bracelet_header.png AssetGenImage get braceletHeader => const AssetGenImage('assets/static/bracelet_header.png'); - - /// 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/family.png AssetGenImage get family => const AssetGenImage('assets/static/family.png'); - - /// 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/integral_background.png AssetGenImage get integralBackground => const AssetGenImage('assets/static/integral_background.png'); - - /// File path: assets/static/old_age_back.png AssetGenImage get oldAgeBack => const AssetGenImage('assets/static/old_age_back.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'); - - /// File path: assets/static/rule_explain.png AssetGenImage get ruleExplain => const AssetGenImage('assets/static/rule_explain.png'); - - /// File path: assets/static/sign_in_background.png AssetGenImage get signInBackground => const AssetGenImage('assets/static/sign_in_background.png'); - - /// File path: assets/static/vip_background.png AssetGenImage get vipBackground => const AssetGenImage('assets/static/vip_background.png'); } @@ -1278,16 +653,9 @@ class $AssetsStaticGen { 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'); } @@ -1296,8 +664,10 @@ class Assets { static const $AssetsApplicationsGen applications = $AssetsApplicationsGen(); static const $AssetsBraceletGen bracelet = $AssetsBraceletGen(); + static const $AssetsHomeGen home = $AssetsHomeGen(); 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(); } diff --git a/lib/pages/home/home_page.dart b/lib/pages/home/home_page.dart index 2c9a4181..4df6291f 100644 --- a/lib/pages/home/home_page.dart +++ b/lib/pages/home/home_page.dart @@ -1,9 +1,8 @@ // Dart imports: import 'package:aku_new_community/constants/application_objects.dart'; -import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/extensions/color_ext.dart'; -import 'package:aku_new_community/model/common/img_model.dart'; +import 'package:aku_new_community/gen/assets.gen.dart'; import 'package:aku_new_community/models/home/home_activity_model.dart'; import 'package:aku_new_community/models/home/home_announce_model.dart'; import 'package:aku_new_community/models/home/home_swiper_model.dart'; @@ -12,29 +11,31 @@ import 'package:aku_new_community/pages/one_alarm/widget/alarm_page.dart'; import 'package:aku_new_community/pages/visitor_access_page/visitor_access_page.dart'; import 'package:aku_new_community/provider/app_provider.dart'; import 'package:aku_new_community/ui/community/activity/activity_card.dart'; +import 'package:aku_new_community/ui/community/activity/activity_detail_page.dart'; import 'package:aku_new_community/ui/community/activity/activity_list_page.dart'; import 'package:aku_new_community/ui/community/community_func.dart'; +import 'package:aku_new_community/ui/community/notice/notice_detail_page.dart'; import 'package:aku_new_community/ui/home/home_notification.dart'; import 'package:aku_new_community/ui/home/home_title.dart'; +import 'package:aku_new_community/ui/home/public_infomation/public_information_detail_page.dart'; import 'package:aku_new_community/ui/manager/advice/advice_page.dart'; import 'package:aku_new_community/ui/market/search/good_detail_page.dart'; import 'package:aku_new_community/ui/search/bee_search.dart'; import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/utils/login_util.dart'; -import 'package:aku_new_community/widget/animated/OverlayWidget.dart'; import 'package:aku_new_community/widget/beeImageNetwork.dart'; +import 'package:aku_new_community/widget/bee_divider.dart'; import 'package:aku_new_community/widget/others/rectIndicator.dart'; import 'package:aku_new_community/widget/others/user_tool.dart'; +import 'package:aku_new_community/widget/views/bee_gradient_divider.dart'; import 'package:badges/badges.dart'; import 'package:bot_toast/bot_toast.dart'; -import 'package:cached_network_image/cached_network_image.dart'; import 'package:card_swiper/card_swiper.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:get/get.dart'; import 'package:jpush_flutter/jpush_flutter.dart'; -import 'package:palette_generator/palette_generator.dart'; import 'package:power_logger/power_logger.dart'; import 'package:provider/provider.dart'; import 'package:url_launcher/url_launcher.dart'; @@ -69,7 +70,6 @@ class _HomePageState extends State List _swiperModels = []; SwiperController _swiperController = SwiperController(); - ValueNotifier _barColor = ValueNotifier(Colors.transparent); @override void initState() { @@ -85,14 +85,6 @@ class _HomePageState extends State } _scrollController = ScrollController(); _refreshController = EasyRefreshController(); - _swiperController.addListener(() { - //由于先触发监听后，再执行onChangeIndex函数，所以_currentSwiperIndex会比当前index少1，用+1并求余的方式获得真正当前index; - if (_swiperModels.length <= 1) { - _swiperBarColor(0); - } else { - _swiperBarColor((_currentSwiperIndex + 1) % 3); - } - }); SystemChrome.setSystemUIOverlayStyle( SystemUiOverlayStyle(statusBarColor: Colors.transparent)); } @@ -112,96 +104,93 @@ class _HomePageState extends State commentCount = appProvider.messageCenterModel.commentCount ?? 0; sysCount = appProvider.messageCenterModel.sysCount ?? 0; sum = commentCount + sysCount; - var head = ValueListenableBuilder( - valueListenable: _barColor, - builder: (context, Color color, child) { - return Container( - padding: EdgeInsets.only(top: MediaQuery.of(context).padding.top), - decoration: BoxDecoration( - border: Border.all(width: 0, color: color), - color: color, - ), - width: double.infinity, - child: child, - ); - }, - child: Padding( - padding: EdgeInsets.symmetric(vertical: 16.w, horizontal: 16.w), - child: Row(crossAxisAlignment: CrossAxisAlignment.center, children: [ - if (appProvider.location != null) - Padding( - padding: const EdgeInsets.only(right: 5), - child: Image.asset( - R.ASSETS_ICONS_ICON_MAIN_LOCATION_PNG, - width: 32.w, - height: 32.w, - ), - ), - Text( - appProvider.location?['city'] == null - ? '' - : appProvider.location?['city'] as String? ?? '', - style: TextStyle( - fontWeight: FontWeight.w600, - fontSize: 24.sp, - color: Color(0xff333333), - ), - textAlign: TextAlign.center, - ), - Text( - '(${appProvider.weatherType} ${appProvider.weatherTemp}℃)', - style: TextStyle( - fontSize: 24.sp, - color: Color(0xff999999), - ), - textAlign: TextAlign.center, + var head = Padding( + padding: EdgeInsets.only( + top: MediaQuery.of(context).padding.top + 20.w, + right: 32.w, + left: 32.w, + bottom: 20.w), + child: Row(crossAxisAlignment: CrossAxisAlignment.center, children: [ + if (appProvider.location != null) + Image.asset( + Assets.home.icLocation.path, + width: 48.w, + height: 48.w, ), - Spacer(), - GestureDetector( - onTap: () { - Get.to(() => BeeSearch()); - }, - child: Image.asset(R.ASSETS_ICONS_ICON_MAIN_FIND_PNG, - height: 40.w, width: 40.w), + 16.wb, + Text( + appProvider.location?['city'] == null + ? '' + : appProvider.location?['city'] as String? ?? '', + style: TextStyle( + fontWeight: FontWeight.w600, + fontSize: 28.sp, + color: Color(0xff333333), ), - Padding( - padding: EdgeInsets.only(right: 16.w, left: 12.w), - child: Badge( - elevation: 0, - badgeColor: Color(0xFFCF2525), - padding: sum > 9 ? EdgeInsets.all(2.w) : EdgeInsets.all(5.w), - showBadge: appProvider.messageCenterModel.commentCount != 0 || - appProvider.messageCenterModel.sysCount != 0, - position: BadgePosition.topEnd( - top: 8.w, - end: -4.w, - ), - badgeContent: Text( - (sum > 99 ? 99 : sum).toString(), - style: TextStyle(color: Colors.white, fontSize: 20.sp), - ), - child: GestureDetector( - onTap: () { - if (LoginUtil.isNotLogin) return; - Get.to(() => MessageCenterPage()); - }, - child: Image.asset(R.ASSETS_ICONS_ICON_MAIN_MESSAGE_PNG, - height: 40.w, width: 40.w), - )), + textAlign: TextAlign.center, + ), + Text( + '(${appProvider.weatherType} ${appProvider.weatherTemp}℃)', + style: TextStyle( + fontSize: 28.sp, + color: Color(0xff999999), ), - ]), - ), + textAlign: TextAlign.center, + ), + Spacer(), + GestureDetector( + onTap: () { + Get.to(() => BeeSearch()); + }, + child: + Image.asset(Assets.home.icSearch.path, height: 48.w, width: 48.w), + ), + 20.wb, + Badge( + elevation: 0, + badgeColor: Color(0xFFCF2525), + padding: sum > 9 ? EdgeInsets.all(2.w) : EdgeInsets.all(5.w), + showBadge: appProvider.messageCenterModel.commentCount != 0 || + appProvider.messageCenterModel.sysCount != 0, + position: BadgePosition.topEnd( + top: 8.w, + end: -4.w, + ), + badgeContent: Text( + (sum > 99 ? 99 : sum).toString(), + style: TextStyle(color: Colors.white, fontSize: 20.sp), + ), + child: GestureDetector( + onTap: () { + if (LoginUtil.isNotLogin) return; + Get.to(() => MessageCenterPage()); + }, + child: Image.asset(Assets.home.icMessage.path, + height: 48.w, width: 48.w), + )), + ]), ); return AnnotatedRegion( value: SystemUiOverlayStyle.dark, child: Scaffold( extendBody: true, extendBodyBehindAppBar: true, - body: Stack( - children: [ - EasyRefresh( + backgroundColor: Color(0xFFFDE019), + appBar: PreferredSize( + preferredSize: + Size.fromHeight(MediaQuery.of(context).padding.top + 88.w), + child: head), + body: SafeArea( + child: Container( + height: MediaQuery.of(context).size.height, + decoration: BoxDecoration( + borderRadius: + BorderRadius.vertical(top: Radius.circular(32.w)), + color: Color(0xFFF9F9F9)), + clipBehavior: Clip.antiAliasWithSaveLayer, + child: EasyRefresh( controller: _refreshController, - header: BeeBallPauseHeader(bgColor: _barColor), + header: MaterialHeader(), firstRefresh: true, onRefresh: () async { _activityItemModels = await CommunityFunc.activityList(); @@ -211,132 +200,99 @@ class _HomePageState extends State setState(() {}); }, child: CustomScrollView( + shrinkWrap: true, controller: _scrollController, slivers: [ SliverToBoxAdapter( - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - head, - HomeSwiper(), //要做点击事件 - // SizedBox(height: 100.w), - Container( - padding: EdgeInsets.only(top: 24.w, bottom: 32.w), - child: getFunction(), //ApplicationView(), - decoration: BoxDecoration( - color: Colors.white, - boxShadow: const [ - BoxShadow( - color: Color(0x14000000), - blurRadius: 0, - offset: Offset(0.0, 2.0), - spreadRadius: 0.1) - ], - borderRadius: BorderRadius.only( - bottomLeft: Radius.circular(28), - bottomRight: Radius.circular(28))), - ) - //ApplicationBox(child: ApplicationView()), - ], - ), + child: HomeSwiper(), ), SliverToBoxAdapter( child: Container( - height: 40, - margin: EdgeInsets.only( - left: 32.w, right: 32.w, top: 24.w), - decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.all(Radius.circular(8)), - boxShadow: const [ - BoxShadow( - color: Color(0x14000000), - blurRadius: 4, - spreadRadius: 0.5) - ], - ), - child: HomeNotification(items: _boardItemModels)), + margin: EdgeInsets.symmetric(horizontal: 32.w), + padding: + EdgeInsets.only(top: 20.w, left: 36.w, right: 36.w), + child: _applications(), //ApplicationView(), + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(16.w), + ), + ), ), SliverToBoxAdapter( - child: Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - GestureDetector( - child: Container( - margin: EdgeInsets.only(top: 24.w), - padding: EdgeInsets.only(left: 32.w, top: 24.w), - width: 140, - height: 150, - decoration: BoxDecoration( - image: DecorationImage( - fit: BoxFit.fill, - image: - AssetImage(R.ASSETS_IMAGES_CARD_YELLOW_PNG), - )), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - '访客邀请', - style: TextStyle( - color: Color(0xD9000000), - fontSize: 26.sp, - fontWeight: FontWeight.bold), - ), - 10.hb, - Text( - '一键分享', - style: TextStyle( - color: Color(0x73000000), - fontSize: 20.sp, - ), - ), - Text( - '让拜访不再是难事', - style: TextStyle( - color: Color(0x73000000), - fontSize: 20.sp, - ), - ), - Spacer(), - Image.asset( - R.ASSETS_ICONS_ICON_MAIN_INVITE_PNG, - width: 100.w, - height: 100.w, + child: Container( + width: 686.w, + height: 320.w, + clipBehavior: Clip.antiAliasWithSaveLayer, + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(16.w)), + margin: EdgeInsets.all(32.w), + child: Row( + children: [ + Expanded( + flex: 1, + child: GestureDetector( + child: Container( + padding: + EdgeInsets.only(left: 34.w, top: 40.w), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(16.w), + image: DecorationImage( + fit: BoxFit.fill, + image: AssetImage( + Assets.home.imgFkyq.path), + )), + child: Column( + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + Text( + '访客邀请', + style: TextStyle( + color: Color(0xD9000000), + fontSize: 26.sp, + fontWeight: FontWeight.bold), + ), + 10.hb, + Text( + '让拜访更加便捷', + style: TextStyle( + color: Color(0x73000000), + fontSize: 20.sp, + ), + ), + ], ), - 30.hb, - ], + ), + onTap: () { + Get.to(() => VisitorAccessPage()); + }, ), ), - onTap: () { - Get.to(VisitorAccessPage()); - }, - ), - 25.wb, - Container( - margin: EdgeInsets.only(top: 24.w), - child: Column( - children: [ - GestureDetector( - child: Container( - width: 190, - height: 69, - decoration: BoxDecoration( - image: DecorationImage( - fit: BoxFit.fill, - image: AssetImage( - R.ASSETS_IMAGES_CARD_PINK_PNG), - )), - child: Row( - mainAxisAlignment: - MainAxisAlignment.start, - children: [ - 20.wb, - Column( + BeeGradientDivider.vertical(), + Expanded( + flex: 2, + child: Column( + children: [ + Expanded( + flex: 1, + child: GestureDetector( + child: Container( + width: double.infinity, + decoration: BoxDecoration( + borderRadius: + BorderRadius.circular(16.w), + image: DecorationImage( + fit: BoxFit.cover, + image: AssetImage( + Assets.home.imgYjbj.path), + )), + padding: EdgeInsets.only( + left: 32.w, top: 40.w), + child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - 20.hb, Text( '一键报警', style: TextStyle( @@ -354,41 +310,32 @@ class _HomePageState extends State ), ], ), - Spacer(), - Image.asset( - R.ASSETS_ICONS_ICON_MAIN_POLICE_PNG, - width: 98.w, - height: 98.w, - ), - 20.wb, - ], + ), + onTap: () { + Get.to(() => AlarmPage()); + }, ), ), - onTap: () { - Get.to(AlarmPage()); - }, - ), - GestureDetector( - child: Container( - margin: EdgeInsets.only(top: 20.w), - width: 190, - height: 69, - decoration: BoxDecoration( - image: DecorationImage( - fit: BoxFit.fill, - image: AssetImage( - R.ASSETS_IMAGES_CARD_BLUE_PNG), - )), - child: Row( - mainAxisAlignment: - MainAxisAlignment.start, - children: [ - 20.wb, - Column( + BeeGradientDivider.horizontal(), + Expanded( + flex: 1, + child: GestureDetector( + child: Container( + padding: EdgeInsets.only( + top: 40.w, left: 32.w), + width: double.infinity, + decoration: BoxDecoration( + borderRadius: + BorderRadius.circular(16.w), + image: DecorationImage( + fit: BoxFit.cover, + image: AssetImage( + Assets.home.imgJyzx.path), + )), + child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - 20.hb, Text( '建议咨询', style: TextStyle( @@ -406,25 +353,18 @@ class _HomePageState extends State ), ], ), - Spacer(), - Image.asset( - R.ASSETS_ICONS_ICON_MAIN_CONSULT_PNG, - width: 98.w, - height: 98.w, - ), - 20.wb, - ], + ), + onTap: () { + Get.to(AdvicePage( + type: AdviceType.SUGGESTION)); + }, ), - ), - onTap: () { - Get.to(AdvicePage( - type: AdviceType.SUGGESTION)); - }, - ) - ], - ), - ) - ], + ) + ], + ), + ) + ], + ), ), ), SliverToBoxAdapter( @@ -470,8 +410,7 @@ class _HomePageState extends State ], ), ), - OverlayLivingBtnWidget() - ], + ), ), )); } @@ -479,48 +418,46 @@ class _HomePageState extends State Widget HomeSwiper() { return Container( width: double.infinity, - height: 320.w, - decoration: - BoxDecoration(border: Border.all(width: 0, color: _barColor.value)), - child: AspectRatio( - aspectRatio: 375 / 160, - child: Swiper( - key: UniqueKey(), - controller: _swiperController, - onIndexChanged: (index) async { - _currentSwiperIndex = index; - }, - itemBuilder: (BuildContext context, int index) { - return getSwiperImage(_swiperModels[index]); - }, + clipBehavior: Clip.antiAlias, + margin: EdgeInsets.all(32.w), + height: 248.w, + decoration: BoxDecoration(borderRadius: BorderRadius.circular(16.w)), + child: Swiper( + key: UniqueKey(), + controller: _swiperController, + onIndexChanged: (index) async { + _currentSwiperIndex = index; + }, + itemBuilder: (BuildContext context, int index) { + return getSwiperImage(_swiperModels[index]); + }, - pagination: SwiperPagination( - alignment: Alignment.bottomRight, - builder: SwiperCustomPagination( - builder: (BuildContext context, SwiperPluginConfig config) { - return RectIndicator( - position: config.activeIndex, - count: _swiperModels.length, - activeColor: Color(0x99FFFFFF), - color: Color(0xD9FFFFFF), - //未选中 指示器颜色，选中的颜色key为Color - width: 4, - //指示器宽度 - activeWidth: 14, - //选中的指示器宽度 - radius: 4, - //指示器圆角角度 - height: 4, - ); //指示器高度 - })), - scrollDirection: Axis.horizontal, - // control: new SwiperControl(), - autoplay: true, - onTap: (index) { - swiperNavigate(_swiperModels[index]); - }, - itemCount: _swiperModels.length, - ), + pagination: SwiperPagination( + alignment: Alignment.bottomRight, + builder: SwiperCustomPagination( + builder: (BuildContext context, SwiperPluginConfig config) { + return RectIndicator( + position: config.activeIndex, + count: _swiperModels.length, + activeColor: Color(0x99FFFFFF), + color: Color(0xD9FFFFFF), + //未选中 指示器颜色，选中的颜色key为Color + width: 4, + //指示器宽度 + activeWidth: 14, + //选中的指示器宽度 + radius: 4, + //指示器圆角角度 + height: 4, + ); //指示器高度 + })), + scrollDirection: Axis.horizontal, + // control: new SwiperControl(), + autoplay: true, + onTap: (index) { + swiperNavigate(_swiperModels[index]); + }, + itemCount: _swiperModels.length, ), ); } @@ -531,41 +468,49 @@ class _HomePageState extends State launch(model.customizeUrl ?? ''); break; case 2: - Get.to(GoodDetailPage(goodId: model.id)); + model.associationId == null + ? null + : Get.to(() => GoodDetailPage( + goodId: model.associationId!, + )); break; case 3: - // Get.to(page) + model.associationId == null + ? null + : Get.to(() => PublicInformationDetailPage( + id: model.associationId!, + )); break; case 4: + model.associationId == null + ? null + : Get.to(() => NoticeDetailPage( + id: model.associationId!, + )); break; case 5: + model.associationId == null + ? null + : Get.to(() => ActivityDetailPage( + id: model.associationId!, + )); break; default: - BotToast.showText(text: '类型错误'); - } - } - - Future _swiperBarColor(int index) async { - if (_swiperModels.isNotEmpty) { - var color = - await PaletteGenerator.fromImageProvider(CachedNetworkImageProvider( - SAASAPI.image(ImgModel.first(_swiperModels[index].imgList)), - )); - _barColor.value = color.dominantColor?.color ?? Colors.transparent; - } else { - _barColor.value = Colors.transparent; + () {}; } } Widget getSwiperImage(HomeSwiperModel swiperModel) { return Container( + clipBehavior: Clip.antiAliasWithSaveLayer, + decoration: BoxDecoration(borderRadius: BorderRadius.circular(16.w)), child: BeeImageNetwork( imgs: swiperModel.imgList ?? [], ), ); } - Widget getFunction() { + Widget _applications() { return Column( children: [ Row( @@ -578,7 +523,7 @@ class _HomePageState extends State getFunctionBtn(AO.fromRaw('智慧养老')), ], ), - 32.hb, + 24.hb, Row( mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center, @@ -589,34 +534,41 @@ class _HomePageState extends State getFunctionBtn(AO.fromRaw('全部应用')), ], ), + 44.hb, + BeeDivider.horizontal(), + 10.hb, + HomeNotification(items: _boardItemModels), + 10.hb, ], ); } Widget getFunctionBtn(AO ao) { - return MaterialButton( - shape: StadiumBorder(), - padding: EdgeInsets.zero, - onPressed: () { - if (LoginUtil.isNotLogin) return; - // if (!LoginUtil.haveRoom(ao.title)) return; - if (ao.page == null) { - BotToast.showText(text: '该功能正在准备上线中，敬请期待', align: Alignment(0, 0.5)); - } else { - Get.to(ao.page); - } - }, - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Image.asset( - ao.path, - height: 80.w, - width: 80.w, - ), - 16.hb, - ao.title.text.size(22.sp).color(Color(0xA6000000)).bold.make(), - ], + return Expanded( + flex: 1, + child: GestureDetector( + onTap: () { + if (LoginUtil.isNotLogin) return; + // if (!LoginUtil.haveRoom(ao.title)) return; + if (ao.page == null) { + BotToast.showText( + text: '该功能正在准备上线中，敬请期待', align: Alignment(0, 0.5)); + } else { + Get.to(ao.page); + } + }, + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Image.asset( + ao.path, + height: 96.w, + width: 96.w, + ), + 8.hb, + ao.title.text.size(24.sp).color(Color(0xFF333333)).make(), + ], + ), ), ); } diff --git a/lib/provider/user_provider.dart b/lib/provider/user_provider.dart index fc290659..178f15f6 100644 --- a/lib/provider/user_provider.dart +++ b/lib/provider/user_provider.dart @@ -60,7 +60,7 @@ class UserProvider extends ChangeNotifier { _token = null; _userInfoModel = null; _myHouses = []; - NetUtil().get(SAASAPI.login.logOut, showMessage: true); + NetUtil().post(SAASAPI.login.logOut, showMessage: true); NetUtil().dio!.options.headers.remove('app-login-token'); HiveStore.appBox!.delete('token'); HiveStore.appBox!.delete('login'); diff --git a/lib/ui/community/community_views/community_page.dart b/lib/ui/community/community_views/community_page.dart index f6ddaaf1..567414f4 100644 --- a/lib/ui/community/community_views/community_page.dart +++ b/lib/ui/community/community_views/community_page.dart @@ -26,12 +26,10 @@ import 'package:aku_new_community/utils/network/base_model.dart'; import 'package:aku_new_community/utils/network/net_util.dart'; import 'package:aku_new_community/widget/others/user_tool.dart'; import 'package:bot_toast/bot_toast.dart'; -import 'package:common_utils/common_utils.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:get/get.dart'; -import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; class CommunityPage extends StatefulWidget { @@ -295,7 +293,7 @@ class _CommunityPageState extends State var result = await Get.to(() => PublicInformationDetailPage(id: item.id)); CommunityFunc.addViews(item.id); - if (result) { + if (result != null && result) { _easyRefreshController.callRefresh(); } }, diff --git a/lib/ui/home/home_notification.dart b/lib/ui/home/home_notification.dart index f4808711..3a274a8f 100644 --- a/lib/ui/home/home_notification.dart +++ b/lib/ui/home/home_notification.dart @@ -1,3 +1,4 @@ +import 'package:aku_new_community/gen/assets.gen.dart'; import 'package:aku_new_community/models/home/home_announce_model.dart'; import 'package:aku_new_community/ui/community/notice/notice_detail_page.dart'; import 'package:aku_new_community/utils/bee_date_util.dart'; @@ -35,11 +36,7 @@ class _HomeNotificationState extends State { return Row( children: [ 24.wb, - Image.asset( - R.ASSETS_IMAGES_NOTICE_PNG, - height: 45.w, - width: 61.w, - ), + Assets.home.icGonggao.image(width: 48.w, height: 48.w), 24.wb, widget.items.isEmpty ? Spacer() @@ -48,7 +45,7 @@ class _HomeNotificationState extends State { options: CarouselOptions( scrollDirection: Axis.vertical, viewportFraction: 1.0, - aspectRatio: 300 / 40, + aspectRatio: 343 / 44, autoPlay: true, onPageChanged: (index, _) { //print(index.toString()); @@ -77,9 +74,8 @@ class _HomeNotificationState extends State { child: Text( e.title, style: TextStyle( - color: Color(0xA6000000), - fontSize: 22.sp, - fontWeight: FontWeight.bold, + color: Color(0xFF333333), + fontSize: 24.sp, ), maxLines: 1, overflow: TextOverflow.ellipsis, @@ -89,14 +85,14 @@ class _HomeNotificationState extends State { child: Text( BeeDateUtil(DateUtil.getDateTime(e.createDate)).timeAgo, style: TextStyle( - color: Color(0x73000000), - fontSize: 20.sp, + color: Color(0xFF999999), + fontSize: 24.sp, ), )), 8.wb, Icon( CupertinoIcons.chevron_forward, - size: 24.w, + size: 32.w, color: Color(0xFF999999), ), ], diff --git a/lib/ui/profile/new_house/my_house_page.dart b/lib/ui/profile/new_house/my_house_page.dart index 27658048..d28a838f 100644 --- a/lib/ui/profile/new_house/my_house_page.dart +++ b/lib/ui/profile/new_house/my_house_page.dart @@ -93,12 +93,10 @@ class _MyHousePageState extends State { children: [ GestureDetector( onTap: () async { - print(model.id); var base = await NetUtil().get( SAASAPI.profile.house.switchDefaultEstate, params: {'estateId': model.id}); if (base.success) { - await UserTool.userProvider.updateMyHouseInfo(); _refreshController.callRefresh(); } else { BotToast.showText(text: '切换默认房屋失败'); diff --git a/lib/widget/views/bee_gradient_divider.dart b/lib/widget/views/bee_gradient_divider.dart new file mode 100644 index 00000000..321502d5 --- /dev/null +++ b/lib/widget/views/bee_gradient_divider.dart @@ -0,0 +1,54 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; + +class BeeGradientDivider extends StatelessWidget { + final Axis direction; + final double? thin; + final double? length; + final List colors; + + const BeeGradientDivider( + {Key? key, + required this.direction, + required this.thin, + required this.length, + required this.colors}) + : super(key: key); + + const BeeGradientDivider.horizontal({ + Key? key, + this.thin, + this.length, + this.colors = const [Colors.white, Color(0xFFE8E8E8), Colors.white], + }) : this.direction = Axis.horizontal, + super(key: key); + + const BeeGradientDivider.vertical({ + Key? key, + this.thin, + this.length, + this.colors = const [Colors.white, Color(0xFFE8E8E8), Colors.white], + }) : this.direction = Axis.vertical, + super(key: key); + + double get dLength => this.length ?? double.infinity; + + double get dThin => this.thin ?? 1.w; + + @override + Widget build(BuildContext context) { + return Container( + width: direction == Axis.horizontal ? dLength : dThin, + height: direction == Axis.vertical ? dLength : dThin, + decoration: BoxDecoration( + gradient: LinearGradient( + begin: direction == Axis.horizontal + ? Alignment.centerLeft + : Alignment.topCenter, + end: direction == Axis.horizontal + ? Alignment.centerRight + : Alignment.bottomCenter, + colors: colors)), + ); + } +} diff --git a/pubspec.lock b/pubspec.lock index e09654bf..3c7fa62d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -359,7 +359,7 @@ packages: name: dio url: "https://pub.flutter-io.cn" source: hosted - version: "4.0.4" + version: "4.0.6" dotted_border: dependency: "direct main" description: @@ -518,21 +518,21 @@ packages: name: flutter_sound url: "https://pub.flutter-io.cn" source: hosted - version: "9.1.7" + version: "9.1.9" flutter_sound_platform_interface: dependency: transitive description: name: flutter_sound_platform_interface url: "https://pub.flutter-io.cn" source: hosted - version: "9.1.7" + version: "9.1.9" flutter_sound_web: dependency: transitive description: name: flutter_sound_web url: "https://pub.flutter-io.cn" source: hosted - version: "9.1.7" + version: "9.1.9" flutter_test: dependency: "direct dev" description: flutter @@ -549,7 +549,7 @@ packages: name: fluwx url: "https://pub.flutter-io.cn" source: hosted - version: "3.8.1+1" + version: "3.8.2" frontend_server_client: dependency: transitive description: @@ -696,7 +696,7 @@ packages: name: jpush_flutter url: "https://pub.flutter-io.cn" source: hosted - version: "2.2.3" + version: "2.2.4" js: dependency: transitive description: @@ -865,13 +865,6 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "1.0.4" - palette_generator: - dependency: "direct main" - description: - name: palette_generator - url: "https://pub.flutter-io.cn" - source: hosted - version: "0.3.3" path: dependency: transitive description: @@ -1375,7 +1368,7 @@ packages: name: win32 url: "https://pub.flutter-io.cn" source: hosted - version: "2.5.0" + version: "2.5.1" xdg_directories: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index fec81c8b..edee033b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -114,8 +114,8 @@ dependencies: scroll_to_index: ^2.1.1 #验证码自动填充 sms_autofill: ^2.2.0 - #提取图片主色 - palette_generator: ^0.3.2 +# #提取图片主色 +# palette_generator: ^0.3.2 #音频播放 just_audio: ^0.9.20 #录音 @@ -152,6 +152,7 @@ flutter: - assets/static/ - assets/json/ - assets/bracelet/ + - assets/home/ import_sorter: emojis: true