Browse Source

Merge branch 'master' of https://git.yishihui.com/iOS/BFFramework

harry 3 years ago
parent
commit
684a509194

+ 7 - 2
BFFramework/Classes/Stuckpoint/Controller/PQStuckPointEditerController.swift

@@ -2042,8 +2042,13 @@ extension PQStuckPointEditerController {
             } 
              // 跳跃卡点不可用
              if selectedTotalDuration < 6 && selectedDataCount != selectedImageDataCount {
-                 jumpPointBtn.setImage(UIImage().BF_Image(named: "jumpPoint_disable"), for: .normal)
-                 jumpPointBtn.setImage(UIImage().BF_Image(named: "jumpPoint_disable"), for: .selected)
+                
+                let styleColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+                jumpPointBtn.setTitleColor(UIColor.init(red: styleColor.rgbaf[0], green: styleColor.rgbaf[1], blue: styleColor.rgbaf[2], alpha: 0.3), for: .selected)
+                
+                let pointEditNamalBackgroundColor = PQBFConfig.shared.pointEditNamalBackgroundColor
+                jumpPointBtn.backgroundColor = UIColor.init(red: pointEditNamalBackgroundColor.rgbaf[0], green: pointEditNamalBackgroundColor.rgbaf[1], blue: pointEditNamalBackgroundColor.rgbaf[2], alpha: 0.3)
+ 
                  jumpPointBtnGif.isHidden = true
              }
 

+ 6 - 2
BFFramework/Classes/Stuckpoint/View/PQSpeedSettingView.swift

@@ -328,8 +328,12 @@ class PQSpeedTitleCell: UICollectionViewCell {
 
             } else {
                 if(titleModel?.isDisable ?? false){
-                    titleLab.backgroundColor = .clear
-                    titleLab.textColor = UIColor.hexColor(hexadecimal: "#DFDFDF")
+                    
+                    let backColor = PQBFConfig.shared.pointEditNamalBackgroundColor
+                    let textColor = UIColor.hexColor(hexadecimal: "#959595")
+                    titleLab.backgroundColor = UIColor.init(red: backColor.rgbaf[0], green: backColor.rgbaf[1], blue: backColor.rgbaf[2], alpha: 0.3)
+                    titleLab.textColor =  UIColor.init(red: textColor.rgbaf[0], green: textColor.rgbaf[1], blue: textColor.rgbaf[2], alpha: 0.3)
+                    
                 }else{
                     titleLab.backgroundColor = PQBFConfig.shared.pointEditNamalBackgroundColor
                     titleLab.textColor = UIColor.hexColor(hexadecimal: "#959595")