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 f7bf801c41 86edde4c09
commit 354759fc8b
9 changed files with 136 additions and 133 deletions
Show Stats Download Patch File Download Diff File

5
lib/constants/saas_api.dart
Unescape View File

@ -104,7 +104,10 @@ class _User {
class _Login {
///app用户退出
String get logOut => '/app/user/quit';
String get quit => '/app/user/quit';
///app用户注销
String get logOut =>'/app/user/logout';
///查询所有小区信息
String get allCommunity => '/app/login/findAllCommunity';

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

@ -110,44 +110,46 @@ class _HomePageState extends State<HomePage>
right: 32.w,
left: 32.w,
bottom: 20.w),
child: Row(crossAxisAlignment: CrossAxisAlignment.center, children: [
// if (appProvider.location != null)
Image.asset(
Assets.home.icLocation.path,
width: 48.w,
height: 48.w,
),
16.wb,
Text(
'${UserTool.userProvider.userInfoModel?.communityName ?? ""}',
// appProvider.location?['city'] == null
// ? ''
// : appProvider.location?['city'] as String? ?? '',
style: TextStyle(
fontWeight: FontWeight.w600,
fontSize: 28.sp,
color: Color(0xff333333),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
// if (appProvider.location != null)
Image.asset(
Assets.home.icLocation.path,
width: 48.w,
height: 48.w,
),
textAlign: TextAlign.center,
),
// Text(
// '(${appProvider.weatherType} ${appProvider.weatherTemp}℃)',
// style: TextStyle(
// fontSize: 28.sp,
// color: Color(0xff999999),
// ),
// textAlign: TextAlign.center,
// ),
Spacer(),
// GestureDetector(
// onTap: () {
// Get.to(() => BeeSearch());
// },
// child:
// Image.asset(Assets.home.icSearch.path, height: 48.w, width: 48.w),
// ),
20.wb,
Badge(
16.wb,
Text(
'${UserTool.userProvider.userInfoModel?.communityName ?? ""}',
// appProvider.location?['city'] == null
// ? ''
// : appProvider.location?['city'] as String? ?? '',
style: TextStyle(
fontWeight: FontWeight.w600,
fontSize: 28.sp,
color: Color(0xff333333),
),
textAlign: TextAlign.center,
),
// Text(
// '(${appProvider.weatherType} ${appProvider.weatherTemp}℃)',
// style: TextStyle(
// fontSize: 28.sp,
// color: Color(0xff999999),
// ),
// textAlign: TextAlign.center,
// ),
Spacer(),
// GestureDetector(
// onTap: () {
// Get.to(() => BeeSearch());
// },
// child:
// Image.asset(Assets.home.icSearch.path, height: 48.w, width: 48.w),
// ),
20.wb,
Badge(
elevation: 0,
badgeColor: Color(0xFFCF2525),
padding: sum > 9 ? EdgeInsets.all(2.w) : EdgeInsets.all(5.w),
@ -168,8 +170,10 @@ class _HomePageState extends State<HomePage>
},
child: Image.asset(Assets.home.icMessage.path,
height: 48.w, width: 48.w),
)),
]),
),
),
],
),
);
return AnnotatedRegion<SystemUiOverlayStyle>(
value: SystemUiOverlayStyle.dark,
@ -359,7 +363,8 @@ class _HomePageState extends State<HomePage>
),
),
onTap: () async {
Get.to(AdvicePage(type: AdviceType.SUGGESTION));
Get.to(AdvicePage(
type: AdviceType.SUGGESTION));
},
),
)

13
lib/pages/setting_page/account_manager_page.dart
Unescape View File

@ -1,3 +1,4 @@
import 'package:aku_new_community/constants/saas_api.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
@ -7,6 +8,9 @@ import 'package:velocity_x/velocity_x.dart';
import 'package:aku_new_community/pages/sign/login/other_login_page.dart';
import 'package:aku_new_community/widget/bee_scaffold.dart';
import '../../utils/network/base_model.dart';
import '../../utils/network/net_util.dart';
class AccountManagerPage extends StatefulWidget {
AccountManagerPage({Key? key}) : super(key: key);
@ -37,9 +41,12 @@ class _AccountManagerPageState extends State<AccountManagerPage> {
color: Colors.red.withOpacity(0.7),
),
),
onPressed: () {
//暂时隐去一键登录页
Get.offAll(() => OtherLoginPage());
onPressed: () async {
BaseModel baseModel =
await NetUtil().post(SAASAPI.login.logOut);
if (baseModel.success) {
Get.offAll(() => OtherLoginPage());
}
},
),
],

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

@ -143,10 +143,10 @@ class _SettingsPageState extends State<SettingsPage> {
title: '意见反馈',
onTap: () => Get.to(() => FeedBackPage()),
),
// _buildTile(
// title: '账号管理',
// onTap: () => Get.to(() => AccountManagerPage()),
// ),
_buildTile(
title: '账号管理',
onTap: () => Get.to(() => AccountManagerPage()),
),
_buildTile(
title: '用户协议',
onTap: () => Get.to(() => AgreementPage()),

2
lib/provider/user_provider.dart
Unescape View File

@ -58,7 +58,7 @@ class UserProvider extends ChangeNotifier {
final appProvider = Provider.of<AppProvider>(Get.context!, listen: false);
appProvider.setCurrentHouse(null);
if (_isLogin) {
NetUtil().post(SAASAPI.login.logOut, showMessage: true);
NetUtil().post(SAASAPI.login.quit, showMessage: true);
NetUtil().dio!.options.headers.remove('app-login-token');
_isLogin = false;
}

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

@ -106,18 +106,15 @@ 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,
),
)
onPressed: () => Get.back(result: true),
icon: Icon(
CupertinoIcons.chevron_back,
color: Colors.black,
),
)
: SizedBox(),
title: '详情',
bottomNavi: _bottomButton(),
actions: [
@ -303,8 +300,9 @@ class _EventDetailPageState extends State<EventDetailPage> {
);
}
Widget _commentWidget(CommentListModel model, int rootIndex) {
return GestureDetector(
Widget _commentWidget(CommentListModel model, int rootIndex){
final userProvider = Provider.of<UserProvider>(context);
return GestureDetector(
onTap: () {
_rootId = model.id;
_parentId = model.id;
@ -363,9 +361,9 @@ class _EventDetailPageState extends State<EventDetailPage> {
),
Spacer(),
CommunityPopButton(
isMyself: _isMyself,
isMyself: userProvider.userInfoModel?.id==model.createId,
onSelect: (value) async {
if (_isMyself) {
if (userProvider.userInfoModel?.id==model.createId) {
await CommunityFunc.deleteComment(model.id);
_refreshController.callRefresh();
}
@ -374,80 +372,68 @@ class _EventDetailPageState extends State<EventDetailPage> {
40.hb,
model.content.text.size(28.sp).color(ktextSubColor).make(),
30.hb,
GestureDetector(
onTap: () async {
var res =
await NetUtil().get(SAASAPI.community.commentLike, params: {
'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 {
_likeNums[rootIndex] -= 1;
}
BotToast.showText(
text: _likes[rootIndex] ? '点赞成功' : '取消点赞成功');
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 {
BotToast.showText(text: base.msg);
_likeNums[rootIndex] -= 1;
}
BotToast.showText(
text: _likes[rootIndex] ? '点赞成功' : '取消点赞成功');
} else {
BotToast.showText(text: base.msg);
}
setState(() {});
},
child: Material(
color: Colors.transparent,
child: Row(
children: [
Image.asset(
R.ASSETS_ICONS_COMMUNITY_LIKE_PNG,
width: 32.w,
height: 32.w,
color: !_likes[rootIndex]
? Colors.black.withOpacity(0.45)
: kPrimaryColor,
),
5.wb,
'${_likeNums[rootIndex]}'
.text
.size(24.sp)
.color(Color(0xFF999999))
.make(),
],
),
setState(() {});
},
child: Material(
color: Colors.transparent,
child: Row(
children: [
Image.asset(
R.ASSETS_ICONS_COMMUNITY_LIKE_PNG,
width: 32.w,
height: 32.w,
color: !_likes[rootIndex]
? Colors.black.withOpacity(0.45)
: kPrimaryColor,
),
5.wb,
'${_likeNums[rootIndex]}'
.text
.size(24.sp)
.color(Color(0xFF999999))
.make(),
],
),
),
32.wb,
Row(
children: [
Image.asset(
R.ASSETS_ICONS_COMMUNITY_COMMENT_PNG,
width: 40.w,
height: 40.w,
),
],
),
5.wb,
'${model.commentNum}'
.text
.size(24.sp)
.color(Color(0xFF999999))
.make(),
],
),
),
32.wb,
Row(
children: [
Image.asset(
R.ASSETS_ICONS_COMMUNITY_COMMENT_PNG,
width: 40.w,
height: 40.w,
),
],
),
5.wb,
'${model.commentNum}'
.text
.size(24.sp)
.color(Color(0xFF999999))
.make(),
],
),
40.hb,
model.commentTwoList.isEmpty
@ -535,7 +521,7 @@ class _EventDetailPageState extends State<EventDetailPage> {
fontSize: 28.sp,
),
children: [
if (model.createId ==widget.createId)
if (model.createId == widget.createId)
WidgetSpan(
child: Container(
width: 56.w,
@ -584,7 +570,6 @@ class _EventDetailPageState extends State<EventDetailPage> {
}
_bottomButton() {
final userProvider = Provider.of<UserProvider>(context);
return Container(
width: double.infinity,
height: 100.w,

1
lib/ui/community/community_views/widgets/chat_card.dart
Unescape View File

@ -247,6 +247,7 @@ class _ChatCardState extends State<ChatCard> {
],
),
Spacer(),
CommunityPopButton(
isMyself: _isMyself,
onSelect: (dynamic _) async {

1
lib/ui/function_and_service/work_order/work_order_page.dart
Unescape View File

@ -62,6 +62,7 @@ class _WorkOrderPageState extends State<WorkOrderPage>
appBarBottom: BeeTabBar(
tabs: _tabs,
controller: _tabController,
scrollable: true,
),
body: TabBarView(
controller: _tabController,

1
lib/widget/tab_bar/bee_tab_bar.dart
Unescape View File

@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
class BeeTabBar extends StatefulWidget with PreferredSizeWidget {
final TabController? controller;

Write Preview
Loading…
Cancel
Save