no message

zhangxiaowen
1 parent d5b843aa
Showing 3 changed files with 33 additions and 28 deletions
CNLiveQrCodeModule/Classes/Controller/CNLiveMyQrCodeController.m
CNLiveQrCodeModule/Classes/Controller/CNLiveScanQrCodeController.m
Example/CNLiveQrCodeModule/CNLIVEAppDelegate.m
@@ -205,7 +205,6 @@ static const CGFloat timeValue = 1.5;
     }
     return _navigationBar;
 }
-
 - (void)rightButton{
     self.navigationBar.right.userInteractionEnabled = NO;
     __weak typeof(self) weakSelf = self;
@@ -264,39 +264,45 @@ static const CGFloat timeValue = 1.5;
         __weak typeof(self) weakSelf = self;
          _navigationBar.onClickLeftButton = ^{
              __strong typeof(weakSelf) strongSelf = weakSelf;
-              if(!strongSelf) return ;
+             if(!strongSelf) return;
              [strongSelf goBack];
          };
         _navigationBar.onClickRightButton = ^{
-            _navigationBar.right.userInteractionEnabled = NO;
-            // 从相册中读取二维码
-            [obtain establishAuthorizationQRCodeObtainAlbumWithController:nil];
-            if (obtain.isPHAuthorization == YES) {
-                [self.scanView removeTimer];
-            }
-            
-            __weak typeof(self) weakSelf = self;
-            [obtain setBlockWithQRCodeObtainAlbumDidCancelImagePickerController:^(SGQRCodeObtain *obtain) {
-                __strong typeof(weakSelf) strongSelf = weakSelf;
-                if(!strongSelf) return ;
-                strongSelf.navigationBar.right.userInteractionEnabled = YES;
-            }];
-            [obtain setBlockWithQRCodeObtainAlbumResult:^(SGQRCodeObtain *obtain, NSString *result) {
-                __strong typeof(weakSelf) strongSelf = weakSelf;
-                if(!strongSelf) return ;
-                strongSelf.navigationBar.right.userInteractionEnabled = YES;
-                if (result == nil) {
-                    NSLog(@"暂未识别出二维码");
-                    [QMUITips showError:@"暂未识别出二维码" inView:strongSelf.view hideAfterDelay:timeValue];
-
-                } else {
-                    [strongSelf handleResult:result];
-                }
-            }];
+            __strong typeof(weakSelf) strongSelf = weakSelf;
+            if(!strongSelf) return ;
+            [strongSelf rightButton];
         };
     }
     return _navigationBar;
 }
+- (void)rightButton{
+    _navigationBar.right.userInteractionEnabled = NO;
+    // 从相册中读取二维码
+    [obtain establishAuthorizationQRCodeObtainAlbumWithController:nil];
+    if (obtain.isPHAuthorization == YES) {
+        [self.scanView removeTimer];
+    }
+    
+    __weak typeof(self) weakSelf = self;
+    [obtain setBlockWithQRCodeObtainAlbumDidCancelImagePickerController:^(SGQRCodeObtain *obtain) {
+        __strong typeof(weakSelf) strongSelf = weakSelf;
+        if(!strongSelf) return ;
+        strongSelf.navigationBar.right.userInteractionEnabled = YES;
+    }];
+    [obtain setBlockWithQRCodeObtainAlbumResult:^(SGQRCodeObtain *obtain, NSString *result) {
+        __strong typeof(weakSelf) strongSelf = weakSelf;
+        if(!strongSelf) return ;
+        strongSelf.navigationBar.right.userInteractionEnabled = YES;
+        if (result == nil) {
+            NSLog(@"暂未识别出二维码");
+            [QMUITips showError:@"暂未识别出二维码" inView:strongSelf.view hideAfterDelay:timeValue];
+
+        } else {
+            [strongSelf handleResult:result];
+        }
+    }];
+
+}
 - (SGQRCodeScanView *)scanView {
     if (!_scanView) {
         _scanView = [[SGQRCodeScanView alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.width, self.view.frame.size.height)];
@@ -63,7 +63,7 @@
     }];
     self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
-    CNLiveScanQrCodeController *vc = [[CNLiveScanQrCodeController alloc] init];
+    CNLiveMyQrCodeController *vc = [[CNLiveMyQrCodeController alloc] init];
 //    vc.ID = @"http://www.baidu.com";
     UINavigationController *nav = [[UINavigationController alloc]initWithRootViewController:vc];