From 43a341237a14082fe32fd89f8f01eca26a38407f Mon Sep 17 00:00:00 2001 From: zhangmeng <494089941@qq.com> Date: Thu, 7 Apr 2022 11:36:46 +0800 Subject: [PATCH 1/2] fix bugs --- lib/pages/home/home_page.dart | 16 +++---- lib/pages/personal/personal_page.dart | 47 +++++++------------ lib/pages/setting_page/settings_page.dart | 33 ++++++------- lib/pages/sign/login/other_login_page.dart | 6 ++- .../community_views/community_page.dart | 3 ++ .../community_views/my_community_view.dart | 1 + .../task/hall/hall_card.dart | 2 +- .../task/my_take_task/my_take_task_card.dart | 25 +--------- .../function_and_service/task/task_map.dart | 11 +++-- 9 files changed, 56 insertions(+), 88 deletions(-) diff --git a/lib/pages/home/home_page.dart b/lib/pages/home/home_page.dart index d7b309d3..cef2869e 100644 --- a/lib/pages/home/home_page.dart +++ b/lib/pages/home/home_page.dart @@ -129,14 +129,14 @@ class _HomePageState extends State ), textAlign: TextAlign.center, ), - Text( - '(${appProvider.weatherType} ${appProvider.weatherTemp}℃)', - style: TextStyle( - fontSize: 28.sp, - color: Color(0xff999999), - ), - textAlign: TextAlign.center, - ), + // Text( + // '(${appProvider.weatherType} ${appProvider.weatherTemp}℃)', + // style: TextStyle( + // fontSize: 28.sp, + // color: Color(0xff999999), + // ), + // textAlign: TextAlign.center, + // ), Spacer(), // GestureDetector( // onTap: () { diff --git a/lib/pages/personal/personal_page.dart b/lib/pages/personal/personal_page.dart index f5fe8bd1..6137d26b 100644 --- a/lib/pages/personal/personal_page.dart +++ b/lib/pages/personal/personal_page.dart @@ -109,7 +109,7 @@ class _PersonalIndexState extends State height: 40.w, alignment: Alignment.center, child: Image.asset( - R.ASSETS_ICONS_ICON_MY_SETTING_PNG, + Assets.newIcon.imgShezhi.path, width: 40.w, height: 40.w), ), @@ -402,13 +402,13 @@ class _PersonalIndexState extends State ), 24.hb, _function('我的积分', Assets.newIcon.icJifen.path, - () => ClockInPage(), ''), + () => Get.to(() => ClockInPage()), ''), _function( '我的房屋', - R.ASSETS_ICONS_ICON_MY_HOUSE_PNG, - (){ - Get.to(() => MyHousePage()); - }, + Assets.newIcon.icWdfw.path, + () { + Get.to(() => MyHousePage()); + }, // () => HouseOwnersPage( // identify: 4, // ), @@ -417,39 +417,26 @@ class _PersonalIndexState extends State '${UserTool.userProvider.defaultHouse?.unitName ?? ''}' '${UserTool.userProvider.defaultHouse?.estateName ?? ''}', ), - 36.hb, - _function( - '我的家庭', - R.ASSETS_ICONS_ICON_MY_HOUSE_PNG, - (){ - Get.to(() => MyFamilyPage()); - } - - , - ''), - 36.hb, + _function('我的家庭', Assets.newIcon.icWdjt.path, () { + Get.to(() => MyFamilyPage()); + }, ''), // _function('我的车位', R.ASSETS_ICONS_ICON_MY_CARSEAT_PNG, // () => CarParkingPage(), ''), // 36.hb, // _function('我的车', R.ASSETS_ICONS_ICON_MY_CAR_PNG, // () => CarManagePage(), ''), // 36.hb, - _function( - '我的访客', - R.ASSETS_ICONS_ICON_MY_VISITOR_PNG, - (){ - BotToast.showText(text: '当前小区尚未连接设备', align: Alignment(0, 0.5)); - } - - , - ''), - 36.hb, + _function('我的访客', Assets.newIcon.icWdfk.path, () { + BotToast.showText( + text: '当前小区尚未连接设备', + align: Alignment(0, 0.5)); + }, ''), _function( '收货地址', - R.ASSETS_ICONS_ICON_MY_LOCATION_PNG, - () => AddressListPage( + Assets.newIcon.icShdz.path, + () => Get.to(() => AddressListPage( canBack: false, - ), + )), ''), ], ), diff --git a/lib/pages/setting_page/settings_page.dart b/lib/pages/setting_page/settings_page.dart index 3fc428bf..d414cbfe 100644 --- a/lib/pages/setting_page/settings_page.dart +++ b/lib/pages/setting_page/settings_page.dart @@ -1,12 +1,9 @@ import 'package:aku_new_community/base/base_style.dart'; import 'package:aku_new_community/extensions/num_ext.dart'; import 'package:aku_new_community/extensions/widget_list_ext.dart'; -import 'package:aku_new_community/pages/setting_page/about_page/about_page.dart'; -import 'package:aku_new_community/pages/setting_page/account_manager_page.dart'; import 'package:aku_new_community/pages/setting_page/agreement_page/agreement_page.dart'; import 'package:aku_new_community/pages/setting_page/agreement_page/privacy_page.dart'; -import 'package:aku_new_community/pages/setting_page/feedback_page/feedback_page.dart'; -import 'package:aku_new_community/pages/tab_navigator.dart'; +import 'package:aku_new_community/pages/sign/login/other_login_page.dart'; import 'package:aku_new_community/provider/user_provider.dart'; import 'package:aku_new_community/utils/developer_util.dart'; import 'package:aku_new_community/utils/websocket/web_socket_util.dart'; @@ -81,7 +78,7 @@ class _SettingsPageState extends State { ), onPressed: () { userProvider.logout(); - Get.offAll(() => TabNavigator()); + Get.to(() => OtherLoginPage()); }, ), ], @@ -106,7 +103,7 @@ class _SettingsPageState extends State { body: ListView( padding: EdgeInsets.zero, children: [ - ...[ + ...[ // _buildTile( // title: '是否接受信息通知', // suffix: CupertinoSwitch( @@ -114,10 +111,10 @@ class _SettingsPageState extends State { // onChanged: (state) {}, // ), // ), - _buildTile( - title: '关于小蜜蜂智慧小区', - onTap: () => Get.to(() => AboutPage()), - ), + // _buildTile( + // title: '关于小蜜蜂智慧小区', + // onTap: () => Get.to(() => AboutPage()), + // ), //TODO 邀请注册 // _buildTile( // title: '邀请注册', @@ -137,14 +134,14 @@ class _SettingsPageState extends State { // title: '清除缓存', // onTap: () {}, // ), - _buildTile( - title: '意见反馈', - onTap: () => Get.to(() => FeedBackPage()), - ), - _buildTile( - title: '账号管理', - onTap: () => Get.to(() => AccountManagerPage()), - ), + // _buildTile( + // title: '意见反馈', + // onTap: () => Get.to(() => FeedBackPage()), + // ), + // _buildTile( + // title: '账号管理', + // onTap: () => Get.to(() => AccountManagerPage()), + // ), _buildTile( title: '小蜜蜂用户协议', onTap: () => Get.to(() => AgreementPage()), diff --git a/lib/pages/sign/login/other_login_page.dart b/lib/pages/sign/login/other_login_page.dart index 92837e46..0071da3a 100644 --- a/lib/pages/sign/login/other_login_page.dart +++ b/lib/pages/sign/login/other_login_page.dart @@ -113,8 +113,10 @@ class _OtherLoginPageState extends State { await UserTool.dataProvider.addHistories(); await UserTool.userProvider.setLogin(response.data['data']); } else { - // BotToast.showText(text: response.data['message']); - BotToast.showText(text: '账号尚未注册，请使用验证码登陆'); + BotToast.showText(text: response.data['msg']); + if (response.data['msg'] == '该账户未设置密码，请使用验证码登录') { + _controller.jumpToPage(0); + } } } catch (e) { print(e.toString()); diff --git a/lib/ui/community/community_views/community_page.dart b/lib/ui/community/community_views/community_page.dart index 3ae3d310..9f30c4db 100644 --- a/lib/ui/community/community_views/community_page.dart +++ b/lib/ui/community/community_views/community_page.dart @@ -97,6 +97,9 @@ class _CommunityPageState extends State child: TabBar( onTap: (index) { setState(() {}); + if (_tabController?.index == 1) { + myKey.currentState?.refresh(); + } }, controller: _tabController, indicatorColor: Color(0xffffc40c), diff --git a/lib/ui/community/community_views/my_community_view.dart b/lib/ui/community/community_views/my_community_view.dart index 3605f060..b10b7d9e 100644 --- a/lib/ui/community/community_views/my_community_view.dart +++ b/lib/ui/community/community_views/my_community_view.dart @@ -131,6 +131,7 @@ class MyCommunityViewState extends State return EasyRefresh( firstRefresh: true, header: MaterialHeader(), + footer: MaterialFooter(), controller: _refreshController, onRefresh: () async { BaseListModel model = await NetUtil().getList( diff --git a/lib/ui/function_and_service/task/hall/hall_card.dart b/lib/ui/function_and_service/task/hall/hall_card.dart index b0732b5e..9bd9404a 100644 --- a/lib/ui/function_and_service/task/hall/hall_card.dart +++ b/lib/ui/function_and_service/task/hall/hall_card.dart @@ -122,7 +122,7 @@ class HallCard extends StatelessWidget { 24.w.heightBox, Row( children: [ - Assets.icons.environment.image(width: 36.w, height: 36.w), + Assets.icons.environment.image(width: 40.w, height: 40.w), 24.w.widthBox, '${model.accessAddress}' .text diff --git a/lib/ui/function_and_service/task/my_take_task/my_take_task_card.dart b/lib/ui/function_and_service/task/my_take_task/my_take_task_card.dart index 5d336015..f41d66e4 100644 --- a/lib/ui/function_and_service/task/my_take_task/my_take_task_card.dart +++ b/lib/ui/function_and_service/task/my_take_task/my_take_task_card.dart @@ -80,29 +80,6 @@ class MyTakeTaskCard extends StatelessWidget { 24.w.heightBox, appointment, 20.w.heightBox, - Row( - children: [ - Assets.icons.clockCircle.image(width: 36.w, height: 36.w), - 24.w.widthBox, - '${DateUtil.formatDateStr(model.readyEndTime)}' - .text - .size(24.sp) - .color(Colors.black.withOpacity(0.65)) - .make(), - ], - ), - 20.w.heightBox, - Row( - children: [ - Assets.icons.environment.image(width: 36.w, height: 36.w), - 24.w.widthBox, - '${model.accessAddress}' - .text - .size(24.sp) - .color(Colors.black.withOpacity(0.65)) - .make(), - ], - ), Row( children: [ Assets.icons.watch.image(width: 40.w, height: 40.w), @@ -120,7 +97,7 @@ class MyTakeTaskCard extends StatelessWidget { 24.w.heightBox, Row( children: [ - Assets.icons.environment.image(width: 36.w, height: 36.w), + Assets.icons.environment.image(width: 40.w, height: 40.w), 24.w.widthBox, '${model.accessAddress}' .text diff --git a/lib/ui/function_and_service/task/task_map.dart b/lib/ui/function_and_service/task/task_map.dart index f6d54ba4..3b95eecf 100644 --- a/lib/ui/function_and_service/task/task_map.dart +++ b/lib/ui/function_and_service/task/task_map.dart @@ -8,15 +8,16 @@ class TaskMap { 9: '其他' }; static Map statusToString = { - 1: '未接单', - 2: '待处理', - 3: '已完成', - 4: '已取消' + 1: '已发布', + 2: '服务中', + 3: '待确认', + 4: '已完成', + 5: '已评价', + 9: '已取消' }; static Map typeToString = {1: '跑腿', 2: '代驾', 3: '装修', 4: '陪玩'}; static Map serviceObject = {1: '住户', 2: '物业', 3: '不限'}; static Map rewardType = {1: '赏金', 2: '积分'}; - } From 7c592892cda6e9c88bf9da64e854a236a9d892b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=A0=E6=96=87=E8=BD=A9?= <12812285557@qq.com> Date: Thu, 7 Apr 2022 11:37:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=B8=AD=E5=BF=83bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/gen/assets.gen.dart | 791 +++++++++++++++++- lib/models/message/reply_list_model.dart | 4 +- lib/models/message/reply_list_model.g.dart | 3 +- .../message_center_page.dart | 35 +- .../reply/replay_view.dart | 4 +- .../message_center_page/reply/reply_card.dart | 8 +- .../thumbs_up/thumbs_up_card.dart | 5 +- .../community_views/event_detail_page.dart | 320 +++---- lib/widget/bee_scaffold.dart | 1 + 9 files changed, 988 insertions(+), 183 deletions(-) diff --git a/lib/gen/assets.gen.dart b/lib/gen/assets.gen.dart index 6aa32d97..2a1cba08 100644 --- a/lib/gen/assets.gen.dart +++ b/lib/gen/assets.gen.dart @@ -3,65 +3,123 @@ /// 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'); } @@ -69,623 +127,1305 @@ class $AssetsBraceletGen { class $AssetsHomeGen { const $AssetsHomeGen(); + /// File path: assets/home/ic_bsbx.png AssetGenImage get icBsbx => const AssetGenImage('assets/home/ic_bsbx.png'); + + /// File path: assets/home/ic_gonggao.png AssetGenImage get icGonggao => const AssetGenImage('assets/home/ic_gonggao.png'); + + /// File path: assets/home/ic_kaimen.png AssetGenImage get icKaimen => const AssetGenImage('assets/home/ic_kaimen.png'); + + /// File path: assets/home/ic_ljcw.png AssetGenImage get icLjcw => const AssetGenImage('assets/home/ic_ljcw.png'); + + /// File path: assets/home/ic_location.png AssetGenImage get icLocation => const AssetGenImage('assets/home/ic_location.png'); + + /// File path: assets/home/ic_message.png AssetGenImage get icMessage => const AssetGenImage('assets/home/ic_message.png'); + + /// File path: assets/home/ic_qbyy.png AssetGenImage get icQbyy => const AssetGenImage('assets/home/ic_qbyy.png'); + + /// File path: assets/home/ic_rwfb.png AssetGenImage get icRwfb => const AssetGenImage('assets/home/ic_rwfb.png'); + + /// File path: assets/home/ic_search.png AssetGenImage get icSearch => const AssetGenImage('assets/home/ic_search.png'); + + /// File path: assets/home/ic_shangc_nor.png AssetGenImage get icShangcNor => const AssetGenImage('assets/home/ic_shangc_nor.png'); + + /// File path: assets/home/ic_shangc_sel.png AssetGenImage get icShangcSel => const AssetGenImage('assets/home/ic_shangc_sel.png'); + + /// File path: assets/home/ic_shequ_nor.png AssetGenImage get icShequNor => const AssetGenImage('assets/home/ic_shequ_nor.png'); + + /// File path: assets/home/ic_shequ_sel.png AssetGenImage get icShequSel => const AssetGenImage('assets/home/ic_shequ_sel.png'); + + /// File path: assets/home/ic_shjf.png AssetGenImage get icShjf => const AssetGenImage('assets/home/ic_shjf.png'); + + /// File path: assets/home/ic_shouye_nor.png AssetGenImage get icShouyeNor => const AssetGenImage('assets/home/ic_shouye_nor.png'); + + /// File path: assets/home/ic_shouye_sel.png AssetGenImage get icShouyeSel => const AssetGenImage('assets/home/ic_shouye_sel.png'); + + /// File path: assets/home/ic_ssyy.png AssetGenImage get icSsyy => const AssetGenImage('assets/home/ic_ssyy.png'); + + /// File path: assets/home/ic_wode_nor.png AssetGenImage get icWodeNor => const AssetGenImage('assets/home/ic_wode_nor.png'); + + /// File path: assets/home/ic_wode_sel.png AssetGenImage get icWodeSel => const AssetGenImage('assets/home/ic_wode_sel.png'); + + /// File path: assets/home/ic_zbfw.png AssetGenImage get icZbfw => const AssetGenImage('assets/home/ic_zbfw.png'); + + /// File path: assets/home/ic_zhyl.png AssetGenImage get icZhyl => const AssetGenImage('assets/home/ic_zhyl.png'); + + /// File path: assets/home/img_fkyq.png AssetGenImage get imgFkyq => const AssetGenImage('assets/home/img_fkyq.png'); + + /// File path: assets/home/img_jyzx.png AssetGenImage get imgJyzx => const AssetGenImage('assets/home/img_jyzx.png'); + + /// File path: assets/home/img_tabdi.png AssetGenImage get imgTabdi => const AssetGenImage('assets/home/img_tabdi.png'); + + /// File path: assets/home/img_yjbj.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/img_qiandao.png AssetGenImage get imgQiandao => const AssetGenImage('assets/icons/img_qiandao.png'); + + /// File path: assets/icons/img_shezhi.png AssetGenImage get imgShezhi => const AssetGenImage('assets/icons/img_shezhi.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/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'); - AssetGenImage get wxpay => const AssetGenImage('assets/images/wxpay.png'); -} -class $AssetsJsonGen { - const $AssetsJsonGen(); + /// File path: assets/images/wxpay.png + AssetGenImage get wxpay => const AssetGenImage('assets/images/wxpay.png'); } class $AssetsNewIconGen { const $AssetsNewIconGen(); + /// File path: assets/newIcon/avatar_placeholder.png AssetGenImage get avatarPlaceholder => const AssetGenImage('assets/newIcon/avatar_placeholder.png'); + + /// File path: assets/newIcon/ic_daifuk.png AssetGenImage get icDaifuk => const AssetGenImage('assets/newIcon/ic_daifuk.png'); + + /// File path: assets/newIcon/ic_daishouh.png AssetGenImage get icDaishouh => const AssetGenImage('assets/newIcon/ic_daishouh.png'); + + /// File path: assets/newIcon/ic_dlxx.png AssetGenImage get icDlxx => const AssetGenImage('assets/newIcon/ic_dlxx.png'); + + /// File path: assets/newIcon/ic_dzsw.png AssetGenImage get icDzsw => const AssetGenImage('assets/newIcon/ic_dzsw.png'); + + /// File path: assets/newIcon/ic_essc.png AssetGenImage get icEssc => const AssetGenImage('assets/newIcon/ic_essc.png'); + + /// File path: assets/newIcon/ic_fwll.png AssetGenImage get icFwll => const AssetGenImage('assets/newIcon/ic_fwll.png'); + + /// File path: assets/newIcon/ic_gxtc.png AssetGenImage get icGxtc => const AssetGenImage('assets/newIcon/ic_gxtc.png'); + + /// File path: assets/newIcon/ic_gxtp.png AssetGenImage get icGxtp => const AssetGenImage('assets/newIcon/ic_gxtp.png'); + + /// File path: assets/newIcon/ic_hdtp.png AssetGenImage get icHdtp => const AssetGenImage('assets/newIcon/ic_hdtp.png'); + + /// File path: assets/newIcon/ic_jhgl.png AssetGenImage get icJhgl => const AssetGenImage('assets/newIcon/ic_jhgl.png'); + + /// File path: assets/newIcon/ic_jifen.png AssetGenImage get icJifen => const AssetGenImage('assets/newIcon/ic_jifen.png'); + + /// File path: assets/newIcon/ic_kdbg.png AssetGenImage get icKdbg => const AssetGenImage('assets/newIcon/ic_kdbg.png'); + + /// File path: assets/newIcon/ic_kmm.png AssetGenImage get icKmm => const AssetGenImage('assets/newIcon/ic_kmm.png'); + + /// File path: assets/newIcon/ic_rwsm.png AssetGenImage get icRwsm => const AssetGenImage('assets/newIcon/ic_rwsm.png'); + + /// File path: assets/newIcon/ic_shdz.png AssetGenImage get icShdz => const AssetGenImage('assets/newIcon/ic_shdz.png'); + + /// File path: assets/newIcon/ic_sqjs.png AssetGenImage get icSqjs => const AssetGenImage('assets/newIcon/ic_sqjs.png'); + + /// File path: assets/newIcon/ic_tsby.png AssetGenImage get icTsby => const AssetGenImage('assets/newIcon/ic_tsby.png'); + + /// File path: assets/newIcon/ic_wdfk.png AssetGenImage get icWdfk => const AssetGenImage('assets/newIcon/ic_wdfk.png'); + + /// File path: assets/newIcon/ic_wdfw.png AssetGenImage get icWdfw => const AssetGenImage('assets/newIcon/ic_wdfw.png'); + + /// File path: assets/newIcon/ic_wdjt.png AssetGenImage get icWdjt => const AssetGenImage('assets/newIcon/ic_wdjt.png'); + + /// File path: assets/newIcon/ic_wjdc.png AssetGenImage get icWjdc => const AssetGenImage('assets/newIcon/ic_wjdc.png'); + + /// File path: assets/newIcon/ic_xmfrw.png AssetGenImage get icXmfrw => const AssetGenImage('assets/newIcon/ic_xmfrw.png'); + + /// File path: assets/newIcon/ic_ywh.png AssetGenImage get icYwh => const AssetGenImage('assets/newIcon/ic_ywh.png'); + + /// File path: assets/newIcon/ic_zbqy.png AssetGenImage get icZbqy => const AssetGenImage('assets/newIcon/ic_zbqy.png'); + + /// File path: assets/newIcon/ic_zysc.png AssetGenImage get icZysc => const AssetGenImage('assets/newIcon/ic_zysc.png'); + + /// File path: assets/newIcon/img_bg.png AssetGenImage get imgBg => const AssetGenImage('assets/newIcon/img_bg.png'); + + /// File path: assets/newIcon/img_bmdh.png AssetGenImage get imgBmdh => const AssetGenImage('assets/newIcon/img_bmdh.png'); + + /// File path: assets/newIcon/img_daifah.png AssetGenImage get imgDaifah => const AssetGenImage('assets/newIcon/img_daifah.png'); + + /// File path: assets/newIcon/img_daipingj.png AssetGenImage get imgDaipingj => const AssetGenImage('assets/newIcon/img_daipingj.png'); + + /// File path: assets/newIcon/img_dengji.png AssetGenImage get imgDengji => const AssetGenImage('assets/newIcon/img_dengji.png'); + + /// File path: assets/newIcon/img_qiandao.png AssetGenImage get imgQiandao => const AssetGenImage('assets/newIcon/img_qiandao.png'); + + /// File path: assets/newIcon/img_shezhi.png AssetGenImage get imgShezhi => const AssetGenImage('assets/newIcon/img_shezhi.png'); + + /// File path: assets/newIcon/img_txmr.png AssetGenImage get imgTxmr => const AssetGenImage('assets/newIcon/img_txmr.png'); + + /// File path: assets/newIcon/img_vip.png AssetGenImage get imgVip => const AssetGenImage('assets/newIcon/img_vip.png'); + + /// File path: assets/newIcon/img_vipbg.png AssetGenImage get imgVipbg => const AssetGenImage('assets/newIcon/img_vipbg.png'); + + /// File path: assets/newIcon/img_wpcm.png AssetGenImage get imgWpcm => const AssetGenImage('assets/newIcon/img_wpcm.png'); + + /// File path: assets/newIcon/img_zxgl.png AssetGenImage get imgZxgl => const AssetGenImage('assets/newIcon/img_zxgl.png'); } @@ -693,39 +1433,74 @@ class $AssetsNewIconGen { 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'); } @@ -733,9 +1508,16 @@ 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'); } @@ -747,7 +1529,6 @@ class Assets { static const $AssetsHomeGen home = $AssetsHomeGen(); static const $AssetsIconsGen icons = $AssetsIconsGen(); static const $AssetsImagesGen images = $AssetsImagesGen(); - static const $AssetsJsonGen json = $AssetsJsonGen(); static const $AssetsNewIconGen newIcon = $AssetsNewIconGen(); static const $AssetsStaticGen static = $AssetsStaticGen(); static const $AssetsTabGen tab = $AssetsTabGen(); diff --git a/lib/models/message/reply_list_model.dart b/lib/models/message/reply_list_model.dart index 5dbbb296..03cf1cbf 100644 --- a/lib/models/message/reply_list_model.dart +++ b/lib/models/message/reply_list_model.dart @@ -7,8 +7,9 @@ part 'reply_list_model.g.dart'; @JsonSerializable() class ReplyListModel { final int id; + final int type; final int status; - final String content; + final String? content; final int sendId; final String sendName; final String sendDate; @@ -26,6 +27,7 @@ class ReplyListModel { const ReplyListModel({ required this.id, + required this.type, required this.status, required this.content, required this.sendId, diff --git a/lib/models/message/reply_list_model.g.dart b/lib/models/message/reply_list_model.g.dart index 821f888c..8693f74e 100644 --- a/lib/models/message/reply_list_model.g.dart +++ b/lib/models/message/reply_list_model.g.dart @@ -9,8 +9,9 @@ part of 'reply_list_model.dart'; ReplyListModel _$ReplyListModelFromJson(Map json) => ReplyListModel( id: json['id'] as int, + type: json['type'] as int, status: json['status'] as int, - content: json['content'] as String, + content: json['content'] !=null? json['content'] as String:'', sendId: json['sendId'] as int, sendName: json['sendName'] as String, sendDate: json['sendDate'] as String, diff --git a/lib/pages/message_center_page/message_center_page.dart b/lib/pages/message_center_page/message_center_page.dart index 9340abbb..2ea77b14 100644 --- a/lib/pages/message_center_page/message_center_page.dart +++ b/lib/pages/message_center_page/message_center_page.dart @@ -47,6 +47,8 @@ class _MessageCenterPageState extends State @override Widget build(BuildContext context) { return BeeScaffold( + bgColor: Colors.white, + bodyColor: Color(0xFFF9F9F9), title: '消息', actions: [ MaterialButton( @@ -65,21 +67,28 @@ class _MessageCenterPageState extends State padding: EdgeInsets.symmetric(horizontal: 32.w), ), ], - appBarBottom: BeeTabBar( + appBarBottom: + TabBar( controller: _tabController, - tabs: _tabs, + indicatorColor: Color(0xffffc40c), + tabs: _tabs.map((e) => Tab(text: e)).toList(), + indicatorPadding: EdgeInsets.only(bottom: 15.w,left: 35.w,right: 35.w), ), - body: TabBarView( - children: [ - ReplayView( - controller: _controllers[0], - ), - ThumbsUpView( - controller: _controllers[1], - ), - AnnounceView(), - ], - controller: _tabController, + body: + Padding( + padding: EdgeInsets.only(top: 10.w), + child: TabBarView( + children: [ + ReplayView( + controller: _controllers[0], + ), + ThumbsUpView( + controller: _controllers[1], + ), + AnnounceView(), + ], + controller: _tabController, + ), ), ); } diff --git a/lib/pages/message_center_page/reply/replay_view.dart b/lib/pages/message_center_page/reply/replay_view.dart index 8229be86..b8572236 100644 --- a/lib/pages/message_center_page/reply/replay_view.dart +++ b/lib/pages/message_center_page/reply/replay_view.dart @@ -38,7 +38,9 @@ class _ReplayViewState extends State { itemBuilder: (context, index) { return ReplyCard(model: items[index]); }, - separatorBuilder: (_, __) =>1.w.heightBox, + separatorBuilder: (_, __) =>Container( + color: Color(0xFFF0F0F0),height: 2.w, + ), 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 index 4fd60235..f9cd58b5 100644 --- a/lib/pages/message_center_page/reply/reply_card.dart +++ b/lib/pages/message_center_page/reply/reply_card.dart @@ -42,7 +42,13 @@ class ReplyCard extends StatelessWidget { children: [ model.sendName.text.size(26.sp).black.bold.make(), 5.heightBox, - model.content.text + model.content==null?''.text + .size(26.sp) + .color(ktextSubColor) + .maxLines(1) + .ellipsis + .make(): + (model.content!).text .size(26.sp) .color(ktextSubColor) .maxLines(1) diff --git a/lib/pages/message_center_page/thumbs_up/thumbs_up_card.dart b/lib/pages/message_center_page/thumbs_up/thumbs_up_card.dart index bf51df36..8a561478 100644 --- a/lib/pages/message_center_page/thumbs_up/thumbs_up_card.dart +++ b/lib/pages/message_center_page/thumbs_up/thumbs_up_card.dart @@ -1,5 +1,6 @@ import 'package:aku_new_community/base/base_style.dart'; import 'package:aku_new_community/gen/assets.gen.dart'; +import 'package:aku_new_community/models/message/reply_list_model.dart'; import 'package:aku_new_community/models/message/thumbs_up_list_model.dart'; import 'package:aku_new_community/pages/message_center_page/message_func.dart'; import 'package:aku_new_community/widget/beeImageNetwork.dart'; @@ -8,7 +9,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:velocity_x/velocity_x.dart'; class ThumbsUpCard extends StatelessWidget { - final ThumbsUpListModel model; + final ReplyListModel model; const ThumbsUpCard({Key? key, required this.model}) : super(key: key); @@ -36,8 +37,10 @@ class ThumbsUpCard extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ model.sendName.text.size(26.sp).black.bold.make(), + 5.heightBox, Assets.icons.communityLikeIs .image(width: 28.w, height: 28.w, fit: BoxFit.contain), + 5.heightBox, model.sendDate.text.size(24.sp).color(ktextSubColor).make(), ], ), diff --git a/lib/ui/community/community_views/event_detail_page.dart b/lib/ui/community/community_views/event_detail_page.dart index 90513e7a..db1701c8 100644 --- a/lib/ui/community/community_views/event_detail_page.dart +++ b/lib/ui/community/community_views/event_detail_page.dart @@ -300,134 +300,134 @@ class _EventDetailPageState extends State { } Widget _commentWidget(CommentListModel model, int rootIndex) { - return Container( - // key: UniqueKey(), - color: Colors.white, - padding: EdgeInsets.symmetric(vertical: 32.w, horizontal: 32.w), - width: double.infinity, - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - [ - Material( - color: Color(0xFFF5F5F5), - borderRadius: BorderRadius.circular(48.w), - clipBehavior: Clip.antiAlias, - child: FadeInImage.assetNetwork( - placeholder: R.ASSETS_IMAGES_PLACEHOLDER_WEBP, - image: SAASAPI.image(ImgModel.first(model.avatarImgList)), - height: 96.w, - width: 96.w, - fit: BoxFit.cover, - imageErrorBuilder: (context, error, stackTrace) { - return Image.asset( - R.ASSETS_IMAGES_PLACEHOLDER_WEBP, - height: 86.w, - width: 86.w, - ); - }, - ), - ), - 20.wb, - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - model.createName, - maxLines: 1, - overflow: TextOverflow.ellipsis, - style: TextStyle( - color: Colors.black.withOpacity(0.85), - fontSize: 30.sp, - fontWeight: FontWeight.w500), + return GestureDetector( + onTap: () { + _rootId = model.id; + _parentId = model.id; + _focusNode.requestFocus(); + _currentCommentIndex = rootIndex; + }, + child: Container( + // key: UniqueKey(), + color: Colors.white, + padding: EdgeInsets.symmetric(vertical: 32.w, horizontal: 32.w), + width: double.infinity, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + [ + Material( + color: Color(0xFFF5F5F5), + borderRadius: BorderRadius.circular(48.w), + clipBehavior: Clip.antiAlias, + child: FadeInImage.assetNetwork( + placeholder: R.ASSETS_IMAGES_PLACEHOLDER_WEBP, + image: SAASAPI.image(ImgModel.first(model.avatarImgList)), + height: 96.w, + width: 96.w, + fit: BoxFit.cover, + imageErrorBuilder: (context, error, stackTrace) { + return Image.asset( + R.ASSETS_IMAGES_PLACEHOLDER_WEBP, + height: 86.w, + width: 86.w, + ); + }, ), - 12.hb, - BeeDateUtil(DateUtil.getDateTime(model.createDate)) - .timeAgoWithHm - .text - .size(24.sp) - .color(Color(0xFF999999)) - .make(), - ], - ), - Spacer(), - CommunityPopButton( - isMyself: _isMyself, - onSelect: (value) async { - if (_isMyself) { - await CommunityFunc.deleteComment(model.id); - _refreshController.callRefresh(); - } - }) - ].row(), - 40.hb, - model.content.text.size(28.sp).color(ktextSubColor).make(), - 30.hb, - GestureDetector( - onTap: () async { - var res = - await NetUtil().get(SAASAPI.community.commentLike, params: { - 'commentId': model.id, - }); - if (res.success) { - _likes[rootIndex] = !_likes[rootIndex]; - setState(() {}); - } - }, - child: Row( - children: [ - Spacer(), - GestureDetector( - onTap: () async { - var base = await NetUtil().get( - SAASAPI.community.commentLike, - params: {'commentId': model.id}); - if (base.success) { - _likes[rootIndex] = !_likes[rootIndex]; - if (_likes[rootIndex]) { - _likeNums[rootIndex] += 1; + ), + 20.wb, + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + model.createName, + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: TextStyle( + color: Colors.black.withOpacity(0.85), + fontSize: 30.sp, + fontWeight: FontWeight.w500), + ), + 12.hb, + BeeDateUtil(DateUtil.getDateTime(model.createDate)) + .timeAgoWithHm + .text + .size(24.sp) + .color(Color(0xFF999999)) + .make(), + ], + ), + Spacer(), + CommunityPopButton( + isMyself: _isMyself, + onSelect: (value) async { + if (_isMyself) { + await CommunityFunc.deleteComment(model.id); + _refreshController.callRefresh(); + } + }) + ].row(), + 40.hb, + model.content.text.size(28.sp).color(ktextSubColor).make(), + 30.hb, + GestureDetector( + onTap: () async { + var res = + await NetUtil().get(SAASAPI.community.commentLike, params: { + 'commentId': model.id, + }); + if (res.success) { + _likes[rootIndex] = !_likes[rootIndex]; + setState(() {}); + } + }, + child: Row( + children: [ + Spacer(), + GestureDetector( + onTap: () async { + var base = await NetUtil().get( + SAASAPI.community.commentLike, + params: {'commentId': model.id}); + if (base.success) { + _likes[rootIndex] = !_likes[rootIndex]; + if (_likes[rootIndex]) { + _likeNums[rootIndex] += 1; + } else { + _likeNums[rootIndex] -= 1; + } + BotToast.showText( + text: _likes[rootIndex] ? '点赞成功' : '取消点赞成功'); } else { - _likeNums[rootIndex] -= 1; + BotToast.showText(text: base.msg); } - BotToast.showText( - text: _likes[rootIndex] ? '点赞成功' : '取消点赞成功'); - } else { - BotToast.showText(text: base.msg); - } - setState(() {}); - }, - child: Material( - color: Colors.transparent, - child: Row( - children: [ - Image.asset( - R.ASSETS_ICONS_COMMUNITY_LIKE_PNG, - width: 32.w, - height: 32.w, - color: !_likes[rootIndex] - ? Colors.black.withOpacity(0.45) - : kPrimaryColor, - ), - 5.wb, - '${_likeNums[rootIndex]}' - .text - .size(24.sp) - .color(Color(0xFF999999)) - .make(), - ], + setState(() {}); + }, + child: Material( + color: Colors.transparent, + child: Row( + children: [ + Image.asset( + R.ASSETS_ICONS_COMMUNITY_LIKE_PNG, + width: 32.w, + height: 32.w, + color: !_likes[rootIndex] + ? Colors.black.withOpacity(0.45) + : kPrimaryColor, + ), + 5.wb, + '${_likeNums[rootIndex]}' + .text + .size(24.sp) + .color(Color(0xFF999999)) + .make(), + ], + ), ), ), - ), - 32.wb, - GestureDetector( - onTap: () { - _rootId = model.id; - _parentId = model.id; - _focusNode.requestFocus(); - _currentCommentIndex = rootIndex; - }, - child: Row( + 32.wb, + Row( children: [ Image.asset( R.ASSETS_ICONS_COMMUNITY_COMMENT_PNG, @@ -436,46 +436,46 @@ class _EventDetailPageState extends State { ), ], ), - ), - 5.wb, - '${model.commentNum}' - .text - .size(24.sp) - .color(Color(0xFF999999)) - .make(), - ], + 5.wb, + '${model.commentNum}' + .text + .size(24.sp) + .color(Color(0xFF999999)) + .make(), + ], + ), ), - ), - 40.hb, - model.commentTwoList.isEmpty - ? SizedBox.shrink() - : Container( - alignment: Alignment.topLeft, - decoration: BoxDecoration( - color: Colors.black.withOpacity(0.06), - borderRadius: BorderRadius.circular(16.w)), - margin: EdgeInsets.only(left: 125.w), - width: 600.w, - padding: - EdgeInsets.symmetric(vertical: 24.w, horizontal: 32.w), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - ...List.generate( - model.commentTwoList.length < 3 - ? model.commentTwoList.length - : 3, - (index) => _subCommentWidget( - model.commentTwoList[index], - model.createId, - model.id, - rootIndex)), - if (model.commentTwoList.length > 3) - _foldComment(model, rootIndex) - ].sepWidget(separate: 24.hb), + 40.hb, + model.commentTwoList.isEmpty + ? SizedBox.shrink() + : Container( + alignment: Alignment.topLeft, + decoration: BoxDecoration( + color: Colors.black.withOpacity(0.06), + borderRadius: BorderRadius.circular(16.w)), + margin: EdgeInsets.only(left: 125.w), + width: 600.w, + padding: + EdgeInsets.symmetric(vertical: 24.w, horizontal: 32.w), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + ...List.generate( + model.commentTwoList.length < 3 + ? model.commentTwoList.length + : 3, + (index) => _subCommentWidget( + model.commentTwoList[index], + model.createId, + model.id, + rootIndex)), + if (model.commentTwoList.length > 3) + _foldComment(model, rootIndex) + ].sepWidget(separate: 24.hb), + ), ), - ), - ], + ], + ), ), ); } diff --git a/lib/widget/bee_scaffold.dart b/lib/widget/bee_scaffold.dart index 932a77e3..1aedb100 100644 --- a/lib/widget/bee_scaffold.dart +++ b/lib/widget/bee_scaffold.dart @@ -73,6 +73,7 @@ class BeeScaffold extends StatelessWidget { actions: actions, bottom: appBarBottom, titleSpacing: titleSpacing, + ); return AnnotatedRegion(