Merge remote-tracking branch 'upstream/pr1015' into apache-master
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/1605d660 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/1605d660 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/1605d660 Branch: refs/heads/master Commit: 1605d66019139a70de11091e9c90dd0078c34fb9 Parents: 14b294d 78a6e67 Author: misakuo <[email protected]> Authored: Thu Feb 8 15:37:04 2018 +0800 Committer: misakuo <[email protected]> Committed: Thu Feb 8 15:37:04 2018 +0800 ---------------------------------------------------------------------- .../weex/appfram/websocket/WebSocketModule.java | 141 ++++++++++++------- 1 file changed, 87 insertions(+), 54 deletions(-) ----------------------------------------------------------------------
