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/06 11:10:18 UTC

[12/12] incubator-weex git commit: Merge branch '0.11-dev' of https://github.com/cxfeng1/incubator-weex into 0.11-dev

Merge branch '0.11-dev' of https://github.com/cxfeng1/incubator-weex into 0.11-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/77c1a58a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/77c1a58a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/77c1a58a

Branch: refs/heads/0.11-dev
Commit: 77c1a58aba2263585f2f78776b6355c761dce3ee
Parents: 0935fcd c0b9b1d
Author: cxfeng <cx...@gmail.com>
Authored: Mon Mar 6 19:09:51 2017 +0800
Committer: cxfeng <cx...@gmail.com>
Committed: Mon Mar 6 19:09:51 2017 +0800

----------------------------------------------------------------------
 .../main/java/com/taobao/weex/WXSDKEngine.java  |   9 +-
 .../java/com/taobao/weex/common/Constants.java  |  13 +-
 .../main/java/com/taobao/weex/dom/WXAttr.java   |  96 +++-
 .../java/com/taobao/weex/dom/WXDomHandler.java  |   2 +-
 .../java/com/taobao/weex/dom/WXDomModule.java   |   8 +-
 .../taobao/weex/dom/WXRecyclerDomObject.java    | 317 +++++++++++
 .../weex/ui/component/WXBasicComponentType.java |   2 +
 .../com/taobao/weex/ui/component/WXHeader.java  |   4 +-
 .../ui/component/list/BasicListComponent.java   |  28 +-
 .../ui/component/list/ListComponentView.java    |   3 -
 .../ui/component/list/SimpleListComponent.java  |   6 +-
 .../weex/ui/component/list/WXListComponent.java |  91 +++-
 .../listview/ExtendedLinearLayoutManager.java   |  25 +
 .../weex/ui/view/listview/WXRecyclerView.java   |  43 +-
 .../listview/adapter/ListBaseViewHolder.java    |   5 +
 .../adapter/RecyclerViewBaseAdapter.java        |  21 +-
 .../adapter/WXRecyclerViewOnScrollListener.java |  99 ++--
 .../ui/view/refresh/wrapper/BaseBounceView.java |  19 +-
 .../refresh/wrapper/BounceRecyclerView.java     |  22 +-
 .../refresh/wrapper/BounceScrollerView.java     |   1 +
 examples/vue/components/waterfall.vue           | 455 ++++++++++++++++
 examples/vue/index.vue                          |   1 +
 ios/playground/Podfile                          |   2 +-
 ios/playground/WeexDemo/DemoDefine.h            |   2 +-
 ios/playground/WeexDemo/UIView+UIThreadCheck.m  |   2 +-
 ios/playground/WeexDemo/WXDemoViewController.m  |   3 +-
 ios/sdk/WeexSDK.xcodeproj/project.pbxproj       |  75 ++-
 .../Component/Recycler/WXMultiColumnLayout.h    |  42 ++
 .../Component/Recycler/WXMultiColumnLayout.m    | 388 ++++++++++++++
 .../Component/Recycler/WXRecyclerComponent.h    |  12 +
 .../Component/Recycler/WXRecyclerComponent.m    | 525 +++++++++++++++++++
 .../Recycler/WXRecyclerDataController.h         |  34 ++
 .../Recycler/WXRecyclerDataController.m         | 114 ++++
 .../Recycler/WXRecyclerUpdateController.h       |  32 ++
 .../Recycler/WXRecyclerUpdateController.m       | 248 +++++++++
 .../Recycler/WXSectionDataController.h          |  33 ++
 .../Recycler/WXSectionDataController.m          |  81 +++
 .../WeexSDK/Sources/Component/WXCellComponent.h |  22 +-
 .../WeexSDK/Sources/Component/WXCellComponent.m |  27 +-
 .../Component/WXComponent+GradientColor.h       |  15 +-
 .../Component/WXComponent+GradientColor.m       |  15 +-
 .../Sources/Component/WXFooterComponent.h       |  13 +
 .../Sources/Component/WXFooterComponent.m       |  13 +
 .../Sources/Component/WXHeaderComponent.h       |  28 +
 .../Sources/Component/WXHeaderComponent.m       |  76 +++
 .../WeexSDK/Sources/Component/WXListComponent.h |  12 -
 .../WeexSDK/Sources/Component/WXListComponent.m | 219 ++++----
 ios/sdk/WeexSDK/Sources/Component/WXTransform.m |  18 +-
 ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m    |   2 +
 ios/sdk/WeexSDK/Sources/Model/WXComponent.m     |   2 +-
 .../WeexSDK/Sources/Module/WXAnimationModule.m  |   8 +-
 ios/sdk/WeexSDK/Sources/Module/WXMetaModule.m   |   4 +-
 ios/sdk/WeexSDK/Sources/Utility/WXConvert.h     |   2 +
 ios/sdk/WeexSDK/Sources/Utility/WXConvert.m     |  30 ++
 ios/sdk/WeexSDK/Sources/Utility/WXDiffUtil.h    |  38 ++
 ios/sdk/WeexSDK/Sources/Utility/WXDiffUtil.m    | 186 +++++++
 ios/sdk/WeexSDK/Sources/Utility/WXLength.h      |  13 +-
 ios/sdk/WeexSDK/Sources/Utility/WXLength.m      |  45 +-
 .../Sources/View/WXComponent+ViewManagement.m   |   4 +-
 59 files changed, 3374 insertions(+), 281 deletions(-)
----------------------------------------------------------------------