iPhone x 屏幕适配修改

单军华

2018-05-04 25f409185a53e5e7beb17518a684298d92d31b3f

 pregnancy_guard/BaseProject/Global/Global.m

@@ -12,11 +12,10 @@


NSMutableDictionary * _loginUser;
DeviceSpareModel * _selectedDevice;
NSString * _curDeviceName;
Hotel * _curHotel_Id;
Room * _sel_room;
int  _curPage;
BOOL  _bConnectSuccess;
NSString * _curReceiveHexValue;

+ (Global *)global
{
@@ -27,11 +26,6 @@
    });
    
    return s_global;
}

+(void)setCurrentDevice:(DeviceSpareModel*) device
{
    _selectedDevice = device;
}

+ (BOOL)isSystemLowIOS11
@@ -181,20 +175,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
    {
@@ -202,5 +205,53 @@
    }
}

// 字典转json字符串方法

-(NSString *)convertToJsonData:(NSDictionary *)dict

{
    NSError *error;
    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:dict options:NSJSONWritingPrettyPrinted error:&error];
    
    NSString *jsonString;
    
    if (!jsonData) {
        
        NSLog(@"%@",error);
        
    }else{
        
        jsonString = [[NSString alloc]initWithData:jsonData encoding:NSUTF8StringEncoding];
        
    }
    
    NSMutableString *mutStr = [NSMutableString stringWithString:jsonString];
    NSRange range = {0,jsonString.length};
    
    //去掉字符串中的空格
    [mutStr replaceOccurrencesOfString:@" " withString:@"" options:NSLiteralSearch range:range];
    
    NSRange range2 = {0,mutStr.length};
    //去掉字符串中的换行符
    [mutStr replaceOccurrencesOfString:@"\n" withString:@"" options:NSLiteralSearch range:range2];
    
    return mutStr;
    
}

+ (NSString *)arrayToJSONString:(NSDictionary *)array

{
    NSError *error = nil;
    //    NSMutableArray *muArray = [NSMutableArray array];
    //    for (NSString *userId in array) {
    //        [muArray addObject:[NSString stringWithFormat:@"\"%@\"", userId]];
    //    }
    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:array options:NSJSONWritingPrettyPrinted error:&error];
    NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
    //    NSString *jsonTemp = [jsonString stringByReplacingOccurrencesOfString:@"\n" withString:@""];
    //    NSString *jsonResult = [jsonTemp stringByReplacingOccurrencesOfString:@" " withString:@""];
    //    NSLog(@"json array is: %@", jsonResult);
    return jsonString;
}
@end