From f99cf1d5cc50407394501853be06cb39f38a092c Mon Sep 17 00:00:00 2001
From: 单军华 <WindShan@danjunhuas-MacBook-Pro.local>
Date: Wed, 28 Mar 2018 14:09:19 +0800
Subject: [PATCH] 界面更换与适配调整
---
pregnancy_guard/BaseProject/Global/Global.m | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/pregnancy_guard/BaseProject/Global/Global.m b/pregnancy_guard/BaseProject/Global/Global.m
index 224db9f..c9c0795 100644
--- a/pregnancy_guard/BaseProject/Global/Global.m
+++ b/pregnancy_guard/BaseProject/Global/Global.m
@@ -17,6 +17,8 @@
Hotel * _curHotel_Id;
Room * _sel_room;
int _curPage;
+BOOL _bConnectSuccess;
+NSString * _curReceiveHexValue;
+ (Global *)global
{
@@ -181,20 +183,29 @@
if(responseBody != nil)
{
BaseResModel *model = [[BaseResModel alloc] init];
+ NSMutableDictionary * data = [responseBody objectForKey:@"data"];
- if ([[responseBody allKeys] containsObject:@"code"])
+ if( data.count == 0 )
{
- model.code = [[responseBody objectForKey:@"code"] intValue];
+ model.desc = [responseBody objectForKey:@"msg"];
+ model.code = -1;
}
else
{
- model.code = -1;
+ if ([[data allKeys] containsObject:@"code"])
+ {
+ model.code = [[data objectForKey:@"code"] intValue];
+ }
+ else
+ {
+ model.code = -1;
+ }
+
+ model.desc = [data objectForKey:@"msg"];
+ model.content = [data objectForKey:@"info"];
}
- model.desc = [responseBody objectForKey:@"desc"];
- model.content = [responseBody objectForKey:@"content"];
-
- return model;
+ return model;
}
else
{
--
Gitblit v1.8.0