diff --git a/assets/inspection/ic_xunjian.png b/assets/inspection/ic_xunjian.png new file mode 100644 index 0000000..dc58c39 Binary files /dev/null and b/assets/inspection/ic_xunjian.png differ diff --git a/assets/manage/ic_car.png b/assets/manage/ic_car.png new file mode 100644 index 0000000..44dd61b Binary files /dev/null and b/assets/manage/ic_car.png differ diff --git a/assets/manage/ic_daofang.png b/assets/manage/ic_daofang.png new file mode 100644 index 0000000..4caed1a Binary files /dev/null and b/assets/manage/ic_daofang.png differ diff --git a/assets/manage/ic_guoqi.png b/assets/manage/ic_guoqi.png new file mode 100644 index 0000000..63411a1 Binary files /dev/null and b/assets/manage/ic_guoqi.png differ diff --git a/assets/manage/ic_wancheng.png b/assets/manage/ic_wancheng.png new file mode 100644 index 0000000..8ddd70f Binary files /dev/null and b/assets/manage/ic_wancheng.png differ diff --git a/assets/manage/ic_weidao.png b/assets/manage/ic_weidao.png new file mode 100644 index 0000000..b58814d Binary files /dev/null and b/assets/manage/ic_weidao.png differ diff --git a/assets/manage/ic_zhuangxiu.png b/assets/manage/ic_zhuangxiu.png new file mode 100644 index 0000000..bb2c48a Binary files /dev/null and b/assets/manage/ic_zhuangxiu.png differ diff --git a/lib/ui/home/announcement/All_anouncement.dart b/lib/ui/home/announcement/All_anouncement.dart index 4228b4b..b4be853 100644 --- a/lib/ui/home/announcement/All_anouncement.dart +++ b/lib/ui/home/announcement/All_anouncement.dart @@ -41,6 +41,7 @@ class AllAnouncementState extends State { child: Row( children: [ Container( + alignment: Alignment.center, width: 104.w, height: 104.w, decoration: BoxDecoration( @@ -52,7 +53,7 @@ class AllAnouncementState extends State { Color(0xFF7EB4FF), Color(0xFF3F8FFE), ])), - child: Image.asset(R.ASSETS_MANAGE_IC_ANNOUNCE_PNG), + child: Image.asset(R.ASSETS_MANAGE_IC_ANNOUNCE_PNG,width: 74.w,height: 60.w,), ), SizedBox( width: 24.w, diff --git a/lib/ui/home/home_page.dart b/lib/ui/home/home_page.dart index e7a60f5..9761fe6 100644 --- a/lib/ui/home/home_page.dart +++ b/lib/ui/home/home_page.dart @@ -129,7 +129,7 @@ class _HomePageState extends State { )); } - int _currentIndicator = 0; + int _currentIndicator = 0; @override Widget build(BuildContext context) { final userProvider = Provider.of(context); @@ -395,48 +395,52 @@ class _HomePageState extends State { //公告栏 Container( color: Color(0xFFFFFFFF), - //公告栏 width: double.infinity, - height: 200.w, - child: Column( - children: [ - CarouselSlider( - items: _anouncementProvider.anouncementCardModels - .map((e) => AllAnouncementState.anounceCard(e)) - .toList(), - options: CarouselOptions( - viewportFraction: 1.0, - aspectRatio: 686 / 172, - autoPlay: true, - onPageChanged: (index, _) { - setState(() { - _currentIndicator = index; - }); - }, + height: 172.w, + child: Stack(children: [ + CarouselSlider( + items: _anouncementProvider.anouncementCardModels + .map((e) => AllAnouncementState.anounceCard(e)) + .toList(), + options: CarouselOptions( + viewportFraction: 1.0, + aspectRatio: 686 / 172, + autoPlay: true, + onPageChanged: (index, _) { + setState(() { + _currentIndicator = index; + }); + }, + ), ), - ), - Row( - mainAxisAlignment: MainAxisAlignment.center, - children: - _anouncementProvider.anouncementCardModels.map((e) { - int index = - _anouncementProvider.anouncementCardModels.indexOf(e); - return Container( - width: 8.w, - height: 8.w, - margin: EdgeInsets.symmetric( - vertical: 10.w, horizontal: 2.w), - decoration: BoxDecoration( - shape: BoxShape.circle, - color: _currentIndicator == index - ? Color.fromRGBO(0, 0, 0, 0.9) - : Color.fromRGBO(0, 0, 0, 0.4), - ), - ); - }).toList(), - ), - ], - ), + Positioned( + top: 144.w, + left: 0, + bottom: 16.w, + right: 0, + child: Row( + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: MainAxisAlignment.center, + children: + _anouncementProvider.anouncementCardModels.map((e) { + int index = _anouncementProvider.anouncementCardModels + .indexOf(e); + return Container( + width: 12.w, + height: 12.w, + margin: EdgeInsets.symmetric( + horizontal: 12.w), + decoration: BoxDecoration( + shape: BoxShape.circle, + color: _currentIndicator == index + ? Color(0xFFFFC40C) + : Color(0xFFE8E8E8), + ), + ); + }).toList(), + ), + ), + ]), ), SizedBox(height: 16.w), //待办事项标题行 diff --git a/lib/ui/manage_pages/inspection_manage/inspection_manage_card.dart b/lib/ui/manage_pages/inspection_manage/inspection_manage_card.dart index f97aee8..510088f 100644 --- a/lib/ui/manage_pages/inspection_manage/inspection_manage_card.dart +++ b/lib/ui/manage_pages/inspection_manage/inspection_manage_card.dart @@ -72,7 +72,7 @@ class InspectionManageCard { Row( children: [ Image.asset( - R.ASSETS_HOME_IC_NEWS_PNG, + R.ASSETS_INSPECTION_IC_XUNJIAN_PNG, width: 40.w, height: 40.w, ), diff --git a/lib/ui/sub_pages/decoration_manager/decoration_manager_detail_page.dart b/lib/ui/sub_pages/decoration_manager/decoration_manager_detail_page.dart index b2679ed..7cfd1f2 100644 --- a/lib/ui/sub_pages/decoration_manager/decoration_manager_detail_page.dart +++ b/lib/ui/sub_pages/decoration_manager/decoration_manager_detail_page.dart @@ -1,3 +1,5 @@ +import 'dart:math'; + import 'package:aku_community_manager/mock_models/decoration/decoration_model.dart'; import 'package:aku_community_manager/mock_models/users/user_info_model.dart'; import 'package:aku_community_manager/provider/user_provider.dart'; @@ -122,7 +124,12 @@ class _DecorationManagerDetailStatePage midBottom: widget.model.userHomeModel.detailAddr, name: '业主：' + widget.model.userHomeModel.userName, phone: widget.model.userHomeModel.phone, - rightTopWidget: Placeholder(), + rightTopWidget: Transform.rotate( + angle: pi/4, + child: widget.model.statusType == DecorationStatusType.DONE + ? Image.asset(R.ASSETS_MANAGE_IC_WANCHENG_PNG) + : Image.asset(R.ASSETS_MANAGE_IC_ZHUANGXIU_PNG), + ), ), AkuBox.h(16), _buildInfoCard( diff --git a/lib/ui/sub_pages/visitor_manager/visitor_manager_card.dart b/lib/ui/sub_pages/visitor_manager/visitor_manager_card.dart index 702427a..899ed9a 100644 --- a/lib/ui/sub_pages/visitor_manager/visitor_manager_card.dart +++ b/lib/ui/sub_pages/visitor_manager/visitor_manager_card.dart @@ -1,3 +1,5 @@ +import 'dart:math'; + import 'package:aku_community_manager/const/resource.dart'; import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/tools/widget_tool.dart'; @@ -70,7 +72,7 @@ class _VisitorManagerCardState extends State { Row( children: [ Image.asset( - R.ASSETS_USER_IC_PERSON_PNG, + R.ASSETS_OUTDOOR_IC_PEOPLE_PNG, width: 40.w, height: 40.w, ), @@ -81,7 +83,7 @@ class _VisitorManagerCardState extends State { ), AkuBox.w(137), Image.asset( - R.ASSETS_HOME_IC_BORROW_PNG, + R.ASSETS_MANAGE_IC_CAR_PNG, width: 40.w, height: 40.w, ), @@ -97,7 +99,7 @@ class _VisitorManagerCardState extends State { Row( children: [ Image.asset( - R.ASSETS_HOME_IC_ARTICLE_PNG, + R.ASSETS_MANAGE_IC_TIME_PNG, width: 40.w, height: 40.w, ), @@ -109,7 +111,13 @@ class _VisitorManagerCardState extends State { ], ), Positioned( - left: 582.w, bottom: 104.w, child: _statusImage(_status)), + left: 552.w-24.w, + bottom: 75.w-28.w, + child: Transform.rotate( + angle: pi / 4, + child: Image.asset(_statusImage(_status),width: 140.w,height: 140.w,), + ), + ), ], ), ), @@ -117,16 +125,16 @@ class _VisitorManagerCardState extends State { ); } - Widget _statusImage(VisitorStatus status) { + String _statusImage(VisitorStatus status) { switch (status) { case VisitorStatus.NOT_VISIT: - return Placeholder(); + return R.ASSETS_MANAGE_IC_WEIDAO_PNG; case VisitorStatus.VISIT_DONE: - return Placeholder(); + return R.ASSETS_MANAGE_IC_DAOFANG_PNG; case VisitorStatus.OUTDATE: - return Placeholder(); + return R.ASSETS_MANAGE_IC_GUOQI_PNG; default: - return Placeholder(); + return ''; } } }