Merge remote-tracking branch 'upstream/pr1019' into apache-master
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/7ab6e7b2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7ab6e7b2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7ab6e7b2 Branch: refs/heads/master Commit: 7ab6e7b236ad78742df0fc0c986187fc8b183225 Parents: 6019278 d6af2aa Author: misakuo <misa...@apache.org> Authored: Thu Feb 8 16:56:56 2018 +0800 Committer: misakuo <misa...@apache.org> Committed: Thu Feb 8 16:56:56 2018 +0800 ---------------------------------------------------------------------- .../weex/commons/adapter/ImageAdapter.java | 49 +- .../java/com/alibaba/weex/WXApplication.java | 6 +- .../weex/extend/module/WXWsonTestModule.java | 58 ++ .../java/com/taobao/weex/WXEnvironment.java | 17 +- .../com/taobao/weex/bridge/WXBridgeManager.java | 112 +++- .../java/com/taobao/weex/common/Constants.java | 7 +- .../main/java/com/taobao/weex/dom/WXAttr.java | 19 +- .../java/com/taobao/weex/dom/WXDomModule.java | 7 +- .../java/com/taobao/weex/dom/WXDomObject.java | 29 +- .../main/java/com/taobao/weex/dom/WXEvent.java | 91 +-- .../main/java/com/taobao/weex/dom/WXStyle.java | 54 ++ .../dom/action/AbstractAddElementAction.java | 15 +- .../com/taobao/weex/dom/action/Actions.java | 6 + .../weex/dom/action/AddElementAction.java | 8 +- .../weex/dom/action/UpdateAttributeAction.java | 6 +- .../dom/action/UpdateComponentDataAction.java | 69 +++ .../com/taobao/weex/dom/binding/ELUtils.java | 1 + .../taobao/weex/dom/binding/WXStatement.java | 6 + .../java/com/taobao/weex/el/parse/Block.java | 3 +- .../java/com/taobao/weex/el/parse/Operator.java | 3 +- .../com/taobao/weex/el/parse/Operators.java | 11 +- .../java/com/taobao/weex/el/parse/Token.java | 3 +- .../weex/ui/component/ComponentUtils.java | 122 ++++ .../taobao/weex/ui/component/WXComponent.java | 110 +++- .../weex/ui/component/binding/Layouts.java | 23 +- .../weex/ui/component/binding/Statements.java | 226 +++++-- .../taobao/weex/ui/component/list/WXCell.java | 18 +- .../list/template/AsyncCellLoadTask.java | 128 ++++ .../list/template/CellDataManager.java | 272 +++++++++ .../list/template/CellRenderContext.java | 79 +++ .../list/template/CellRenderState.java | 122 ++++ .../component/list/template/DomTreeBuilder.java | 100 --- .../ui/component/list/template/PositionRef.java | 64 ++ .../template/VirtualComponentLifecycle.java | 45 ++ .../list/template/WXRecyclerTemplateList.java | 610 ++++++++++--------- .../java/com/taobao/weex/el/FailedCaseTest.java | 50 ++ .../ui/component/binding/StatementTest.java | 8 +- 37 files changed, 1970 insertions(+), 587 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7ab6e7b2/android/sdk/src/main/java/com/taobao/weex/common/Constants.java ----------------------------------------------------------------------