Merge branch '0.16-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex 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/ef94d710 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ef94d710 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ef94d710 Branch: refs/heads/0.16-dev Commit: ef94d710ec52b97995d1f27a8d8e4c512ca5d6d6 Parents: 887f61a 42285f3 Author: acton393 <zhangxing610...@gmail.com> Authored: Fri Aug 11 17:27:20 2017 +0800 Committer: acton393 <zhangxing610...@gmail.com> Committed: Fri Aug 11 17:27:20 2017 +0800 ---------------------------------------------------------------------- android/sdk/libs/armeabi/libweexjsc.so | Bin 7570504 -> 7570392 bytes android/sdk/libs/x86/libweexjsc.so | Bin 12121924 -> 12121924 bytes examples/vue/modules/websocket.vue | 22 ++- html5/runtime/normalize.js | 13 +- .../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 | 32 ++++ .../WeexSDK/Sources/Bridge/WXBridgeContext.m | 35 ++-- ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 23 ++- .../Sources/Component/WXScrollerComponent.m | 3 +- .../WeexSDK/Sources/Component/WXTextComponent.m | 5 +- 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/Loader/WXWebSocketLoader.h | 2 +- .../WeexSDK/Sources/Loader/WXWebSocketLoader.m | 2 +- .../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/Module/WXStreamModule.m | 13 ++ .../WeexSDK/Sources/Module/WXWebSocketModule.m | 16 +- ios/sdk/WeexSDK/Sources/Monitor/WXMonitor.m | 9 + .../Sources/Protocol/WXAppMonitorProtocol.h | 2 + .../Protocol/WXExtendCallNativeProtocol.h | 47 ++++++ .../Sources/Protocol/WXTracingProtocol.h | 29 ++++ ios/sdk/WeexSDK/Sources/Utility/WXUtility.h | 12 ++ ios/sdk/WeexSDK/Sources/Utility/WXUtility.m | 22 +++ .../Sources/View/WXComponent+ViewManagement.m | 1 - .../Sources/WebSocket/WXWebSocketDefaultImpl.m | 2 +- ios/sdk/WeexSDK/Sources/WeexSDK.h | 2 + package.json | 3 +- pre-build/native-bundle-main.js | 10 +- 44 files changed, 720 insertions(+), 86 deletions(-) ----------------------------------------------------------------------