Merge branch 'develop' into feature/jeremy

# Conflicts:
#	RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/VideoRecord/Controller/AliyunMagicCameraViewController.m

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/VideoRecord/Controller/AliyunMagicCameraViewController.m

@@ -1009,13 +1009,15 @@
 }
 
 - (void)recorderDidStopWithMaxDuration {
-    self.magicCameraView.backButton.enabled = YES;
-    [MBProgressHUD showHUDAddedTo:self.view animated:YES];
-    self.magicCameraView.progressView.videoCount++;
-    self.magicCameraView.progressView.showBlink = NO;
-    [self.recorder finishRecording];
-    [self.magicCameraView destroy];
-    _magicCameraView.userInteractionEnabled =YES;
+
+    [self.magicCameraView endRecord];
+    self.magicCameraView.circleBtn.transform = CGAffineTransformIdentity;
+    [self.magicCameraView.circleBtn setImage:_uiConfig.videoShootImageNormal forState:UIControlStateNormal];
+    
+    if ([_clipManager partCount]) {
+        [MBProgressHUD showHUDAddedTo:self.view animated:YES];
+        [_recorder finishRecording];
+    }
 }
 
 - (void)recoderError:(NSError *)error

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/VideoRecord/View/AliyunMagicCameraView.h

@@ -203,4 +203,9 @@
  */
 -(void)refreshFocusPointWithPoint:(CGPoint)point;
 
+/**
+ 结束录制
+ */
+- (void)endRecord;
+
 @end