Chris %!s(int64=5) %!d(string=hai) anos
pai
achega
6e530eb1b5

+ 0 - 2
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityVideoContent/ViewController/CommunityVideoListController.swift

@@ -342,11 +342,9 @@ extension CommunityVideoListController {
                 self?.collectionView.reloadData()
                 if  self?.videoListMdl?.pagination?.currentPage ?? 1 >= self?.videoListMdl?.pagination?.totalPages ?? 1 {
                     self?.collectionView.endFooterNoMoreData()
-                    self?.collectionView.isHiddenFooter(true)
                 }
             }else {
                 self?.collectionView.endFooterNoMoreData()
-                self?.collectionView.isHiddenFooter(true)
             }
             
         }

+ 9 - 4
RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/VideoRecord/Controller/AliyunMagicCameraViewController.m

@@ -520,6 +520,7 @@
     [self starPreview];
     
     _magicCameraView.hide = NO;
+    _magicCameraView.backButton.hidden = NO;
     [_magicCameraView resetRecordButtonUI];
     _magicCameraView.recording = NO;
     _magicCameraView.realVideoCount = [_clipManager partCount];
@@ -768,6 +769,7 @@
 - (void)recordButtonRecordVideo{
     if (self.magicCameraView.backButton.enabled == NO) {
         _magicCameraView.hide = NO;
+        _magicCameraView.backButton.hidden = NO;
         self.magicCameraView.progressView.videoCount--;
         [self.magicCameraView resetRecordButtonUI];
         self.magicCameraView.recording = NO;
@@ -775,7 +777,7 @@
         return;
     }
     
-    NSLog(@"---------->点击了录制按钮");
+    // 点击了录制按钮
     if (self.hideSegmentBlock) {
         self.hideSegmentBlock(true);
     }
@@ -793,11 +795,11 @@
     int code =  [_recorder startRecording];
     if (code == 0) {
         _magicCameraView.hide = YES;
-        _magicCameraView.backButton.enabled = NO;
+        _magicCameraView.backButton.hidden = YES;
     }else{
         NSLog(@"---------->startRecording错误error:  code:%d",code);
         _magicCameraView.hide = NO;
-        _magicCameraView.backButton.enabled = YES;
+        _magicCameraView.backButton.hidden = NO;
         self.magicCameraView.progressView.videoCount--;
         [self.magicCameraView resetRecordButtonUI];
         self.magicCameraView.recording = NO;
@@ -806,11 +808,12 @@
 }
 
 - (void)recordButtonPauseVideo {
-    NSLog(@"---------->点击了暂停录制按钮");
+    // 点击了暂停录制按钮
     [_recorder stopRecording];
     _magicCameraView.userInteractionEnabled =NO;
     self.upTime = CFAbsoluteTimeGetCurrent();
     _magicCameraView.hide = NO;
+    _magicCameraView.backButton.hidden = NO;
 }
 
 - (void)recordButtonFinishVideo {
@@ -818,6 +821,7 @@
     _quVideo.videoRotate = [_clipManager firstClipVideoRotation];
     [_recorder finishRecording];
     _magicCameraView.hide = NO;
+    _magicCameraView.backButton.hidden = NO;
 }
 
 - (void)backButtonClicked {
@@ -1101,6 +1105,7 @@
     [MBProgressHUD hideHUDForView:self.view animated:YES];
     self.magicCameraView.backButton.enabled = YES;
     _magicCameraView.hide = NO;
+    _magicCameraView.backButton.hidden = NO;
     [_magicCameraView resetRecordButtonUI];
     _magicCameraView.recording = NO;
     _magicCameraView.realVideoCount = [_clipManager partCount];