From bee4fe33874e6ae42352217790ebb0e73d33a5d6 Mon Sep 17 00:00:00 2001 From: laiiihz Date: Thu, 1 Apr 2021 16:23:59 +0800 Subject: [PATCH 1/4] fix multi hero share the same tag --- .../widgets/my_event_card.dart | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) 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 4b64f147..01228ff8 100644 --- a/lib/ui/community/community_views/widgets/my_event_card.dart +++ b/lib/ui/community/community_views/widgets/my_event_card.dart @@ -82,21 +82,18 @@ class MyEventCard extends StatelessWidget { tag: ImgModel.first(model.imgUrl), ); }, - child: Hero( - tag: ImgModel.first(model.imgUrl), - child: Container( - clipBehavior: Clip.antiAlias, - decoration: BoxDecoration( - color: Colors.black12, - borderRadius: BorderRadius.circular(8.w), - ), - child: FadeInImage.assetNetwork( - placeholder: R.ASSETS_IMAGES_PLACEHOLDER_WEBP, - image: API.image(ImgModel.first(model.imgUrl)), - width: 152.w, - height: 152.w, - fit: BoxFit.cover, - ), + child: Container( + clipBehavior: Clip.antiAlias, + decoration: BoxDecoration( + color: Colors.black12, + borderRadius: BorderRadius.circular(8.w), + ), + child: FadeInImage.assetNetwork( + placeholder: R.ASSETS_IMAGES_PLACEHOLDER_WEBP, + image: API.image(ImgModel.first(model.imgUrl)), + width: 152.w, + height: 152.w, + fit: BoxFit.cover, ), ), ), From d0cf1b61e249af7bf00b09f66f697aaa9bf9b40b Mon Sep 17 00:00:00 2001 From: laiiihz Date: Thu, 1 Apr 2021 16:27:38 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=A8=E6=80=81=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../community/community_views/add_new_event_page.dart | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/ui/community/community_views/add_new_event_page.dart b/lib/ui/community/community_views/add_new_event_page.dart index a30c576b..efa687d4 100644 --- a/lib/ui/community/community_views/add_new_event_page.dart +++ b/lib/ui/community/community_views/add_new_event_page.dart @@ -203,12 +203,13 @@ class _AddNewEventPageState extends State { Divider(height: 1.w), 28.hb, if (widget.initTopic == null) _pickTopic(), - Align( - alignment: Alignment.centerLeft, - child: _renderTopic( - HotTopicModel(name: widget.topicName, id: widget.initTopic), + if (widget.initTopic != null) + Align( + alignment: Alignment.centerLeft, + child: _renderTopic( + HotTopicModel(name: widget.topicName, id: widget.initTopic), + ), ), - ), ], ).material(color: Colors.white), ); From 6425e6956ad945f4ac451faa3aad4e8a5fa9eaa4 Mon Sep 17 00:00:00 2001 From: laiiihz Date: Fri, 2 Apr 2021 11:15:15 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AF=9D=E9=A2=98?= =?UTF-8?q?=E5=88=97=E8=A1=A8AppBar=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/main.dart | 5 +- .../agreement_page/agreement_page.dart | 18 +--- .../agreement_page/privacy_page.dart | 18 +--- lib/pages/tab_navigator.dart | 1 + .../topic/topic_detail_page.dart | 102 +++++++++--------- .../topic/topic_sliver_header.dart | 23 +++- 6 files changed, 87 insertions(+), 80 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index 910f65aa..c4dd5d5b 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -22,7 +22,10 @@ import 'package:akuCommunity/utils/headers.dart'; void main() async { WidgetsFlutterBinding.ensureInitialized(); SystemChrome.setSystemUIOverlayStyle( - SystemUiOverlayStyle(statusBarColor: Colors.transparent), + SystemUiOverlayStyle( + statusBarColor: Colors.transparent, + systemNavigationBarColor: Colors.white, + ), ); JPush jpush = new JPush(); jpush.addEventHandler( diff --git a/lib/pages/setting_page/agreement_page/agreement_page.dart b/lib/pages/setting_page/agreement_page/agreement_page.dart index fe68afa1..5f3deb6c 100644 --- a/lib/pages/setting_page/agreement_page/agreement_page.dart +++ b/lib/pages/setting_page/agreement_page/agreement_page.dart @@ -15,14 +15,8 @@ class _AgreementPageState extends State { title: '用户协议', body: SingleChildScrollView( padding: EdgeInsets.all(16.w), - child: Column( - children: [ - Text( - '《用户协议》', - style: TextStyle(fontWeight: FontWeight.w600, fontSize: 35.w), - ), - Text( - ''' + child: Text( + ''' 欢迎您使用“小蜜蜂智慧社区”APP软件及服务！ 为使用“小蜜蜂智慧社区”APP软件（以下简称“许可软件”）及服务，您应当阅读并遵守《用户协议》（以下简称“本协议”）。请您务必审慎阅读、充分理解各条款内容，特别是免除或者限制责任的条款，以及开通或使用某项服务的单独协议，并选择接受或不接受。限制、免责条款可能以加粗形式提示您注意。 @@ -221,11 +215,9 @@ class _AgreementPageState extends State { 2020年10月21日 ''', - style: TextStyle( - fontSize: 30.w, - ), - ), - ], + style: TextStyle( + fontSize: 30.w, + ), ), ), ); diff --git a/lib/pages/setting_page/agreement_page/privacy_page.dart b/lib/pages/setting_page/agreement_page/privacy_page.dart index 4307f5ab..26176bf6 100644 --- a/lib/pages/setting_page/agreement_page/privacy_page.dart +++ b/lib/pages/setting_page/agreement_page/privacy_page.dart @@ -16,14 +16,8 @@ class _PrivacyPageState extends State { title: '隐私政策', body: SingleChildScrollView( padding: EdgeInsets.all(16.sp), - child: Column( - children: [ - Text( - '小蜜蜂智慧社区隐私政策', - style: TextStyle(fontWeight: FontWeight.w600, fontSize: 35.w), - ), - Text( - ''' + child: Text( + ''' 小蜜蜂智慧社区APP是由深圳市凯达来科技有限公司提供的一款智慧社区APP，为用户提供更好、更优、更个性化的服务是我们坚持不懈的追求，也希望通过我们提供的服务可以更方便您的生活。依据法律的规定，我们将在特定情形下收集、使用、保存和披露您的个人信息。以下条款描述了我们如何收集、使用、保存和披露您的个人信息。 本政策将帮助您了解以下内容，请根据以下目录阅读相应章节： 1.个人信息的收集 @@ -124,11 +118,9 @@ class _PrivacyPageState extends State { 深圳市凯达来科技有限公司 2020年10月20日 ''', - style: TextStyle( - fontSize: 30.w, - ), - ), - ], + style: TextStyle( + fontSize: 30.w, + ), ), ), ); diff --git a/lib/pages/tab_navigator.dart b/lib/pages/tab_navigator.dart index e249a5c1..d6870af2 100644 --- a/lib/pages/tab_navigator.dart +++ b/lib/pages/tab_navigator.dart @@ -99,6 +99,7 @@ class _TabNavigatorState extends State bottomNavigationBar: StatefulBuilder(builder: (context, setFunc) { return BottomNavigationBar( items: _bottomNav, + backgroundColor: Colors.white, currentIndex: _currentIndex, selectedFontSize: 20.sp, unselectedFontSize: 20.sp, 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 96030d89..a364d232 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,5 @@ import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:get/get.dart'; @@ -31,57 +32,60 @@ class _TopicDetailPageState extends State { @override Widget build(BuildContext context) { - return Scaffold( - floatingActionButton: FloatingActionButton( - heroTag: 'event_add', - onPressed: () async { - if (LoginUtil.isNotLogin) return; - bool result = await Get.to(() => AddNewEventPage.topic( - topicName: widget.model.summary, - initTopic: widget.model.id, - )); - }, - child: Icon(Icons.add), - ), - body: BeeListView( - convert: (model) { - return model.tableList - .map((e) => EventItemModel.fromJson(e)) - .toList(); - }, - path: API.community.eventByTopicId, - extraParams: {'gambitId': widget.model.id}, - controller: _refreshController, - builder: (items) { - return CustomScrollView( - slivers: [ - SliverPersistentHeader( - delegate: TopicSliverHeader( - id: widget.model.id, - title: widget.model.summary, - imgPath: widget.model.firstImg, - subTitle: widget.model.content, + return AnnotatedRegion( + value: SystemUiOverlayStyle.light, + child: Scaffold( + floatingActionButton: FloatingActionButton( + heroTag: 'event_add', + onPressed: () async { + if (LoginUtil.isNotLogin) return; + bool result = await Get.to(() => AddNewEventPage.topic( + topicName: widget.model.summary, + initTopic: widget.model.id, + )); + }, + child: Icon(Icons.add), + ), + body: BeeListView( + convert: (model) { + return model.tableList + .map((e) => EventItemModel.fromJson(e)) + .toList(); + }, + path: API.community.eventByTopicId, + extraParams: {'gambitId': widget.model.id}, + controller: _refreshController, + builder: (items) { + return CustomScrollView( + slivers: [ + SliverPersistentHeader( + delegate: TopicSliverHeader( + id: widget.model.id, + title: widget.model.summary, + imgPath: widget.model.firstImg, + subTitle: widget.model.content, + ), + pinned: true, + floating: true, ), - pinned: true, - floating: true, - ), - SliverList( - delegate: SliverChildBuilderDelegate( - (context, index) { - final item = items[index] as EventItemModel; - return ChatCard( - model: item, - onDelete: () { - _refreshController.callRefresh(); - }, - ); - }, - childCount: items.length, + SliverList( + delegate: SliverChildBuilderDelegate( + (context, index) { + final item = items[index] as EventItemModel; + return ChatCard( + model: item, + onDelete: () { + _refreshController.callRefresh(); + }, + ); + }, + childCount: items.length, + ), ), - ), - ], - ); - }, + ], + ); + }, + ), ), ); } diff --git a/lib/ui/community/community_views/topic/topic_sliver_header.dart b/lib/ui/community/community_views/topic/topic_sliver_header.dart index 94c0ca76..70091296 100644 --- a/lib/ui/community/community_views/topic/topic_sliver_header.dart +++ b/lib/ui/community/community_views/topic/topic_sliver_header.dart @@ -26,7 +26,7 @@ class TopicSliverHeader extends SliverPersistentHeaderDelegate { top: 0, bottom: 0, child: Material( - color: Colors.white.withOpacity(0 + 0.5 * _offset(shrinkOffset)), + color: Colors.black.withOpacity(0 + 0.5 * _offset(shrinkOffset)), ), ); } @@ -35,7 +35,7 @@ class TopicSliverHeader extends SliverPersistentHeaderDelegate { return Positioned( left: 0, top: ScreenUtil().statusBarHeight, - child: BeeBackButton().material( + child: BeeBackButton(color: Colors.white).material( color: Colors.transparent, clipBehavior: Clip.antiAlias, borderRadius: BorderRadius.circular(24), @@ -47,7 +47,7 @@ class TopicSliverHeader extends SliverPersistentHeaderDelegate { return Positioned( bottom: 202.w - 195.w * _filterOffset(shrinkOffset), left: 32.w + (95.w - 32.w) * _offset(shrinkOffset), - child: '#$title'.text.bold.size(52.sp).make(), + child: '#$title'.text.bold.white.size(52.sp).make(), ); } @@ -57,7 +57,15 @@ class TopicSliverHeader extends SliverPersistentHeaderDelegate { left: 32.w, child: Opacity( opacity: 1 - _offset(shrinkOffset), - child: subTitle.text.size(24.sp).make(), + child: SizedBox( + width: 500.w, + child: subTitle.text + .size(24.sp) + .maxLines(2) + .white + .overflow(TextOverflow.ellipsis) + .make(), + ), ), ); } @@ -78,6 +86,13 @@ class TopicSliverHeader extends SliverPersistentHeaderDelegate { fit: BoxFit.cover, ), ), + Positioned( + left: 0, + right: 0, + top: 0, + bottom: 0, + child: Material(color: Colors.black.withOpacity(0.4)), + ), _buildOverlay(shrinkOffset), _buildBackButton(), _buildTitle(shrinkOffset), From 6baeb68cbf1b63c964ebf990cbca79695626e562 Mon Sep 17 00:00:00 2001 From: laiiihz Date: Fri, 2 Apr 2021 11:50:31 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E5=A4=B4=E5=83=8F=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/constants/app_theme.dart | 8 ++++ lib/model/message/comment_message_model.dart | 46 ++++++------------- .../comment_message/comment_message_page.dart | 7 ++- .../topic/topic_detail_page.dart | 3 +- lib/ui/community/notice/notice_card.dart | 2 +- lib/ui/home/home_notification.dart | 7 ++- 6 files changed, 35 insertions(+), 38 deletions(-) diff --git a/lib/constants/app_theme.dart b/lib/constants/app_theme.dart index 25244a9e..475a4d21 100644 --- a/lib/constants/app_theme.dart +++ b/lib/constants/app_theme.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; @@ -108,3 +109,10 @@ class AppTheme { ); } } + +class SystemStyle { + static const lightStatusBar = SystemUiOverlayStyle( + statusBarIconBrightness: Brightness.light, + systemNavigationBarColor: Colors.white, + ); +} diff --git a/lib/model/message/comment_message_model.dart b/lib/model/message/comment_message_model.dart index e9e7cbde..fe66c058 100644 --- a/lib/model/message/comment_message_model.dart +++ b/lib/model/message/comment_message_model.dart @@ -1,3 +1,5 @@ +import 'package:akuCommunity/model/common/img_model.dart'; + class CommentMessageModel { int id; int gambitThemeId; @@ -8,7 +10,8 @@ class CommentMessageModel { int sendStatus; String createName; String createDate; - List imgUrls; + List imgUrls; + List headSculpture; CommentMessageModel( {this.id, @@ -20,7 +23,8 @@ class CommentMessageModel { this.sendStatus, this.createName, this.createDate, - this.imgUrls}); + this.imgUrls, + this.headSculpture}); CommentMessageModel.fromJson(Map json) { id = json['id']; @@ -33,9 +37,15 @@ class CommentMessageModel { createName = json['createName']; createDate = json['createDate']; if (json['imgUrls'] != null) { - imgUrls = new List(); + imgUrls = []; json['imgUrls'].forEach((v) { - imgUrls.add(new ImgUrls.fromJson(v)); + imgUrls.add(new ImgModel.fromJson(v)); + }); + } + if (json['headSculpture'] != null) { + headSculpture = []; + json['headSculpture'].forEach((v) { + headSculpture.add(new ImgModel.fromJson(v)); }); } } @@ -57,31 +67,3 @@ class CommentMessageModel { return data; } } - -class ImgUrls { - String url; - String size; - int longs; - int paragraph; - int sort; - - ImgUrls({this.url, this.size, this.longs, this.paragraph, this.sort}); - - ImgUrls.fromJson(Map json) { - url = json['url']; - size = json['size']; - longs = json['longs']; - paragraph = json['paragraph']; - sort = json['sort']; - } - - Map toJson() { - final Map data = new Map(); - data['url'] = this.url; - data['size'] = this.size; - data['longs'] = this.longs; - data['paragraph'] = this.paragraph; - data['sort'] = this.sort; - return data; - } -} 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 65e14a77..989c8192 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,3 +1,4 @@ +import 'package:akuCommunity/model/common/img_model.dart'; import 'package:flutter/material.dart'; import 'package:flustars/flustars.dart'; @@ -56,7 +57,8 @@ class _CommentMessagePageState extends State { clipBehavior: Clip.antiAlias, child: FadeInImage.assetNetwork( placeholder: R.ASSETS_IMAGES_PLACEHOLDER_WEBP, - image: model.imgUrls.first.url, + image: API.image(ImgModel.first(model.headSculpture)), + fit: BoxFit.cover, ), ), 10.wb, @@ -85,7 +87,8 @@ class _CommentMessagePageState extends State { height: 160.w, child: FadeInImage.assetNetwork( placeholder: R.ASSETS_IMAGES_PLACEHOLDER_WEBP, - image: model.imgUrls.first.url, + image: API.image(ImgModel.first(model.imgUrls)), + fit: BoxFit.cover, ), ), ], 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 a364d232..780c30e5 100644 --- a/lib/ui/community/community_views/topic/topic_detail_page.dart +++ b/lib/ui/community/community_views/topic/topic_detail_page.dart @@ -1,3 +1,4 @@ +import 'package:akuCommunity/constants/app_theme.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; @@ -33,7 +34,7 @@ class _TopicDetailPageState extends State { @override Widget build(BuildContext context) { return AnnotatedRegion( - value: SystemUiOverlayStyle.light, + value: SystemStyle.lightStatusBar, child: Scaffold( floatingActionButton: FloatingActionButton( heroTag: 'event_add', diff --git a/lib/ui/community/notice/notice_card.dart b/lib/ui/community/notice/notice_card.dart index eeea3df3..1332e6bb 100644 --- a/lib/ui/community/notice/notice_card.dart +++ b/lib/ui/community/notice/notice_card.dart @@ -100,7 +100,7 @@ class NoticeCard extends StatelessWidget { tag: ImgModel.first(model.imgUrls), child: FadeInImage.assetNetwork( placeholder: R.ASSETS_IMAGES_PLACEHOLDER_WEBP, - image: ImgModel.first(model.imgUrls), + image: API.image(ImgModel.first(model.imgUrls)), width: 152.w, height: 152.w, fit: BoxFit.cover, diff --git a/lib/ui/home/home_notification.dart b/lib/ui/home/home_notification.dart index a2f44d7c..6bfd702b 100644 --- a/lib/ui/home/home_notification.dart +++ b/lib/ui/home/home_notification.dart @@ -19,7 +19,6 @@ class HomeNotification extends StatefulWidget { } class _HomeNotificationState extends State { - @override Widget build(BuildContext context) { return Row( @@ -38,8 +37,12 @@ class _HomeNotificationState extends State { alignment: Alignment.centerLeft, height: 85.w, child: AnimatedTextKit( + pause: Duration(milliseconds: 2000), animatedTexts: widget.items - .map((e) => RotateAnimatedText(e.title)) + .map((e) => RotateAnimatedText( + e.title, + duration: Duration(milliseconds: 3000), + )) .toList(), repeatForever: true, ),