Browse Source

Merge branch 'master' of https://git.yishihui.com/iOS/BFFramework
合并代码

jsonwang 3 years ago
parent
commit
9a8f0d26bd

+ 1 - 1
BFFramework/Classes/Stuckpoint/Controller/PQStuckPointMusicController.swift

@@ -81,7 +81,7 @@ class PQStuckPointMusicController: PQBaseViewController {
     lazy var searchTF: UITextField = {
     lazy var searchTF: UITextField = {
         let searchTF = UITextField(frame: CGRect(x: leftMargin, y: cDevice_iPhoneNavBarAndStatusBarHei, width: cScreenWidth - leftMargin * 2, height: searchTFH))
         let searchTF = UITextField(frame: CGRect(x: leftMargin, y: cDevice_iPhoneNavBarAndStatusBarHei, width: cScreenWidth - leftMargin * 2, height: searchTFH))
         searchTF.font = UIFont.systemFont(ofSize: 17)
         searchTF.font = UIFont.systemFont(ofSize: 17)
-        searchTF.backgroundColor = UIColor.hexColor(hexadecimal: "#F2F2F2")
+        searchTF.backgroundColor = PQBFConfig.shared.otherTintColor
         searchTF.attributedPlaceholder = NSAttributedString(string: "搜索歌曲名称/歌手", attributes: [.foregroundColor: UIColor.hexColor(hexadecimal: "#BDBDBD"), .font: UIFont.systemFont(ofSize: 14)])
         searchTF.attributedPlaceholder = NSAttributedString(string: "搜索歌曲名称/歌手", attributes: [.foregroundColor: UIColor.hexColor(hexadecimal: "#BDBDBD"), .font: UIFont.systemFont(ofSize: 14)])
         searchTF.textColor = PQBFConfig.shared.styleTitleColor
         searchTF.textColor = PQBFConfig.shared.styleTitleColor
         searchTF.addCorner(corner: searchTFH / 2)
         searchTF.addCorner(corner: searchTFH / 2)

+ 4 - 0
BFFramework/Classes/Utils/PQBFConfig.swift

@@ -19,6 +19,8 @@ public class PQBFConfig: NSObject {
      cutViewTintColor: UIColor = UIColor.black
      cutViewTintColor: UIColor = UIColor.black
      materialDeleteImage = UIImage.init().BF_Image(named:"icon_search_delete")
      materialDeleteImage = UIImage.init().BF_Image(named:"icon_search_delete")
      cutDurationColor = UIColor.init(red: 238.0 / 255.0, green: 0 / 255.0, blue: 81.0 / 255.0, alpha: 0.1)
      cutDurationColor = UIColor.init(red: 238.0 / 255.0, green: 0 / 255.0, blue: 81.0 / 255.0, alpha: 0.1)
+     hiddenMusicMask = false
+     otherTintColor = UIColor.hexColor(hexadecimal: "#333333")
      //主题适配方案二
      //主题适配方案二
      styleColor = green
      styleColor = green
      statusBarStyle = .dark
      statusBarStyle = .dark
@@ -28,6 +30,8 @@ public class PQBFConfig: NSObject {
      cutViewTintColor: UIColor = UIColor.white
      cutViewTintColor: UIColor = UIColor.white
      materialDeleteImage = UIImage.init().BF_Image(named:"deleteAudio")
      materialDeleteImage = UIImage.init().BF_Image(named:"deleteAudio")
      cutDurationColor = UIColor.init(red: 61.0 / 255.0, green: 193.0 / 255.0, blue: 193.0 / 255.0, alpha: 0.1)
      cutDurationColor = UIColor.init(red: 61.0 / 255.0, green: 193.0 / 255.0, blue: 193.0 / 255.0, alpha: 0.1)
+     hiddenMusicMask = true
+     otherTintColor = UIColor.hexColor(hexadecimal: "#F2F2F2")
      */
      */
     // 主题色
     // 主题色
     public var styleColor: styleColor = .green
     public var styleColor: styleColor = .green