Skip to content

修复BHRouter多个问题 #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

修复BHRouter多个问题 #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
72e7550
修复#133<调用BHRouter.canOpenUrl过滤pathComponentKey为/无法转换为Class错误>
zevwings Mar 21, 2019
61c3812
update .travis.yml
zevwings Mar 21, 2019
83a26cc
`BHRouter.openURL`调用`Service`时，如果`Selector`返回值为`NSObject`时crash。
zevwings Mar 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
language: objective-c
xcode_project: BeeHive.xcodeproj
xcode_scheme: BeeHive
xcode_sdk: iphonesimulator
xcode_destination: platform=iOS Simulator,OS=9.3,name=iPhone 5s
8 changes: 8 additions & 0 deletions BeeHive.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
135 changes: 71 additions & 64 deletions BeeHive/BHRouter.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ + (id)bh_getReturnFromInv:(NSInvocation *)inv withSig:(NSMethodSignature *)sig {
};

case '@': { // id
id ret = nil;
__unsafe_unretained id ret = nil;
[inv getReturnValue:&ret];
return ret;
};
Expand Down Expand Up @@ -247,69 +247,76 @@ + (BOOL)canOpenURL:(NSURL *)URL
__block BOOL flag = YES;

[pathComponents enumerateObjectsUsingBlock:^(NSString * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
NSArray<NSString *> * subPaths = [obj componentsSeparatedByString:BHRURLSubPathSplitPattern];
if (!subPaths.count) {
flag = NO;
*stop = NO;
return;
}
NSString *pathComponentKey = subPaths.firstObject;
if (router.pathComponentByKey[pathComponentKey]) {
return;
}
Class mClass = NSClassFromString(pathComponentKey);
if (!mClass) {
flag = NO;
*stop = NO;
return;
}
switch (usage) {
case BHRUsageCallService: {
if (subPaths.count < 3) {
flag = NO;
*stop = NO;
return;
}
NSString *protocolStr = subPaths[1];
NSString *selectorStr = subPaths[2];
Protocol *protocol = NSProtocolFromString(protocolStr);
SEL selector = NSSelectorFromString(selectorStr);
if (!protocol ||
!selector ||
![mClass conformsToProtocol:@protocol(BHServiceProtocol)] ||
![mClass conformsToProtocol:protocol] ||
![mClass instancesRespondToSelector:selector]) {
flag = NO;
*stop = NO;
return;
}
} break;
case BHRUsageJumpViewControler: {
if (![mClass isSubclassOfClass:[UIViewController class]]) {
flag = NO;
*stop = NO;
return;
}
} break;
case BHRUsageRegister: {
if (![mClass conformsToProtocol:@protocol(BHServiceProtocol)]) {
return;
}
if (subPaths.count < 2) {
flag = NO;
*stop = NO;
return;
}
NSString *protocolStr = subPaths[1];
Protocol *protocol = NSProtocolFromString(protocolStr);
if (!protocol || ![mClass conformsToProtocol:protocol]) {
flag = NO;
*stop = NO;
}
} break;

default:
break;

if (![obj isEqualToString:@"/"]) {

NSArray<NSString *> * subPaths = [obj componentsSeparatedByString:BHRURLSubPathSplitPattern];
if (!subPaths.count) {
flag = NO;
*stop = NO;
return;
}

NSString *pathComponentKey = subPaths.firstObject;
if (router.pathComponentByKey[pathComponentKey]) {
return;
}

Class mClass = NSClassFromString(pathComponentKey);
if (!mClass) {
flag = NO;
*stop = NO;
return;
}

switch (usage) {
case BHRUsageCallService: {
if (subPaths.count < 3) {
flag = NO;
*stop = NO;
return;
}
NSString *protocolStr = subPaths[1];
NSString *selectorStr = subPaths[2];
Protocol *protocol = NSProtocolFromString(protocolStr);
SEL selector = NSSelectorFromString(selectorStr);
if (!protocol ||
!selector ||
![mClass conformsToProtocol:@protocol(BHServiceProtocol)] ||
![mClass conformsToProtocol:protocol] ||
![mClass instancesRespondToSelector:selector]) {
flag = NO;
*stop = NO;
return;
}
} break;
case BHRUsageJumpViewControler: {
if (![mClass isSubclassOfClass:[UIViewController class]]) {
flag = NO;
*stop = NO;
return;
}
} break;
case BHRUsageRegister: {
if (![mClass conformsToProtocol:@protocol(BHServiceProtocol)]) {
return;
}
if (subPaths.count < 2) {
flag = NO;
*stop = NO;
return;
}
NSString *protocolStr = subPaths[1];
Protocol *protocol = NSProtocolFromString(protocolStr);
if (!protocol || ![mClass conformsToProtocol:protocol]) {
flag = NO;
*stop = NO;
}
} break;

default:
break;
}
}
}];

Expand Down