Explorar o código

当拍摄时长超过3s(整体时长)时,出现确定按钮,点击确定按钮直接跳转至视频编辑页面(视频总长度超过3s);

南鑫林 %!s(int64=5) %!d(string=hai) anos
pai
achega
c103a94935

+ 5 - 1
RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/VideoRecord/Controller/AliyunMagicCameraViewController.m

@@ -903,7 +903,6 @@
 
 - (void)finishButtonClicked {
     if ([_clipManager partCount]) {
-        [MBProgressHUD showHUDAddedTo:self.view animated:YES];
         [_recorder finishRecording];
     }
 }
@@ -1060,12 +1059,17 @@
 //    _magicCameraView.musicButton.enabled = ![_clipManager partCount];
     [_magicCameraView destroy];
     _magicCameraView.userInteractionEnabled =YES;
+    
+    if (_magicCameraView.autoShow) {
+        [self recordButtonFinishVideo];
+    }
 }
 
 // 完成录制回调
 - (void)recorderDidFinishRecording {
     self.magicCameraView.backButton.enabled = YES;
     [self stopPreview];
+    _magicCameraView.autoShow = NO;
     _magicCameraView.userInteractionEnabled =YES;
     [[MBProgressHUD HUDForView:self.view] hideAnimated:YES];
     if (_suspend == NO) {

+ 5 - 0
RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/VideoRecord/View/AliyunMagicCameraView.h

@@ -215,4 +215,9 @@
  滤镜文字
  */
 @property (nonatomic, strong) UILabel *effectFilterLabel;
+
+/**
+ 滤镜文字
+ */
+@property (nonatomic, assign) BOOL autoShow;
 @end

+ 17 - 1
RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/VideoRecord/View/AliyunMagicCameraView.m

@@ -221,6 +221,10 @@
 {
     self.recordTime = percent;
     [self.progressView updateProgress:percent];
+    
+    if (percent >= 3) {
+        self.finishButton.hidden = false;
+    }
     if(_recording){
         int d = percent;
         int m = d / 60;
@@ -234,6 +238,8 @@
         self.finishButton.hidden = YES;
         self.timeLabel.text = @"";
     }
+    
+
 }
 
 - (void)destroy
@@ -562,7 +568,17 @@
  */
 - (void)finishButtonClicked {
     if ([self.delegate respondsToSelector:@selector(finishButtonClicked)]) {
-        [self.delegate finishButtonClicked];
+        if (_recording) {
+            self.autoShow = true;
+            [self endRecord];
+            [self.delegate recordButtonPauseVideo];
+//            [self.delegate finishButtonClicked];
+
+            self.circleBtn.transform = CGAffineTransformIdentity;
+            [self.circleBtn setImage:_uiConfig.videoShootImageNormal forState:UIControlStateNormal];
+        }else {
+            [self.delegate finishButtonClicked];
+        }
     }
 }