weex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acton...@apache.org
Subject [3/3] incubator-weex git commit: Merge branch '0.16-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into wip-us-0.16-dev
Date Fri, 11 Aug 2017 08:15:35 GMT
Merge branch '0.16-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into wip-us-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/8719cdeb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8719cdeb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8719cdeb

Branch: refs/heads/0.16-dev
Commit: 8719cdebfb8c5a9059cbd37e1f00467de5c83298
Parents: 4529f16 ffe4951
Author: acton393 <zhangxing610321@gmail.com>
Authored: Fri Aug 11 16:15:24 2017 +0800
Committer: acton393 <zhangxing610321@gmail.com>
Committed: Fri Aug 11 16:15:24 2017 +0800

----------------------------------------------------------------------
 .../com/taobao/weex/ui/component/WXSlider.java  |   4 +-
 .../WeexDemo.xcodeproj/project.pbxproj          |   6 +
 ios/playground/WeexDemo/AppDelegate.m           |   2 +-
 .../WeexDemo/WXExtendCallNativeTest.h           |  25 +++
 .../WeexDemo/WXExtendCallNativeTest.m           |  47 ++++++
 ios/sdk/WeexSDK.xcodeproj/project.pbxproj       |  28 +++
 .../WeexSDK/Sources/Bridge/WXBridgeContext.m    |  35 ++--
 ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m |  23 ++-
 ios/sdk/WeexSDK/Sources/Debug/WXDebugTool.h     |   4 +
 ios/sdk/WeexSDK/Sources/Debug/WXDebugTool.m     |  10 ++
 ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.h    |  10 ++
 ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m    |   6 +
 .../WeexSDK/Sources/Manager/WXBridgeManager.m   |   4 +
 .../Sources/Manager/WXComponentFactory.h        |   1 +
 .../Sources/Manager/WXComponentFactory.m        |  23 +++
 .../Sources/Manager/WXComponentManager.m        |  18 +-
 .../Sources/Manager/WXExtendCallNativeManager.h |  26 +++
 .../Sources/Manager/WXExtendCallNativeManager.m |  80 +++++++++
 .../WeexSDK/Sources/Manager/WXModuleFactory.h   |   6 +
 .../WeexSDK/Sources/Manager/WXModuleFactory.m   |  24 +++
 .../WeexSDK/Sources/Manager/WXTracingManager.h  |  33 +++-
 .../WeexSDK/Sources/Manager/WXTracingManager.m  | 169 ++++++++++++++++---
 ios/sdk/WeexSDK/Sources/Model/WXComponent.m     |   1 -
 ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m   |   6 +-
 ios/sdk/WeexSDK/Sources/Monitor/WXMonitor.m     |   2 +
 .../Protocol/WXExtendCallNativeProtocol.h       |  47 ++++++
 .../Sources/Protocol/WXTracingProtocol.h        |  29 ++++
 .../Sources/View/WXComponent+ViewManagement.m   |   1 -
 ios/sdk/WeexSDK/Sources/WeexSDK.h               |   2 +
 29 files changed, 609 insertions(+), 63 deletions(-)
----------------------------------------------------------------------



Mime
View raw message