1281228557
/
aku_new_community
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: 1281228557:17e136b20c6f8008dc19489fd6eb145744cec9df
Branches Tags
1281228557:master
1281228557:newHost
1281228557:hmxc
..
compare: 1281228557:c66fbdb811358d1a152a9366501e9b8bdf37d87a
Branches Tags
1281228557:master
1281228557:newHost
1281228557:hmxc

No commits in common. '17e136b20c6f8008dc19489fd6eb145744cec9df' and 'c66fbdb811358d1a152a9366501e9b8bdf37d87a' have entirely different histories.
17e136b20c ... c66fbdb811

9 changed files with 183 additions and 202 deletions
Show Stats

5
lib/gen/assets.gen.dart
Unescape View File

@ -1297,6 +1297,10 @@ class $AssetsImagesGen {
AssetGenImage get wxpay => const AssetGenImage('assets/images/wxpay.png'); AssetGenImage get wxpay => const AssetGenImage('assets/images/wxpay.png');
} }
class $AssetsJsonGen {
const $AssetsJsonGen();
}
class $AssetsNewIconGen { class $AssetsNewIconGen {
const $AssetsNewIconGen(); const $AssetsNewIconGen();
@ -1529,6 +1533,7 @@ class Assets {
static const $AssetsHomeGen home = $AssetsHomeGen(); static const $AssetsHomeGen home = $AssetsHomeGen();
static const $AssetsIconsGen icons = $AssetsIconsGen(); static const $AssetsIconsGen icons = $AssetsIconsGen();
static const $AssetsImagesGen images = $AssetsImagesGen(); static const $AssetsImagesGen images = $AssetsImagesGen();
static const $AssetsJsonGen json = $AssetsJsonGen();
static const $AssetsNewIconGen newIcon = $AssetsNewIconGen(); static const $AssetsNewIconGen newIcon = $AssetsNewIconGen();
static const $AssetsStaticGen static = $AssetsStaticGen(); static const $AssetsStaticGen static = $AssetsStaticGen();
static const $AssetsTabGen tab = $AssetsTabGen(); static const $AssetsTabGen tab = $AssetsTabGen();

4
lib/models/message/reply_list_model.dart
Unescape View File

@ -7,9 +7,8 @@ part 'reply_list_model.g.dart';
@JsonSerializable() @JsonSerializable()
class ReplyListModel { class ReplyListModel {
final int id; final int id;
final int type;
final int status; final int status;
final String? content; final String content;
final int sendId; final int sendId;
final String sendName; final String sendName;
final String sendDate; final String sendDate;
@ -27,7 +26,6 @@ class ReplyListModel {
const ReplyListModel({ const ReplyListModel({
required this.id, required this.id,
required this.type,
required this.status, required this.status,
required this.content, required this.content,
required this.sendId, required this.sendId,

3
lib/models/message/reply_list_model.g.dart
Unescape View File

@ -9,9 +9,8 @@ part of 'reply_list_model.dart';
ReplyListModel _$ReplyListModelFromJson(Map<String, dynamic> json) => ReplyListModel _$ReplyListModelFromJson(Map<String, dynamic> json) =>
ReplyListModel( ReplyListModel(
id: json['id'] as int, id: json['id'] as int,
type: json['type'] as int,
status: json['status'] as int, status: json['status'] as int,
content: json['content'] !=null? json['content'] as String:'', content: json['content'] as String,
sendId: json['sendId'] as int, sendId: json['sendId'] as int,
sendName: json['sendName'] as String, sendName: json['sendName'] as String,
sendDate: json['sendDate'] as String, sendDate: json['sendDate'] as String,

35
lib/pages/message_center_page/message_center_page.dart
Unescape View File

@ -47,8 +47,6 @@ class _MessageCenterPageState extends State<MessageCenterPage>
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BeeScaffold( return BeeScaffold(
bgColor: Colors.white,
bodyColor: Color(0xFFF9F9F9),
title: '消息', title: '消息',
actions: [ actions: [
MaterialButton( MaterialButton(
@ -67,28 +65,21 @@ class _MessageCenterPageState extends State<MessageCenterPage>
padding: EdgeInsets.symmetric(horizontal: 32.w), padding: EdgeInsets.symmetric(horizontal: 32.w),
), ),
], ],
appBarBottom: appBarBottom: BeeTabBar(
TabBar(
controller: _tabController, controller: _tabController,
indicatorColor: Color(0xffffc40c), tabs: _tabs,
tabs: _tabs.map((e) => Tab(text: e)).toList(),
indicatorPadding: EdgeInsets.only(bottom: 15.w,left: 35.w,right: 35.w),
), ),
body: body: TabBarView(
Padding( children: [
padding: EdgeInsets.only(top: 10.w), ReplayView(
child: TabBarView( controller: _controllers[0],
children: [ ),
ReplayView( ThumbsUpView(
controller: _controllers[0], controller: _controllers[1],
), ),
ThumbsUpView( AnnounceView(),
controller: _controllers[1], ],
), controller: _tabController,
AnnounceView(),
],
controller: _tabController,
),
), ),
); );
} }

4
lib/pages/message_center_page/reply/replay_view.dart
Unescape View File

@ -38,9 +38,7 @@ class _ReplayViewState extends State<ReplayView> {
itemBuilder: (context, index) { itemBuilder: (context, index) {
return ReplyCard(model: items[index]); return ReplyCard(model: items[index]);
}, },
separatorBuilder: (_, __) =>Container( separatorBuilder: (_, __) =>1.w.heightBox,
color: Color(0xFFF0F0F0),height: 2.w,
),
itemCount: items.length); itemCount: items.length);
}); });
} }

8
lib/pages/message_center_page/reply/reply_card.dart
Unescape View File

@ -42,13 +42,7 @@ class ReplyCard extends StatelessWidget {
children: [ children: [
model.sendName.text.size(26.sp).black.bold.make(), model.sendName.text.size(26.sp).black.bold.make(),
5.heightBox, 5.heightBox,
model.content==null?''.text model.content.text
.size(26.sp)
.color(ktextSubColor)
.maxLines(1)
.ellipsis
.make():
(model.content!).text
.size(26.sp) .size(26.sp)
.color(ktextSubColor) .color(ktextSubColor)
.maxLines(1) .maxLines(1)

5
lib/pages/message_center_page/thumbs_up/thumbs_up_card.dart
Unescape View File

@ -1,6 +1,5 @@
import 'package:aku_new_community/base/base_style.dart'; import 'package:aku_new_community/base/base_style.dart';
import 'package:aku_new_community/gen/assets.gen.dart'; import 'package:aku_new_community/gen/assets.gen.dart';
import 'package:aku_new_community/models/message/reply_list_model.dart';
import 'package:aku_new_community/models/message/thumbs_up_list_model.dart'; import 'package:aku_new_community/models/message/thumbs_up_list_model.dart';
import 'package:aku_new_community/pages/message_center_page/message_func.dart'; import 'package:aku_new_community/pages/message_center_page/message_func.dart';
import 'package:aku_new_community/widget/beeImageNetwork.dart'; import 'package:aku_new_community/widget/beeImageNetwork.dart';
@ -9,7 +8,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:velocity_x/velocity_x.dart'; import 'package:velocity_x/velocity_x.dart';
class ThumbsUpCard extends StatelessWidget { class ThumbsUpCard extends StatelessWidget {
final ReplyListModel model; final ThumbsUpListModel model;
const ThumbsUpCard({Key? key, required this.model}) : super(key: key); const ThumbsUpCard({Key? key, required this.model}) : super(key: key);
@ -37,10 +36,8 @@ class ThumbsUpCard extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
model.sendName.text.size(26.sp).black.bold.make(), model.sendName.text.size(26.sp).black.bold.make(),
5.heightBox,
Assets.icons.communityLikeIs Assets.icons.communityLikeIs
.image(width: 28.w, height: 28.w, fit: BoxFit.contain), .image(width: 28.w, height: 28.w, fit: BoxFit.contain),
5.heightBox,
model.sendDate.text.size(24.sp).color(ktextSubColor).make(), model.sendDate.text.size(24.sp).color(ktextSubColor).make(),
], ],
), ),

320
lib/ui/community/community_views/event_detail_page.dart
Unescape View File

@ -300,134 +300,134 @@ class _EventDetailPageState extends State<EventDetailPage> {
} }
Widget _commentWidget(CommentListModel model, int rootIndex) { Widget _commentWidget(CommentListModel model, int rootIndex) {
return GestureDetector( return Container(
onTap: () { // key: UniqueKey(),
_rootId = model.id; color: Colors.white,
_parentId = model.id; padding: EdgeInsets.symmetric(vertical: 32.w, horizontal: 32.w),
_focusNode.requestFocus(); width: double.infinity,
_currentCommentIndex = rootIndex; child: Column(
}, crossAxisAlignment: CrossAxisAlignment.start,
child: Container( children: [
// key: UniqueKey(), [
color: Colors.white, Material(
padding: EdgeInsets.symmetric(vertical: 32.w, horizontal: 32.w), color: Color(0xFFF5F5F5),
width: double.infinity, borderRadius: BorderRadius.circular(48.w),
child: Column( clipBehavior: Clip.antiAlias,
crossAxisAlignment: CrossAxisAlignment.start, child: FadeInImage.assetNetwork(
children: [ placeholder: R.ASSETS_IMAGES_PLACEHOLDER_WEBP,
[ image: SAASAPI.image(ImgModel.first(model.avatarImgList)),
Material( height: 96.w,
color: Color(0xFFF5F5F5), width: 96.w,
borderRadius: BorderRadius.circular(48.w), fit: BoxFit.cover,
clipBehavior: Clip.antiAlias, imageErrorBuilder: (context, error, stackTrace) {
child: FadeInImage.assetNetwork( return Image.asset(
placeholder: R.ASSETS_IMAGES_PLACEHOLDER_WEBP, R.ASSETS_IMAGES_PLACEHOLDER_WEBP,
image: SAASAPI.image(ImgModel.first(model.avatarImgList)), height: 86.w,
height: 96.w, width: 86.w,
width: 96.w, );
fit: BoxFit.cover, },
imageErrorBuilder: (context, error, stackTrace) {
return Image.asset(
R.ASSETS_IMAGES_PLACEHOLDER_WEBP,
height: 86.w,
width: 86.w,
);
},
),
),
20.wb,
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
model.createName,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: Colors.black.withOpacity(0.85),
fontSize: 30.sp,
fontWeight: FontWeight.w500),
),
12.hb,
BeeDateUtil(DateUtil.getDateTime(model.createDate))
.timeAgoWithHm
.text
.size(24.sp)
.color(Color(0xFF999999))
.make(),
],
), ),
Spacer(), ),
CommunityPopButton( 20.wb,
isMyself: _isMyself, Column(
onSelect: (value) async { crossAxisAlignment: CrossAxisAlignment.start,
if (_isMyself) { children: [
await CommunityFunc.deleteComment(model.id); Text(
_refreshController.callRefresh(); model.createName,
} maxLines: 1,
}) overflow: TextOverflow.ellipsis,
].row(), style: TextStyle(
40.hb, color: Colors.black.withOpacity(0.85),
model.content.text.size(28.sp).color(ktextSubColor).make(), fontSize: 30.sp,
30.hb, fontWeight: FontWeight.w500),
GestureDetector( ),
onTap: () async { 12.hb,
var res = BeeDateUtil(DateUtil.getDateTime(model.createDate))
await NetUtil().get(SAASAPI.community.commentLike, params: { .timeAgoWithHm
'commentId': model.id, .text
}); .size(24.sp)
if (res.success) { .color(Color(0xFF999999))
_likes[rootIndex] = !_likes[rootIndex]; .make(),
setState(() {}); ],
} ),
}, Spacer(),
child: Row( CommunityPopButton(
children: [ isMyself: _isMyself,
Spacer(), onSelect: (value) async {
GestureDetector( if (_isMyself) {
onTap: () async { await CommunityFunc.deleteComment(model.id);
var base = await NetUtil().get( _refreshController.callRefresh();
SAASAPI.community.commentLike, }
params: {'commentId': model.id}); })
if (base.success) { ].row(),
_likes[rootIndex] = !_likes[rootIndex]; 40.hb,
if (_likes[rootIndex]) { model.content.text.size(28.sp).color(ktextSubColor).make(),
_likeNums[rootIndex] += 1; 30.hb,
} else { GestureDetector(
_likeNums[rootIndex] -= 1; onTap: () async {
} var res =
BotToast.showText( await NetUtil().get(SAASAPI.community.commentLike, params: {
text: _likes[rootIndex] ? '点赞成功' : '取消点赞成功'); 'commentId': model.id,
});
if (res.success) {
_likes[rootIndex] = !_likes[rootIndex];
setState(() {});
}
},
child: Row(
children: [
Spacer(),
GestureDetector(
onTap: () async {
var base = await NetUtil().get(
SAASAPI.community.commentLike,
params: {'commentId': model.id});
if (base.success) {
_likes[rootIndex] = !_likes[rootIndex];
if (_likes[rootIndex]) {
_likeNums[rootIndex] += 1;
} else { } else {
BotToast.showText(text: base.msg); _likeNums[rootIndex] -= 1;
} }
BotToast.showText(
text: _likes[rootIndex] ? '点赞成功' : '取消点赞成功');
} else {
BotToast.showText(text: base.msg);
}
setState(() {}); setState(() {});
}, },
child: Material( child: Material(
color: Colors.transparent, color: Colors.transparent,
child: Row( child: Row(
children: [ children: [
Image.asset( Image.asset(
R.ASSETS_ICONS_COMMUNITY_LIKE_PNG, R.ASSETS_ICONS_COMMUNITY_LIKE_PNG,
width: 32.w, width: 32.w,
height: 32.w, height: 32.w,
color: !_likes[rootIndex] color: !_likes[rootIndex]
? Colors.black.withOpacity(0.45) ? Colors.black.withOpacity(0.45)
: kPrimaryColor, : kPrimaryColor,
), ),
5.wb, 5.wb,
'${_likeNums[rootIndex]}' '${_likeNums[rootIndex]}'
.text .text
.size(24.sp) .size(24.sp)
.color(Color(0xFF999999)) .color(Color(0xFF999999))
.make(), .make(),
], ],
),
), ),
), ),
32.wb, ),
Row( 32.wb,
GestureDetector(
onTap: () {
_rootId = model.id;
_parentId = model.id;
_focusNode.requestFocus();
_currentCommentIndex = rootIndex;
},
child: Row(
children: [ children: [
Image.asset( Image.asset(
R.ASSETS_ICONS_COMMUNITY_COMMENT_PNG, R.ASSETS_ICONS_COMMUNITY_COMMENT_PNG,
@ -436,46 +436,46 @@ class _EventDetailPageState extends State<EventDetailPage> {
), ),
], ],
), ),
5.wb, ),
'${model.commentNum}' 5.wb,
.text '${model.commentNum}'
.size(24.sp) .text
.color(Color(0xFF999999)) .size(24.sp)
.make(), .color(Color(0xFF999999))
], .make(),
), ],
), ),
40.hb, ),
model.commentTwoList.isEmpty 40.hb,
? SizedBox.shrink() model.commentTwoList.isEmpty
: Container( ? SizedBox.shrink()
alignment: Alignment.topLeft, : Container(
decoration: BoxDecoration( alignment: Alignment.topLeft,
color: Colors.black.withOpacity(0.06), decoration: BoxDecoration(
borderRadius: BorderRadius.circular(16.w)), color: Colors.black.withOpacity(0.06),
margin: EdgeInsets.only(left: 125.w), borderRadius: BorderRadius.circular(16.w)),
width: 600.w, margin: EdgeInsets.only(left: 125.w),
padding: width: 600.w,
EdgeInsets.symmetric(vertical: 24.w, horizontal: 32.w), padding:
child: Column( EdgeInsets.symmetric(vertical: 24.w, horizontal: 32.w),
crossAxisAlignment: CrossAxisAlignment.start, child: Column(
children: <Widget>[ crossAxisAlignment: CrossAxisAlignment.start,
...List.generate( children: <Widget>[
model.commentTwoList.length < 3 ...List.generate(
? model.commentTwoList.length model.commentTwoList.length < 3
: 3, ? model.commentTwoList.length
(index) => _subCommentWidget( : 3,
model.commentTwoList[index], (index) => _subCommentWidget(
model.createId, model.commentTwoList[index],
model.id, model.createId,
rootIndex)), model.id,
if (model.commentTwoList.length > 3) rootIndex)),
_foldComment(model, rootIndex) if (model.commentTwoList.length > 3)
].sepWidget(separate: 24.hb), _foldComment(model, rootIndex)
), ].sepWidget(separate: 24.hb),
), ),
], ),
), ],
), ),
); );
} }

1
lib/widget/bee_scaffold.dart
Unescape View File

@ -73,7 +73,6 @@ class BeeScaffold extends StatelessWidget {
actions: actions, actions: actions,
bottom: appBarBottom, bottom: appBarBottom,
titleSpacing: titleSpacing, titleSpacing: titleSpacing,
); );
return AnnotatedRegion<SystemUiOverlayStyle>( return AnnotatedRegion<SystemUiOverlayStyle>(

Write Preview
Loading…
Cancel
Save