Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-weex 
into ios-feature-mutli-context


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e49b2a73
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e49b2a73
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e49b2a73

Branch: refs/heads/master
Commit: e49b2a734e5473b68082e206a26f9307906ecae8
Parents: 0c85353 ec3db13
Author: acton393 <zhangxing610...@gmail.com>
Authored: Fri Dec 29 15:10:17 2017 +0800
Committer: acton393 <zhangxing610...@gmail.com>
Committed: Fri Dec 29 15:10:17 2017 +0800

----------------------------------------------------------------------
 android/sdk/libs/armeabi/libweexjsb.so          | Bin 22624 -> 22620 bytes
 android/sdk/libs/armeabi/libweexjsc.so          | Bin 335340 -> 336796 bytes
 android/sdk/libs/armeabi/libweexjss.so          | Bin 6754020 -> 6758224 bytes
 .../java/com/taobao/weex/WXSDKInstance.java     |   7 +-
 .../com/taobao/weex/bridge/EventResult.java     |  46 +++++++++++
 .../taobao/weex/bridge/NativeInvokeHelper.java  |   7 +-
 .../java/com/taobao/weex/bridge/WXBridge.java   |  13 +++
 .../com/taobao/weex/bridge/WXBridgeManager.java |  82 ++++++++++++++++++-
 .../java/com/taobao/weex/common/Constants.java  |  10 +++
 .../java/com/taobao/weex/common/IWXBridge.java  |   6 ++
 .../com/taobao/weex/http/WXStreamModule.java    |  39 ++++-----
 .../taobao/weex/ui/component/WXComponent.java   |  40 ++++++++-
 .../taobao/weex/ui/component/WXVContainer.java  |  15 ++++
 .../taobao/weex/ui/module/WXModalUIModule.java  |  28 +++----
 .../weex/ui/view/WXBaseCircleIndicator.java     |   4 +-
 .../taobao/weex/ui/view/WXCircleViewPager.java  |  12 +--
 .../com/taobao/weex/ui/view/WXFrameLayout.java  |   4 +-
 .../weex/ui/view/WXHorizontalScrollView.java    |  15 ++--
 .../com/taobao/weex/ui/view/WXScrollView.java   |  12 +--
 .../taobao/weex/ui/view/gesture/WXGesture.java  |  63 +++++++++++++-
 .../ui/view/gesture/WXGestureObservable.java    |   4 +-
 .../weex/ui/view/listview/WXRecyclerView.java   |   8 +-
 .../refresh/wrapper/BounceRecyclerView.java     |   4 +-
 .../taobao/weex/http/WXStreamModuleTest.java    |  15 ++--
 .../weex/ui/module/WXModalUIModuleTest.java     |   9 +-
 dangerfile.js                                   |   1 +
 26 files changed, 353 insertions(+), 91 deletions(-)
----------------------------------------------------------------------


Reply via email to