diff --git a/lib/base/assets_image.dart b/lib/base/assets_image.dart deleted file mode 100644 index 54fd04a1..00000000 --- a/lib/base/assets_image.dart +++ /dev/null @@ -1,78 +0,0 @@ -//TODO CLEAN BOTTOM CODES. -@Deprecated("sh*t assets_image need to be cleaned.") -class AssetsImage { - static const LOCATION = 'assets/icons/location.png'; - - static const HOUSE = 'assets/icons/house.png'; - - static const PHONE = 'assets/icons/phone.png'; - - static const IMAGEADD = 'assets/icons/img_add.png'; - - static const PROPERTY = 'assets/icons/property.png'; - - static const SYSTEMNOTICE = 'assets/icons/system_notice.png'; - - static const COMMENTNOTICE = 'assets/icons/comment_notice.png'; - - static const SHOPNOTICE = 'assets/icons/shop_notice.png'; - - static const MINEBG = 'assets/images/mine_bg.png'; - - static const MEMBERBG = 'assets/images/member_bg.png'; - - static const HOUSEHEADER = 'assets/images/house_header.png'; - - static const HOUSEATTESTATION = 'assets/images/house_attestation.png'; - - static const CARHEADER = 'assets/images/car_header.png'; - - static const LOGO = 'assets/images/logo.png'; - - static const PHONELOGO = 'assets/images/phone_logo.png'; - - static const CODELOGO = 'assets/images/code_logo.png'; - - static const LICENSE = 'assets/images/license.png'; - - static const LICENSEBACK = 'assets/images/license_back.png'; - - static const DRAWINGS = 'assets/images/drawings.png'; - - static const APPLICATION = 'assets/images/application.png'; - - static const COMMITMENT = 'assets/images/commitment.png'; - - static const WXPAY = 'assets/images/wxpay.png'; - - static const APPADD = 'assets/icons/app_add.png'; - - static const APPREDUCE = 'assets/icons/app_reduce.png'; - - static const COMPLAINT = 'assets/icons/complaint.png'; - - static const CONSULT = 'assets/icons/consult.png'; - - static const LIKE = 'assets/icons/like.png'; - - static const PROPOSAL = 'assets/icons/proposal.png'; - - static const List> shopGridList = [ - {'title': '居家生活', 'imagePath': 'assets/icons/tool_jjsh.png'}, - {'title': '数码家电', 'imagePath': 'assets/icons/tool_smjd.png'}, - {'title': '休闲副食', 'imagePath': 'assets/icons/tool_xxfs.png'}, - {'title': '滋补保健', 'imagePath': 'assets/icons/tool_zbbj.png'}, - {'title': '彩妆香水', 'imagePath': 'assets/icons/tool_czxs.png'}, - {'title': '服饰箱包', 'imagePath': 'assets/icons/tool_fsxb.png'}, - {'title': '母婴玩具', 'imagePath': 'assets/icons/tool_mywj.png'}, - {'title': '饮料酒水', 'imagePath': 'assets/icons/tool_yljs.png'}, - ]; - - static const List> orderGridList = [ - {'title': '待付款', 'imagePath': 'assets/icons/user_icon_dfk.png'}, - {'title': '待发货', 'imagePath': 'assets/icons/user_icon_dfh.png'}, - {'title': '待收货', 'imagePath': 'assets/icons/user_icon_dsh.png'}, - {'title': '待评价', 'imagePath': 'assets/icons/user_icon_dpj.png'}, - {'title': '售后', 'imagePath': 'assets/icons/user_icon_sh.png'}, - ]; -} diff --git a/lib/constants/application_objects.dart b/lib/constants/application_objects.dart index 351a1c7c..cf8704d7 100644 --- a/lib/constants/application_objects.dart +++ b/lib/constants/application_objects.dart @@ -1,5 +1,3 @@ -import 'package:akuCommunity/ui/profile/car/car_manage_page.dart'; -import 'package:akuCommunity/ui/profile/car_parking/car_parking_page.dart'; import 'package:flutter/material.dart'; import 'package:akuCommunity/const/resource.dart'; @@ -10,7 +8,6 @@ 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/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'; import 'package:akuCommunity/pages/setting_page/settings_page.dart'; import 'package:akuCommunity/pages/things_page/fixed_submit_page.dart'; @@ -19,6 +16,8 @@ import 'package:akuCommunity/ui/community/activity/activity_list_page.dart'; import 'package:akuCommunity/ui/home/application/all_application.dart'; import 'package:akuCommunity/ui/manager/advice/advice_page.dart'; import 'package:akuCommunity/ui/manager/questionnaire/questionnaire_page.dart'; +import 'package:akuCommunity/ui/profile/car/car_manage_page.dart'; +import 'package:akuCommunity/ui/profile/car_parking/car_parking_page.dart'; import 'package:akuCommunity/ui/profile/house/house_owners_page.dart'; ///应用对象 @@ -54,7 +53,7 @@ class AO { ///所有应用 List appObjects = [ - AO('一键开门', R.ASSETS_APPLICATIONS_OEPN_DOOR_PNG, () => OpenDoorPage()), + AO('一键开门', R.ASSETS_APPLICATIONS_OEPN_DOOR_PNG, () => Scaffold()), AO('开门码', R.ASSETS_APPLICATIONS_DOOR_CODE_PNG, () => OpeningCodePage()), AO('访客邀请', R.ASSETS_APPLICATIONS_VISITOR_INVITE_PNG, () => VisitorAccessPage()), diff --git a/lib/model/user/car_parking_model.dart b/lib/model/user/car_parking_model.dart index b9ba7c86..cd50d58c 100644 --- a/lib/model/user/car_parking_model.dart +++ b/lib/model/user/car_parking_model.dart @@ -1,5 +1,6 @@ -import 'package:flustars/flustars.dart'; import 'package:flutter/material.dart'; + +import 'package:flustars/flustars.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; class CarParkingModel { diff --git a/lib/model/user/house_model.dart b/lib/model/user/house_model.dart index 199b6d07..dd13158e 100644 --- a/lib/model/user/house_model.dart +++ b/lib/model/user/house_model.dart @@ -1,6 +1,7 @@ -import 'package:flustars/flustars.dart'; import 'package:flutter/material.dart'; +import 'package:flustars/flustars.dart'; + class HouseModel { int id; String roomName; diff --git a/lib/pages/certification_page/certification_page.dart b/lib/pages/certification_page/certification_page.dart deleted file mode 100644 index 363b06f0..00000000 --- a/lib/pages/certification_page/certification_page.dart +++ /dev/null @@ -1,193 +0,0 @@ -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; - -import 'package:akuCommunity/base/assets_image.dart'; -import 'package:akuCommunity/utils/headers.dart'; -import 'package:akuCommunity/widget/bee_scaffold.dart'; -import 'package:akuCommunity/widget/common_input.dart'; - -class CertificationPage extends StatefulWidget { - CertificationPage({Key key}) : super(key: key); - - @override - _CertificationPageState createState() => _CertificationPageState(); -} - -class _CertificationPageState extends State { - TextEditingController _userName = new TextEditingController(); - TextEditingController _userIDCard = new TextEditingController(); - - List> _uploadImageList = [ - { - 'imagePath': AssetsImage.LICENSE, - 'title': '上传身份证正面照', - }, - { - 'imagePath': AssetsImage.LICENSEBACK, - 'title': '上传身份证背面照', - }, - ]; - - @override - void initState() { - super.initState(); - } - - Widget _idCardType() { - return Container( - padding: EdgeInsets.only( - top: 23.w, - bottom: 24.w, - ), - margin: EdgeInsets.only(bottom: 60.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), - Container( - width: 686.w, - child: Text( - '身份证', - style: TextStyle( - fontSize: 36.sp, - color: Color(0xff333333), - fontWeight: FontWeight.w600, - ), - ), - ) - ], - ), - ); - } - - Widget _upLoadImage() { - return Container( - padding: EdgeInsets.only( - top: 23.w, - bottom: 24.w, - ), - margin: EdgeInsets.only(bottom: 60.w), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - '上传证件照片', - style: TextStyle(fontSize: 28.sp, color: Color(0xff333333)), - ), - SizedBox(height: 25.w), - // Row( - // mainAxisAlignment: MainAxisAlignment.spaceBetween, - // children: List.generate( - // _uploadImageList.length, - // (index) => SingleImageUp( - // title: _uploadImageList[index]['title'], - // imagePath: _uploadImageList[index]['imagePath'], - // ), - // ), - // ), - ], - ), - ); - } - - Widget _input(String title, hintText, TextEditingController controller) { - return Container( - padding: EdgeInsets.only( - top: 23.w, - bottom: 24.w, - ), - margin: EdgeInsets.only(bottom: 60.w), - decoration: BoxDecoration( - border: - Border(bottom: BorderSide(color: Color(0xffeeeeee), width: 0.5)), - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - title, - style: TextStyle(fontSize: 28.sp, color: Color(0xff333333)), - ), - SizedBox(height: 25.w), - CommonInput(inputController: controller, hintText: hintText) - ], - ), - ); - } - - InkWell _submit() { - return InkWell( - child: Container( - alignment: Alignment.center, - height: 96.w, - width: 686.w, - padding: EdgeInsets.symmetric( - vertical: 26.w, - ), - decoration: BoxDecoration( - color: Color(0xffffc40c), - borderRadius: BorderRadius.all(Radius.circular(48))), - child: Text( - '确认提交', - style: TextStyle( - fontWeight: FontWeight.w600, - fontSize: 32.sp, - color: Color(0xff333333)), - ), - ), - ); - } - - @override - Widget build(BuildContext context) { - return BeeScaffold( - title: '实名认证', - body: Container( - padding: EdgeInsets.only( - top: 32.w, - left: 32.w, - right: 32.w, - ), - color: Colors.white, - child: ListView( - children: [ - SingleChildScrollView( - child: Container( - child: GestureDetector( - behavior: HitTestBehavior.opaque, - onTap: () { - FocusScope.of(context).requestFocus(FocusNode()); - }, - child: Container( - child: Column( - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Column( - children: [ - _idCardType(), - _upLoadImage(), - _input('证件号', '请输入证件号', _userName), - _input('姓名', '姓名需与证件上相同', _userIDCard), - ], - ), - ], - ), - ), - ), - ), - ), - _submit(), - ], - ), - ), - ); - } -} diff --git a/lib/pages/event_activity/event_voting_page.dart b/lib/pages/event_activity/event_voting_page.dart index 2af5ae42..df156223 100644 --- a/lib/pages/event_activity/event_voting_page.dart +++ b/lib/pages/event_activity/event_voting_page.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; +import 'package:get/get.dart'; import 'package:akuCommunity/base/base_style.dart'; import 'package:akuCommunity/constants/api.dart'; @@ -10,7 +11,6 @@ import 'package:akuCommunity/pages/things_page/widget/bee_list_view.dart'; import 'package:akuCommunity/utils/headers.dart'; import 'package:akuCommunity/widget/bee_scaffold.dart'; import 'package:akuCommunity/widget/others/stack_avatar.dart'; -import 'package:get/get.dart'; class EventVotingPage extends StatefulWidget { EventVotingPage({Key key}) : super(key: key); diff --git a/lib/pages/event_activity/voting_detail_page.dart b/lib/pages/event_activity/voting_detail_page.dart index 5e0015d9..6fe8a720 100644 --- a/lib/pages/event_activity/voting_detail_page.dart +++ b/lib/pages/event_activity/voting_detail_page.dart @@ -1,13 +1,14 @@ -import 'package:akuCommunity/model/common/img_model.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:bot_toast/bot_toast.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:get/get.dart'; +import 'package:velocity_x/velocity_x.dart'; import 'package:akuCommunity/base/base_style.dart'; import 'package:akuCommunity/constants/api.dart'; +import 'package:akuCommunity/model/common/img_model.dart'; import 'package:akuCommunity/model/manager/voting_detail_model.dart'; import 'package:akuCommunity/pages/manager_func.dart'; import 'package:akuCommunity/utils/headers.dart'; @@ -16,7 +17,6 @@ import 'package:akuCommunity/widget/bee_divider.dart'; import 'package:akuCommunity/widget/bee_scaffold.dart'; import 'package:akuCommunity/widget/buttons/bee_single_check.dart'; import 'package:akuCommunity/widget/buttons/bottom_button.dart'; -import 'package:velocity_x/velocity_x.dart'; class VotingDetailPage extends StatefulWidget { final int id; diff --git a/lib/pages/fitup_manage/fitup_manage_page.dart b/lib/pages/fitup_manage/fitup_manage_page.dart deleted file mode 100644 index 291fe1a7..00000000 --- a/lib/pages/fitup_manage/fitup_manage_page.dart +++ /dev/null @@ -1,89 +0,0 @@ -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; - -import 'package:akuCommunity/base/base_style.dart'; -import 'package:akuCommunity/utils/headers.dart'; -import 'package:akuCommunity/widget/bee_scaffold.dart'; -import 'package:akuCommunity/widget/sliver_app_bar_delegate.dart'; -import 'widget/director_manage.dart'; -import 'widget/owner_manage.dart'; - -class FitupManagePage extends StatefulWidget { - FitupManagePage({Key key}) : super(key: key); - - @override - _FitupManagePageState createState() => _FitupManagePageState(); -} - -class _FitupManagePageState extends State - with TickerProviderStateMixin { - TabController _controller; - - //导航标签 - List> treeList = [ - {'name': '业主'}, - {'name': '装修负责人'}, - ]; - @override - void initState() { - _controller = TabController(length: 2, vsync: this); - super.initState(); - } - - @override - void dispose() { - _controller.dispose(); - super.dispose(); - } - - List _silverBuilder(BuildContext context, bool innerBoxIsScrolled) { - return [ - SliverPersistentHeader( - pinned: true, - delegate: SliverAppBarDelegate( - minHeight: 56, - maxHeight: 56, - child: Container( - color: Colors.white, - child: TabBar( - unselectedLabelStyle: TextStyle( - fontSize: BaseStyle.fontSize28, - ), - labelStyle: TextStyle( - fontWeight: FontWeight.w600, - fontSize: BaseStyle.fontSize28, - ), - labelPadding: EdgeInsets.symmetric(horizontal: (131.5).w), - indicatorColor: Color(0xffffc40c), - indicatorSize: TabBarIndicatorSize.label, - indicatorPadding: EdgeInsets.symmetric(horizontal: 21.w), - isScrollable: true, - controller: _controller, - tabs: List.generate( - treeList.length, - (index) => Tab(text: treeList[index]['name']), - ), - ), - ), - ), - ), - ]; - } - - @override - Widget build(BuildContext context) { - return BeeScaffold( - title: '装修管理', - body: NestedScrollView( - headerSliverBuilder: _silverBuilder, - body: TabBarView( - controller: _controller, - children: List.generate( - treeList.length, - (index) => index == 0 ? OwnerManage() : DirectorManage(), - ), - ), - ), - ); - } -} diff --git a/lib/pages/fitup_manage/widget/decorator_info.dart b/lib/pages/fitup_manage/widget/decorator_info.dart deleted file mode 100644 index 40e02ed3..00000000 --- a/lib/pages/fitup_manage/widget/decorator_info.dart +++ /dev/null @@ -1,117 +0,0 @@ -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; - -import 'package:akuCommunity/base/assets_image.dart'; -import 'package:akuCommunity/base/base_style.dart'; -import 'package:akuCommunity/utils/headers.dart'; -import 'package:akuCommunity/widget/common_input.dart'; - -// import 'package:akuCommunity/widget/single_image_up.dart'; - -class DecoratorInfo extends StatefulWidget { - DecoratorInfo({Key key}) : super(key: key); - - @override - _DecoratorInfoState createState() => _DecoratorInfoState(); -} - -class _DecoratorInfoState extends State { - TextEditingController _userName = new TextEditingController(); - TextEditingController _userIDCard = new TextEditingController(); - TextEditingController _userPhone = new TextEditingController(); - TextEditingController _userAddress = new TextEditingController(); - - List> _uploadImageList = [ - { - 'imagePath': AssetsImage.LICENSE, - 'title': '上传身份证正面照', - }, - { - 'imagePath': AssetsImage.LICENSEBACK, - 'title': '上传身份证背面照', - }, - ]; - - @override - void initState() { - super.initState(); - } - - Widget _cardList(String title, Widget widget) { - return Container( - padding: EdgeInsets.only( - top: 23.w, - bottom: 24.w, - ), - decoration: BoxDecoration( - border: Border( - bottom: BorderSide(color: BaseStyle.coloreeeeee, width: 0.5)), - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - title, - style: TextStyle(fontSize: 28.sp, color: Color(0xff333333)), - ), - SizedBox(height: 25.w), - widget - ], - ), - ); - } - - Widget _upLoadImage() { - return Container( - padding: EdgeInsets.only( - top: 23.w, - bottom: 24.w, - ), - decoration: BoxDecoration( - border: Border( - bottom: BorderSide(color: BaseStyle.coloreeeeee, width: 0.5)), - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - '上传证件照片', - style: TextStyle(fontSize: 28.sp, color: Color(0xff333333)), - ), - SizedBox(height: 25.w), - // Row( - // mainAxisAlignment: MainAxisAlignment.spaceBetween, - // children: List.generate( - // _uploadImageList.length, - // (index) => SingleImageUp( - // title: _uploadImageList[index]['title'], - // imagePath: _uploadImageList[index]['imagePath'], - // ), - // ), - // ), - ], - ), - ); - } - - @override - Widget build(BuildContext context) { - return Container( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - _cardList( - '姓名', CommonInput(inputController: _userName, hintText: '请输入姓名')), - // _cardList('证件类型', CommonSelect(title: '证件类型')), - _cardList('证件号', - CommonInput(inputController: _userIDCard, hintText: '请输入证件号')), - _cardList('联系方式', - CommonInput(inputController: _userPhone, hintText: '请输入电话号码')), - _cardList('联系地址', - CommonInput(inputController: _userAddress, hintText: '请输入公司地址')), - _upLoadImage(), - ], - ), - ); - } -} diff --git a/lib/pages/fitup_manage/widget/director_manage.dart b/lib/pages/fitup_manage/widget/director_manage.dart deleted file mode 100644 index 6852566d..00000000 --- a/lib/pages/fitup_manage/widget/director_manage.dart +++ /dev/null @@ -1,265 +0,0 @@ -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; - -import 'package:akuCommunity/base/assets_image.dart'; -import 'package:akuCommunity/base/base_style.dart'; -import 'package:akuCommunity/utils/headers.dart'; -import 'package:akuCommunity/widget/common_input.dart'; -import 'decorator_info.dart'; -import 'house_info.dart'; - -// import 'package:akuCommunity/widget/single_image_up.dart'; - -class DirectorManage extends StatefulWidget { - DirectorManage({Key key}) : super(key: key); - - @override - _DirectorManageState createState() => _DirectorManageState(); -} - -class _DirectorManageState extends State { - TextEditingController _companyName = new TextEditingController(); - - int memberNum = 1; - - List> _uploadImageList = [ - { - 'imagePath': AssetsImage.LICENSE, - 'title': '上传营业执照', - }, - { - 'imagePath': AssetsImage.LICENSEBACK, - 'title': '上传资质证书', - }, - {'imagePath': AssetsImage.DRAWINGS, 'title': '上传装修图纸'}, - {'imagePath': AssetsImage.APPLICATION, 'title': '上传装修申请表'}, - {'imagePath': AssetsImage.COMMITMENT, 'title': '上传装修承诺书'} - ]; - - List> _listHouse = [ - {'title': '宁波华茂悦峰', 'subtitle': '1幢-1单元-702室'}, - ]; - - @override - void initState() { - super.initState(); - } - - Widget _doorIdCard() { - return Container( - width: 686.w, - child: RichText( - text: TextSpan(children: [ - TextSpan( - text: '2', - style: TextStyle( - fontSize: BaseStyle.fontSize36, - color: ktextPrimary, - fontWeight: FontWeight.w600, - ), - ), - TextSpan( - text: '张', - style: TextStyle( - fontSize: BaseStyle.fontSize28, - color: ktextPrimary, - fontWeight: FontWeight.w600, - ), - ), - ]), - ), - ); - } - - Widget _cardList(String title, Widget widget) { - return Container( - padding: EdgeInsets.only( - top: 23.w, - bottom: 24.w, - ), - decoration: BoxDecoration( - border: Border( - bottom: BorderSide(color: BaseStyle.coloreeeeee, width: 0.5)), - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - title, - style: TextStyle(fontSize: 28.sp, color: Color(0xff333333)), - ), - SizedBox(height: 25.w), - widget - ], - ), - ); - } - - Widget _upLoadImage() { - return Container( - padding: EdgeInsets.only( - top: 23.w, - bottom: 24.w, - ), - decoration: BoxDecoration( - border: Border( - bottom: BorderSide(color: BaseStyle.coloreeeeee, width: 0.5)), - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - '上传凭证', - style: TextStyle(fontSize: 28.sp, color: Color(0xff333333)), - ), - SizedBox(height: 25.w), - // Row( - // mainAxisAlignment: MainAxisAlignment.spaceBetween, - // children: List.generate( - // 2, - // (index) => SingleImageUp( - // title: _uploadImageList[index]['title'], - // imagePath: _uploadImageList[index]['imagePath'], - // ), - // ), - // ), - // SizedBox(height: 25.w), - // Row( - // mainAxisAlignment: MainAxisAlignment.spaceBetween, - // children: List.generate( - // 2, - // (index) => SingleImageUp( - // title: _uploadImageList.take(4).skip(2).toList()[index] - // ['title'], - // imagePath: _uploadImageList.take(4).skip(2).toList()[index] - // ['imagePath'], - // ), - // ), - // ), - // SizedBox(height: 25.w), - // Row( - // mainAxisAlignment: MainAxisAlignment.spaceBetween, - // children: List.generate( - // 1, - // (index) => SingleImageUp( - // title: _uploadImageList.take(5).skip(4).toList()[index] - // ['title'], - // imagePath: _uploadImageList.take(5).skip(4).toList()[index] - // ['imagePath'], - // ), - // ), - // ), - ], - ), - ); - } - - Widget _inkWellSubmit() { - return InkWell( - child: Center( - child: Container( - margin: EdgeInsets.only(bottom: 64.w), - decoration: BoxDecoration( - color: BaseStyle.colorffc40c, - borderRadius: BorderRadius.all(Radius.circular(36)), - ), - width: 426.w, - height: 82.w, - padding: EdgeInsets.only( - top: 19.w, - bottom: 18.w, - ), - alignment: Alignment.center, - child: Text( - '确认提交', - style: TextStyle( - fontSize: BaseStyle.fontSize32, - color: ktextPrimary, - fontWeight: FontWeight.w600, - ), - ), - ), - ), - ); - } - - @override - Widget build(BuildContext context) { - return SingleChildScrollView( - child: Container( - color: Colors.white, - child: GestureDetector( - behavior: HitTestBehavior.opaque, - onTap: () { - FocusScope.of(context).requestFocus(FocusNode()); - }, - child: Stack( - children: [ - Container( - margin: EdgeInsets.only( - top: 32.w, - left: 32.w, - right: 32.w, - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Column( - children: _listHouse - .map((item) => HouseInfo( - title: item['title'], - subtitle: item['subtitle'], - )) - .toList(), - ), - _cardList( - '装修公司', - CommonInput( - inputController: _companyName, - hintText: '请输入公司名称')), - _cardList('门禁卡数量', _doorIdCard()), - _upLoadImage(), - SizedBox(height: 78.w), - Text( - '装修人员', - style: TextStyle( - fontWeight: FontWeight.w600, - fontSize: BaseStyle.fontSize32, - color: ktextPrimary), - ), - Column( - children: - List.generate(memberNum, (index) => DecoratorInfo()), - ), - InkWell( - onTap: () { - setState(() { - memberNum++; - }); - }, - child: Container( - margin: EdgeInsets.only(top: 54.w), - padding: EdgeInsets.only( - top: 16.w, - bottom: 16.w, - ), - alignment: Alignment.center, - child: Text( - '继续添加装修工人', - style: TextStyle( - fontSize: BaseStyle.fontSize24, - color: BaseStyle.color999999), - ), - ), - ), - _inkWellSubmit(), - ], - ), - ), - ], - ), - ), - ), - ); - } -} diff --git a/lib/pages/fitup_manage/widget/house_info.dart b/lib/pages/fitup_manage/widget/house_info.dart deleted file mode 100644 index f4e10cdf..00000000 --- a/lib/pages/fitup_manage/widget/house_info.dart +++ /dev/null @@ -1,61 +0,0 @@ -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; - -import 'package:akuCommunity/base/assets_image.dart'; -import 'package:akuCommunity/base/base_style.dart'; -import 'package:akuCommunity/utils/headers.dart'; - -class HouseInfo extends StatefulWidget { - final String title, subtitle; - HouseInfo({Key key, this.title, this.subtitle}) : super(key: key); - - @override - _HouseInfoState createState() => _HouseInfoState(); -} - -class _HouseInfoState extends State { - @override - Widget build(BuildContext context) { - return Container( - padding: EdgeInsets.only( - bottom: 32.w, - ), - decoration: BoxDecoration( - border: Border( - bottom: BorderSide(color: BaseStyle.coloreeeeee, 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( - widget.title, - style: TextStyle( - fontSize: BaseStyle.fontSize32, - color: BaseStyle.color474747, - ), - ), - SizedBox(height: 10.w), - Text( - widget.subtitle, - style: TextStyle( - fontSize: BaseStyle.fontSize32, - color: BaseStyle.color474747, - ), - ) - ], - ), - ], - ), - ); - } -} diff --git a/lib/pages/fitup_manage/widget/owner_manage.dart b/lib/pages/fitup_manage/widget/owner_manage.dart deleted file mode 100644 index 78e706ec..00000000 --- a/lib/pages/fitup_manage/widget/owner_manage.dart +++ /dev/null @@ -1,157 +0,0 @@ -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; - -import 'package:akuCommunity/base/base_style.dart'; -import 'package:akuCommunity/utils/headers.dart'; -import 'package:akuCommunity/widget/bottom_button.dart'; -import 'package:akuCommunity/widget/common_input.dart'; -import 'house_info.dart'; -import 'pay_model_sheet.dart'; - -class OwnerManage extends StatefulWidget { - OwnerManage({Key key}) : super(key: key); - - @override - _OwnerManageState createState() => _OwnerManageState(); -} - -class _OwnerManageState extends State - with AutomaticKeepAliveClientMixin { - @override - bool get wantKeepAlive => true; - - TextEditingController _companyName = new TextEditingController(); - TextEditingController _contactsName = new TextEditingController(); - TextEditingController _contactsPhone = new TextEditingController(); - - List> _listHouse = [ - {'title': '宁波华茂悦峰', 'subtitle': '1幢-1单元-702室'}, - ]; - - List> _listWidget = []; - - @override - void initState() { - super.initState(); - _listWidget = [ - { - 'title': '装修公司', - 'widget': - CommonInput(inputController: _companyName, hintText: '请输入公司名称') - }, - { - 'title': '房屋紧急联系人', - 'widget': - CommonInput(inputController: _contactsName, hintText: '请输入联系人姓名') - }, - { - 'title': '联系方式', - 'widget': - CommonInput(inputController: _contactsPhone, hintText: '请输入联系方式') - }, - // {'title': '预计开始时间', 'widget': CommonSelect(title: '时间')}, - // {'title': '预计结束时间', 'widget': CommonSelect(title: '时间')}, - ]; - } - - void _showModelBotoomSheet() { - showModalBottomSheet( - // isScrollControlled: true, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.only( - topLeft: Radius.circular(10), - topRight: Radius.circular(10), - ), - ), - context: context, - backgroundColor: Colors.white, - builder: (context) { - return PayModelSheet(); - }, - ); - } - - List _listView() { - return _listWidget - .asMap() - .keys - .map((index) => Container( - padding: EdgeInsets.only( - top: 23.w, - bottom: 24.w, - ), - margin: EdgeInsets.only(bottom: (index == 2 ? 117 : 0).w), - decoration: BoxDecoration( - border: Border( - bottom: - BorderSide(color: BaseStyle.coloreeeeee, width: 0.5)), - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - _listWidget[index]['title'], - style: TextStyle( - fontSize: BaseStyle.fontSize28, color: ktextPrimary), - ), - SizedBox(height: 25.w), - _listWidget[index]['widget'], - ], - ), - )) - .toList(); - } - - @override - Widget build(BuildContext context) { - super.build(context); - return Container( - color: Colors.white, - child: Stack( - children: [ - SingleChildScrollView( - child: Container( - 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: [ - Column( - children: _listHouse - .map((item) => HouseInfo( - title: item['title'], - subtitle: item['subtitle'], - )) - .toList(), - ), - Column( - children: _listView(), - ), - SizedBox(height: 89.w), - ], - ), - ), - ), - ), - ), - Positioned( - bottom: 0, - child: BottomButton( - title: '申请付款', - fun: _showModelBotoomSheet, - ), - ) - ], - ), - ); - } -} diff --git a/lib/pages/fitup_manage/widget/pay_model_sheet.dart b/lib/pages/fitup_manage/widget/pay_model_sheet.dart deleted file mode 100644 index 7d965768..00000000 --- a/lib/pages/fitup_manage/widget/pay_model_sheet.dart +++ /dev/null @@ -1,286 +0,0 @@ -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; - -import 'package:flutter_icons/flutter_icons.dart'; -import 'package:get/get.dart'; - -import 'package:akuCommunity/base/assets_image.dart'; -import 'package:akuCommunity/base/base_style.dart'; -import 'package:akuCommunity/utils/headers.dart'; -import 'package:akuCommunity/widget/bottom_button.dart'; - -class PayModelSheet extends StatefulWidget { - PayModelSheet({Key key}) : super(key: key); - - @override - _PayModelSheetState createState() => _PayModelSheetState(); -} - -class _PayModelSheetState extends State { - List> _listPay = [ - { - 'title': '支付宝支付', - 'widget': Icon( - AntDesign.alipay_circle, - color: Color(0xff06b4fd), - size: 50.w, - ), - 'id': 'alipay', - 'isCheck': true - }, - { - 'title': '微信支付', - 'widget': Image.asset( - AssetsImage.WXPAY, - height: 60.w, - width: 60.w, - ), - 'id': 'wxpay', - 'isCheck': false - } - ]; - - int _currentindex = 0; - - void _showModelBotoomSheet() { - showModalBottomSheet( - // isScrollControlled: true, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.only( - topLeft: Radius.circular(10), - topRight: Radius.circular(10), - ), - ), - context: context, - backgroundColor: Colors.white, - builder: (context) { - return Container( - margin: EdgeInsets.only( - top: 20.w, - left: 20.w, - right: 20.w, - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Container( - alignment: Alignment.center, - decoration: BoxDecoration( - border: Border( - bottom: - BorderSide(color: BaseStyle.coloreeeeee, width: 0.5)), - ), - child: Row( - mainAxisAlignment: MainAxisAlignment.start, - children: [ - IconButton( - icon: Icon( - AntDesign.left, - size: 40.sp, - color: BaseStyle.color999999, - ), - onPressed: () { - Get.back(); - }, - ), - Container( - padding: EdgeInsets.only(left: 190.w), - child: Text( - '选择付款方式', - style: TextStyle( - fontSize: BaseStyle.fontSize32, - color: ktextPrimary, - fontWeight: FontWeight.w600, - ), - ), - ), - ], - ), - ), - Column( - children: _listPay - .asMap() - .keys - .map((index) => _inkWellSelectPay(_listPay[index]['title'], - _listPay[index]['widget'], index)) - .toList(), - ), - ], - ), - ); - }, - ); - } - - InkWell _inkWellSelectPay(String title, Widget logo, int index) { - return InkWell( - onTap: () { - setState(() { - _listPay.forEach((item) { - item['isCheck'] = false; - }); - _listPay[index]['isCheck'] = true; - _currentindex = index; - Get.back(); - }); - }, - child: Container( - padding: EdgeInsets.only( - top: 10.w, - ), - child: Row( - mainAxisAlignment: MainAxisAlignment.start, - children: [ - logo, - SizedBox(width: 24.w), - Expanded( - child: Container( - padding: EdgeInsets.only( - bottom: 27.w, - top: 28.w, - ), - decoration: BoxDecoration( - border: Border( - bottom: - BorderSide(color: BaseStyle.coloreeeeee, width: 0.5)), - ), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Text( - title, - style: TextStyle( - fontSize: BaseStyle.fontSize28, color: ktextPrimary), - ), - _listPay[index]['isCheck'] - ? Icon( - AntDesign.check, - color: BaseStyle.colorffc40c, - size: 50.w, - ) - : SizedBox(), - ], - ), - ), - ), - ], - ), - ), - ); - } - - InkWell _inkWellDefaultPay() { - return InkWell( - onTap: _showModelBotoomSheet, - child: Container( - padding: EdgeInsets.only( - bottom: 27.w, - top: 28.w, - ), - decoration: BoxDecoration( - border: Border( - bottom: BorderSide(color: BaseStyle.coloreeeeee, width: 0.5)), - ), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Row( - children: [ - _listPay[_currentindex]['widget'], - SizedBox(width: 24.w), - Text( - _listPay[_currentindex]['title'], - style: TextStyle( - fontSize: BaseStyle.fontSize28, color: ktextPrimary), - ), - ], - ), - Icon( - AntDesign.right, - color: BaseStyle.color999999, - size: 32.w, - ), - ], - ), - ), - ); - } - - @override - Widget build(BuildContext context) { - return Container( - child: Stack( - children: [ - Container( - margin: EdgeInsets.only( - top: 36.w, - left: 32.w, - right: 32.w, - ), - child: Column( - children: [ - Container( - alignment: Alignment.center, - decoration: BoxDecoration( - border: Border( - bottom: BorderSide( - color: BaseStyle.coloreeeeee, width: 0.5)), - ), - padding: EdgeInsets.only(bottom: 20.w), - child: Text( - '付款详情', - style: TextStyle( - fontSize: BaseStyle.fontSize32, - color: ktextPrimary, - fontWeight: FontWeight.w600, - ), - ), - ), - Container( - padding: EdgeInsets.only( - bottom: 80.w, - top: 89.w, - ), - decoration: BoxDecoration( - border: Border( - bottom: BorderSide( - color: BaseStyle.coloreeeeee, width: 0.5)), - ), - alignment: Alignment.center, - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Text( - '￥${5300}', - style: TextStyle( - fontSize: BaseStyle.fontSize52, - color: Color(0xffe60e0e), - fontWeight: FontWeight.w600, - ), - ), - SizedBox(height: 20.w), - Text( - '注释：装修押金${5000}元，垃圾清理费${300}元', - style: TextStyle( - fontSize: BaseStyle.fontSize22, - color: BaseStyle.color999999), - ), - ], - ), - ), - _inkWellDefaultPay(), - ], - ), - ), - Positioned( - bottom: 0, - child: BottomButton( - title: '立即付款', - ), - ) - ], - ), - ); - } -} diff --git a/lib/pages/goods_deto_page/deto_code_page/deto_code_page.dart b/lib/pages/goods_deto_page/deto_code_page/deto_code_page.dart index 027fbd87..d4306fbb 100644 --- a/lib/pages/goods_deto_page/deto_code_page/deto_code_page.dart +++ b/lib/pages/goods_deto_page/deto_code_page/deto_code_page.dart @@ -1,4 +1,3 @@ -import 'package:akuCommunity/provider/app_provider.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -8,6 +7,7 @@ import 'package:provider/provider.dart'; import 'package:qr_flutter/qr_flutter.dart'; import 'package:akuCommunity/model/manager/article_QR_code_model.dart'; +import 'package:akuCommunity/provider/app_provider.dart'; import 'package:akuCommunity/utils/headers.dart'; import 'package:akuCommunity/widget/bee_scaffold.dart'; import 'package:akuCommunity/widget/dotted_line.dart'; diff --git a/lib/pages/goods_deto_page/deto_create_page/deto_create_page.dart b/lib/pages/goods_deto_page/deto_create_page/deto_create_page.dart index c0f4b4ec..d318879c 100644 --- a/lib/pages/goods_deto_page/deto_create_page/deto_create_page.dart +++ b/lib/pages/goods_deto_page/deto_create_page/deto_create_page.dart @@ -2,8 +2,6 @@ import 'dart:io'; -import 'package:akuCommunity/provider/app_provider.dart'; -import 'package:akuCommunity/ui/profile/house/pick_my_house_page.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -17,7 +15,9 @@ import 'package:akuCommunity/const/resource.dart'; import 'package:akuCommunity/constants/api.dart'; import 'package:akuCommunity/pages/goods_deto_page/select_move_company_page.dart'; import 'package:akuCommunity/pages/manager_func.dart'; +import 'package:akuCommunity/provider/app_provider.dart'; import 'package:akuCommunity/provider/user_provider.dart'; +import 'package:akuCommunity/ui/profile/house/pick_my_house_page.dart'; import 'package:akuCommunity/utils/bee_parse.dart'; import 'package:akuCommunity/utils/headers.dart'; import 'package:akuCommunity/utils/network/base_model.dart'; diff --git a/lib/pages/goods_deto_page/goods_deto_page.dart b/lib/pages/goods_deto_page/goods_deto_page.dart index 0b439768..12555020 100644 --- a/lib/pages/goods_deto_page/goods_deto_page.dart +++ b/lib/pages/goods_deto_page/goods_deto_page.dart @@ -126,7 +126,7 @@ class _GoodsDetoPageState extends State { } : () { userProvider.isLogin - ? Get.to(()=>DetoCreatePage()) + ? Get.to(() => DetoCreatePage()) : BotToast.showText(text: '请先登录！'); }, child: _isEdit diff --git a/lib/pages/home/widget/animate_app_bar.dart b/lib/pages/home/widget/animate_app_bar.dart index fd7ca639..c0811973 100644 --- a/lib/pages/home/widget/animate_app_bar.dart +++ b/lib/pages/home/widget/animate_app_bar.dart @@ -1,10 +1,10 @@ -import 'package:akuCommunity/utils/headers.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:provider/provider.dart'; import 'package:akuCommunity/provider/app_provider.dart'; +import 'package:akuCommunity/utils/headers.dart'; class AnimateAppBar extends StatefulWidget with PreferredSizeWidget { final ScrollController scrollController; diff --git a/lib/pages/home/widget/home_swiper.dart b/lib/pages/home/widget/home_swiper.dart index ece3b0aa..c8b31eb8 100644 --- a/lib/pages/home/widget/home_swiper.dart +++ b/lib/pages/home/widget/home_swiper.dart @@ -1,11 +1,12 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -// import 'package:flutter_swiper/flutter_swiper.dart'; - import 'package:akuCommunity/utils/headers.dart'; import 'package:akuCommunity/widget/cached_image_wrapper.dart'; +// import 'package:flutter_swiper/flutter_swiper.dart'; + + //TODO CLEAN BOTTOM CODES. @Deprecated("sh*t home_swiper need to be cleaned.") class HomeSwiper extends StatefulWidget { diff --git a/lib/pages/life_pay/life_pay_page.dart b/lib/pages/life_pay/life_pay_page.dart index c6a59f3e..621fcb45 100644 --- a/lib/pages/life_pay/life_pay_page.dart +++ b/lib/pages/life_pay/life_pay_page.dart @@ -1,6 +1,3 @@ -import 'package:akuCommunity/pages/life_pay/life_pay_record_page.dart'; -import 'package:akuCommunity/provider/app_provider.dart'; -import 'package:akuCommunity/ui/profile/house/pick_my_house_page.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -12,10 +9,13 @@ import 'package:velocity_x/velocity_x.dart'; import 'package:akuCommunity/base/base_style.dart'; import 'package:akuCommunity/constants/api.dart'; import 'package:akuCommunity/model/manager/life_pay_model.dart'; +import 'package:akuCommunity/pages/life_pay/life_pay_record_page.dart'; import 'package:akuCommunity/pages/life_pay/widget/life_pay_detail_page.dart'; import 'package:akuCommunity/pages/life_pay/widget/my_house_page.dart'; import 'package:akuCommunity/pages/things_page/widget/bee_list_view.dart'; +import 'package:akuCommunity/provider/app_provider.dart'; import 'package:akuCommunity/provider/user_provider.dart'; +import 'package:akuCommunity/ui/profile/house/pick_my_house_page.dart'; import 'package:akuCommunity/utils/bee_parse.dart'; import 'package:akuCommunity/utils/headers.dart'; import 'package:akuCommunity/widget/bee_divider.dart'; diff --git a/lib/pages/life_pay/life_pay_record_page.dart b/lib/pages/life_pay/life_pay_record_page.dart index cf3e8374..5aabe669 100644 --- a/lib/pages/life_pay/life_pay_record_page.dart +++ b/lib/pages/life_pay/life_pay_record_page.dart @@ -1,14 +1,15 @@ +import 'package:flutter/material.dart'; + +import 'package:flustars/flustars.dart'; +import 'package:flutter_easyrefresh/easy_refresh.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:velocity_x/velocity_x.dart'; + import 'package:akuCommunity/base/base_style.dart'; import 'package:akuCommunity/constants/api.dart'; import 'package:akuCommunity/model/manager/life_pay_record_model.dart'; import 'package:akuCommunity/pages/things_page/widget/bee_list_view.dart'; import 'package:akuCommunity/widget/bee_scaffold.dart'; -import 'package:flustars/flustars.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:velocity_x/velocity_x.dart'; -import 'package:flutter_gen/gen_l10n/app_localizations.dart'; class LifePayRecordPage extends StatefulWidget { LifePayRecordPage({Key key}) : super(key: key); diff --git a/lib/pages/life_pay/widget/life_pay_detail_page.dart b/lib/pages/life_pay/widget/life_pay_detail_page.dart index 6f2ce6c0..d0839969 100644 --- a/lib/pages/life_pay/widget/life_pay_detail_page.dart +++ b/lib/pages/life_pay/widget/life_pay_detail_page.dart @@ -1,4 +1,3 @@ -import 'package:akuCommunity/provider/app_provider.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -7,6 +6,7 @@ import 'package:provider/provider.dart'; import 'package:akuCommunity/base/base_style.dart'; import 'package:akuCommunity/model/manager/life_pay_model.dart'; +import 'package:akuCommunity/provider/app_provider.dart'; import 'package:akuCommunity/provider/user_provider.dart'; import 'package:akuCommunity/utils/bee_parse.dart'; import 'package:akuCommunity/utils/headers.dart'; diff --git a/lib/pages/life_pay/widget/my_house_page.dart b/lib/pages/life_pay/widget/my_house_page.dart index 273b3836..0a8975b7 100644 --- a/lib/pages/life_pay/widget/my_house_page.dart +++ b/lib/pages/life_pay/widget/my_house_page.dart @@ -1,4 +1,3 @@ -import 'package:akuCommunity/provider/app_provider.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; @@ -7,6 +6,7 @@ import 'package:akuCommunity/base/base_style.dart'; import 'package:akuCommunity/model/manager/estate_payment_model.dart'; import 'package:akuCommunity/pages/goods_deto_page/deto_create_page/widget/common_radio.dart'; import 'package:akuCommunity/pages/manager_func.dart'; +import 'package:akuCommunity/provider/app_provider.dart'; import 'package:akuCommunity/provider/user_provider.dart'; import 'package:akuCommunity/utils/bee_parse.dart'; import 'package:akuCommunity/utils/headers.dart'; diff --git a/lib/pages/message_center_page/comment_message/comment_message_page.dart b/lib/pages/message_center_page/comment_message/comment_message_page.dart index 70288fbc..3ef8fb94 100644 --- a/lib/pages/message_center_page/comment_message/comment_message_page.dart +++ b/lib/pages/message_center_page/comment_message/comment_message_page.dart @@ -1,4 +1,3 @@ -import 'package:akuCommunity/model/common/img_model.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -9,6 +8,7 @@ import 'package:velocity_x/velocity_x.dart'; import 'package:akuCommunity/const/resource.dart'; import 'package:akuCommunity/constants/api.dart'; +import 'package:akuCommunity/model/common/img_model.dart'; import 'package:akuCommunity/model/message/comment_message_model.dart'; import 'package:akuCommunity/pages/things_page/widget/bee_list_view.dart'; import 'package:akuCommunity/utils/bee_date_util.dart'; diff --git a/lib/pages/message_center_page/system_message/system_message_detail_page.dart b/lib/pages/message_center_page/system_message/system_message_detail_page.dart index 5ae1e979..6b009ee9 100644 --- a/lib/pages/message_center_page/system_message/system_message_detail_page.dart +++ b/lib/pages/message_center_page/system_message/system_message_detail_page.dart @@ -38,10 +38,10 @@ class _SystemMessageDetailPageState extends State { child: _onload ? _empty() : Center( - child: Padding( - padding: EdgeInsets.all(32.w), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + child: Padding( + padding: EdgeInsets.all(32.w), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, children: [ 20.w.heightBox, '系统通知'.text.black.bold.size(32.sp).make(), @@ -51,8 +51,8 @@ class _SystemMessageDetailPageState extends State { _model.content.text.black.size(28.sp).isIntrinsic.make(), ], ), + ), ), - ), ), ); } diff --git a/lib/pages/message_center_page/system_message/system_message_page.dart b/lib/pages/message_center_page/system_message/system_message_page.dart index 96f6b7db..7258f6ac 100644 --- a/lib/pages/message_center_page/system_message/system_message_page.dart +++ b/lib/pages/message_center_page/system_message/system_message_page.dart @@ -2,6 +2,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; +import 'package:get/get.dart'; import 'package:akuCommunity/base/base_style.dart'; import 'package:akuCommunity/constants/api.dart'; @@ -13,7 +14,6 @@ import 'package:akuCommunity/utils/headers.dart'; import 'package:akuCommunity/utils/network/net_util.dart'; import 'package:akuCommunity/widget/bee_divider.dart'; import 'package:akuCommunity/widget/bee_scaffold.dart'; -import 'package:get/get.dart'; class SystemMessagePage extends StatefulWidget { SystemMessagePage({Key key}) : super(key: key); diff --git a/lib/pages/open_door_page/open_door_page.dart b/lib/pages/open_door_page/open_door_page.dart deleted file mode 100644 index dae39018..00000000 --- a/lib/pages/open_door_page/open_door_page.dart +++ /dev/null @@ -1,130 +0,0 @@ -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; - -import 'package:get/get.dart'; - -import 'package:akuCommunity/pages/certification_page/certification_page.dart'; -import 'package:akuCommunity/utils/headers.dart'; -import 'package:akuCommunity/widget/bee_scaffold.dart'; - -class OpenDoorPage extends StatefulWidget { - OpenDoorPage({Key key}) : super(key: key); - - @override - _OpenDoorPageState createState() => _OpenDoorPageState(); -} - -class _OpenDoorPageState extends State { - void _showDialog() { - showCupertinoDialog( - context: context, - builder: (context) { - return CupertinoAlertDialog( - title: Text( - '实名认证', - style: TextStyle( - fontSize: 34.sp, - color: Color(0xff030303), - ), - ), - content: Text( - '\n为了小区的安全，需要先进行实名认证', - style: TextStyle( - fontSize: 28.sp, - color: Color(0xff030303), - ), - ), - actions: [ - CupertinoDialogAction( - child: Text( - '考虑考虑', - style: TextStyle( - fontSize: 34.sp, - color: Color(0xff333333), - ), - ), - onPressed: () { - Get.back(); - }, - ), - CupertinoDialogAction( - child: Text( - '前去认证', - style: TextStyle( - fontWeight: FontWeight.w600, - fontSize: 34.sp, - color: Color(0xffff8200), - ), - ), - onPressed: () { - Get.back(); - Get.to(() => CertificationPage()); - }, - ), - ], - ); - }, - ); - } - - @override - Widget build(BuildContext context) { - return BeeScaffold( - title: '一键开门', - body: Container( - color: Colors.white, - alignment: Alignment.center, - child: ListView( - children: [ - Container( - margin: EdgeInsets.only(top: 220.w), - child: Column( - children: [ - InkWell( - onTap: _showDialog, - child: Stack( - children: [ - Container( - alignment: Alignment.center, - width: 400.w, - height: 420.w, - child: Image.asset( - 'assets/images/open_door.png', - width: 400.w, - height: 420.w, - fit: BoxFit.fill, - ), - ), - Positioned( - top: 120.w, - left: 137.5.w, - child: Image.asset( - 'assets/images/lock.png', - width: 125.w, - height: 150.w, - fit: BoxFit.fill, - ), - ), - ], - ), - ), - Container( - margin: EdgeInsets.only(top: 40.w), - child: Text( - '未检测到相关设备', - style: TextStyle( - fontSize: 44.w, - color: Color(0xff999999), - fontWeight: FontWeight.w600, - ), - ), - ), - ], - ), - ), - ], - ), - ), - ); - } -} diff --git a/lib/pages/personal/look_logistics_page.dart b/lib/pages/personal/look_logistics_page.dart index e2a29850..00d11034 100644 --- a/lib/pages/personal/look_logistics_page.dart +++ b/lib/pages/personal/look_logistics_page.dart @@ -6,12 +6,14 @@ import 'package:flutter/material.dart'; import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter_icons/flutter_icons.dart'; import 'package:get/get.dart'; -// import 'package:sliding_up_panel/sliding_up_panel.dart'; import 'package:akuCommunity/base/base_style.dart'; import 'package:akuCommunity/utils/headers.dart'; import 'package:akuCommunity/widget/cached_image_wrapper.dart'; +// import 'package:sliding_up_panel/sliding_up_panel.dart'; + + class LookLogisticsPage extends StatefulWidget { LookLogisticsPage({Key key}) : super(key: key); diff --git a/lib/pages/personal/personal_page.dart b/lib/pages/personal/personal_page.dart index 9ea77545..15088507 100644 --- a/lib/pages/personal/personal_page.dart +++ b/lib/pages/personal/personal_page.dart @@ -6,7 +6,6 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:provider/provider.dart'; -import 'package:akuCommunity/base/assets_image.dart'; import 'package:akuCommunity/base/base_style.dart'; import 'package:akuCommunity/const/resource.dart'; import 'package:akuCommunity/constants/api.dart'; @@ -48,7 +47,7 @@ class _PersonalIndexState extends State child: Container( decoration: BoxDecoration( image: DecorationImage( - image: AssetImage(AssetsImage.MINEBG), + image: AssetImage(R.ASSETS_IMAGES_MINE_BG_PNG), fit: BoxFit.cover, ), ), diff --git a/lib/pages/property/widget/property_card.dart b/lib/pages/property/widget/property_card.dart index eec86f8b..073c0f69 100644 --- a/lib/pages/property/widget/property_card.dart +++ b/lib/pages/property/widget/property_card.dart @@ -4,24 +4,16 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:url_launcher/url_launcher.dart'; -import 'package:akuCommunity/base/assets_image.dart'; import 'package:akuCommunity/utils/headers.dart'; class PropertyCard extends StatelessWidget { PropertyCard({Key key}) : super(key: key); final List> _listCard = [ - // { - // 'title': '语音管家', - // 'subtitle': '随时随地帮你下单', - // 'image': AssetsImage.PROPERTY, - // 'coloList': [Color(0xff33dfe4), Color(0xff00ccf3)], - // 'shapeColoList': [Color(0xff04ddf2), Color(0xff339a8f)] - // }, { 'title': '电话物业', 'subtitle': '24小时在线', - 'image': AssetsImage.PROPERTY, + 'image': R.ASSETS_ICONS_PROPERTY_PNG, 'coloList': [Color(0xff42ceff), Color(0xff198cfb)], 'shapeColoList': [Color(0xff42ceff), Color(0xff0b69c4)] } diff --git a/lib/pages/setting_page/account_manager_page.dart b/lib/pages/setting_page/account_manager_page.dart index 477cfcfe..ea9fb58f 100644 --- a/lib/pages/setting_page/account_manager_page.dart +++ b/lib/pages/setting_page/account_manager_page.dart @@ -38,7 +38,7 @@ class _AccountManagerPageState extends State { ), ), onPressed: () { - Get.offAll(()=>SignInPage()); + Get.offAll(() => SignInPage()); }, ), ], diff --git a/lib/pages/sign/sign_in_page.dart b/lib/pages/sign/sign_in_page.dart index 79b1aea6..a36e6185 100644 --- a/lib/pages/sign/sign_in_page.dart +++ b/lib/pages/sign/sign_in_page.dart @@ -1,7 +1,6 @@ import 'dart:async'; import 'dart:ui'; -import 'package:akuCommunity/pages/sign/sign_up/sign_up_set_nickname_page.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -15,13 +14,13 @@ import 'package:power_logger/power_logger.dart'; import 'package:provider/provider.dart'; import 'package:velocity_x/velocity_x.dart'; -import 'package:akuCommunity/base/assets_image.dart'; import 'package:akuCommunity/base/base_style.dart'; import 'package:akuCommunity/const/resource.dart'; import 'package:akuCommunity/extensions/num_ext.dart'; import 'package:akuCommunity/pages/setting_page/agreement_page/agreement_page.dart'; import 'package:akuCommunity/pages/setting_page/agreement_page/privacy_page.dart'; import 'package:akuCommunity/pages/sign/sign_func.dart'; +import 'package:akuCommunity/pages/sign/sign_up/sign_up_set_nickname_page.dart'; import 'package:akuCommunity/pages/tab_navigator.dart'; import 'package:akuCommunity/provider/sign_up_provider.dart'; import 'package:akuCommunity/provider/user_provider.dart'; @@ -50,7 +49,7 @@ class _SignInPageState extends State { return Container( alignment: Alignment.center, child: Image.asset( - AssetsImage.LOGO, + R.ASSETS_IMAGES_LOGO_PNG, height: 184.w, width: 266.w, ), diff --git a/lib/pages/sign/sign_up/sign_up_set_nickname_page.dart b/lib/pages/sign/sign_up/sign_up_set_nickname_page.dart index c62b0994..9939e28b 100644 --- a/lib/pages/sign/sign_up/sign_up_set_nickname_page.dart +++ b/lib/pages/sign/sign_up/sign_up_set_nickname_page.dart @@ -1,8 +1,6 @@ -import 'package:akuCommunity/pages/sign/sign_func.dart'; -import 'package:akuCommunity/pages/tab_navigator.dart'; -import 'package:bot_toast/bot_toast.dart'; import 'package:flutter/material.dart'; +import 'package:bot_toast/bot_toast.dart'; import 'package:flustars/flustars.dart'; import 'package:get/get.dart'; import 'package:provider/provider.dart'; @@ -10,7 +8,9 @@ import 'package:random_character/chinese_character/random_chinese_charater.dart' import 'package:velocity_x/velocity_x.dart'; import 'package:akuCommunity/base/base_style.dart'; +import 'package:akuCommunity/pages/sign/sign_func.dart'; import 'package:akuCommunity/pages/sign/sign_up/sign_up_common_widget.dart'; +import 'package:akuCommunity/pages/tab_navigator.dart'; import 'package:akuCommunity/provider/sign_up_provider.dart'; import 'package:akuCommunity/utils/headers.dart'; diff --git a/lib/pages/tab_navigator.dart b/lib/pages/tab_navigator.dart index d6870af2..18bd16a1 100644 --- a/lib/pages/tab_navigator.dart +++ b/lib/pages/tab_navigator.dart @@ -69,8 +69,6 @@ class _TabNavigatorState extends State List _bottomNav = [ _buildBottomBar('首页', R.ASSETS_ICONS_TABBAR_HOME_NO_PNG, R.ASSETS_ICONS_TABBAR_HOME_PNG), - // _buildBottomBar( - // '商城', AssetsImage.TAB_MARKET_UNSELECT, AssetsImage.TAB_MARKET_SELECT), _buildBottomBar('物业', R.ASSETS_ICONS_TABBAR_HOUSE_NO_PNG, R.ASSETS_ICONS_TABBAR_HOUSE_PNG), _buildBottomBar('社区', R.ASSETS_ICONS_TABBAR_MESSAGE_NO_PNG, diff --git a/lib/pages/things_page/fixed_submit_page.dart b/lib/pages/things_page/fixed_submit_page.dart index 708ce688..e1188834 100644 --- a/lib/pages/things_page/fixed_submit_page.dart +++ b/lib/pages/things_page/fixed_submit_page.dart @@ -10,7 +10,6 @@ import 'package:velocity_x/velocity_x.dart'; import 'package:akuCommunity/base/base_style.dart'; import 'package:akuCommunity/constants/api.dart'; import 'package:akuCommunity/extensions/num_ext.dart'; - import 'package:akuCommunity/model/user/fixed_submit_model.dart'; import 'package:akuCommunity/pages/manager_func.dart'; import 'package:akuCommunity/pages/things_page/widget/add_fixed_submit_page.dart'; diff --git a/lib/pages/things_page/widget/add_fixed_submit_page.dart b/lib/pages/things_page/widget/add_fixed_submit_page.dart index 70d447ce..efac6c7c 100644 --- a/lib/pages/things_page/widget/add_fixed_submit_page.dart +++ b/lib/pages/things_page/widget/add_fixed_submit_page.dart @@ -1,9 +1,5 @@ import 'dart:io'; -import 'package:akuCommunity/provider/app_provider.dart'; -import 'package:akuCommunity/ui/profile/house/house_owners_page.dart'; -import 'package:akuCommunity/ui/profile/house/pick_my_house_page.dart'; -import 'package:akuCommunity/utils/headers.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -16,13 +12,16 @@ import 'package:velocity_x/velocity_x.dart'; import 'package:akuCommunity/base/base_style.dart'; import 'package:akuCommunity/const/resource.dart'; import 'package:akuCommunity/constants/api.dart'; - import 'package:akuCommunity/extensions/widget_list_ext.dart'; import 'package:akuCommunity/pages/life_pay/widget/my_house_page.dart'; import 'package:akuCommunity/pages/manager_func.dart'; import 'package:akuCommunity/pages/things_page/widget/finish_fixed_submit_page.dart'; +import 'package:akuCommunity/provider/app_provider.dart'; import 'package:akuCommunity/provider/user_provider.dart'; +import 'package:akuCommunity/ui/profile/house/house_owners_page.dart'; +import 'package:akuCommunity/ui/profile/house/pick_my_house_page.dart'; import 'package:akuCommunity/utils/bee_parse.dart'; +import 'package:akuCommunity/utils/headers.dart'; import 'package:akuCommunity/utils/network/base_model.dart'; import 'package:akuCommunity/utils/network/net_util.dart'; import 'package:akuCommunity/widget/bee_divider.dart'; diff --git a/lib/pages/things_page/widget/bee_list_view.dart b/lib/pages/things_page/widget/bee_list_view.dart index 15930a27..bef1b503 100644 --- a/lib/pages/things_page/widget/bee_list_view.dart +++ b/lib/pages/things_page/widget/bee_list_view.dart @@ -98,7 +98,7 @@ class _BeeListViewState extends State { ); _models = widget.convert(_model); widget.controller?.resetLoadState(); - if(mounted)setState(() {}); + if (mounted) setState(() {}); }, firstRefresh: true, onLoad: () async { diff --git a/lib/pages/visitor_access_page/visitor_access_page.dart b/lib/pages/visitor_access_page/visitor_access_page.dart index ed504622..ba09fbc9 100644 --- a/lib/pages/visitor_access_page/visitor_access_page.dart +++ b/lib/pages/visitor_access_page/visitor_access_page.dart @@ -1,10 +1,8 @@ -import 'package:akuCommunity/provider/app_provider.dart'; -import 'package:akuCommunity/ui/profile/house/pick_my_house_page.dart'; -import 'package:flustars/flustars.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:bot_toast/bot_toast.dart'; +import 'package:flustars/flustars.dart'; import 'package:flutter_icons/flutter_icons.dart'; import 'package:get/get.dart'; import 'package:provider/provider.dart'; @@ -13,8 +11,10 @@ import 'package:velocity_x/velocity_x.dart'; import 'package:akuCommunity/base/base_style.dart'; import 'package:akuCommunity/pages/life_pay/widget/my_house_page.dart'; import 'package:akuCommunity/pages/manager_func.dart'; +import 'package:akuCommunity/provider/app_provider.dart'; import 'package:akuCommunity/provider/user_provider.dart'; import 'package:akuCommunity/ui/manager/visitor/visitor_record_page.dart'; +import 'package:akuCommunity/ui/profile/house/pick_my_house_page.dart'; import 'package:akuCommunity/utils/bee_parse.dart'; import 'package:akuCommunity/utils/headers.dart'; import 'package:akuCommunity/widget/bee_divider.dart'; diff --git a/lib/provider/app_provider.dart b/lib/provider/app_provider.dart index 031fd2b5..d3b94056 100644 --- a/lib/provider/app_provider.dart +++ b/lib/provider/app_provider.dart @@ -1,5 +1,3 @@ -import 'package:akuCommunity/model/user/car_parking_model.dart'; -import 'package:akuCommunity/model/user/house_model.dart'; import 'package:flutter/material.dart'; import 'package:amap_flutter_location/amap_flutter_location.dart'; @@ -12,6 +10,8 @@ import 'package:akuCommunity/constants/application_objects.dart'; import 'package:akuCommunity/model/common/real_time_weather_model.dart'; import 'package:akuCommunity/model/community/hot_topic_model.dart'; import 'package:akuCommunity/model/message/message_center_model.dart'; +import 'package:akuCommunity/model/user/car_parking_model.dart'; +import 'package:akuCommunity/model/user/house_model.dart'; import 'package:akuCommunity/utils/hive_store.dart'; import 'package:akuCommunity/utils/network/base_model.dart'; import 'package:akuCommunity/utils/network/net_util.dart'; diff --git a/lib/provider/user_provider.dart b/lib/provider/user_provider.dart index 5e37f756..b7fcfdb6 100644 --- a/lib/provider/user_provider.dart +++ b/lib/provider/user_provider.dart @@ -1,18 +1,18 @@ -import 'package:akuCommunity/provider/app_provider.dart'; -import 'package:akuCommunity/ui/profile/house/house_func.dart'; import 'package:flutter/material.dart'; import 'package:flustars/flustars.dart'; +import 'package:get/get.dart'; +import 'package:provider/provider.dart'; import 'package:akuCommunity/constants/api.dart'; import 'package:akuCommunity/model/user/user_detail_model.dart'; import 'package:akuCommunity/model/user/user_info_model.dart'; import 'package:akuCommunity/pages/sign/sign_func.dart'; +import 'package:akuCommunity/provider/app_provider.dart'; +import 'package:akuCommunity/ui/profile/house/house_func.dart'; import 'package:akuCommunity/utils/hive_store.dart'; import 'package:akuCommunity/utils/network/base_model.dart'; import 'package:akuCommunity/utils/network/net_util.dart'; -import 'package:get/get.dart'; -import 'package:provider/provider.dart'; class UserProvider extends ChangeNotifier { bool _isLogin = false; diff --git a/lib/ui/community/community_views/community_page.dart b/lib/ui/community/community_views/community_page.dart index 67bd0e12..81f59340 100644 --- a/lib/ui/community/community_views/community_page.dart +++ b/lib/ui/community/community_views/community_page.dart @@ -1,9 +1,9 @@ -import 'package:akuCommunity/pages/message_center_page/message_center_page.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:provider/provider.dart'; +import 'package:akuCommunity/pages/message_center_page/message_center_page.dart'; import 'package:akuCommunity/provider/user_provider.dart'; import 'package:akuCommunity/ui/community/community_views/add_new_event_page.dart'; import 'package:akuCommunity/ui/community/community_views/my_community_view.dart'; diff --git a/lib/ui/community/community_views/topic/topic_detail_page.dart b/lib/ui/community/community_views/topic/topic_detail_page.dart index 780c30e5..0e55e1d4 100644 --- a/lib/ui/community/community_views/topic/topic_detail_page.dart +++ b/lib/ui/community/community_views/topic/topic_detail_page.dart @@ -1,4 +1,3 @@ -import 'package:akuCommunity/constants/app_theme.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; @@ -6,6 +5,7 @@ import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:get/get.dart'; import 'package:akuCommunity/constants/api.dart'; +import 'package:akuCommunity/constants/app_theme.dart'; import 'package:akuCommunity/model/community/community_topic_model.dart'; import 'package:akuCommunity/model/community/event_item_model.dart'; import 'package:akuCommunity/pages/things_page/widget/bee_list_view.dart'; diff --git a/lib/ui/community/community_views/widgets/chat_card.dart b/lib/ui/community/community_views/widgets/chat_card.dart index 0124b50f..be0c833a 100644 --- a/lib/ui/community/community_views/widgets/chat_card.dart +++ b/lib/ui/community/community_views/widgets/chat_card.dart @@ -1,6 +1,5 @@ import 'dart:math'; -import 'package:akuCommunity/model/common/img_model.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -10,6 +9,7 @@ import 'package:provider/provider.dart'; import 'package:velocity_x/velocity_x.dart'; import 'package:akuCommunity/constants/api.dart'; +import 'package:akuCommunity/model/common/img_model.dart'; import 'package:akuCommunity/model/community/event_item_model.dart'; import 'package:akuCommunity/provider/user_provider.dart'; import 'package:akuCommunity/ui/community/community_views/event_detail_page.dart'; diff --git a/lib/ui/community/community_views/widgets/my_event_card.dart b/lib/ui/community/community_views/widgets/my_event_card.dart index 01228ff8..a17206c0 100644 --- a/lib/ui/community/community_views/widgets/my_event_card.dart +++ b/lib/ui/community/community_views/widgets/my_event_card.dart @@ -1,4 +1,3 @@ -import 'package:akuCommunity/model/common/img_model.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; @@ -6,6 +5,7 @@ import 'package:velocity_x/velocity_x.dart'; import 'package:akuCommunity/const/resource.dart'; import 'package:akuCommunity/constants/api.dart'; +import 'package:akuCommunity/model/common/img_model.dart'; import 'package:akuCommunity/model/community/my_event_item_model.dart'; import 'package:akuCommunity/ui/community/community_views/event_detail_page.dart'; import 'package:akuCommunity/utils/bee_date_util.dart'; diff --git a/lib/ui/community/notice/notice_card.dart b/lib/ui/community/notice/notice_card.dart index 1332e6bb..582235c7 100644 --- a/lib/ui/community/notice/notice_card.dart +++ b/lib/ui/community/notice/notice_card.dart @@ -1,4 +1,3 @@ -import 'package:akuCommunity/model/common/img_model.dart'; import 'package:flutter/material.dart'; import 'package:flustars/flustars.dart'; @@ -7,6 +6,7 @@ import 'package:velocity_x/velocity_x.dart'; import 'package:akuCommunity/const/resource.dart'; import 'package:akuCommunity/constants/api.dart'; +import 'package:akuCommunity/model/common/img_model.dart'; import 'package:akuCommunity/model/community/board_model.dart'; import 'package:akuCommunity/ui/community/notice/notice_detail_page.dart'; import 'package:akuCommunity/utils/headers.dart'; diff --git a/lib/ui/community/notice/notice_detail_page.dart b/lib/ui/community/notice/notice_detail_page.dart index e119b551..6b0e3ca0 100644 --- a/lib/ui/community/notice/notice_detail_page.dart +++ b/lib/ui/community/notice/notice_detail_page.dart @@ -1,7 +1,6 @@ -import 'package:akuCommunity/widget/views/%20bee_download_view.dart'; -import 'package:bot_toast/bot_toast.dart'; import 'package:flutter/material.dart'; +import 'package:bot_toast/bot_toast.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:get/get.dart'; import 'package:open_file/open_file.dart'; @@ -15,6 +14,7 @@ import 'package:akuCommunity/utils/network/base_model.dart'; import 'package:akuCommunity/utils/network/net_util.dart'; import 'package:akuCommunity/widget/bee_scaffold.dart'; import 'package:akuCommunity/widget/picker/bee_image_preview.dart'; +import 'package:akuCommunity/widget/views/%20bee_download_view.dart'; class NoticeDetailPage extends StatefulWidget { final int id; diff --git a/lib/ui/home/home_notification.dart b/lib/ui/home/home_notification.dart index 6bfd702b..d3043e41 100644 --- a/lib/ui/home/home_notification.dart +++ b/lib/ui/home/home_notification.dart @@ -1,7 +1,7 @@ -import 'package:animated_text_kit/animated_text_kit.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:animated_text_kit/animated_text_kit.dart'; import 'package:get/get.dart'; import 'package:velocity_x/velocity_x.dart'; diff --git a/lib/ui/manager/advice/new_advice_page.dart b/lib/ui/manager/advice/new_advice_page.dart index 425ed357..43d19e0c 100644 --- a/lib/ui/manager/advice/new_advice_page.dart +++ b/lib/ui/manager/advice/new_advice_page.dart @@ -1,6 +1,5 @@ import 'dart:io'; -import 'package:akuCommunity/provider/app_provider.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -13,6 +12,7 @@ import 'package:velocity_x/velocity_x.dart'; import 'package:akuCommunity/const/resource.dart'; import 'package:akuCommunity/constants/api.dart'; +import 'package:akuCommunity/provider/app_provider.dart'; import 'package:akuCommunity/ui/manager/advice/advice_page.dart'; import 'package:akuCommunity/utils/headers.dart'; import 'package:akuCommunity/utils/network/base_model.dart'; diff --git a/lib/ui/manager/questionnaire/questionnaire_page.dart b/lib/ui/manager/questionnaire/questionnaire_page.dart index 9f1be0d6..b34bc702 100644 --- a/lib/ui/manager/questionnaire/questionnaire_page.dart +++ b/lib/ui/manager/questionnaire/questionnaire_page.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flustars/flustars.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; +import 'package:get/get.dart'; import 'package:akuCommunity/base/base_style.dart'; import 'package:akuCommunity/constants/api.dart'; @@ -11,7 +12,6 @@ import 'package:akuCommunity/ui/manager/questionnaire/questionnaire_detail_page. import 'package:akuCommunity/utils/headers.dart'; import 'package:akuCommunity/widget/bee_scaffold.dart'; import 'package:akuCommunity/widget/others/stack_avatar.dart'; -import 'package:get/get.dart'; class QuestionnairePage extends StatefulWidget { QuestionnairePage({Key key}) : super(key: key); diff --git a/lib/ui/profile/car/car_manage_card.dart b/lib/ui/profile/car/car_manage_card.dart index 42fc42f1..4a29280b 100644 --- a/lib/ui/profile/car/car_manage_card.dart +++ b/lib/ui/profile/car/car_manage_card.dart @@ -1,6 +1,7 @@ +import 'package:flutter/material.dart'; + import 'package:akuCommunity/model/user/car_parking_model.dart'; import 'package:akuCommunity/utils/headers.dart'; -import 'package:flutter/material.dart'; class CarManageCard extends StatelessWidget { final CarParkingModel model; diff --git a/lib/ui/profile/car/car_manage_page.dart b/lib/ui/profile/car/car_manage_page.dart index 01377698..a496f3a5 100644 --- a/lib/ui/profile/car/car_manage_page.dart +++ b/lib/ui/profile/car/car_manage_page.dart @@ -1,11 +1,13 @@ +import 'package:flutter/material.dart'; + +import 'package:flutter_easyrefresh/easy_refresh.dart'; +import 'package:provider/provider.dart'; + import 'package:akuCommunity/provider/app_provider.dart'; import 'package:akuCommunity/ui/profile/car/car_manage_card.dart'; import 'package:akuCommunity/ui/profile/car_parking/car_parking_card.dart'; import 'package:akuCommunity/utils/headers.dart'; import 'package:akuCommunity/widget/bee_scaffold.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; -import 'package:provider/provider.dart'; class CarManagePage extends StatefulWidget { CarManagePage({Key key}) : super(key: key); diff --git a/lib/ui/profile/car_parking/car_parking_card.dart b/lib/ui/profile/car_parking/car_parking_card.dart index 46b5ca81..1f4dbf65 100644 --- a/lib/ui/profile/car_parking/car_parking_card.dart +++ b/lib/ui/profile/car_parking/car_parking_card.dart @@ -1,6 +1,7 @@ +import 'package:flutter/material.dart'; + import 'package:akuCommunity/model/user/car_parking_model.dart'; import 'package:akuCommunity/utils/headers.dart'; -import 'package:flutter/material.dart'; class CarparkingCard extends StatelessWidget { final CarParkingModel model; diff --git a/lib/ui/profile/car_parking/car_parking_page.dart b/lib/ui/profile/car_parking/car_parking_page.dart index 9c0b934a..861266c4 100644 --- a/lib/ui/profile/car_parking/car_parking_page.dart +++ b/lib/ui/profile/car_parking/car_parking_page.dart @@ -1,10 +1,12 @@ +import 'package:flutter/material.dart'; + +import 'package:flutter_easyrefresh/easy_refresh.dart'; +import 'package:provider/provider.dart'; + import 'package:akuCommunity/provider/app_provider.dart'; import 'package:akuCommunity/ui/profile/car_parking/car_parking_card.dart'; import 'package:akuCommunity/utils/headers.dart'; import 'package:akuCommunity/widget/bee_scaffold.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; -import 'package:provider/provider.dart'; class CarParkingPage extends StatefulWidget { CarParkingPage({Key key}) : super(key: key); diff --git a/lib/ui/profile/car_parking/manage_car_parking_page.dart b/lib/ui/profile/car_parking/manage_car_parking_page.dart index c0a448d0..7fd1b43c 100644 --- a/lib/ui/profile/car_parking/manage_car_parking_page.dart +++ b/lib/ui/profile/car_parking/manage_car_parking_page.dart @@ -1,6 +1,7 @@ -import 'package:akuCommunity/widget/bee_scaffold.dart'; import 'package:flutter/material.dart'; +import 'package:akuCommunity/widget/bee_scaffold.dart'; + class ManageCarParkingPage extends StatefulWidget { ManageCarParkingPage({Key key}) : super(key: key); diff --git a/lib/ui/profile/house/house_card.dart b/lib/ui/profile/house/house_card.dart index 94f48b80..93333fbb 100644 --- a/lib/ui/profile/house/house_card.dart +++ b/lib/ui/profile/house/house_card.dart @@ -1,9 +1,11 @@ +import 'package:flutter/material.dart'; + +import 'package:get/get.dart'; + import 'package:akuCommunity/const/resource.dart'; import 'package:akuCommunity/model/user/house_model.dart'; import 'package:akuCommunity/ui/profile/house/pick_my_house_page.dart'; -import 'package:flutter/material.dart'; import 'package:akuCommunity/utils/headers.dart'; -import 'package:get/get.dart'; enum CardAuthType { FAIL, diff --git a/lib/ui/profile/house/house_owners_page.dart b/lib/ui/profile/house/house_owners_page.dart index f949270a..19c47785 100644 --- a/lib/ui/profile/house/house_owners_page.dart +++ b/lib/ui/profile/house/house_owners_page.dart @@ -1,17 +1,17 @@ -import 'package:akuCommunity/provider/app_provider.dart'; -import 'package:akuCommunity/ui/profile/house/house_card.dart'; -import 'package:akuCommunity/ui/profile/house/house_func.dart'; import 'package:flutter/material.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; +import 'package:provider/provider.dart'; import 'package:akuCommunity/const/resource.dart'; +import 'package:akuCommunity/provider/app_provider.dart'; import 'package:akuCommunity/ui/profile/house/add_house_page.dart'; -import 'package:akuCommunity/widget/bee_scaffold.dart'; +import 'package:akuCommunity/ui/profile/house/house_card.dart'; +import 'package:akuCommunity/ui/profile/house/house_func.dart'; import 'package:akuCommunity/utils/headers.dart'; -import 'package:provider/provider.dart'; +import 'package:akuCommunity/widget/bee_scaffold.dart'; class HouseOwnersPage extends StatefulWidget { HouseOwnersPage({Key key}) : super(key: key); diff --git a/lib/ui/profile/house/pick_my_house_page.dart b/lib/ui/profile/house/pick_my_house_page.dart index 7e910e83..815665dc 100644 --- a/lib/ui/profile/house/pick_my_house_page.dart +++ b/lib/ui/profile/house/pick_my_house_page.dart @@ -1,18 +1,20 @@ -import 'package:akuCommunity/constants/api.dart'; -import 'package:akuCommunity/model/user/house_model.dart'; -import 'package:akuCommunity/provider/app_provider.dart'; -import 'package:akuCommunity/ui/profile/house/add_house_page.dart'; -import 'package:akuCommunity/ui/profile/house/house_func.dart'; -import 'package:akuCommunity/utils/network/net_util.dart'; -import 'package:akuCommunity/widget/bee_scaffold.dart'; -import 'package:bot_toast/bot_toast.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; + +import 'package:bot_toast/bot_toast.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:flutter_slidable/flutter_slidable.dart'; import 'package:get/get.dart'; import 'package:provider/provider.dart'; + +import 'package:akuCommunity/constants/api.dart'; +import 'package:akuCommunity/model/user/house_model.dart'; +import 'package:akuCommunity/provider/app_provider.dart'; +import 'package:akuCommunity/ui/profile/house/add_house_page.dart'; +import 'package:akuCommunity/ui/profile/house/house_func.dart'; import 'package:akuCommunity/utils/headers.dart'; +import 'package:akuCommunity/utils/network/net_util.dart'; +import 'package:akuCommunity/widget/bee_scaffold.dart'; class PickMyHousePage extends StatefulWidget { PickMyHousePage({Key key}) : super(key: key); diff --git a/lib/utils/bee_map.dart b/lib/utils/bee_map.dart index 7690d836..860a5ff9 100644 --- a/lib/utils/bee_map.dart +++ b/lib/utils/bee_map.dart @@ -51,8 +51,8 @@ class BeeMap { 3: '已读', }; - static Map messageIsRead ={ - 1:false, - 3:true, + static Map messageIsRead = { + 1: false, + 3: true, }; } diff --git a/lib/utils/login_util.dart b/lib/utils/login_util.dart index 56a80f4e..531db115 100644 --- a/lib/utils/login_util.dart +++ b/lib/utils/login_util.dart @@ -1,12 +1,12 @@ -import 'package:akuCommunity/provider/app_provider.dart'; -import 'package:akuCommunity/ui/profile/house/add_house_page.dart'; -import 'package:akuCommunity/ui/profile/house/house_owners_page.dart'; import 'package:bot_toast/bot_toast.dart'; import 'package:get/get.dart'; import 'package:provider/provider.dart'; import 'package:akuCommunity/pages/sign/sign_in_page.dart'; +import 'package:akuCommunity/provider/app_provider.dart'; import 'package:akuCommunity/provider/user_provider.dart'; +import 'package:akuCommunity/ui/profile/house/add_house_page.dart'; +import 'package:akuCommunity/ui/profile/house/house_owners_page.dart'; /// | 名称 | 函数 | /// |-----|------| diff --git a/lib/widget/views/ bee_download_view.dart b/lib/widget/views/ bee_download_view.dart index 4ed7366d..e4b51f32 100644 --- a/lib/widget/views/ bee_download_view.dart +++ b/lib/widget/views/ bee_download_view.dart @@ -1,7 +1,8 @@ import 'dart:io'; -import 'package:dio/dio.dart'; import 'package:flutter/material.dart'; + +import 'package:dio/dio.dart'; import 'package:get/get.dart'; import 'package:path_provider/path_provider.dart';