You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by mi...@apache.org on 2017/08/16 03:49:12 UTC
[04/13] incubator-weex git commit: Merge remote-tracking branch
'upstream/0.16-dev' into 0.16-dev
Merge remote-tracking branch 'upstream/0.16-dev' 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/1215e8f8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/1215e8f8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/1215e8f8
Branch: refs/heads/0.16-dev
Commit: 1215e8f87ecc6624c68c6739f240a57e92fc2f0e
Parents: 043bc96 ffe4951
Author: misakuo <mi...@apache.org>
Authored: Fri Aug 11 11:25:13 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Fri Aug 11 11:25:13 2017 +0800
----------------------------------------------------------------------
android/sdk/libs/armeabi/libweexjsc.so | Bin 7570504 -> 7570392 bytes
android/sdk/libs/x86/libweexjsc.so | Bin 12121924 -> 7570392 bytes
examples/vue/modules/websocket.vue | 22 ++-
.../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 +
41 files changed, 712 insertions(+), 68 deletions(-)
----------------------------------------------------------------------