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

refact:change field name from scheme to source

Browse Source
This commit is contained in:
pengfei.zhou
2020-02-17 21:23:02 +08:00
committed by osborn
parent 9e54ba1ea6
commit 0961cb9fc9
32 changed files with 72 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
doric-iOS/Pod/Classes/Loader/DoricHttpJSLoader.m
View File

@@ -22,13 +22,13 @@
@implementation DoricHttpJSLoader
- (BOOL)filter:(NSString *)scheme {
return [scheme hasPrefix:@"http"];
- (BOOL)filter:(NSString *)source {
return [source hasPrefix:@"http"];
}
- (DoricAsyncResult <NSString *> *)request:(NSString *)scheme {
- (DoricAsyncResult <NSString *> *)request:(NSString *)source {
DoricAsyncResult *ret = [DoricAsyncResult new];
NSURL *URL = [NSURL URLWithString:scheme];
NSURL *URL = [NSURL URLWithString:source];
NSURLRequest *request = [NSURLRequest requestWithURL:URL];
[[[NSURLSession sessionWithConfiguration:[NSURLSessionConfiguration defaultSessionConfiguration]]
dataTaskWithRequest:request

2
doric-iOS/Pod/Classes/Loader/DoricJSLoaderManager.h
View File

@@ -29,5 +29,5 @@
- (void)addJSLoader:(id <DoricLoaderProtocol>)loader;
- (DoricAsyncResult <NSString *> *)request:(NSString *)scheme;
- (DoricAsyncResult <NSString *> *)request:(NSString *)source;
@end

6
doric-iOS/Pod/Classes/Loader/DoricJSLoaderManager.m
View File

@@ -55,11 +55,11 @@ - (void)addJSLoader:(id <DoricLoaderProtocol>)loader {
}];
}
- (DoricAsyncResult <NSString *> *)request:(NSString *)scheme {
- (DoricAsyncResult <NSString *> *)request:(NSString *)source {
__block DoricAsyncResult *ret;
[self.loaders enumerateObjectsUsingBlock:^(id <DoricLoaderProtocol> obj, BOOL *stop) {
if ([obj filter:scheme]) {
ret = [obj request:scheme];
if ([obj filter:source]) {
ret = [obj request:source];
*stop = YES;
}
}];

4
doric-iOS/Pod/Classes/Loader/DoricLoaderProtocol.h
View File

@@ -21,7 +21,7 @@
#import "DoricAsyncResult.h"
@protocol DoricLoaderProtocol <NSObject>
- (BOOL)filter:(NSString *)scheme;
- (BOOL)filter:(NSString *)source;
- (DoricAsyncResult <NSString *> *)request:(NSString *)scheme;
- (DoricAsyncResult <NSString *> *)request:(NSString *)source;
@end

8
doric-iOS/Pod/Classes/Loader/DoricMainBundleJSLoader.m
View File

@@ -21,14 +21,14 @@
@implementation DoricMainBundleJSLoader
- (BOOL)filter:(NSString *)scheme {
return [scheme hasPrefix:@"assets"];
- (BOOL)filter:(NSString *)source {
return [source hasPrefix:@"assets"];
}
- (DoricAsyncResult <NSString *> *)request:(NSString *)scheme {
- (DoricAsyncResult <NSString *> *)request:(NSString *)source {
DoricAsyncResult <NSString *> *ret = [DoricAsyncResult new];
NSString *path = [[NSBundle mainBundle] bundlePath];
NSString *fullPath = [path stringByAppendingPathComponent:[scheme substringFromIndex:@"assets://".length]];
NSString *fullPath = [path stringByAppendingPathComponent:[source substringFromIndex:@"assets://".length]];
NSError *error;
NSString *jsContent = [NSString stringWithContentsOfFile:fullPath encoding:NSUTF8StringEncoding error:&error];
if (error) {