Merge branch '0.16-dev' into ios-feature-0.16-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/eaa2df37
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/eaa2df37
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/eaa2df37

Branch: refs/heads/0.16-dev
Commit: eaa2df37b53389f7a6fc2e3c5a8725d18a7e0668
Parents: 423bdc5 6b9f23b
Author: 齐山 <sunjjb...@163.com>
Authored: Thu Aug 31 19:32:50 2017 +0800
Committer: 齐山 <sunjjb...@163.com>
Committed: Thu Aug 31 19:32:50 2017 +0800

----------------------------------------------------------------------
 .../java/com/taobao/weex/common/Constants.java  |  1 +
 .../ui/component/list/BasicListComponent.java   | 42 +++----------
 .../java/com/taobao/weex/utils/WXUtils.java     | 64 +++++++++++---------
 ios/playground/WeexDemo/Scanner/WXScannerVC.m   |  2 +-
 .../WeexSDK/Sources/Component/WXEditComponent.m |  5 --
 .../Sources/Component/WXImageComponent.m        |  3 +
 ios/sdk/WeexSDK/Sources/Utility/WXConvert.m     |  2 +-
 7 files changed, 49 insertions(+), 70 deletions(-)
----------------------------------------------------------------------


Reply via email to