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

iOS:Environment support customize

Browse Source
This commit is contained in:
pengfei.zhou 2020-01-10 15:11:14 +08:00 committed by osborn
parent d4b19eb4ea
commit 50147329a4
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doric-iOS/Pod/Classes/DoricRegistry.h
View File

@ -40,6 +40,10 @@ NS_ASSUME_NONNULL_BEGIN
- (Class)acquireViewNode:(NSString *)name; - (Class)acquireViewNode:(NSString *)name;
- (void)setEnvironment:(NSString *)key variable:(id)value;
- (NSDictionary *)environmentVariables;
+ (void)register:(DoricLibrary *)library; + (void)register:(DoricLibrary *)library;
@end @end

16
doric-iOS/Pod/Classes/DoricRegistry.m
View File

@ -78,7 +78,7 @@ @interface DoricRegistry ()
@property(nonatomic, strong) NSMutableDictionary *bundles; @property(nonatomic, strong) NSMutableDictionary *bundles;
@property(nonatomic, strong) NSMutableDictionary *plugins; @property(nonatomic, strong) NSMutableDictionary *plugins;
@property(nonatomic, strong) NSMutableDictionary *nodes; @property(nonatomic, strong) NSMutableDictionary *nodes;
@property(nonatomic, strong) NSMutableDictionary <NSString *, id> *envVariables;
@end @end
@implementation DoricRegistry @implementation DoricRegistry
@ -89,9 +89,10 @@ + (void)register:(DoricLibrary *)library {
- (instancetype)init { - (instancetype)init {
if (self = [super init]) { if (self = [super init]) {
_bundles = [[NSMutableDictionary alloc] init]; _bundles = [NSMutableDictionary new];
_plugins = [[NSMutableDictionary alloc] init]; _plugins = [NSMutableDictionary new];
_nodes = [[NSMutableDictionary alloc] init]; _nodes = [NSMutableDictionary new];
_envVariables = [NSMutableDictionary new];
[self innerRegister]; [self innerRegister];
[DoricLibraries.instance.libraries enumerateObjectsUsingBlock:^(DoricLibrary *obj, BOOL *stop) { [DoricLibraries.instance.libraries enumerateObjectsUsingBlock:^(DoricLibrary *obj, BOOL *stop) {
[obj load:self]; [obj load:self];
@ -153,4 +154,11 @@ - (Class)acquireViewNode:(NSString *)name {
return self.nodes[name]; return self.nodes[name];
} }
- (void)setEnvironment:(NSString *)key variable:(id)value {
self.envVariables[key] = value;
}
- (NSDictionary *)environmentVariables {
return self.envVariables;
}
@end @end

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

@ -23,7 +23,6 @@
#import "DoricJSEngine.h" #import "DoricJSEngine.h"
#import "DoricJSExecutorProtocol.h" #import "DoricJSExecutorProtocol.h"
#import "DoricJSCoreExecutor.h" #import "DoricJSCoreExecutor.h"
#import "DoricJSRemoteExecutor.h"
#import "DoricConstant.h" #import "DoricConstant.h"
#import "DoricUtil.h" #import "DoricUtil.h"
#import "DoricBridgeExtension.h" #import "DoricBridgeExtension.h"
@ -56,14 +55,20 @@ - (instancetype)init {
- (void)initJSExecutor { - (void)initJSExecutor {
__weak typeof(self) _self = self; __weak typeof(self) _self = self;
NSDictionary *infoDictionary = [[NSBundle mainBundle] infoDictionary]; NSDictionary *infoDictionary = [[NSBundle mainBundle] infoDictionary];
[self.jsExecutor injectGlobalJSObject:INJECT_ENVIRONMENT obj:@{ NSMutableDictionary *envDic = [@{
@"platform": @"iOS", @"platform": @"iOS",
@"platformVersion": [[UIDevice currentDevice] systemVersion], @"platformVersion": [[UIDevice currentDevice] systemVersion],
@"appName": infoDictionary[@"CFBundleName"], @"appName": infoDictionary[@"CFBundleName"],
@"appVersion": infoDictionary[@"CFBundleShortVersionString"], @"appVersion": infoDictionary[@"CFBundleShortVersionString"],
@"screenWidth": @([[UIScreen mainScreen] bounds].size.width), @"screenWidth": @([[UIScreen mainScreen] bounds].size.width),
@"screenHeight": @([[UIScreen mainScreen] bounds].size.height), @"screenHeight": @([[UIScreen mainScreen] bounds].size.height),
} mutableCopy];
[self.registry.environmentVariables enumerateKeysAndObjectsUsingBlock:^(NSString *key, id obj, BOOL *stop) {
envDic[key] = obj;
}]; }];
[self.jsExecutor injectGlobalJSObject:INJECT_ENVIRONMENT obj:[envDic copy]];
[self.jsExecutor injectGlobalJSObject:INJECT_LOG obj:^(NSString *type, NSString *message) { [self.jsExecutor injectGlobalJSObject:INJECT_LOG obj:^(NSString *type, NSString *message) {
DoricLog(@"JS:%@", message); DoricLog(@"JS:%@", message);
}]; }];