You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ky...@apache.org on 2017/09/13 10:09:13 UTC
[3/3] incubator-weex git commit: Merge branch '0.16-dev' into
0.16-dev-gitlab
Merge branch '0.16-dev' into 0.16-dev-gitlab
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ed0a8dc1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ed0a8dc1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ed0a8dc1
Branch: refs/heads/0.16-dev
Commit: ed0a8dc1a1d6ccdafaa39ea29913df516265d227
Parents: 8ea57af 20b0a43
Author: YorkShen <sh...@gmail.com>
Authored: Wed Sep 13 18:06:22 2017 +0800
Committer: YorkShen <sh...@gmail.com>
Committed: Wed Sep 13 18:06:22 2017 +0800
----------------------------------------------------------------------
.../alibaba/weex/benchmark/BenchmarkTest.java | 29 ++--
.../java/com/taobao/weex/WXSDKInstance.java | 75 ++++++----
.../java/com/taobao/weex/common/Constants.java | 2 +
.../com/taobao/weex/dom/ImmutableDomObject.java | 21 ++-
.../taobao/weex/ui/component/WXComponent.java | 143 +++++++++++++-----
.../com/taobao/weex/ui/component/WXDiv.java | 74 +++++++++-
.../com/taobao/weex/ui/component/WXSlider.java | 4 +-
.../com/taobao/weex/ui/component/WXText.java | 65 +++++----
.../taobao/weex/ui/component/WXVContainer.java | 44 ++++--
.../taobao/weex/ui/component/list/WXCell.java | 61 +++++++-
.../weex/ui/component/list/WXListComponent.java | 53 ++++---
.../com/taobao/weex/ui/flat/FlatComponent.java | 33 +++++
.../com/taobao/weex/ui/flat/FlatGUIContext.java | 146 +++++++++++++++++++
.../taobao/weex/ui/flat/WidgetContainer.java | 93 ++++++++++++
.../weex/ui/flat/widget/AndroidViewWidget.java | 76 ++++++++++
.../taobao/weex/ui/flat/widget/BaseWidget.java | 130 +++++++++++++++++
.../taobao/weex/ui/flat/widget/TextWidget.java | 49 +++++++
.../com/taobao/weex/ui/flat/widget/Widget.java | 51 +++++++
.../taobao/weex/ui/flat/widget/WidgetGroup.java | 54 +++++++
.../com/taobao/weex/ui/view/WXFrameLayout.java | 53 ++++++-
.../java/com/taobao/weex/utils/WXViewUtils.java | 31 ++++
.../com/taobao/weex/ui/component/WXDivTest.java | 12 +-
.../taobao/weex/ui/component/WXTextTest.java | 18 +--
23 files changed, 1125 insertions(+), 192 deletions(-)
----------------------------------------------------------------------