xt / Flutter-ReserveApp · Commits

Go to a project

Commit d7fd01923612587edf13a1d43a676ab67d860f6e

Authored by “gaiyaguang”
1 parent a73f1cd2

合并

Inline Side-by-side
Showing 3 changed files with 67 additions and 55 deletions
@@ -19,44 +19,46 @@ class MessageLeftPage extends StatefulWidget { @@ -19,44 +19,46 @@ 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,_){ 61 + builder: (context, model, _) {
60 if (model.unPageState != PageState.Success) { 62 if (model.unPageState != PageState.Success) {
61 return ExceptionPage( 63 return ExceptionPage(
62 pageState: model.unPageState, 64 pageState: model.unPageState,
@@ -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 );
@@ -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 +}
@@ -15,8 +15,12 @@ class MessageModel extends ChangeNotifier { @@ -15,8 +15,12 @@ class MessageModel extends ChangeNotifier {
15 PageState unPageState = PageState.Loading; 15 PageState unPageState = PageState.Loading;
16 PageState pageState = PageState.Loading; 16 PageState pageState = PageState.Loading;
17 //获取未处理在线预订消息 17 //获取未处理在线预订消息
18 - getUntreatedMsg(BuildContext context, Map<String, String> params) async {  
19 - unPageState = PageState.Loading; 18 + getUntreatedMsg(BuildContext context, Map<String, String> params,
  19 + {showLoading = true}) async {
  20 + if (showLoading) {
  21 + unPageState = PageState.Loading;
  22 + }
  23 +
20 notifyListeners(); 24 notifyListeners();
21 BaseResp<List> baseResp = await DioUtil() 25 BaseResp<List> baseResp = await DioUtil()
22 .request<List>(context, Method.get, HttpUrl.get_message_list, 26 .request<List>(context, Method.get, HttpUrl.get_message_list,
@@ -63,8 +67,8 @@ class MessageModel extends ChangeNotifier { @@ -63,8 +67,8 @@ class MessageModel extends ChangeNotifier {
63 } 67 }
64 68
65 //获取已处理在线预订消息 69 //获取已处理在线预订消息
66 - getTreatedMsg(BuildContext context, Map<String, String> params) async {  
67 - if (params["offset"] == "0") { 70 + getTreatedMsg(BuildContext context, Map<String, String> params,{showLoading = true}) async {
  71 + if (params["offset"] == "0" && showLoading) {
68 pageState = PageState.Loading; 72 pageState = PageState.Loading;
69 notifyListeners(); 73 notifyListeners();
70 } 74 }