适配 UI 不同主题色

BFFramework/Classes/Stuckpoint/Controller/PQStuckPointEditerController.swift

@@ -307,7 +307,8 @@ class PQStuckPointEditerController: PQBaseViewController {
     lazy var pointEditerBtn: UIButton = {
         let pointEdterBtn = UIButton(type: .custom)
         pointEdterBtn.setImage(UIImage().BF_Image(named: "pointEditerBtn_n"), for: .normal)
-        pointEdterBtn.setImage(UIImage().BF_Image(named: "pointEditerBtn_h"), for: .selected)
+        pointEdterBtn.setImage(UIImage().BF_Image(named: "pointEditerBtn_h").withRenderingMode(.alwaysTemplate), for: .selected)
+        pointEdterBtn.tintColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
         pointEdterBtn.addTarget(self, action: #selector(pointEditerBtnClick(sender:)), for: .touchUpInside)
         pointEdterBtn.isSelected = true
         pointEdterBtn.adjustsImageWhenHighlighted = false
@@ -318,7 +319,8 @@ class PQStuckPointEditerController: PQBaseViewController {
     lazy var musicEditerBtn: UIButton = {
         let musicEditerBtn = UIButton(type: .custom)
         musicEditerBtn.setImage(UIImage().BF_Image(named: "musicEditerBtn_n"), for: .normal)
-        musicEditerBtn.setImage(UIImage().BF_Image(named: "musicEditerBtn_h"), for: .selected)
+        musicEditerBtn.setImage(UIImage().BF_Image(named: "musicEditerBtn_h").withRenderingMode(.alwaysTemplate), for: .selected)
+        musicEditerBtn.tintColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
         musicEditerBtn.addTarget(self, action: #selector(musicEditerBtnClick(sender:)), for: .touchUpInside)
         musicEditerBtn.adjustsImageWhenHighlighted = false
         return musicEditerBtn
@@ -328,11 +330,17 @@ class PQStuckPointEditerController: PQBaseViewController {
     lazy var speedStuckBtn: UIButton = {
         let speedStuckBtn = UIButton(type: .custom)
         speedStuckBtn.addTarget(self, action: #selector(editModelClick1(sender:)), for: .touchUpInside)
-        speedStuckBtn.setBackgroundImage(UIImage().BF_Image(named: "speedstuck_n"), for: .normal)
-        speedStuckBtn.setBackgroundImage(UIImage().BF_Image(named: "speedstuck_h"), for: .selected)
-
+        speedStuckBtn.setTitle("快慢速卡点", for: .normal)
+        speedStuckBtn.titleLabel?.font = UIFont.systemFont(ofSize: 13, weight: .regular)
+        jumpPointBtn.backgroundColor =  PQBFConfig.shared.pointEditNamalBackgroundColor
+        speedStuckBtn.setTitleColor(UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue), for: .selected)
+        speedStuckBtn.setTitleColor(UIColor.hexColor(hexadecimal: "#959595"), for: .normal)
+        speedStuckBtn.addCorner(corner: 5)
+        speedStuckBtn.imagePosition(at: .top, space: 8)
         speedStuckBtn.tag = 1
         speedStuckBtn.adjustsImageWhenHighlighted = false
+        speedStuckBtn.setImage(UIImage.moduleImage(named: PQBFConfig.shared.speedStuckBtnImage_N, moduleName: "BFFramework", isAssets: false), for: .normal)
+        speedStuckBtn.setImage(UIImage.moduleImage(named: PQBFConfig.shared.speedStuckBtnImage_H, moduleName: "BFFramework", isAssets: false), for: .selected)
         return speedStuckBtn
     }()
 
@@ -348,11 +356,20 @@ class PQStuckPointEditerController: PQBaseViewController {
     // 跳转卡点模式 btn
     lazy var jumpPointBtn: UIButton = {
         let jumpPointBtn = UIButton(type: .custom)
-        jumpPointBtn.setImage(UIImage().BF_Image(named: "jumpPoint_n"), for: .normal)
-        jumpPointBtn.setImage(UIImage().BF_Image(named: "jumpPoint_h"), for: .selected)
+    
+        jumpPointBtn.setTitle("跳跃卡点", for: .normal)
+        jumpPointBtn.titleLabel?.font = UIFont.systemFont(ofSize: 13, weight: .regular)
+        jumpPointBtn.backgroundColor =  PQBFConfig.shared.pointEditNamalBackgroundColor
+        jumpPointBtn.setTitleColor(UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue), for: .selected)
+        jumpPointBtn.setTitleColor(UIColor.hexColor(hexadecimal: "#959595"), for: .normal)
+        jumpPointBtn.imagePosition(at: .top, space: 8)
+        jumpPointBtn.addCorner(corner: 5)
         jumpPointBtn.tag = 2
         jumpPointBtn.addTarget(self, action: #selector(editModelClick1(sender:)), for: .touchUpInside)
         jumpPointBtn.adjustsImageWhenHighlighted = false
+        
+        jumpPointBtn.setImage(UIImage.moduleImage(named: PQBFConfig.shared.jumpPointBtnImage_N, moduleName: "BFFramework", isAssets: false), for: .normal)
+        jumpPointBtn.setImage(UIImage.moduleImage(named: PQBFConfig.shared.jumpPointBtnImage_H, moduleName: "BFFramework", isAssets: false), for: .selected)
         return jumpPointBtn
     }()
 
@@ -367,18 +384,27 @@ class PQStuckPointEditerController: PQBaseViewController {
     // 仅配乐模式 btn
     lazy var onlyMusicBtn: UIButton = {
         let onlyMusicBtn = UIButton(type: .custom)
-        onlyMusicBtn.setImage(UIImage().BF_Image(named: "onlyMusic_n"), for: .normal)
-        onlyMusicBtn.setImage(UIImage().BF_Image(named: "onlyMusic_h"), for: .selected)
+ 
+        onlyMusicBtn.setTitle("仅配乐", for: .normal)
+        onlyMusicBtn.titleLabel?.font = UIFont.systemFont(ofSize: 13, weight: .regular)
+        onlyMusicBtn.backgroundColor =  PQBFConfig.shared.pointEditNamalBackgroundColor
+        onlyMusicBtn.setTitleColor(UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue), for: .selected)
+        onlyMusicBtn.setTitleColor(UIColor.hexColor(hexadecimal: "#959595"), for: .normal)
+        onlyMusicBtn.addCorner(corner: 5)
         onlyMusicBtn.tag = 3
         onlyMusicBtn.addTarget(self, action: #selector(editModelClick1(sender:)), for: .touchUpInside)
         onlyMusicBtn.adjustsImageWhenHighlighted = false
+        
+        onlyMusicBtn.setImage(UIImage.moduleImage(named: PQBFConfig.shared.onlyMusicBtnImage_N, moduleName: "BFFramework", isAssets: false), for: .normal)
+        onlyMusicBtn.setImage(UIImage.moduleImage(named: PQBFConfig.shared.onlyMusicBtnImage_H, moduleName: "BFFramework", isAssets: false), for: .selected)
+
         return onlyMusicBtn
     }()
 
     // 操作面板上的分割线
     lazy var optionlineView: UIView = {
         let optionlineView = UIView()
-        optionlineView.backgroundColor = UIColor.hexColor(hexadecimal: "#EFEFEF")
+        optionlineView.backgroundColor = PQBFConfig.shared.pointEditNamalBackgroundColor
         return optionlineView
     }()
 
@@ -608,8 +634,14 @@ class PQStuckPointEditerController: PQBaseViewController {
             return
         }
         lastEditModelBtn?.isSelected = false
+        //设置取消选中的背景色
+        lastEditModelBtn?.backgroundColor = PQBFConfig.shared.pointEditNamalBackgroundColor
         sender.isSelected = !sender.isSelected
         lastEditModelBtn = sender
+        //设置选中的背景色
+        let styleColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+        lastEditModelBtn?.backgroundColor = UIColor(red: styleColor.rgbaf[0], green: styleColor.rgbaf[1], blue: styleColor.rgbaf[2], alpha: 0.15)
+        
 
         BFLog(message: "sender tag is \(sender.tag)")
         // 1 ui 调整
@@ -665,8 +697,8 @@ class PQStuckPointEditerController: PQBaseViewController {
         var speedStuckBtnGifName = ""
         var jumpPointBtnGifName = ""
         if sender.tag == 1 { // 快慢速
-            speedStuckBtnGifName = "speedstuck_h"
-            jumpPointBtnGifName = "jumpPoint_n"
+            speedStuckBtnGifName = "speedstuck_h_pq"
+            jumpPointBtnGifName = "jumpPoint_n_pq"
             currentCreateStickersModel = .createStickersModelSpeed
 
             if reportLog {
@@ -674,8 +706,8 @@ class PQStuckPointEditerController: PQBaseViewController {
             }
 
         } else if sender.tag == 2 { // 跳跃卡点
-            speedStuckBtnGifName = "speedstuck_n"
-            jumpPointBtnGifName = "jumpPoint_h"
+            speedStuckBtnGifName = "speedstuck_n_pq"
+            jumpPointBtnGifName = "jumpPoint_h_pq"
             currentCreateStickersModel = .createStickersModelPoint
 
             if reportLog {
@@ -683,8 +715,8 @@ class PQStuckPointEditerController: PQBaseViewController {
             }
 
         } else if sender.tag == 3 { // 仅音乐
-            speedStuckBtnGifName = "speedstuck_n"
-            jumpPointBtnGifName = "jumpPoint_n"
+            speedStuckBtnGifName = "speedstuck_n_pq"
+            jumpPointBtnGifName = "jumpPoint_n_pq"
             currentCreateStickersModel = .createStickersModelOnlyMusic
             if reportLog {
                 PQEventTrackViewModel.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_shanyinApp_musicVideoPreview_selectPatternBgm, pageSource: .sp_shanyinApp_main, extParams: nil, remindmsg: "")
@@ -693,8 +725,8 @@ class PQStuckPointEditerController: PQBaseViewController {
         speedStuckBtnGif.kf.setImage(with: URL(fileURLWithPath: currentBundlePath()!.path(forResource: speedStuckBtnGifName, ofType: "gif")!))
         jumpPointBtnGif.kf.setImage(with: URL(fileURLWithPath: currentBundlePath()!.path(forResource: jumpPointBtnGifName, ofType: "gif")!))
 
-        speedStuckBtnGif.isHidden = false
-        jumpPointBtnGif.isHidden = false
+//        speedStuckBtnGif.isHidden = false
+//        jumpPointBtnGif.isHidden = false
 
         settingPlayerView()
     }
@@ -876,6 +908,17 @@ class PQStuckPointEditerController: PQBaseViewController {
             make.width.equalTo(64)
         }
 
+        //重新设置三个模式 btn 图片和title的位置
+        speedStuckBtn.titleEdgeInsets = UIEdgeInsets(top: 0, left: -(speedStuckBtn.imageView?.frame.size.width ?? 0)  , bottom: -(speedStuckBtn.imageView?.frame.size.height ?? 0), right: 0);
+        speedStuckBtn.imageEdgeInsets = UIEdgeInsets(top: -(speedStuckBtn.titleLabel?.intrinsicContentSize.height ?? 0), left: 0, bottom: 0, right: -(speedStuckBtn.titleLabel?.intrinsicContentSize.width ?? 0));
+
+        jumpPointBtn.titleEdgeInsets = UIEdgeInsets(top: 0, left: -(jumpPointBtn.imageView?.frame.size.width ?? 0)  , bottom: -(jumpPointBtn.imageView?.frame.size.height ?? 0), right: 0);
+        jumpPointBtn.imageEdgeInsets = UIEdgeInsets(top: -(jumpPointBtn.titleLabel?.intrinsicContentSize.height ?? 0), left: 0, bottom: 0, right: -(jumpPointBtn.titleLabel?.intrinsicContentSize.width ?? 0));
+
+   
+        onlyMusicBtn.titleEdgeInsets = UIEdgeInsets(top: 0, left: -(onlyMusicBtn.imageView?.frame.size.width ?? 0)  , bottom: -(onlyMusicBtn.imageView?.frame.size.height ?? 0), right: 0);
+        onlyMusicBtn.imageEdgeInsets = UIEdgeInsets(top: -(onlyMusicBtn.titleLabel?.intrinsicContentSize.height ?? 0), left: 0, bottom: 0, right: -(onlyMusicBtn.titleLabel?.intrinsicContentSize.width ?? 0));
+
         speedSettingView.snp.makeConstraints { make in
             make.left.equalToSuperview().offset(16)
             make.right.equalToSuperview()

BFFramework/Classes/Stuckpoint/View/PQCustomSpeedSettingView.swift

@@ -44,7 +44,7 @@ class PQCustomSpeedSettingView: UIView {
         let cancleBtn = UIButton(type: .custom)
         cancleBtn.setTitle("取消", for: .normal)
         cancleBtn.setTitleColor(UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue), for: .normal)
-        cancleBtn.backgroundColor = UIColor.hexColor(hexadecimal: "#F9F9F9")
+        cancleBtn.backgroundColor = PQBFConfig.shared.pointEditNamalBackgroundColor
         cancleBtn.addTarget(self, action: #selector(backClick(sender:)), for: .touchUpInside)
         cancleBtn.titleLabel?.font = UIFont.systemFont(ofSize: 17, weight: .medium)
         cancleBtn.addCorner(corner: 11)
@@ -65,7 +65,7 @@ class PQCustomSpeedSettingView: UIView {
 
     lazy var fastSlider: BFUISlider = {
         let fastSlider = BFUISlider()
-        let thbImage = UIImage().BF_Image(named: "sliderTHBPin")
+        let thbImage = UIImage.moduleImage(named: PQBFConfig.shared.silderPinUsedImageName, moduleName: "BFFramework", isAssets: false)
         fastSlider.setMinimumTrackImage(thbImage, for: .normal)
         fastSlider.setMaximumTrackImage(thbImage, for: .normal)
         fastSlider.setThumbImage(thbImage, for: .highlighted)
@@ -84,7 +84,7 @@ class PQCustomSpeedSettingView: UIView {
 
     lazy var slowSlider: BFUISlider = {
         let slowSlider = BFUISlider()
-        let thbImage = UIImage().BF_Image(named: "sliderTHBPin")
+        let thbImage =  UIImage.moduleImage(named: PQBFConfig.shared.silderPinUsedImageName, moduleName: "BFFramework", isAssets: false)
         slowSlider.setMinimumTrackImage(thbImage, for: .normal)
         slowSlider.setMaximumTrackImage(thbImage, for: .normal)
         slowSlider.setThumbImage(thbImage, for: .highlighted)
@@ -103,7 +103,7 @@ class PQCustomSpeedSettingView: UIView {
 
     lazy var jumpSpeedSlider: BFUISlider = {
         let jumpSpeedSlider = BFUISlider()
-        let thbImage = UIImage().BF_Image(named: "sliderTHBPin")
+        let thbImage =  UIImage.moduleImage(named: PQBFConfig.shared.silderPinUsedImageName, moduleName: "BFFramework", isAssets: false)
         jumpSpeedSlider.setMinimumTrackImage(thbImage, for: .normal)
         jumpSpeedSlider.setMaximumTrackImage(thbImage, for: .normal)
         jumpSpeedSlider.setThumbImage(thbImage, for: .highlighted)
@@ -141,8 +141,8 @@ class PQCustomSpeedSettingView: UIView {
 
     override init(frame: CGRect) {
         super.init(frame: frame)
-        backgroundColor = .white
-
+        backgroundColor = PQBFConfig.shared.otherTintColor
+       
         layer.shadowColor = UIColor(red: 0, green: 0, blue: 0, alpha: 0.15).cgColor
         layer.shadowOpacity = 1
         layer.shadowOffset = CGSize(width: 0, height: -6)

BFFramework/Classes/Stuckpoint/View/PQCustomSwitchView.swift

@@ -51,11 +51,12 @@ class PQCustomSwitchView: UIView {
                 itemBtn.isSelected = true
               
                 currentItemBtn = itemBtn
-                itemBtn.backgroundColor = UIColor(red: 0.239, green: 0.757, blue: 0.757, alpha: 0.15)
+                let styleColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+                itemBtn.backgroundColor = UIColor(red: styleColor.rgbaf[0], green: styleColor.rgbaf[1], blue: styleColor.rgbaf[2], alpha: 0.15)
                 
                 itemBtn.titleLabel?.font = UIFont.boldSystemFont(ofSize: 13)
             }else{
-                itemBtn.backgroundColor = UIColor.hexColor(hexadecimal: "#F9F9F9")
+                itemBtn.backgroundColor = PQBFConfig.shared.pointEditNamalBackgroundColor
                 itemBtn.titleLabel?.font = UIFont.systemFont(ofSize: 13)
             }
            
@@ -79,12 +80,12 @@ class PQCustomSwitchView: UIView {
     func updateSelectBtn(sender: UIButton) {
         currentItemBtn?.isSelected = false
         currentItemBtn?.titleLabel?.font = UIFont.systemFont(ofSize: 13)
-        currentItemBtn?.backgroundColor = UIColor.hexColor(hexadecimal: "#F9F9F9")
+        currentItemBtn?.backgroundColor = PQBFConfig.shared.pointEditNamalBackgroundColor
         
         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
+        let styleColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+        sender.backgroundColor = UIColor(red: styleColor.rgbaf[0], green: styleColor.rgbaf[1], blue: styleColor.rgbaf[2], alpha: 0.15)
         currentItemBtn = sender
     }
  

BFFramework/Classes/Stuckpoint/View/PQSpeedSettingView.swift

@@ -319,7 +319,9 @@ class PQSpeedTitleCell: UICollectionViewCell {
             }
 
             if titleModel?.isSelected ?? false {
-                titleLab.backgroundColor = UIColor(red: 0.24, green: 0.758, blue: 0.758, alpha: 0.15)
+            
+                let styleColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+                titleLab.backgroundColor = UIColor(red: styleColor.rgbaf[0], green: styleColor.rgbaf[1], blue: styleColor.rgbaf[2], alpha: 0.15)
                 titleLab.textColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
                 
                 titleLab.font = UIFont.boldSystemFont(ofSize: 13)
@@ -329,7 +331,7 @@ class PQSpeedTitleCell: UICollectionViewCell {
                     titleLab.backgroundColor = .clear
                     titleLab.textColor = UIColor.hexColor(hexadecimal: "#DFDFDF")
                 }else{
-                    titleLab.backgroundColor = UIColor.hexColor(hexadecimal: "#F9F9F9")
+                    titleLab.backgroundColor = PQBFConfig.shared.pointEditNamalBackgroundColor
                     titleLab.textColor = UIColor.hexColor(hexadecimal: "#959595")
                 }
                 titleLab.font = UIFont.systemFont(ofSize: 13, weight: .regular)

BFFramework/Classes/Stuckpoint/View/PQStuckPointCuttingView.swift

@@ -135,7 +135,7 @@ class PQStuckPointCuttingView: UIView {
     //两边的mask 2 是裁剪区的边框
     lazy var leftMaskView: UIView = {
         let leftMaskView: UIView = UIView(frame: CGRect(x:0, y: 0, width: (cScreenWidth - cropViewWidth) / 2 - 2, height: 80))
-        leftMaskView.backgroundColor = UIColor.white
+        leftMaskView.backgroundColor = PQBFConfig.shared.styleBackGroundColor
         leftMaskView.alpha = 0.7
         return leftMaskView
     }()
@@ -143,7 +143,7 @@ class PQStuckPointCuttingView: UIView {
     //右边的mask 2 是裁剪区的边框
     lazy var rightMaskView: UIView = {
         let rightMaskView: UIView = UIView(frame: CGRect(x:videoCropView.frame.maxX + 2, y: 0, width: (cScreenWidth - cropViewWidth) / 2, height: 80))
-        rightMaskView.backgroundColor = UIColor.white
+        rightMaskView.backgroundColor = PQBFConfig.shared.styleBackGroundColor
         rightMaskView.alpha = 0.7
         return rightMaskView
     }()

BFFramework/Classes/Stuckpoint/ViewModel/PQGPUImagePlayerView.swift

@@ -164,8 +164,9 @@ public class PQGPUImagePlayerView: UIView {
     // 暂停播放view
     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.tintColor = UIColor.white
-        view.image = UIImage.moduleImage(named: "gpuplayBtn", moduleName: "BFFramework",isAssets: false)
+//        view.tintColor = UIColor.white
+        view.image = UIImage.moduleImage(named: "gpuplayBtn", moduleName: "BFFramework",isAssets: false)?.withRenderingMode(.alwaysTemplate)
+        view.tintColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
         view.isHidden = true
         return view