Merge branch '0.16-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into ios-native-0.16-dev
# Conflicts: # ios/sdk/WeexSDK.xcodeproj/project.pbxproj Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/4bf47ed4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/4bf47ed4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/4bf47ed4 Branch: refs/heads/0.16-dev Commit: 4bf47ed4131b2d027bdc772dd41462e986e22ce4 Parents: 4df48bc d1bdd73 Author: é½å±± <sunjjb...@163.com> Authored: Thu Aug 10 20:43:58 2017 +0800 Committer: é½å±± <sunjjb...@163.com> Committed: Thu Aug 10 20:43:58 2017 +0800 ---------------------------------------------------------------------- examples/vue/modules/websocket.vue | 22 ++- ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 10 ++ .../WeexSDK/Sources/Bridge/WXBridgeContext.m | 35 ++-- ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 10 +- .../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 ++ .../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 +- .../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 + .../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 | 1 + 30 files changed, 428 insertions(+), 67 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4bf47ed4/ios/sdk/WeexSDK.xcodeproj/project.pbxproj ---------------------------------------------------------------------- diff --cc ios/sdk/WeexSDK.xcodeproj/project.pbxproj index 7f19a7c,336161c..809c2a6 --- a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj +++ b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj @@@ -236,16 -236,10 +236,18 @@@ C401945E1E344E8300D19C31 /* WXFloatCompareTests.m in Sources */ = {isa = PBXBuildFile; fileRef = C401945D1E344E8300D19C31 /* WXFloatCompareTests.m */; }; C41E1A971DC1FD15009C7F90 /* WXDatePickerManager.h in Headers */ = {isa = PBXBuildFile; fileRef = C41E1A951DC1FD15009C7F90 /* WXDatePickerManager.h */; }; C41E1A981DC1FD15009C7F90 /* WXDatePickerManager.m in Sources */ = {isa = PBXBuildFile; fileRef = C41E1A961DC1FD15009C7F90 /* WXDatePickerManager.m */; }; + C42E8FAB1F3C7C09001EBE9D /* WXExtendCallNativeProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = C4424E591F24DA3D009F52E2 /* WXExtendCallNativeProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; }; + C42E8FAC1F3C7C3B001EBE9D /* WXExtendCallNativeManager.m in Sources */ = {isa = PBXBuildFile; fileRef = C47B78CD1F2998EE001D3B0C /* WXExtendCallNativeManager.m */; }; + C42E8FAD1F3C7C3F001EBE9D /* WXExtendCallNativeManager.h in Headers */ = {isa = PBXBuildFile; fileRef = C47B78CC1F2998EE001D3B0C /* WXExtendCallNativeManager.h */; }; + C42E8FAE1F3C7C49001EBE9D /* WXRecyclerDragController.m in Sources */ = {isa = PBXBuildFile; fileRef = DC7764911F3C2CA300B5727E /* WXRecyclerDragController.m */; }; + C42E8FAF1F3C7C4B001EBE9D /* WXRecyclerDragController.h in Headers */ = {isa = PBXBuildFile; fileRef = DC7764921F3C2CA300B5727E /* WXRecyclerDragController.h */; }; + C42E8F9B1F39DF07001EBE9D /* WXTracingProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = C42E8F991F39DF07001EBE9D /* WXTracingProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; }; + C42E8FAA1F3C7AA1001EBE9D /* WXTracingProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = C42E8F991F39DF07001EBE9D /* WXTracingProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; }; C43C03E81EC8ACA40044C7FF /* WXPrerenderManager.h in Headers */ = {isa = PBXBuildFile; fileRef = C43C03E41EC8ACA40044C7FF /* WXPrerenderManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; C43C03E91EC8ACA40044C7FF /* WXPrerenderManager.m in Sources */ = {isa = PBXBuildFile; fileRef = C43C03E51EC8ACA40044C7FF /* WXPrerenderManager.m */; }; + C4424E5B1F24DA3D009F52E2 /* WXExtendCallNativeProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = C4424E591F24DA3D009F52E2 /* WXExtendCallNativeProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; }; + C47B78CE1F2998EE001D3B0C /* WXExtendCallNativeManager.h in Headers */ = {isa = PBXBuildFile; fileRef = C47B78CC1F2998EE001D3B0C /* WXExtendCallNativeManager.h */; }; + C47B78CF1F2998EE001D3B0C /* WXExtendCallNativeManager.m in Sources */ = {isa = PBXBuildFile; fileRef = C47B78CD1F2998EE001D3B0C /* WXExtendCallNativeManager.m */; }; C4B3D6D41E6954300013F38D /* WXEditComponent.h in Headers */ = {isa = PBXBuildFile; fileRef = C4B3D6D21E6954300013F38D /* WXEditComponent.h */; }; C4B3D6D51E6954300013F38D /* WXEditComponent.m in Sources */ = {isa = PBXBuildFile; fileRef = C4B3D6D31E6954300013F38D /* WXEditComponent.m */; }; C4B834271DE69B09007AD27E /* WXPickerModule.m in Sources */ = {isa = PBXBuildFile; fileRef = C4B834251DE69B09007AD27E /* WXPickerModule.m */; }; @@@ -810,11 -806,9 +814,12 @@@ C401945D1E344E8300D19C31 /* WXFloatCompareTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WXFloatCompareTests.m; sourceTree = "<group>"; }; C41E1A951DC1FD15009C7F90 /* WXDatePickerManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXDatePickerManager.h; sourceTree = "<group>"; }; C41E1A961DC1FD15009C7F90 /* WXDatePickerManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WXDatePickerManager.m; sourceTree = "<group>"; }; + C42E8F991F39DF07001EBE9D /* WXTracingProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXTracingProtocol.h; sourceTree = "<group>"; }; C43C03E41EC8ACA40044C7FF /* WXPrerenderManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXPrerenderManager.h; sourceTree = "<group>"; }; C43C03E51EC8ACA40044C7FF /* WXPrerenderManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WXPrerenderManager.m; sourceTree = "<group>"; }; + C4424E591F24DA3D009F52E2 /* WXExtendCallNativeProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXExtendCallNativeProtocol.h; sourceTree = "<group>"; }; + C47B78CC1F2998EE001D3B0C /* WXExtendCallNativeManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXExtendCallNativeManager.h; sourceTree = "<group>"; }; + C47B78CD1F2998EE001D3B0C /* WXExtendCallNativeManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WXExtendCallNativeManager.m; sourceTree = "<group>"; }; C4B3D6D21E6954300013F38D /* WXEditComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXEditComponent.h; sourceTree = "<group>"; }; C4B3D6D31E6954300013F38D /* WXEditComponent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WXEditComponent.m; sourceTree = "<group>"; }; C4B834251DE69B09007AD27E /* WXPickerModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WXPickerModule.m; sourceTree = "<group>"; }; @@@ -1285,7 -1277,7 +1290,8 @@@ 74EF31A91DE58AE600667A07 /* WXURLRewriteProtocol.h */, 042013AC1E66CD6A001FC79C /* WXValidateProtocol.h */, DC6836E51EBB12B200AD2D84 /* WXConfigCenterProtocol.h */, + C4424E591F24DA3D009F52E2 /* WXExtendCallNativeProtocol.h */, + C42E8F991F39DF07001EBE9D /* WXTracingProtocol.h */, ); path = Protocol; sourceTree = "<group>"; http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4bf47ed4/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4bf47ed4/ios/sdk/WeexSDK/Sources/WeexSDK.h ----------------------------------------------------------------------