clean up
This commit is contained in:
parent
feea80a2f9
commit
f0a45e13e2
@ -98,16 +98,15 @@ struct SocketPacket {
|
||||
|
||||
for arg in data {
|
||||
if arg is NSDictionary || arg is [AnyObject] {
|
||||
let jsonSend: NSData?
|
||||
do {
|
||||
jsonSend = try NSJSONSerialization.dataWithJSONObject(arg,
|
||||
let jsonSend = try NSJSONSerialization.dataWithJSONObject(arg,
|
||||
options: NSJSONWritingOptions(rawValue: 0))
|
||||
} catch {
|
||||
jsonSend = nil
|
||||
}
|
||||
let jsonString = NSString(data: jsonSend!, encoding: NSUTF8StringEncoding)
|
||||
let jsonString = NSString(data: jsonSend, encoding: NSUTF8StringEncoding)
|
||||
|
||||
message += jsonString! as String + ","
|
||||
} catch {
|
||||
print("Error creating JSON object in SocketPacket.completeMessage")
|
||||
}
|
||||
} else if var str = arg as? String {
|
||||
str = str["\n"] ~= "\\\\n"
|
||||
str = str["\r"] ~= "\\\\r"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user