Merge branch 'develop' into feature/jeremy

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishTakeVideo/PublishFilterView.swift

@@ -13,7 +13,15 @@ class PublishFilterView: BaseView {
     typealias DimClickClosure = () -> Void
     var dimClickClosure : DimClickClosure?
     
-    override func setupViews() {    
+    override func setupViews() {
+        self.backgroundColor = UIColor.clear
+        
+        // 添加毛玻璃效果，需使用frame设置位置
+        let blurEffect = UIBlurEffect(style: .dark)
+        let blurEffectView = UIVisualEffectView(effect: blurEffect)
+        blurEffectView.frame = CGRect(x: CGFloat(0), y: kScreenHeight-173, width: kScreenWidth, height: 173)
+        addSubview(blurEffectView)
+        
         addSubview(dimBackView)
         addSubview(collectionView)
         addSubview(titleLabel)
@@ -37,7 +45,7 @@ class PublishFilterView: BaseView {
     
     private lazy var dimBackView: UIView = {
         let dimBackView = UIView()
-        dimBackView.backgroundColor = kRGBAColor(r: 0/255.0, g: 0/255.0, b: 0/255.0, a: 0.2)
+        dimBackView.backgroundColor = UIColor.clear
         dimBackView.addTapGesture(1, target: self, action: #selector(dismissAction))
         return dimBackView
     }()
@@ -50,7 +58,7 @@ class PublishFilterView: BaseView {
     
     private lazy var titleLabel: UILabel = {
         let titleLabel = UILabel()
-        titleLabel.backgroundColor = kRGBAColor(r: 0/255.0, g: 0/255.0, b: 0/255.0, a: 0.8)
+        titleLabel.backgroundColor = UIColor.clear
         titleLabel.text = "滤镜"
         titleLabel.textColor = kffffffColor
         titleLabel.font = kRegularFont16
@@ -60,7 +68,7 @@ class PublishFilterView: BaseView {
     
     private lazy var collectionView: UICollectionView = {
         let collectionView = UICollectionView.init(frame: CGRect.zero, collectionViewLayout: collectionViewLayout)
-        collectionView.backgroundColor = kRGBAColor(r: 0/255.0, g: 0/255.0, b: 0/255.0, a: 0.8)
+        collectionView.backgroundColor = UIColor.clear
         collectionView.delegate = self;
         collectionView.dataSource = self;
         collectionView.showsVerticalScrollIndicator = false

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishTakeVideo/PublishMusicView.swift

@@ -14,10 +14,16 @@ class PublishMusicView: BaseView {
     var dismissViewClosure : DismissViewClosure?
     
     override func setupViews() {
+        self.backgroundColor = UIColor.clear
+        
+        // 添加毛玻璃效果，需使用frame设置位置
+        let blurEffect = UIBlurEffect(style: .dark)
+        let blurEffectView = UIVisualEffectView(effect: blurEffect)
+        blurEffectView.frame = CGRect(x: CGFloat(0), y: kNavBarTotalHeight, width: kScreenWidth, height: kScreenHeight-kNavBarTotalHeight)
+        addSubview(blurEffectView)
+        
         addSubview(headerView)
         addSubview(tableView)
-        
-        self.backgroundColor = UIColor.clear
     }
     
     override func setupLayouts() {
@@ -34,7 +40,7 @@ class PublishMusicView: BaseView {
     
     lazy var headerView: PublishMusicHeader = {
         let headerView = PublishMusicHeader()
-        headerView.backgroundColor = kRGBAColor(r: 0/255.0, g: 0/255.0, b: 0/255.0, a: 0.8)
+        headerView.backgroundColor = UIColor.clear
         headerView.dismissClosure = {
             [weak self] in
             if let dismissViewClosure = self?.dismissViewClosure {
@@ -47,8 +53,7 @@ class PublishMusicView: BaseView {
     lazy var tableView: UITableView = {
         let tableView = UITableView(frame: CGRect.zero, style: UITableView.Style.grouped)
         tableView.separatorStyle = .none
-        tableView.backgroundColor = kRGBAColor(r: 0/255.0, g: 0/255.0, b: 0/255.0, a: 0.8)
-//        tableView.backgroundColor = UIColor.clear
+        tableView.backgroundColor = UIColor.clear
         tableView.dataSource = self
         tableView.delegate = self
         tableView.estimatedRowHeight = 50

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishTakeVideo/PublishVideoRecorderController.swift

@@ -83,12 +83,10 @@ class PublishVideoRecorderController: BaseViewController {
         view.addSubview(videoCameraView)
         videoCameraView.preRecordViewShow()
         
-        view.addSubview(filterView)
-        filterView.addVisualEffect()
+        view.addSubview(filterView)        
         filterView.isHidden = true
         
         view.addSubview(musicView)
-        musicView.addVisualEffect()
         musicView.isHidden = true
     }
     
@@ -212,6 +210,9 @@ class PublishVideoRecorderController: BaseViewController {
                 
             case .filter:
                 self?.filterView.isHidden = false
+                if let hideSegmentClosure = self?.hideSegmentClosure {
+                    hideSegmentClosure(true)
+                }
                 
             case .delete:
                 self?.deleteButtonClicked()
@@ -237,6 +238,11 @@ class PublishVideoRecorderController: BaseViewController {
         filterView.dimClickClosure = {
             [weak self] in
             self?.filterView.isHidden = true
+            if self?.clipManager?.partCount == 0 {
+                if let hideSegmentClosure = self?.hideSegmentClosure {
+                    hideSegmentClosure(false)
+                }
+            }
         }
         return filterView
     }()

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishTakeVideo/PublishVideoView.swift

@@ -165,77 +165,6 @@ class PublishVideoView: BaseView {
         }
     }
     
-    // 刷新进度条进度
-    func recordingPercent(percent: CGFloat) {
-        progressView.updateProgress(percent)
-        
-//        if recording {
-            let d: Int = Int(percent)
-            let m: Int = Int(d / 60)
-            let s: Int = Int(d % 60)
-            
-            timeLabel.text = String(format: "%02d:%02d", m, s)
-//        }
-        
-        if percent == 0 {
-            progressView.reset()
-            timeLabel.text = ""
-        }
-        
-    }
-    
-    /**
-     * 显示默认视图
-     */
-    func preRecordViewShow() {
-        backButton.isHidden = false
-        recordButton.isHidden = false
-        progressView.isHidden = false
-        
-        controlBackView.isHidden = false
-        segmentedView.isHidden = false
-        timeBackView.isHidden = true
-        selBackView.isHidden = true
-    }
-    /**
-     * 显示正在拍摄视图
-     */
-    func recordingViewShow() {
-        backButton.isHidden = false
-        recordButton.isHidden = false
-        progressView.isHidden = false
-        
-        controlBackView.isHidden = true
-        segmentedView.isHidden = true
-        timeBackView.isHidden = false
-        selBackView.isHidden = true
-    }
-    /**
-     * 显示暂停拍摄视图
-     */
-    func pauseViewShow() {
-        backButton.isHidden = false
-        recordButton.isHidden = false
-        progressView.isHidden = false
-        
-        controlBackView.isHidden = false
-        segmentedView.isHidden = false
-        timeBackView.isHidden = true
-        selBackView.isHidden = false
-    }
-    /**
-     * 显示编辑音乐视图
-     */
-    func editMusicViewShow() {
-        backButton.isHidden = true
-        recordButton.isHidden = true
-        progressView.isHidden = true
-        
-        controlBackView.isHidden = true
-        segmentedView.isHidden = true
-        selBackView.isHidden = true
-    }
-    
     // MARK: - 创建视图控件
     //1.初始化JXSegmentedViewx
     lazy var segmentedView: JXSegmentedView = {
@@ -432,6 +361,80 @@ class PublishVideoView: BaseView {
     
 }
 
+// MARK: - 视图状态处理
+extension PublishVideoView {
+    // 刷新进度条进度
+    func recordingPercent(percent: CGFloat) {
+        progressView.updateProgress(percent)
+        
+        //        if recording {
+        let d: Int = Int(percent)
+        let m: Int = Int(d / 60)
+        let s: Int = Int(d % 60)
+        
+        timeLabel.text = String(format: "%02d:%02d", m, s)
+        //        }
+        
+        if percent == 0 {
+            progressView.reset()
+            timeLabel.text = ""
+        }
+        
+    }
+    
+    /**
+     * 显示默认视图
+     */
+    func preRecordViewShow() {
+        backButton.isHidden = false
+        recordButton.isHidden = false
+        progressView.isHidden = false
+        
+        controlBackView.isHidden = false
+        segmentedView.isHidden = false
+        timeBackView.isHidden = true
+        selBackView.isHidden = true
+    }
+    /**
+     * 显示正在拍摄视图
+     */
+    func recordingViewShow() {
+        backButton.isHidden = false
+        recordButton.isHidden = false
+        progressView.isHidden = false
+        
+        controlBackView.isHidden = true
+        segmentedView.isHidden = true
+        timeBackView.isHidden = false
+        selBackView.isHidden = true
+    }
+    /**
+     * 显示暂停拍摄视图
+     */
+    func pauseViewShow() {
+        backButton.isHidden = false
+        recordButton.isHidden = false
+        progressView.isHidden = false
+        
+        controlBackView.isHidden = false
+        segmentedView.isHidden = false
+        timeBackView.isHidden = true
+        selBackView.isHidden = false
+    }
+    /**
+     * 显示编辑音乐视图
+     */
+    func editMusicViewShow() {
+        backButton.isHidden = true
+        recordButton.isHidden = true
+        progressView.isHidden = true
+        
+        controlBackView.isHidden = true
+        segmentedView.isHidden = true
+        selBackView.isHidden = true
+    }
+}
+
 extension PublishVideoView : JXSegmentedViewDelegate {
     
     // 点击选中的情况才会调用该方法