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

Merge branch 'newHost' of https://git.oa00.com/1281228557/aku_new_community into newHost

Browse Source 
# Conflicts:
#	lib/ui/community/community_views/my_community_view.dart
#	lib/ui/community/community_views/widgets/chat_card.dart
pull/1/head
张萌 3 years ago
parent d88af28f6b e526b1ff4f
commit 242c7f3ad5
20 changed files with 197 additions and 86 deletions
Show Stats Download Patch File Download Diff File

6
lib/constants/saas_api.dart
Unescape View File

@ -158,6 +158,12 @@ class _Community {
///新鲜话题
String get topNewList => '/app/user/community/topic/newList';
///增加咨询浏览量
String get addViewNum => '/app/user/information/addViewNum';
///增加咨询浏览量
String get dynamicAddViewNum => '/app/user/community/dynamic/addViewNum';
}
class _Task {

2
lib/models/home/activity_detail_model.dart
Unescape View File

@ -26,6 +26,7 @@ class ActivityDetailModel {
final String contact;
final String tel;
final List<ImgModel> organizerImgList;
final int isRegistration;
factory ActivityDetailModel.fromJson(Map<String, dynamic> json) =>
_$ActivityDetailModelFromJson(json);
@ -55,6 +56,7 @@ class ActivityDetailModel {
required this.contact,
required this.tel,
required this.organizerImgList,
required this.isRegistration,
});
}

1
lib/models/home/activity_detail_model.g.dart
Unescape View File

@ -34,6 +34,7 @@ ActivityDetailModel _$ActivityDetailModelFromJson(Map<String, dynamic> json) =>
organizerImgList: (json['organizerImgList'] as List<dynamic>)
.map((e) => ImgModel.fromJson(e as Map<String, dynamic>))
.toList(),
isRegistration:json['isRegistration'] as int
);
Registration _$RegistrationFromJson(Map<String, dynamic> json) => Registration(

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

@ -14,6 +14,7 @@ class ReplyListModel {
final String sendDate;
final List<ImgModel> avatarImgList;
final List<ImgModel> dynamicImgList;
final int jumpId;
factory ReplyListModel.fromJson(Map<String, dynamic> json) =>
_$ReplyListModelFromJson(json);
@ -32,5 +33,6 @@ class ReplyListModel {
required this.sendDate,
required this.avatarImgList,
required this.dynamicImgList,
required this.jumpId
});
}

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

@ -20,4 +20,5 @@ ReplyListModel _$ReplyListModelFromJson(Map<String, dynamic> json) =>
dynamicImgList: (json['dynamicImgList'] as List<dynamic>)
.map((e) => ImgModel.fromJson(e as Map<String, dynamic>))
.toList(),
jumpId:json['jumpId'] as int
);

14
lib/pages/home/home_page.dart
Unescape View File

@ -21,7 +21,9 @@ import 'package:aku_new_community/ui/home/public_infomation/public_information_d
import 'package:aku_new_community/ui/manager/advice/advice_page.dart';
import 'package:aku_new_community/ui/market/search/good_detail_page.dart';
import 'package:aku_new_community/utils/headers.dart';
import 'package:aku_new_community/utils/hive_store.dart';
import 'package:aku_new_community/utils/login_util.dart';
import 'package:aku_new_community/utils/websocket/tips_dialog.dart';
import 'package:aku_new_community/widget/beeImageNetwork.dart';
import 'package:aku_new_community/widget/bee_divider.dart';
import 'package:aku_new_community/widget/others/rectIndicator.dart';
@ -353,9 +355,15 @@ class _HomePageState extends State<HomePage>
],
),
),
onTap: () {
Get.to(AdvicePage(
type: AdviceType.SUGGESTION));
onTap: () async {
var agreement = await HiveStore.appBox?.get('AdvicePage') ?? false;
if (!agreement) {
await TipsDialog.tipsDialog();
HiveStore.appBox!.put('AdvicePage', true);
}
// Get.to(AdvicePage(
// type: AdviceType.SUGGESTION));
},
),
)

80
lib/pages/message_center_page/announce/announce_card.dart
Unescape View File

@ -3,6 +3,7 @@ import 'package:aku_new_community/extensions/widget_list_ext.dart';
import 'package:aku_new_community/models/home/home_announce_model.dart';
import 'package:aku_new_community/pages/message_center_page/announce/announce_view.dart';
import 'package:aku_new_community/ui/community/notice/notice_detail_page.dart';
import 'package:aku_new_community/widget/beeImageNetwork.dart';
import 'package:common_utils/common_utils.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
@ -43,42 +44,59 @@ class AnnounceCard extends StatelessWidget {
...modelList.models
.map((e) => _card(e))
.toList()
.sepWidget(separate: 10.heightBox)
],
);
}
Widget _card(HomeAnnounceModel model) {
return Container(
color: Colors.white,
padding: EdgeInsets.symmetric(horizontal: 32.w, vertical: 24.w),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
'${DateUtil.formatDateStr(model.createDate, format: 'dd日 HH:mm')}'
.text
.size(28.sp)
.color(ktextSubColor)
.make(),
32.w.heightBox,
'${model.title}'.text.size(36.sp).black.bold.make(),
32.w.heightBox,
'${model.content}'.text.size(28.sp).color(ktextSubColor).make(),
40.w.heightBox,
Container(
height: 72.w,
decoration: BoxDecoration(
border: Border(
top: BorderSide(
color: Color(0xFF000000).withOpacity(0.06),
),
return InkWell(
onTap: () {
Get.to(() => NoticeDetailPage(id: model.id));
},
child: Container(
color: Colors.white,
padding: EdgeInsets.symmetric(horizontal: 32.w, vertical: 24.w),
margin: EdgeInsets.only(bottom: 16 .w),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
'${DateUtil.formatDateStr(model.createDate, format: 'dd日 HH:mm')}'
.text
.size(28.sp)
.color(ktextSubColor)
.make(),
32.w.heightBox,
Container(
width: double.infinity,
height: 258.w,
clipBehavior: Clip.antiAliasWithSaveLayer,
decoration: BoxDecoration(borderRadius: BorderRadius.circular(16.w)),
child: BeeImageNetwork(
imgs: model.imgList,
),
),
child: InkWell(
onTap: () {
Get.to(() => NoticeDetailPage(id: model.id));
},
32.w.heightBox,
'${model.title}'.text.size(36.sp).black.bold.make(),
32.w.heightBox,
'${model.content}'.text.maxLines(2).ellipsis.size(28.sp).color(ktextSubColor).make(),
40.w.heightBox,
Container(
height: 72.w,
decoration: BoxDecoration(
border: Border(
top: BorderSide(
color: Color(0xFF000000).withOpacity(0.06),
),
),
),
child: Row(
children: [
'查看详情'.text.size(24.w).color(ktextSubColor).make(),
@ -90,8 +108,8 @@ class AnnounceCard extends StatelessWidget {
],
),
),
),
],
],
),
),
);
}

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

@ -71,7 +71,7 @@ class _MessageCenterPageState extends State<MessageCenterPage>
),
body: TabBarView(
children: [
ReplayView(
ReplayView(
controller: _controllers[0],
),
ThumbsUpView(

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

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

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

@ -1,9 +1,11 @@
import 'package:aku_new_community/base/base_style.dart';
import 'package:aku_new_community/models/message/reply_list_model.dart';
import 'package:aku_new_community/pages/message_center_page/message_func.dart';
import 'package:aku_new_community/ui/community/community_views/event_detail_page.dart';
import 'package:aku_new_community/widget/beeImageNetwork.dart';
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import 'package:velocity_x/velocity_x.dart';
class ReplyCard extends StatelessWidget {
@ -16,9 +18,13 @@ class ReplyCard extends StatelessWidget {
return GestureDetector(
onTap: () async {
await MessageFunc.readMessage(model.id);
Get.to(() => EventDetailPage(
dynamicId: model.jumpId,
));
},
child: Container(
padding: EdgeInsets.symmetric(horizontal: 32.w, vertical: 48.w),
color: Colors.white,
child: Row(
children: [
ClipOval(
@ -35,13 +41,15 @@ class ReplyCard extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
model.sendName.text.size(26.sp).black.bold.make(),
5.heightBox,
model.content.text
.size(24.sp)
.size(26.sp)
.color(ktextSubColor)
.maxLines(1)
.ellipsis
.make(),
model.sendDate.text.size(24.sp).color(ktextSubColor).make(),
5.heightBox,
model.sendDate.text.size(22.sp).color(ktextSubColor).make(),
],
),
),

3
lib/pages/personal/clock_in/clock_in_page.dart
Unescape View File

@ -259,6 +259,7 @@ class _ClockInPageState extends State<ClockInPage> {
currentValue.signDate,
currentValue.addNums))
.toList(),
_records.length>6?
Container(
width: double.infinity,
height: 82.w,
@ -266,7 +267,7 @@ class _ClockInPageState extends State<ClockInPage> {
color: Color(0xFFE5E5E5),
child:
'没有更多记录了~'.text.size(28.sp).color(ktextSubColor).make(),
),
):SizedBox(),
].sepWidget(separate: 32.hb),
),
)

35
lib/pages/personal/personal_page.dart
Unescape View File

@ -406,7 +406,9 @@ class _PersonalIndexState extends State<PersonalIndex>
_function(
'我的房屋',
R.ASSETS_ICONS_ICON_MY_HOUSE_PNG,
() => MyHousePage(),
(){
Get.to(() => MyHousePage());
},
// () => HouseOwnersPage(
// identify: 4,
// ),
@ -415,23 +417,33 @@ class _PersonalIndexState extends State<PersonalIndex>
'${UserTool.userProvider.defaultHouse?.unitName ?? ''}'
'${UserTool.userProvider.defaultHouse?.estateName ?? ''}',
),
36.hb,
_function(
'我的家庭',
R.ASSETS_ICONS_ICON_MY_HOUSE_PNG,
() => MyFamilyPage(),
(){
Get.to(() => MyFamilyPage());
}
,
''),
36.hb,
// _function('我的车位', R.ASSETS_ICONS_ICON_MY_CARSEAT_PNG,
// () => CarParkingPage(), ''),
// 36.hb,
// _function('我的车', R.ASSETS_ICONS_ICON_MY_CAR_PNG,
// () => CarManagePage(), ''),
// 36.hb,
// _function(
// '我的访客',
// R.ASSETS_ICONS_ICON_MY_VISITOR_PNG,
// () => CarManagePage(),
// ''),
// 36.hb,
_function(
'我的访客',
R.ASSETS_ICONS_ICON_MY_VISITOR_PNG,
(){
BotToast.showText(text: '当前小区尚未连接设备', align: Alignment(0, 0.5));
}
,
''),
36.hb,
_function(
'收货地址',
R.ASSETS_ICONS_ICON_MY_LOCATION_PNG,
@ -477,13 +489,12 @@ class _PersonalIndexState extends State<PersonalIndex>
_function(
String title,
String path,
dynamic page,
VoidCallback onTap,
//dynamic page,
String msg,
) {
return GestureDetector(
onTap: () {
Get.to(page);
},
onTap: onTap,
child: Container(
color: Colors.transparent,
padding: EdgeInsets.symmetric(horizontal: 20.w, vertical: 20.w),

1
lib/ui/community/activity/activity_card.dart
Unescape View File

@ -104,6 +104,7 @@ class ActivityCard extends StatelessWidget {
(model?.avatarImgList?.map((e) => e.url).toList() ?? []),
pNum: model?.registrationNum ?? 0,
hasIcon: false,
),
),
// Spacer(),

4
lib/ui/community/activity/activity_detail_page.dart
Unescape View File

@ -1,3 +1,4 @@
import 'package:aku_new_community/base/base_style.dart';
import 'package:aku_new_community/constants/saas_api.dart';
import 'package:aku_new_community/model/common/img_model.dart';
import 'package:aku_new_community/models/home/activity_detail_model.dart';
@ -166,7 +167,7 @@ class _ActivityDetailPageState extends State<ActivityDetailPage> {
}
bool get canTap {
if (_model?.regisEndTime?.isBefore(DateTime.now()) ?? true) {
if ((_model?.regisEndTime?.isBefore(DateTime.now()) ?? true) ||_model!.isRegistration==1) {
return false;
}
return true;
@ -298,6 +299,7 @@ class _ActivityDetailPageState extends State<ActivityDetailPage> {
BeeDivider.horizontal(),
16.hb,
AvatarsParticipate(
registrationList: _model!.registrationList,
avatars: _model!.registrationList
.map((e) => ImgModel.first(e.avatarImgList))
.toList(),

41
lib/ui/community/activity/activity_people_list_page.dart
Unescape View File

@ -38,6 +38,7 @@ class _ActivityPeopleListPageState extends State<ActivityPeopleListPage> {
color: Colors.black.withOpacity(0.06),
height: 75.w,
width: double.infinity,
alignment: Alignment.center,
child: '已有'.richText.color(Colors.black.withOpacity(0.65)).size(28.sp).withTextSpanChildren([
widget.registrationList==null?''.textSpan
.size(28.sp)
@ -59,16 +60,29 @@ class _ActivityPeopleListPageState extends State<ActivityPeopleListPage> {
itemBuilder: (context, index) {
return Row(
children: [
96.hb,
132.hb,
20.wb,
FadeInImage.assetNetwork(
placeholder: R.ASSETS_IMAGES_PLACEHOLDER_WEBP,
image: SAASAPI.image(ImgModel.first(widget.registrationList![index].avatarImgList)),
height: 60.w,
width: 60.w,
Material(
color: Color(0xFFF5F5F5),
borderRadius: BorderRadius.circular(40.w),
clipBehavior: Clip.antiAlias,
child: FadeInImage.assetNetwork(
placeholder: R.ASSETS_IMAGES_PLACEHOLDER_WEBP,
image: SAASAPI.image(ImgModel.first(widget.registrationList![index].avatarImgList)),
height: 80.w,
width: 80.w,
fit: BoxFit.fill,
imageErrorBuilder: (context, error, stackTrace) {
return Image.asset(
R.ASSETS_IMAGES_PLACEHOLDER_WEBP,
width: 80.w,
height: 80.w,
);
},
),
),
18.wb,
widget.registrationList![index].name.text.size(28.sp).make(),
'${getName(widget.registrationList![index].name) }'.text.size(28.sp).make(),
],
);
},
@ -80,4 +94,17 @@ class _ActivityPeopleListPageState extends State<ActivityPeopleListPage> {
);
}
getName(String name){
for(int i=0;i<name.length;i++){
if(i>0){
name = name.replaceRange(i, i+1, '*') ;
}
}
return name;
}
}

17
lib/ui/community/community_func.dart
Unescape View File

@ -1,4 +1,3 @@
import 'package:aku_new_community/constants/api.dart';
import 'package:aku_new_community/constants/saas_api.dart';
import 'package:aku_new_community/model/good/market_swiper_model.dart';
import 'package:aku_new_community/models/community/dynamic_my_list_body.dart';
@ -50,9 +49,21 @@ class CommunityFunc {
///给单个资讯增加浏览量
static Future<String> addViews(int newsId) async {
BaseModel model = await NetUtil().get(
API.community.addViews,
SAASAPI.community.addViewNum,
params: {
'newsId': newsId,
'informationId': newsId,
},
);
if (model.success) return '';
return model.msg;
}
///给单个动态增加浏览量
static Future<String> dynamicAddViews(int newsId) async {
BaseModel model = await NetUtil().get(
SAASAPI.community.dynamicAddViewNum,
params: {
'dynamicId': newsId,
},
);
if (model.success) return '';

2
lib/ui/community/community_views/community_page.dart
Unescape View File

@ -299,7 +299,9 @@ class _CommunityPageState extends State<CommunityPage>
onTap: () async {
var result =
await Get.to(() => PublicInformationDetailPage(id: item.id));
CommunityFunc.addViews(item.id);
if (result != null && result) {
_easyRefreshController.callRefresh();
}

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

@ -102,6 +102,18 @@ class _EventDetailPageState extends State<EventDetailPage> {
@override
Widget build(BuildContext context) {
return BeeScaffold(
leading: Navigator.canPop(context)
? IconButton(
onPressed: () => Get.back(result: true),
icon: Icon(
CupertinoIcons.chevron_back,
color: Colors.black,
),
)
: SizedBox(),
title: '详情',
bottomNavi: _bottomButton(),
actions: [

17
lib/ui/community/community_views/my_community_view.dart
Unescape View File

@ -16,6 +16,8 @@ import 'package:flutter/material.dart';
import 'package:flutter_easyrefresh/easy_refresh.dart';
import 'package:get/get.dart';
import '../community_func.dart';
class MyCommunityView extends StatefulWidget {
MyCommunityView({Key? key}) : super(key: key);
@ -265,14 +267,13 @@ class MyCommunityViewState extends State<MyCommunityView>
],
));
// if (result == true) {
// await NetUtil().get(
// API.community.deleteMyEvent,
// params: {'themeId': widget.model!.id},
// showMessage: true,
// );
//
// }
if (result == true) {
var result =
await CommunityFunc.deleteDynamic(item.id);
if (result) {
refresh();
}
}
},
child: Container(
width: 32.w,

29
lib/ui/profile/new_house/member_view.dart
Unescape View File

@ -118,22 +118,19 @@ class _MemberViewState extends State<MemberView> {
borderRadius: BorderRadius.circular(58.w),
clipBehavior: Clip.antiAlias,
child: Container(
width: 108.w,
height: 40.w,
alignment: Alignment.center,
padding: EdgeInsets.symmetric(horizontal: 10.w),
decoration: BoxDecoration(
color: Color(0xFFF1C87F).withOpacity(0.4),
),
child: '${BeeMap.getIdentify(identify)}'
.text
.size(22.sp)
.maxFontSize(22.sp)
.minFontSize(18.sp)
.stepGranularity(1.sp)
.color(Colors.black.withOpacity(0.85))
.make(),
),
width: 108.w,
height: 40.w,
alignment: Alignment.center,
padding: EdgeInsets.symmetric(horizontal: 5.w),
decoration: BoxDecoration(
color: Color(0xFFF1C87F).withOpacity(0.4),
),
child: Text(
'${BeeMap.getIdentify(identify)}',
style: TextStyle(
fontSize: 22.sp,
color: Colors.black.withOpacity(0.85)),
)),
))
],
),

Write Preview
Loading…
Cancel
Save