Bladeren bron

音乐优化完成

南鑫林 5 jaren geleden
bovenliggende
commit
3231a708fd

+ 2 - 2
RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishMusicAbout/PublishMusicListController.swift

@@ -157,7 +157,7 @@ extension PublishMusicListController {
                     self?.tableView.resetNoMoreData()
 
                 }
-                self?.createDisableMusicItem()
+//                self?.createDisableMusicItem()
                 self?.musicItemMdlArr = (self?.musicItemMdlArr)! + (recommendMusicListModel?.data!)!
                 
                 self?.tableView.reloadData()
@@ -181,7 +181,7 @@ extension PublishMusicListController {
                     self?.tableView.resetNoMoreData()
 
                 }
-                self?.createDisableMusicItem()
+//                self?.createDisableMusicItem()
                 self?.musicItemMdlArr = (self?.musicItemMdlArr)! + (categoryMusicListModel?.data!)!
                 
                 self?.tableView.reloadData()

+ 17 - 1
RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishMusicAbout/PublishRecordMusicView.swift

@@ -54,7 +54,7 @@ class PublishRecordMusicView: BaseView {
         configRectCorner(corner: [.topLeft,.topRight], radii: CGSize(width: 8, height: 8))
         
         addSubview(cancelButton)
-        
+        addSubview(noSelectedMusicButton)
         addSubview(recommendLabel)
         addSubview(recommendButton)
     }
@@ -66,6 +66,10 @@ class PublishRecordMusicView: BaseView {
             make.left.equalTo(3)
             make.size.equalTo(44)
         }
+        noSelectedMusicButton.snp.makeConstraints { (make) in
+            make.centerY.equalTo(cancelButton)
+            make.right.equalTo(-14)
+        }
         
         recommendLabel.snp.makeConstraints { (make) in
             make.centerX.equalTo(kScreenWidth*0.5-20)
@@ -105,6 +109,17 @@ class PublishRecordMusicView: 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 = "没有找到想要的音乐?"
@@ -246,6 +261,7 @@ extension PublishRecordMusicView :JXSegmentedListContainerViewDataSource {
         MusicPlayManager.shared().destroyPlayer()
         MusicPlayManager.shared().curPlayingId = -1
     }
+    
 }
 
 // MARK: - 网络请求