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

Branch: refs/heads/0.16-dev
Commit: b639af258b5098924163a5048f6ae78d44e91604
Parents: c5f43fa d1bdd73
Author: YorkShen <shenyua...@gmail.com>
Authored: Thu Aug 10 20:44:12 2017 +0800
Committer: YorkShen <shenyua...@gmail.com>
Committed: Thu Aug 10 20:44:12 2017 +0800

----------------------------------------------------------------------
 ios/sdk/WeexSDK.xcodeproj/project.pbxproj       |   6 +
 .../WeexSDK/Sources/Bridge/WXBridgeContext.m    |  35 ++--
 ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m |  10 +-
 ios/sdk/WeexSDK/Sources/Debug/WXDebugTool.h     |   4 +
 ios/sdk/WeexSDK/Sources/Debug/WXDebugTool.m     |  10 ++
 .../WeexSDK/Sources/Manager/WXBridgeManager.m   |   4 +
 .../Sources/Manager/WXComponentFactory.h        |   1 +
 .../Sources/Manager/WXComponentFactory.m        |  23 +++
 .../Sources/Manager/WXComponentManager.m        |  18 +-
 .../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 +
 .../Sources/Protocol/WXTracingProtocol.h        |  29 ++++
 .../Sources/View/WXComponent+ViewManagement.m   |   1 -
 ios/sdk/WeexSDK/Sources/WeexSDK.h               |   1 +
 19 files changed, 324 insertions(+), 59 deletions(-)
----------------------------------------------------------------------


Reply via email to