feat:add protect case for plugin and view

This commit is contained in:
pengfei.zhou
2021-06-22 15:45:17 +08:00
committed by osborn
parent 8339a64663
commit 901d3fdf72
8 changed files with 175 additions and 8 deletions

View File

@@ -21,7 +21,6 @@
//
#import "DoricBridgeExtension.h"
#import "DoricRegistry.h"
#import "DoricContextManager.h"
#import "DoricNativePlugin.h"
#import "DoricUtil.h"
@@ -38,6 +37,13 @@ - (id)callNativeWithContextId:(NSString *)contextId module:(NSString *)module me
return nil;
}
Class pluginClass = [self.registry acquireNativePlugin:module];
if (!pluginClass) {
[[[DoricPromise alloc] initWithContext:context callbackId:callbackId]
reject:[NSString stringWithFormat:@"Cannot obtain plugin instance:%@, method:%@",
module,
method]];
return @(NO);
}
DoricNativePlugin *nativePlugin = context.pluginInstanceMap[module];
if (nativePlugin == nil) {
nativePlugin = [(DoricNativePlugin *) [pluginClass alloc] initWithContext:context];
@@ -96,6 +102,7 @@ - (id)findClass:(Class)clz target:(id)target context:(DoricContext *)context met
} @catch (NSException *exception) {
DoricLog(@"CallNative Error:%@", exception.reason);
[strongContext.driver.registry onException:exception inContext:strongContext];
[[[DoricPromise alloc] initWithContext:context callbackId:callbackId] reject:exception.reason];
}
};
@@ -127,6 +134,11 @@ - (id)findClass:(Class)clz target:(id)target context:(DoricContext *)context met
Class superclass = class_getSuperclass(clz);
if (superclass && superclass != [NSObject class]) {
return [self findClass:superclass target:target context:strongContext method:name callbackId:callbackId argument:argument];
} else {
[[[DoricPromise alloc] initWithContext:context callbackId:callbackId]
reject:[NSString stringWithFormat:@"Cannot find plugin method in class:%@, method:%@",
NSStringFromClass(clz),
name]];
}
}
return ret;

View File

@@ -0,0 +1,32 @@
/*
* Copyright [2019] [Doric.Pub]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
//
// DoricErrorHintNode.h
// DoricCore
//
// Created by pengfei.zhou on 2021/6/22.
//
#import <Foundation/Foundation.h>
#import "DoricViewNode.h"
NS_ASSUME_NONNULL_BEGIN
@interface DoricErrorHintNode : DoricViewNode <UILabel *>
@property(nonatomic, copy) NSString *hintText;
@end
NS_ASSUME_NONNULL_END

View File

@@ -0,0 +1,35 @@
/*
* Copyright [2019] [Doric.Pub]
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
//
// DoricErrorHintNode.m
// DoricCore
//
// Created by pengfei.zhou on 2021/6/22.
//
#import "DoricErrorHintNode.h"
@implementation DoricErrorHintNode
- (UILabel *)build {
UILabel *view = [UILabel new];
view.text = self.hintText;
view.textColor = [UIColor blackColor];
view.font = [UIFont systemFontOfSize:16];
view.textAlignment = NSTextAlignmentCenter;
view.backgroundColor = [UIColor yellowColor];
return view;
}
@end

View File

@@ -29,6 +29,7 @@
#import "DoricExtensions.h"
#import "DoricPromise.h"
#import "DoricFlexNode.h"
#import "DoricErrorHintNode.h"
@interface AnimationCallback : NSObject <CAAnimationDelegate>
@property(nonatomic, strong) NSMutableDictionary *dictionary;
@@ -322,7 +323,13 @@ - (DoricAsyncResult *)pureCallJSResponse:(NSString *)funcId, ... {
+ (__kindof DoricViewNode *)create:(DoricContext *)context withType:(NSString *)type {
DoricRegistry *registry = context.driver.registry;
Class clz = [registry acquireViewNode:type];
DoricViewNode *viewNode = [(DoricViewNode *) [clz alloc] initWithContext:context];
DoricViewNode *viewNode;
if (!clz) {
viewNode = [[DoricErrorHintNode alloc] initWithContext:context];
((DoricErrorHintNode *) viewNode).hintText = type;
} else {
viewNode = [(DoricViewNode *) [clz alloc] initWithContext:context];
}
viewNode.type = type;
return viewNode;
}