diff --git a/assets/static/car_park_empty.webp b/assets/static/car_park_empty.webp new file mode 100644 index 00000000..cf127cc9 Binary files /dev/null and b/assets/static/car_park_empty.webp differ diff --git a/lib/constants/application_objects.dart b/lib/constants/application_objects.dart index 0651b159..c66808e5 100644 --- a/lib/constants/application_objects.dart +++ b/lib/constants/application_objects.dart @@ -1,3 +1,4 @@ +import 'package:akuCommunity/ui/profile/car_parking/car_parking_page.dart'; import 'package:flutter/material.dart'; import 'package:akuCommunity/const/resource.dart'; @@ -8,7 +9,6 @@ import 'package:akuCommunity/pages/goods_deto_page/goods_deto_page.dart'; import 'package:akuCommunity/pages/goods_manage_page/goods_manage_page.dart'; import 'package:akuCommunity/pages/industry_committee/industry_committee_page.dart'; import 'package:akuCommunity/pages/life_pay/life_pay_page.dart'; -import 'package:akuCommunity/pages/mine_car_page/mine_car_page.dart'; import 'package:akuCommunity/pages/one_alarm/widget/alarm_page.dart'; import 'package:akuCommunity/pages/open_door_page/open_door_page.dart'; import 'package:akuCommunity/pages/opening_code_page/opening_code_page.dart'; @@ -77,8 +77,8 @@ List appObjects = [ List userAppObjects = [ AO('我的房屋', R.ASSETS_ICONS_USER_ICON_WDFW_PNG, () => HouseOwnersPage()), - AO('我的车位', R.ASSETS_ICONS_USER_ICON_WDCW_PNG, () => MineCarPage()), - AO('我的车', R.ASSETS_ICONS_USER_ICON_WDC_PNG, () => MineCarPage()), + AO('我的车位', R.ASSETS_ICONS_USER_ICON_WDCW_PNG, () => CarParkingPage()), + AO('我的车', R.ASSETS_ICONS_USER_ICON_WDC_PNG, () => CarParkingPage()), AO('社区活动', R.ASSETS_ICONS_USER_ICON_WDSQHD_PNG, () => ActivityListPage()), AO('我的缴费', R.ASSETS_ICONS_USER_ICON_WDJF_PNG, () => LifePayPage()), AO('我的报修', R.ASSETS_ICONS_USER_ICON_WDBX_PNG, () => FixedSubmitPage()), diff --git a/lib/pages/mine_car_page/car_add_page/car_add_page.dart b/lib/pages/mine_car_page/car_add_page/car_add_page.dart deleted file mode 100644 index 51d738a5..00000000 --- a/lib/pages/mine_car_page/car_add_page/car_add_page.dart +++ /dev/null @@ -1,106 +0,0 @@ -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; - -import 'package:akuCommunity/utils/headers.dart'; -import 'package:akuCommunity/widget/bee_scaffold.dart'; -import 'package:akuCommunity/widget/common_input.dart'; - -class CarAddPage extends StatefulWidget { - CarAddPage({Key key}) : super(key: key); - - @override - _CarAddPageState createState() => _CarAddPageState(); -} - -class _CarAddPageState extends State { - TextEditingController _carNum = new TextEditingController(); - - InkWell _inkWellSave() { - return InkWell( - child: Container( - padding: EdgeInsets.only( - top: 19.w, - bottom: 21.w, - ), - alignment: Alignment.center, - width: 686.w, - decoration: BoxDecoration( - color: Color(0xffffd000), - borderRadius: BorderRadius.all(Radius.circular(4)), - boxShadow: [ - BoxShadow( - color: Colors.grey.withOpacity(0.1), - offset: Offset(1.1, 1.1), - blurRadius: 10.0), - ], - ), - child: Text( - '保存', - style: TextStyle( - fontWeight: FontWeight.w600, - fontSize: 32.sp, - color: Color(0xff333333), - ), - ), - ), - ); - } - - @override - Widget build(BuildContext context) { - return BeeScaffold( - title: '添加车辆', - body: SingleChildScrollView( - child: Container( - color: Colors.white, - child: GestureDetector( - behavior: HitTestBehavior.opaque, - onTap: () { - FocusScope.of(context).requestFocus(FocusNode()); - }, - child: Container( - margin: EdgeInsets.only( - top: 32.w, - left: 32.w, - right: 32.w, - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Container( - padding: EdgeInsets.only( - top: 23.w, - bottom: 24.w, - ), - decoration: BoxDecoration( - border: Border( - bottom: - BorderSide(color: Color(0xffeeeeee), width: 0.5)), - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - '您的车牌号', - style: TextStyle( - fontSize: 28.sp, color: Color(0xff333333)), - ), - SizedBox(height: 25.w), - CommonInput( - hintText: '请输入您的车牌号', - inputController: _carNum, - ), - ], - ), - ), - SizedBox(height: 89.w), - _inkWellSave(), - ], - ), - ), - ), - ), - ), - ); - } -} diff --git a/lib/pages/mine_car_page/mine_car_page.dart b/lib/pages/mine_car_page/mine_car_page.dart deleted file mode 100644 index 1363d660..00000000 --- a/lib/pages/mine_car_page/mine_car_page.dart +++ /dev/null @@ -1,185 +0,0 @@ -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; - -import 'package:akuCommunity/base/assets_image.dart'; -import 'package:akuCommunity/pages/mine_car_page/car_add_page/car_add_page.dart'; -import 'package:akuCommunity/pages/mine_car_page/select_community_page/select_community_page.dart'; -import 'package:akuCommunity/utils/headers.dart'; -import 'package:akuCommunity/widget/bee_scaffold.dart'; - -class MineCarPage extends StatefulWidget { - MineCarPage({Key key}) : super(key: key); - - @override - _MineCarPageState createState() => _MineCarPageState(); -} - -class _MineCarPageState extends State { - List> _listHouse = [ - {'title': '深圳华茂悦峰', 'subtitle': '1幢-1单元-702室'}, - ]; - - Widget _containerHouseCard(String title, subtitle) { - return Container( - margin: EdgeInsets.only( - top: 24.w, - left: 32.w, - right: 32.w, - ), - child: Container( - padding: EdgeInsets.only( - top: 41.w, - bottom: 41.w, - left: 27.w, - ), - decoration: BoxDecoration( - border: - Border(bottom: BorderSide(color: Color(0xffeeeeee), width: 0.5)), - ), - child: Row( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Image.asset( - AssetsImage.HOUSEATTESTATION, - height: 48.w, - width: 48.w, - ), - SizedBox(width: 20.w), - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - title, - style: TextStyle( - fontSize: 32.sp, - color: Color(0xff474747), - ), - ), - SizedBox(height: 10.w), - Text( - subtitle, - style: TextStyle( - fontSize: 32.sp, - color: Color(0xff474747), - ), - ) - ], - ), - ], - ), - ), - ); - } - - Widget _inkWellCheck(String type) { - return InkWell( - onTap: () { - switch (type) { - case '车': - CarAddPage().to; - break; - case '车位': - SelectCommunityPage().to; - break; - default: - } - }, - child: Container( - padding: EdgeInsets.only( - top: 11.w, - bottom: 10.w, - ), - alignment: Alignment.center, - width: 167.w, - decoration: BoxDecoration( - color: Color(0xffffd000), - borderRadius: BorderRadius.all(Radius.circular(4)), - boxShadow: [ - BoxShadow( - color: Colors.grey.withOpacity(0.1), - offset: Offset(1.1, 1.1), - blurRadius: 10.0), - ], - ), - child: Text( - '去添加', - style: TextStyle( - fontWeight: FontWeight.w600, - fontSize: 32.sp, - color: Color(0xff333333), - ), - ), - ), - ); - } - - Widget _containerAttestation(String tag) { - return Container( - margin: EdgeInsets.only(top: 156.w), - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Image.asset( - AssetsImage.CARHEADER, - height: 240.w, - width: 130.w, - ), - SizedBox(height: 24.w), - Text( - '马泽鹏', - style: TextStyle( - fontWeight: FontWeight.w600, - fontSize: 32.sp, - color: Color(0xff474747), - ), - ), - SizedBox(height: 8.w), - Text( - '尊敬的业主/租客，您还没有添加您的$tag', - style: TextStyle( - fontSize: 24.sp, - color: Color(0xff999999), - ), - ), - SizedBox(height: 39.w), - ], - ), - ); - } - - @override - Widget build(BuildContext context) { - return BeeScaffold( - title: '我的', - body: Container( - color: Colors.white, - child: Stack( - children: [ - ListView( - children: [ - Container( - margin: EdgeInsets.only(bottom: 85.w), - child: Column( - children: [ - Column( - children: _listHouse - .map((item) => _containerHouseCard( - item['title'], - item['subtitle'], - )) - .toList(), - ), - ], - ), - ), - ], - ), - // _positionedBottomBar(widget.buttonName), - ], - ), - ), - ); - } -} diff --git a/lib/pages/mine_car_page/select_community_page/select_community_page.dart b/lib/pages/mine_car_page/select_community_page/select_community_page.dart deleted file mode 100644 index b098ffbe..00000000 --- a/lib/pages/mine_car_page/select_community_page/select_community_page.dart +++ /dev/null @@ -1,101 +0,0 @@ -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; - -import 'package:flutter_icons/flutter_icons.dart'; - -import 'package:akuCommunity/pages/mine_car_page/select_parking_page/select_parking_page.dart'; -import 'package:akuCommunity/routers/page_routers.dart'; -import 'package:akuCommunity/utils/headers.dart'; -import 'package:akuCommunity/widget/bee_scaffold.dart'; - -class SelectCommunityPage extends StatefulWidget { - SelectCommunityPage({Key key}) : super(key: key); - - @override - _SelectCommunityPageState createState() => _SelectCommunityPageState(); -} - -class _SelectCommunityPageState extends State { - List _communityList = ['大唐景园', '龙环小区', '雍景院', '月湖盛院', '五城花园']; - - @override - Widget build(BuildContext context) { - return BeeScaffold( - title: '选择小区', - body: ListView( - children: [ - Container( - width: MediaQuery.of(context).size.width, - color: Colors.white, - margin: EdgeInsets.only(top: 32.w), - padding: EdgeInsets.symmetric(vertical: 28.w, horizontal: 32.w), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Row( - children: [ - Icon( - EvilIcons.location, - color: Color(0xff333333), - size: 40.sp, - ), - SizedBox(width: 18.w), - Text( - '深圳市', - style: TextStyle( - fontSize: 28.sp, - color: Color(0xff333333), - ), - ) - ], - ), - InkWell( - child: Icon( - MaterialIcons.refresh, - color: Color(0xff333333), - size: 40.sp, - ), - ), - ], - ), - ), - Container( - margin: EdgeInsets.all(32.w), - child: Text( - '所有社区', - style: TextStyle( - fontSize: 28.sp, - color: Color(0xff333333), - ), - ), - ), - Column( - children: List.generate( - _communityList.length, - (index) => InkWell( - onTap: () { - SelectParkingPage( - bundle: Bundle()..putString('title', _communityList[index]), - ).to; - }, - child: Container( - width: MediaQuery.of(context).size.width, - color: Colors.white, - padding: - EdgeInsets.symmetric(vertical: 28.w, horizontal: 32.w), - child: Text( - _communityList[index], - style: TextStyle( - fontSize: 28.sp, - color: Color(0xff333333), - ), - ), - ), - ), - ), - ), - ], - ), - ); - } -} diff --git a/lib/pages/mine_car_page/select_parking_page/select_parking_page.dart b/lib/pages/mine_car_page/select_parking_page/select_parking_page.dart deleted file mode 100644 index 1d8eedb0..00000000 --- a/lib/pages/mine_car_page/select_parking_page/select_parking_page.dart +++ /dev/null @@ -1,57 +0,0 @@ -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; - -import 'package:akuCommunity/routers/page_routers.dart'; -import 'package:akuCommunity/utils/headers.dart'; -import 'package:akuCommunity/widget/bee_scaffold.dart'; - -class SelectParkingPage extends StatefulWidget { - final Bundle bundle; - SelectParkingPage({Key key, this.bundle}) : super(key: key); - - @override - _SelectParkingPageState createState() => _SelectParkingPageState(); -} - -class _SelectParkingPageState extends State { - @override - Widget build(BuildContext context) { - return BeeScaffold( - title: '车位列表', - body: ListView( - children: [ - Container( - margin: EdgeInsets.all(32.w), - child: Text( - '所有社区', - style: TextStyle( - fontSize: 28.sp, - color: Color(0xff333333), - ), - ), - ), - Column( - children: List.generate( - 11, - (index) => InkWell( - child: Container( - width: MediaQuery.of(context).size.width, - color: Colors.white, - padding: - EdgeInsets.symmetric(vertical: 28.w, horizontal: 32.w), - child: Text( - '${widget.bundle.getString('title')}地下车库11号${index + 1}', - style: TextStyle( - fontSize: 28.sp, - color: Color(0xff333333), - ), - ), - ), - ), - ), - ), - ], - ), - ); - } -} diff --git a/lib/ui/profile/car_parking/car_parking_page.dart b/lib/ui/profile/car_parking/car_parking_page.dart new file mode 100644 index 00000000..1bf2b1f7 --- /dev/null +++ b/lib/ui/profile/car_parking/car_parking_page.dart @@ -0,0 +1,29 @@ +import 'package:akuCommunity/widget/bee_scaffold.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_easyrefresh/easy_refresh.dart'; + +class CarParkingPage extends StatefulWidget { + CarParkingPage({Key key}) : super(key: key); + + @override + _CarParkingPageState createState() => _CarParkingPageState(); +} + +class _CarParkingPageState extends State { + @override + Widget build(BuildContext context) { + return BeeScaffold( + title: '我的车位', + actions: [ + TextButton( + onPressed: () {}, + child: Text('管理车位'), + ), + ], + body: EasyRefresh( + onRefresh: () async {}, + child: ListView(), + ), + ); + } +}