You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by cx...@apache.org on 2017/03/31 02:32:22 UTC
[5/5] incubator-weex git commit: Merge branch '0.12-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.12-dev
Merge branch '0.12-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.12-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/e4cbdc46
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e4cbdc46
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e4cbdc46
Branch: refs/heads/0.12-dev
Commit: e4cbdc468c3ee7fda6e3ace16350bef1fe2df8ce
Parents: 09bdb40 ba19f55
Author: cxfeng <cx...@apache.org>
Authored: Fri Mar 31 10:32:13 2017 +0800
Committer: cxfeng <cx...@apache.org>
Committed: Fri Mar 31 10:32:13 2017 +0800
----------------------------------------------------------------------
.eslintrc | 5 +-
android/commons/build.gradle | 3 +-
.../weex/commons/AbstractWeexActivity.java | 24 ++
android/playground/app/build.gradle | 3 +-
.../playground/app/src/main/assets/animation.js | 11 +-
.../app/src/main/assets/component/a-demo.js | 11 +-
.../src/main/assets/component/countdown-demo.js | 11 +-
.../app/src/main/assets/component/image-demo.js | 11 +-
.../app/src/main/assets/component/input-demo.js | 11 +-
.../main/assets/component/list/list-basic.js | 8 +
.../assets/component/list/list-demo-horizon.js | 8 +
.../src/main/assets/component/list/list-demo.js | 8 +
.../src/main/assets/component/marquee-demo.js | 11 +-
.../src/main/assets/component/navigator-demo.js | 15 +-
.../main/assets/component/process-bar-demo.js | 11 +-
.../src/main/assets/component/scroller-demo.js | 11 +-
.../slider-neighbor/slider-neighbor-item.js | 8 +
.../slider-neighbor/slider-neighbor-page.js | 8 +
.../src/main/assets/component/slider/index.js | 11 +-
.../main/assets/component/slider/slider-item.js | 8 +
.../main/assets/component/slider/slider-page.js | 8 +
.../main/assets/component/tabbar/tabbar-demo.js | 15 +-
.../main/assets/component/tabbar/tabbar-item.js | 8 +
.../app/src/main/assets/component/text-demo.js | 11 +-
.../app/src/main/assets/component/video-demo.js | 11 +-
.../app/src/main/assets/component/web-demo.js | 11 +-
android/playground/app/src/main/assets/hello.js | 8 +
.../playground/app/src/main/assets/iconfont.js | 8 +
.../app/src/main/assets/module/clipboard.js | 11 +-
.../java/com/alibaba/weex/IndexActivity.java | 6 +
.../java/com/alibaba/weex/WXApplication.java | 4 +
.../extend/WXInstanceStatisticsListener.java | 268 +++++++++++++++++
android/sdk/build.gradle | 2 +
android/sdk/libs/armeabi/libweexv8.so | Bin 3583820 -> 3563544 bytes
android/sdk/libs/x86/libweexv8.so | Bin 4336768 -> 4545544 bytes
.../com/taobao/weex/IWXStatisticsListener.java | 252 ++++++++++++++++
.../main/java/com/taobao/weex/InitConfig.java | 14 +
.../java/com/taobao/weex/WXEnvironment.java | 18 ++
.../main/java/com/taobao/weex/WXSDKEngine.java | 5 +-
.../java/com/taobao/weex/WXSDKInstance.java | 65 +++-
.../main/java/com/taobao/weex/WXSDKManager.java | 72 ++++-
.../taobao/weex/adapter/IWXSoLoaderAdapter.java | 236 +++++++++++++++
.../java/com/taobao/weex/bridge/WXBridge.java | 6 +
.../com/taobao/weex/bridge/WXBridgeManager.java | 59 +++-
.../java/com/taobao/weex/bridge/WXParams.java | 13 +
.../java/com/taobao/weex/common/Constants.java | 8 +
.../java/com/taobao/weex/common/IWXBridge.java | 7 +
.../taobao/weex/common/WXJSBridgeMsgType.java | 1 +
.../taobao/weex/ui/IExternalMoudleGetter.java | 215 +++++++++++++
.../java/com/taobao/weex/utils/OsVersion.java | 233 ++++++++++++++
.../main/java/com/taobao/weex/utils/Trace.java | 301 +++++++++++++++++++
.../taobao/weex/utils/WXSoInstallMgrSdk.java | 51 +++-
.../java/com/taobao/weex/utils/WXUtils.java | 84 +++++-
.../taobao/weex/bridge/WXWebsocketBridge.java | 3 +
build/build.js | 2 +
build/examples-banner-plugin.js | 65 ++++
build/webpack.examples.config.js | 3 +-
html5/frameworks/legacy/app/ctrl/init.js | 55 +++-
html5/frameworks/legacy/static/create.js | 5 +-
html5/frameworks/legacy/static/life.js | 17 ++
60 files changed, 2291 insertions(+), 67 deletions(-)
----------------------------------------------------------------------