1281228557
/
aku_new_community
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

添加部分功能入口 修改文案

Browse Source
hmxc
张萌 3 years ago
parent fcf846ffef
commit 83bbef7ceb
8 changed files with 87 additions and 38 deletions
Show Stats Download Patch File Download Diff File

BIN
assets/icons/projection_screen.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 90 KiB

13
lib/constants/app_theme.dart
Unescape View File

@ -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),

8
lib/constants/application_objects.dart
Unescape View File

@ -104,6 +104,7 @@ List<AO> 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<String> _recommendApp = [
'报事报修',
'建议咨询',
'一键报警',
'共享投屏',
'二手市场',
'共享停车',
];
///为您推荐
@ -262,11 +266,11 @@ List<String> _aboutCommunityApp = [
List<AO> get aboutCommunityApp =>
_aboutCommunityApp.map((e) => AO.fromRaw(e)).toList();
List<String> _wisdomServiceApp = ['智慧养老', '周边服务', '小蜜蜂任务'];
List<String> _wisdomServiceApp = ['智慧养老', '周边服务', '小蜜蜂任务', '共享投屏'];
List<AO> get wisdomServiceApp =>
_wisdomServiceApp.map((e) => AO.fromRaw(e)).toList();
List<String> _nearbyShoppingApp = ['自营商城', '邻家宠物', '共享停车', '二手市场'];
List<AO> get nearbyShoppingApp =>
_wisdomServiceApp.map((e) => AO.fromRaw(e)).toList();
_nearbyShoppingApp.map((e) => AO.fromRaw(e)).toList();

4
lib/gen/assets.gen.dart
Unescape View File

@ -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');

54
lib/pages/home/home_page.dart
Unescape View File

@ -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<HomePage>
}
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<HomePage>
height: 80.w,
width: 80.w,
),
8.hb,
16.hb,
title.text.size(22.sp).color(Color(0xA6000000)).bold.make(),
],
),

20
lib/ui/home/application/all_application.dart
Unescape View File

@ -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<AllApplicationPage> {
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<AllApplicationPage> {
: () {
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<AllApplicationPage> {
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,

24
lib/ui/profile/house/add_house_page.dart
Unescape View File

@ -166,18 +166,18 @@ class _AddHousePageState extends State<AddHousePage> {
key: _formKey,
child: ListView(
children: <Widget>[
_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(

2
lib/widget/views/application_view.dart
Unescape View File

@ -37,7 +37,7 @@ class _ApplicationViewState extends State<ApplicationView> {
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);
}

Write Preview
Loading…
Cancel
Save