hmxc
章文轩 3 years ago
parent 57bd25f384
commit 0e9e9109d9

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 398 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 545 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 580 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 204 KiB

@ -218,6 +218,9 @@ class R {
static const String ASSETS_ICONS_FIRE_ALARM_PNG = static const String ASSETS_ICONS_FIRE_ALARM_PNG =
'assets/icons/fire_alarm.png'; 'assets/icons/fire_alarm.png';
/// ![preview](file:///Users/datang/aku_community/assets/icons/func_all.png)
static const String ASSETS_ICONS_FUNC_ALL_PNG = 'assets/icons/func_all.png';
/// ![preview](file:///Users/datang/aku_community/assets/icons/func_bmdh.png) /// ![preview](file:///Users/datang/aku_community/assets/icons/func_bmdh.png)
static const String ASSETS_ICONS_FUNC_BMDH_PNG = 'assets/icons/func_bmdh.png'; static const String ASSETS_ICONS_FUNC_BMDH_PNG = 'assets/icons/func_bmdh.png';
@ -339,6 +342,10 @@ class R {
static const String ASSETS_ICONS_ICON_CHANGE_LIST_PNG = static const String ASSETS_ICONS_ICON_CHANGE_LIST_PNG =
'assets/icons/icon_change_list.png'; 'assets/icons/icon_change_list.png';
/// ![preview](file:///Users/datang/aku_community/assets/icons/icon_comment.png)
static const String ASSETS_ICONS_ICON_COMMENT_PNG =
'assets/icons/icon_comment.png';
/// ![preview](file:///Users/datang/aku_community/assets/icons/icon_community_push.png) /// ![preview](file:///Users/datang/aku_community/assets/icons/icon_community_push.png)
static const String ASSETS_ICONS_ICON_COMMUNITY_PUSH_PNG = static const String ASSETS_ICONS_ICON_COMMUNITY_PUSH_PNG =
'assets/icons/icon_community_push.png'; 'assets/icons/icon_community_push.png';
@ -426,6 +433,10 @@ class R {
static const String ASSETS_ICONS_ICON_MY_CARSEAT_PNG = static const String ASSETS_ICONS_ICON_MY_CARSEAT_PNG =
'assets/icons/icon_my_carSeat.png'; 'assets/icons/icon_my_carSeat.png';
/// ![preview](file:///Users/datang/aku_community/assets/icons/icon_my_edit.png)
static const String ASSETS_ICONS_ICON_MY_EDIT_PNG =
'assets/icons/icon_my_edit.png';
/// ![preview](file:///Users/datang/aku_community/assets/icons/icon_my_house.png) /// ![preview](file:///Users/datang/aku_community/assets/icons/icon_my_house.png)
static const String ASSETS_ICONS_ICON_MY_HOUSE_PNG = static const String ASSETS_ICONS_ICON_MY_HOUSE_PNG =
'assets/icons/icon_my_house.png'; 'assets/icons/icon_my_house.png';
@ -478,10 +489,26 @@ class R {
static const String ASSETS_ICONS_ICON_SETTING_PNG = static const String ASSETS_ICONS_ICON_SETTING_PNG =
'assets/icons/icon_setting.png'; 'assets/icons/icon_setting.png';
/// ![preview](file:///Users/datang/aku_community/assets/icons/icon_thumbsUp.png)
static const String ASSETS_ICONS_ICON_THUMBSUP_PNG =
'assets/icons/icon_thumbsUp.png';
/// ![preview](file:///Users/datang/aku_community/assets/icons/icon_toTop.png) /// ![preview](file:///Users/datang/aku_community/assets/icons/icon_toTop.png)
static const String ASSETS_ICONS_ICON_TOTOP_PNG = static const String ASSETS_ICONS_ICON_TOTOP_PNG =
'assets/icons/icon_toTop.png'; 'assets/icons/icon_toTop.png';
/// ![preview](file:///Users/datang/aku_community/assets/icons/icon_topic_first.png)
static const String ASSETS_ICONS_ICON_TOPIC_FIRST_PNG =
'assets/icons/icon_topic_first.png';
/// ![preview](file:///Users/datang/aku_community/assets/icons/icon_topic_second.png)
static const String ASSETS_ICONS_ICON_TOPIC_SECOND_PNG =
'assets/icons/icon_topic_second.png';
/// ![preview](file:///Users/datang/aku_community/assets/icons/icon_topic_third.png)
static const String ASSETS_ICONS_ICON_TOPIC_THIRD_PNG =
'assets/icons/icon_topic_third.png';
/// ![preview](file:///Users/datang/aku_community/assets/icons/img_add.png) /// ![preview](file:///Users/datang/aku_community/assets/icons/img_add.png)
static const String ASSETS_ICONS_IMG_ADD_PNG = 'assets/icons/img_add.png'; static const String ASSETS_ICONS_IMG_ADD_PNG = 'assets/icons/img_add.png';
@ -850,6 +877,9 @@ class R {
/// ![preview](file:///Users/datang/aku_community/assets/images/mine_bg.png) /// ![preview](file:///Users/datang/aku_community/assets/images/mine_bg.png)
static const String ASSETS_IMAGES_MINE_BG_PNG = 'assets/images/mine_bg.png'; static const String ASSETS_IMAGES_MINE_BG_PNG = 'assets/images/mine_bg.png';
/// ![preview](file:///Users/datang/aku_community/assets/images/my_bg.png)
static const String ASSETS_IMAGES_MY_BG_PNG = 'assets/images/my_bg.png';
/// ![preview](file:///Users/datang/aku_community/assets/images/notice.png) /// ![preview](file:///Users/datang/aku_community/assets/images/notice.png)
static const String ASSETS_IMAGES_NOTICE_PNG = 'assets/images/notice.png'; static const String ASSETS_IMAGES_NOTICE_PNG = 'assets/images/notice.png';

@ -124,7 +124,7 @@ class _HomePageState extends State<HomePage>
end: -4.w, end: -4.w,
), ),
badgeContent: Text( badgeContent: Text(
(sum).toString(), (sum>99?99:sum).toString(),
style: TextStyle(color: Colors.white, fontSize: 20.sp), style: TextStyle(color: Colors.white, fontSize: 20.sp),
), ),
child: GestureDetector( child: GestureDetector(
@ -511,12 +511,12 @@ class _HomePageState extends State<HomePage>
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
getFunctionBtn( getFunctionBtn(
'报事报修', R.ASSETS_ICONS_ICON_MAIN_FIX_PNG, () => FixedSubmitPage()), '报事报修', R.ASSETS_ICONS_FUNC_BSBX_PNG, () => FixedSubmitPage()),
getFunctionBtn('设施预约', R.ASSETS_ICONS_ICON_MAIN_SUBSCRIBE_PNG, getFunctionBtn('设施预约', R.ASSETS_ICONS_FUNC_SSYY_PNG,
() => FacilityAppointmentPage()), () => FacilityAppointmentPage()),
getFunctionBtn('生活缴费', R.ASSETS_ICONS_ICON_MAIN_PAY_PNG, getFunctionBtn('生活缴费', R.ASSETS_ICONS_FUNC_SHJF_PNG,
() => LifePayChoosePage()), () => LifePayChoosePage()),
getFunctionBtn('全部应用', R.ASSETS_ICONS_ICON_MAIN_ALL_PNG, getFunctionBtn('全部应用', R.ASSETS_ICONS_FUNC_ALL_PNG,
() => AllApplicationPage()), () => AllApplicationPage()),
], ],
); );

@ -331,13 +331,9 @@ class _PersonalIndexState extends State<PersonalIndex>
alignment: Alignment.topCenter, alignment: Alignment.topCenter,
decoration: BoxDecoration( decoration: BoxDecoration(
gradient: LinearGradient( image: DecorationImage(
begin: Alignment.topCenter, image: AssetImage(R.ASSETS_IMAGES_MY_BG_PNG),
end: Alignment.bottomCenter, fit: BoxFit.cover,
colors: <Color>[
Color(0xFFF9D57A),
Color(0xFFF9D57A),
],
), ),
), ),
padding: EdgeInsets.only(top: 100.w), padding: EdgeInsets.only(top: 100.w),
@ -467,7 +463,7 @@ class _PersonalIndexState extends State<PersonalIndex>
), ),
Padding( Padding(
padding: EdgeInsets.only(top: 289.w), padding: EdgeInsets.only(top: 350.w),
child: Column( child: Column(
children: [ children: [

@ -153,11 +153,11 @@ class _AddNewEventPageState extends State<AddNewEventPage> {
appBar: AppBar( appBar: AppBar(
backgroundColor: Colors.white, backgroundColor: Colors.white,
elevation: 0, elevation: 0,
leading: MaterialButton( // leading: MaterialButton(
padding: EdgeInsets.zero, // padding: EdgeInsets.zero,
onPressed: Get.back, // onPressed: Get.back,
child: '取消'.text.size(34.sp).make(), // child: '取消'.text.size(34.sp).make(),
), // ),
leadingWidth: 108.w, leadingWidth: 108.w,
centerTitle: true, centerTitle: true,
title: '社区'.text.make(), title: '社区'.text.make(),

@ -1,5 +1,6 @@
import 'dart:ui'; import 'dart:ui';
import 'package:aku_community/base/base_style.dart';
import 'package:aku_community/widget/bee_scaffold.dart'; import 'package:aku_community/widget/bee_scaffold.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -23,94 +24,151 @@ class TopicCommunityView extends StatefulWidget {
class TopicCommunityViewState extends State<TopicCommunityView>{ class TopicCommunityViewState extends State<TopicCommunityView>{
EasyRefreshController _refreshController = EasyRefreshController(); EasyRefreshController _refreshController = EasyRefreshController();
_buildItem(CommunityTopicModel model) { _buildItem(CommunityTopicModel model,int index) {
return MaterialButton( return GestureDetector(
padding: EdgeInsets.symmetric(horizontal: 53.w, vertical: 20.w), onTap: () {
onPressed: () {
Get.to(() => TopicDetailPage(model: model)); Get.to(() => TopicDetailPage(model: model));
}, },
child: Row( child: Container(
crossAxisAlignment: CrossAxisAlignment.start,
children: [ padding: EdgeInsets.symmetric(vertical: 20.w,horizontal: 32.w),
Hero( decoration: BoxDecoration(
// tag: "${model.firstImg}_${model.id}",
tag: model.hashCode.toString(), color: Colors.white,
child: Container( ),
clipBehavior: Clip.antiAlias, child: Row(
decoration: BoxDecoration( crossAxisAlignment: CrossAxisAlignment.start,
borderRadius: BorderRadius.circular(8.w), children: [
color: Colors.black12,
),
child: Stack( Column(
children: [ crossAxisAlignment: CrossAxisAlignment.start,
FadeInImage.assetNetwork( children: [
placeholder: R.ASSETS_IMAGES_PLACEHOLDER_WEBP, Row(
image: API.image(ImgModel.first(model.imgUrl)), children: [
height: 160.w, index<=2?Container(
width: 250.w, width: 36.w,
fit: BoxFit.cover, height: 35.w,
), clipBehavior: Clip.antiAlias,
Positioned( alignment: Alignment.center,
bottom: 0, decoration: BoxDecoration(
left: 0, image: DecorationImage(
right: 0, image: AssetImage(index==0? R.ASSETS_ICONS_ICON_TOPIC_FIRST_PNG:index==1? R.ASSETS_ICONS_ICON_TOPIC_SECOND_PNG:
child: ClipRRect( R.ASSETS_ICONS_ICON_TOPIC_THIRD_PNG),
borderRadius: BorderRadius.vertical( fit: BoxFit.cover,
bottom: Radius.circular(8.w), ),
), ),
child: BackdropFilter( child:(index+1)
filter: ImageFilter.blur(sigmaX: 5, sigmaY: 5), .text
child: ('#${model.summary}') .white
.text .size(24.sp)
.center .bold
.size(28.sp) .make(),
.white
.make() ):Container(
.material(color: Colors.black26), width: 32.w,
height: 32.w,
clipBehavior: Clip.antiAlias,
alignment: Alignment.center,
decoration: BoxDecoration(
color: Color(0xFFC4C4C4),
borderRadius: BorderRadius.all(Radius.circular(4.w)),
), ),
child:(index+1)
.text
.white
.size(24.sp)
.bold
.make(),
), ),
), 15.wb,
],
), Container(
), width: 400.w,
), child:('#'+model.summary!)
12.wb, .text
Column( .maxLines(1)
crossAxisAlignment: CrossAxisAlignment.start, .size(30.sp)
children: [ .bold
(model.title ?? '') .isIntrinsic
.text .overflow(TextOverflow.ellipsis)
.maxLines(2) .make(),
.size(28.sp) )
.bold
.overflow(TextOverflow.ellipsis) ],
.make(),
(model.content ?? '')
.text
.maxLines(1)
.size(22.sp)
.color(Color(0xFF666666))
.overflow(TextOverflow.ellipsis)
.make(),
21.hb,
[
Spacer(),
Image.asset(
R.ASSETS_ICONS_HOT_FIRE_PNG,
height: 24.w,
width: 24.w,
), ),
12.wb, 20.hb,
'${model.activityNum}' (model.content ?? '')
.text .text
.maxLines(1) .maxLines(2)
.size(22.sp) .size(22.sp)
.color(Color(0xFF666666))
.overflow(TextOverflow.ellipsis) .overflow(TextOverflow.ellipsis)
.make() .make(),
].row(), 21.hb,
], [
).box.make().expand(), Spacer(),
], Image.asset(
R.ASSETS_ICONS_HOT_FIRE_PNG,
height: 24.w,
width: 24.w,
),
12.wb,
'${model.activityNum}'
.text
.maxLines(1)
.size(22.sp)
.overflow(TextOverflow.ellipsis)
.make()
].row(),
],
).box.make().expand(),
12.wb,
Hero(
// tag: "${model.firstImg}_${model.id}",
tag: model.hashCode.toString(),
child: Container(
clipBehavior: Clip.antiAlias,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8.w),
color: Colors.black12,
),
child: Stack(
children: [
FadeInImage.assetNetwork(
placeholder: R.ASSETS_IMAGES_PLACEHOLDER_WEBP,
image: API.image(ImgModel.first(model.imgUrl)),
height: 160.w,
width: 160.w,
fit: BoxFit.cover,
),
// Positioned(
// bottom: 0,
// left: 0,
// right: 0,
// child: ClipRRect(
// borderRadius: BorderRadius.vertical(
// bottom: Radius.circular(8.w),
// ),
// child: BackdropFilter(
// filter: ImageFilter.blur(sigmaX: 5, sigmaY: 5),
// child: ('#${model.summary}')
// .text
// .center
// .size(28.sp)
// .white
// .make()
// .material(color: Colors.black26),
// ),
// ),
// ),
],
),
),
),
],
),
), ),
); );
} }
@ -119,7 +177,7 @@ class TopicCommunityViewState extends State<TopicCommunityView>{
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BeeScaffold( return BeeScaffold(
title: '所有话题', title: '所有话题'.text.color(ktextPrimary).size(32.sp).normal.make(),
body:BeeListView<CommunityTopicModel>( body:BeeListView<CommunityTopicModel>(
path: API.community.topicList, path: API.community.topicList,
controller: _refreshController, controller: _refreshController,
@ -130,8 +188,10 @@ class TopicCommunityViewState extends State<TopicCommunityView>{
}, },
builder: (items) { builder: (items) {
return ListView.separated( return ListView.separated(
padding: EdgeInsets.only(top: 20.w),
itemBuilder: (context, index) { itemBuilder: (context, index) {
return _buildItem(items[index]); return _buildItem(items[index],index
);
}, },
separatorBuilder: (_, __) => 20.hb, separatorBuilder: (_, __) => 20.hb,
itemCount: items.length, itemCount: items.length,

@ -2,7 +2,7 @@ name: aku_community
description: A new Flutter project. description: A new Flutter project.
publish_to: "none" publish_to: "none"
version: 1.8.5-dev+48 version: 1.8.9-dev+49
environment: environment:
sdk: ">=2.12.0 <3.0.0" sdk: ">=2.12.0 <3.0.0"

Loading…
Cancel
Save