no message

zhangxiaowen
1 parent d1212621
Showing 3 changed files with 57 additions and 52 deletions
CNLiveQrCodeModule/Classes/Controller/CNLiveGenerateQrCodeController.m
CNLiveQrCodeModule/Classes/Controller/CNLiveMyQrCodeController.m
CNLiveQrCodeModule/Classes/Controller/CNLiveScanQrCodeController.m
@@ -197,56 +197,60 @@ static const CGFloat timeValue = 1.5;
             [strongSelf goBack];
         };
         _navigationBar.onClickRightButton = ^{
-            _navigationBar.right.userInteractionEnabled = NO;
-            __weak typeof(self) weakSelf = self;
-            QMUIAlertAction *action1 = [QMUIAlertAction actionWithTitle:@"保存图片" style:QMUIAlertActionStyleDefault handler:^(__kindof QMUIAlertController *aAlertController, QMUIAlertAction *action) {
-                __strong typeof(weakSelf) strongSelf = weakSelf;
-                if(!strongSelf) return ;
-                [strongSelf getPHAuthorizationStatus:^{
-                    UIImage *image = [strongSelf generateImage:strongSelf.qrCodeView];
-                    [QMUITips showLoadingInView:strongSelf.view];
-                    [strongSelf saveImage:image];
-                    [QMUITips hideAllTipsInView:strongSelf.view];
-                }];
-                _navigationBar.right.userInteractionEnabled = YES;
-
-             }];
-            QMUIAlertAction *action2 = [QMUIAlertAction actionWithTitle:@"扫描二维码" style:QMUIAlertActionStyleDefault handler:^(__kindof QMUIAlertController *aAlertController, QMUIAlertAction *action) {
-                __strong typeof(weakSelf) strongSelf = weakSelf;
-                if(!strongSelf) return ;
-                CNLiveScanQrCodeController *vc = [[CNLiveScanQrCodeController alloc]init];
-                [strongSelf.navigationController pushViewController:vc animated:YES];
-
-                _navigationBar.right.userInteractionEnabled = YES;
-            }];
-            QMUIAlertAction *cancel = [QMUIAlertAction actionWithTitle:@"取消" style:QMUIAlertActionStyleCancel handler:^(__kindof QMUIAlertController *aAlertController, QMUIAlertAction *action) {
-                  __strong typeof(weakSelf) strongSelf = weakSelf;
-                  if(!strongSelf) return ;
-                  _navigationBar.right.userInteractionEnabled = YES;
-
-              }];
-                   
-            QMUIAlertController *alertController = [QMUIAlertController alertControllerWithTitle:@"" message:@"" preferredStyle:QMUIAlertControllerStyleActionSheet];
-            alertController.delegate = self;
-            [alertController addAction:action1];
-            [alertController addAction:action2];
-            [alertController addAction:cancel];
-
-            NSMutableDictionary *titleAttributs = [[NSMutableDictionary alloc] initWithDictionary:alertController.alertTitleAttributes];
-                   
-            titleAttributs[NSForegroundColorAttributeName] = [UIColor colorWithRed:35/255.0 green:212/255.0 blue:30/255.0 alpha:1.0];
-            
-            NSMutableDictionary *cancelAttributs = [[NSMutableDictionary alloc] initWithDictionary:alertController.alertTitleAttributes];
-            cancelAttributs[NSForegroundColorAttributeName] = [UIColor colorWithRed:51/255.0 green:51/255.0 blue:51/255.0 alpha:1.0];
-
-            action1.buttonAttributes = titleAttributs;
-            action2.buttonAttributes = titleAttributs;
-            cancel.buttonAttributes = cancelAttributs;
-
-            [alertController showWithAnimated:YES];
+            __strong typeof(weakSelf) strongSelf = weakSelf;
+             if(!strongSelf) return ;
+            [strongSelf rightButtonOnClick];
         };
     }
     return _navigationBar;
 }
+- (void)rightButtonOnClick{
+    _navigationBar.right.userInteractionEnabled = NO;
+    __weak typeof(self) weakSelf = self;
+    QMUIAlertAction *action1 = [QMUIAlertAction actionWithTitle:@"保存图片" style:QMUIAlertActionStyleDefault handler:^(__kindof QMUIAlertController *aAlertController, QMUIAlertAction *action) {
+        __strong typeof(weakSelf) strongSelf = weakSelf;
+        if(!strongSelf) return ;
+        [strongSelf getPHAuthorizationStatus:^{
+            UIImage *image = [strongSelf generateImage:strongSelf.qrCodeView];
+            [QMUITips showLoadingInView:strongSelf.view];
+            [strongSelf saveImage:image];
+            [QMUITips hideAllTipsInView:strongSelf.view];
+        }];
+        strongSelf.navigationBar.right.userInteractionEnabled = YES;
+
+     }];
+    QMUIAlertAction *action2 = [QMUIAlertAction actionWithTitle:@"扫描二维码" style:QMUIAlertActionStyleDefault handler:^(__kindof QMUIAlertController *aAlertController, QMUIAlertAction *action) {
+        __strong typeof(weakSelf) strongSelf = weakSelf;
+        if(!strongSelf) return ;
+        CNLiveScanQrCodeController *vc = [[CNLiveScanQrCodeController alloc]init];
+        [strongSelf.navigationController pushViewController:vc animated:YES];
+        strongSelf.navigationBar.right.userInteractionEnabled = YES;
+    }];
+    QMUIAlertAction *cancel = [QMUIAlertAction actionWithTitle:@"取消" style:QMUIAlertActionStyleCancel handler:^(__kindof QMUIAlertController *aAlertController, QMUIAlertAction *action) {
+          __strong typeof(weakSelf) strongSelf = weakSelf;
+          if(!strongSelf) return ;
+          strongSelf.navigationBar.right.userInteractionEnabled = YES;
+
+      }];
+           
+    QMUIAlertController *alertController = [QMUIAlertController alertControllerWithTitle:@"" message:@"" preferredStyle:QMUIAlertControllerStyleActionSheet];
+    alertController.delegate = self;
+    [alertController addAction:action1];
+    [alertController addAction:action2];
+    [alertController addAction:cancel];
+
+    NSMutableDictionary *titleAttributs = [[NSMutableDictionary alloc] initWithDictionary:alertController.alertTitleAttributes];
+           
+    titleAttributs[NSForegroundColorAttributeName] = [UIColor colorWithRed:35/255.0 green:212/255.0 blue:30/255.0 alpha:1.0];
+    
+    NSMutableDictionary *cancelAttributs = [[NSMutableDictionary alloc] initWithDictionary:alertController.alertTitleAttributes];
+    cancelAttributs[NSForegroundColorAttributeName] = [UIColor colorWithRed:51/255.0 green:51/255.0 blue:51/255.0 alpha:1.0];
+
+    action1.buttonAttributes = titleAttributs;
+    action2.buttonAttributes = titleAttributs;
+    cancel.buttonAttributes = cancelAttributs;
+
+    [alertController showWithAnimated:YES];
+}
 @end
@@ -199,13 +199,13 @@ static const CGFloat timeValue = 1.5;
         _navigationBar.onClickRightButton = ^{
             __strong typeof(weakSelf) strongSelf = weakSelf;
              if(!strongSelf) return ;
-            [strongSelf rightButton];
+            [strongSelf rightButtonOnClick];
         };
     }
     return _navigationBar;
 }
-- (void)rightButton{
+- (void)rightButtonOnClick{
     self.navigationBar.right.userInteractionEnabled = NO;
     __weak typeof(self) weakSelf = self;
     QMUIAlertAction *action1 = [QMUIAlertAction actionWithTitle:@"保存图片" style:QMUIAlertActionStyleDefault handler:^(__kindof QMUIAlertController *aAlertController, QMUIAlertAction *action) {
@@ -244,7 +244,6 @@ static const CGFloat timeValue = 1.5;
 }
-#pragma mark - 选择图片识别二维码
 #pragma mark - 懒加载
 - (CNLiveNavigationBar *)navigationBar {
     if (!_navigationBar) {
@@ -267,15 +266,17 @@ static const CGFloat timeValue = 1.5;
              if(!strongSelf) return;
              [strongSelf goBack];
          };
+    
+#pragma mark - 选择图片识别二维码
         _navigationBar.onClickRightButton = ^{
             __strong typeof(weakSelf) strongSelf = weakSelf;
             if(!strongSelf) return ;
-            [strongSelf rightButton];
+            [strongSelf rightButtonOnClick];
         };
     }
     return _navigationBar;
 }
-- (void)rightButton{
+- (void)rightButtonOnClick{
     _navigationBar.right.userInteractionEnabled = NO;
     // 从相册中读取二维码
     [obtain establishAuthorizationQRCodeObtainAlbumWithController:nil];