fix jira bug

BFRecordScreenKit/Assets/BFRecordScreenKit.xcassets/music_icon.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "music_icon@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BFRecordScreenKit/Classes/RecordScreen/Controller/BFMusicManager.swift

@@ -60,10 +60,10 @@ class BFMusicManager {
         }
     }
     
-    func pause() {
+    func pause(_ status:BFMuicInfoCellState = .pause) {
         player.pause()
         needDeteactiveStatus = false
-        playStatusCallback?(player.currentItem, .pause)
+        playStatusCallback?(player.currentItem, status)
     }
     
     func stop() {

BFRecordScreenKit/Classes/RecordScreen/Controller/BFMusicSearchController.swift

@@ -100,6 +100,7 @@ class BFMusicSearchController: BFBaseViewController {
         super.viewDidAppear(animated)
         
         searchTF.becomeFirstResponder()
+        uiForChangeVolume()
     }
     
     override func viewDidLoad() {

BFRecordScreenKit/Classes/RecordScreen/Controller/BFRecordScreenCameraManager.swift

@@ -431,6 +431,7 @@ class BFRecordScreenCameraManager: BFRecordScreenBaseManager {
         
         startTimer(isPlay: true)
     }
+    
     func prepareToPlayNext(needPlay: Bool = true) {
         
         if let mod = recordItem?.videoStickers.first(where: { mode in

BFRecordScreenKit/Classes/RecordScreen/Controller/BFRecordScreenController.swift

@@ -79,6 +79,9 @@ public class BFRecordScreenController: BFBaseViewController {
     
     lazy var rscmanager : BFRecordScreenCameraManager = {
         let m = BFRecordScreenCameraManager()
+        m.assetPlayer = assetPlayer
+
+        
         m.recordProgressCallBack = {[weak self] progress in
             guard let wself = self else { return }
             wself.rscurrentManager.currentAssetProgress = progress
@@ -555,12 +558,17 @@ public class BFRecordScreenController: BFBaseViewController {
             var nextAction : ((Bool) -> Void)?
             if type == BFChooseMusicViewClickType.sure {
                 wself.hadChoosed(music: vv?.chosedMusic)
+                wself.audioSettingView.musicSlider.value = Float(vv?.musicVolume ?? 0)
+
+                BFLog(1, message: "volume1 sure: \(wself.choseMusicPanel.musicVolume)")
             }else if type == .cancle{
-                
+                wself.choseMusicPanel.musicVolume = Int(wself.audioSettingView.musicSlider.value)
+                BFLog(1, message: "volume1 cancel: \(wself.choseMusicPanel.musicVolume)")
             }else if type == .search{
                 nextAction = {[weak self] isFinished in
                     guard let wself = self else { return }
-                    
+                    BFLog(1, message: "volume1 search: \(wself.choseMusicPanel.musicVolume)")
+
                     if isFinished {
                         let vc = BFMusicSearchController()
                         vc.modalPresentationStyle = .fullScreen
@@ -660,6 +668,8 @@ public class BFRecordScreenController: BFBaseViewController {
     // 音量设置
     lazy var audioSettingView: BFAudioSettingView = {
         let audioSettingView = BFAudioSettingView(frame: CGRect(x: 0, y: 0, width: cScreenWidth, height: cScreenHeigth))
+        audioSettingView.originalMSlider.value = 20
+        audioSettingView.musicSlider.value = 20
         audioSettingView.isHidden = true
         audioSettingView.musicSlider.valueIsInt = true
         audioSettingView.originalMSlider.valueIsInt = true
@@ -1598,6 +1608,7 @@ public class BFRecordScreenController: BFBaseViewController {
             wself.choseMusicPanel.frame = CGRect(x: 0, y: 0, width: cScreenWidth, height: cScreenHeigth)
         }
         choseMusicPanel.refreshCurrSelectModel(mod: bgmModel)
+        choseMusicPanel.musicVolume = Int(audioSettingView.musicSlider.value)
     }
 
     /// 删除指定段落的所有字幕 数据
@@ -2685,13 +2696,12 @@ public class BFRecordScreenController: BFBaseViewController {
     func hadChoosed(music:PQVoiceModel?) {
         bgmModel = music
         bgmPlayer.replaceCurrentItem(musicPath: bgmModel?.musicPath)
-        
+
         if let model = music {
             
             BFEventTrackAdaptor.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_musicChangerButton, pageSource: .sp_speekPage,extParams: ["musicID":bgmModel?.musicId ?? ""],commonParams: commonParams())
      
             if let title = model.musicName {
-                audioSettingView.musicSlider.value = Float(model.volume)
 //                addMusicBtn.setTitle(title, for: .normal)
 //                addMusicBtn.kf.setImage(with: URL(string: model.avatarUrl), for: .normal)
                 

BFRecordScreenKit/Classes/RecordScreen/View/BFAudioSettingView.swift

@@ -32,6 +32,7 @@ class BFAudioSettingView: UIView {
     // 有录音
     lazy var originalMSlider: BFUISlider = {
         let originalMSlider = BFUISlider()
+        originalMSlider.isMovePoint = false
         let thbImage = UIImage.moduleImage(named: BFConfig.shared.silderPinUsedImageName, moduleName: "BFFramework", isAssets: false)
         originalMSlider.setMinimumTrackImage(thbImage, for: .normal)
         originalMSlider.setMaximumTrackImage(thbImage, for: .normal)
@@ -44,9 +45,8 @@ class BFAudioSettingView: UIView {
 //        speechSlidView.addTarget(self, action: #selector(sliderTouchEnded(sender:)), for: .touchUpInside)
         originalMSlider.maximumValue = 100
         originalMSlider.minimumValue = 0
-        originalMSlider.isMovePoint = false
+        originalMSlider.valueIsInt = true
         originalMSlider.valueTextColor = UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue)
-        originalMSlider.value = 20
         originalMSlider.valueChangedHandle = { [weak self] sender in
             if self?.callBack != nil {
                 self?.callBack!(sender.value, self?.musicSlider.value ?? 0)
@@ -80,8 +80,8 @@ class BFAudioSettingView: UIView {
         musicSlider.maximumValue = 100
         musicSlider.minimumValue = 0
         musicSlider.unit = "%"
+        musicSlider.valueIsInt = true
         musicSlider.valueTextColor = UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue)
-        musicSlider.value = 20
         musicSlider.valueChangedHandle = { [weak self] sender in
             if self?.callBack != nil {
                 self?.callBack!(self?.originalMSlider.value ?? 0, sender.value)
@@ -112,24 +112,24 @@ class BFAudioSettingView: UIView {
 
         originalMLab.snp.makeConstraints { make in
             make.left.equalToSuperview().offset(16)
-            make.right.equalToSuperview().offset(-16)
-            make.top.equalToSuperview().offset(25)
+            make.top.equalToSuperview().offset(60)
+            make.width.equalTo(40)
+            make.height.equalTo(20)
         }
         originalMSlider.snp.makeConstraints { make in
-            make.left.equalToSuperview().offset(16)
+            make.left.equalTo(originalMLab.snp.right).offset(10)
             make.right.equalToSuperview().offset(-16)
-            make.top.equalTo(originalMLab).offset(24)
+            make.top.height.equalTo(originalMLab)
         }
 
         musicLab.snp.makeConstraints { make in
-            make.left.equalToSuperview().offset(16)
-            make.right.equalToSuperview().offset(-16)
-            make.top.equalTo(originalMSlider).offset(42)
+            make.left.width.height.equalTo(originalMLab)
+            make.top.equalTo(originalMSlider).offset(70)
         }
         musicSlider.snp.makeConstraints { make in
-            make.left.equalToSuperview().offset(16)
+            make.left.equalTo(musicLab.snp.right).offset(10)
             make.right.equalToSuperview().offset(-16)
-            make.top.equalTo(musicLab).offset(24)
+            make.top.height.equalTo(musicLab)
         }
     }
 

BFRecordScreenKit/Classes/RecordScreen/View/BFChooseMusicView.swift

@@ -390,11 +390,11 @@ class BFChooseMusicView: UIView {
         
     }
     
-    // 取消选歌
-    func cancelChooseMusic() {
-//        chosedMusic = nil
-        playManager.pause()
-        choseCell()?.status = .normal
+    // 禁用音乐
+    func inhibitChooseMusic() {
+        chosedMusic = nil
+        playManager.pause(.normal)
+//        choseCell()?.status = .normal
         choseCell()?.changeSelected(false)
         chosedIndexPath = nil
     }
@@ -532,7 +532,7 @@ extension BFChooseMusicView : UICollectionViewDelegate, UICollectionViewDataSour
             getMusicsForCategory()
             
         }else {
-            cancelChooseMusic()
+            inhibitChooseMusic()
         }
     }
     

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

@@ -155,7 +155,7 @@ class BFMuicInfoCell: UITableViewCell {
     
     func addData() {
         if let data = data{
-            let plImg = imageInCommon(by: "videomk_music_default") ?? UIImage()
+            let plImg = imageInRecordScreenKit(by: "music_icon") ?? UIImage()
             iconIV.setNetImage(url: data.avatarUrl, placeholder: plImg)
             titleL.text = data.musicName