UI 验收问题调整

BFFramework/Classes/Stuckpoint/Controller/PQStuckPointEditerController.swift

@@ -278,6 +278,7 @@ class PQStuckPointEditerController: PQBaseViewController {
     lazy var speedStuckBtnGif: UIImageView = {
         let speedStuckBtnGif = UIImageView()
         speedStuckBtnGif.kf.setImage(with: URL(fileURLWithPath: Bundle().BF_mainbundle().path(forResource: "speedstuck_h", ofType: ".gif")!))
+        speedStuckBtnGif.isHidden  = true
         return speedStuckBtnGif
 
     }()
@@ -296,6 +297,7 @@ class PQStuckPointEditerController: PQBaseViewController {
     lazy var jumpPointBtnGif: UIImageView = {
         let jumpPointBtnGif = UIImageView()
         jumpPointBtnGif.kf.setImage(with: URL(fileURLWithPath: Bundle().BF_mainbundle().path(forResource: "jumpPoint_n", ofType: ".gif")!))
+        jumpPointBtnGif.isHidden  = true
         return jumpPointBtnGif
 
     }()
@@ -310,14 +312,7 @@ class PQStuckPointEditerController: PQBaseViewController {
         onlyMusicBtn.adjustsImageWhenHighlighted = false
         return onlyMusicBtn
     }()
-
-    // 编辑模式的指示线
-    lazy var editModelLineView: UIView = {
-        let editModelLineView = UIView()
-        editModelLineView.backgroundColor = UIColor.hexColor(hexadecimal: "#EFEFEF")
-        return editModelLineView
-    }()
-
+ 
     // 操作面板上的分割线
     lazy var optionlineView: UIView = {
         let optionlineView = UIView()
@@ -543,17 +538,17 @@ class PQStuckPointEditerController: PQBaseViewController {
             speedSettingView.snp.remakeConstraints { make in
                 make.left.equalToSuperview().offset(16)
                 make.right.equalToSuperview()
-                make.top.equalTo(editModelLineView.snp_bottom).offset(8)
+                make.top.equalTo(onlyMusicBtn.snp_bottom).offset(10)
                 make.height.equalTo(sender.tag == 1 ? 44 : 30)
             }
             speedSettingView.isHidden = false
             speedTitleLab.isHidden = false
             sustomSwitchView.isHidden = false
-            editModelLineView.isHidden = false
+
         } else {
             speedTitleLab.isHidden = true
             speedSettingView.isHidden = true
-            editModelLineView.isHidden = true
+
             sustomSwitchView.isHidden = true
         }
         // 2素材全是图片的时候三个模式都显示循环设置 UI
@@ -563,12 +558,11 @@ class PQStuckPointEditerController: PQBaseViewController {
             speedSettingView.snp.remakeConstraints { make in
                 make.left.equalToSuperview().offset(16)
                 make.right.equalToSuperview()
-                make.top.equalTo(editModelLineView.snp_bottom).offset(8)
+                make.top.equalTo(onlyMusicBtn.snp_bottom).offset(10)
                 make.height.equalTo(30)
             }
 
             speedSettingView.isHidden = false
-            editModelLineView.isHidden = false
             speedTitleLab.isHidden = false
             sustomSwitchView.isHidden = false
             if(lastCyclesSelectIndex != -1){
@@ -616,10 +610,12 @@ class PQStuckPointEditerController: PQBaseViewController {
             }
                 
         }
-
-        settingPlayerView()
         speedStuckBtnGif.kf.setImage(with: URL(fileURLWithPath: Bundle().BF_mainbundle().path(forResource: speedStuckBtnGifName, ofType: ".gif")!))
         jumpPointBtnGif.kf.setImage(with: URL(fileURLWithPath: Bundle().BF_mainbundle().path(forResource: jumpPointBtnGifName, ofType: ".gif")!))
+        
+        settingPlayerView()
+        
+
     }
 
     override func viewWillDisappear(_ animated: Bool) {
@@ -673,7 +669,6 @@ class PQStuckPointEditerController: PQBaseViewController {
         pointEditBGView.addSubview(jumpPointBtn)
         jumpPointBtn.addSubview(jumpPointBtnGif)
         pointEditBGView.addSubview(onlyMusicBtn)
-        pointEditBGView.addSubview(editModelLineView)
         pointEditBGView.addSubview(speedSettingView)
         pointEditBGView.addSubview(sustomSwitchView)
 
@@ -705,7 +700,7 @@ class PQStuckPointEditerController: PQBaseViewController {
         }
         stuckPointCuttingView.snp.makeConstraints { make in
             make.left.right.equalTo(view)
-            make.bottom.equalTo(pointEditerBtn.snp_top).offset(-7)
+            make.bottom.equalTo(pointEditerBtn.snp_top).offset(-12)
             make.height.equalTo(290)
         }
         optionlineView.snp.makeConstraints { make in
@@ -755,21 +750,16 @@ class PQStuckPointEditerController: PQBaseViewController {
             make.height.equalTo(80)
             make.width.equalTo(64)
         }
-        editModelLineView.snp.makeConstraints { make in
-            make.left.equalToSuperview().offset(16)
-            make.right.equalToSuperview()
-            make.bottom.equalTo(onlyMusicBtn.snp_bottom).offset(17)
-            make.height.equalTo(1)
-        }
+     
         speedSettingView.snp.makeConstraints { make in
             make.left.equalToSuperview().offset(16)
             make.right.equalToSuperview()
-            make.top.equalTo(editModelLineView.snp_bottom).offset(8)
+            make.top.equalTo(onlyMusicBtn.snp_bottom).offset(10)
             make.height.equalTo(44)
         }
         speedTitleLab.snp.makeConstraints { make in
             make.left.equalToSuperview().offset(16)
-            make.top.equalToSuperview().offset(213)
+            make.top.equalToSuperview().offset(190)
             make.height.equalTo(20)
             make.width.equalTo(80)
         }

BFFramework/Classes/Stuckpoint/View/PQCustomSwitchView.swift

@@ -44,10 +44,13 @@ class PQCustomSwitchView: UIView {
               
                 currentItemBtn = itemBtn
                 itemBtn.backgroundColor = UIColor(red: 0.239, green: 0.757, blue: 0.757, alpha: 0.15)
+                
+                itemBtn.titleLabel?.font = UIFont.boldSystemFont(ofSize: 13)
             }else{
                 itemBtn.backgroundColor = UIColor.hexColor(hexadecimal: "#F9F9F9")
+                itemBtn.titleLabel?.font = UIFont.systemFont(ofSize: 13)
             }
-            itemBtn.titleLabel?.font = UIFont.systemFont(ofSize: 13)
+           
             itemBtn.addCorner(corner:5)
             addSubview(itemBtn)
             
@@ -64,6 +67,8 @@ class PQCustomSwitchView: UIView {
         currentItemBtn?.isSelected = false
         currentItemBtn?.titleLabel?.font = UIFont.systemFont(ofSize: 13)
         currentItemBtn?.backgroundColor = UIColor.hexColor(hexadecimal: "#F9F9F9")
+        
+        sender.titleLabel?.font = UIFont.boldSystemFont(ofSize: 13)
         sender.isSelected = true
         sender.backgroundColor = UIColor(red: 0.239, green: 0.757, blue: 0.757, alpha: 0.15)
 //        sender.backgroundColor = .red

BFFramework/Classes/Stuckpoint/View/PQSelecteMusicView.swift

@@ -429,7 +429,7 @@ extension PQSelecteMusicView: UICollectionViewDelegate, UICollectionViewDataSour
 class PQSelectMusicTagsCell: UICollectionViewCell {
     lazy var titleLab: UILabel = {
         let titleLab = UILabel()
-        titleLab.font = UIFont.boldSystemFont(ofSize: 14)
+        titleLab.font = UIFont.systemFont(ofSize: 14)
         titleLab.textColor = UIColor.hexColor(hexadecimal: "#959595")
         titleLab.textAlignment = .center
         titleLab.backgroundColor = PQBFConfig.shared.styleBackGroundColor
@@ -492,6 +492,7 @@ class PQSelectMusicCell: UICollectionViewCell {
     lazy var playImageView: UIImageView = {
         let playImageView = UIImageView()
         playImageView.image = UIImage().BF_Image(named: "stuckPoint_music_pause")
+        playImageView.contentMode = .scaleAspectFit
         return playImageView
     }()
 
@@ -564,7 +565,12 @@ class PQSelectMusicCell: UICollectionViewCell {
     func addData() {
         audioImageView.setNetImage(url: "\(bgmData?.avatarUrl ?? "")", placeholder: UIImage().BF_Image(named: "videomk_music_default"))
         
-        musicNameLab.text = bgmData?.musicName ?? ""
+        if((bgmData?.musicName ?? "").count <= 4){
+            musicNameLab.text = (bgmData?.musicName ?? "").appending("\n ")
+        }else{
+            musicNameLab.text = (bgmData?.musicName ?? "")
+        }
+     
         
         if  bgmData?.voiceStatue == .isSelected{
             playImageView.isHidden = false
@@ -609,7 +615,14 @@ class PQSelectMusicCell: UICollectionViewCell {
         
         confirmBtn.isHidden = !(bgmData?.voiceStatue == .isPause || bgmData?.voiceStatue == .isPlaying)
 
-        musicNameLab.textColor = (bgmData?.voiceStatue == .isSelected) ? UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue):  UIColor.hexColor(hexadecimal: "#959595")
+        if(bgmData?.voiceStatue == .isSelected){
+            musicNameLab.textColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+            musicNameLab.font = UIFont.boldSystemFont(ofSize: 12)
+        }else{
+            musicNameLab.textColor =  UIColor.hexColor(hexadecimal: "#959595")
+            musicNameLab.font = UIFont.systemFont(ofSize: 12)
+        }
+        
 
     }
 
@@ -624,7 +637,7 @@ class PQSelectMusicCell: UICollectionViewCell {
         }
         playImageView.snp.remakeConstraints { make in
             make.center.equalToSuperview()
-            make.width.height.equalTo(36)
+            make.width.height.equalTo(24)
         }
 
         musicNameLab.snp.remakeConstraints { make in

BFFramework/Classes/Stuckpoint/View/PQSpeedSettingView.swift

@@ -303,6 +303,8 @@ class PQSpeedTitleCell: UICollectionViewCell {
             if titleModel?.isSelected ?? false {
                 titleLab.backgroundColor = UIColor(red: 0.24, green: 0.758, blue: 0.758, alpha: 0.15)
                 titleLab.textColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+                
+                titleLab.font = UIFont.boldSystemFont(ofSize: 13)
 
             } else {
                 if(titleModel?.isDisable ?? false){
@@ -312,6 +314,7 @@ class PQSpeedTitleCell: UICollectionViewCell {
                     titleLab.backgroundColor = UIColor.hexColor(hexadecimal: "#F9F9F9")
                     titleLab.textColor = UIColor.hexColor(hexadecimal: "#959595")
                 }
+                titleLab.font = UIFont.systemFont(ofSize: 13, weight: .regular)
               
             }
         }

BFFramework/Classes/Stuckpoint/View/PQStuckPointLoadingView.swift

@@ -37,7 +37,7 @@ class PQStuckPointLoadingView: UIView {
 
     override init(frame: CGRect) {
         super.init(frame: frame)
-        backgroundColor = UIColor.init(red: 0, green: 0, blue: 0, alpha: 0.5)
+        backgroundColor = UIColor.init(red: 1, green: 1, blue: 1, alpha: 0.5)
         addSubViews()
         addLayout()
         
@@ -59,15 +59,20 @@ class PQStuckPointLoadingView: UIView {
     }
 
     func addSubViews() {
+        
+//        addSubview(blackMaskView)
         addSubview(loadingView)
         addSubview(navBarLeftBtn)
+        
     }
 
     func addLayout() {
         loadingView.snp.makeConstraints { make in
-            make.center.equalToSuperview()
+            make.top.equalToSuperview().offset(cScreenWidth / 2.0 + cDevice_iPhoneStatusBarHei)
+            make.centerX.equalTo(cScreenWidth / 2.0)
             make.width.height.equalTo(cDefaultMargin * 10)
         }
+        
     }
 
     /// 移除视图

BFFramework/Classes/Stuckpoint/ViewModel/PQGPUImagePlayerView.swift

@@ -164,7 +164,7 @@ public class PQGPUImagePlayerView: UIView {
     lazy var playView: UIImageView = {
         let view = UIImageView(frame: CGRect(x: (self.frame.size.width - self.frame.size.height / 3.6) / 2, y: (self.frame.size.height - self.frame.size.height / 3.6) / 2, width: self.frame.size.height / 3.6, height: self.frame.size.height / 3.6))
         view.image =  UIImage().BF_Image(named: "gpuplayBtn").withRenderingMode(.alwaysTemplate)
-        view.tintColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+        view.tintColor = UIColor.white
         view.isHidden = true
         return view
 
@@ -173,7 +173,7 @@ public class PQGPUImagePlayerView: UIView {
     // 暂停播放view
     lazy var playMaskView: UIView = {
         let playMaskView = UIView.init()
-        playMaskView.backgroundColor = UIColor.init(red: 1, green: 1, blue: 1, alpha: 0.5)
+        playMaskView.backgroundColor = UIColor.init(red: 0, green: 0, blue: 0, alpha: 0.5)
         playMaskView.isUserInteractionEnabled = false
         playMaskView.isHidden = true
         return playMaskView
@@ -182,8 +182,8 @@ public class PQGPUImagePlayerView: UIView {
 
     // 播放进度/总时长
     lazy var progressLab: UILabel = {
-        let titleLab = UILabel(frame: CGRect(x: (self.frame.size.width - 140) / 2, y: self.frame.size.height - 10 - 14, width: 140, height: 14))
-        titleLab.font = UIFont.systemFont(ofSize: 14, weight: .medium)
+        let titleLab = UILabel(frame: CGRect(x: (self.frame.size.width - 140) / 2, y: self.frame.size.height - 10 - 14, width: 140, height: 12))
+        titleLab.font = UIFont.systemFont(ofSize: 12, weight: .medium)
         titleLab.textColor = UIColor.white
         titleLab.textAlignment = .center
         titleLab.text = ""