diff --git a/assets/icons/projection_screen.png b/assets/icons/projection_screen.png new file mode 100644 index 00000000..ae368be4 Binary files /dev/null and b/assets/icons/projection_screen.png differ diff --git a/lib/constants/app_theme.dart b/lib/constants/app_theme.dart index 2771dda3..9bc9db90 100644 --- a/lib/constants/app_theme.dart +++ b/lib/constants/app_theme.dart @@ -32,17 +32,24 @@ class AppTheme { appBarTheme: AppBarTheme( elevation: 0, centerTitle: true, - brightness: Brightness.light, iconTheme: IconThemeData( color: Color(0xFF333333), ), - textTheme: TextTheme( + systemOverlayStyle: SystemUiOverlayStyle.dark, + toolbarTextStyle: TextTheme( headline6: TextStyle( color: Color(0xFF333333), fontSize: 36.sp, fontWeight: FontWeight.bold, ), - ), + ).bodyText2, + titleTextStyle: TextTheme( + headline6: TextStyle( + color: Color(0xFF333333), + fontSize: 36.sp, + fontWeight: FontWeight.bold, + ), + ).headline6, ), tabBarTheme: TabBarTheme( labelColor: Color(0xFF333333), diff --git a/lib/constants/application_objects.dart b/lib/constants/application_objects.dart index a2c344af..530aa4cf 100644 --- a/lib/constants/application_objects.dart +++ b/lib/constants/application_objects.dart @@ -104,6 +104,7 @@ List appObjects = [ AO('邻家宠物', Assets.icons.nearbyPet.path, null), AO('共享停车', Assets.icons.sharePark.path, null), AO('二手市场', Assets.icons.secondHandMarket.path, null), + AO('共享投屏', Assets.icons.projectionScreen.path, null), // AO( // '小区教育', @@ -161,6 +162,9 @@ List _recommendApp = [ '报事报修', '建议咨询', '一键报警', + '共享投屏', + '二手市场', + '共享停车', ]; ///为您推荐 @@ -262,11 +266,11 @@ List _aboutCommunityApp = [ List get aboutCommunityApp => _aboutCommunityApp.map((e) => AO.fromRaw(e)).toList(); -List _wisdomServiceApp = ['智慧养老', '周边服务', '小蜜蜂任务']; +List _wisdomServiceApp = ['智慧养老', '周边服务', '小蜜蜂任务', '共享投屏']; List get wisdomServiceApp => _wisdomServiceApp.map((e) => AO.fromRaw(e)).toList(); List _nearbyShoppingApp = ['自营商城', '邻家宠物', '共享停车', '二手市场']; List get nearbyShoppingApp => - _wisdomServiceApp.map((e) => AO.fromRaw(e)).toList(); + _nearbyShoppingApp.map((e) => AO.fromRaw(e)).toList(); diff --git a/lib/gen/assets.gen.dart b/lib/gen/assets.gen.dart index 90b1d009..1bd1b401 100644 --- a/lib/gen/assets.gen.dart +++ b/lib/gen/assets.gen.dart @@ -619,6 +619,10 @@ class $AssetsIconsGen { /// File path: assets/icons/phone.png AssetGenImage get phone => const AssetGenImage('assets/icons/phone.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'); diff --git a/lib/pages/home/home_page.dart b/lib/pages/home/home_page.dart index 03fd91b7..fed28479 100644 --- a/lib/pages/home/home_page.dart +++ b/lib/pages/home/home_page.dart @@ -2,6 +2,7 @@ import 'package:aku_new_community/const/resource.dart'; import 'package:aku_new_community/constants/api.dart'; +import 'package:aku_new_community/gen/assets.gen.dart'; import 'package:aku_new_community/model/common/img_model.dart'; import 'package:aku_new_community/model/community/activity_item_model.dart'; import 'package:aku_new_community/model/community/board_model.dart'; @@ -29,6 +30,7 @@ import 'package:aku_new_community/widget/animated/OverlayWidget.dart'; import 'package:aku_new_community/widget/others/rectIndicator.dart'; import 'package:aku_new_community/widget/others/user_tool.dart'; import 'package:badges/badges.dart'; +import 'package:bot_toast/bot_toast.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; @@ -506,30 +508,54 @@ class _HomePageState extends State } Widget getFunction() { - return Row( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, + return Column( children: [ - getFunctionBtn( - '报事报修', R.ASSETS_ICONS_FUNC_BSBX_PNG, () => FixedSubmitPage()), - getFunctionBtn('设施预约', R.ASSETS_ICONS_FUNC_SSYY_PNG, - () => FacilityAppointmentPage()), - getFunctionBtn( - '生活缴费', R.ASSETS_ICONS_FUNC_SHJF_PNG, () => LifePayChoosePage()), - getFunctionBtn( - '全部应用', R.ASSETS_ICONS_FUNC_ALL_PNG, () => AllApplicationPage()), + Row( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + getFunctionBtn( + '报事报修', R.ASSETS_ICONS_FUNC_BSBX_PNG, () => FixedSubmitPage()), + getFunctionBtn('设施预约', R.ASSETS_ICONS_FUNC_SSYY_PNG, + () => FacilityAppointmentPage()), + getFunctionBtn('生活缴费', R.ASSETS_ICONS_FUNC_SHJF_PNG, + () => LifePayChoosePage()), + getFunctionBtn('智慧养老', Assets.icons.provideAged.path, null, + unComplete: true), + ], + ), + 32.hb, + Row( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + getFunctionBtn('周边服务', Assets.icons.nearbyService.path, null, + unComplete: true), + getFunctionBtn('任务发布', Assets.icons.beeTask.path, null, + unComplete: true), + getFunctionBtn('邻家宠物', Assets.icons.nearbyPet.path, null, + unComplete: true), + getFunctionBtn('全部应用', R.ASSETS_ICONS_FUNC_ALL_PNG, + () => AllApplicationPage()), + ], + ), ], ); } - Widget getFunctionBtn(String title, String path, dynamic page) { + Widget getFunctionBtn(String title, String path, dynamic page, + {bool unComplete = false}) { return MaterialButton( shape: StadiumBorder(), padding: EdgeInsets.zero, onPressed: () { if (LoginUtil.isNotLogin) return; if (!LoginUtil.haveRoom(title)) return; - Get.to(page); + if (unComplete) { + BotToast.showText(text: '该功能正在准备上线中,敬请期待', align: Alignment(0, 0.5)); + } else { + Get.to(page); + } }, child: Column( mainAxisAlignment: MainAxisAlignment.center, @@ -539,7 +565,7 @@ class _HomePageState extends State height: 80.w, width: 80.w, ), - 8.hb, + 16.hb, title.text.size(22.sp).color(Color(0xA6000000)).bold.make(), ], ), diff --git a/lib/ui/home/application/all_application.dart b/lib/ui/home/application/all_application.dart index b0141192..9515742e 100644 --- a/lib/ui/home/application/all_application.dart +++ b/lib/ui/home/application/all_application.dart @@ -5,6 +5,7 @@ import 'package:aku_new_community/ui/search/bee_search.dart'; import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/utils/login_util.dart'; import 'package:aku_new_community/widget/bee_back_button.dart'; +import 'package:bot_toast/bot_toast.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; @@ -25,7 +26,11 @@ class _AllApplicationPageState extends State { PageController _pageController = PageController(); - _buildTile(AO object, {bool editMode = false}) { + _buildTile( + AO object, { + bool editMode = false, + bool unComplete = false, + }) { return MaterialButton( shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8.w)), padding: EdgeInsets.zero, @@ -34,7 +39,12 @@ class _AllApplicationPageState extends State { : () { if (LoginUtil.isNotLogin) return; if (!LoginUtil.haveRoom(object.title)) return; - Get.to(object.page); + if (unComplete) { + BotToast.showText( + text: '正在准备上线中,敬请期待', align: Alignment(0, 0.5)); + } else { + Get.to(object.page); + } }, child: Column( mainAxisAlignment: MainAxisAlignment.center, @@ -84,10 +94,8 @@ class _AllApplicationPageState extends State { itemBuilder: (context, index) { return Stack( children: [ - _buildTile( - appProvider.myApplications[index], - editMode: _editMode, - ), + _buildTile(appProvider.myApplications[index], + editMode: _editMode, unComplete: index > 3), Positioned( right: 0, top: 0, diff --git a/lib/ui/profile/house/add_house_page.dart b/lib/ui/profile/house/add_house_page.dart index 3e7aa5bd..3d919721 100644 --- a/lib/ui/profile/house/add_house_page.dart +++ b/lib/ui/profile/house/add_house_page.dart @@ -166,18 +166,18 @@ class _AddHousePageState extends State { key: _formKey, child: ListView( children: [ - _renderTile( - title: '小区名称', - item: _renderPicker( - text: S.of(context)!.tempPlotName, - hintText: '请选择小区', - // 跳转到选择小区页面 - // - // onTap: () { - // Get.to(() => PickPlotPage()); - // }, - ), - ), + // _renderTile( + // title: '小区名称', + // item: _renderPicker( + // text: S.of(context)!.tempPlotName, + // hintText: '请选择小区', + // // 跳转到选择小区页面 + // // + // // onTap: () { + // // Get.to(() => PickPlotPage()); + // // }, + // ), + // ), _renderTile( title: '楼栋、单元、室', item: _renderPicker( diff --git a/lib/widget/views/application_view.dart b/lib/widget/views/application_view.dart index c5b6aa8a..5197a5a4 100644 --- a/lib/widget/views/application_view.dart +++ b/lib/widget/views/application_view.dart @@ -37,7 +37,7 @@ class _ApplicationViewState extends State { if (LoginUtil.isNotLogin) return; if (!LoginUtil.haveRoom(object.title)) return; if (widget.unComplete) { - BotToast.showText(text: '该功能正在准备上线中,敬请期待'); + BotToast.showText(text: '该功能正在准备上线中,敬请期待', align: Alignment(0, 0.5)); } else { Get.to(object.page); }