提交0.0.14

梁星国
1 parent 09d4bc2d
Showing 2 changed files with 35 additions and 9 deletions
CNLiveAVCamera.podspec
CNLiveAVCamera/Classes/XFCameraController.m
@@ -8,7 +8,7 @@
  
 Pod::Spec.new do |s|
   s.name             = 'CNLiveAVCamera'
-  s.version          = '0.1.3'
+  s.version          = '0.1.4'
   s.summary          = '自定义相机'
  
 # This description is used to generate tags and improve search results.
@@ -459,13 +459,29 @@ typedef void(^PropertyChangeBlock)(AVCaptureDevice *captureDevice);
  
     [self startAnimationGroup];
  
+    AVCaptureDevice *currentDevice = [self.videoInput device];
+    AVCaptureDevicePosition currentPosition = [currentDevice position];
+    
+    if (currentPosition == AVCaptureDevicePositionBack) {
+        self.flashButton.hidden = NO;
+    }else {
+        self.flashButton.hidden = YES;
+    }
 }
  
 /**
  *  确认按钮并返回代理
  */
-- (void)confirmBtnFunc
+- (void)confirmBtnFunc:(UIButton *)btn
 {
+    [self confirmBtnDisplayFunc:btn];
+
+}
+
+#pragma mark - 延迟执行
+- (void)confirmBtnDisplayFunc:(UIButton *)sender {
+    
+    sender.enabled = NO;
  
     if (self.playerLayer) {
         self.playerLayer.hidden = YES;
@@ -498,8 +514,7 @@ typedef void(^PropertyChangeBlock)(AVCaptureDevice *captureDevice);
  
         //        }];
  
-        self.confirmButton.userInteractionEnabled = NO;
-        
+        sender.enabled = YES;
     }
     else
     {
@@ -540,9 +555,8 @@ typedef void(^PropertyChangeBlock)(AVCaptureDevice *captureDevice);
                             [[NSFileManager defaultManager] removeItemAtURL:weakSelf.videoURL error:nil];
                             weakSelf.videoURL = nil;
                         }
+                        sender.enabled = YES;
                     }
-                    
-                    weakSelf.confirmButton.userInteractionEnabled = NO;
                 }];
  
                 //                [XFPhotoLibraryManager saveVideoWithVideoUrl:outputURL andAssetCollectionName:nil withCompletion:^(NSURL *videoUrl, NSError *error) {
@@ -578,10 +592,17 @@ typedef void(^PropertyChangeBlock)(AVCaptureDevice *captureDevice);
                 [[NSFileManager defaultManager] removeItemAtURL:weakSelf.videoURL error:nil];
                 weakSelf.videoURL = nil;
                 [[NSFileManager defaultManager] removeItemAtURL:outputURL error:nil];
+                sender.enabled = YES;
             }
         }];
     }
+    
 }
+
+
+
+
+
 #pragma mark - 懒加载
 - (AVCaptureSession *)captureSession
 {
@@ -702,7 +723,7 @@ typedef void(^PropertyChangeBlock)(AVCaptureDevice *captureDevice);
     {
         _confirmButton = [[UIButton alloc] init];
         [_confirmButton setImage:[UIImage imageNamedFromMyBundle:@"fb_wancheng"] forState:UIControlStateNormal];
-        [_confirmButton addTarget:self action:@selector(confirmBtnFunc) forControlEvents:UIControlEventTouchUpInside];
+        [_confirmButton addTarget:self action:@selector(confirmBtnFunc:) forControlEvents:UIControlEventTouchUpInside];
 //        _confirmButton.cs_acceptEventInterval = 2.0f;
  
     }
@@ -846,6 +867,11 @@ typedef void(^PropertyChangeBlock)(AVCaptureDevice *captureDevice);
  
     CALayer *layer = self.view.layer;
  
+    if (IS_IPhoneX_All) {
+        _captureVideoPreviewLayer.frame = CGRectMake(0, 88, KScreenWidth, KScreenHeight - 88 - kVerticalBottomSafeHeight);
+    }else {
+        _captureVideoPreviewLayer.frame = CGRectMake(0, 0, KScreenWidth, KScreenHeight);
+    }
     _captureVideoPreviewLayer.frame = CGRectMake(0, 0, k_ScreenWidth, KScreenHeight);
     _captureVideoPreviewLayer.xf_centerY = self.view.centerY;
  
@@ -1448,9 +1474,9 @@ typedef void(^PropertyChangeBlock)(AVCaptureDevice *captureDevice);
 - (NSString *)createVideoFolderPath
 {
  
-#pragma mark - TODO: 存储路径
+#pragma mark - 存储路径
  
-    if (self.outPutPath) {
+    if (self.outPutPath.length > 0) {
         return [self checkFilePath:self.outPutPath];
     }
     return [self chatFilePathByName:@"相机"];