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

wanghengheng · wanghengheng · commit 7117c566f72b · 2016-02-23T10:34:30.000+08:00
diff --git a/Coding_iOS/Controllers/RootControllers/Project_RootViewController.m b/Coding_iOS/Controllers/RootControllers/Project_RootViewController.m
@@ -31,6 +31,7 @@
 #import "FRDLivelyButton.h"
 #import "StartImagesManager.h"
 #import "ZXScanCodeViewController.h"
+#import "OTPListViewController.h"
 #import "WebViewController.h"
 
 @interface Project_RootViewController ()<UISearchBarDelegate, UITableViewDataSource, UITableViewDelegate>
@@ -616,11 +617,14 @@ - (void)scanBtnClicked{
 }
 
 - (void)dealWithScanResult:(NSString *)resultStr ofVC:(ZXScanCodeViewController *)vc{
+    if ([OTPListViewController handleScanResult:resultStr ofVC:vc]) {
+        return;
+    }
     UIViewController *nextVC  = [BaseViewController analyseVCFromLinkStr:resultStr];
     NSURL *URL = [NSURL URLWithString:resultStr];
     if (nextVC) {
         [self.navigationController pushViewController:nextVC animated:YES];
-    }else if (URL){
+    }else if ([[UIApplication sharedApplication] canOpenURL:URL]){
         UIAlertView *alertV = [UIAlertView bk_alertViewWithTitle:@"&#25552;&#31034;" message:[NSString stringWithFormat:@"&#21487;&#33021;&#23384;&#22312;&#39118;&#38505;&#65292;&#26159;&#21542;&#25171;&#24320;&#27492;&#38142;&#25509;&#65311;\n&#12300;%@&#12301;", resultStr]];
         [alertV bk_setCancelButtonWithTitle:@"&#21462;&#28040;" handler:nil];
         [alertV bk_addButtonWithTitle:@"&#25171;&#24320;&#38142;&#25509;" handler:nil];
diff --git a/Coding_iOS/Ease_2FA/Controllers/OTPListViewController.h b/Coding_iOS/Ease_2FA/Controllers/OTPListViewController.h
@@ -9,5 +9,6 @@
 #import "BaseViewController.h"
 
 @interface OTPListViewController : BaseViewController
-+(NSString *)otpCodeWithGK:(NSString *)global_key;
++ (NSString *)otpCodeWithGK:(NSString *)global_key;
++ (BOOL)handleScanResult:(NSString *)resultStr ofVC:(UIViewController *)vc;
 @end
diff --git a/Coding_iOS/Ease_2FA/Controllers/OTPListViewController.m b/Coding_iOS/Ease_2FA/Controllers/OTPListViewController.m
@@ -7,7 +7,6 @@
 //
 
 #import "OTPListViewController.h"
-#import "ZXScanCodeViewController.h"
 #import "OTPTableViewCell.h"
 
 #import "OTPAuthURL.h"
@@ -60,7 +59,7 @@ + (NSMutableArray *)loadKeychainAuthURLs{
     return authURLs;
 }
 
-+(NSString *)otpCodeWithGK:(NSString *)global_key{
++ (NSString *)otpCodeWithGK:(NSString *)global_key{
     NSString *otpCode = nil;
     if (global_key.length > 0) {
         NSMutableArray *authURLs = [self loadKeychainAuthURLs];
@@ -77,6 +76,18 @@ +(NSString *)otpCodeWithGK:(NSString *)global_key{
     return otpCode;
 }
 
++ (BOOL)handleScanResult:(NSString *)resultStr ofVC:(UIViewController *)vc{
+    //&#35299;&#26512;&#32467;&#26524;
+    OTPAuthURL *authURL = [OTPAuthURL authURLWithURL:[NSURL URLWithString:resultStr] secret:nil];
+    if ([authURL isKindOfClass:[TOTPAuthURL class]]) {
+        OTPListViewController *nextVC = [OTPListViewController new];
+        [vc.navigationController pushViewController:nextVC animated:YES];
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            [nextVC addOneAuthURL:authURL];
+        });
+    }
+}
+
 - (void)viewDidLoad{
     [super viewDidLoad];
     self.title = @"&#36523;&#20221;&#39564;&#35777;&#22120;";
