You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by zs...@apache.org on 2017/08/24 07:42:17 UTC
[3/3] incubator-weex git commit: Merge branch '0.16-dev-yh' into
0.16-dev
Merge branch '0.16-dev-yh' 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/60c744e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/60c744e6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/60c744e6
Branch: refs/heads/0.16-dev
Commit: 60c744e66413c1f78b65d60f1188ebf66615da76
Parents: 66011b3 048661b
Author: zshshr <zh...@gmail.com>
Authored: Thu Aug 24 15:41:14 2017 +0800
Committer: zshshr <zh...@gmail.com>
Committed: Thu Aug 24 15:41:14 2017 +0800
----------------------------------------------------------------------
.../java/com/alibaba/weex/WXPageActivity.java | 9 +-
android/sdk/libs/armeabi/libweexjsb.so | Bin 0 -> 22556 bytes
android/sdk/libs/armeabi/libweexjsc.so | Bin 7570392 -> 325660 bytes
android/sdk/libs/armeabi/libweexjss.so | Bin 0 -> 6754012 bytes
.../java/com/taobao/weex/WXEnvironment.java | 16 +-
.../main/java/com/taobao/weex/WXSDKEngine.java | 3 +-
.../java/com/taobao/weex/WXSDKInstance.java | 17 ++
.../java/com/taobao/weex/bridge/WXBridge.java | 14 ++
.../com/taobao/weex/bridge/WXBridgeManager.java | 175 ++++++++++++++++++-
.../java/com/taobao/weex/common/IWXBridge.java | 2 +
.../com/taobao/weex/common/WXErrorCode.java | 14 +-
.../taobao/weex/common/WXJSBridgeMsgType.java | 2 +
.../com/taobao/weex/dom/action/Actions.java | 3 +
.../weex/dom/action/ReloadPageAction.java | 64 +++++++
.../taobao/weex/bridge/WXWebsocketBridge.java | 6 +
15 files changed, 309 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/60c744e6/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
----------------------------------------------------------------------