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

Merge branch 'master' of https://git.oa00.com/bee/aku_community_manager

Browse Source
hmxc
张萌 4 years ago
parent 0cba0ae6d1 582d391c9d
commit acf4994f47
14 changed files with 314 additions and 275 deletions
Show Stats Download Patch File Download Diff File

16
android/app/build.gradle
Unescape View File

@ -78,15 +78,19 @@ android {
signingConfig signingConfigs.release signingConfig signingConfigs.release
} }
debug { debug {
minifyEnabled true minifyEnabled true
useProguard true useProguard true
multiDexEnabled true multiDexEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
signingConfig signingConfigs.release signingConfig signingConfigs.release
} }
profile{ profile{
minifyEnabled true minifyEnabled true
useProguard true useProguard true
multiDexEnabled true multiDexEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
signingConfig signingConfigs.release signingConfig signingConfigs.release
} }
} }

3
lib/main.dart
Unescape View File

@ -36,6 +36,8 @@ void main() async {
print("flutter onReceiveNotification: $message"); print("flutter onReceiveNotification: $message");
LoggerData.addData(message); LoggerData.addData(message);
await JpushMessageParse(message).shot(); await JpushMessageParse(message).shot();
final appProvider = Provider.of<AppProvider>(Get.context, listen: false);
appProvider.updateMessage();
}, },
// 点击通知回调方法。 // 点击通知回调方法。
onOpenNotification: (Map<String, dynamic> message) async { onOpenNotification: (Map<String, dynamic> message) async {
@ -88,6 +90,7 @@ class MyApp extends StatelessWidget {
designSize: Size(750, 1334), designSize: Size(750, 1334),
builder: () { builder: () {
return GetMaterialApp( return GetMaterialApp(
debugShowCheckedModeBanner: false,
title: '小蜜蜂管家', title: '小蜜蜂管家',
theme: AppTheme.themeData, theme: AppTheme.themeData,
home: SplashPage(), home: SplashPage(),

2
lib/models/manager/inspection/inspection_point_submit_model.dart
Unescape View File

@ -30,7 +30,7 @@ class ExecuteCheckList {
final Map<String, dynamic> data = { final Map<String, dynamic> data = {
"id": this.id, "id": this.id,
"status": this.status, "status": this.status,
"remarks": this.remarkes, "remakes": this.remarkes,
}; };
return data; return data;
} }

3
lib/models/user/user_info_model.dart
Unescape View File

@ -16,6 +16,9 @@ class UserInfoModel {
///操作权限（借还管理） ///操作权限（借还管理）
bool get canOperation => jurisdiction.contains(57); bool get canOperation => jurisdiction.contains(57);
///管家
bool get manager => canSendTicket && canPickUpTicket;
UserInfoModel({this.id, this.roleId, this.nickName, this.jurisdiction}); UserInfoModel({this.id, this.roleId, this.nickName, this.jurisdiction});
UserInfoModel.fromJson(Map<String, dynamic> json) { UserInfoModel.fromJson(Map<String, dynamic> json) {

17
lib/provider/app_provider.dart
Unescape View File

@ -1,10 +1,13 @@
// Flutter imports: // Flutter imports:
import 'package:aku_community_manager/const/api.dart';
import 'package:aku_community_manager/utils/network/net_util.dart';
import 'package:amap_flutter_location/amap_flutter_location.dart'; import 'package:amap_flutter_location/amap_flutter_location.dart';
import 'package:amap_flutter_location/amap_location_option.dart'; import 'package:amap_flutter_location/amap_location_option.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
// Project imports: // Project imports:
import 'package:aku_community_manager/ui/home/application/applications_page.dart'; import 'package:aku_community_manager/ui/home/application/applications_page.dart';
import 'package:dio/dio.dart';
class AppProvider extends ChangeNotifier { class AppProvider extends ChangeNotifier {
List<AppApplication> _recentUsedApp = []; List<AppApplication> _recentUsedApp = [];
@ -50,4 +53,18 @@ class AppProvider extends ChangeNotifier {
_flutterLocation.stopLocation(); _flutterLocation.stopLocation();
_flutterLocation.destroy(); _flutterLocation.destroy();
} }
int _sysMessage = 0;
int _commentMessage = 0;
bool get hasMessage => _sysMessage != 0 || _commentMessage != 0;
int get sysMessage => _sysMessage;
int get commentMessage => _commentMessage;
updateMessage() async {
Response response = await NetUtil().dio.get(API.message.messageCenter);
if (response == null || response.data == null) return;
_sysMessage = response.data['sysCount'] ?? 0;
_commentMessage = response.data['commentCount'] ?? 0;
notifyListeners();
}
} }

14
lib/provider/user_provider.dart
Unescape View File

@ -2,6 +2,7 @@
import 'dart:io'; import 'dart:io';
// Flutter imports: // Flutter imports:
import 'package:aku_community_manager/provider/app_provider.dart';
import 'package:aku_community_manager/utils/network/base_file_model.dart'; import 'package:aku_community_manager/utils/network/base_file_model.dart';
import 'package:bot_toast/bot_toast.dart'; import 'package:bot_toast/bot_toast.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -16,6 +17,9 @@ import 'package:aku_community_manager/utils/network/net_util.dart';
import 'package:aku_community_manager/models/user/user_info_model.dart' import 'package:aku_community_manager/models/user/user_info_model.dart'
as USER_INFO; as USER_INFO;
import 'package:get/get.dart';
import 'package:jpush_flutter/jpush_flutter.dart';
import 'package:provider/provider.dart';
//登录状态管理 //登录状态管理
class UserProvider extends ChangeNotifier { class UserProvider extends ChangeNotifier {
@ -44,6 +48,8 @@ class UserProvider extends ChangeNotifier {
///更新用户profile ///更新用户profile
Future<UserProfileModel> updateProfile() async { Future<UserProfileModel> updateProfile() async {
final appProvider = Provider.of<AppProvider>(Get.context, listen: false);
appProvider.updateMessage();
BaseModel model = await NetUtil().get(API.user.profile); BaseModel model = await NetUtil().get(API.user.profile);
if (model == null) if (model == null)
return null; return null;
@ -53,10 +59,14 @@ class UserProvider extends ChangeNotifier {
Future<USER_INFO.UserInfoModel> updateUserInfo() async { Future<USER_INFO.UserInfoModel> updateUserInfo() async {
BaseModel model = await NetUtil().get(API.user.info); BaseModel model = await NetUtil().get(API.user.info);
if (model == null) if (model == null)
return null; return null;
else else {
return USER_INFO.UserInfoModel.fromJson(model.data); var userModel = USER_INFO.UserInfoModel.fromJson(model.data);
JPush().setAlias(userModel.id.toString());
return userModel;
}
} }
///注销登录 ///注销登录

4
lib/ui/agreements/agreement_page.dart
Unescape View File

@ -216,9 +216,7 @@ class AgreementPage extends StatelessWidget {
2020年10月21日 2020年10月21日
''', ''',
style: TextStyle( style: Theme.of(context).textTheme.subtitle1,
fontSize: 30.w,
),
), ),
), ),
); );

8
lib/ui/agreements/privacy_page.dart
Unescape View File

@ -18,10 +18,6 @@ class PrivacyPage extends StatelessWidget {
padding: EdgeInsets.all(16.sp), padding: EdgeInsets.all(16.sp),
child: Column( child: Column(
children: [ children: [
Text(
'小蜜蜂智慧社区管家端隐私政策',
style: TextStyle(fontWeight: FontWeight.w600, fontSize: 35.w),
),
Text( Text(
''' '''
小蜜蜂智慧社区管家端APP是由深圳市凯达来科技有限公司提供的一款智慧社区APP，为用户提供更好、更优、更个性化的服务是我们坚持不懈的追求，也希望通过我们提供的服务可以更方便您的生活。依据法律的规定，我们将在特定情形下收集、使用、保存和披露您的个人信息。以下条款描述了我们如何收集、使用、保存和披露您的个人信息。 小蜜蜂智慧社区管家端APP是由深圳市凯达来科技有限公司提供的一款智慧社区APP，为用户提供更好、更优、更个性化的服务是我们坚持不懈的追求，也希望通过我们提供的服务可以更方便您的生活。依据法律的规定，我们将在特定情形下收集、使用、保存和披露您的个人信息。以下条款描述了我们如何收集、使用、保存和披露您的个人信息。
@ -124,9 +120,7 @@ class PrivacyPage extends StatelessWidget {
深圳市凯达来科技有限公司 深圳市凯达来科技有限公司
2020年10月20日 2020年10月20日
''', ''',
style: TextStyle( style: Theme.of(context).textTheme.subtitle1,
fontSize: 30.w,
),
), ),
], ],
), ),

455
lib/ui/home/home_page.dart
Unescape View File

@ -5,10 +5,12 @@ import 'package:aku_community_manager/models/manager/bussiness_and_fix/bussiness
import 'package:aku_community_manager/models/manager/item_num_model.dart'; import 'package:aku_community_manager/models/manager/item_num_model.dart';
import 'package:aku_community_manager/models/todo_bussiness/todo_model.dart'; import 'package:aku_community_manager/models/todo_bussiness/todo_model.dart';
import 'package:aku_community_manager/models/todo_bussiness/todo_outdoor_model.dart'; import 'package:aku_community_manager/models/todo_bussiness/todo_outdoor_model.dart';
import 'package:aku_community_manager/tools/user_tool.dart';
import 'package:aku_community_manager/ui/home/business/bussiness_func.dart'; import 'package:aku_community_manager/ui/home/business/bussiness_func.dart';
import 'package:aku_community_manager/ui/home/business/todo_outdoor_card.dart'; import 'package:aku_community_manager/ui/home/business/todo_outdoor_card.dart';
import 'package:aku_community_manager/utils/network/base_list_model.dart'; import 'package:aku_community_manager/utils/network/base_list_model.dart';
import 'package:aku_community_manager/utils/network/net_util.dart'; import 'package:aku_community_manager/utils/network/net_util.dart';
import 'package:badges/badges.dart';
import 'package:dio/dio.dart'; import 'package:dio/dio.dart';
import 'package:firebase_crashlytics/firebase_crashlytics.dart'; import 'package:firebase_crashlytics/firebase_crashlytics.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -151,12 +153,15 @@ class _HomePageState extends State<HomePage> {
statusBarColor: Colors.transparent, statusBarColor: Colors.transparent,
)); ));
Future.delayed(Duration(milliseconds: 300), () async { Future.delayed(Duration(milliseconds: 300), () async {
_itemNumModel = await _getItemNum(); final userProvider = Provider.of<UserProvider>(context, listen: false);
var dataList = await BussinessFunc.getBussinessModelList(1); if (userProvider.isLogin) {
_todoModelList = dataList.map((e) => ToDoModel.fromJson(e)).toList(); _itemNumModel = await _getItemNum();
_anounceMentList = await _getAnouncement(); var dataList = await BussinessFunc.getBussinessModelList(1);
_onload = false; _todoModelList = dataList.map((e) => ToDoModel.fromJson(e)).toList();
setState(() {}); _anounceMentList = await _getAnouncement();
_onload = false;
setState(() {});
}
}); });
} }
@ -182,6 +187,10 @@ class _HomePageState extends State<HomePage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final userProvider = Provider.of<UserProvider>(context); final userProvider = Provider.of<UserProvider>(context);
final appProvider = Provider.of<AppProvider>(context);
var loadingWidget = Center(
child: CircularProgressIndicator(),
);
return AnnotatedRegion<SystemUiOverlayStyle>( return AnnotatedRegion<SystemUiOverlayStyle>(
child: Scaffold( child: Scaffold(
drawer: PersonalDraw(), drawer: PersonalDraw(),
@ -261,7 +270,7 @@ class _HomePageState extends State<HomePage> {
), ),
SizedBox(width: 19.w), SizedBox(width: 19.w),
Text( Text(
'搜索工单订单号、手机', '搜索应用',
style: TextStyle( style: TextStyle(
color: AppStyle.minorTextColor, color: AppStyle.minorTextColor,
fontSize: 28.sp, fontSize: 28.sp,
@ -300,32 +309,40 @@ class _HomePageState extends State<HomePage> {
// ]), // ]),
// ), // ),
// ), // ),
Container( Badge(
margin: EdgeInsets.only(top: 5.w, bottom: 5.w), elevation: 0,
child: AkuMaterialButton( position: BadgePosition.topEnd(
minWidth: 78.w, top: 4,
//消息按钮 end: 4,
height: double.infinity, ),
onPressed: () { showBadge: appProvider.hasMessage,
if (userProvider.isLogin) child: Container(
Get.to(() => Message()); margin: EdgeInsets.only(top: 5.w, bottom: 5.w),
else child: AkuMaterialButton(
Get.to(() => LoginPage()); minWidth: 78.w,
}, //消息按钮
child: Column(children: [ height: double.infinity,
Image.asset( onPressed: () {
R.ASSETS_HOME_IC_NEWS_PNG, if (userProvider.isLogin)
height: 48.w, Get.to(() => Message());
width: 48.w, else
), Get.to(() => LoginPage());
Text( },
'消息', child: Column(children: [
style: TextStyle( Image.asset(
color: AppStyle.primaryTextColor, R.ASSETS_HOME_IC_NEWS_PNG,
fontSize: 20.sp, height: 48.w,
width: 48.w,
), ),
), Text(
]), '消息',
style: TextStyle(
color: AppStyle.primaryTextColor,
fontSize: 20.sp,
),
),
]),
),
), ),
), ),
SizedBox(width: 17.w), SizedBox(width: 17.w),
@ -389,114 +406,23 @@ class _HomePageState extends State<HomePage> {
), ),
), ),
), ),
body: _onload //需要重构
? Center( body: (!UserTool.userProvider.isLogin)
child: Shimmer.fromColors( ? SizedBox()
child: 'LOADING······'.text.black.size(50.sp).make(), : _onload
baseColor: Colors.white, ? loadingWidget
highlightColor: kPrimaryColor), : ListView(
) padding: EdgeInsets.all(32.w),
: ListView( children: [
padding: EdgeInsets.all(32.w), Container(
children: [ //公告标题行
Container( width: double.infinity,
//公告标题行 height: 45.w,
width: double.infinity,
height: 45.w,
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
'今日公告',
style: TextStyle(
color: Color(0xFF4A4B51),
fontSize: 32.sp,
fontWeight: FontWeight.bold,
),
),
Spacer(),
AkuButton(
//全部公告按钮
onPressed: () {
Get.to(() => AllAnouncement());
},
child: Row(
children: [
Text(
'全部公告',
style: TextStyle(
color: AppStyle.minorTextColor,
fontSize: 24.sp,
fontWeight: FontWeight.bold,
),
),
Icon(
Icons.arrow_forward_ios,
size: 22.w,
color: AppStyle.minorTextColor,
)
],
),
),
],
),
),
SizedBox(height: 16.w),
//公告栏
Container(
color: Color(0xFFFFFFFF),
width: double.infinity,
height: 172.w,
child: Stack(children: [
CarouselSlider(
items: _anounceMentList
.map((e) => AllAnouncementState.anounceCard(e))
.toList(),
options: CarouselOptions(
viewportFraction: 1.0,
aspectRatio: 686 / 172,
autoPlay: true,
onPageChanged: (index, _) {
setState(() {
_currentIndicator = index;
});
},
),
),
Positioned(
top: 144.w,
left: 0,
bottom: 16.w,
right: 0,
child: Row( child: Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: _anounceMentList.map((e) {
int index = _anounceMentList.indexOf(e);
return Container(
width: 12.w,
height: 12.w,
margin: EdgeInsets.symmetric(horizontal: 12.w),
decoration: BoxDecoration(
shape: BoxShape.circle,
color: _currentIndicator == index
? Color(0xFFFFC40C)
: Color(0xFFE8E8E8),
),
);
}).toList(),
),
),
]),
),
SizedBox(height: 16.w),
//待办事项标题行
!userProvider.isLogin
? SizedBox()
: Row(
children: [ children: [
Text( Text(
'待办事项', '今日公告',
style: TextStyle( style: TextStyle(
color: Color(0xFF4A4B51), color: Color(0xFF4A4B51),
fontSize: 32.sp, fontSize: 32.sp,
@ -505,112 +431,203 @@ class _HomePageState extends State<HomePage> {
), ),
Spacer(), Spacer(),
AkuButton( AkuButton(
padding: EdgeInsets.symmetric(vertical: 16.w), //全部公告按钮
onPressed: () { onPressed: () {
Get.to(BusinessPage(initIndex: 3)); Get.to(() => AllAnouncement());
}, },
child: Row( child: Row(
children: [ children: [
Text( Text(
'全部事项', '全部公告',
style: TextStyle( style: TextStyle(
color: AppStyle.minorTextColor, color: AppStyle.minorTextColor,
fontSize: 24.sp, fontSize: 24.sp,
fontWeight: FontWeight.bold), fontWeight: FontWeight.bold,
),
), ),
Icon( Icon(
Icons.arrow_forward_ios, Icons.arrow_forward_ios,
size: 22.w, size: 22.w,
color: AppStyle.minorTextColor, color: AppStyle.minorTextColor,
), )
], ],
), ),
), ),
], ],
), ),
SizedBox(height: 16.w), ),
//待办事项栏 SizedBox(height: 16.w),
!userProvider.isLogin //公告栏
? SizedBox() Container(
: Container( color: Color(0xFFFFFFFF),
height: 480.w, width: double.infinity,
child: ListView.separated( height: 172.w,
separatorBuilder: (context, index) { child: Stack(children: [
return AkuBox.w(16); CarouselSlider(
}, items: _anounceMentList
scrollDirection: Axis.horizontal, .map((e) => AllAnouncementState.anounceCard(e))
itemBuilder: (context, index) { .toList(),
return Container( options: CarouselOptions(
width: 526.w, viewportFraction: 1.0,
child: Builder( aspectRatio: 686 / 172,
builder: (context) { autoPlay: true,
if (_todoModelList[index] onPageChanged: (index, _) {
.dynamicModel setState(() {
.runtimeType == _currentIndicator = index;
BussinessAndFixModel) { });
return BusinessFixCard( },
model: _todoModelList[index] ),
.dynamicModel);
} else if (_todoModelList[index]
.dynamicModel
.runtimeType ==
ToDoOutDoorModel) {
return ToDoOutDoorCard(
model:
_todoModelList[index].dynamicModel,
);
} else
return SizedBox();
},
),
);
},
itemCount: _todoModelList.length,
), ),
), Positioned(
SizedBox(height: 24.w), top: 144.w,
//底部信息栏 left: 0,
!userProvider.isLogin bottom: 16.w,
? SizedBox() right: 0,
: Container( child: Row(
width: double.infinity, mainAxisSize: MainAxisSize.max,
decoration: BoxDecoration( mainAxisAlignment: MainAxisAlignment.center,
borderRadius: BorderRadius.circular(8.w), children: _anounceMentList.map((e) {
color: Colors.white, int index = _anounceMentList.indexOf(e);
return Container(
width: 12.w,
height: 12.w,
margin:
EdgeInsets.symmetric(horizontal: 12.w),
decoration: BoxDecoration(
shape: BoxShape.circle,
color: _currentIndicator == index
? Color(0xFFFFC40C)
: Color(0xFFE8E8E8),
),
);
}).toList(),
),
), ),
child: Column( ]),
children: [ ),
Row( SizedBox(height: 16.w),
children: [ //待办事项标题行
_card(_itemNumModel.unProcessedNum ?? 0, !userProvider.isLogin
'未处理事项', Color(0xFFFF4E0D), 0), ? SizedBox()
GridientDiveder().verticalDivider(166.5.w), : Row(
_card(_itemNumModel.processingNum ?? 0, children: [
'处理中事项', Color(0xFFFFC40C), 1), Text(
], '待办事项',
style: TextStyle(
color: Color(0xFF4A4B51),
fontSize: 32.sp,
fontWeight: FontWeight.bold,
),
),
Spacer(),
AkuButton(
padding: EdgeInsets.symmetric(vertical: 16.w),
onPressed: () {
Get.to(BusinessPage(initIndex: 3));
},
child: Row(
children: [
Text(
'全部事项',
style: TextStyle(
color: AppStyle.minorTextColor,
fontSize: 24.sp,
fontWeight: FontWeight.bold),
),
Icon(
Icons.arrow_forward_ios,
size: 22.w,
color: AppStyle.minorTextColor,
),
],
),
),
],
),
SizedBox(height: 16.w),
//待办事项栏
!userProvider.isLogin
? SizedBox()
: Container(
height: 480.w,
child: ListView.separated(
separatorBuilder: (context, index) {
return AkuBox.w(16);
},
scrollDirection: Axis.horizontal,
itemBuilder: (context, index) {
return Container(
width: 526.w,
child: Builder(
builder: (context) {
if (_todoModelList[index]
.dynamicModel
.runtimeType ==
BussinessAndFixModel) {
return BusinessFixCard(
model: _todoModelList[index]
.dynamicModel);
} else if (_todoModelList[index]
.dynamicModel
.runtimeType ==
ToDoOutDoorModel) {
return ToDoOutDoorCard(
model: _todoModelList[index]
.dynamicModel,
);
} else
return SizedBox();
},
),
);
},
itemCount: _todoModelList.length,
),
),
SizedBox(height: 24.w),
//底部信息栏
!userProvider.isLogin
? SizedBox()
: Container(
width: double.infinity,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8.w),
color: Colors.white,
), ),
Row(children: [ child: Column(
GridientDiveder().horizontalDivider(343.w),
GridientDiveder(isReverse: true)
.horizontalDivider(343.w)
]),
Row(
children: [ children: [
_card(_itemNumModel.processedNum ?? 0, Row(
'已处理事项', Color(0xFF3F8FFE), 2), children: [
GridientDiveder(isReverse: true) _card(_itemNumModel.unProcessedNum ?? 0,
.verticalDivider( '未处理事项', Color(0xFFFF4E0D), 0),
166.5.w, GridientDiveder()
.verticalDivider(166.5.w),
_card(_itemNumModel.processingNum ?? 0,
'处理中事项', Color(0xFFFFC40C), 1),
],
),
Row(children: [
GridientDiveder().horizontalDivider(343.w),
GridientDiveder(isReverse: true)
.horizontalDivider(343.w)
]),
Row(
children: [
_card(_itemNumModel.processedNum ?? 0,
'已处理事项', Color(0xFF3F8FFE), 2),
GridientDiveder(isReverse: true)
.verticalDivider(
166.5.w,
),
_card(_itemNumModel.allNum ?? 0, '全部事项',
Color(0xFF333333), 3),
],
), ),
_card(_itemNumModel.allNum ?? 0, '全部事项',
Color(0xFF333333), 3),
], ],
), ),
], ),
), ],
), ),
],
),
), ),
value: SystemUiOverlayStyle.dark, value: SystemUiOverlayStyle.dark,
); );

21
lib/ui/home/messages/message.dart
Unescape View File

@ -1,6 +1,5 @@
// Flutter imports: // Flutter imports:
import 'package:aku_community_manager/const/api.dart'; import 'package:aku_community_manager/provider/app_provider.dart';
import 'package:aku_community_manager/utils/network/net_util.dart';
import 'package:dio/dio.dart'; import 'package:dio/dio.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -17,6 +16,7 @@ import 'package:aku_community_manager/style/app_style.dart';
import 'package:aku_community_manager/ui/home/messages/comment_message.dart'; import 'package:aku_community_manager/ui/home/messages/comment_message.dart';
import 'package:aku_community_manager/ui/home/messages/system_message.dart'; import 'package:aku_community_manager/ui/home/messages/system_message.dart';
import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart';
import 'package:provider/provider.dart';
class Message extends StatefulWidget { class Message extends StatefulWidget {
Message({Key key}) : super(key: key); Message({Key key}) : super(key: key);
@ -26,8 +26,6 @@ class Message extends StatefulWidget {
} }
class _MessageState extends State<Message> { class _MessageState extends State<Message> {
int _messageCount = 0;
int _commentCount = 0;
EasyRefreshController _refreshController = EasyRefreshController(); EasyRefreshController _refreshController = EasyRefreshController();
Widget _messageTypeImage(String type) { Widget _messageTypeImage(String type) {
String path; String path;
@ -132,15 +130,9 @@ class _MessageState extends State<Message> {
); );
} }
Future _updateMessageCenter() async {
Response response = await NetUtil().dio.get(API.message.messageCenter);
if (response == null || response.data == null) return;
_messageCount = response.data['sysCount'] ?? 0;
_commentCount = response.data['commentCount'] ?? 0;
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final appProvider = Provider.of<AppProvider>(context);
return AkuScaffold( return AkuScaffold(
title: '消息', title: '消息',
titleStyle: AppStyle().barTitleStyle, titleStyle: AppStyle().barTitleStyle,
@ -148,8 +140,7 @@ class _MessageState extends State<Message> {
controller: _refreshController, controller: _refreshController,
firstRefresh: true, firstRefresh: true,
onRefresh: () async { onRefresh: () async {
await _updateMessageCenter(); await appProvider.updateMessage();
setState(() {});
}, },
header: MaterialHeader(), header: MaterialHeader(),
child: ListView( child: ListView(
@ -160,7 +151,7 @@ class _MessageState extends State<Message> {
_messageTypeImage('系统消息'), _messageTypeImage('系统消息'),
'系统消息', '系统消息',
'你有一条新的报事报修待处理', '你有一条新的报事报修待处理',
_messageCount, appProvider.sysMessage,
onpressed: () { onpressed: () {
Get.to(() => SystemMessage()); Get.to(() => SystemMessage());
}, },
@ -173,7 +164,7 @@ class _MessageState extends State<Message> {
_messageTypeImage('评论消息'), _messageTypeImage('评论消息'),
'评论消息', '评论消息',
'你有一条新的评论回复', '你有一条新的评论回复',
_commentCount, appProvider.commentMessage,
onpressed: () { onpressed: () {
Get.to(() => CommentMessage()); Get.to(() => CommentMessage());
}, },

2
lib/ui/home/search_workorder_page.dart
Unescape View File

@ -91,7 +91,7 @@ class _SearchWorkOrderpageState extends State<SearchWorkOrderPage> {
child: TextField( child: TextField(
controller: _textController, controller: _textController,
decoration: InputDecoration( decoration: InputDecoration(
hintText: '搜索工单、手机号', hintText: '搜索应用',
hintStyle: TextStyle( hintStyle: TextStyle(
color: AppStyle.minorTextColor, color: AppStyle.minorTextColor,
fontSize: 28.sp, fontSize: 28.sp,

3
lib/utils/network/manage_func.dart
Unescape View File

@ -19,8 +19,7 @@ class ManageFunc {
///派单类型 ///派单类型
static Future dispatchListDetailType() async { static Future dispatchListDetailType() async {
Response response = await NetUtil().dio.get( Response response = await NetUtil().dio.get(
'http://test.akuhotel.com:8804/IntelligentCommunity' + '${API.host}/IntelligentCommunity' + API.manage.dispatchListDetailType);
API.manage.dispatchListDetailType);
return response.data as List; return response.data as List;
} }

21
pubspec.lock
Unescape View File

@ -23,23 +23,21 @@ packages:
name: amap_flutter_base name: amap_flutter_base
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.0.2" version: "2.0.0"
amap_flutter_location: amap_flutter_location:
dependency: "direct main" dependency: "direct main"
description: description:
name: amap_flutter_location name: amap_flutter_location
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.0.1" version: "2.0.0"
amap_flutter_map: amap_flutter_map:
dependency: "direct main" dependency: "direct main"
description: description:
path: "." name: amap_flutter_map
ref: nullsafety url: "https://pub.flutter-io.cn"
resolved-ref: "5c50cf60d2157cc2779a171ca65c327d571389a7" source: hosted
url: "http://159.75.73.143:8080/third_packages/amap_flutter_map" version: "2.0.1"
source: git
version: "2.0.2-nullsafety"
analyzer: analyzer:
dependency: transitive dependency: transitive
description: description:
@ -82,6 +80,13 @@ packages:
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "3.0.0" version: "3.0.0"
badges:
dependency: "direct main"
description:
name: badges
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.2.0"
boolean_selector: boolean_selector:
dependency: transitive dependency: transitive
description: description:

20
pubspec.yaml
Unescape View File

@ -42,14 +42,11 @@ dependencies:
expandable: ^5.0.1 expandable: ^5.0.1
url_launcher: ^6.0.3 url_launcher: ^6.0.3
amap_flutter_map: amap_flutter_map: ^2.0.1
git: amap_flutter_location: ^2.0.0
url: http://159.75.73.143:8080/third_packages/amap_flutter_map amap_flutter_base: ^2.0.0
ref: nullsafety
amap_flutter_location: ^1.0.1
amap_flutter_base: ^1.0.2
permission_handler: ^6.1.1 permission_handler: ^6.1.1
velocity_x: ^2.6.0 velocity_x: ^2.6.0
dotted_border: ^2.0.0-nullsafety.0 dotted_border: ^2.0.0-nullsafety.0
dio: ^4.0.0 dio: ^4.0.0
@ -58,7 +55,7 @@ dependencies:
firebase_crashlytics: ^2.0.0 firebase_crashlytics: ^2.0.0
#json序列化 #json序列化
json_serializable: ^4.1.1 json_serializable: ^4.1.1
power_logger: ^1.0.1-nullsafety.1 power_logger: ^1.0.1-nullsafety.1
logger: ^1.0.0 logger: ^1.0.0
aku_ui: aku_ui:
@ -67,11 +64,12 @@ dependencies:
hive: ^1.4.4+1 hive: ^1.4.4+1
hive_flutter: ^0.3.1 hive_flutter: ^0.3.1
jpush_flutter: jpush_flutter:
git: git:
url: http://159.75.73.143:8080/third_packages/jpush_flutter url: http://159.75.73.143:8080/third_packages/jpush_flutter
shimmer: ^2.0.0-nullsafety.0 shimmer: ^2.0.0-nullsafety.0
badges: ^1.2.0
dev_dependencies: dev_dependencies:
flutter_test: flutter_test:

Write Preview
Loading…
Cancel
Save