diff --git a/README.md b/README.md index c45a6ae..3e3f654 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ socket.on("connect") {data in socket.emit("dataTest", args: data) // Sending multiple args - socket.emitMultiple("multTest", args: [data], 1.4, 1, "true", + socket.emit("multTest", args: [data], 1.4, 1, "true", true, ["test": data], data) } diff --git a/SwiftIO/SocketIOClient.swift b/SwiftIO/SocketIOClient.swift index 5349b02..dc016cc 100644 --- a/SwiftIO/SocketIOClient.swift +++ b/SwiftIO/SocketIOClient.swift @@ -101,84 +101,10 @@ class SocketIOClient: NSObject, SRWebSocketDelegate { return mutData } - // Sends a message - // If a message contains binary we have to send those - // seperately. - func emit(event:String, args:AnyObject? = nil) { - if !self.connected { - return - } - - var frame:Event! - var str:String - - if let dict = args as? NSDictionary { - // Check for binary data - let (newDict, hadBinary, binaryDatas) = self.parseNSDictionary(dict) - if hadBinary { - str = Event.createMessageForEvent(event, withArgs: [newDict], hasBinary: true, withDatas: binaryDatas!.count) - self.io?.send(str) - - for data in binaryDatas! { - let sendData = self.createBinaryDataForSend(data) - self.io?.send(sendData) - } - - return - } - } else if let binaryData = args as? NSData { - // args is just binary - str = Event.createMessageForEvent(event, withArgs: [["_placeholder": true, "num": 0]], - hasBinary: true, withDatas: 1) - - self.io?.send(str) - let sendData = self.createBinaryDataForSend(binaryData) - self.io?.send(sendData) - - return - } else if let arr = args as? NSArray { - var hadBinary = false - var placeholders = [AnyObject](count: arr.count, repeatedValue: 1) - var datas = [NSData]() - var placeNum = 0 - - for i in 0..