Commit 7117c56

committed

扫一扫中添加对两步验证码的处理

1 parent f380a3a commit 7117c56Copy full SHA for 7117c56

File tree

+20

-4

lines changed

+20

-4

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@`
`31`	`31`	`#import "FRDLivelyButton.h"`
`32`	`32`	`#import "StartImagesManager.h"`
`33`	`33`	`#import "ZXScanCodeViewController.h"`
	`34`	`+#import "OTPListViewController.h"`
`34`	`35`	`#import "WebViewController.h"`
`35`	`36`
`36`	`37`	`@interface Project_RootViewController ()<UISearchBarDelegate, UITableViewDataSource, UITableViewDelegate>`
`@@ -616,11 +617,14 @@ - (void)scanBtnClicked{`
`616`	`617`	`}`
`617`	`618`
`618`	`619`	`- (void)dealWithScanResult:(NSString )resultStr ofVC:(ZXScanCodeViewController )vc{`
	`620`	`+ if ([OTPListViewController handleScanResult:resultStr ofVC:vc]) {`
	`621`	`+ return;`
	`622`	`+ }`
`619`	`623`	`UIViewController *nextVC = [BaseViewController analyseVCFromLinkStr:resultStr];`
`620`	`624`	`NSURL *URL = [NSURL URLWithString:resultStr];`
`621`	`625`	`if (nextVC) {`
`622`	`626`	`[self.navigationController pushViewController:nextVC animated:YES];`
`623`		`- }else if (URL){`
	`627`	`+ }else if ([[UIApplication sharedApplication] canOpenURL:URL]){`
`624`	`628`	`UIAlertView *alertV = [UIAlertView bk_alertViewWithTitle:@"提示" message:[NSString stringWithFormat:@"可能存在风险,是否打开此链接?\n「%@」", resultStr]];`
`625`	`629`	`[alertV bk_setCancelButtonWithTitle:@"取消" handler:nil];`
`626`	`630`	`[alertV bk_addButtonWithTitle:@"打开链接" handler:nil];`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,6 @@`
`9`	`9`	`#import "BaseViewController.h"`
`10`	`10`
`11`	`11`	`@interface OTPListViewController : BaseViewController`
`12`		`-+(NSString )otpCodeWithGK:(NSString )global_key;`
	`12`	`++ (NSString )otpCodeWithGK:(NSString )global_key;`
	`13`	`++ (BOOL)handleScanResult:(NSString )resultStr ofVC:(UIViewController )vc;`
`13`	`14`	`@end`

Lines changed: 13 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`	`//`
`8`	`8`
`9`	`9`	`#import "OTPListViewController.h"`
`10`		`-#import "ZXScanCodeViewController.h"`
`11`	`10`	`#import "OTPTableViewCell.h"`
`12`	`11`
`13`	`12`	`#import "OTPAuthURL.h"`
`@@ -60,7 +59,7 @@ + (NSMutableArray *)loadKeychainAuthURLs{`
`60`	`59`	`return authURLs;`
`61`	`60`	`}`
`62`	`61`
`63`		`-+(NSString )otpCodeWithGK:(NSString )global_key{`
	`62`	`++(NSString )otpCodeWithGK:(NSString )global_key{`
`64`	`63`	`NSString *otpCode = nil;`
`65`	`64`	`if (global_key.length > 0) {`
`66`	`65`	`NSMutableArray *authURLs = [self loadKeychainAuthURLs];`
`@@ -77,6 +76,18 @@ +(NSString )otpCodeWithGK:(NSString )global_key{`
`77`	`76`	`return otpCode;`
`78`	`77`	`}`
`79`	`78`
	`79`	`++ (BOOL)handleScanResult:(NSString )resultStr ofVC:(UIViewController )vc{`
	`80`	`+ //解析结果`
	`81`	`+ OTPAuthURL *authURL = [OTPAuthURL authURLWithURL:[NSURL URLWithString:resultStr] secret:nil];`
	`82`	`+ if ([authURL isKindOfClass:[TOTPAuthURL class]]) {`
	`83`	`+ OTPListViewController *nextVC = [OTPListViewController new];`
	`84`	`+ [vc.navigationController pushViewController:nextVC animated:YES];`
	`85`	`+ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{`
	`86`	`+ [nextVC addOneAuthURL:authURL];`
	`87`	`+ });`
	`88`	`+ }`
	`89`	`+}`
	`90`	`+`
`80`	`91`	`- (void)viewDidLoad{`
`81`	`92`	`[super viewDidLoad];`
`82`	`93`	`self.title = @"身份验证器";`

Comments

(0)