tianzixuan/Doric
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Remove nativeEmpty, check call change to native side

Browse Source
This commit is contained in:
pengfei.zhou
2021-09-16 11:53:32 +08:00
committed by osborn
parent 3d3f646845
commit dd4e8db3ad
20 changed files with 72 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
doric-iOS/Pod/Classes/Engine/DoricJSEngine.m
View File

@@ -170,9 +170,6 @@ - (void)initJSExecutor {
} else {
[self.registry onLog:DoricLogTypeDebug message:message];
}
}];
[self.jsExecutor injectGlobalJSObject:INJECT_EMPTY obj:^() {
}];
[self.jsExecutor injectGlobalJSObject:INJECT_REQUIRE obj:^(NSString *name) {
__strong typeof(_self) self = _self;
@@ -262,11 +259,15 @@ - (JSValue *)invokeDoricMethod:(NSString *)method arguments:(va_list)args {
[array addObject:arg];
arg = va_arg(args, JSValue *);
}
return [self.jsExecutor invokeObject:GLOBAL_DORIC method:method args:array];
return [self invokeDoricMethod:method argumentsArray:array];
}
- (JSValue *)invokeDoricMethod:(NSString *)method argumentsArray:(NSArray *)args {
return [self.jsExecutor invokeObject:GLOBAL_DORIC method:method args:args];
JSValue *ret = [self.jsExecutor invokeObject:GLOBAL_DORIC method:method args:args];
if (![method isEqualToString:@"pureCallEntityMethod"]) {
[self.jsExecutor invokeObject:GLOBAL_DORIC method:DORIC_HOOK_NATIVE_CALL args:nil];
}
return ret;
}
- (NSString *)packageContextScript:(NSString *)contextId content:(NSString *)content {

3
doric-iOS/Pod/Classes/Util/DoricConstant.h
View File

@@ -32,7 +32,6 @@ extern NSString *const INJECT_REQUIRE;
extern NSString *const INJECT_TIMER_SET;
extern NSString *const INJECT_TIMER_CLEAR;
extern NSString *const INJECT_BRIDGE;
extern NSString *const INJECT_EMPTY;
extern NSString *const TEMPLATE_CONTEXT_CREATE;
@@ -54,6 +53,8 @@ extern NSString *const DORIC_BRIDGE_RESOLVE;
extern NSString *const DORIC_BRIDGE_REJECT;
extern NSString *const DORIC_HOOK_NATIVE_CALL;
extern NSString *const DORIC_ENTITY_RESPONSE;
extern NSString *const DORIC_ENTITY_INIT;

3
doric-iOS/Pod/Classes/Util/DoricConstant.m
View File

@@ -33,7 +33,6 @@
NSString *const INJECT_TIMER_SET = @"nativeSetTimer";
NSString *const INJECT_TIMER_CLEAR = @"nativeClearTimer";
NSString *const INJECT_BRIDGE = @"nativeBridge";
NSString *const INJECT_EMPTY = @"nativeEmpty";
NSString *const TEMPLATE_CONTEXT_CREATE = @"Reflect.apply("
"function(doric,context,Entry,require,exports){" "\n"
@@ -72,6 +71,8 @@
NSString *const DORIC_BRIDGE_REJECT = @"jsCallReject";
NSString *const DORIC_HOOK_NATIVE_CALL = @"jsHookAfterNativeCall";
NSString *const DORIC_ENTITY_RESPONSE = @"__response__";
NSString *const DORIC_ENTITY_INIT = @"__init__";