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
pull/1/head
戴余标 3 years ago
parent 71c2452942 17e136b20c
commit 10189510ba
18 changed files with 258 additions and 271 deletions
Show Stats Download Patch File Download Diff File

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

@ -1297,10 +1297,6 @@ 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();
@ -1533,7 +1529,6 @@ 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,8 +7,9 @@ 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;
@ -26,6 +27,7 @@ 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,8 +9,9 @@ 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'] as String, content: json['content'] !=null? 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,

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

@ -129,14 +129,14 @@ class _HomePageState extends State<HomePage>
), ),
textAlign: TextAlign.center, textAlign: TextAlign.center,
), ),
Text( // Text(
'(${appProvider.weatherType} ${appProvider.weatherTemp}℃)', // '(${appProvider.weatherType} ${appProvider.weatherTemp}℃)',
style: TextStyle( // style: TextStyle(
fontSize: 28.sp, // fontSize: 28.sp,
color: Color(0xff999999), // color: Color(0xff999999),
), // ),
textAlign: TextAlign.center, // textAlign: TextAlign.center,
), // ),
Spacer(), Spacer(),
// GestureDetector( // GestureDetector(
// onTap: () { // onTap: () {

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

@ -47,6 +47,8 @@ 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(
@ -65,11 +67,17 @@ class _MessageCenterPageState extends State<MessageCenterPage>
padding: EdgeInsets.symmetric(horizontal: 32.w), padding: EdgeInsets.symmetric(horizontal: 32.w),
), ),
], ],
appBarBottom: BeeTabBar( appBarBottom:
TabBar(
controller: _tabController, controller: _tabController,
tabs: _tabs, indicatorColor: Color(0xffffc40c),
tabs: _tabs.map((e) => Tab(text: e)).toList(),
indicatorPadding: EdgeInsets.only(bottom: 15.w,left: 35.w,right: 35.w),
), ),
body: TabBarView( body:
Padding(
padding: EdgeInsets.only(top: 10.w),
child: TabBarView(
children: [ children: [
ReplayView( ReplayView(
controller: _controllers[0], controller: _controllers[0],
@ -81,6 +89,7 @@ class _MessageCenterPageState extends State<MessageCenterPage>
], ],
controller: _tabController, controller: _tabController,
), ),
),
); );
} }
} }

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

@ -38,7 +38,9 @@ class _ReplayViewState extends State<ReplayView> {
itemBuilder: (context, index) { itemBuilder: (context, index) {
return ReplyCard(model: items[index]); return ReplyCard(model: items[index]);
}, },
separatorBuilder: (_, __) =>1.w.heightBox, separatorBuilder: (_, __) =>Container(
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,7 +42,13 @@ 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.text model.content==null?''.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,5 +1,6 @@
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';
@ -8,7 +9,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 ThumbsUpListModel model; final ReplyListModel model;
const ThumbsUpCard({Key? key, required this.model}) : super(key: key); const ThumbsUpCard({Key? key, required this.model}) : super(key: key);
@ -36,8 +37,10 @@ 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(),
], ],
), ),

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

@ -109,7 +109,7 @@ class _PersonalIndexState extends State<PersonalIndex>
height: 40.w, height: 40.w,
alignment: Alignment.center, alignment: Alignment.center,
child: Image.asset( child: Image.asset(
R.ASSETS_ICONS_ICON_MY_SETTING_PNG, Assets.newIcon.imgShezhi.path,
width: 40.w, width: 40.w,
height: 40.w), height: 40.w),
), ),
@ -402,11 +402,11 @@ class _PersonalIndexState extends State<PersonalIndex>
), ),
24.hb, 24.hb,
_function('我的积分', Assets.newIcon.icJifen.path, _function('我的积分', Assets.newIcon.icJifen.path,
() => ClockInPage(), ''), () => Get.to(() => ClockInPage()), ''),
_function( _function(
'我的房屋', '我的房屋',
R.ASSETS_ICONS_ICON_MY_HOUSE_PNG, Assets.newIcon.icWdfw.path,
(){ () {
Get.to(() => MyHousePage()); Get.to(() => MyHousePage());
}, },
// () => HouseOwnersPage( // () => HouseOwnersPage(
@ -417,39 +417,26 @@ class _PersonalIndexState extends State<PersonalIndex>
'${UserTool.userProvider.defaultHouse?.unitName ?? ''}' '${UserTool.userProvider.defaultHouse?.unitName ?? ''}'
'${UserTool.userProvider.defaultHouse?.estateName ?? ''}', '${UserTool.userProvider.defaultHouse?.estateName ?? ''}',
), ),
36.hb, _function('我的家庭', Assets.newIcon.icWdjt.path, () {
_function(
'我的家庭',
R.ASSETS_ICONS_ICON_MY_HOUSE_PNG,
(){
Get.to(() => MyFamilyPage()); Get.to(() => MyFamilyPage());
} }, ''),
,
''),
36.hb,
// _function('我的车位', R.ASSETS_ICONS_ICON_MY_CARSEAT_PNG, // _function('我的车位', R.ASSETS_ICONS_ICON_MY_CARSEAT_PNG,
// () => CarParkingPage(), ''), // () => CarParkingPage(), ''),
// 36.hb, // 36.hb,
// _function('我的车', R.ASSETS_ICONS_ICON_MY_CAR_PNG, // _function('我的车', R.ASSETS_ICONS_ICON_MY_CAR_PNG,
// () => CarManagePage(), ''), // () => CarManagePage(), ''),
// 36.hb, // 36.hb,
_function( _function('我的访客', Assets.newIcon.icWdfk.path, () {
'我的访客', BotToast.showText(
R.ASSETS_ICONS_ICON_MY_VISITOR_PNG, text: '当前小区尚未连接设备',
(){ align: Alignment(0, 0.5));
BotToast.showText(text: '当前小区尚未连接设备', align: Alignment(0, 0.5)); }, ''),
}
,
''),
36.hb,
_function( _function(
'收货地址', '收货地址',
R.ASSETS_ICONS_ICON_MY_LOCATION_PNG, Assets.newIcon.icShdz.path,
() => AddressListPage( () => Get.to(() => AddressListPage(
canBack: false, canBack: false,
), )),
''), ''),
], ],
), ),

33
lib/pages/setting_page/settings_page.dart
Unescape View File

@ -1,12 +1,9 @@
import 'package:aku_new_community/base/base_style.dart'; import 'package:aku_new_community/base/base_style.dart';
import 'package:aku_new_community/extensions/num_ext.dart'; import 'package:aku_new_community/extensions/num_ext.dart';
import 'package:aku_new_community/extensions/widget_list_ext.dart'; import 'package:aku_new_community/extensions/widget_list_ext.dart';
import 'package:aku_new_community/pages/setting_page/about_page/about_page.dart';
import 'package:aku_new_community/pages/setting_page/account_manager_page.dart';
import 'package:aku_new_community/pages/setting_page/agreement_page/agreement_page.dart'; import 'package:aku_new_community/pages/setting_page/agreement_page/agreement_page.dart';
import 'package:aku_new_community/pages/setting_page/agreement_page/privacy_page.dart'; import 'package:aku_new_community/pages/setting_page/agreement_page/privacy_page.dart';
import 'package:aku_new_community/pages/setting_page/feedback_page/feedback_page.dart'; import 'package:aku_new_community/pages/sign/login/other_login_page.dart';
import 'package:aku_new_community/pages/tab_navigator.dart';
import 'package:aku_new_community/provider/user_provider.dart'; import 'package:aku_new_community/provider/user_provider.dart';
import 'package:aku_new_community/utils/developer_util.dart'; import 'package:aku_new_community/utils/developer_util.dart';
import 'package:aku_new_community/utils/websocket/web_socket_util.dart'; import 'package:aku_new_community/utils/websocket/web_socket_util.dart';
@ -81,7 +78,7 @@ class _SettingsPageState extends State<SettingsPage> {
), ),
onPressed: () { onPressed: () {
userProvider.logout(); userProvider.logout();
Get.offAll(() => TabNavigator()); Get.to(() => OtherLoginPage());
}, },
), ),
], ],
@ -106,7 +103,7 @@ class _SettingsPageState extends State<SettingsPage> {
body: ListView( body: ListView(
padding: EdgeInsets.zero, padding: EdgeInsets.zero,
children: [ children: [
...[ ...<Widget>[
// _buildTile( // _buildTile(
// title: '是否接受信息通知', // title: '是否接受信息通知',
// suffix: CupertinoSwitch( // suffix: CupertinoSwitch(
@ -114,10 +111,10 @@ class _SettingsPageState extends State<SettingsPage> {
// onChanged: (state) {}, // onChanged: (state) {},
// ), // ),
// ), // ),
_buildTile( // _buildTile(
title: '关于小蜜蜂智慧小区', // title: '关于小蜜蜂智慧小区',
onTap: () => Get.to(() => AboutPage()), // onTap: () => Get.to(() => AboutPage()),
), // ),
//TODO 邀请注册 //TODO 邀请注册
// _buildTile( // _buildTile(
// title: '邀请注册', // title: '邀请注册',
@ -137,14 +134,14 @@ class _SettingsPageState extends State<SettingsPage> {
// title: '清除缓存', // title: '清除缓存',
// onTap: () {}, // onTap: () {},
// ), // ),
_buildTile( // _buildTile(
title: '意见反馈', // title: '意见反馈',
onTap: () => Get.to(() => FeedBackPage()), // onTap: () => Get.to(() => FeedBackPage()),
), // ),
_buildTile( // _buildTile(
title: '账号管理', // title: '账号管理',
onTap: () => Get.to(() => AccountManagerPage()), // onTap: () => Get.to(() => AccountManagerPage()),
), // ),
_buildTile( _buildTile(
title: '小蜜蜂用户协议', title: '小蜜蜂用户协议',
onTap: () => Get.to(() => AgreementPage()), onTap: () => Get.to(() => AgreementPage()),

6
lib/pages/sign/login/other_login_page.dart
Unescape View File

@ -113,8 +113,10 @@ class _OtherLoginPageState extends State<OtherLoginPage> {
await UserTool.dataProvider.addHistories(); await UserTool.dataProvider.addHistories();
await UserTool.userProvider.setLogin(response.data['data']); await UserTool.userProvider.setLogin(response.data['data']);
} else { } else {
// BotToast.showText(text: response.data['message']); BotToast.showText(text: response.data['msg']);
BotToast.showText(text: '账号尚未注册，请使用验证码登陆'); if (response.data['msg'] == '该账户未设置密码，请使用验证码登录') {
_controller.jumpToPage(0);
}
} }
} catch (e) { } catch (e) {
print(e.toString()); print(e.toString());

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

@ -97,6 +97,9 @@ class _CommunityPageState extends State<CommunityPage>
child: TabBar( child: TabBar(
onTap: (index) { onTap: (index) {
setState(() {}); setState(() {});
if (_tabController?.index == 1) {
myKey.currentState?.refresh();
}
}, },
controller: _tabController, controller: _tabController,
indicatorColor: Color(0xffffc40c), indicatorColor: Color(0xffffc40c),

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

@ -300,7 +300,14 @@ class _EventDetailPageState extends State<EventDetailPage> {
} }
Widget _commentWidget(CommentListModel model, int rootIndex) { Widget _commentWidget(CommentListModel model, int rootIndex) {
return Container( return GestureDetector(
onTap: () {
_rootId = model.id;
_parentId = model.id;
_focusNode.requestFocus();
_currentCommentIndex = rootIndex;
},
child: Container(
// key: UniqueKey(), // key: UniqueKey(),
color: Colors.white, color: Colors.white,
padding: EdgeInsets.symmetric(vertical: 32.w, horizontal: 32.w), padding: EdgeInsets.symmetric(vertical: 32.w, horizontal: 32.w),
@ -420,14 +427,7 @@ class _EventDetailPageState extends State<EventDetailPage> {
), ),
), ),
32.wb, 32.wb,
GestureDetector( Row(
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,7 +436,6 @@ class _EventDetailPageState extends State<EventDetailPage> {
), ),
], ],
), ),
),
5.wb, 5.wb,
'${model.commentNum}' '${model.commentNum}'
.text .text
@ -477,6 +476,7 @@ class _EventDetailPageState extends State<EventDetailPage> {
), ),
], ],
), ),
),
); );
} }

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

@ -131,6 +131,7 @@ class MyCommunityViewState extends State<MyCommunityView>
return EasyRefresh( return EasyRefresh(
firstRefresh: true, firstRefresh: true,
header: MaterialHeader(), header: MaterialHeader(),
footer: MaterialFooter(),
controller: _refreshController, controller: _refreshController,
onRefresh: () async { onRefresh: () async {
BaseListModel model = await NetUtil().getList( BaseListModel model = await NetUtil().getList(

2
lib/ui/function_and_service/task/hall/hall_card.dart
Unescape View File

@ -122,7 +122,7 @@ class HallCard extends StatelessWidget {
24.w.heightBox, 24.w.heightBox,
Row( Row(
children: [ children: [
Assets.icons.environment.image(width: 36.w, height: 36.w), Assets.icons.environment.image(width: 40.w, height: 40.w),
24.w.widthBox, 24.w.widthBox,
'${model.accessAddress}' '${model.accessAddress}'
.text .text

25
lib/ui/function_and_service/task/my_take_task/my_take_task_card.dart
Unescape View File

@ -80,29 +80,6 @@ class MyTakeTaskCard extends StatelessWidget {
24.w.heightBox, 24.w.heightBox,
appointment, appointment,
20.w.heightBox, 20.w.heightBox,
Row(
children: [
Assets.icons.clockCircle.image(width: 36.w, height: 36.w),
24.w.widthBox,
'${DateUtil.formatDateStr(model.readyEndTime)}'
.text
.size(24.sp)
.color(Colors.black.withOpacity(0.65))
.make(),
],
),
20.w.heightBox,
Row(
children: [
Assets.icons.environment.image(width: 36.w, height: 36.w),
24.w.widthBox,
'${model.accessAddress}'
.text
.size(24.sp)
.color(Colors.black.withOpacity(0.65))
.make(),
],
),
Row( Row(
children: [ children: [
Assets.icons.watch.image(width: 40.w, height: 40.w), Assets.icons.watch.image(width: 40.w, height: 40.w),
@ -120,7 +97,7 @@ class MyTakeTaskCard extends StatelessWidget {
24.w.heightBox, 24.w.heightBox,
Row( Row(
children: [ children: [
Assets.icons.environment.image(width: 36.w, height: 36.w), Assets.icons.environment.image(width: 40.w, height: 40.w),
24.w.widthBox, 24.w.widthBox,
'${model.accessAddress}' '${model.accessAddress}'
.text .text

11
lib/ui/function_and_service/task/task_map.dart
Unescape View File

@ -8,15 +8,16 @@ class TaskMap {
9: '其他' 9: '其他'
}; };
static Map<int, String> statusToString = { static Map<int, String> statusToString = {
1: '未接单', 1: '已发布',
2: '待处理', 2: '服务中',
3: '已完成', 3: '待确认',
4: '已取消' 4: '已完成',
5: '已评价',
9: '已取消'
}; };
static Map<int, String> typeToString = {1: '跑腿', 2: '代驾', 3: '装修', 4: '陪玩'}; static Map<int, String> typeToString = {1: '跑腿', 2: '代驾', 3: '装修', 4: '陪玩'};
static Map<int, String> serviceObject = {1: '住户', 2: '物业', 3: '不限'}; static Map<int, String> serviceObject = {1: '住户', 2: '物业', 3: '不限'};
static Map<int, String> rewardType = {1: '赏金', 2: '积分'}; static Map<int, String> rewardType = {1: '赏金', 2: '积分'};
} }

1
lib/widget/bee_scaffold.dart
Unescape View File

@ -73,6 +73,7 @@ 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