From 980892a30f8d798d9af9962f82ca2c99ccd1e7c1 Mon Sep 17 00:00:00 2001 From: Junhua Hao <380050803@qq.com> Date: Thu, 29 Nov 2018 15:57:45 +0800 Subject: [PATCH] [WEEX-671][iOS] `extendCallNative` method move to instance jscontext (#1843) --- ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m | 13 +++++++++++++ ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.mm | 12 ------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m b/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m index 0dfe18dd3e..e82917787d 100644 --- a/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m +++ b/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m @@ -51,6 +51,7 @@ #import "WXJSFrameworkLoadProtocol.h" #import "WXJSFrameworkLoadDefaultImpl.h" #import "WXHandlerFactory.h" +#import "WXExtendCallNativeManager.h" #define SuppressPerformSelectorLeakWarning(Stuff) \ do { \ @@ -1125,6 +1126,10 @@ + (void)mountContextEnvironment:(JSContext*)context NSString * levelStr = [[args lastObject] toString]; [WXBridgeContext handleConsoleOutputWithArgument:args logLevel:(WXLogFlag)[levelMap[levelStr] integerValue]]; }; + + context[@"extendCallNative"] = ^(JSValue *value ) { + return [WXBridgeContext extendCallNative:[value toDictionary]]; + }; } + (void)handleConsoleOutputWithArgument:(NSArray *)arguments logLevel:(WXLogFlag)logLevel @@ -1149,4 +1154,12 @@ + (void)handleConsoleOutputWithArgument:(NSArray *)arguments logLevel:(WXLogFlag } }]; } + ++(id)extendCallNative:(NSDictionary *)dict +{ + if(dict){ + return [WXExtendCallNativeManager sendExtendCallNativeEvent:dict]; + } + return @(-1); +} @end diff --git a/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.mm b/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.mm index 0e7a48d529..f6c5436a92 100644 --- a/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.mm +++ b/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.mm @@ -427,10 +427,6 @@ - (void)createDefaultContext _jsContext[@"clearTimeoutWeex"] = ^(JSValue *ret) { [weakSelf triggerClearTimeout:[ret toString]]; }; - - _jsContext[@"extendCallNative"] = ^(JSValue *value ) { - return [weakSelf extendCallNative:[value toDictionary]]; - }; } -(void)addInstance:(NSString *)instance callback:(NSString *)callback @@ -545,12 +541,4 @@ - (void)triggerClearTimeout:(NSString *)ret } } --(id)extendCallNative:(NSDictionary *)dict -{ - if(dict){ - return [WXExtendCallNativeManager sendExtendCallNativeEvent:dict]; - } - return @(-1); -} - @end