更新拆分库

BFFramework/Classes/BFModules/BFCategorys/UICollectionView+Ext.swift

@@ -1,69 +0,0 @@
-//
-//  UICollectionView+Ext.swift
-//  PQCreativeCommunity
-//
-//  Created by SanW on 2021/8/4.
-//  Copyright © 2021 BytesFlow. All rights reserved.
-//
-
-import Foundation
-
-extension UICollectionView{
-    /// 获取当前cell
-    /// - Returns: <#description#>
-    func visibleCell() -> UICollectionViewCell? {
-        let visibleRect = CGRect(origin: contentOffset, size: bounds.size)
-        let visiblePoint = CGPoint(x: visibleRect.midX, y: visibleRect.midY)
-        guard let visibleIndexPath = indexPathForItem(at: visiblePoint) else { return nil }
-        return cellForItem(at: visibleIndexPath)
-    }
-
-    /// 添加刷新组件
-    /// - Parameters:
-    ///   - scroller: <#scroller description#>
-    ///   - type: 1-头部跟尾部 2-头部 3-尾部
-    public func addRefreshView(type: REFRESH_TYPE = .REFRESH_TYPE_ALL, refreshHandle: ((_ isHeader: Bool) -> Void)?) {
-        if type == .REFRESH_TYPE_ALL || type == .REFRESH_TYPE_HEADER {
-            let header = MJRefreshNormalHeader.init {
-                if refreshHandle != nil {
-                    refreshHandle!(true)
-                }
-            }
-            header.setTitle("下拉刷新", for: .willRefresh)
-            header.setTitle("正在刷新...", for: .refreshing)
-            header.setTitle("松开刷新", for: .pulling)
-            header.setTitle("下拉刷新", for: .idle)
-            header.lastUpdatedTimeLabel?.isHidden = true
-            mj_header = header
-        }
-        if type == .REFRESH_TYPE_ALL || type == .REFRESH_TYPE_FOOTER {
-            // MJRefreshBackNormalFooter 不会附在上面
-            // MJRefreshAutoFooter 不会便宜
-            let footer = MJRefreshBackNormalFooter.init {
-                if refreshHandle != nil {
-                    refreshHandle!(false)
-                }
-            }
-            footer.setTitle("暂时没有更多了", for: .noMoreData)
-            footer.setTitle("精彩内容正在加载中...", for: .refreshing)
-            mj_footer = footer
-        }
-        
-        if type == .REFRESH_TYPE_AUTOFOOTER {
-            let footer = MJRefreshAutoNormalFooter.init {
-                if refreshHandle != nil {
-                    refreshHandle!(false)
-                }
-            }
-            footer.triggerAutomaticallyRefreshPercent = -70
-            footer.setTitle("暂时没有更多了", for: .noMoreData)
-            footer.setTitle("精彩内容正在加载中...", for: .refreshing)
-            mj_footer = footer
-        }
-    }
-
-    func indexPathsForElements(in rect: CGRect) -> [IndexPath] {
-        let allLayoutAttributes = collectionViewLayout.layoutAttributesForElements(in: rect)!
-        return allLayoutAttributes.map { $0.indexPath }
-    }
-}

BFFramework/Classes/BFModules/BFUtility/PQAliOssUtil.swift

@@ -162,7 +162,7 @@ public class PQAliOssUtil: NSObject {
         let url = PQENVUtil.shared.longvideoapi + (isMatarialUpload ? materialUploadStsTokenUrl : getStsTokenUrl)
         
         let authServerUrl = url + "?appType=\(commonParams()["appType"] as? String ?? "")" + "&machineCode=" + getMachineCode()
-            + "&token=" + (PQBFConfig.shared.token ?? "") + "&loginUid" + (PQBFConfig.shared.uid ?? "") + "&fileType=2" + "&uploadId=\(ossUploadID)"
+            + "&token=" + (BFConfig.shared.token ?? "") + "&loginUid" + (BFConfig.shared.uid ?? "") + "&fileType=2" + "&uploadId=\(ossUploadID)"
         debugPrint("authServerUrl is: \(authServerUrl)")
         debugPrint("当前上传authServerUrl线程:\(Thread.isMainThread) ")
 

BFFramework/Classes/Base/View/PQActivityIndicatorView.swift

@@ -8,6 +8,7 @@
 
 import UIKit
 import BFCommonKit
+import BFUIKit
  
 class PQActivityIndicatorView: UIView {
     func showHud(isCovered: Bool = false) {

BFFramework/Classes/Base/View/PQAssetCategoryCell.swift

@@ -21,20 +21,20 @@ public class PQAssetCategoryCell: UICollectionViewCell {
     lazy public var categoryNameLab: UILabel = {
         let categoryNameLab = UILabel()
         categoryNameLab.font = UIFont.systemFont(ofSize: 14)
-        categoryNameLab.textColor = PQBFConfig.shared.styleTitleColor
+        categoryNameLab.textColor = BFConfig.shared.styleTitleColor
         return categoryNameLab
     }()
 
     lazy public var countLab: UILabel = {
         let countLab = UILabel()
         countLab.font = UIFont.systemFont(ofSize: 14)
-        countLab.textColor = PQBFConfig.shared.styleTitleColor
+        countLab.textColor = BFConfig.shared.styleTitleColor
         return countLab
     }()
 
     lazy public var seleImage: UIImageView = {
         let seleImage = UIImageView()
-        seleImage.tintColor = PQBFConfig.shared.styleTitleColor
+        seleImage.tintColor = BFConfig.shared.styleTitleColor
         seleImage.image = bfFramworkImage(by: "icon_uploadVideo_do")?.withRenderingMode(.alwaysTemplate)//UIImage.moduleImage(named: , moduleName: "BFFramework",isAssets: false)?.withRenderingMode(.alwaysTemplate)
         seleImage.isHidden = true
         return seleImage

BFFramework/Classes/PModels/PQLoginUserInfo.swift

@@ -162,9 +162,9 @@ public class BFLoginUserInfo: NSObject {
             if getUserDefaults(key: cOtherSubscribes) != nil {
                 otherSubscribes = getUserDefaults(key: cOtherSubscribes) as! String
             }
-            PQBFConfig.shared.token = accessToken
-            PQBFConfig.shared.loginUid = uid
-            PQBFConfig.shared.uid = uid
+            BFConfig.shared.token = accessToken
+            BFConfig.shared.loginUid = uid
+            BFConfig.shared.uid = uid
         }
     }
 

BFFramework/Classes/Stuckpoint/Controller/PQEditMusicSearchController.swift

@@ -57,9 +57,9 @@ class PQEditMusicSearchController: BFBaseViewController {
     lazy var searchTF: UITextField = {
         let searchTF = UITextField(frame: CGRect(x: leftMargin, y: cDevice_iPhoneStatusBarHei, width: cScreenWidth - leftMargin * 2, height: searchTFH))
         searchTF.font = UIFont.systemFont(ofSize: 17)
-        searchTF.backgroundColor = PQBFConfig.shared.otherTintColor
+        searchTF.backgroundColor = BFConfig.shared.otherTintColor
         searchTF.attributedPlaceholder = NSAttributedString(string: "搜索歌曲名称/歌手", attributes: [.foregroundColor: UIColor.hexColor(hexadecimal: "#BDBDBD"), .font: UIFont.systemFont(ofSize: 14)])
-        searchTF.textColor = PQBFConfig.shared.styleTitleColor
+        searchTF.textColor = BFConfig.shared.styleTitleColor
         searchTF.addCorner(corner: searchTFH / 2)
 
         searchTF.leftViewMode = .always
@@ -139,7 +139,7 @@ class PQEditMusicSearchController: BFBaseViewController {
         addChild(searchController)
         view.addSubview(searchController.view)
         
-        leftButton(image: UIImage(named: "upload_delete"), tintColor: PQBFConfig.shared.styleTitleColor)
+        leftButton(image: UIImage(named: "upload_delete"), tintColor: BFConfig.shared.styleTitleColor)
         
         //请求一下热门数据在没有搜索数据时显示
         PQStuckPointViewModel.stuckPointMusicPageList(tagId: 425, parentTagId: 0, pageNum: 1, videoCount: 0, imageCount: 0, totalDuration: 0) { [weak self] musicInfo, _ in

BFFramework/Classes/Stuckpoint/Controller/PQStuckPointEditerController.swift

@@ -20,7 +20,7 @@ import Photos
 import RealmSwift
 import UIKit
 
-class PQStuckPointEditerController: PQBaseViewController {
+class PQStuckPointEditerController: BFBaseViewController {
     // 是否导出视频成功
     var isExportVideosSuccess: Bool = false
     // 是否请求卡点数据成功
@@ -129,7 +129,7 @@ class PQStuckPointEditerController: PQBaseViewController {
         nextBtn.setTitle("合成", for: .normal)
         nextBtn.titleLabel?.font = UIFont.systemFont(ofSize: 15, weight: .medium)
         nextBtn.addTarget(self, action: #selector(nextBtnClick(sender:)), for: .touchUpInside)
-        nextBtn.backgroundColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+        nextBtn.backgroundColor = UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue)
         nextBtn.setTitleColor(UIColor.hexColor(hexadecimal: "#FFFFFF"), for: .normal)
         nextBtn.uxy_acceptEventInterval = 0.5
         nextBtn.addCorner(corner: 3)
@@ -139,7 +139,7 @@ class PQStuckPointEditerController: PQBaseViewController {
     // 播放器显示 view
     lazy var playerView: PQGPUImagePlayerView = {
         let playerView = PQGPUImagePlayerView(frame: .zero)
-        playerView.backgroundColor = PQBFConfig.shared.styleBackGroundColor
+        playerView.backgroundColor = BFConfig.shared.styleBackGroundColor
         playerView.isShowLine = false
         playerView.showGaussianBlur = true
         playerView.pause()
@@ -257,7 +257,7 @@ class PQStuckPointEditerController: PQBaseViewController {
         pointEditRemindLab.backgroundColor = .clear
         pointEditRemindLab.textAlignment = .left
         pointEditRemindLab.font = UIFont.boldSystemFont(ofSize: 14)
-        pointEditRemindLab.textColor = PQBFConfig.shared.styleTitleColor
+        pointEditRemindLab.textColor = BFConfig.shared.styleTitleColor
         pointEditRemindLab.text = "卡点模式"
         return pointEditRemindLab
     }()
@@ -268,7 +268,7 @@ class PQStuckPointEditerController: PQBaseViewController {
         speedTitleLab.backgroundColor = .clear
         speedTitleLab.textAlignment = .left
         speedTitleLab.font = UIFont.boldSystemFont(ofSize: 14)
-        speedTitleLab.textColor = PQBFConfig.shared.styleTitleColor
+        speedTitleLab.textColor = BFConfig.shared.styleTitleColor
         speedTitleLab.text = "节奏变化"
         return speedTitleLab
     }()
@@ -312,7 +312,7 @@ class PQStuckPointEditerController: PQBaseViewController {
         pointEdterBtn.setImage(UIImage.moduleImage(named: "pointEditerBtn_n", moduleName: "BFFramework", isAssets: false), for: .normal)
          
         pointEdterBtn.setImage(UIImage.moduleImage(named: "pointEditerBtn_h", moduleName: "BFFramework", isAssets: false)?.withRenderingMode(.alwaysTemplate), for: .selected)
-        pointEdterBtn.tintColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+        pointEdterBtn.tintColor = UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue)
         pointEdterBtn.addTarget(self, action: #selector(pointEditerBtnClick(sender:)), for: .touchUpInside)
         pointEdterBtn.isSelected = true
         pointEdterBtn.adjustsImageWhenHighlighted = false
@@ -324,7 +324,7 @@ class PQStuckPointEditerController: PQBaseViewController {
         let musicEditerBtn = UIButton(type: .custom)
         musicEditerBtn.setImage(UIImage.moduleImage(named: "musicEditerBtn_n", moduleName: "BFFramework", isAssets: false), for: .normal)
         musicEditerBtn.setImage(UIImage.moduleImage(named: "musicEditerBtn_h", moduleName: "BFFramework", isAssets: false)?.withRenderingMode(.alwaysTemplate), for: .selected)
-        musicEditerBtn.tintColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+        musicEditerBtn.tintColor = UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue)
         musicEditerBtn.addTarget(self, action: #selector(musicEditerBtnClick(sender:)), for: .touchUpInside)
         musicEditerBtn.adjustsImageWhenHighlighted = false
         return musicEditerBtn
@@ -336,15 +336,15 @@ class PQStuckPointEditerController: PQBaseViewController {
         speedStuckBtn.addTarget(self, action: #selector(editModelClick1(sender:)), for: .touchUpInside)
         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)
+        jumpPointBtn.backgroundColor =  BFConfig.shared.pointEditNamalBackgroundColor
+        speedStuckBtn.setTitleColor(UIColor.hexColor(hexadecimal: BFConfig.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)
+        speedStuckBtn.setImage(UIImage.moduleImage(named: BFConfig.shared.speedStuckBtnImage_N, moduleName: "BFFramework", isAssets: false), for: .normal)
+        speedStuckBtn.setImage(UIImage.moduleImage(named: BFConfig.shared.speedStuckBtnImage_H, moduleName: "BFFramework", isAssets: false), for: .selected)
         return speedStuckBtn
     }()
 
@@ -363,8 +363,8 @@ class PQStuckPointEditerController: PQBaseViewController {
     
         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.backgroundColor =  BFConfig.shared.pointEditNamalBackgroundColor
+        jumpPointBtn.setTitleColor(UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue), for: .selected)
         jumpPointBtn.setTitleColor(UIColor.hexColor(hexadecimal: "#959595"), for: .normal)
         jumpPointBtn.imagePosition(at: .top, space: 8)
         jumpPointBtn.addCorner(corner: 5)
@@ -372,8 +372,8 @@ class PQStuckPointEditerController: PQBaseViewController {
         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)
+        jumpPointBtn.setImage(UIImage.moduleImage(named: BFConfig.shared.jumpPointBtnImage_N, moduleName: "BFFramework", isAssets: false), for: .normal)
+        jumpPointBtn.setImage(UIImage.moduleImage(named: BFConfig.shared.jumpPointBtnImage_H, moduleName: "BFFramework", isAssets: false), for: .selected)
         return jumpPointBtn
     }()
 
@@ -391,16 +391,16 @@ class PQStuckPointEditerController: PQBaseViewController {
  
         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.backgroundColor =  BFConfig.shared.pointEditNamalBackgroundColor
+        onlyMusicBtn.setTitleColor(UIColor.hexColor(hexadecimal: BFConfig.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)
+        onlyMusicBtn.setImage(UIImage.moduleImage(named: BFConfig.shared.onlyMusicBtnImage_N, moduleName: "BFFramework", isAssets: false), for: .normal)
+        onlyMusicBtn.setImage(UIImage.moduleImage(named: BFConfig.shared.onlyMusicBtnImage_H, moduleName: "BFFramework", isAssets: false), for: .selected)
 
         return onlyMusicBtn
     }()
@@ -408,7 +408,7 @@ class PQStuckPointEditerController: PQBaseViewController {
     // 操作面板上的分割线
     lazy var optionlineView: UIView = {
         let optionlineView = UIView()
-        optionlineView.backgroundColor = PQBFConfig.shared.pointEditNamalBackgroundColor
+        optionlineView.backgroundColor = BFConfig.shared.pointEditNamalBackgroundColor
         return optionlineView
     }()
 
@@ -500,7 +500,7 @@ class PQStuckPointEditerController: PQBaseViewController {
 //        musicNameView.backgroundColor = UIColor.hexColor(hexadecimal: "#333333")
         musicNameView.addCorner(corner: musicNameView.frame.height / 2)
         let musicImageView = UIImageView()
-        musicImageView.tintColor = PQBFConfig.shared.styleTitleColor
+        musicImageView.tintColor = BFConfig.shared.styleTitleColor
         musicImageView.image = UIImage.moduleImage(named: "stuckPoint_reCreate_music", moduleName: "BFFramework", isAssets: false)?.withRenderingMode(.alwaysTemplate)
         musicImageView.frame = CGRect(x: musicNameView.frame.height / 2 - 5, y: (musicNameView.frame.height - 22) / 2, width: 22, height: 22)
         musicNameView.addSubview(musicImageView)
@@ -512,7 +512,7 @@ class PQStuckPointEditerController: PQBaseViewController {
     lazy var musicNameLab: LMJHorizontalScrollText = {
         let nameWidth: CGFloat = sizeWithText(text: "\(stuckPointMusicData?.musicName ?? "")", font: UIFont.systemFont(ofSize: 13), size: CGSize(width: view.frame.width - ((cDefaultMargin * 6 + 16 * 2) * 2) - (25 + cDefaultMargin * 3), height: cDefaultMargin * 3)).width
         let musicNameLab = LMJHorizontalScrollText(frame: CGRect(x: 0, y: 0, width: nameWidth < cDefaultMargin * 4 ? cDefaultMargin * 4 : nameWidth, height: cDefaultMargin * 3))
-        musicNameLab.textColor = PQBFConfig.shared.styleTitleColor
+        musicNameLab.textColor = BFConfig.shared.styleTitleColor
         musicNameLab.textFont = UIFont.systemFont(ofSize: 13)
         musicNameLab.speed = 0.03
         musicNameLab.moveDirection = LMJTextScrollMoveLeft
@@ -639,11 +639,11 @@ class PQStuckPointEditerController: PQBaseViewController {
         }
         lastEditModelBtn?.isSelected = false
         //设置取消选中的背景色
-        lastEditModelBtn?.backgroundColor = PQBFConfig.shared.pointEditNamalBackgroundColor
+        lastEditModelBtn?.backgroundColor = BFConfig.shared.pointEditNamalBackgroundColor
         sender.isSelected = !sender.isSelected
         lastEditModelBtn = sender
         //设置选中的背景色
-        let styleColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+        let styleColor = UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue)
         lastEditModelBtn?.backgroundColor = UIColor(red: styleColor.rgbaf[0], green: styleColor.rgbaf[1], blue: styleColor.rgbaf[2], alpha: 0.15)
         
 
@@ -759,7 +759,7 @@ class PQStuckPointEditerController: PQBaseViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        leftButton(image: nil, tintColor: PQBFConfig.shared.styleTitleColor)
+        leftButton(image: nil, tintColor: BFConfig.shared.styleTitleColor)
         navHeadImageView?.addSubview(nextBtn)
         navHeadImageView?.addSubview(musicNameView)
 
@@ -1861,7 +1861,7 @@ extension PQStuckPointEditerController {
                 } else {
                     self?.synchroMarskView.removeMarskView()
                     cShowHUB(superView: nil, msg: "音乐信息加载失败，请重新选择音乐")
-//                    PQUploadRemindView.showUploadRemindView(title: nil, attributedTitle: NSAttributedString(string: "加载音乐失败，请重新选择音乐"), summary: "", confirmTitle: nil) { [weak self] _, _ in
+//                    BFUploadRemindView.showUploadRemindView(title: nil, attributedTitle: NSAttributedString(string: "加载音乐失败，请重新选择音乐"), summary: "", confirmTitle: nil) { [weak self] _, _ in
                         self?.navigationController?.popViewController(animated: true)
 //                    }
                 }
@@ -2055,10 +2055,10 @@ extension PQStuckPointEditerController {
              // 跳跃卡点不可用
              if selectedTotalDuration < 6 && selectedDataCount != selectedImageDataCount {
                 
-                let styleColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+                let styleColor = UIColor.hexColor(hexadecimal: BFConfig.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
+                let pointEditNamalBackgroundColor = BFConfig.shared.pointEditNamalBackgroundColor
                 jumpPointBtn.backgroundColor = UIColor.init(red: pointEditNamalBackgroundColor.rgbaf[0], green: pointEditNamalBackgroundColor.rgbaf[1], blue: pointEditNamalBackgroundColor.rgbaf[2], alpha: 0.3)
  
              }

BFFramework/Classes/Stuckpoint/Controller/PQStuckPointMaterialController.swift

@@ -34,11 +34,11 @@ public class PQStuckPointMaterialController: BFBaseViewController {
     lazy var changeCollecBtn: UIButton = {
         let changeCollecBtn = UIButton(frame: CGRect(x: cDefaultMargin * 5, y: cDevice_iPhoneStatusBarHei, width: cScreenWidth - cDefaultMargin * 10, height: cDefaultMargin * 4))
         changeCollecBtn.titleLabel?.lineBreakMode = .byTruncatingTail
-        changeCollecBtn.tintColor = PQBFConfig.shared.styleTitleColor
+        changeCollecBtn.tintColor = BFConfig.shared.styleTitleColor
         changeCollecBtn.setTitle("我的相册", for: .normal)
         changeCollecBtn.setImage(UIImage.moduleImage(named: "icon_selected_down", moduleName: "BFFramework",isAssets: false)?.withRenderingMode(.alwaysTemplate), for: .normal)
         changeCollecBtn.setImage(UIImage.moduleImage(named: "icon_selected_up", moduleName: "BFFramework",isAssets: false)?.withRenderingMode(.alwaysTemplate), for: .selected)
-        changeCollecBtn.setTitleColor(PQBFConfig.shared.styleTitleColor, for: .normal)
+        changeCollecBtn.setTitleColor(BFConfig.shared.styleTitleColor, for: .normal)
         changeCollecBtn.titleLabel?.font = UIFont.systemFont(ofSize: 18, weight: .medium)
         changeCollecBtn.tag = 1
         changeCollecBtn.imagePosition(at: PQButtonImageEdgeInsetsStyle.right, space: cDefaultMargin / 2)
@@ -64,7 +64,7 @@ public class PQStuckPointMaterialController: BFBaseViewController {
     lazy var choseLocalAllBtn: UIButton = {
         let choseLocalAllBtn = UIButton(frame: CGRect(x: (view.frame.width - choseBtnW * 3) / 4, y: cDevice_iPhoneNavBarAndStatusBarHei + margin, width: choseBtnW, height: choseBtnH))
         choseLocalAllBtn.setTitleColor(UIColor.hexColor(hexadecimal: "#999999"), for: .normal)
-        choseLocalAllBtn.setTitleColor(PQBFConfig.shared.styleTitleColor, for: .selected)
+        choseLocalAllBtn.setTitleColor(BFConfig.shared.styleTitleColor, for: .selected)
         choseLocalAllBtn.setTitle("全部", for: .normal)
         choseLocalAllBtn.titleLabel?.font = UIFont.systemFont(ofSize: 17, weight: .medium)
         choseLocalAllBtn.addCorner(corner: 6)
@@ -76,7 +76,7 @@ public class PQStuckPointMaterialController: BFBaseViewController {
     lazy var choseLocalVideoBtn: UIButton = {
         let choseLocalVideoBtn = UIButton(frame: CGRect(x: choseLocalAllBtn.frame.maxX + (view.frame.width - choseBtnW * 3) / 4, y: choseLocalAllBtn.frame.minY, width: choseBtnW, height: choseBtnH))
         choseLocalVideoBtn.setTitleColor(UIColor.hexColor(hexadecimal: "#999999"), for: .normal)
-        choseLocalVideoBtn.setTitleColor(PQBFConfig.shared.styleTitleColor, for: .selected)
+        choseLocalVideoBtn.setTitleColor(BFConfig.shared.styleTitleColor, for: .selected)
         choseLocalVideoBtn.setTitle("视频", for: .normal)
         choseLocalVideoBtn.titleLabel?.font = UIFont.systemFont(ofSize: 17, weight: .medium)
         choseLocalVideoBtn.addCorner(corner: 6)
@@ -89,7 +89,7 @@ public class PQStuckPointMaterialController: BFBaseViewController {
     lazy var choseLocalImageBtn: UIButton = {
         let choseLocalImageBtn = UIButton(frame: CGRect(x: choseLocalVideoBtn.frame.maxX + (view.frame.width - choseBtnW * 3) / 4, y: choseLocalAllBtn.frame.minY, width: choseBtnW, height: choseBtnH))
         choseLocalImageBtn.setTitleColor(UIColor.hexColor(hexadecimal: "#999999"), for: .normal)
-        choseLocalImageBtn.setTitleColor(PQBFConfig.shared.styleTitleColor, for: .selected)
+        choseLocalImageBtn.setTitleColor(BFConfig.shared.styleTitleColor, for: .selected)
         choseLocalImageBtn.setTitle("照片", for: .normal)
         choseLocalImageBtn.titleLabel?.font = UIFont.systemFont(ofSize: 17, weight: .medium)
         choseLocalImageBtn.addCorner(corner: 6)
@@ -102,7 +102,7 @@ public class PQStuckPointMaterialController: BFBaseViewController {
         let choseLineView = UIView(frame: CGRect(x: 0, y: 0, width: 25, height: 3))
         choseLineView.frame.origin.y = (navHeadImageView?.frame.maxY ?? 0) - 6
         choseLineView.center.x = choseLocalVideoBtn.center.x
-        choseLineView.backgroundColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+        choseLineView.backgroundColor = UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue)
         return choseLineView
     }()
 
@@ -115,14 +115,14 @@ public class PQStuckPointMaterialController: BFBaseViewController {
     // 底部操作视图
     lazy var bottomRemindView: UIView = {
         let bottomRemindView = UIView(frame: CGRect(x: 0, y: view.frame.height - (bottomH + cSafeAreaHeight), width: view.frame.width, height: bottomH + cSafeAreaHeight))
-        bottomRemindView.backgroundColor = PQBFConfig.shared.styleBackGroundColor
+        bottomRemindView.backgroundColor = BFConfig.shared.styleBackGroundColor
         return bottomRemindView
     }()
 
     // 确定按钮
     lazy var confirmBtn: UIButton = {
         let confirmBtn = UIButton(frame: CGRect(x: bottomRemindView.frame.width - cDefaultMargin * 9 - margin, y: margin / 2, width: cDefaultMargin * 9, height: bottomH - margin))
-        confirmBtn.backgroundColor = PQBFConfig.shared.otherTintColor
+        confirmBtn.backgroundColor = BFConfig.shared.otherTintColor
 //        confirmBtn.backgroundColor = UIColor.hexColor(hexadecimal: "#EE0051")
         confirmBtn.setTitle("确定", for: .normal)
         confirmBtn.setTitleColor(UIColor.hexColor(hexadecimal: "#999999"), for: .normal)
@@ -139,7 +139,7 @@ public class PQStuckPointMaterialController: BFBaseViewController {
         let bottomRemindLab = UILabel(frame: CGRect(x: margin, y: 0, width: bottomRemindView.frame.width - margin * 3 - confirmBtn.frame.width, height: bottomH))
         bottomRemindLab.attributedText = NSAttributedString(string: "至少选择 1 个视频或 2 张照片")
         bottomRemindLab.textAlignment = .left
-        bottomRemindLab.textColor = PQBFConfig.shared.styleTitleColor
+        bottomRemindLab.textColor = BFConfig.shared.styleTitleColor
         bottomRemindLab.font = UIFont.systemFont(ofSize: 14, weight: .medium)
         return bottomRemindLab
     }()
@@ -211,7 +211,7 @@ public class PQStuckPointMaterialController: BFBaseViewController {
 
     override public func viewDidLoad() {
         super.viewDidLoad()
-        leftButton(image: UIImage.init(named: "upload_delete"), tintColor: PQBFConfig.shared.styleTitleColor)
+        leftButton(image: UIImage.init(named: "upload_delete"), tintColor: BFConfig.shared.styleTitleColor)
         navHeadImageView?.addSubview(changeCollecBtn)
         navHeadImageView?.frame.size.height = cDevice_iPhoneNavBarAndStatusBarHei + margin * 2 + choseBtnH
         navHeadImageView?.addSubview(choseLocalAllBtn)
@@ -335,9 +335,9 @@ public class PQStuckPointMaterialController: BFBaseViewController {
     func dealWithSelectedMaterial(materialData _: PHAsset?, totalDuration: Float64) {
         confirmBtn.isSelected = (selectedDataCount > 0 && (selectedImageDataCount >= 2 || selectedDataCount > selectedImageDataCount))
         if confirmBtn.isSelected {
-            confirmBtn.backgroundColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+            confirmBtn.backgroundColor = UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue)
         } else {
-            confirmBtn.backgroundColor = PQBFConfig.shared.otherTintColor
+            confirmBtn.backgroundColor = BFConfig.shared.otherTintColor
         }
         if selectedDataCount <= 0 {
             bottomRemindLab.attributedText = NSAttributedString(string: "至少选择 1 个视频或 2 张照片")
@@ -346,7 +346,7 @@ public class PQStuckPointMaterialController: BFBaseViewController {
             bottomRemindLab.attributedText = att
         } else {
             let att = NSMutableAttributedString(string: "素材总时长 \(totalDuration.formatDurationToHMS())")
-            att.setAttributes([.foregroundColor: UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)], range: NSRange(location: 6, length: "\(totalDuration.formatDurationToHMS())".count))
+            att.setAttributes([.foregroundColor: UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue)], range: NSRange(location: 6, length: "\(totalDuration.formatDurationToHMS())".count))
             bottomRemindLab.attributedText = att
         }
         confirmBtn.setTitle(selectedDataCount > 0 ? "确定(\(selectedDataCount))" : "确定", for: .normal)

BFFramework/Classes/Stuckpoint/Controller/PQStuckPointMusicContentController.swift

@@ -8,8 +8,9 @@
 
 import UIKit
 import BFCommonKit
+@_exported import BFUIKit
 
-class PQStuckPointMusicContentController: PQBaseViewController {
+class PQStuckPointMusicContentController: BFBaseViewController {
     var itemList: [Any] = Array<Any>.init() // 所有分类数据
     // 当前选择的位置
     var lastIndexPath: IndexPath?
@@ -80,8 +81,8 @@ class PQStuckPointMusicContentController: PQBaseViewController {
         return collectionView
     }()
 
-    lazy var emptyRemindView: PQEmptyRemindView = {
-        let emptyRemindView = PQEmptyRemindView(frame: collectionView.bounds)
+    lazy var emptyRemindView: BFEmptyRemindView = {
+        let emptyRemindView = BFEmptyRemindView(frame: collectionView.bounds)
         emptyRemindView.remindLab.font = UIFont.systemFont(ofSize: 16)
         emptyRemindView.remindLab.textColor = UIColor.hexColor(hexadecimal: "#575757")
         emptyRemindView.isHidden = true
@@ -95,8 +96,8 @@ class PQStuckPointMusicContentController: PQBaseViewController {
         return emptyRemindView
     }()
 
-    var emptyData: PQEmptyModel? = {
-        let emptyData = PQEmptyModel()
+    var emptyData: BFEmptyModel? = {
+        let emptyData = BFEmptyModel()
         emptyData.title = "暂无音乐"
         emptyData.netDisRefreshBgColor = UIColor.hexColor(hexadecimal: "#FA6400")
         emptyData.netDisTitle = "内容加载失败"
@@ -142,7 +143,7 @@ class PQStuckPointMusicContentController: PQBaseViewController {
         } else {
             itemList = itemList + musicListData
         }
-        if (contentType != .serach && musicListData.count < 20) || (contentType == .serach && musicListData.count <= 0) || itemList.first is PQEmptyModel {
+        if (contentType != .serach && musicListData.count < 20) || (contentType == .serach && musicListData.count <= 0) || itemList.first is BFEmptyModel {
             collectionView.mj_footer?.endRefreshingWithNoMoreData()
         } else {
             collectionView.mj_footer?.endRefreshing()
@@ -211,9 +212,9 @@ extension PQStuckPointMusicContentController: UICollectionViewDelegate, UICollec
                 }
             }
             return cell
-        } else if itemData is PQEmptyModel {
+        } else if itemData is BFEmptyModel {
             let cell = PQStuckPointSearchEmptyCell.stuckPointSearchEmptyCell(collectionView: collectionView, indexPath: indexPath)
-            cell.bgmData = itemData as? PQEmptyModel
+            cell.bgmData = itemData as? BFEmptyModel
             return cell
         } else {
             let cell = PQStuckPointMusicContentCell.stuckPointMusicContentCell(collectionView: collectionView, indexPath: indexPath)
@@ -235,7 +236,7 @@ extension PQStuckPointMusicContentController: UICollectionViewDelegate, UICollec
                         PQEventTrackViewModel.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_click_chooseMusic, pageSource: .sp_stuck_selectSynceedUpMusic, extParams: ["musicName": (bgmData as? PQVoiceModel)?.musicName ?? "", "musicId": (bgmData as? PQVoiceModel)?.musicId ?? ""], remindmsg: "卡点视频数据上报-（点击上报：选择音乐素材）")
                     } else if self?.contentType == .serach {
                         // 点击上报：选择音乐素材
-                        PQEventTrackViewModel.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_click_chooseSearchMusic, pageSource: .sp_stuck_searchSyncedUpMusic, extParams: ["musicName": (bgmData as? PQVoiceModel)?.musicName ?? "", "musicId": (bgmData as? PQVoiceModel)?.musicId ?? "", "isHotMusic": self?.itemList.first is PQEmptyModel], remindmsg: "卡点视频数据上报-（点击上报：选择音乐素材）")
+                        PQEventTrackViewModel.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_click_chooseSearchMusic, pageSource: .sp_stuck_searchSyncedUpMusic, extParams: ["musicName": (bgmData as? PQVoiceModel)?.musicName ?? "", "musicId": (bgmData as? PQVoiceModel)?.musicId ?? "", "isHotMusic": self?.itemList.first is BFEmptyModel], remindmsg: "卡点视频数据上报-（点击上报：选择音乐素材）")
                     }
                 }
             }
@@ -248,7 +249,7 @@ extension PQStuckPointMusicContentController: UICollectionViewDelegate, UICollec
         if let sul = itemData as? ([PQStuckPointMusicTagsModel], ([UICollectionViewLayoutAttributes], CGFloat)) {
             let height: CGFloat = (sul.0.count > 0) ? (sul.1.1  + 35) : 0
             return CGSize(width: collectionView.frame.width, height: height)
-        }else if itemData is PQEmptyModel {
+        }else if itemData is BFEmptyModel {
             return CGSize(width: collectionView.frame.width, height: 290)
         } else {
             return CGSize(width: collectionView.frame.width, height: cellHight)
@@ -260,7 +261,7 @@ extension PQStuckPointMusicContentController: UICollectionViewDelegate, UICollec
             cShowHUB(superView: nil, msg: "请有网时再试")
             return
         }
-        if !(itemList[indexPath.item] is PQEmptyModel) {
+        if !(itemList[indexPath.item] is BFEmptyModel) {
             if lastIndexPath != indexPath {
                 if contentType == .catagery {
                     (itemList[lastIndexPath?.item ?? 0] as? PQStuckPointMusicTagsModel)?.isSelected = false
@@ -298,7 +299,7 @@ extension PQStuckPointMusicContentController: UICollectionViewDelegate, UICollec
                 PQEventTrackViewModel.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_click_auditionMusic, pageSource: .sp_stuck_selectSynceedUpMusic, extParams: ["musicName": (itemList[indexPath.item] as? PQVoiceModel)?.musicName ?? "", "musicId": (itemList[indexPath.item] as? PQVoiceModel)?.musicId ?? ""], remindmsg: "卡点视频数据上报-（点击上报：音乐素材试听）")
             } else if contentType == .serach {
                 // 点击上报：试听音乐素材
-                PQEventTrackViewModel.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_click_auditionSearchMusic, pageSource: .sp_stuck_searchSyncedUpMusic, extParams: ["musicName": (itemList[indexPath.item] as? PQVoiceModel)?.musicName ?? "", "musicId": (itemList[indexPath.item] as? PQVoiceModel)?.musicId ?? "", "isHotMusic": itemList.first is PQEmptyModel], remindmsg: "卡点视频数据上报-（点击上报：试听音乐素材）")
+                PQEventTrackViewModel.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_click_auditionSearchMusic, pageSource: .sp_stuck_searchSyncedUpMusic, extParams: ["musicName": (itemList[indexPath.item] as? PQVoiceModel)?.musicName ?? "", "musicId": (itemList[indexPath.item] as? PQVoiceModel)?.musicId ?? "", "isHotMusic": itemList.first is BFEmptyModel], remindmsg: "卡点视频数据上报-（点击上报：试听音乐素材）")
             }
         } else if contentType == .catagery && (itemList[indexPath.item] is PQStuckPointMusicTagsModel) {
             // 点击上报：选择音乐分类
@@ -320,7 +321,7 @@ extension PQStuckPointMusicContentController: UICollectionViewDelegate, UICollec
                 PQEventTrackViewModel.baseReportUpload(businessType: .bt_buttonView, objectType: .ot_view_syncedUpMusic, pageSource: .sp_stuck_selectSynceedUpMusic, extParams: ["musicName": (itemData as? PQVoiceModel)?.musicName ?? "", "musicId": (itemData as? PQVoiceModel)?.musicId ?? ""], remindmsg: "卡点视频数据上报-（曝光上报：音乐素材曝光）")
             } else if contentType == .serach {
                 // 曝光上报：搜索结果音乐素材曝光
-                PQEventTrackViewModel.baseReportUpload(businessType: .bt_buttonView, objectType: .ot_view_searchMusic, pageSource: .sp_stuck_searchSyncedUpMusic, extParams: ["musicName": (itemData as? PQVoiceModel)?.musicName ?? "", "musicId": (itemData as? PQVoiceModel)?.musicId ?? "", "isHotMusic": itemList.first is PQEmptyModel], remindmsg: "卡点视频数据上报-（曝光上报：搜索结果音乐素材曝光）")
+                PQEventTrackViewModel.baseReportUpload(businessType: .bt_buttonView, objectType: .ot_view_searchMusic, pageSource: .sp_stuck_searchSyncedUpMusic, extParams: ["musicName": (itemData as? PQVoiceModel)?.musicName ?? "", "musicId": (itemData as? PQVoiceModel)?.musicId ?? "", "isHotMusic": itemList.first is BFEmptyModel], remindmsg: "卡点视频数据上报-（曝光上报：搜索结果音乐素材曝光）")
             }
         }
     }

BFFramework/Classes/Stuckpoint/Controller/PQStuckPointMusicController.swift

@@ -113,9 +113,9 @@ class PQStuckPointMusicController: BFBaseViewController {
     lazy var searchTF: UITextField = {
         let searchTF = UITextField(frame: CGRect(x: leftMargin, y: cDevice_iPhoneNavBarAndStatusBarHei, width: cScreenWidth - leftMargin * 2, height: searchTFH))
         searchTF.font = UIFont.systemFont(ofSize: 17)
-        searchTF.backgroundColor = PQBFConfig.shared.otherTintColor
+        searchTF.backgroundColor = BFConfig.shared.otherTintColor
         searchTF.attributedPlaceholder = NSAttributedString(string: "搜索歌曲名称/歌手", attributes: [.foregroundColor: UIColor.hexColor(hexadecimal: "#BDBDBD"), .font: UIFont.systemFont(ofSize: 14)])
-        searchTF.textColor = PQBFConfig.shared.styleTitleColor
+        searchTF.textColor = BFConfig.shared.styleTitleColor
         searchTF.addCorner(corner: searchTFH / 2)
 
         searchTF.leftViewMode = .always
@@ -256,8 +256,8 @@ class PQStuckPointMusicController: BFBaseViewController {
         disablePopGesture().popGestureHandle = { [weak self] in
             self?.backBtnClick()
         }
-        leftButton(image: nil, tintColor: PQBFConfig.shared.styleTitleColor)
-        setTitle(title: "选择音乐主题", color: PQBFConfig.shared.styleTitleColor)
+        leftButton(image: nil, tintColor: BFConfig.shared.styleTitleColor)
+        setTitle(title: "选择音乐主题", color: BFConfig.shared.styleTitleColor)
         view.addSubview(searchTF)
       
         /// 请求标签数据

BFFramework/Classes/Stuckpoint/Controller/PQStuckPointPublicController.swift

@@ -6,15 +6,14 @@
 //  Copyright © 2021 BytesFlow. All rights reserved.
 //
 
-import ObjectMapper
 import Photos
 import UIKit
+import ObjectMapper
 import WechatOpenSDK
 import Kingfisher
-import BFUIKit
 import Alamofire
 import BFUIKit
-
+import BFCommonKit
 
 //mdf by ak 按 UI图 下方操作区的高度是固定的， 其它区高度和设备自适应
 public let bottomOprationBgViewHeight:CGFloat = 322.0
@@ -175,7 +174,7 @@ class PQStuckPointPublicController: BFBaseViewController {
     /// 预览背景页
     lazy var bgTopView: UIView = {
         let bgTopView = UIView(frame: CGRect(x: 0, y: cDevice_iPhoneNavBarAndStatusBarHei, width: cScreenWidth, height: maxHeight))
-        bgTopView.backgroundColor = PQBFConfig.shared.styleBackGroundColor
+        bgTopView.backgroundColor = BFConfig.shared.styleBackGroundColor
         return bgTopView
     }()
 
@@ -269,7 +268,7 @@ class PQStuckPointPublicController: BFBaseViewController {
     lazy var progressView: UIProgressView = {
         let progressView = UIProgressView(progressViewStyle: .default)
         progressView.trackTintColor = UIColor(white: 0, alpha: 0.5)
-        progressView.progressTintColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+        progressView.progressTintColor = UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue)
         progressView.transform = CGAffineTransform(scaleX: 1.0, y: playerHeaderView.frame.height)
         return progressView
     }()
@@ -278,7 +277,7 @@ class PQStuckPointPublicController: BFBaseViewController {
     lazy var remindLab: UILabel = {
         let remindLab = UILabel()
         remindLab.font = UIFont.boldSystemFont(ofSize: 18)
-        remindLab.textColor = PQBFConfig.shared.styleTitleColor
+        remindLab.textColor = BFConfig.shared.styleTitleColor
         remindLab.textAlignment = .center
         remindLab.numberOfLines = 2
         remindLab.backgroundColor = .clear
@@ -292,7 +291,7 @@ class PQStuckPointPublicController: BFBaseViewController {
         inputBackView.backgroundColor = .clear
         inputBackView.layer.cornerRadius = 7
         inputBackView.layer.borderWidth = 2
-        inputBackView.layer.borderColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue).cgColor
+        inputBackView.layer.borderColor = UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue).cgColor
         return inputBackView
     }()
 
@@ -331,7 +330,7 @@ class PQStuckPointPublicController: BFBaseViewController {
         titleLabel.numberOfLines = 2
         titleLabel.isUserInteractionEnabled = true
 
-        titleLabel.textColor = PQBFConfig.shared.styleTitleColor
+        titleLabel.textColor = BFConfig.shared.styleTitleColor
         titleLabel.textAlignment = .left
         titleLabel.font = UIFont.systemFont(ofSize: 17)
         let ges = UITapGestureRecognizer(target: self, action: #selector(titleLabelClick))
@@ -354,7 +353,7 @@ class PQStuckPointPublicController: BFBaseViewController {
                 inputText = inputText.replacingOccurrences(of: " ", with: "")
 
                 if inputText.count > 0 {
-                    self?.setTitleText(text: title ?? "", textColor: PQBFConfig.shared.styleTitleColor)
+                    self?.setTitleText(text: title ?? "", textColor: BFConfig.shared.styleTitleColor)
                     // 更新数据
                     self?.videoData?.title = title
                     self?.updateCoverImagegOrTitle()
@@ -381,7 +380,7 @@ class PQStuckPointPublicController: BFBaseViewController {
         let shareWechatBtn = UIButton(type: .custom)
         shareWechatBtn.frame = CGRect(x: 0, y: 0, width: 70, height: 70)
         shareWechatBtn.setImage(UIImage.moduleImage(named: "reCreate_opration_wechat", moduleName: "BFFramework",isAssets: false), for: .normal)
-        shareWechatBtn.backgroundColor = PQBFConfig.shared.styleBackGroundColor
+        shareWechatBtn.backgroundColor = BFConfig.shared.styleBackGroundColor
         shareWechatBtn.addCorner(corner: 6)
         shareWechatBtn.tag = 2
         shareWechatBtn.addTarget(self, action: #selector(btnClick(sender:)), for: .touchUpInside)
@@ -392,7 +391,7 @@ class PQStuckPointPublicController: BFBaseViewController {
     lazy var shareFriendBtn: UIButton = {
         let shareFriendBtn = UIButton(type: .custom)
         shareFriendBtn.frame = CGRect(x: 0, y: 0, width: 70, height: 70)
-        shareFriendBtn.setImage(UIImage.moduleImage(named: PQBFConfig.shared.shareFriendBtnImage, moduleName: "BFFramework",isAssets: false), for: .normal)
+        shareFriendBtn.setImage(UIImage.moduleImage(named: BFConfig.shared.shareFriendBtnImage, moduleName: "BFFramework",isAssets: false), for: .normal)
         shareFriendBtn.addCorner(corner: 6)
         shareFriendBtn.tag = 1
         shareFriendBtn.addTarget(self, action: #selector(btnClick(sender:)), for: .touchUpInside)
@@ -403,7 +402,7 @@ class PQStuckPointPublicController: BFBaseViewController {
     lazy var finishedBtn: UIButton = {
         let finishedBtn = UIButton(type: .custom)
         finishedBtn.setTitle("完成", for: .normal)
-        finishedBtn.setTitleColor(UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue), for: .normal)
+        finishedBtn.setTitleColor(UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue), for: .normal)
         finishedBtn.titleLabel?.font = UIFont.systemFont(ofSize: 16, weight: .medium)
         finishedBtn.backgroundColor = .clear
         finishedBtn.tag = 3
@@ -452,7 +451,7 @@ class PQStuckPointPublicController: BFBaseViewController {
         saveRetryBtn.setTitle("重试", for: .normal)
         saveRetryBtn.setTitleColor(UIColor.white, for: .normal)
         saveRetryBtn.titleLabel?.font = UIFont.systemFont(ofSize: 15, weight: .medium)
-        saveRetryBtn.backgroundColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+        saveRetryBtn.backgroundColor = UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue)
         saveRetryBtn.tag = 97
         saveRetryBtn.isHidden = true
         saveRetryBtn.addCorner(corner: 5)
@@ -492,7 +491,7 @@ class PQStuckPointPublicController: BFBaseViewController {
         // 注册上传成功的通知
         addNotification(self, selector: #selector(uploadSuccess(notify:)), name: cUploadSuccessKey, object: nil)
         PQNotification.addObserver(self, selector: #selector(didBecomeActiveNotification), name: UIApplication.didBecomeActiveNotification, object: nil)
-        leftButton(image: nil, tintColor: PQBFConfig.shared.styleTitleColor)
+        leftButton(image: nil, tintColor: BFConfig.shared.styleTitleColor)
         navHeadImageView?.backgroundColor = UIColor.clear
         lineView?.removeFromSuperview()
         view.addSubview(bgTopView)
@@ -863,7 +862,7 @@ extension PQStuckPointPublicController {
                 //导出不带水印的正片
                 self?.beginExport(inputAsset: asset)
                 
-                if(PQBFConfig.shared.enableWatermarkMovie){
+                if(BFConfig.shared.enableWatermarkMovie){
                     //导出带水印的正片
                     self?.beginExportWatermarkMovie(inputAsset:asset)
                 }
@@ -938,7 +937,7 @@ extension PQStuckPointPublicController {
                 
                 
                 // add by ak 不生成水印视频时直接自动保存系统相册，e.g. 乐活圈中会执行
-                if(!PQBFConfig.shared.enableWatermarkMovie){
+                if(!BFConfig.shared.enableWatermarkMovie){
                     self?.authorizationStatus()
                 }
        
@@ -978,7 +977,7 @@ extension PQStuckPointPublicController {
     /// - Returns: <#description#>
     func saveStuckPointVideo() {
         
-        let tempSaveMoveiLocal:URL? = PQBFConfig.shared.enableWatermarkMovie ? saveMovieLocalURL : exportLocalURL
+        let tempSaveMoveiLocal:URL? = BFConfig.shared.enableWatermarkMovie ? saveMovieLocalURL : exportLocalURL
         
         if(tempSaveMoveiLocal == nil){
             BFLog(message: "保存相册的视频导出地址无效！！！")
@@ -1124,9 +1123,12 @@ extension PQStuckPointPublicController {
             if isExportSuccess, exportLocalURL != nil {
                 let size = try! exportLocalURL?.resourceValues(forKeys: [.fileSizeKey])
                 BFLog(message: "size = \(String(describing: size))")
-                if Float64(size?.fileSize ?? 0) <= maxUploadSize {
-                    /// fp5 - 上传视频
-                    reUploadVideo()
+//                if Float64(size?.fileSize ?? 0) <= maxUploadSize {
+//                    /// fp5 - 上传视频
+//                    reUploadVideo()
+//                }
+                if Int64(23) > 0 {
+                    
                 }
             }
         }
@@ -1228,7 +1230,7 @@ extension PQStuckPointPublicController {
         if uploadData?.localPath != nil {
             let size = try! URL(string: uploadData?.localPath ?? "")?.resourceValues(forKeys: [.fileSizeKey])
             BFLog(message: "size = \(String(describing: size))")
-            if Float64(size?.fileSize ?? 0) > maxUploadSize {
+            if Int64(size?.fileSize ?? 0) > Int64(maxUploadSize) {
                 cShowHUB(superView: nil, msg: "无法发布大于10G的视频,请重新选择/合成发布")
                 // 上传失败-播放视频
                 publicEnd(isError: true)
@@ -1487,7 +1489,7 @@ extension PQStuckPointPublicController {
         emptyData.titleColor = UIColor.hexColor(hexadecimal: "#353535")
         emptyData.summary = "建议切换 WIFI/移动网络后再重试"
         emptyData.summaryColor = UIColor.hexColor(hexadecimal: "#353535")
-        emptyData.refreshBgColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+        emptyData.refreshBgColor = UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue)
         emptyData.refreshTitle = NSMutableAttributedString(string: "立即重试", attributes: [.foregroundColor:UIColor.white])
         emptyData.emptySoureImage = UIImage.moduleImage(named: "stuckPoint_video_empty", moduleName: "BFMaterialKit",isAssets: false)
         emptyData.netDisRefreshBgColor = UIColor.hexColor(hexadecimal: "#FA6400")
@@ -1499,7 +1501,7 @@ extension PQStuckPointPublicController {
         let emptyRemindView = BFEmptyRemindView(frame: CGRect(x: 0, y: cDevice_iPhoneNavBarAndStatusBarHei, width: view.frame.width, height: view.frame.height - cDevice_iPhoneNavBarAndStatusBarHei))
 //        emptyRemindView.isHidden = true
         emptyRemindView.emptyData = emptyData
-        emptyRemindView.backgroundColor = PQBFConfig.shared.styleBackGroundColor
+        emptyRemindView.backgroundColor = BFConfig.shared.styleBackGroundColor
         emptyRemindView.fullRefreshBloc = {[weak self, weak emptyRemindView] _, _ in
             if emptyRemindView?.refreshBtn.currentAttributedTitle?.string == "立即重试" {
                 emptyRemindView?.isHidden = true

BFFramework/Classes/Stuckpoint/View/PQCustomSpeedSettingView.swift

@@ -24,7 +24,7 @@ class PQCustomSpeedSettingView: UIView {
         titleLab.font = UIFont.systemFont(ofSize: 14, weight: .medium)
         titleLab.textAlignment = .center
         titleLab.text = "自定义快慢速"
-        titleLab.textColor = PQBFConfig.shared.styleTitleColor
+        titleLab.textColor = BFConfig.shared.styleTitleColor
         return titleLab
     }()
 
@@ -34,7 +34,7 @@ class PQCustomSpeedSettingView: UIView {
         confirmBtn.setTitle("确定", for: .normal)
         confirmBtn.setTitleColor(.white, for: .normal)
         confirmBtn.addTarget(self, action: #selector(confirmClick(sender:)), for: .touchUpInside)
-        confirmBtn.backgroundColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+        confirmBtn.backgroundColor = UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue)
         confirmBtn.titleLabel?.font = UIFont.systemFont(ofSize: 17, weight: .medium)
         confirmBtn.addCorner(corner: 11)
         return confirmBtn
@@ -44,8 +44,8 @@ class PQCustomSpeedSettingView: UIView {
     public lazy var cancleBtn: UIButton = {
         let cancleBtn = UIButton(type: .custom)
         cancleBtn.setTitle("取消", for: .normal)
-        cancleBtn.setTitleColor(UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue), for: .normal)
-        cancleBtn.backgroundColor = PQBFConfig.shared.pointEditNamalBackgroundColor
+        cancleBtn.setTitleColor(UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue), for: .normal)
+        cancleBtn.backgroundColor = BFConfig.shared.pointEditNamalBackgroundColor
         cancleBtn.addTarget(self, action: #selector(backClick(sender:)), for: .touchUpInside)
         cancleBtn.titleLabel?.font = UIFont.systemFont(ofSize: 17, weight: .medium)
         cancleBtn.addCorner(corner: 11)
@@ -66,18 +66,18 @@ class PQCustomSpeedSettingView: UIView {
 
     lazy var fastSlider: BFUISlider = {
         let fastSlider = BFUISlider()
-        let thbImage = UIImage.moduleImage(named: PQBFConfig.shared.silderPinUsedImageName, moduleName: "BFFramework", isAssets: false)
+        let thbImage = UIImage.moduleImage(named: BFConfig.shared.silderPinUsedImageName, moduleName: "BFFramework", isAssets: false)
         fastSlider.setMinimumTrackImage(thbImage, for: .normal)
         fastSlider.setMaximumTrackImage(thbImage, for: .normal)
         fastSlider.setThumbImage(thbImage, for: .highlighted)
         fastSlider.setThumbImage(thbImage, for: .normal)
         fastSlider.maximumTrackTintColor = UIColor.hexColor(hexadecimal: "#E6E8E8")
-        fastSlider.minimumTrackTintColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+        fastSlider.minimumTrackTintColor = UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue)
         fastSlider.tag = 10
 //        speechSlidView.addTarget(self, action: #selector(sliderTouchEnded(sender:)), for: .touchUpInside)
         fastSlider.maximumValue = 8
         fastSlider.minimumValue = 0.2
-        fastSlider.valueTextColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+        fastSlider.valueTextColor = UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue)
         fastSlider.value = 0.2
 
         return fastSlider
@@ -85,18 +85,18 @@ class PQCustomSpeedSettingView: UIView {
 
     lazy var slowSlider: BFUISlider = {
         let slowSlider = BFUISlider()
-        let thbImage =  UIImage.moduleImage(named: PQBFConfig.shared.silderPinUsedImageName, moduleName: "BFFramework", isAssets: false)
+        let thbImage =  UIImage.moduleImage(named: BFConfig.shared.silderPinUsedImageName, moduleName: "BFFramework", isAssets: false)
         slowSlider.setMinimumTrackImage(thbImage, for: .normal)
         slowSlider.setMaximumTrackImage(thbImage, for: .normal)
         slowSlider.setThumbImage(thbImage, for: .highlighted)
         slowSlider.setThumbImage(thbImage, for: .normal)
         slowSlider.maximumTrackTintColor = UIColor.hexColor(hexadecimal: "#E6E8E8")
-        slowSlider.minimumTrackTintColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+        slowSlider.minimumTrackTintColor = UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue)
         slowSlider.tag = 10
 //        speechSlidView.addTarget(self, action: #selector(sliderTouchEnded(sender:)), for: .touchUpInside)
         slowSlider.maximumValue = 4
         slowSlider.minimumValue = 0.2
-        slowSlider.valueTextColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+        slowSlider.valueTextColor = UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue)
         slowSlider.value = 0.2
 
         return slowSlider
@@ -104,18 +104,18 @@ class PQCustomSpeedSettingView: UIView {
 
     lazy var jumpSpeedSlider: BFUISlider = {
         let jumpSpeedSlider = BFUISlider()
-        let thbImage =  UIImage.moduleImage(named: PQBFConfig.shared.silderPinUsedImageName, moduleName: "BFFramework", isAssets: false)
+        let thbImage =  UIImage.moduleImage(named: BFConfig.shared.silderPinUsedImageName, moduleName: "BFFramework", isAssets: false)
         jumpSpeedSlider.setMinimumTrackImage(thbImage, for: .normal)
         jumpSpeedSlider.setMaximumTrackImage(thbImage, for: .normal)
         jumpSpeedSlider.setThumbImage(thbImage, for: .highlighted)
         jumpSpeedSlider.setThumbImage(thbImage, for: .normal)
         jumpSpeedSlider.maximumTrackTintColor = UIColor.hexColor(hexadecimal: "#E6E8E8")
-        jumpSpeedSlider.minimumTrackTintColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+        jumpSpeedSlider.minimumTrackTintColor = UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue)
         jumpSpeedSlider.tag = 10
 //        speechSlidView.addTarget(self, action: #selector(sliderTouchEnded(sender:)), for: .touchUpInside)
         jumpSpeedSlider.maximumValue = 10
         jumpSpeedSlider.minimumValue = 1
-        jumpSpeedSlider.valueTextColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+        jumpSpeedSlider.valueTextColor = UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue)
         jumpSpeedSlider.value = 1
 
         return jumpSpeedSlider
@@ -142,7 +142,7 @@ class PQCustomSpeedSettingView: UIView {
 
     override init(frame: CGRect) {
         super.init(frame: frame)
-        backgroundColor = PQBFConfig.shared.otherTintColor
+        backgroundColor = BFConfig.shared.otherTintColor
        
         layer.shadowColor = UIColor(red: 0, green: 0, blue: 0, alpha: 0.15).cgColor
         layer.shadowOpacity = 1

BFFramework/Classes/Stuckpoint/View/PQCustomSwitchView.swift

@@ -44,19 +44,19 @@ class PQCustomSwitchView: UIView {
             itemBtn.tag = (3 - index)
             itemBtn.setTitle(itemTitle, for: .normal)
             itemBtn.setTitleColor(UIColor.hexColor(hexadecimal: "#959595"), for: .normal)
-            itemBtn.setTitleColor(UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue), for: .selected)
+            itemBtn.setTitleColor(UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue), for: .selected)
             itemBtn.addTarget(self, action: #selector(btnClick(sender:)), for: .touchUpInside)
   
             if itemBtn.tag == defaultIndex  {
                 itemBtn.isSelected = true
               
                 currentItemBtn = itemBtn
-                let styleColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+                let styleColor = UIColor.hexColor(hexadecimal: BFConfig.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 = PQBFConfig.shared.pointEditNamalBackgroundColor
+                itemBtn.backgroundColor = BFConfig.shared.pointEditNamalBackgroundColor
                 itemBtn.titleLabel?.font = UIFont.systemFont(ofSize: 13)
             }
            
@@ -80,11 +80,11 @@ class PQCustomSwitchView: UIView {
     func updateSelectBtn(sender: UIButton) {
         currentItemBtn?.isSelected = false
         currentItemBtn?.titleLabel?.font = UIFont.systemFont(ofSize: 13)
-        currentItemBtn?.backgroundColor = PQBFConfig.shared.pointEditNamalBackgroundColor
+        currentItemBtn?.backgroundColor = BFConfig.shared.pointEditNamalBackgroundColor
         
         sender.titleLabel?.font = UIFont.boldSystemFont(ofSize: 13)
         sender.isSelected = true
-        let styleColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+        let styleColor = UIColor.hexColor(hexadecimal: BFConfig.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/PQCuttingPointView.swift

@@ -13,13 +13,13 @@ class PQCuttingPointView: UIView {
     lazy var pointView: UIView = {
         let pointView = UIView()
         pointView.addCorner(corner: 1.5)
-        pointView.backgroundColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+        pointView.backgroundColor = UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue)
         return pointView
     }()
 
     lazy var dragingImageView: UIImageView = {
         let dragingImageView = UIImageView(image:UIImage.moduleImage(named: "stuckPoint_dragingImage", moduleName: "BFFramework",isAssets: false)?.withRenderingMode(.alwaysTemplate))
-        dragingImageView.tintColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+        dragingImageView.tintColor = UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue)
         return dragingImageView
     }()
 

BFFramework/Classes/Stuckpoint/View/PQEditPublicCoverImageView.swift

@@ -23,7 +23,7 @@ class PQEditPublicCoverImageView: UIView {
     lazy var backView: UIView = {
         let backView = UIView()
         backView.addCorner(corner: 1.5)
-        backView.backgroundColor = PQBFConfig.shared.otherTintColor
+        backView.backgroundColor = BFConfig.shared.otherTintColor
         return backView
     }()
 
@@ -36,7 +36,7 @@ class PQEditPublicCoverImageView: UIView {
     // 确定按钮
     lazy var compliteBtn: UIButton = {
         let compliteBtn = UIButton(type: .custom)
-        compliteBtn.backgroundColor =  UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+        compliteBtn.backgroundColor =  UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue)
         compliteBtn.setTitle("确定", for: .normal)
         compliteBtn.titleLabel?.font = UIFont.systemFont(ofSize: 18, weight: .medium)
         compliteBtn.setTitleColor(UIColor.hexColor(hexadecimal: "#FFFFFF"), for: .normal)
@@ -51,7 +51,7 @@ class PQEditPublicCoverImageView: UIView {
     lazy var selectPhotoBtn: UIButton = {
         let selectPhotoBtn = UIButton(type: .custom)
        
-        selectPhotoBtn.setImage(UIImage.moduleImage(named:  PQBFConfig.shared.editCoverimageSelectImage, moduleName: "BFFramework",isAssets: false), for: .normal)
+        selectPhotoBtn.setImage(UIImage.moduleImage(named:  BFConfig.shared.editCoverimageSelectImage, moduleName: "BFFramework",isAssets: false), for: .normal)
         selectPhotoBtn.adjustsImageWhenHighlighted = false
         selectPhotoBtn.addCorner(corner: 11)
         selectPhotoBtn.tag = 1
@@ -91,7 +91,7 @@ class PQEditPublicCoverImageView: UIView {
             coverImageBtn.addTarget(self, action: #selector(coverImageBtnClick(sender:)), for: .touchUpInside)
             //选中后的角标
             let iconView = UIImageView.init(frame: CGRect(x: frame.size.width  - 22.0 - 6, y: 6, width: 22, height: 22))
-            iconView.image = UIImage.moduleImage(named:  PQBFConfig.shared.editCoverimageSelectedImage, moduleName: "BFFramework",isAssets: false)
+            iconView.image = UIImage.moduleImage(named:  BFConfig.shared.editCoverimageSelectedImage, moduleName: "BFFramework",isAssets: false)
            
           
             iconView.tag = 1000

BFFramework/Classes/Stuckpoint/View/PQEditPublicTitleView.swift

@@ -37,7 +37,7 @@ class PQEditPublicTitleView: UIView {
         inputTV.textColor = .black
         inputTV.maxTextLength = 30
         inputTV.placeHolderDefultPoint = CGPoint(x: 5, y: 0)
-        inputTV.tintColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+        inputTV.tintColor = UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue)
         inputTV.placeHolder = "我见过你眼中的春与秋，胜过我见过的所有山川河流"
         inputTV.showsVerticalScrollIndicator = false
         inputTV.textContainerInset = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 0)
@@ -51,14 +51,14 @@ class PQEditPublicTitleView: UIView {
         inputBgView.addCorner(corner: 10)
         inputBgView.layer.cornerRadius = 7
         inputBgView.layer.borderWidth = 2
-        inputBgView.layer.borderColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue).cgColor
+        inputBgView.layer.borderColor = UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue).cgColor
         return inputBgView
     }()
 
     // 确定按钮
     lazy var confirmBtn: UIButton = {
         let confirmBtn = UIButton()
-        confirmBtn.backgroundColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+        confirmBtn.backgroundColor = UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue)
         confirmBtn.setTitle("确定", for: .normal)
         confirmBtn.setTitleColor(.white, for: .normal)
         confirmBtn.setTitleColor(UIColor.white, for: .selected)

BFFramework/Classes/Stuckpoint/View/PQSelecteMusicView.swift

@@ -488,7 +488,7 @@ class PQSelectMusicTagsCell: UICollectionViewCell {
         titleLab.font = UIFont.systemFont(ofSize: 14)
         titleLab.textColor = UIColor.hexColor(hexadecimal: "#959595")
         titleLab.textAlignment = .center
-        titleLab.backgroundColor = PQBFConfig.shared.styleBackGroundColor
+        titleLab.backgroundColor = BFConfig.shared.styleBackGroundColor
         return titleLab
     }()
 
@@ -511,7 +511,7 @@ class PQSelectMusicTagsCell: UICollectionViewCell {
     func addData() {
         titleLab.text = "\(tagData?.tagName ?? "")"
         if tagData?.isSelected ?? false {
-            titleLab.textColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+            titleLab.textColor = UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue)
             titleLab.font = UIFont.boldSystemFont(ofSize: 14)
 
         } else {
@@ -543,7 +543,7 @@ class PQSelectMusicCell: UICollectionViewCell {
 
     lazy var imageMaskView: UIView = {
         let imageMaskView = UIView()
-        imageMaskView.backgroundColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue,alpha: 0.76)
+        imageMaskView.backgroundColor = UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue,alpha: 0.76)
         imageMaskView.addCorner(corner: 4)
         return imageMaskView
     }()
@@ -558,7 +558,7 @@ class PQSelectMusicCell: UICollectionViewCell {
     lazy var titleLab: UILabel = {
         let titleLab = UILabel()
         titleLab.font = UIFont.systemFont(ofSize: 14)
-        titleLab.textColor = PQBFConfig.shared.styleTitleColor
+        titleLab.textColor = BFConfig.shared.styleTitleColor
         return titleLab
     }()
 
@@ -581,13 +581,13 @@ class PQSelectMusicCell: UICollectionViewCell {
         confirmBtn.titleLabel?.font = UIFont.systemFont(ofSize: 14, weight: .medium)
         confirmBtn.addTarget(self, action: #selector(confirmClick(sender:)), for: .touchUpInside)
         confirmBtn.addCorner(corner: 4)
-        confirmBtn.backgroundColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+        confirmBtn.backgroundColor = UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue)
         return confirmBtn
     }()
 
     lazy var remindView: UIView = {
         let remindView = UIView()
-        remindView.backgroundColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+        remindView.backgroundColor = UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue)
         remindView.addCorner(corner: 3)
         return remindView
     }()
@@ -675,7 +675,7 @@ class PQSelectMusicCell: UICollectionViewCell {
         confirmBtn.isHidden = !(bgmData?.voiceStatue == .isPause || bgmData?.voiceStatue == .isPlaying)
 
         if(bgmData?.voiceStatue == .isSelected || bgmData?.voiceStatue == .isPause || bgmData?.voiceStatue == .isPlaying){
-            musicNameLab.textColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+            musicNameLab.textColor = UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue)
             musicNameLab.font = UIFont.boldSystemFont(ofSize: 12)
         }else{
             musicNameLab.textColor =  UIColor.hexColor(hexadecimal: "#959595")

BFFramework/Classes/Stuckpoint/View/PQSelectedMaterialListView.swift

@@ -34,7 +34,7 @@ class PQSelectedMaterialListView: UIView {
 
     override init(frame: CGRect) {
         super.init(frame: frame)
-        backgroundColor = PQBFConfig.shared.styleBackGroundColor
+        backgroundColor = BFConfig.shared.styleBackGroundColor
         addSubview(photoCollectionView)
     }
 

BFFramework/Classes/Stuckpoint/View/PQSpeedSettingView.swift

@@ -320,22 +320,22 @@ class PQSpeedTitleCell: UICollectionViewCell {
 
             if titleModel?.isSelected ?? false {
             
-                let styleColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+                let styleColor = UIColor.hexColor(hexadecimal: BFConfig.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.textColor = UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue)
                 
                 titleLab.font = UIFont.boldSystemFont(ofSize: 13)
 
             } else {
                 if(titleModel?.isDisable ?? false){
                     
-                    let backColor = PQBFConfig.shared.pointEditNamalBackgroundColor
+                    let backColor = BFConfig.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.backgroundColor = BFConfig.shared.pointEditNamalBackgroundColor
                     titleLab.textColor = UIColor.hexColor(hexadecimal: "#959595")
                 }
                 titleLab.font = UIFont.systemFont(ofSize: 13, weight: .regular)

BFFramework/Classes/Stuckpoint/View/PQStuckPointCuttingView.swift

@@ -118,7 +118,7 @@ class PQStuckPointCuttingView: UIView {
         tatalTimeLabel.font = UIFont.systemFont(ofSize: 11)
         tatalTimeLabel.textAlignment = .right
         tatalTimeLabel.tag = 66
-        tatalTimeLabel.textColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+        tatalTimeLabel.textColor = UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue)
         return tatalTimeLabel
     }()
 
@@ -126,7 +126,7 @@ class PQStuckPointCuttingView: UIView {
     lazy var videoCropView: UIView = {
         let videoCropView: UIView = UIView(frame: CGRect(x: (cScreenWidth - cropViewWidth) / 2, y: 0, width: cropViewWidth, height: 80))
         videoCropView.isUserInteractionEnabled = false
-        videoCropView.layer.borderColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue).cgColor
+        videoCropView.layer.borderColor = UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue).cgColor
         videoCropView.layer.borderWidth = 2
         videoCropView.layer.cornerRadius = 8
 
@@ -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 = PQBFConfig.shared.styleBackGroundColor
+        leftMaskView.backgroundColor = BFConfig.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 = PQBFConfig.shared.styleBackGroundColor
+        rightMaskView.backgroundColor = BFConfig.shared.styleBackGroundColor
         rightMaskView.alpha = 0.7
         return rightMaskView
     }()
@@ -182,7 +182,7 @@ class PQStuckPointCuttingView: UIView {
         tatalTimeLabel.text = "\(Float64(stuckPointEndTime - stuckPointStartTime).formatDurationToHMS())"
   
         BFLog(1, message: "播放开始:\(stuckPointStartTime) 结束:\(stuckPointEndTime) 时长为:\(stuckPointEndTime - stuckPointStartTime); 音乐总时长为:\(videoDuration);推荐卡点开始:\(suggestRhythmStartTime) 结束:\(suggestRhythmEndTime)")
-        backgroundColor = PQBFConfig.shared.styleBackGroundColor
+        backgroundColor = BFConfig.shared.styleBackGroundColor
         addSubview(scrollView)
 
         addSubview(videoCropView)
@@ -302,9 +302,9 @@ class PQStuckPointCuttingView: UIView {
         let selectIndex = Int(ceil(startIndex + progress * CGFloat(wavSelectCount)))
         while(selectIndex < lineLayerArray.count && selectIndex > lastDrawedLineIndex){
             let drawLayer:CAShapeLayer = lineLayerArray[lastDrawedLineIndex]
-            if drawLayer.strokeColor != UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue).cgColor{
+            if drawLayer.strokeColor != UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue).cgColor{
 //                BFLog(1, message: "progress is \(progress) i \(lastDrawedLineIndex) 命中的位置：\(CGFloat(lastDrawedLineIndex) * oneMarginTime)")
-                drawLayer.strokeColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue).cgColor
+                drawLayer.strokeColor = UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue).cgColor
                 drawLayer.setNeedsDisplay()
                 drawLayer.layoutIfNeeded()
             }

BFFramework/Classes/Stuckpoint/View/PQStuckPointLoadingView.swift

@@ -27,7 +27,7 @@ class PQStuckPointLoadingView: UIView {
         navBarLeftBtn.frame = CGRect(x: 0, y: cDevice_iPhoneStatusBarHei, width: cDefaultMargin * 4, height: cDefaultMargin * 4)
         navBarLeftBtn.imageEdgeInsets = UIEdgeInsets(top: 0, left: 0, bottom: -5, right: 0)
         navBarLeftBtn.imageEdgeInsets = UIEdgeInsets(top: 0, left: 0, bottom: -5, right: 0)
-        navBarLeftBtn.tintColor = PQBFConfig.shared.styleTitleColor
+        navBarLeftBtn.tintColor = BFConfig.shared.styleTitleColor
         navBarLeftBtn.setImage(imageInUIKit(by: "icon_detail_back")?.withRenderingMode(.alwaysTemplate), for: .normal)
         navBarLeftBtn.addTarget(self, action: #selector(cancelDownload(sender:)), for: .touchUpInside)
         return navBarLeftBtn

BFFramework/Classes/Stuckpoint/View/PQStuckPointMusicContentCell.swift

@@ -37,14 +37,14 @@ class PQStuckPointMusicContentCell: UICollectionViewCell {
     lazy var titleLab: UILabel = {
         let titleLab = UILabel()
         titleLab.font = UIFont.systemFont(ofSize: 14)
-        titleLab.textColor = PQBFConfig.shared.styleTitleColor
+        titleLab.textColor = BFConfig.shared.styleTitleColor
         return titleLab
     }()
 
     /// 音乐歌曲名称
     lazy var musicNameLab: LMJHorizontalScrollText = {
         let musicNameLab = LMJHorizontalScrollText(frame: CGRect(x: 0, y: 0, width: cDefaultMargin * 6, height: cDefaultMargin * 3))
-        musicNameLab.textColor = PQBFConfig.shared.styleTitleColor
+        musicNameLab.textColor = BFConfig.shared.styleTitleColor
         musicNameLab.textFont = UIFont.systemFont(ofSize: 16)
         musicNameLab.speed = 0.03
         musicNameLab.moveDirection = LMJTextScrollMoveLeft
@@ -56,7 +56,7 @@ class PQStuckPointMusicContentCell: UICollectionViewCell {
     // 使用按钮
     lazy var confirmContentView: UIView = {
         let confirmContentView = UIView()
-        confirmContentView.backgroundColor = PQBFConfig.shared.styleBackGroundColor
+        confirmContentView.backgroundColor = BFConfig.shared.styleBackGroundColor
         let ges = UITapGestureRecognizer(target: self, action: #selector(confirmClick))
         confirmContentView.addGestureRecognizer(ges)
         confirmContentView.isHidden = true
@@ -71,13 +71,13 @@ class PQStuckPointMusicContentCell: UICollectionViewCell {
         confirmBtn.titleLabel?.font = UIFont.systemFont(ofSize: 14, weight: .medium)
         confirmBtn.isUserInteractionEnabled = false
         confirmBtn.addCorner(corner: 5)
-        confirmBtn.backgroundColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+        confirmBtn.backgroundColor = UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue)
         return confirmBtn
     }()
 
     lazy var remindView: UIView = {
         let remindView = UIView()
-        remindView.backgroundColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+        remindView.backgroundColor = UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue)
         remindView.addCorner(corner: 3)
         return remindView
     }()
@@ -119,7 +119,7 @@ class PQStuckPointMusicContentCell: UICollectionViewCell {
     }
 
     func addData() {
-        imageMaskView.isHidden = !(bgmData is PQVoiceModel) || PQBFConfig.shared.hiddenMusicMask
+        imageMaskView.isHidden = !(bgmData is PQVoiceModel) || BFConfig.shared.hiddenMusicMask
         musicNameLab.isHidden = !(bgmData is PQVoiceModel)
         titleLab.isHidden = (bgmData is PQVoiceModel)
         if bgmData is PQVoiceModel {
@@ -163,8 +163,8 @@ class PQStuckPointMusicContentCell: UICollectionViewCell {
             } else {
                 titleLab.font = UIFont.systemFont(ofSize: 14)
             }
-            contentView.backgroundColor = ((bgmData as? PQStuckPointMusicTagsModel)?.isSelected ?? false) ? PQBFConfig.shared.styleBackGroundColor : PQBFConfig.shared.otherTintColor
-            titleLab.textColor = ((bgmData as? PQStuckPointMusicTagsModel)?.isSelected ?? false) ? UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue) : PQBFConfig.shared.styleTitleColor
+            contentView.backgroundColor = ((bgmData as? PQStuckPointMusicTagsModel)?.isSelected ?? false) ? BFConfig.shared.styleBackGroundColor : BFConfig.shared.otherTintColor
+            titleLab.textColor = ((bgmData as? PQStuckPointMusicTagsModel)?.isSelected ?? false) ? UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue) : BFConfig.shared.styleTitleColor
             remindView.isHidden = !((bgmData as? PQStuckPointMusicTagsModel)?.isSelected ?? false)
         }
     }

BFFramework/Classes/Stuckpoint/View/PQStuckPointMusicTagsContentCell.swift

@@ -15,7 +15,7 @@ class PQStuckPointMusicTagsContentCell: UICollectionViewCell {
         titleLab.font = UIFont.systemFont(ofSize: 12)
         titleLab.textColor = UIColor.hexColor(hexadecimal: "#959595")
         titleLab.textAlignment = .center
-        titleLab.backgroundColor = PQBFConfig.shared.styleBackGroundColor
+        titleLab.backgroundColor = BFConfig.shared.styleBackGroundColor
         titleLab.addCorner(corner: 4)
         return titleLab
     }()
@@ -44,9 +44,9 @@ class PQStuckPointMusicTagsContentCell: UICollectionViewCell {
     func addData() {
         titleLab.text = "\(tagData?.tagName ?? "")"
         if tagData?.isSelected ?? false {
-            titleLab.textColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+            titleLab.textColor = UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue)
             titleLab.layer.borderWidth = 0.5
-            titleLab.layer.borderColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue).cgColor
+            titleLab.layer.borderColor = UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue).cgColor
         } else {
             titleLab.textColor = UIColor.hexColor(hexadecimal: "#959595")
             titleLab.layer.borderWidth = 0.5

BFFramework/Classes/Stuckpoint/View/PQVideoCutingOprateView.swift

@@ -60,7 +60,7 @@ class PQVideoCutingOprateView: UIView {
     lazy var durationLabel: UILabel = {
         let durationLabel = UILabel()
         durationLabel.font = UIFont.systemFont(ofSize: 16, weight: .medium)
-        durationLabel.backgroundColor = PQBFConfig.shared.cutDurationColor
+        durationLabel.backgroundColor = BFConfig.shared.cutDurationColor
         durationLabel.textColor = UIColor.white
         durationLabel.textAlignment = .center
         durationLabel.addShadow()
@@ -69,10 +69,10 @@ class PQVideoCutingOprateView: UIView {
 
     lazy var leftOprateView: UIImageView = {
         let leftOprateView = UIImageView(image:UIImage.moduleImage(named: "videomk_crop_left", moduleName: "BFFramework",isAssets: false)?.withRenderingMode(.alwaysTemplate))
-        leftOprateView.tintColor = PQBFConfig.shared.cutViewTintColor
+        leftOprateView.tintColor = BFConfig.shared.cutViewTintColor
         leftOprateView.contentMode = .scaleAspectFill
         leftOprateView.isUserInteractionEnabled = true
-        leftOprateView.backgroundColor = PQBFConfig.shared.cutViewStyleColor
+        leftOprateView.backgroundColor = BFConfig.shared.cutViewStyleColor
         let panGes = UIPanGestureRecognizer(target: self, action: #selector(panGesture(gesture:)))
         panGes.maximumNumberOfTouches = 1
         panGes.minimumNumberOfTouches = 1
@@ -82,10 +82,10 @@ class PQVideoCutingOprateView: UIView {
 
     lazy var rightOprateView: UIImageView = {
         let rightOprateView = UIImageView(image:UIImage.moduleImage(named: "videomk_crop_right", moduleName: "BFFramework",isAssets: false)?.withRenderingMode(.alwaysTemplate))
-        rightOprateView.tintColor = PQBFConfig.shared.cutViewTintColor
+        rightOprateView.tintColor = BFConfig.shared.cutViewTintColor
         rightOprateView.contentMode = .scaleAspectFill
         rightOprateView.isUserInteractionEnabled = true
-        rightOprateView.backgroundColor = PQBFConfig.shared.cutViewStyleColor
+        rightOprateView.backgroundColor = BFConfig.shared.cutViewStyleColor
         let panGes = UIPanGestureRecognizer(target: self, action: #selector(panGesture(gesture:)))
         panGes.maximumNumberOfTouches = 1
         panGes.minimumNumberOfTouches = 1
@@ -95,13 +95,13 @@ class PQVideoCutingOprateView: UIView {
 
     lazy var topLineView: UIImageView = {
         let topLineView = UIImageView()
-        topLineView.backgroundColor = PQBFConfig.shared.cutViewStyleColor
+        topLineView.backgroundColor = BFConfig.shared.cutViewStyleColor
         return topLineView
     }()
 
     lazy var bottomLineView: UIImageView = {
         let bottomLineView = UIImageView()
-        bottomLineView.backgroundColor = PQBFConfig.shared.cutViewStyleColor
+        bottomLineView.backgroundColor = BFConfig.shared.cutViewStyleColor
         return bottomLineView
     }()
 

BFFramework/Classes/Stuckpoint/ViewModel/PQGPUImagePlayerView.swift

@@ -156,13 +156,13 @@ public class PQGPUImagePlayerView: UIView {
     // 渲染区view
     private lazy var renderView: RenderView = {
         let view = RenderView()
-        view.backgroundColor = PQBFConfig.shared.styleBackGroundColor
+        view.backgroundColor = BFConfig.shared.styleBackGroundColor
         view.frame = self.bounds
         view.delegate = self
         let tap = UITapGestureRecognizer(target: self, action: #selector(RenderViewOnclick))
         view.addGestureRecognizer(tap)
  
-        view.backgroundRenderColor =  Color.init(red: Float(PQBFConfig.shared.styleBackGroundColor.rgbaf[0]), green: Float(PQBFConfig.shared.styleBackGroundColor.rgbaf[1]), blue: Float(PQBFConfig.shared.styleBackGroundColor.rgbaf[2]))
+        view.backgroundRenderColor =  Color.init(red: Float(BFConfig.shared.styleBackGroundColor.rgbaf[0]), green: Float(BFConfig.shared.styleBackGroundColor.rgbaf[1]), blue: Float(BFConfig.shared.styleBackGroundColor.rgbaf[2]))
 
         return view
     }()
@@ -172,7 +172,7 @@ public class PQGPUImagePlayerView: UIView {
         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)?.withRenderingMode(.alwaysTemplate)
-        view.tintColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+        view.tintColor = UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue)
         view.isHidden = true
         return view
 
@@ -237,7 +237,7 @@ public class PQGPUImagePlayerView: UIView {
         addSubview(playMaskView)
         addSubview(playView)
      
-        backgroundColor = PQBFConfig.shared.styleBackGroundColor
+        backgroundColor = BFConfig.shared.styleBackGroundColor
         playerEmptyView = UIImageView(frame: bounds)
         playerEmptyView.backgroundColor = .black
         playerEmptyView.image = UIImage.moduleImage(named: "playEmpty", moduleName: "BFFramework",isAssets: false)

BFFramework/Classes/Stuckpoint/ViewModel/PQPlayerViewModel.swift

@@ -9,6 +9,7 @@
 import RealmSwift
 import UIKit
 import BFCommonKit
+import BFUIKit
 
 open class PQPlayerViewModel: NSObject {
     /// 根据贴纸信息转成种 fitler ，编辑 ，总览，导出共用

BFFramework/Classes/Utils/PQThirdPlatformUtil.swift

@@ -155,7 +155,7 @@ public class PQSingletoWXApiUtil: NSObject {
                         targetPagePath = "user-videos"
                         isRhythmVideo = 0
                     }
-                    var params = (targetPagePath + "?id=\(videoId)&tp=share&rootPageSource=\(pageSource.rawValue)&shareDepth=1&rootLaunchShareId=\(shareId)&parentShareId=\(shareId)&shareId=\(shareId)&shareAppType=\(PQBFConfig.shared.appType)&mid=\(getMachineCode())&su=\(BFLoginUserInfo.shared.uid)&isRhythmVideo=\(isRhythmVideo)").addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)
+                    var params = (targetPagePath + "?id=\(videoId)&tp=share&rootPageSource=\(pageSource.rawValue)&shareDepth=1&rootLaunchShareId=\(shareId)&parentShareId=\(shareId)&shareId=\(shareId)&shareAppType=\(BFConfig.shared.appType)&mid=\(getMachineCode())&su=\(BFLoginUserInfo.shared.uid)&isRhythmVideo=\(isRhythmVideo)").addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed)
                     ["/", "=", "?", "&"].forEach { char in
                         let custom = CharacterSet(charactersIn: char).inverted
                         params = params?.addingPercentEncoding(withAllowedCharacters: custom) ?? ""

BFFramework/Classes/selectImage/PQImageCropVC.swift

@@ -126,7 +126,7 @@ class PQImageCropVC: BFBaseViewController, UIScrollViewDelegate {
     lazy var bottomView: UIView = {
         let bottomView = UIView(frame: CGRect(x: 0, y: cScreenHeigth - cDevice_iPhoneTabBarHei, width: cScreenWidth, height: cDevice_iPhoneTabBarHei))
         let deleteBtn = UIButton(frame: CGRect(x: cDefaultMargin, y: 0, width: cDevice_iPhoneTabBarHei, height: cDevice_iPhoneTabBarHei))
-        bottomView.backgroundColor = PQBFConfig.shared.styleBackGroundColor
+        bottomView.backgroundColor = BFConfig.shared.styleBackGroundColor
         deleteBtn.setImage(imageInUIKit(by: "icon_detail_back"), for: .normal)
         deleteBtn.addTarget(self, action: #selector(tappedClose), for: .touchUpInside)
 
@@ -146,7 +146,7 @@ class PQImageCropVC: BFBaseViewController, UIScrollViewDelegate {
         nextBtn.addTarget(self, action: #selector(tappedCrop), for: .touchUpInside)
         nextBtn.setTitleColor(UIColor.white, for: .normal)
         nextBtn.titleLabel?.font = UIFont.systemFont(ofSize: 16, weight: .medium)
-        nextBtn.backgroundColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+        nextBtn.backgroundColor = UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue)
         bottomView.addSubview(nextBtn)
 
         return bottomView

BFFramework/Classes/selectImage/PQUploadController.swift

@@ -138,7 +138,7 @@ class PQUploadController: BFBaseViewController {
        
         backBtn.setImage(UIImage.moduleImage(named: "icon_blanc_back", moduleName: "BFFramework",isAssets: false)?.withRenderingMode(.alwaysTemplate), for: .normal)
         backBtn.addTarget(self, action: #selector(backBtnClick), for: .touchUpInside)
-        backBtn.imageView?.tintColor = PQBFConfig.shared.styleTitleColor
+        backBtn.imageView?.tintColor = BFConfig.shared.styleTitleColor
         return backBtn
     }()
 
@@ -206,7 +206,7 @@ class PQUploadController: BFBaseViewController {
         } else {
             automaticallyAdjustsScrollViewInsets = false
         }
-        categoryCollectionView.backgroundColor = PQBFConfig.shared.editCoverimageSelectedbackgroundColor
+        categoryCollectionView.backgroundColor = BFConfig.shared.editCoverimageSelectedbackgroundColor
         return categoryCollectionView
     }()
 
@@ -249,11 +249,11 @@ class PQUploadController: BFBaseViewController {
         selecteBtn.setTitle("全部", for: .normal)
          
         selecteBtn.setImage(UIImage.moduleImage(named: "icon_uploadVideo_more", moduleName: "BFFramework",isAssets: false)?.withRenderingMode(.alwaysTemplate), for: .normal)
-        selecteBtn.setTitleColor( PQBFConfig.shared.styleTitleColor, for: .normal)
+        selecteBtn.setTitleColor( BFConfig.shared.styleTitleColor, for: .normal)
         selecteBtn.titleLabel?.font = UIFont.systemFont(ofSize: 16, weight: .medium)
         selecteBtn.tag = 2
         selecteBtn.imagePosition(at: PQButtonImageEdgeInsetsStyle.right, space: cDefaultMargin / 2)
-        selecteBtn.imageView?.tintColor = PQBFConfig.shared.styleTitleColor
+        selecteBtn.imageView?.tintColor = BFConfig.shared.styleTitleColor
         selecteBtn.addTarget(self, action: #selector(btnClick(sender:)), for: .touchUpInside)
         return selecteBtn
     }()
@@ -263,7 +263,7 @@ class PQUploadController: BFBaseViewController {
         deleteBtn.setImage(UIImage.moduleImage(named: "icon_blanc_back", moduleName: "BFFramework",isAssets: false)?.withRenderingMode(.alwaysTemplate), for: .normal)
         deleteBtn.tag = 1
         deleteBtn.addTarget(self, action: #selector(btnClick(sender:)), for: .touchUpInside)
-        deleteBtn.imageView?.tintColor = PQBFConfig.shared.styleTitleColor
+        deleteBtn.imageView?.tintColor = BFConfig.shared.styleTitleColor
         return deleteBtn
     }()
 
@@ -274,7 +274,7 @@ class PQUploadController: BFBaseViewController {
         nextBtn.titleLabel?.font = UIFont.systemFont(ofSize: 13, weight: .medium)
         nextBtn.tag = 3
         nextBtn.addTarget(self, action: #selector(btnClick(sender:)), for: .touchUpInside)
-        nextBtn.backgroundColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+        nextBtn.backgroundColor = UIColor.hexColor(hexadecimal: BFConfig.shared.styleColor.rawValue)
         nextBtn.setTitleColor(.white, for: .normal)
         return nextBtn
     }()
@@ -282,7 +282,7 @@ class PQUploadController: BFBaseViewController {
     lazy var bottomView: UIView = {
         let bottomView = UIView(frame: CGRect(x: 0, y: cDefaultMargin * 2, width: cScreenWidth, height: cDevice_iPhoneNavBarHei))
         bottomView.addSubview(selecteBtn)
-        bottomView.backgroundColor = PQBFConfig.shared.styleBackGroundColor
+        bottomView.backgroundColor = BFConfig.shared.styleBackGroundColor
         selecteBtn.center.y = nextBtn.center.y
         bottomView.addSubview(deleteBtn)
         bottomView.addSubview(nextBtn)
@@ -293,11 +293,11 @@ class PQUploadController: BFBaseViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
      
-        view.backgroundColor =  PQBFConfig.shared.editCoverimageSelectedbackgroundColor
-        navHeadImageView?.backgroundColor =  PQBFConfig.shared.editCoverimageSelectedbackgroundColor
-        lineView?.backgroundColor =  PQBFConfig.shared.editCoverimageSelectedbackgroundColor
+        view.backgroundColor =  BFConfig.shared.editCoverimageSelectedbackgroundColor
+        navHeadImageView?.backgroundColor =  BFConfig.shared.editCoverimageSelectedbackgroundColor
+        lineView?.backgroundColor =  BFConfig.shared.editCoverimageSelectedbackgroundColor
         addSubViews()
-        bottomView.backgroundColor = PQBFConfig.shared.editCoverimageSelectedbackgroundColor
+        bottomView.backgroundColor = BFConfig.shared.editCoverimageSelectedbackgroundColor
         loadLocalData()
  
     }