xt / Flutter-ReserveApp · Commits

Go to a project

Commit 450c5e0e7b47946c681a1c3e2717b3983085aaa4

Authored by “gaiyaguang”
1 parent 0d9e1994

合并

Inline Side-by-side
Showing 3 changed files with 76 additions and 66 deletions
@@ -57,9 +57,9 @@ class MessageLeftPageState extends State<MessageLeftPage> { @@ -57,9 +57,9 @@ class MessageLeftPageState extends State<MessageLeftPage> {
57 // TODO: implement build 57 // TODO: implement build
58 return Consumer<MessageModel>( 58 return Consumer<MessageModel>(
59 builder: (context,model,_){ 59 builder: (context,model,_){
60 - if (model.pageState != PageState.Success) { 60 + if (model.unPageState != PageState.Success) {
61 return ExceptionPage( 61 return ExceptionPage(
62 - pageState: model.pageState, 62 + pageState: model.unPageState,
63 callback: () { 63 callback: () {
64 getUntreatedMessage(); 64 getUntreatedMessage();
65 }, 65 },
@@ -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 ),
@@ -9,71 +9,69 @@ import 'package:one_key/net/http_url.dart'; @@ -9,71 +9,69 @@ import 'package:one_key/net/http_url.dart';
9 import 'package:one_key/utils/log_util.dart'; 9 import 'package:one_key/utils/log_util.dart';
10 import 'package:one_key/utils/utils.dart'; 10 import 'package:one_key/utils/utils.dart';
11 11
  12 +class MessageModel extends ChangeNotifier {
  13 + List<Message> untreatedMsgs = []; //未处理在线预订消息
  14 + List<Message> treatedMsgs = []; //已处理在线预订消息
12 15
13 -class MessageModel extends ChangeNotifier{  
14 -  
15 - List<Message> untreatedMsgs=[];//未处理在线预订消息  
16 - List<Message> treatedMsgs=[];//已处理在线预订消息  
17 - 16 + PageState unPageState = PageState.Loading;
18 PageState pageState = PageState.Loading; 17 PageState pageState = PageState.Loading;
19 -  
20 //获取未处理在线预订消息 18 //获取未处理在线预订消息
21 - getUntreatedMsg(BuildContext context,Map<String,String> params) async {  
22 - pageState = PageState.Loading; 19 + getUntreatedMsg(BuildContext context, Map<String, String> params) async {
  20 + unPageState = PageState.Loading;
23 notifyListeners(); 21 notifyListeners();
24 BaseResp<List> baseResp = await DioUtil() 22 BaseResp<List> baseResp = await DioUtil()
25 .request<List>(context, Method.get, HttpUrl.get_message_list, 23 .request<List>(context, Method.get, HttpUrl.get_message_list,
26 - data: params,showLoading: false) 24 + data: params, showLoading: false)
27 .catchError((error) { 25 .catchError((error) {
28 print(error.toString()); 26 print(error.toString());
29 if (error is MyError) { 27 if (error is MyError) {
30 switch (error.type) { 28 switch (error.type) {
31 case 1: 29 case 1:
32 - pageState = PageState.ConnectivityError; 30 + unPageState = PageState.ConnectivityError;
33 break; 31 break;
34 case 2: 32 case 2:
35 - pageState = PageState.ConnectivityTimeOut; 33 + unPageState = PageState.ConnectivityTimeOut;
36 break; 34 break;
37 default: 35 default:
38 - pageState = PageState.ConnectivityError; 36 + unPageState = PageState.ConnectivityError;
39 break; 37 break;
40 } 38 }
41 } 39 }
42 notifyListeners(); 40 notifyListeners();
43 }); 41 });
44 - if (baseResp!=null&&baseResp.code == Constant.status_success) {  
45 - untreatedMsgs=baseResp.data.map<Message>((value){ 42 + if (baseResp != null && baseResp.code == Constant.status_success) {
  43 + untreatedMsgs = baseResp.data.map<Message>((value) {
46 return Message.fromJson(value); 44 return Message.fromJson(value);
47 }).toList(); 45 }).toList();
48 - untreatedMsgs.removeWhere((message){  
49 - if(message.message_type.toString()=="10"){  
50 - if(message.status=="4"){ 46 + untreatedMsgs.removeWhere((message) {
  47 + if (message.message_type.toString() == "10") {
  48 + if (message.status == "4") {
51 return true; 49 return true;
52 } 50 }
53 return false; 51 return false;
54 - }else if(message.message_type.toString()=="11"){ 52 + } else if (message.message_type.toString() == "11") {
55 return false; 53 return false;
56 } 54 }
57 return true; 55 return true;
58 }); 56 });
59 if (untreatedMsgs.isEmpty) { 57 if (untreatedMsgs.isEmpty) {
60 - pageState = PageState.Empty; 58 + unPageState = PageState.Empty;
61 } else { 59 } else {
62 - pageState = PageState.Success; 60 + unPageState = PageState.Success;
63 } 61 }
64 notifyListeners(); 62 notifyListeners();
65 } 63 }
66 } 64 }
67 65
68 - //获取未处理在线预订消息  
69 - getTreatedMsg(BuildContext context,Map<String,String> params) async { 66 + //获取已处理在线预订消息
  67 + getTreatedMsg(BuildContext context, Map<String, String> params) async {
70 if (params["offset"] == "0") { 68 if (params["offset"] == "0") {
71 pageState = PageState.Loading; 69 pageState = PageState.Loading;
72 notifyListeners(); 70 notifyListeners();
73 } 71 }
74 BaseResp<List> baseResp = await DioUtil() 72 BaseResp<List> baseResp = await DioUtil()
75 .request<List>(context, Method.get, HttpUrl.get_message_list, 73 .request<List>(context, Method.get, HttpUrl.get_message_list,
76 - data: params,showLoading: false) 74 + data: params, showLoading: false)
77 .catchError((error) { 75 .catchError((error) {
78 print(error.toString()); 76 print(error.toString());
79 if (error is MyError) { 77 if (error is MyError) {
@@ -91,18 +89,20 @@ class MessageModel extends ChangeNotifier{ @@ -91,18 +89,20 @@ class MessageModel extends ChangeNotifier{
91 } 89 }
92 notifyListeners(); 90 notifyListeners();
93 }); 91 });
94 - if (baseResp!=null&&baseResp.code == Constant.status_success) {  
95 - if(params["offset"]=="0"){//第一页  
96 - treatedMsgs=baseResp.data.map<Message>((value){ 92 + if (baseResp != null && baseResp.code == Constant.status_success) {
  93 + if (params["offset"] == "0") {
  94 + //第一页
  95 + treatedMsgs = baseResp.data.map<Message>((value) {
97 return Message.fromJson(value); 96 return Message.fromJson(value);
98 }).toList(); 97 }).toList();
99 - }else{  
100 - treatedMsgs.addAll(baseResp.data.map<Message>((value){ 98 + } else {
  99 + treatedMsgs.addAll(baseResp.data.map<Message>((value) {
101 return Message.fromJson(value); 100 return Message.fromJson(value);
102 }).toList()); 101 }).toList());
103 } 102 }
104 - treatedMsgs.removeWhere((message){  
105 - if(message.message_type.toString()=="10"||message.message_type.toString()=="11"){ 103 + treatedMsgs.removeWhere((message) {
  104 + if (message.message_type.toString() == "10" ||
  105 + message.message_type.toString() == "11") {
106 return false; 106 return false;
107 } 107 }
108 return true; 108 return true;
@@ -117,8 +117,8 @@ class MessageModel extends ChangeNotifier{ @@ -117,8 +117,8 @@ class MessageModel extends ChangeNotifier{
117 } 117 }
118 118
119 //移除未处理在线预订消息 119 //移除未处理在线预订消息
120 - removeUntreatedMessageByMid(String mid){  
121 - untreatedMsgs.removeWhere((message)=>message.id==mid); 120 + removeUntreatedMessageByMid(String mid) {
  121 + untreatedMsgs.removeWhere((message) => message.id == mid);
122 notifyListeners(); 122 notifyListeners();
123 } 123 }
124 } 124 }