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