Merge branch '0.16-dev' into 0.16-dev-web
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/30687e78 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/30687e78 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/30687e78 Branch: refs/heads/0.16-dev Commit: 30687e785226b31df450b4e82f80840018da91b4 Parents: 38c789e a54bcb9 Author: MrRaindrop <tekk...@gmail.com> Authored: Thu Jul 27 17:59:19 2017 +0800 Committer: MrRaindrop <tekk...@gmail.com> Committed: Thu Jul 27 17:59:19 2017 +0800 ---------------------------------------------------------------------- WeexSDK.podspec | 2 +- ios/playground/Podfile | 2 +- ios/playground/WeexDemo/WXDemoViewController.m | 1 - ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 2 +- .../WeexSDK/Sources/Bridge/WXBridgeContext.m | 27 +++++++++++++-- ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 14 ++++++++ ios/sdk/WeexSDK/Sources/Bridge/WXModuleMethod.h | 2 ++ ios/sdk/WeexSDK/Sources/Bridge/WXModuleMethod.m | 11 ++++-- .../WeexSDK/Sources/Component/WXListComponent.m | 2 +- .../Sources/Manager/WXComponentManager.m | 14 +++++--- .../WeexSDK/Sources/Manager/WXTracingManager.h | 35 ++++++++++---------- .../WeexSDK/Sources/Manager/WXTracingManager.m | 18 +++++----- ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 6 ++-- .../WeexSDK/Sources/Protocol/WXBridgeProtocol.h | 5 +++ .../Sources/Protocol/WXValidateProtocol.h | 4 +-- ios/sdk/WeexSDK/Sources/Utility/WXDefine.h | 2 +- ios/sdk/WeexSDK/Sources/Utility/WXLog.m | 9 ++++- ios/sdk/WeexSDK/Sources/WeexSDK.h | 2 +- pre-build/native-bundle-main.js | 12 +++---- 19 files changed, 117 insertions(+), 53 deletions(-) ----------------------------------------------------------------------