* [iOS] preserve nativeLog function
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5eb25423 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5eb25423 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5eb25423 Branch: refs/heads/master Commit: 5eb254235d9cad09056ebd4e666acb7dd2dcfe86 Parents: b274f4d Author: acton393 <[email protected]> Authored: Wed Dec 20 17:43:29 2017 +0800 Committer: acton393 <[email protected]> Committed: Wed Dec 20 17:53:12 2017 +0800 ---------------------------------------------------------------------- ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m | 4 +++- ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5eb25423/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m ---------------------------------------------------------------------- diff --git a/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m b/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m index 13b92c8..eae64fb 100644 --- a/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m +++ b/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m @@ -855,7 +855,9 @@ _Pragma("clang diagnostic pop") \ @"__LOG": @(WXLogFlagLog) }; }); - + NSArray * args = [JSContext currentArguments]; + NSString * levelStr = [[args lastObject] toString]; + [WXBridgeContext handleConsoleOutputWithArgument:args logLevel:levelMap[levelStr]]; }; } + (void)handleConsoleOutputWithArgument:(NSArray*)arguments logLevel:(WXLogFlag)logLevel http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5eb25423/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m ---------------------------------------------------------------------- diff --git a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m index 5be22d5..c08b80b 100644 --- a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m +++ b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m @@ -391,8 +391,11 @@ typedef enum : NSUInteger { [WXPrerenderManager removePrerenderTaskforUrl:[self.scriptURL absoluteString]]; [WXPrerenderManager destroyTask:self.instanceId]; [[WXSDKManager bridgeMgr] destroyInstance:self.instanceId]; - JSGarbageCollect(_instanceJavaScriptContext.JSGlobalContextRef); - _instanceJavaScriptContext = nil; + if (_instanceJavaScriptContext) { + JSGarbageCollect(_instanceJavaScriptContext.JSGlobalContextRef); + _instanceJavaScriptContext = nil; + } + if (_componentManager) { [_componentManager invalidate]; }
