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

2
doric-iOS/Example/Example/ViewController.m
View File

@@ -77,7 +77,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
}
NSString *file = self.demoFilePaths[(NSUInteger) indexPath.row];
DoricViewController *doricViewController = [[DoricViewController alloc]
initWithScheme:[NSString stringWithFormat:@"assets://src/%@", file]
initWithSource:[NSString stringWithFormat:@"assets://src/%@", file]
alias:self.demoFilePaths[(NSUInteger) indexPath.row]
extra:nil
];

2
doric-iOS/Pod/Classes/DoricViewController.h
View File

@@ -32,5 +32,5 @@ extern NSString *const DORIC_MASK_RETRY;
@property(nonatomic, strong) UIView *loadingView;
@property(nonatomic, strong) UIView *errorView;
- (instancetype)initWithScheme:(NSString *)scheme alias:(NSString *)alias extra:(NSString *)extra;
- (instancetype)initWithSource:(NSString *)source alias:(NSString *)alias extra:(NSString *)extra;
@end

12
doric-iOS/Pod/Classes/DoricViewController.m
View File

@@ -29,16 +29,16 @@ @interface DoricViewController ()
@property(nonatomic) BOOL navBarHidden;
@property(nonatomic, strong) UIImage *navBarImage;
@property(nonatomic, strong) UIView *maskView;
@property(nonatomic, copy) NSString *scheme;
@property(nonatomic, copy) NSString *source;
@property(nonatomic, copy) NSString *alias;
@property(nonatomic, copy) NSString *extra;
@end
@implementation DoricViewController
- (instancetype)initWithScheme:(NSString *)scheme alias:(NSString *)alias extra:(NSString *)extra {
- (instancetype)initWithSource:(NSString *)source alias:(NSString *)alias extra:(NSString *)extra {
if (self = [super init]) {
self.edgesForExtendedLayout = UIRectEdgeNone;
_scheme = scheme;
_source = source;
_alias = alias;
_extra = extra;
_doricPanel = [DoricPanel new];
@@ -105,8 +105,8 @@ - (void)viewWillLayoutSubviews {
self.doricPanel.view.height = self.view.height;
}
- (void)doric_navigator_push:(NSString *)scheme alias:(NSString *)alias animated:(BOOL)animated extra:(NSString *)extra {
DoricViewController *viewController = [[DoricViewController alloc] initWithScheme:scheme alias:alias extra:extra];
- (void)doric_navigator_push:(NSString *)source alias:(NSString *)alias animated:(BOOL)animated extra:(NSString *)extra {
DoricViewController *viewController = [[DoricViewController alloc] initWithSource:source alias:alias extra:extra];
[self.navigationController pushViewController:viewController animated:animated];
}
@@ -180,7 +180,7 @@ - (void)hideMask {
- (void)loadJSBundle {
[self showLoading];
DoricAsyncResult <NSString *> *result = [DoricJSLoaderManager.instance request:self.scheme];
DoricAsyncResult <NSString *> *result = [DoricJSLoaderManager.instance request:self.source];
result.resultCallback = ^(NSString *result) {
dispatch_async(dispatch_get_main_queue(), ^{
[self hideMask];

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) {

2
doric-iOS/Pod/Classes/Navigator/DoricNavigatorDelegate.h
View File

@@ -20,7 +20,7 @@
#import <Foundation/Foundation.h>
@protocol DoricNavigatorDelegate <NSObject>
- (void)doric_navigator_push:(NSString *)scheme alias:(NSString *)alias animated:(BOOL)animated extra:(NSString *)extra;
- (void)doric_navigator_push:(NSString *)source alias:(NSString *)alias animated:(BOOL)animated extra:(NSString *)extra;
- (void)doric_navigator_pop:(BOOL)animated;
@end

6
doric-iOS/Pod/Classes/Plugin/DoricNavigatorPlugin.m
View File

@@ -24,8 +24,8 @@ @implementation DoricNavigatorPlugin
- (void)push:(NSDictionary *)params {
dispatch_async(dispatch_get_main_queue(), ^{
BOOL animated = YES;
NSString *scheme = params[@"scheme"];
NSString *alias = scheme;
NSString *source = params[@"source"];
NSString *alias = source;
NSDictionary *config = params[@"config"];
if (config) {
if (config[@"animated"]) {
@@ -36,7 +36,7 @@ - (void)push:(NSDictionary *)params {
alias = config[@"alias"];
}
}
[self.doricContext.navigator doric_navigator_push:scheme alias:alias animated:animated extra:config[@"extra"]];
[self.doricContext.navigator doric_navigator_push:source alias:alias animated:animated extra:config[@"extra"]];
});
}

19
doric-iOS/Pod/Classes/Shader/DoricLayouts.m
View File

@@ -463,22 +463,3 @@ - (void)layoutSelf:(CGSize)targetSize {
}
}
@end
DoricVLayoutView *vLayout(NSArray <__kindof UIView *> *views) {
DoricVLayoutView *layout = [[DoricVLayoutView alloc] initWithFrame:CGRectZero];
for (__kindof UIView *uiView in views) {
[layout addSubview:uiView];
}
layout.layoutConfig = [[DoricLayoutConfig alloc] initWithWidth:DoricLayoutWrapContent height:DoricLayoutWrapContent];
return layout;
}
DoricHLayoutView *hLayout(NSArray <__kindof UIView *> *views) {
DoricHLayoutView *layout = [[DoricHLayoutView alloc] initWithFrame:CGRectZero];
for (__kindof UIView *uiView in views) {
[layout addSubview:uiView];
}
layout.layoutConfig = [[DoricLayoutConfig alloc] initWithWidth:DoricLayoutWrapContent height:DoricLayoutWrapContent];
return layout;
}