Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-weex 
into wip-us-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/0e1470ae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0e1470ae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0e1470ae

Branch: refs/heads/master
Commit: 0e1470ae0f4744b54953f64fa48164995d61231a
Parents: fba9dfe b7383a4
Author: acton393 <zhangxing610...@gmail.com>
Authored: Wed Oct 18 11:01:05 2017 +0800
Committer: acton393 <zhangxing610...@gmail.com>
Committed: Wed Oct 18 11:01:05 2017 +0800

----------------------------------------------------------------------
 android/sdk/build.gradle                        |   1 +
 android/sdk/libs/armeabi/libweexjsb.so          | Bin 22616 -> 22556 bytes
 android/sdk/libs/armeabi/libweexjsc.so          | Bin 341824 -> 335100 bytes
 android/sdk/libs/armeabi/libweexjss.so          | Bin 6754016 -> 6754016 bytes
 .../com/taobao/weex/bridge/WXBridgeManager.java |   4 +-
 .../java/com/taobao/weex/common/Constants.java  |   3 +
 .../taobao/weex/ui/component/WXComponent.java   |   4 +-
 .../ui/component/list/BasicListComponent.java   | 114 +++++++++++++----
 .../ui/component/list/StickyHeaderHelper.java   |  43 ++++++-
 .../taobao/weex/ui/component/list/WXCell.java   |  68 +++++++---
 .../list/template/WXRecyclerTemplateList.java   |   2 +-
 .../java/com/taobao/weex/utils/WXUtilsTest.java |   3 +-
 dangerfile.js                                   |  11 +-
 html5/runtime/api/WeexInstance.js               | 126 +++++++++++++++++++
 html5/runtime/api/component.js                  |  51 ++++++++
 html5/runtime/api/init.js                       | 107 ++++++++++------
 html5/runtime/api/module.js                     |  56 +++++++++
 .../WeexSDK/Sources/Component/WXWebComponent.m  |   3 +
 18 files changed, 502 insertions(+), 94 deletions(-)
----------------------------------------------------------------------


Reply via email to