You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by so...@apache.org on 2017/06/01 02:52:52 UTC

[15/16] incubator-weex git commit: Merge branch 'android-feature-enable-inspector' of github.com:misakuo/incubator-weex into 0.13-dev

Merge branch 'android-feature-enable-inspector' of github.com:misakuo/incubator-weex into 0.13-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/3fd712a0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/3fd712a0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/3fd712a0

Branch: refs/heads/0.13-dev
Commit: 3fd712a04a89f2624057fc59d20ece7c9f68c6ca
Parents: 9d96b65 006685c
Author: sospartan <so...@apache.org>
Authored: Thu Jun 1 10:51:45 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Thu Jun 1 10:51:45 2017 +0800

----------------------------------------------------------------------
 android/commons/build.gradle                    |   1 +
 .../adapter/DefaultWebSocketAdapter.java        |  54 +++++-
 .../weex/commons/util/RequestIdGenerator.java   |  15 ++
 .../weex/commons/util/WSEventReporter.java      | 192 +++++++++++++++++++
 android/playground/app/build.gradle             |   2 +-
 .../java/com/alibaba/weex/WXApplication.java    |   2 +
 .../extend/adapter/InterceptWXHttpAdapter.java  |  57 +++---
 7 files changed, 290 insertions(+), 33 deletions(-)
----------------------------------------------------------------------