声音控制

BFRecordScreenKit/Classes/RecordScreen/Controller/BFMusicSearchController.swift

@@ -29,9 +29,9 @@ class BFMusicSearchController: BFBaseViewController {
     
     var currPage = 1
     
-    var musicVolume = 0.0 {
+    var musicVolume = 0 {
         didSet{
-            slidV.value = Float(musicVolume)
+            slidV.value = Float(musicVolume) / 100.0
             uiForChangeVolume()
         }
     }
@@ -176,19 +176,18 @@ class BFMusicSearchController: BFBaseViewController {
     }
     
     @objc func valuChange(slid:UISlider) {
-        musicVolume = Double(slid.value)
+        musicVolume = Int(slid.value * 100)
     }
     
     func uiForChangeVolume() {
-        let num = (Int)(musicVolume * 100)
 
-        progressL.text = String(format: "%d%%", num)
+        progressL.text = String(format: "%d%%", musicVolume)
         
         var frame = progressL.frame
-        frame.origin.x = slidV.x - 7 + ((slidV.width - 28) / 100.0) * CGFloat(num)
+        frame.origin.x = slidV.x - 7 + ((slidV.width - 28) / 100.0) * CGFloat(musicVolume)
         progressL.frame = frame
         
-        player.volume = Float(musicVolume)
+        player.volume = Float(musicVolume) / 100.0
 
     }
 }

BFRecordScreenKit/Classes/RecordScreen/Controller/BFRecordScreenController.swift

@@ -663,7 +663,7 @@ public class BFRecordScreenController: BFBaseViewController {
             wself.showOptBtn(isShow: true)
             wself.bgmModel?.volume = Int(musicVolume)
             wself.originalVolume = originalVolume / 100.0
-            wself.choseMusicPanel.musicVolume = Double(musicVolume / 100.0)
+            wself.choseMusicPanel.musicVolume = Int(musicVolume)
             if !wself.isNormalPlaying, !wself.isRecording {
                 
                 wself.assetPlayer.volume = wself.originalVolume

BFRecordScreenKit/Classes/RecordScreen/View/BFChooseMusicView.swift

@@ -79,9 +79,9 @@ class BFChooseMusicView: UIView {
     // 音乐类别
     var categories = [MusicCategoryModel]()
     
-    var musicVolume = 0.0 {
+    var musicVolume = 0 {
         didSet{
-            slidV.value = Float(musicVolume)
+            slidV.value = Float(musicVolume) / 100.0
             uiForChangeVolume()
         }
     }
@@ -230,7 +230,7 @@ class BFChooseMusicView: UIView {
         progressL.frame = CGRect(x: slidV.x - 7, y: slidV.y - 24, width: 36, height: 16)
         addSubview(progressL)
         
-        self.musicVolume = 0.2
+        self.musicVolume = 20
 
         loadedTimeRangesObserver = player.observe(\AVPlayer.currentItem?.loadedTimeRanges, options: [.new, .initial]) { [weak self] (player, change) in
             
@@ -350,20 +350,19 @@ class BFChooseMusicView: UIView {
     }
     
     @objc func valuChange(slid:UISlider) {
-        musicVolume = Double(slid.value)
+        musicVolume = Int(slid.value * 100)
     }
     
     func uiForChangeVolume() {
-        let num = (Int)(musicVolume * 100)
 
-        progressL.text = String(format: "%d%%", num)
+        progressL.text = String(format: "%d%%", musicVolume)
         
         var frame = progressL.frame
-        frame.origin.x = slidV.x - 7 + ((slidV.width - 28) / 100.0) * CGFloat(num)
+        frame.origin.x = slidV.x - 7 + ((slidV.width - 28) / 100.0) * CGFloat(musicVolume)
         progressL.frame = frame
         
-        player.volume = Float(musicVolume)
-        chosedMusic?.volume = num
+        player.volume = Float(musicVolume) / 100.0
+        chosedMusic?.volume = musicVolume
 
     }
     
@@ -383,7 +382,7 @@ class BFChooseMusicView: UIView {
         player.pause()
  
         choseCell()?.status = .pause
-        
+
         switch btn.tag{
         case 1001:
             clickBtnAction?(.cancle)
@@ -438,6 +437,7 @@ extension BFChooseMusicView:UITableViewDelegate, UITableViewDataSource {
                 chosedIndexPath = indexPath
                 chosedMusic = cell.data
                 cell.status = chosedCellStatu
+                tableView.selectRow(at: indexPath, animated: false, scrollPosition: UITableView.ScrollPosition.none)
             }else{
                 cell.status = .normal
             }
@@ -472,6 +472,7 @@ extension BFChooseMusicView:UITableViewDelegate, UITableViewDataSource {
             
             chosedMusic?.isSelected = false
             chosedMusic = cell.data
+            chosedMusic?.volume = musicVolume
             cell.changeSelected(true)
             
             chosedIndexPath = indexPath

BFRecordScreenKit/Classes/RecordScreen/View/Cell/BFMuicInfoCell.swift

@@ -170,12 +170,12 @@ class BFMuicInfoCell: UITableViewCell {
 
         if selected{
             titleL.textColor = UIColor.hexColor(hexadecimal: "#389AFF")
-            showFunctionBtn()
             titleL.font = UIFont.systemFont(ofSize: 16, weight: .medium)
+            showFunctionBtn()
         }else {
             titleL.textColor = UIColor.white
-            hiddenFunctionBtn()
             titleL.font = UIFont.systemFont(ofSize: 16, weight: .regular)
+            hiddenFunctionBtn()
         }
     }