Merge branch '0.16-dev' of 
https://git-wip-us.apache.org/repos/asf/incubator-weex into ios-feature-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/fd411415
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/fd411415
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/fd411415

Branch: refs/heads/0.16-dev
Commit: fd4114152f3becd49227d4addea9010c316a2144
Parents: a0a917a 4ffcc7c
Author: acton393 <zhangxing610...@gmail.com>
Authored: Wed Aug 16 20:07:52 2017 +0800
Committer: acton393 <zhangxing610...@gmail.com>
Committed: Wed Aug 16 20:07:52 2017 +0800

----------------------------------------------------------------------
 .../java/com/taobao/weex/WXEnvironment.java     |   2 +-
 .../java/com/taobao/weex/WXSDKInstance.java     |  37 ++-
 .../main/java/com/taobao/weex/WXSDKManager.java |  36 ++-
 .../taobao/weex/adapter/ITracingAdapter.java    |  31 ++
 .../com/taobao/weex/bridge/WXBridgeManager.java |  66 +++-
 .../java/com/taobao/weex/common/Constants.java  |   3 +
 .../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 +
 .../taobao/weex/dom/WXRecyclerDomObject.java    |   9 +
 .../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 +++-
 .../com/taobao/weex/ui/component/WXSlider.java  |   8 +-
 .../taobao/weex/ui/component/WXVContainer.java  |  18 ++
 .../ui/component/list/BasicListComponent.java   |   1 +
 .../weex/ui/view/WXBaseCircleIndicator.java     |   3 +-
 .../taobao/weex/ui/view/WXCircleViewPager.java  |  57 ++--
 .../ui/view/refresh/core/WXSwipeLayout.java     |  15 +-
 .../ui/view/refresh/wrapper/BaseBounceView.java |   2 +-
 .../java/com/taobao/weex/utils/WXLogUtils.java  |  45 +--
 .../com/taobao/weex/utils/WXLogUtilsTest.java   |   1 -
 doc/source/cn/references/common-style.md        |   2 +
 doc/source/cn/references/modules/animation.md   |   2 +-
 doc/source/references/common-style.md           |   2 +
 doc/source/references/modules/animation.md      |   2 +-
 examples/vue/market/gcanvas.vue                 |  10 +-
 ios/sdk/WeexSDK.xcodeproj/project.pbxproj       |  24 +-
 .../Sources/Component/WXComponent_internal.h    |  12 +
 .../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                                    |   1 +
 test/run.sh                                     |  18 +-
 57 files changed, 1453 insertions(+), 328 deletions(-)
----------------------------------------------------------------------


Reply via email to