Merge branch 'dev' of https://git.yishihui.com/iOS/BFRecordScreenKit into dev

音量设置

BFRecordScreenKit/Classes/RecordScreen/Controller/BFRecordScreenController.swift

@@ -651,6 +651,7 @@ public class BFRecordScreenController: BFBaseViewController {
 
             wself.bgmModel?.volume = Int(musicVolume)
             wself.originalVolume = originalVolume / 100.0
+            wself.choseMusicPanel.musicVolume = Double(musicVolume / 100.0)
             if !wself.isNormalPlaying, !wself.isRecording {
                 
                 wself.assetPlayer.volume = wself.originalVolume
@@ -2637,6 +2638,7 @@ public class BFRecordScreenController: BFBaseViewController {
 
         if let model = music {
             if let title = model.musicName {
+                audioSettingView.musicSlider.value = Float(model.volume)
                 addMusicBtn.setTitle(title, for: .normal)
             }else{
                 addMusicBtn.setTitle("选择音乐", for: .normal)

BFRecordScreenKit/Classes/RecordScreen/View/BFChooseMusicView.swift

@@ -32,7 +32,12 @@ class BFChooseMusicView: UIView {
     // 音乐类别
     var categories = [PQStuckPointMusicTagsModel]()
     
-    var musicVolume = 0.2
+    var musicVolume = 0.2 {
+        didSet{
+            slidV.value = Float(musicVolume)
+            uiForChangeVolume()
+        }
+    }
     
     // 选中的音乐
     var chosedMusic : PQVoiceModel?
@@ -272,14 +277,21 @@ class BFChooseMusicView: UIView {
     }
     
     @objc func valuChange(slid:UISlider) {
-        let progress = slid.value
-        let num = (Int)(progress * 100)
+        musicVolume = Double(slid.value)
+        uiForChangeVolume()
+    }
+    
+    func uiForChangeVolume() {
+        let num = (Int)(musicVolume * 100)
+
         progressL.text = String(format: "%d%%", num)
+        
         var frame = progressL.frame
         frame.origin.x = slidV.x - 7 + ((slidV.width - 28) / 100.0) * CGFloat(num)
         progressL.frame = frame
-        musicVolume = Double(num) / 100.0
+        
         player.volume = Float(musicVolume)
+
     }
     
     func configCategoriesView(){