xt / Flutter-ReserveApp · Commits

Go to a project

Commit 38faa60f0679cd9d707924774d7f947d1d5035f5

Authored by gaiyaguang
2 parents 23a1a409 01e2dff4
build: skipped

桌位管理

Inline Side-by-side
Showing 5 changed files with 202 additions and 144 deletions
@@ -62,6 +62,30 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -62,6 +62,30 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
62 widget.detailEntity.pnum, 62 widget.detailEntity.pnum,
63 widget.detailEntity.tables); 63 widget.detailEntity.tables);
64 _initData(); 64 _initData();
  65 + // //输入框焦点
  66 + // _nameNode.addListener(() {
  67 + // if (!_nameNode.hasFocus) {
  68 + // print('失去焦点');
  69 + // } else {
  70 + // print('得到焦点');
  71 + // _phoneNode.unfocus();
  72 + // }
  73 + // });
  74 + // //输入框焦点
  75 + // _phoneNode.addListener(() {
  76 + // if (!_phoneNode.hasFocus) {
  77 + // print('失去焦点');
  78 + // } else {
  79 + // print('得到焦点');
  80 + // }
  81 + // });
  82 + }
  83 +
  84 + @override
  85 + void dispose() {
  86 + _nameNode.unfocus();
  87 + _phoneNode.unfocus();
  88 + super.dispose();
65 } 89 }
66 90
67 _initData() { 91 _initData() {
@@ -122,10 +146,12 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -122,10 +146,12 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
122 } 146 }
123 _notebookDetailChangeModel.initHourAndMinuteSelect(); 147 _notebookDetailChangeModel.initHourAndMinuteSelect();
124 //选完今天明天刷新页面 148 //选完今天明天刷新页面
125 - int ddate = Utils.getDdate(_notebookDetailChangeModel.dateList);  
126 - String ddateSolt =  
127 - Utils.getDdateSolt(_notebookDetailChangeModel.sunDateList);  
128 - String pnum = Utils.getPnum(_notebookDetailChangeModel.personNumList); 149 + int ddate =
  150 + Utils.getDdate(_notebookDetailChangeModel.dateList);
  151 + String ddateSolt = Utils.getDdateSolt(
  152 + _notebookDetailChangeModel.sunDateList);
  153 + String pnum = Utils.getPnum(
  154 + _notebookDetailChangeModel.personNumList);
129 List<t.TableList> list = 155 List<t.TableList> list =
130 await _notebookDetailChangeModel.getNewTableList( 156 await _notebookDetailChangeModel.getNewTableList(
131 context, 157 context,
@@ -236,9 +262,12 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -236,9 +262,12 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
236 } 262 }
237 _notebookDetailChangeModel.notifyListeners(); 263 _notebookDetailChangeModel.notifyListeners();
238 //人数选择页面刷新 264 //人数选择页面刷新
239 - String pnum = Utils.getPnum(_notebookDetailChangeModel.personNumList);  
240 - int ddate = Utils.getDdate(_notebookDetailChangeModel.dateList);  
241 - String ddateSolt = Utils.getDdateSolt(_notebookDetailChangeModel.sunDateList); 265 + String pnum =
  266 + Utils.getPnum(_notebookDetailChangeModel.personNumList);
  267 + int ddate =
  268 + Utils.getDdate(_notebookDetailChangeModel.dateList);
  269 + String ddateSolt = Utils.getDdateSolt(
  270 + _notebookDetailChangeModel.sunDateList);
242 271
243 _notebookDetailChangeModel.getNewTableList( 272 _notebookDetailChangeModel.getNewTableList(
244 context, 273 context,
@@ -287,14 +316,11 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -287,14 +316,11 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
287 } 316 }
288 _notebookDetailChangeModel.initHourAndMinuteSelect(); 317 _notebookDetailChangeModel.initHourAndMinuteSelect();
289 // 选完日历刷新页面 318 // 选完日历刷新页面
290 - String ddateSolt = Utils.getDdateSolt(_notebookDetailChangeModel.sunDateList); 319 + String ddateSolt =
  320 + Utils.getDdateSolt(_notebookDetailChangeModel.sunDateList);
291 String pnum = Utils.getPnum(_notebookDetailChangeModel.personNumList); 321 String pnum = Utils.getPnum(_notebookDetailChangeModel.personNumList);
292 - _notebookDetailChangeModel.getNewTableList(  
293 - context,  
294 - '${dateTimeMill}',  
295 - ddateSolt,  
296 - pnum,  
297 - _notebookDetailChangeModel.tableList); 322 + _notebookDetailChangeModel.getNewTableList(context, '${dateTimeMill}',
  323 + ddateSolt, pnum, _notebookDetailChangeModel.tableList);
298 } 324 }
299 _notebookDetailChangeModel.notifyListeners(); 325 _notebookDetailChangeModel.notifyListeners();
300 }); 326 });
@@ -519,12 +545,14 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -519,12 +545,14 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
519 // EdgeInsets.only(bottom: ScreenUtil().setWidth(17)), 545 // EdgeInsets.only(bottom: ScreenUtil().setWidth(17)),
520 border: InputBorder.none, 546 border: InputBorder.none,
521 ), 547 ),
522 - onChanged: (value) {}, 548 + onChanged: (value) {
  549 + print('ggg');
  550 + },
523 onEditingComplete: () { 551 onEditingComplete: () {
524 print('fff'); 552 print('fff');
525 _nameNode.unfocus(); 553 _nameNode.unfocus();
526 }, 554 },
527 - // keyboardType: TextInputType.number, 555 + keyboardType: TextInputType.text,
528 ), 556 ),
529 ), 557 ),
530 HEmptyView(40), 558 HEmptyView(40),
@@ -757,7 +785,7 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -757,7 +785,7 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
757 body: Column(children: <Widget>[ 785 body: Column(children: <Widget>[
758 SizedBox(height: ScreenUtil.statusBarHeight), 786 SizedBox(height: ScreenUtil.statusBarHeight),
759 MyAppBar( 787 MyAppBar(
760 - widget.detailEntity.id=="-1"?"录入订座信息":"变更预订", 788 + widget.detailEntity.id == "-1" ? "录入订座信息" : "变更预订",
761 showBack: true, 789 showBack: true,
762 ), 790 ),
763 Expanded( 791 Expanded(
@@ -774,7 +802,7 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -774,7 +802,7 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
774 width: double.infinity, 802 width: double.infinity,
775 height: 84, 803 height: 84,
776 fontSize: 34, 804 fontSize: 34,
777 - content: widget.detailEntity.id=="-1"?"完成预订":"确定修改", 805 + content: widget.detailEntity.id == "-1" ? "完成预订" : "确定修改",
778 state: 2, 806 state: 2,
779 onPress: () async { 807 onPress: () async {
780 String name = 808 String name =
@@ -787,9 +815,13 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -787,9 +815,13 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
787 Utils.showToast("请选择桌位"); 815 Utils.showToast("请选择桌位");
788 return; 816 return;
789 } 817 }
790 - SunReserveInfoModel _model =_notebookDetailChangeModel.detailEntity.type=="1"?//判断是否在线预订  
791 - await _notebookDetailChangeModel  
792 - .updateOnlineReserveInfo(context):await _notebookDetailChangeModel.setReserveInfo(context); 818 + SunReserveInfoModel _model =
  819 + _notebookDetailChangeModel.detailEntity.type == "1"
  820 + ? //判断是否在线预订
  821 + await _notebookDetailChangeModel
  822 + .updateOnlineReserveInfo(context)
  823 + : await _notebookDetailChangeModel
  824 + .setReserveInfo(context);
793 if (ObjectUtil.isNotEmpty(_model.row) || 825 if (ObjectUtil.isNotEmpty(_model.row) ||
794 ObjectUtil.isNotEmpty(_model.row.id)) { 826 ObjectUtil.isNotEmpty(_model.row.id)) {
795 print('成功'); 827 print('成功');
@@ -816,17 +848,20 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -816,17 +848,20 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
816 List<dynamic> tableinfo = 848 List<dynamic> tableinfo =
817 convert.jsonDecode(_model.row.tableinfo); 849 convert.jsonDecode(_model.row.tableinfo);
818 print(tableinfo); 850 print(tableinfo);
819 - String _nameStr=t.TableList.fromJson(tableinfo[0]).name; 851 + String _nameStr = t.TableList.fromJson(tableinfo[0]).name;
820 if (tableinfo.length > 1) { 852 if (tableinfo.length > 1) {
821 - _nameStr = t.TableList.fromJson(tableinfo[0]).name + '等${tableinfo.length}桌'; 853 + _nameStr = t.TableList.fromJson(tableinfo[0]).name +
  854 + '等${tableinfo.length}桌';
822 } 855 }
823 LogUtil.v(_nameStr); 856 LogUtil.v(_nameStr);
824 NavigatorUtil.goInvicationPage(context, _model.row.id, 857 NavigatorUtil.goInvicationPage(context, _model.row.id,
825 _nameStr, _model.row.ddate, ddate_solt,_model.row.phone, 858 _nameStr, _model.row.ddate, ddate_solt,_model.row.phone,
826 replace: true); 859 replace: true);
827 - EventBus().emit("refresh_tablemanager");//刷新桌位 860 + EventBus().emit("refresh_tablemanager"); //刷新桌位
828 } else { 861 } else {
829 - Utils.showToast(widget.detailEntity.id=="-1"?"录入预订订单失败，请重试！":"变更预订订单失败，请重试！"); 862 + Utils.showToast(widget.detailEntity.id == "-1"
  863 + ? "录入预订订单失败，请重试！"
  864 + : "变更预订订单失败，请重试！");
830 } 865 }
831 }, 866 },
832 )) 867 ))
@@ -955,7 +990,8 @@ class _ButtonState extends State<CustomButton> { @@ -955,7 +990,8 @@ class _ButtonState extends State<CustomButton> {
955 onEditingComplete: () { 990 onEditingComplete: () {
956 _cancelNode.unfocus(); 991 _cancelNode.unfocus();
957 int ddate = Utils.getDdate(widget.model.dateList); 992 int ddate = Utils.getDdate(widget.model.dateList);
958 - String ddateSolt = Utils.getDdateSolt(widget.model.sunDateList); 993 + String ddateSolt =
  994 + Utils.getDdateSolt(widget.model.sunDateList);
959 String pnum = Utils.getPnum(widget.model.personNumList); 995 String pnum = Utils.getPnum(widget.model.personNumList);
960 996
961 widget.model.getNewTableList(context, '${ddate}', 997 widget.model.getNewTableList(context, '${ddate}',
@@ -19,47 +19,49 @@ class MessageLeftPage extends StatefulWidget { @@ -19,47 +19,49 @@ class MessageLeftPage extends StatefulWidget {
19 } 19 }
20 20
21 class MessageLeftPageState extends State<MessageLeftPage> { 21 class MessageLeftPageState extends State<MessageLeftPage> {
22 -  
23 EasyRefreshController _controller; 22 EasyRefreshController _controller;
24 23
25 @override 24 @override
26 void initState() { 25 void initState() {
27 // TODO: implement initState 26 // TODO: implement initState
28 super.initState(); 27 super.initState();
29 - bus.on("remove_untreated_message",(args){  
30 - MessageModel messageModel=Provider.of<MessageModel>(context,listen: false); 28 + bus.on("remove_untreated_message", (args) {
  29 + MessageModel messageModel =
  30 + Provider.of<MessageModel>(context, listen: false);
31 messageModel.removeUntreatedMessageByMid(args.toString()); 31 messageModel.removeUntreatedMessageByMid(args.toString());
32 - MessageDialogModel messageDialogModel=Provider.of<MessageDialogModel>(context,listen: false); 32 + MessageDialogModel messageDialogModel =
  33 + Provider.of<MessageDialogModel>(context, listen: false);
33 messageDialogModel.removeMessage(args.toString()); 34 messageDialogModel.removeMessage(args.toString());
34 }); 35 });
35 - _controller=EasyRefreshController();  
36 - WidgetsBinding.instance.addPostFrameCallback((_){ 36 + _controller = EasyRefreshController();
  37 + WidgetsBinding.instance.addPostFrameCallback((_) {
37 getUntreatedMessage(); 38 getUntreatedMessage();
38 }); 39 });
39 } 40 }
40 41
41 //获取未处理在线预订消息 42 //获取未处理在线预订消息
42 - getUntreatedMessage(){  
43 - UserModel userModel=Provider.of<UserModel>(context,listen: false);  
44 - Map<String,String> params={  
45 - "sid":userModel.user.sellerid,  
46 - "type_id":"10",  
47 - "status":"0",  
48 - "offset":"0",  
49 - "limit":"100", 43 + getUntreatedMessage({bool showLoading = true}) {
  44 + UserModel userModel = Provider.of<UserModel>(context, listen: false);
  45 + Map<String, String> params = {
  46 + "sid": userModel.user.sellerid,
  47 + "type_id": "10",
  48 + "status": "0",
  49 + "offset": "0",
  50 + "limit": "100",
50 }; 51 };
51 - MessageModel messageModel=Provider.of<MessageModel>(context,listen: false);  
52 - messageModel.getUntreatedMsg(context, params); 52 + MessageModel messageModel =
  53 + Provider.of<MessageModel>(context, listen: false);
  54 + messageModel.getUntreatedMsg(context, params, showLoading: showLoading);
53 } 55 }
54 56
55 @override 57 @override
56 Widget build(BuildContext context) { 58 Widget build(BuildContext context) {
57 // TODO: implement build 59 // TODO: implement build
58 return Consumer<MessageModel>( 60 return Consumer<MessageModel>(
59 - builder: (context,model,_){  
60 - if (model.pageState != PageState.Success) { 61 + builder: (context, model, _) {
  62 + if (model.unPageState != PageState.Success) {
61 return ExceptionPage( 63 return ExceptionPage(
62 - pageState: model.pageState, 64 + pageState: model.unPageState,
63 callback: () { 65 callback: () {
64 getUntreatedMessage(); 66 getUntreatedMessage();
65 }, 67 },
@@ -67,19 +69,21 @@ class MessageLeftPageState extends State<MessageLeftPage> { @@ -67,19 +69,21 @@ class MessageLeftPageState extends State<MessageLeftPage> {
67 emptyImg: "empty_search", 69 emptyImg: "empty_search",
68 showMsg: "加载中，请稍后...", 70 showMsg: "加载中，请稍后...",
69 ); 71 );
70 - }else{ 72 + } else {
71 return EasyRefresh.custom( 73 return EasyRefresh.custom(
72 controller: _controller, 74 controller: _controller,
73 slivers: [ 75 slivers: [
74 SliverList( 76 SliverList(
75 - delegate:  
76 - SliverChildBuilderDelegate((BuildContext context, int index) { 77 + delegate: SliverChildBuilderDelegate(
  78 + (BuildContext context, int index) {
77 return MessageItem(model.untreatedMsgs[index]); 79 return MessageItem(model.untreatedMsgs[index]);
78 - },childCount: model.untreatedMsgs.length), 80 + }, childCount: model.untreatedMsgs.length),
79 ) 81 )
80 - ],onRefresh: () async {  
81 - getUntreatedMessage();  
82 - },); 82 + ],
  83 + onRefresh: () async {
  84 + getUntreatedMessage(showLoading: false);
  85 + },
  86 + );
83 } 87 }
84 }, 88 },
85 ); 89 );
@@ -6,7 +6,7 @@ import 'package:one_key/widgets/v_empty_view.dart'; @@ -6,7 +6,7 @@ import 'package:one_key/widgets/v_empty_view.dart';
6 import 'message_left_page.dart'; 6 import 'message_left_page.dart';
7 import 'message_right_page.dart'; 7 import 'message_right_page.dart';
8 8
9 -class MessagePage extends StatefulWidget{ 9 +class MessagePage extends StatefulWidget {
10 @override 10 @override
11 State<StatefulWidget> createState() { 11 State<StatefulWidget> createState() {
12 // TODO: implement createState 12 // TODO: implement createState
@@ -14,7 +14,7 @@ class MessagePage extends StatefulWidget{ @@ -14,7 +14,7 @@ class MessagePage extends StatefulWidget{
14 } 14 }
15 } 15 }
16 16
17 -class MessagePageState extends State<MessagePage>{ 17 +class MessagePageState extends State<MessagePage> {
18 @override 18 @override
19 Widget build(BuildContext context) { 19 Widget build(BuildContext context) {
20 // TODO: implement build 20 // TODO: implement build
@@ -24,38 +24,48 @@ class MessagePageState extends State<MessagePage>{ @@ -24,38 +24,48 @@ class MessagePageState extends State<MessagePage>{
24 color: MyColours.color_f5f5f5, 24 color: MyColours.color_f5f5f5,
25 child: Column( 25 child: Column(
26 children: <Widget>[ 26 children: <Widget>[
27 - MyAppBar("消息中心",showBack: false,), 27 + MyAppBar(
  28 + "消息中心",
  29 + showBack: false,
  30 + ),
28 Expanded( 31 Expanded(
29 - child: DefaultTabController(length: 2, child: Column(  
30 - children: <Widget>[  
31 - Material(  
32 - color: MyColours.color_ffffff,  
33 - child: SizedBox(  
34 - width: double.infinity,  
35 - height: ScreenUtil().setHeight(76),  
36 - child: TabBar(tabs:[  
37 - Tab(text: "未处理",),  
38 - Tab(text: "已处理",)  
39 - ],  
40 - indicatorColor: MyColours.color_199095,  
41 - indicatorSize: TabBarIndicatorSize.label,  
42 - indicatorWeight: ScreenUtil().setHeight(4.0),  
43 - labelColor: MyColours.color_199095,  
44 - unselectedLabelColor: MyColours.color_999999,  
45 - labelStyle: TextStyle(fontSize: ScreenUtil().setSp(32),fontWeight: FontWeight.bold), 32 + child: DefaultTabController(
  33 + length: 2,
  34 + child: Column(
  35 + children: <Widget>[
  36 + Material(
  37 + color: MyColours.color_ffffff,
  38 + child: SizedBox(
  39 + width: double.infinity,
  40 + height: ScreenUtil().setHeight(76),
  41 + child: TabBar(
  42 + tabs: [
  43 + Tab(
  44 + text: "未处理",
  45 + ),
  46 + Tab(
  47 + text: "已处理",
  48 + )
  49 + ],
  50 + indicatorColor: MyColours.color_199095,
  51 + indicatorSize: TabBarIndicatorSize.label,
  52 + indicatorWeight: ScreenUtil().setHeight(4.0),
  53 + labelColor: MyColours.color_199095,
  54 + unselectedLabelColor: MyColours.color_999999,
  55 + labelStyle: TextStyle(
  56 + fontSize: ScreenUtil().setSp(32),
  57 + fontWeight: FontWeight.bold),
  58 + ),
  59 + ),
46 ), 60 ),
47 - ),  
48 - ),  
49 - VEmptyView(11),  
50 - Expanded(  
51 - flex: 1,  
52 - child: TabBarView(children: [  
53 - MessageLeftPage(),  
54 - MessageRightPage()  
55 - ]),  
56 - )  
57 - ],  
58 - )), 61 + VEmptyView(11),
  62 + Expanded(
  63 + flex: 1,
  64 + child: TabBarView(
  65 + children: [MessageLeftPage(), MessageRightPage()]),
  66 + )
  67 + ],
  68 + )),
59 ) 69 )
60 ], 70 ],
61 ), 71 ),
@@ -8,50 +8,49 @@ import 'package:one_key/widgets/page_error.dart'; @@ -8,50 +8,49 @@ import 'package:one_key/widgets/page_error.dart';
8 import 'package:one_key/widgets/page_exception.dart'; 8 import 'package:one_key/widgets/page_exception.dart';
9 import 'package:provider/provider.dart'; 9 import 'package:provider/provider.dart';
10 10
11 -class MessageRightPage extends StatefulWidget{ 11 +class MessageRightPage extends StatefulWidget {
12 @override 12 @override
13 State<StatefulWidget> createState() { 13 State<StatefulWidget> createState() {
14 // TODO: implement createState 14 // TODO: implement createState
15 return new MessageRightPageState(); 15 return new MessageRightPageState();
16 } 16 }
17 -  
18 } 17 }
19 18
20 -class MessageRightPageState extends State<MessageRightPage>{  
21 - 19 +class MessageRightPageState extends State<MessageRightPage> {
22 EasyRefreshController _controller; 20 EasyRefreshController _controller;
23 21
24 - int offset=0;//当前页数 22 + int offset = 0; //当前页数
25 23
26 @override 24 @override
27 void initState() { 25 void initState() {
28 // TODO: implement initState 26 // TODO: implement initState
29 super.initState(); 27 super.initState();
30 - _controller=EasyRefreshController();  
31 - WidgetsBinding.instance.addPostFrameCallback((_){ 28 + _controller = EasyRefreshController();
  29 + WidgetsBinding.instance.addPostFrameCallback((_) {
32 getTreatedMessage(); 30 getTreatedMessage();
33 }); 31 });
34 } 32 }
35 33
36 //获取未处理在线预订消息 34 //获取未处理在线预订消息
37 - getTreatedMessage(){  
38 - UserModel userModel=Provider.of<UserModel>(context,listen: false);  
39 - Map<String,String> params={  
40 - "sid":userModel.user.sellerid,  
41 - "type_id":"10",  
42 - "status":"1",  
43 - "offset":offset.toString(),  
44 - "limit":"10", 35 + getTreatedMessage({bool showLoading = true}) {
  36 + UserModel userModel = Provider.of<UserModel>(context, listen: false);
  37 + Map<String, String> params = {
  38 + "sid": userModel.user.sellerid,
  39 + "type_id": "10",
  40 + "status": "1",
  41 + "offset": offset.toString(),
  42 + "limit": "10",
45 }; 43 };
46 - MessageModel messageModel=Provider.of<MessageModel>(context,listen: false);  
47 - messageModel.getTreatedMsg(context, params); 44 + MessageModel messageModel =
  45 + Provider.of<MessageModel>(context, listen: false);
  46 + messageModel.getTreatedMsg(context, params, showLoading: showLoading);
48 } 47 }
49 48
50 @override 49 @override
51 Widget build(BuildContext context) { 50 Widget build(BuildContext context) {
52 // TODO: implement build 51 // TODO: implement build
53 return Consumer<MessageModel>( 52 return Consumer<MessageModel>(
54 - builder: (context,model,_){ 53 + builder: (context, model, _) {
55 if (model.pageState != PageState.Success) { 54 if (model.pageState != PageState.Success) {
56 return ExceptionPage( 55 return ExceptionPage(
57 pageState: model.pageState, 56 pageState: model.pageState,
@@ -62,21 +61,26 @@ class MessageRightPageState extends State<MessageRightPage>{ @@ -62,21 +61,26 @@ class MessageRightPageState extends State<MessageRightPage>{
62 emptyImg: "empty_search", 61 emptyImg: "empty_search",
63 showMsg: "加载中，请稍后...", 62 showMsg: "加载中，请稍后...",
64 ); 63 );
65 - }else{ 64 + } else {
66 return EasyRefresh.custom( 65 return EasyRefresh.custom(
67 controller: _controller, 66 controller: _controller,
68 slivers: [ 67 slivers: [
69 SliverList( 68 SliverList(
70 - delegate:  
71 - SliverChildBuilderDelegate((BuildContext context, int index) {  
72 - return MessageItem(model.treatedMsgs[index],isTreated: true,);  
73 - },childCount: model.treatedMsgs.length), 69 + delegate: SliverChildBuilderDelegate(
  70 + (BuildContext context, int index) {
  71 + return MessageItem(
  72 + model.treatedMsgs[index],
  73 + isTreated: true,
  74 + );
  75 + }, childCount: model.treatedMsgs.length),
74 ) 76 )
75 - ],onRefresh: () async {  
76 - getTreatedMessage();  
77 - },); 77 + ],
  78 + onRefresh: () async {
  79 + getTreatedMessage(showLoading: false);
  80 + },
  81 + );
78 } 82 }
79 }, 83 },
80 ); 84 );
81 } 85 }
82 -}  
  86 +}
@@ -8,71 +8,73 @@ import 'package:one_key/net/dio_util.dart'; @@ -8,71 +8,73 @@ import 'package:one_key/net/dio_util.dart';
8 import 'package:one_key/net/http_url.dart'; 8 import 'package:one_key/net/http_url.dart';
9 import 'package:one_key/utils/utils.dart'; 9 import 'package:one_key/utils/utils.dart';
10 10
  11 +class MessageModel extends ChangeNotifier {
  12 + List<Message> untreatedMsgs = []; //未处理在线预订消息
  13 + List<Message> treatedMsgs = []; //已处理在线预订消息
11 14
12 -class MessageModel extends ChangeNotifier{  
13 -  
14 - List<Message> untreatedMsgs=[];//未处理在线预订消息  
15 - List<Message> treatedMsgs=[];//已处理在线预订消息  
16 - 15 + PageState unPageState = PageState.Loading;
17 PageState pageState = PageState.Loading; 16 PageState pageState = PageState.Loading;
18 -  
19 //获取未处理在线预订消息 17 //获取未处理在线预订消息
20 - getUntreatedMsg(BuildContext context,Map<String,String> params) async {  
21 - pageState = PageState.Loading; 18 + getUntreatedMsg(BuildContext context, Map<String, String> params,
  19 + {showLoading = true}) async {
  20 + if (showLoading) {
  21 + unPageState = PageState.Loading;
  22 + }
  23 +
22 notifyListeners(); 24 notifyListeners();
23 BaseResp<List> baseResp = await DioUtil() 25 BaseResp<List> baseResp = await DioUtil()
24 .request<List>(context, Method.get, HttpUrl.get_message_list, 26 .request<List>(context, Method.get, HttpUrl.get_message_list,
25 - data: params,showLoading: false) 27 + data: params, showLoading: false)
26 .catchError((error) { 28 .catchError((error) {
27 print(error.toString()); 29 print(error.toString());
28 if (error is MyError) { 30 if (error is MyError) {
29 switch (error.type) { 31 switch (error.type) {
30 case 1: 32 case 1:
31 - pageState = PageState.ConnectivityError; 33 + unPageState = PageState.ConnectivityError;
32 break; 34 break;
33 case 2: 35 case 2:
34 - pageState = PageState.ConnectivityTimeOut; 36 + unPageState = PageState.ConnectivityTimeOut;
35 break; 37 break;
36 default: 38 default:
37 - pageState = PageState.ConnectivityError; 39 + unPageState = PageState.ConnectivityError;
38 break; 40 break;
39 } 41 }
40 } 42 }
41 notifyListeners(); 43 notifyListeners();
42 }); 44 });
43 - if (baseResp!=null&&baseResp.code == Constant.status_success) {  
44 - untreatedMsgs=baseResp.data.map<Message>((value){ 45 + if (baseResp != null && baseResp.code == Constant.status_success) {
  46 + untreatedMsgs = baseResp.data.map<Message>((value) {
45 return Message.fromJson(value); 47 return Message.fromJson(value);
46 }).toList(); 48 }).toList();
47 - untreatedMsgs.removeWhere((message){  
48 - if(message.message_type.toString()=="10"){  
49 - if(message.status=="4"){ 49 + untreatedMsgs.removeWhere((message) {
  50 + if (message.message_type.toString() == "10") {
  51 + if (message.status == "4") {
50 return true; 52 return true;
51 } 53 }
52 return false; 54 return false;
53 - }else if(message.message_type.toString()=="11"){ 55 + } else if (message.message_type.toString() == "11") {
54 return false; 56 return false;
55 } 57 }
56 return true; 58 return true;
57 }); 59 });
58 if (untreatedMsgs.isEmpty) { 60 if (untreatedMsgs.isEmpty) {
59 - pageState = PageState.Empty; 61 + unPageState = PageState.Empty;
60 } else { 62 } else {
61 - pageState = PageState.Success; 63 + unPageState = PageState.Success;
62 } 64 }
63 notifyListeners(); 65 notifyListeners();
64 } 66 }
65 } 67 }
66 68
67 - //获取未处理在线预订消息  
68 - getTreatedMsg(BuildContext context,Map<String,String> params) async {  
69 - if (params["offset"] == "0") { 69 + //获取已处理在线预订消息
  70 + getTreatedMsg(BuildContext context, Map<String, String> params,{showLoading = true}) async {
  71 + if (params["offset"] == "0" && showLoading) {
70 pageState = PageState.Loading; 72 pageState = PageState.Loading;
71 notifyListeners(); 73 notifyListeners();
72 } 74 }
73 BaseResp<List> baseResp = await DioUtil() 75 BaseResp<List> baseResp = await DioUtil()
74 .request<List>(context, Method.get, HttpUrl.get_message_list, 76 .request<List>(context, Method.get, HttpUrl.get_message_list,
75 - data: params,showLoading: false) 77 + data: params, showLoading: false)
76 .catchError((error) { 78 .catchError((error) {
77 print(error.toString()); 79 print(error.toString());
78 if (error is MyError) { 80 if (error is MyError) {
@@ -90,18 +92,20 @@ class MessageModel extends ChangeNotifier{ @@ -90,18 +92,20 @@ class MessageModel extends ChangeNotifier{
90 } 92 }
91 notifyListeners(); 93 notifyListeners();
92 }); 94 });
93 - if (baseResp!=null&&baseResp.code == Constant.status_success) {  
94 - if(params["offset"]=="0"){//第一页  
95 - treatedMsgs=baseResp.data.map<Message>((value){ 95 + if (baseResp != null && baseResp.code == Constant.status_success) {
  96 + if (params["offset"] == "0") {
  97 + //第一页
  98 + treatedMsgs = baseResp.data.map<Message>((value) {
96 return Message.fromJson(value); 99 return Message.fromJson(value);
97 }).toList(); 100 }).toList();
98 - }else{  
99 - treatedMsgs.addAll(baseResp.data.map<Message>((value){ 101 + } else {
  102 + treatedMsgs.addAll(baseResp.data.map<Message>((value) {
100 return Message.fromJson(value); 103 return Message.fromJson(value);
101 }).toList()); 104 }).toList());
102 } 105 }
103 - treatedMsgs.removeWhere((message){  
104 - if(message.message_type.toString()=="10"||message.message_type.toString()=="11"){ 106 + treatedMsgs.removeWhere((message) {
  107 + if (message.message_type.toString() == "10" ||
  108 + message.message_type.toString() == "11") {
105 return false; 109 return false;
106 } 110 }
107 return true; 111 return true;
@@ -116,8 +120,8 @@ class MessageModel extends ChangeNotifier{ @@ -116,8 +120,8 @@ class MessageModel extends ChangeNotifier{
116 } 120 }
117 121
118 //移除未处理在线预订消息 122 //移除未处理在线预订消息
119 - removeUntreatedMessageByMid(String mid){  
120 - untreatedMsgs.removeWhere((message)=>message.id==mid); 123 + removeUntreatedMessageByMid(String mid) {
  124 + untreatedMsgs.removeWhere((message) => message.id == mid);
121 notifyListeners(); 125 notifyListeners();
122 } 126 }
123 } 127 }