소스 검색

bug fixed

Chris 5 년 전
부모
커밋
30d64951af

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 3 - 5
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityVideoContent/View/CommunityVideoCoverCollectionCell.swift


+ 0 - 7
RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoCommonFile/Tools/MediaConfig/AliyunMediaConfig.h

@@ -237,13 +237,6 @@ typedef NS_ENUM(NSInteger, kPhotoMediaType) {
                                        fps:(int)fps
                                        gop:(int)gop;
 
-/**
- 初始化config
-
- @return 初始化后的config
- */
-+ (instancetype)invertConfig;
-
 /**
  获取一个默认属性的config
 

+ 0 - 5
RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoCommonFile/Tools/MediaConfig/AliyunMediaConfig.m

@@ -50,11 +50,6 @@
     return config;
 }
 
-+ (instancetype)invertConfig {
-    AliyunMediaConfig *config = [[AliyunMediaConfig alloc] init];
-    return config;
-}
-
 + (instancetype)defaultConfig{
     AliyunMediaConfig *config = [[AliyunMediaConfig alloc] init];
     config.outputSize = CGSizeMake(720, 1280);

+ 7 - 2
RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/VideoRecord/Controller/AliyunMagicCameraViewController.m

@@ -783,8 +783,12 @@
     self.downTime = CFAbsoluteTimeGetCurrent();
     self.downVideoCount = [_clipManager partCount];
     if (_clipManager.partCount<=0) { 
-        _recorder.cameraRotate = self.cameraRotate;
-        _quVideo.videoRotate = _recorder.cameraRotate;
+//        _recorder.cameraRotate = self.cameraRotate;
+//        _quVideo.videoRotate = _recorder.cameraRotate;
+        
+        // FIXME: 暂禁用重力感应(July.23)
+        _recorder.cameraRotate = 0;
+        _quVideo.videoRotate = 0;
     }
     int code =  [_recorder startRecording];
     if (code == 0) {
@@ -1060,6 +1064,7 @@
         //跳转处理
         NSString *outputPath = _recorder.outputPath;
         
+        // 保存至相册
 //        UISaveVideoAtPathToSavedPhotosAlbum(_recorder.outputPath, self, nil, nil);
         
         if (self.finishBlock) {

+ 14 - 10
RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishEditController/Controller/PublishEditController.swift

@@ -50,12 +50,7 @@ class PublishEditController: BaseViewController {
         setupViews()
         setupData()
         
-//        rightButton.backgroundColor = kd8d8d8Color
-        rightButton.backgroundColor = k62CC74Color
-    }
-    
-    override func viewWillAppear(_ animated: Bool) {
-        
+        checkPublishButtonStatus()
     }
     
     override func setupViews() {
@@ -112,9 +107,7 @@ class PublishEditController: BaseViewController {
         rightButton.cornerRadius = 13
         rightButton.masksToBounds = true
         rightButton.rx.tap.subscribe(onNext: { [weak self] (data) in
-            
-            self?.checkPublishStatus()
-            
+            self?.checkAndPublishAction()
         }).disposed(by: disposeBag)
         return rightButton
     }()
@@ -163,6 +156,7 @@ extension PublishEditController : UITableViewDelegate, UITableViewDataSource {
             desCell.commentTextViewClosure = {
                 [weak self] (text) in
                 self?.pubContent = text
+                self?.checkPublishButtonStatus()
             }
             return desCell
         case 3:
@@ -201,6 +195,7 @@ extension PublishEditController : UITableViewDelegate, UITableViewDataSource {
                     }
                 }
                 self?.tableView.reloadRows(at: [indexPath], with: UITableView.RowAnimation.none)
+                self?.checkPublishButtonStatus()
             }
             self.navigationController?.pushViewController(vc, animated: true)
         case 4:
@@ -249,7 +244,7 @@ extension PublishEditController : UITableViewDelegate, UITableViewDataSource {
 // MARK: - 逻辑处理
 extension PublishEditController {
     
-    func checkPublishStatus() {
+    func checkAndPublishAction() {
         if pubTitle.count > 20 {
             SwiftProgressHUD.shared().showText("标题最多输入20个字符")
             return
@@ -280,4 +275,13 @@ extension PublishEditController {
         })
     }
     
+    // 改变发布按钮颜色
+    func checkPublishButtonStatus() {
+        if pubContent.count == 0 || selTopicIdArr.count == 0 {
+            rightButton.backgroundColor = kd8d8d8Color
+        } else {
+            rightButton.backgroundColor = k62CC74Color
+        }
+    }
+    
 }