修复bug

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishMediaPicker/Controller/KSMediaPickerController.swift

@@ -101,6 +101,8 @@ open class KSMediaPickerController: UIViewController, UICollectionViewDelegate,
     private static let k_image_item_iden = NSStringFromClass(k_image_item_class)
     private static let k_video_item_iden = NSStringFromClass(k_video_item_class)
     
+    var tableView : UITableView?
+    
     override open func loadView() {
         let view = KSMediaPickerView()
         view.jumpType = self.jumpType
@@ -118,9 +120,9 @@ open class KSMediaPickerController: UIViewController, UICollectionViewDelegate,
         collectionView.delegate = self
         collectionView.dataSource = self
         
-        let tableView = view.albumTableView
-        tableView.delegate = self
-        tableView.dataSource = self
+        tableView = view.albumTableView
+        tableView?.delegate = self
+        tableView?.dataSource = self
         
         self.view = view
     }
@@ -184,12 +186,19 @@ open class KSMediaPickerController: UIViewController, UICollectionViewDelegate,
         _selectedAlbum = _albumList?.first
     }
     
+    typealias IsHiddenSegmentedViewClosure = (Bool) -> Void
+    var isHiddenSegmentedViewClosure : IsHiddenSegmentedViewClosure?
+    
     @objc private func _chengedAlbumListStatus(_ button: UIButton) {
         let isShow = (view as! KSMediaPickerView).chengedAlbumListStatus()
+        if let isHiddenSegmentedViewClosure = isHiddenSegmentedViewClosure {
+            isHiddenSegmentedViewClosure(isShow)
+        }
         if isShow {
-            button.setImage(kImage(name: "ico_arrow_up"), for: UIControl.State.normal)
-        }else {
             button.setImage(kImage(name: "ico_arrow_down"), for: UIControl.State.normal)
+            
+        }else {
+            button.setImage(kImage(name: "ico_arrow_up"), for: UIControl.State.normal)
         }
         button.setTitle(self._selectedAlbum?.albumTitle, for: UIControl.State.normal)
         button.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.right, imageTitleSpace: 1)

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishMediaPicker/View/KSMediaPickerView.swift

@@ -159,7 +159,7 @@ open class KSMediaPickerView: UIView {
         collectionView.scrollIndicatorInsets = conetntInset
         
         let inset = UIEdgeInsets(top: navHeight, left: 0.0, bottom: 0.0, right: 0.0)
-        albumTableView.frame = CGRect(x: self.x, y: self.y, width: self.width, height: kScreenHeight-kTabBarTotalHeight+3)
+        albumTableView.frame = CGRect(x: self.x, y: self.y, width: self.width, height: kScreenHeight)
         albumTableView.contentInset = inset
         albumTableView.scrollIndicatorInsets = inset
         

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishMusicAbout/PublishMusicChooseView.swift

@@ -58,6 +58,8 @@ class PublishMusicChooseView: BaseView {
         configRectCorner(corner: [.topLeft,.topRight], radii: CGSize(width: 8, height: 8))
         
         addSubview(cancelButton)
+        addSubview(noSelectedMusicButton)
+        
         
         addSubview(recommendLabel)
         addSubview(recommendButton)
@@ -76,6 +78,11 @@ class PublishMusicChooseView: BaseView {
             make.size.equalTo(44)
         }
         
+        noSelectedMusicButton.snp.makeConstraints { (make) in
+            make.centerY.equalTo(cancelButton)
+            make.right.equalTo(-14)
+        }
+        
         // 底部分割线
         sepLineView.snp.makeConstraints { (make) in
             make.left.right.equalToSuperview()
@@ -141,6 +148,17 @@ class PublishMusicChooseView: BaseView {
         return cancelButton
     }()
     
+    lazy var noSelectedMusicButton: UIButton = {
+        let noSelectedMusicButton = UIButton()
+        noSelectedMusicButton.setTitle("不使用音乐", for: UIControl.State.normal)
+        noSelectedMusicButton.setTitleColor(UIColor.white, for: UIControl.State.normal)
+        noSelectedMusicButton.titleLabel?.font = kRegularFont15
+        noSelectedMusicButton.rx.tap.subscribe(onNext: { [weak self] in
+            self?.chooseMusicAction("")
+        }).disposed(by: disposeBag)
+        return noSelectedMusicButton
+    }()
+    
     lazy var recommendLabel: UILabel = {
         let recommendLabel = UILabel()
         recommendLabel.text = "没有找到想要的音乐？"

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishViewController.swift

@@ -77,7 +77,6 @@ class PublishViewController: BaseViewController {
     }
     
     override func setupData() {
-        
     }
     
     //1.初始化JXSegmentedViewx
@@ -226,6 +225,10 @@ extension PublishViewController :JXSegmentedListContainerViewDataSource {
                 pubVc.imageArr = imageArray
                 self?.navigationController?.pushViewController(pubVc, animated: true)
             }
+            mediaVc.isHiddenSegmentedViewClosure = {
+                [weak self] (isHidden) in
+                self?.segmentedView.isHidden = !isHidden
+            }
             return mediaVc
         case 1:
             let videoVc = AliyunMagicCameraViewController()