Merge remote-tracking branch 'upstream/0.16-dev' into 0.16-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/3d84ec8e Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/3d84ec8e Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/3d84ec8e Branch: refs/heads/0.16-dev Commit: 3d84ec8e27df68a0155f4e4fa27e1b8afa80abb6 Parents: 2f47530 e377699 Author: boboning <ningli...@163.com> Authored: Thu Aug 10 17:08:44 2017 +0800 Committer: boboning <ningli...@163.com> Committed: Thu Aug 10 17:08:44 2017 +0800 ---------------------------------------------------------------------- examples/vue/modules/websocket.vue | 22 +++++++++++++++++++- .../WeexSDK/Sources/Loader/WXWebSocketLoader.h | 2 +- .../WeexSDK/Sources/Loader/WXWebSocketLoader.m | 2 +- ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m | 13 ++++++++++++ .../WeexSDK/Sources/Module/WXWebSocketModule.m | 16 ++++++++++++-- ios/sdk/WeexSDK/Sources/Utility/WXUtility.h | 12 +++++++++++ ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 22 ++++++++++++++++++++ .../Sources/WebSocket/WXWebSocketDefaultImpl.m | 2 +- 8 files changed, 85 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
