修改扫描二维码页面

Author: wanghengheng

Coding_iOS/Ease_2FA/Controllers/OTPListViewController.m

@@ -182,12 +182,35 @@ - (void)configUI{
 - (void)beginButtonClicked:(id)sender{
     __weak typeof(self) weakSelf = self;
     ZXScanCodeViewController *vc = [ZXScanCodeViewController new];
-    vc.sucessScanBlock = ^(OTPAuthURL *authURL){
-        [weakSelf addOneAuthURL:authURL];
+    vc.scanResultBlock = ^(ZXScanCodeViewController *vc, NSString *resultStr){
+        [weakSelf dealWithScanResult:resultStr ofVC:vc];
     };
     [self.navigationController pushViewController:vc animated:YES];
 }
 
+- (void)dealWithScanResult:(NSString *)resultStr ofVC:(ZXScanCodeViewController *)vc{
+    //解析结果
+    OTPAuthURL *authURL = [OTPAuthURL authURLWithURL:[NSURL URLWithString:resultStr] secret:nil];
+    if ([authURL isKindOfClass:[TOTPAuthURL class]]) {
+        [self addOneAuthURL:authURL];
+        [vc.navigationController popViewControllerAnimated:YES];
+    }else{
+        NSString *tipStr;
+        if (authURL) {
+            tipStr = @"目前仅支持 TOTP 类型的身份验证令牌";
+        }else{
+            tipStr = [NSString stringWithFormat:@"条码「%@」不是有效的身份验证令牌条码", resultStr];
+        }
+        UIAlertView *alertV = [UIAlertView bk_alertViewWithTitle:@"无效条码" message:tipStr];
+        [alertV bk_addButtonWithTitle:@"重试" handler:^{
+            if (![vc isScaning]) {
+                [vc startScan];
+            }
+        }];
+        [alertV show];
+    }
+}
+
 - (void)addOneAuthURL:(OTPAuthURL *)authURL{
     [MobClick event:kUmeng_Event_Request_ActionOfLocal label:@"2FA_扫描成功"];
 

Coding_iOS/Ease_2FA/Controllers/ZXScanCodeViewController.h

@@ -7,10 +7,14 @@
 //
 
 #import "BaseViewController.h"
-#import "OTPAuthURL.h"
+#import <AVFoundation/AVFoundation.h>
 
 @interface ZXScanCodeViewController : BaseViewController
+@property (strong, nonatomic, readonly) AVCaptureVideoPreviewLayer *videoPreviewLayer;
+- (BOOL)isScaning;
+- (void)startScan;
+- (void)stopScan;
 
-@property (copy, nonatomic) void(^sucessScanBlock)(OTPAuthURL *authURL);
+@property (copy, nonatomic) void(^scanResultBlock)(ZXScanCodeViewController *vc, NSString *resultStr);
 
 @end

Coding_iOS/Ease_2FA/Controllers/ZXScanCodeViewController.m

@@ -7,25 +7,34 @@
 //
 
 #import "ZXScanCodeViewController.h"
-#import <AVFoundation/AVFoundation.h>
 #import "ScanBGView.h"
+#import "Helper.h"
 
-@interface ZXScanCodeViewController ()<AVCaptureMetadataOutputObjectsDelegate>
+@interface ZXScanCodeViewController ()<AVCaptureMetadataOutputObjectsDelegate, UIImagePickerControllerDelegate, UINavigationControllerDelegate>
 @property (strong, nonatomic) ScanBGView *myScanBGView;
 @property (strong, nonatomic) UIImageView *scanRectView, *lineView;
 @property (strong, nonatomic) UILabel *tipLabel;
 
 @property (strong, nonatomic) AVCaptureVideoPreviewLayer *videoPreviewLayer;
+@property (strong, nonatomic) CIDetector *detector;
 @end
 
 @implementation ZXScanCodeViewController
 
+- (CIDetector *)detector{
+    if (!_detector) {
+        _detector = [CIDetector detectorOfType:CIDetectorTypeQRCode context:nil options:@{ CIDetectorAccuracy : CIDetectorAccuracyHigh }];
+    }
+    return _detector;
+}
+
 - (void)viewDidLoad {
     [super viewDidLoad];
 
     self.title = @"扫描二维码";
     self.view.backgroundColor = [UIColor blackColor];
-    
+    self.navigationItem.rightBarButtonItem = [UIBarButtonItem itemWithBtnTitle:@"相册" target:self action:@selector(clickRightBarButton:)];
+
     NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
     [nc addObserver:self
            selector:@selector(applicationDidBecomeActive:)
@@ -35,19 +44,18 @@ - (void)viewDidLoad {
            selector:@selector(applicationWillResignActive:)
                name:UIApplicationWillResignActiveNotification
              object:nil];
-
 }
 
 - (void)viewDidAppear:(BOOL)animated {
     [super viewDidAppear:animated];
-    [self configUI];
+    if (!_videoPreviewLayer) {
+        [self configUI];
+    }
 }
 
 - (void)viewWillDisappear:(BOOL)animated{
     [super viewWillDisappear:animated];
-    [self.videoPreviewLayer.session stopRunning];
-    [self.videoPreviewLayer removeFromSuperlayer];
-    [self scanLineStopAction];
+    [self stopScan];
 }
 
 - (void)configUI{
@@ -175,48 +183,79 @@ - (void)captureOutput:(AVCaptureOutput *)captureOutput didOutputMetadataObjects:
 }
 
 - (void)analyseResult:(AVMetadataMachineReadableCodeObject *)result{
-    DebugLog(@"result : %@", result.stringValue);
-    if (result.stringValue.length <= 0) {
+    NSString *resultStr = result.stringValue;
+    if (resultStr.length <= 0) {
         return;
     }
-
     //停止扫描
     [self.videoPreviewLayer.session stopRunning];
     [self scanLineStopAction];
-    
     //震动反馈
     AudioServicesPlaySystemSound(kSystemSoundID_Vibrate);
-    
-    //解析结果
-    OTPAuthURL *authURL = [OTPAuthURL authURLWithURL:[NSURL URLWithString:result.stringValue] secret:nil];
-    if ([authURL isKindOfClass:[TOTPAuthURL class]]) {
-        if (self.sucessScanBlock) {
-            self.sucessScanBlock(authURL);
-        }
-        [self.navigationController popViewControllerAnimated:YES];
-    }else{
-        NSString *tipStr;
-        if (authURL) {
-            tipStr = @"目前仅支持 TOTP 类型的身份验证令牌";
-        }else{
-            tipStr = [NSString stringWithFormat:@"条码「%@ : %@」不是有效的身份验证令牌条码", result.type, result.stringValue];
-        }
-        UIAlertView *alertV = [UIAlertView bk_alertViewWithTitle:@"无效条码" message:tipStr];
-        [alertV bk_addButtonWithTitle:@"重试" handler:^{
-            [self.videoPreviewLayer.session startRunning];
-            [self scanLineStartAction];
-        }];
-        [alertV show];
+    //交给 block 处理
+    if (_scanResultBlock) {
+        _scanResultBlock(self, resultStr);
     }
 }
 
 #pragma mark Notification
 - (void)applicationDidBecomeActive:(UIApplication *)application {
-    [self.videoPreviewLayer.session startRunning];
-    [self scanLineStartAction];
+    [self startScan];
 }
 
 - (void)applicationWillResignActive:(UIApplication *)application {
+    [self stopScan];
+}
+#pragma mark Photo
+-(void)clickRightBarButton:(UIBarButtonItem*)item{
+    if (![Helper checkPhotoLibraryAuthorizationStatus]) {
+        return;
+    }
+    //停止扫描
+    [self.videoPreviewLayer.session stopRunning];
+    [self scanLineStopAction];
+    
+    UIImagePickerController *picker = [UIImagePickerController new];
+    picker.delegate = self;
+    picker.allowsEditing = NO;
+    picker.sourceType = UIImagePickerControllerSourceTypePhotoLibrary;
+    [self.navigationController presentViewController:picker animated:YES completion:nil];
+}
+
+- (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingMediaWithInfo:(NSDictionary<NSString *,id> *)info{
+    [picker dismissViewControllerAnimated:YES completion:nil];
+    UIImage *image = [info objectForKey:UIImagePickerControllerEditedImage];
+    if (!image){
+        image = [info objectForKey:UIImagePickerControllerOriginalImage];
+    }
+    __block NSString *resultStr = nil;
+    NSArray *features = [self.detector featuresInImage:[CIImage imageWithCGImage:image.CGImage]];
+    [features enumerateObjectsUsingBlock:^(CIQRCodeFeature *obj, NSUInteger idx, BOOL *stop) {
+        if (obj.messageString.length > 0) {
+            resultStr = obj.messageString;
+            *stop = YES;
+        }
+    }];
+    //震动反馈
+    AudioServicesPlaySystemSound(kSystemSoundID_Vibrate);
+    //交给 block 处理
+    if (_scanResultBlock) {
+        _scanResultBlock(self, resultStr);
+    }
+}
+- (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker{
+    [picker dismissViewControllerAnimated:YES completion:nil];
+}
+
+#pragma mark public
+- (BOOL)isScaning{
+    return _videoPreviewLayer.session.isRunning;
+}
+- (void)startScan{
+    [self.videoPreviewLayer.session startRunning];
+    [self scanLineStartAction];
+}
+- (void)stopScan{
     [self.videoPreviewLayer.session stopRunning];
     [self scanLineStopAction];
 }