Repository: incubator-weex Updated Branches: refs/heads/0.16-dev 77fff9fa5 -> 7098973be
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/64bb75da Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/64bb75da Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/64bb75da Branch: refs/heads/0.16-dev Commit: 64bb75da32e3cb5c111da320ec2fdc491dcd5d94 Parents: 1215e8f 2074156 Author: misakuo <misa...@apache.org> Authored: Tue Aug 15 17:55:53 2017 +0800 Committer: misakuo <misa...@apache.org> Committed: Tue Aug 15 17:55:53 2017 +0800 ---------------------------------------------------------------------- android/sdk/libs/armeabi/libweexjsc.so | Bin 7570392 -> 7570504 bytes android/sdk/libs/x86/libweexjsc.so | Bin 7570392 -> 12121924 bytes .../java/com/taobao/weex/WXEnvironment.java | 2 +- .../java/com/taobao/weex/WXSDKInstance.java | 37 ++- .../main/java/com/taobao/weex/WXSDKManager.java | 30 +- .../taobao/weex/adapter/ITracingAdapter.java | 31 ++ .../com/taobao/weex/bridge/WXBridgeManager.java | 66 +++- .../java/com/taobao/weex/common/Constants.java | 2 + .../taobao/weex/dom/DOMActionContextImpl.java | 15 +- .../com/taobao/weex/dom/RenderActionTask.java | 26 +- .../java/com/taobao/weex/dom/WXDomHandler.java | 8 +- .../java/com/taobao/weex/dom/WXDomManager.java | 16 +- .../java/com/taobao/weex/dom/WXDomModule.java | 39 ++- .../java/com/taobao/weex/dom/WXDomObject.java | 24 +- .../java/com/taobao/weex/dom/WXDomTask.java | 1 + .../dom/action/AbstractAddElementAction.java | 26 +- .../dom/action/AbstractLayoutFinishAction.java | 3 +- .../weex/dom/action/AddElementAction.java | 26 ++ .../taobao/weex/dom/action/AddEventAction.java | 24 +- .../weex/dom/action/CreateBodyAction.java | 19 ++ .../weex/dom/action/CreateFinishAction.java | 6 + .../weex/dom/action/RefreshFinishAction.java | 4 + .../taobao/weex/dom/action/TraceableAction.java | 82 +++++ .../weex/dom/action/UpdateAttributeAction.java | 2 +- .../weex/dom/action/UpdateStyleAction.java | 2 +- .../java/com/taobao/weex/tracing/Stopwatch.java | 132 ++++++++ .../java/com/taobao/weex/tracing/WXTracing.java | 129 ++++++++ .../com/taobao/weex/ui/WXRenderManager.java | 26 +- .../ui/component/AbstractEditComponent.java | 2 +- .../taobao/weex/ui/component/WXComponent.java | 65 +++- .../taobao/weex/ui/component/WXVContainer.java | 18 ++ .../ui/component/list/BasicListComponent.java | 1 + .../java/com/taobao/weex/utils/WXLogUtils.java | 45 +-- .../com/taobao/weex/utils/WXLogUtilsTest.java | 1 - doc/source/_posts/arkit.md | 112 +++++++ doc/source/_posts/cn/hello.md | 6 - doc/source/_posts/hello_world.md | 7 - doc/source/_posts/test.md | 14 - doc/source/cn/blog/index.md | 4 - .../cn/references/advanced/extend-to-ios.md | 4 +- .../advanced/integrate-devtool-to-android.md | 86 ++++- doc/source/cn/references/common-style.md | 2 + doc/source/cn/references/components/text.md | 4 +- doc/source/cn/references/modules/animation.md | 2 +- doc/source/references/advanced/extend-to-ios.md | 5 +- doc/source/references/common-style.md | 2 + doc/source/references/components/text.md | 4 +- doc/source/references/modules/animation.md | 2 +- doc/themes/weex/layout/_partial/header.ejs | 1 + .../weex/layout/_partial/post/summary.ejs | 1 + doc/themes/weex/source/css/blog.scss | 3 + doc/themes/weex/source/css/media-queries.scss | 1 + doc/themes/weex/source/css/partial/header.scss | 6 +- html5/runtime/normalize.js | 13 +- ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 24 +- .../Sources/Component/WXComponent_internal.h | 12 + .../WeexSDK/Sources/Component/WXListComponent.m | 4 +- .../Sources/Display/WXComponent+Display.m | 16 +- .../WeexSDK/Sources/Layout/WXComponent+Layout.m | 3 +- ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 67 +++- .../WeexSDK/Sources/Module/WXAnimationLayout.h | 49 --- .../WeexSDK/Sources/Module/WXAnimationLayout.m | 115 ------- .../WeexSDK/Sources/Module/WXAnimationModule.h | 2 + .../WeexSDK/Sources/Module/WXAnimationModule.m | 88 ++++-- ios/sdk/WeexSDK/Sources/Module/WXTransition.h | 43 +++ ios/sdk/WeexSDK/Sources/Module/WXTransition.m | 311 +++++++++++++++++++ ios/sdk/WeexSDK/Sources/Utility/WXConvert.m | 3 +- package.json | 4 +- pre-build/native-bundle-main.js | 10 +- test/run.sh | 18 +- 70 files changed, 1609 insertions(+), 349 deletions(-) ----------------------------------------------------------------------