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> {
// TODO: implement build
return Consumer<MessageModel>(
builder: (context,model,_){
if (model.pageState != PageState.Success) {
if (model.unPageState != PageState.Success) {
return ExceptionPage(
pageState: model.pageState,
pageState: model.unPageState,
callback: () {
getUntreatedMessage();
},
... ...
... ... @@ -6,7 +6,7 @@ import 'package:one_key/widgets/v_empty_view.dart';
import 'message_left_page.dart';
import 'message_right_page.dart';
class MessagePage extends StatefulWidget{
class MessagePage extends StatefulWidget {
@override
State<StatefulWidget> createState() {
// TODO: implement createState
... ... @@ -14,7 +14,7 @@ class MessagePage extends StatefulWidget{
}
}
class MessagePageState extends State<MessagePage>{
class MessagePageState extends State<MessagePage> {
@override
Widget build(BuildContext context) {
// TODO: implement build
... ... @@ -24,38 +24,48 @@ class MessagePageState extends State<MessagePage>{
color: MyColours.color_f5f5f5,
child: Column(
children: <Widget>[
MyAppBar("消息中心",showBack: false,),
MyAppBar(
"消息中心",
showBack: false,
),
Expanded(
child: DefaultTabController(length: 2, child: Column(
children: <Widget>[
Material(
color: MyColours.color_ffffff,
child: SizedBox(
width: double.infinity,
height: ScreenUtil().setHeight(76),
child: TabBar(tabs:[
Tab(text: "未处理",),
Tab(text: "已处理",)
],
indicatorColor: MyColours.color_199095,
indicatorSize: TabBarIndicatorSize.label,
indicatorWeight: ScreenUtil().setHeight(4.0),
labelColor: MyColours.color_199095,
unselectedLabelColor: MyColours.color_999999,
labelStyle: TextStyle(fontSize: ScreenUtil().setSp(32),fontWeight: FontWeight.bold),
child: DefaultTabController(
length: 2,
child: Column(
children: <Widget>[
Material(
color: MyColours.color_ffffff,
child: SizedBox(
width: double.infinity,
height: ScreenUtil().setHeight(76),
child: TabBar(
tabs: [
Tab(
text: "未处理",
),
Tab(
text: "已处理",
)
],
indicatorColor: MyColours.color_199095,
indicatorSize: TabBarIndicatorSize.label,
indicatorWeight: ScreenUtil().setHeight(4.0),
labelColor: MyColours.color_199095,
unselectedLabelColor: MyColours.color_999999,
labelStyle: TextStyle(
fontSize: ScreenUtil().setSp(32),
fontWeight: FontWeight.bold),
),
),
),
),
),
VEmptyView(11),
Expanded(
flex: 1,
child: TabBarView(children: [
MessageLeftPage(),
MessageRightPage()
]),
)
],
)),
VEmptyView(11),
Expanded(
flex: 1,
child: TabBarView(
children: [MessageLeftPage(), MessageRightPage()]),
)
],
)),
)
],
),
... ...
... ... @@ -9,71 +9,69 @@ import 'package:one_key/net/http_url.dart';
import 'package:one_key/utils/log_util.dart';
import 'package:one_key/utils/utils.dart';
class MessageModel extends ChangeNotifier {
List<Message> untreatedMsgs = []; //未处理在线预订消息
List<Message> treatedMsgs = []; //已处理在线预订消息
class MessageModel extends ChangeNotifier{
List<Message> untreatedMsgs=[];//未处理在线预订消息
List<Message> treatedMsgs=[];//已处理在线预订消息
PageState unPageState = PageState.Loading;
PageState pageState = PageState.Loading;
//获取未处理在线预订消息
getUntreatedMsg(BuildContext context,Map<String,String> params) async {
pageState = PageState.Loading;
getUntreatedMsg(BuildContext context, Map<String, String> params) async {
unPageState = PageState.Loading;
notifyListeners();
BaseResp<List> baseResp = await DioUtil()
.request<List>(context, Method.get, HttpUrl.get_message_list,
data: params,showLoading: false)
data: params, showLoading: false)
.catchError((error) {
print(error.toString());
if (error is MyError) {
switch (error.type) {
case 1:
pageState = PageState.ConnectivityError;
unPageState = PageState.ConnectivityError;
break;
case 2:
pageState = PageState.ConnectivityTimeOut;
unPageState = PageState.ConnectivityTimeOut;
break;
default:
pageState = PageState.ConnectivityError;
unPageState = PageState.ConnectivityError;
break;
}
}
notifyListeners();
});
if (baseResp!=null&&baseResp.code == Constant.status_success) {
untreatedMsgs=baseResp.data.map<Message>((value){
if (baseResp != null && baseResp.code == Constant.status_success) {
untreatedMsgs = baseResp.data.map<Message>((value) {
return Message.fromJson(value);
}).toList();
untreatedMsgs.removeWhere((message){
if(message.message_type.toString()=="10"){
if(message.status=="4"){
untreatedMsgs.removeWhere((message) {
if (message.message_type.toString() == "10") {
if (message.status == "4") {
return true;
}
return false;
}else if(message.message_type.toString()=="11"){
} else if (message.message_type.toString() == "11") {
return false;
}
return true;
});
if (untreatedMsgs.isEmpty) {
pageState = PageState.Empty;
unPageState = PageState.Empty;
} else {
pageState = PageState.Success;
unPageState = PageState.Success;
}
notifyListeners();
}
}
//获取未处理在线预订消息
getTreatedMsg(BuildContext context,Map<String,String> params) async {
//获取已处理在线预订消息
getTreatedMsg(BuildContext context, Map<String, String> params) async {
if (params["offset"] == "0") {
pageState = PageState.Loading;
notifyListeners();
}
BaseResp<List> baseResp = await DioUtil()
.request<List>(context, Method.get, HttpUrl.get_message_list,
data: params,showLoading: false)
data: params, showLoading: false)
.catchError((error) {
print(error.toString());
if (error is MyError) {
... ... @@ -91,18 +89,20 @@ class MessageModel extends ChangeNotifier{
}
notifyListeners();
});
if (baseResp!=null&&baseResp.code == Constant.status_success) {
if(params["offset"]=="0"){//第一页
treatedMsgs=baseResp.data.map<Message>((value){
if (baseResp != null && baseResp.code == Constant.status_success) {
if (params["offset"] == "0") {
//第一页
treatedMsgs = baseResp.data.map<Message>((value) {
return Message.fromJson(value);
}).toList();
}else{
treatedMsgs.addAll(baseResp.data.map<Message>((value){
} else {
treatedMsgs.addAll(baseResp.data.map<Message>((value) {
return Message.fromJson(value);
}).toList());
}
treatedMsgs.removeWhere((message){
if(message.message_type.toString()=="10"||message.message_type.toString()=="11"){
treatedMsgs.removeWhere((message) {
if (message.message_type.toString() == "10" ||
message.message_type.toString() == "11") {
return false;
}
return true;
... ... @@ -117,8 +117,8 @@ class MessageModel extends ChangeNotifier{
}
//移除未处理在线预订消息
removeUntreatedMessageByMid(String mid){
untreatedMsgs.removeWhere((message)=>message.id==mid);
removeUntreatedMessageByMid(String mid) {
untreatedMsgs.removeWhere((message) => message.id == mid);
notifyListeners();
}
}
... ...