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

合并代码

BFCommonKit.podspec

@@ -5,7 +5,7 @@
 # Any lines starting with a # are optional, but their use is encouraged
 # To learn more about a Podspec see https://guides.cocoapods.org/syntax/podspec.html
 #
-
+# update framework 2021.11.1
 Pod::Spec.new do |s|
   s.name             = 'BFCommonKit'
   s.version          = '1.4.9'
@@ -39,7 +39,7 @@ TODO: Add long description of the pod here.
   s.subspec 'BFBase' do |bb|
     bb.source_files = 'BFCommonKit/Classes/BFBase/**/*'
     bb.frameworks = 'UIKit', 'WebKit'
-    bb.dependency 'Alamofire','5.4.3'
+    bb.dependency 'Alamofire','5.4.4'
     bb.dependency 'SnapKit','5.0.1'
     bb.dependency 'RealmSwift','10.7.6'
     bb.dependency 'FDFullscreenPopGesture','1.1'
@@ -60,9 +60,9 @@ TODO: Add long description of the pod here.
     uu.source_files = 'BFCommonKit/Classes/BFUtility/*'
     uu.frameworks = 'Foundation','UIKit','AdSupport','Photos','AudioToolbox','AVKit'
     uu.dependency 'KingfisherWebP','1.3.0'
-    uu.dependency 'Alamofire','5.4.3'
+    uu.dependency 'Alamofire','5.4.4'
     uu.dependency 'KeychainAccess','4.2.2'
-    uu.dependency 'Kingfisher','6.3.0'
+    uu.dependency 'Kingfisher','6.3.1'
     uu.dependency 'Toast-Swift','5.0.1'
     uu.dependency 'BFCommonKit/BFCategorys'
     uu.dependency 'BFCommonKit/BFConfig'

BFCommonKit/Classes/BFBase/Controller/PQBaseViewController.swift

@@ -159,7 +159,7 @@ open class PQBaseViewController: UIViewController, UIGestureRecognizerDelegate {
 
     deinit {
         PQNotification.removeObserver(self)
-        BFLog(message: "\(String(describing: type(of: self)))被销毁")
+        BFLog(message: "vc \(String(describing: type(of: self))) release \(String(format: "%p", self))")
     }
 
     override open var preferredStatusBarStyle: UIStatusBarStyle {

BFCommonKit/Classes/BFBase/View/BFUIButton.swift

@@ -0,0 +1,17 @@
+//
+//  BFUIButton.swift
+//  Alamofire
+//
+//  Created by ak on 2021/8/4.
+//  功能：默认扩大 btn 的点击范围
+
+import Foundation
+
+public class BFUIButton: UIButton {
+    //扩大点击范围 PX
+    var margin: CGFloat = 60
+    public override func point(inside point: CGPoint, with _: UIEvent?) -> Bool {
+        let area = bounds.insetBy(dx: -margin, dy: -margin) // 负值是方法响应范围
+        return area.contains(point)
+    }
+}

BFCommonKit/Classes/BFBase/View/BFUISlider.swift

@@ -0,0 +1,92 @@
+//
+//  BFSlider.swift
+//  BFFramework
+//
+//  Created by ak on 2021/8/4.
+//  功能：自定义 UISlider
+
+import Foundation
+
+public class BFUISlider: UISlider {
+    // slider的value文本
+    public var valueText: String? {
+        didSet {
+            valueLabel.text = valueText
+            valueLabel.sizeToFit()
+
+            let trackRect = convert(bounds, to: nil)
+            let thumbRectTemp = thumbRect(forBounds: bounds, trackRect: trackRect, value: value)
+            valueLabel.center = CGPoint(x: thumbRectTemp.origin.x - thumbRectTemp.origin.x + thumbRectTemp.size.width / 2, y: -self.frame.size.height)
+
+//            CGPointMake((thumbRect.origin.x - trackRect.origin.x + thumbRect.size.width / 2), -self.frame.size.height);
+
+//            [super trackRectForBounds:bounds];
+//           return CGRectMake(bounds.origin.x, bounds.origin.y + (bounds.size.height - 3.0) / 2, bounds.size.width, 3.0);
+        }
+    }
+
+    override public var value: Float {
+        didSet {
+            sliderValueChanged(sender: self)
+        }
+    }
+
+    // slider的value字体
+    public var valueFont: UIFont?
+    // slider的value文本颜色
+    public var valueTextColor: UIColor?
+
+    // 返回的数值是否为整形
+    public var valueIsInt: Bool = false
+
+    public lazy var valueLabel: UILabel = {
+        let valueLabel = UILabel()
+        valueLabel.text = "0"
+        valueLabel.textColor = valueTextColor != nil ? valueTextColor : self.thumbTintColor
+        valueLabel.font = valueFont != nil ? valueFont : UIFont.systemFont(ofSize: 14)
+        valueLabel.textAlignment = .center
+
+        return valueLabel
+
+    }()
+
+    override public init(frame: CGRect) {
+        super.init(frame: frame)
+        addTarget(self, action: #selector(sliderTouchDown(sender:)), for: .touchDown)
+        addTarget(self, action: #selector(sliderValueChanged(sender:)), for: .valueChanged)
+        addTarget(self, action: #selector(sliderTouchUpInside(sender:)), for: .touchUpInside)
+    }
+
+    public required init?(coder _: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    override public func layoutSubviews() {
+        super.layoutSubviews()
+        addSubview(valueLabel)
+        sliderValueChanged(sender: self)
+    }
+
+    override public func setValue(_ value: Float, animated: Bool) {
+        super.setValue(value, animated: animated)
+        sliderValueChanged(sender: self)
+    }
+
+    // 重写方法-返回进度条的bounds-修改进度条的高度
+    override public func trackRect(forBounds bounds: CGRect) -> CGRect {
+        let bounds = super.trackRect(forBounds: bounds)
+        return CGRect(origin: CGPoint(x: bounds.origin.x, y: bounds.origin.y + (bounds.size.height - 3.0) / 2), size: CGSize(width: bounds.size.width, height: 3))
+    }
+
+    @objc public func sliderTouchDown(sender _: BFUISlider) {}
+
+    @objc public func sliderValueChanged(sender: BFUISlider) {
+        if valueIsInt {
+            valueText = "\(Int(sender.value))x"
+        } else {
+            valueText = "\(sender.value.decimalString())x"
+        }
+    }
+
+    @objc public func sliderTouchUpInside(sender _: BFUISlider) {}
+}

BFCommonKit/Classes/BFBase/View/NXBadgeView/NXBadgeControl.swift

@@ -0,0 +1,114 @@
+//
+//  NXBadgeControl.swift
+//  NXFramework-Swift
+//
+//  Created by ak on 2020/11/11.
+//
+
+
+import UIKit
+
+
+open class NXBadgeControl: UIControl {
+    
+    /// 记录Badge的偏移量 Record the offset of Badge
+    public var offset: CGPoint = CGPoint(x: 0, y: 0)
+    
+    /// Badge伸缩的方向, Default is NXBadgeViewFlexModeTail
+    public var flexMode: NXBadgeViewFlexMode = .tail
+    
+    private lazy var textLabel: UILabel = UILabel()
+    
+    private lazy var imageView: UIImageView = UIImageView()
+    
+    private var badgeViewColor: UIColor?
+    private var badgeViewHeightConstraint: NSLayoutConstraint?
+    
+    public class func `default`() -> Self {
+        return self.init(frame: .zero)
+    }
+    
+    required override public init(frame: CGRect) {
+        super.init(frame: frame)
+        setupSubviews()
+    }
+    
+    required public init?(coder aDecoder: NSCoder) {
+        super.init(coder: aDecoder)
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    /// Set Text
+    open var text: String? {
+        didSet {
+            textLabel.text = text
+        }
+    }
+    
+    /// Set AttributedText
+    open var attributedText: NSAttributedString? {
+        didSet {
+            textLabel.attributedText = attributedText
+        }
+    }
+    
+    /// Set Font
+    open var font: UIFont? {
+        didSet {
+            textLabel.font = font
+        }
+    }
+    
+    /// Set background image
+    open var backgroundImage: UIImage? {
+        didSet {
+            imageView.image = backgroundImage
+            if let _ = backgroundImage {
+                if let constraint = heightConstraint() {
+                    badgeViewHeightConstraint = constraint
+                    removeConstraint(constraint)
+                }
+                backgroundColor = UIColor.clear
+            } else {
+                if heightConstraint() == nil, let constraint = badgeViewHeightConstraint {
+                    addConstraint(constraint)
+                }
+                backgroundColor = badgeViewColor
+            }
+        }
+    }
+    
+    open override var backgroundColor: UIColor? {
+        didSet {
+            super.backgroundColor = backgroundColor
+            if let color = backgroundColor, color != .clear {
+                badgeViewColor = backgroundColor
+            }
+        }
+    }
+    
+    private func setupSubviews() {
+        layer.masksToBounds = true
+        layer.cornerRadius = 9.0
+        translatesAutoresizingMaskIntoConstraints = false
+        backgroundColor = UIColor.red
+        textLabel.textColor = UIColor.white
+        textLabel.font = UIFont.systemFont(ofSize: 13)
+        textLabel.textAlignment = .center
+        addSubview(textLabel)
+        addSubview(imageView)
+        addLayout(with: imageView, leading: 0, trailing: 0)
+        addLayout(with: textLabel, leading: 5, trailing: -5)
+    }
+    
+    private func addLayout(with view: UIView, leading: CGFloat, trailing: CGFloat) {
+        view.translatesAutoresizingMaskIntoConstraints = false
+        let topConstraint = NSLayoutConstraint(item: view, attribute: .top, relatedBy: .equal, toItem: self, attribute: .top, multiplier: 1.0, constant: 0)
+        let leadingConstraint = NSLayoutConstraint(item: view, attribute: .leading, relatedBy: .equal, toItem: self, attribute: .leading, multiplier: 1.0, constant: leading)
+        let bottomConstraint = NSLayoutConstraint(item: view, attribute: .bottom, relatedBy: .equal, toItem: self, attribute: .bottom, multiplier: 1.0, constant: 0)
+        let trailingConstraint = NSLayoutConstraint(item: view, attribute: .trailing, relatedBy: .equal, toItem: self, attribute: .trailing, multiplier: 1.0, constant: trailing)
+        leadingConstraint.priority = UILayoutPriority(rawValue: 999)
+        trailingConstraint.priority = UILayoutPriority(rawValue: 999)
+        addConstraints([topConstraint, leadingConstraint, bottomConstraint, trailingConstraint])
+    }
+}

BFCommonKit/Classes/BFBase/View/NXBadgeView/NXBadgeView.swift

@@ -0,0 +1,28 @@
+//
+//  NXBadgeView.swift.swift
+//  NXFramework-Swift
+//
+//  Created by ak on 2020/11/11.
+//
+
+
+import UIKit
+
+public struct NX<Base> {
+    public let base: Base
+    public init(_ base: Base) {
+        self.base = base
+    }
+}
+
+public extension NSObjectProtocol {
+    var nx: NX<Self> {
+        return NX(self)
+    }
+}
+
+public enum NXBadgeViewFlexMode {
+    case head    // 左伸缩 Head Flex    : <==●
+    case tail    // 右伸缩 Tail Flex    : ●==>
+    case middle  // 左右伸缩 Middle Flex : <=●=>
+}

BFCommonKit/Classes/BFBase/View/NXBadgeView/UIBarButtonItem+NXBadgeView.swift

@@ -0,0 +1,125 @@
+//
+//  UIBarButtonItem+NXBadgeView.swift
+//  NXFramework-Swift
+//
+//  Created by ak on 2020/11/11.
+//
+
+import UIKit
+
+public extension NX where Base: UIBarButtonItem {
+    
+    public var badgeView: NXBadgeControl {
+        return _bottomView.nx.badgeView
+    }
+    
+    /// 添加带文本内容的Badge, 默认右上角, 红色, 18pts
+    ///
+    /// Add Badge with text content, the default upper right corner, red backgroundColor, 18pts
+    ///
+    /// - Parameter text: 文本字符串
+     public  func addBadge(text: String) {
+        _bottomView.nx.addBadge(text: text)
+    }
+    
+    /// 添加带数字的Badge, 默认右上角,红色,18pts
+    ///
+    /// Add the Badge with numbers, the default upper right corner, red backgroundColor, 18pts
+    ///
+    /// - Parameter number: 整形数字
+     public  func addBadge(number: Int) {
+        _bottomView.nx.addBadge(number: number)
+    }
+    
+    /// 添加带颜色的小圆点, 默认右上角, 红色, 8pts
+    ///
+    /// Add small dots with color, the default upper right corner, red backgroundColor, 8pts
+    ///
+    /// - Parameter color: 颜色
+     public  func addDot(color: UIColor?) {
+        _bottomView.nx.addDot(color: color)
+    }
+    
+    /// 设置Badge的偏移量, Badge中心点默认为其父视图的右上角
+    ///
+    /// Set Badge offset, Badge center point defaults to the top right corner of its parent view
+    ///
+    /// - Parameters:
+    ///   - x: X轴偏移量 (x<0: 左移, x>0: 右移) axis offset (x <0: left, x> 0: right)
+    ///   - y: Y轴偏移量 (y<0: 上移, y>0: 下移) axis offset (Y <0: up,   y> 0: down)
+     public  func moveBadge(x: CGFloat, y: CGFloat) {
+        _bottomView.nx.moveBadge(x: x, y: y)
+    }
+    
+    /// 设置Badge伸缩的方向
+    ///
+    /// Setting the direction of Badge expansion
+    ///
+    /// NXBadgeViewFlexModeHead,    左伸缩 Head Flex    : <==●
+    /// NXBadgeViewFlexModeTail,    右伸缩 Tail Flex    : ●==>
+    /// NXBadgeViewFlexModeMiddle   左右伸缩 Middle Flex : <=●=>
+    /// - Parameter flexMode : Default is PPBadgeViewFlexModeTail
+     public  func setBadge(flexMode: NXBadgeViewFlexMode = .tail) {
+        _bottomView.nx.setBadge(flexMode: flexMode)
+    }
+    
+    /// 设置Badge的高度,因为Badge宽度是动态可变的,通过改变Badge高度,其宽度也按比例变化,方便布局
+    ///
+    /// (注意: 此方法需要将Badge添加到控件上后再调用!!!)
+    ///
+    /// Set the height of Badge, because the Badge width is dynamically and  variable.By changing the Badge height in proportion to facilitate the layout.
+    ///
+    /// (Note: this method needs to add Badge to the controls and then use it !!!)
+    ///
+    /// - Parameter points: 高度大小
+     public  func setBadge(height: CGFloat) {
+        _bottomView.nx.setBadge(height: height)
+    }
+    
+    /// 显示Badge
+     public  func showBadge() {
+        _bottomView.nx.showBadge()
+    }
+    
+    /// 隐藏Badge
+     public  func hiddenBadge() {
+        _bottomView.nx.hiddenBadge()
+    }
+    
+    // MARK: - 数字增加/减少, 注意:以下方法只适用于Badge内容为纯数字的情况
+    // MARK: - Digital increase /decrease, note: the following method applies only to cases where the Badge content is purely numeric
+    /// badge数字加1
+     public  func increase() {
+        _bottomView.nx.increase()
+    }
+    
+    /// badge数字加number
+     public  func increaseBy(number: Int) {
+        _bottomView.nx.increaseBy(number: number)
+    }
+    
+    /// badge数字加1
+     public  func decrease() {
+        _bottomView.nx.decrease()
+    }
+    
+    /// badge数字减number
+     public  func decreaseBy(number: Int) {
+        _bottomView.nx.decreaseBy(number: number)
+    }
+
+    /// 通过Xcode视图调试工具找到UIBarButtonItem的Badge所在父视图为:UIImageView
+    private var _bottomView: UIView {
+        let navigationButton = (self.base.value(forKey: "_view") as? UIView) ?? UIView()
+        let systemVersion = (UIDevice.current.systemVersion as NSString).doubleValue
+        let controlName = (systemVersion < 11.0 ? "UIImageView" : "UIButton" )
+        for subView in navigationButton.subviews {
+            if subView.isKind(of: NSClassFromString(controlName)!) {
+                subView.layer.masksToBounds = false
+                return subView
+            }
+        }
+        return navigationButton
+    }
+}
+

BFCommonKit/Classes/BFBase/View/NXBadgeView/UITabBarItem+NXBadgeView.swift

@@ -0,0 +1,126 @@
+
+//
+//  UITabBarItem+NXBadgeView.swift
+//  NXFramework-Swift
+//
+//  Created by ak on 2020/11/11.
+//
+
+import Foundation
+
+public extension NX where Base: UITabBarItem {
+    
+    var badgeView: NXBadgeControl {
+        return _bottomView.nx.badgeView
+    }
+    
+    /// 添加带文本内容的Badge, 默认右上角, 红色, 18pts
+    ///
+    /// Add Badge with text content, the default upper right corner, red backgroundColor, 18pts
+    ///
+    /// - Parameter text: 文本字符串
+    func addBadge(text: String) {
+        _bottomView.nx.addBadge(text: text)
+        _bottomView.nx.moveBadge(x: 4, y: 3)
+    }
+    
+    /// 添加带数字的Badge, 默认右上角,红色,18pts
+    ///
+    /// Add the Badge with numbers, the default upper right corner, red backgroundColor, 18pts
+    ///
+    /// - Parameter number: 整形数字
+    func addBadge(number: Int) {
+        _bottomView.nx.addBadge(number: number)
+        _bottomView.nx.moveBadge(x: 4, y: 3)
+    }
+    
+    /// 添加带颜色的小圆点, 默认右上角, 红色, 8pts
+    ///
+    /// Add small dots with color, the default upper right corner, red backgroundColor, 8pts
+    ///
+    /// - Parameter color: 颜色
+    func addDot(color: UIColor?) {
+        _bottomView.nx.addDot(color: color)
+    }
+    
+    /// 设置Badge的偏移量, Badge中心点默认为其父视图的右上角
+    ///
+    /// Set Badge offset, Badge center point defaults to the top right corner of its parent view
+    ///
+    /// - Parameters:
+    ///   - x: X轴偏移量 (x<0: 左移, x>0: 右移) axis offset (x <0: left, x> 0: right)
+    ///   - y: Y轴偏移量 (y<0: 上移, y>0: 下移) axis offset (Y <0: up,   y> 0: down)
+    func moveBadge(x: CGFloat, y: CGFloat) {
+        _bottomView.nx.moveBadge(x: x, y: y)
+    }
+    
+    /// 设置Badge伸缩的方向
+    ///
+    /// Setting the direction of Badge expansion
+    ///
+    /// PPBadgeViewFlexModeHead,    左伸缩 Head Flex    : <==●
+    /// PPBadgeViewFlexModeTail,    右伸缩 Tail Flex    : ●==>
+    /// PPBadgeViewFlexModeMiddle   左右伸缩 Middle Flex : <=●=>
+    /// - Parameter flexMode : Default is PPBadgeViewFlexModeTail
+    func setBadge(flexMode: NXBadgeViewFlexMode = .tail) {
+        _bottomView.nx.setBadge(flexMode: flexMode)
+    }
+    
+    /// 设置Badge的高度,因为Badge宽度是动态可变的,通过改变Badge高度,其宽度也按比例变化,方便布局
+    ///
+    /// (注意: 此方法需要将Badge添加到控件上后再调用!!!)
+    ///
+    /// Set the height of Badge, because the Badge width is dynamically and  variable.By changing the Badge height in proportion to facilitate the layout.
+    ///
+    /// (Note: this method needs to add Badge to the controls and then use it !!!)
+    ///
+    /// - Parameter height: 高度大小
+    func setBadge(height: CGFloat) {
+        _bottomView.nx.setBadge(height: height)
+    }
+    
+    
+    /// 显示Badge
+    func showBadge() {
+        _bottomView.nx.showBadge()
+    }
+    
+    /// 隐藏Badge
+    func hiddenBadge() {
+        _bottomView.nx.hiddenBadge()
+    }
+    
+    // MARK: - 数字增加/减少, 注意:以下方法只适用于Badge内容为纯数字的情况
+    // MARK: - Digital increase /decrease, note: the following method applies only to cases where the Badge content is purely numeric
+    /// badge数字加1
+    func increase() {
+        _bottomView.nx.increase()
+    }
+    
+    /// badge数字加number
+    func increaseBy(number: Int) {
+        _bottomView.nx.increaseBy(number: number)
+    }
+    
+    /// badge数字加1
+    func decrease() {
+        _bottomView.nx.decrease()
+    }
+    
+    /// badge数字减number
+    func decreaseBy(number: Int) {
+        _bottomView.nx.decreaseBy(number: number)
+    }
+    
+    /// 通过Xcode视图调试工具找到UITabBarItem原生Badge所在父视图
+    private var _bottomView: UIView {
+        let tabBarButton = (self.base.value(forKey: "_view") as? UIView) ?? UIView()
+        for subView in tabBarButton.subviews {
+            guard let superclass = subView.superclass else { return tabBarButton }
+            if superclass == NSClassFromString("UIImageView") {
+                return subView
+            }
+        }
+        return tabBarButton
+    }
+}

BFCommonKit/Classes/BFBase/View/NXBadgeView/UIView+NXBadgeView.swift

@@ -0,0 +1,260 @@
+//
+//  UIView+NXBadgeView.swift
+//  NXFramework-Swift
+//
+//  Created by ak on 2020/11/11.
+//
+
+import UIKit
+
+private var kBadgeView = "kNXBadgeView"
+
+// MARK: - add Badge
+public extension NX where Base: UIView {
+    
+    var badgeView: NXBadgeControl {
+        return base.badgeView
+    }
+    
+    /// 添加带文本内容的Badge, 默认右上角, 红色, 18pts
+    ///
+    /// Add Badge with text content, the default upper right corner, red backgroundColor, 18pts
+    ///
+    /// - Parameter text: 文本字符串
+    func addBadge(text: String?) {
+        showBadge()
+        base.badgeView.text = text
+        setBadge(flexMode: base.badgeView.flexMode)
+        if text == nil {
+            if base.badgeView.widthConstraint()?.relation == .equal { return }
+            base.badgeView.widthConstraint()?.isActive = false
+            let constraint = NSLayoutConstraint(item: base.badgeView, attribute: .width, relatedBy: .equal, toItem: base.badgeView, attribute: .height, multiplier: 1.0, constant: 0)
+            base.badgeView.addConstraint(constraint)
+        } else {
+            if base.badgeView.widthConstraint()?.relation == .greaterThanOrEqual { return }
+            base.badgeView.widthConstraint()?.isActive = false
+            let constraint = NSLayoutConstraint(item: base.badgeView, attribute: .width, relatedBy: .greaterThanOrEqual, toItem: base.badgeView, attribute: .height, multiplier: 1.0, constant: 0)
+            base.badgeView.addConstraint(constraint)
+        }
+    }
+    
+    /// 添加带数字的Badge, 默认右上角,红色,18pts
+    ///
+    /// Add the Badge with numbers, the default upper right corner, red backgroundColor, 18pts
+    ///
+    /// - Parameter number: 整形数字
+    func addBadge(number: Int) {
+        if number <= 0 {
+            addBadge(text: "0")
+            hiddenBadge()
+            return
+        }
+        addBadge(text: "\(number)")
+    }
+    
+    /// 添加带颜色的小圆点, 默认右上角, 红色, 8pts
+    ///
+    /// Add small dots with color, the default upper right corner, red backgroundColor, 8pts
+    ///
+    /// - Parameter color: 颜色
+    func addDot(color: UIColor? = .red) {
+        addBadge(text: nil)
+        setBadge(height: 8.0)
+        base.badgeView.backgroundColor = color
+    }
+    
+    /// 设置Badge的偏移量, Badge中心点默认为其父视图的右上角
+    ///
+    /// Set Badge offset, Badge center point defaults to the top right corner of its parent view
+    ///
+    /// - Parameters:
+    ///   - x: X轴偏移量 (x<0: 左移, x>0: 右移) axis offset (x <0: left, x> 0: right)
+    ///   - y: Y轴偏移量 (y<0: 上移, y>0: 下移) axis offset (Y <0: up,   y> 0: down)
+    func moveBadge(x: CGFloat, y: CGFloat) {
+        base.badgeView.offset = CGPoint(x: x, y: y)
+        base.centerYConstraint(with: base.badgeView)?.constant = y
+        
+        let badgeHeight = base.badgeView.heightConstraint()?.constant ?? 0
+        switch base.badgeView.flexMode {
+        case .head:
+            base.centerXConstraint(with: base.badgeView)?.isActive = false
+            base.leadingConstraint(with: base.badgeView)?.isActive = false
+            if let constraint = base.trailingConstraint(with: base.badgeView) {
+                constraint.constant = badgeHeight * 0.5 + x
+                return
+            }
+            let trailingConstraint = NSLayoutConstraint(item: base.badgeView, attribute: .trailing, relatedBy: .equal, toItem: base, attribute: .trailing, multiplier: 1.0, constant: badgeHeight * 0.5 + x)
+            base.addConstraint(trailingConstraint)
+            
+        case .tail:
+            base.centerXConstraint(with: base.badgeView)?.isActive = false
+            base.trailingConstraint(with: base.badgeView)?.isActive = false
+            if let constraint = base.leadingConstraint(with: base.badgeView) {
+                constraint.constant = x - badgeHeight * 0.5
+                return
+            }
+            let leadingConstraint = NSLayoutConstraint(item: base.badgeView, attribute: .leading, relatedBy: .equal, toItem: base, attribute: .trailing, multiplier: 1.0, constant: x - badgeHeight * 0.5)
+            base.addConstraint(leadingConstraint)
+            
+        case .middle:
+            base.leadingConstraint(with: base.badgeView)?.isActive = false
+            base.trailingConstraint(with: base.badgeView)?.isActive = false
+            base.centerXConstraint(with: base.badgeView)?.constant = x
+            if let constraint = base.centerXConstraint(with: base.badgeView) {
+                constraint.constant = x
+                return
+            }
+            let centerXConstraint = NSLayoutConstraint(item: base.badgeView, attribute: .centerX, relatedBy: .equal, toItem: base, attribute: .centerX, multiplier: 1.0, constant: x)
+            base.addConstraint(centerXConstraint)
+        }
+    }
+    
+    /// 设置Badge伸缩的方向
+    ///
+    /// Setting the direction of Badge expansion
+    ///
+    /// NXBadgeViewFlexModeHead,    左伸缩 Head Flex    : <==●
+    /// NXBadgeViewFlexModeTail,    右伸缩 Tail Flex    : ●==>
+    /// NXBadgeViewFlexModeMiddle   左右伸缩 Middle Flex : <=●=>
+    /// - Parameter flexMode : Default is PPBadgeViewFlexModeTail
+    func setBadge(flexMode: NXBadgeViewFlexMode = .tail) {
+        base.badgeView.flexMode = flexMode
+        moveBadge(x: base.badgeView.offset.x, y: base.badgeView.offset.y)
+    }
+    
+    /// 设置Badge的高度,因为Badge宽度是动态可变的,通过改变Badge高度,其宽度也按比例变化,方便布局
+    ///
+    /// (注意: 此方法需要将Badge添加到控件上后再调用!!!)
+    ///
+    /// Set the height of Badge, because the Badge width is dynamically and  variable.By changing the Badge height in proportion to facilitate the layout.
+    ///
+    /// (Note: this method needs to add Badge to the controls and then use it !!!)
+    ///
+    /// - Parameter height: 高度大小
+    func setBadge(height: CGFloat) {
+        base.badgeView.layer.cornerRadius = height * 0.5
+        base.badgeView.heightConstraint()?.constant = height
+        moveBadge(x: base.badgeView.offset.x, y: base.badgeView.offset.y)
+    }
+    
+    /// 显示Badge
+    func showBadge() {
+        base.badgeView.isHidden = false
+    }
+    
+    /// 隐藏Badge
+    func hiddenBadge() {
+        base.badgeView.isHidden = true
+    }
+    
+    // MARK: - 数字增加/减少, 注意:以下方法只适用于Badge内容为纯数字的情况
+    // MARK: - Digital increase /decrease, note: the following method applies only to cases where the Badge content is purely numeric
+    /// badge数字加1
+    func increase() {
+        increaseBy(number: 1)
+    }
+    
+    /// badge数字加number
+    func increaseBy(number: Int) {
+        let label = base.badgeView
+        let result = (Int(label.text ?? "0") ?? 0) + number
+        if result > 0 {
+            showBadge()
+        }
+        label.text = "\(result)"
+    }
+    
+    /// badge数字加1
+    func decrease() {
+        decreaseBy(number: 1)
+    }
+    
+    /// badge数字减number
+    func decreaseBy(number: Int) {
+        let label = base.badgeView
+        let result = (Int(label.text ?? "0") ?? 0) - number
+        if (result <= 0) {
+            hiddenBadge()
+            label.text = "0"
+            return
+        }
+        label.text = "\(result)"
+    }
+}
+
+extension UIView {
+    
+      public  func addBadgeViewLayoutConstraint() {
+        badgeView.translatesAutoresizingMaskIntoConstraints = false
+        let centerXConstraint = NSLayoutConstraint(item: badgeView, attribute: .centerX, relatedBy: .equal, toItem: self, attribute: .trailing, multiplier: 1.0, constant: 0)
+        let centerYConstraint = NSLayoutConstraint(item: badgeView, attribute: .centerY, relatedBy: .equal, toItem: self, attribute: .top, multiplier: 1.0, constant: 0)
+        let widthConstraint = NSLayoutConstraint(item: badgeView, attribute: .width, relatedBy: .greaterThanOrEqual, toItem: badgeView, attribute: .height, multiplier: 1.0, constant: 0)
+        let heightConstraint = NSLayoutConstraint(item: badgeView, attribute: .height, relatedBy: .equal, toItem: nil, attribute: .notAnAttribute, multiplier: 1.0, constant: 18)
+        addConstraints([centerXConstraint, centerYConstraint])
+        badgeView.addConstraints([widthConstraint, heightConstraint])
+    }
+}
+
+// MARK: - getter/setter
+extension UIView {
+
+    public var badgeView: NXBadgeControl {
+        get {
+            if let aValue = objc_getAssociatedObject(self, &kBadgeView) as? NXBadgeControl {
+                return aValue
+            }
+            else {
+                let badgeControl = NXBadgeControl.default()
+                self.addSubview(badgeControl)
+                self.bringSubviewToFront(badgeControl)
+                self.badgeView = badgeControl
+                self.addBadgeViewLayoutConstraint()
+                return badgeControl
+            }
+        }
+        set {
+            objc_setAssociatedObject(self, &kBadgeView, newValue, objc_AssociationPolicy.OBJC_ASSOCIATION_RETAIN_NONATOMIC)
+        }
+    }
+    
+       public  func topConstraint(with item: AnyObject?) -> NSLayoutConstraint? {
+        return constraint(with: item, attribute: .top)
+    }
+    
+       public  func leadingConstraint(with item: AnyObject?) -> NSLayoutConstraint? {
+        return constraint(with: item, attribute: .leading)
+    }
+    
+       public  func bottomConstraint(with item: AnyObject?) -> NSLayoutConstraint? {
+        return constraint(with: item, attribute: .bottom)
+    }
+
+       public  func trailingConstraint(with item: AnyObject?) -> NSLayoutConstraint? {
+        return constraint(with: item, attribute: .trailing)
+    }
+    
+       public  func widthConstraint() -> NSLayoutConstraint? {
+        return constraint(with: self, attribute: .width)
+    }
+    
+       public  func heightConstraint() -> NSLayoutConstraint? {
+        return constraint(with: self, attribute: .height)
+    }
+
+       public  func centerXConstraint(with item: AnyObject?) -> NSLayoutConstraint? {
+        return constraint(with: item, attribute: .centerX)
+    }
+    
+       public  func centerYConstraint(with item: AnyObject?) -> NSLayoutConstraint? {
+        return constraint(with: item, attribute: .centerY)
+    }
+    
+       public  func constraint(with item: AnyObject?, attribute: NSLayoutConstraint.Attribute) -> NSLayoutConstraint? {
+        for constraint in constraints {
+            if let isSame = constraint.firstItem?.isEqual(item), isSame, constraint.firstAttribute == attribute {
+                return constraint
+            }
+        }
+        return nil
+    }
+}

BFCommonKit/Classes/BFBase/View/PQLoadingHUB.swift

@@ -102,7 +102,7 @@ public class PQLoadingHUB: NSObject {
                     window?.addSubview(loadingHUB)
                 }
              
-                loadingHUB.center = window?.center as! CGPoint
+                loadingHUB.center = window?.center ?? CGPoint.zero
                 loadingHUB.loading()
                 self?.isLoading = true
             }

BFCommonKit/Classes/BFBase/View/bubbleLayer/NXBubbleLayer.swift

@@ -0,0 +1,166 @@
+//
+//  NXBubbleLayer.swift
+//  bubbleLayer_swift
+//
+//  Created by liuming on 2020/8/23.
+//  Copyright © 2020 liuming. All rights reserved.
+//
+
+import UIKit
+// 箭头方向枚举
+public enum ArrowDirection: Int {
+    case right = 0 // 指向右边, 即在圆角矩形的右边
+    case bottom = 1 // 指向下边
+    case left = 2 // 指向左边
+    case top = 3 // 指向上边
+}
+
+class NXBubbleLayer: NSObject {
+    // 矩形的圆角的半径
+    var cornerRadius: CGFloat = 8
+    // 箭头位置的圆角半径
+    var arrowRadius: CGFloat = 3
+    // 箭头的高度
+    var arrowHeight: CGFloat = 12
+    // 箭头的宽度
+    var arrowWidth: CGFloat = 30
+    // 箭头方向
+    var arrowDirection: ArrowDirection = .bottom
+    // 箭头的相对位置
+    var arrowPosition: CGFloat = 0.5
+    // 这里的size是需要mask成气泡形状的view的size
+    public var size: CGSize = CGSize.zero
+
+    /// 气泡layer 在视图层的位置
+    public var bubbleLayerRect: CGRect = .zero
+
+    init(originalSize: CGSize) {
+        size = originalSize
+    }
+
+    // 最终拿这个layer去设置mask
+    func layer() -> CAShapeLayer {
+        let layer = CAShapeLayer()
+        layer.path = bubblePath()
+        return layer
+    }
+
+    // 绘制气泡形状,获取path
+    func bubblePath() -> CGPath? {
+        UIGraphicsBeginImageContextWithOptions(size, false, 0.0)
+        let ctx = UIGraphicsGetCurrentContext()
+
+        // 获取绘图所需要的关键点
+        let points = keyPoints()
+
+        // 第一步是要画箭头的“第一个支点”所在的那个角，所以要把“笔”放在这个支点顺时针顺序的上一个点
+        // 所以把“笔”放在最后才画的矩形框的角的位置, 准备开始画箭头
+        let currentPoint = points[6]
+        ctx?.move(to: currentPoint)
+
+        // 用于 CGContextAddArcToPoint函数的变量
+        var pointA = CGPoint.zero
+        var pointB = CGPoint.zero
+        var radius: CGFloat = 0
+        var count: Int = 0
+
+        while count < 7 {
+            // 整个过程需要画七个圆角(矩形框的四个角和箭头处的三个角)，所以分为七个步骤
+
+            // 箭头处的三个圆角和矩形框的四个圆角不一样
+            radius = count < 3 ? arrowRadius : cornerRadius
+
+            pointA = points[count]
+            pointB = points[(count + 1) % 7]
+            // 画矩形框最后一个角的时候，pointB就是points[0]
+
+            ctx?.addArc(tangent1End: pointA, tangent2End: pointB, radius: radius)
+
+            count = count + 1
+        }
+
+        ctx?.closePath()
+        UIGraphicsEndImageContext()
+
+        return ctx?.path?.copy()
+    }
+
+    // 关键点: 绘制气泡形状前，需要计算箭头的三个点和矩形的四个角的点的坐标
+    func keyPoints() -> [CGPoint] {
+        // 先确定箭头的三个点
+        var beginPoint = CGPoint.zero // 按顺时针画箭头时的第一个支点，例如箭头向上时的左边的支点
+        var topPoint = CGPoint.zero // 顶点
+        var endPoint = CGPoint.zero // 另外一个支点
+
+        // 箭头顶点topPoint的X坐标(或Y坐标)的范围（用来计算arrowPosition）
+        let tpXRange = size.width - 2 * cornerRadius - arrowWidth
+        let tpYRange = size.height - 2 * cornerRadius - arrowWidth
+
+        // 用于表示矩形框的位置和大小
+        var rX: CGFloat = 0
+        var rY: CGFloat = 0
+        var rWidth = size.width
+        var rHeight = size.height
+
+        // 计算箭头的位置，以及调整矩形框的位置和大小
+        switch arrowDirection {
+        case .right: // 箭头在右时
+            topPoint = CGPoint(x: size.width, y: size.height / 2 + tpYRange * (arrowPosition - 0.5))
+            beginPoint = CGPoint(x: topPoint.x - arrowHeight, y: topPoint.y - arrowWidth / 2)
+            endPoint = CGPoint(x: beginPoint.x, y: beginPoint.y + arrowWidth)
+
+            rWidth = rWidth - arrowHeight // 矩形框右边的位置“腾出”给箭头
+
+        case .bottom: // 箭头在下时
+            topPoint = CGPoint(x: size.width / 2 + tpXRange * (arrowPosition - 0.5), y: size.height)
+            beginPoint = CGPoint(x: topPoint.x + arrowWidth / 2, y: topPoint.y - arrowHeight)
+            endPoint = CGPoint(x: beginPoint.x - arrowWidth, y: beginPoint.y)
+
+            rHeight = rHeight - arrowHeight
+
+        case .left: // 箭头在左时
+            topPoint = CGPoint(x: 0, y: size.height / 2 + tpYRange * (arrowPosition - 0.5))
+            beginPoint = CGPoint(x: topPoint.x + arrowHeight, y: topPoint.y + arrowWidth / 2)
+            endPoint = CGPoint(x: beginPoint.x, y: beginPoint.y - arrowWidth)
+
+            rX = arrowHeight
+            rWidth = rWidth - arrowHeight
+
+        case .top: // 箭头在上时
+            topPoint = CGPoint(x: size.width / 2 + tpXRange * (arrowPosition - 0.5), y: 0)
+            beginPoint = CGPoint(x: topPoint.x - arrowWidth / 2, y: topPoint.y + arrowHeight)
+            endPoint = CGPoint(x: beginPoint.x + arrowWidth, y: beginPoint.y)
+
+            rY = arrowHeight
+            rHeight = rHeight - arrowHeight
+
+        default:
+            ()
+        }
+        bubbleLayerRect = CGRect(x: rX, y: rY, width: rWidth, height: rHeight)
+        // 先把箭头的三个点放进关键点数组中
+        var points = [beginPoint, topPoint, endPoint]
+
+        // 确定圆角矩形的四个点
+        let bottomRight = CGPoint(x: rX + rWidth, y: rY + rHeight) // 右下角的点
+        let bottomLeft = CGPoint(x: rX, y: rY + rHeight)
+        let topLeft = CGPoint(x: rX, y: rY)
+        let topRight = CGPoint(x: rX + rWidth, y: rY)
+
+        // 先放在一个临时数组, 放置顺序跟下面紧接着的操作有关
+        let rectPoints = [bottomRight, bottomLeft, topLeft, topRight]
+
+        // 绘制气泡形状的时候，从箭头开始,顺时针地进行
+        // 箭头向右时，画完箭头之后会先画到矩形框的右下角
+        // 所以此时先把矩形框右下角的点放进关键点数组,其他三个点按顺时针方向添加
+        // 箭头在其他方向时，以此类推
+
+        var rectPointIndex: Int = arrowDirection.rawValue
+        for _ in 0...3 {
+            points.append(rectPoints[rectPointIndex])
+            rectPointIndex = (rectPointIndex + 1) % 4
+        }
+
+        return points
+    }
+}

BFCommonKit/Classes/BFBase/View/bubbleLayer/NXContainView.swift

@@ -0,0 +1,23 @@
+//
+//  NXContainView.swift
+//  bubbleLayer_swift
+//
+//  Created by liuming on 2020/9/1.
+//  Copyright © 2020 liuming. All rights reserved.
+//
+
+import UIKit
+public class NXBubbleContainView: UIView {
+    override public func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
+        var view = super.hitTest(point, with: event)
+        if view == nil {
+            subviews.forEach { subView in
+                let p = subView.convert(point, from: self)
+                if subView.bounds.contains(p) {
+                    view = subView
+                }
+            }
+        }
+        return view
+    }
+}

BFCommonKit/Classes/BFBase/View/bubbleLayer/NXInteractiveView.swift

@@ -0,0 +1,73 @@
+//
+//  NXInteractiveView.swift
+//  bubbleLayer_swift
+//
+//  Created by liuming on 2020/8/23.
+//  Copyright © 2020 liuming. All rights reserved.
+//
+
+import UIKit
+public class NXInteractiveView: UIView {
+    public var tapGestureRecognizer: UITapGestureRecognizer?
+    public var longPressGestureRecognizer: UILongPressGestureRecognizer?
+    // 点击回调
+    public var tapGestureHander: (() -> Void)?
+    // 长按回调
+    public var longPressGestureHander: (() -> Void)?
+
+    override public init(frame: CGRect) {
+        super.init(frame: frame)
+        addTagGestureRecognizer()
+        addLongGestureRecogizer()
+    }
+
+    required init?(coder _: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    // 单机方法
+    private func addTagGestureRecognizer() {
+        let tap = UITapGestureRecognizer(target: self, action: #selector(tapGestureRecognizerHandler(sender:)))
+        tap.numberOfTouchesRequired = 1
+        tap.numberOfTapsRequired = 1
+        addGestureRecognizer(tap)
+        tapGestureRecognizer = tap
+    }
+
+    @objc
+    public func tapGestureRecognizerHandler(sender _: UITapGestureRecognizer) {
+        print("---- tapGestureRecognizerHandler -----")
+        if tapGestureHander != nil {
+            tapGestureHander!()
+        }
+    }
+
+    // 长按事件
+    private func addLongGestureRecogizer() {
+        let longPressGestureRecognizer = UILongPressGestureRecognizer(target: self, action: #selector(longGestureRecognizerHandler(sender:)))
+        longPressGestureRecognizer.numberOfTapsRequired = 1
+        longPressGestureRecognizer.numberOfTouchesRequired = 1
+        addGestureRecognizer(longPressGestureRecognizer)
+        self.longPressGestureRecognizer = longPressGestureRecognizer
+    }
+
+    @objc
+    public func longGestureRecognizerHandler(sender _: UILongPressGestureRecognizer) {
+        print("---- longGestureRecognizerHandler -----")
+        if longPressGestureHander != nil {
+            longPressGestureHander!()
+        }
+    }
+
+    public func removeTapGestureRecognizer() {
+        if let tap = tapGestureRecognizer {
+            removeGestureRecognizer(tap)
+        }
+    }
+
+    public func removeLongPressGestureRecognizer() {
+        if let long = longPressGestureRecognizer {
+            removeGestureRecognizer(long)
+        }
+    }
+}

BFCommonKit/Classes/BFBase/View/bubbleLayer/NXNormalBubbleView.swift

@@ -0,0 +1,80 @@
+//
+//  NXBaseBubbleView.swift
+//  bubbleLayer_swift
+//
+//  Created by liuming on 2020/8/23.
+//  Copyright © 2020 liuming. All rights reserved.
+//
+
+import Foundation
+import UIKit
+public class NXNormalBubbleView: NXInteractiveView {
+    let bubbleLayer = NXBubbleLayer(originalSize: .zero)
+    var currentLayer: CALayer?
+    /// 内部内容控件
+    public var containView = NXBubbleContainView(frame: .zero)
+
+    // 矩形的圆角的半径
+    public var cornerRadius: CGFloat = 8
+    // 箭头位置的圆角半径
+    public var arrowRadius: CGFloat = 3
+    // 箭头的高度
+    public var arrowHeight: CGFloat = 12
+    // 箭头的宽度
+    public var arrowWidth: CGFloat = 30
+    // 箭头方向
+    public var arrowDirection: ArrowDirection = .bottom
+    // 箭头的相对位置
+    public var arrowPosition: CGFloat = 0.5
+
+    public var bubbleColor: UIColor = .white {
+        didSet {
+            self.setNeedsLayout()
+            self.layoutIfNeeded()
+        }
+    }
+
+    override public init(frame: CGRect) {
+        super.init(frame: frame)
+        addSubview(containView)
+    }
+
+    required init?(coder _: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    override public func layoutSubviews() {
+        super.layoutSubviews()
+        if let layer = currentLayer {
+            layer.removeFromSuperlayer()
+        }
+        bubbleLayer.size = frame.size
+        bubbleLayer.cornerRadius = cornerRadius
+        bubbleLayer.arrowRadius = arrowRadius
+        bubbleLayer.arrowHeight = arrowHeight
+        bubbleLayer.arrowWidth = arrowWidth
+        bubbleLayer.arrowDirection = arrowDirection
+        bubbleLayer.arrowPosition = arrowPosition
+        let layer = bubbleLayer.layer()
+        layer.fillColor = bubbleColor.cgColor
+        self.layer.insertSublayer(layer, at: 0)
+        currentLayer = layer
+        // 调整 contain坐标
+        containView.frame = bubbleLayer.bubbleLayerRect
+
+        backgroundColor = .clear
+        containView.backgroundColor = .clear
+    }
+
+    // MARK: - 重写交互层的长按和点击事件
+
+    override public func tapGestureRecognizerHandler(sender: UITapGestureRecognizer) {
+        super.tapGestureRecognizerHandler(sender: sender)
+        print("点击了普通气泡")
+    }
+
+    override public func longGestureRecognizerHandler(sender: UILongPressGestureRecognizer) {
+        super.longGestureRecognizerHandler(sender: sender)
+        print("长按了 点击了普通气泡")
+    }
+}

BFCommonKit/Classes/BFBase/View/bubbleLayer/NXTextBubbleView.swift

@@ -0,0 +1,40 @@
+//
+//  NXTextBubbleView.swift
+//  bubbleLayer_swift
+//
+//  Created by liuming on 2020/8/23.
+//  Copyright © 2020 liuming. All rights reserved.
+//
+
+import SnapKit
+import UIKit
+
+class NXTextBubbleView: NXNormalBubbleView {
+    public let textLabel = UILabel(frame: .zero)
+
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        initSubViews()
+    }
+
+    required init?(coder _: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    private func initSubViews() {
+        containView.addSubview(textLabel)
+        textLabel.snp.makeConstraints { make in
+            make.edges.equalTo(UIEdgeInsets(top: 0, left: 5, bottom: 0, right: 5))
+        }
+    }
+
+    // MARK: - 重写交互层的长按和点击事件
+
+    override public func tapGestureRecognizerHandler(sender _: UITapGestureRecognizer) {
+        print("点击了文字气泡")
+    }
+
+    override public func longGestureRecognizerHandler(sender _: UILongPressGestureRecognizer) {
+        print("长按了 点击了文字气泡")
+    }
+}

BFCommonKit/Classes/BFBase/View/bubbleLayer/NXVoiceBubbleView.swift

@@ -0,0 +1,184 @@
+//
+//  NXVoiceBubbleView.swift
+//  bubbleLayer_swift
+//
+//  Created by liuming on 2020/8/23.
+//  Copyright © 2020 liuming. All rights reserved.
+//
+
+import UIKit
+public class NXVoiceBubbleView: NXNormalBubbleView {
+    /// 关闭按钮
+    private let closeBtn = UIButton(type: .custom)
+    /// 声音图片
+    private let voiceImgView = UIImageView(frame: .zero)
+
+    /// 语音时间文本
+    public let durationLabel = UILabel(frame: .zero)
+    /// 语音图片序列帧动画时间
+    public var animationDuration: TimeInterval = 0.5 {
+        didSet {
+            self.initVoiceAnimation()
+        }
+    }
+
+    // 加载圈
+    lazy var activityIndicator: UIActivityIndicatorView = {
+        let activityIndicator: UIActivityIndicatorView = UIActivityIndicatorView(style:
+            .gray)
+        return activityIndicator
+    }()
+
+    /// 语音图片帧图片
+    public var animationImages: [UIImage] = Array() {
+        didSet {
+            initVoiceAnimation()
+        }
+    }
+
+    /// 语音图片动画重复次数
+    public var animationRepeatCount: Int = 1 {
+        didSet {
+            initVoiceAnimation()
+        }
+    }
+
+    /// 音频显示的总时间
+    public var duration: Float64 = 0 {
+        didSet {
+            showTime()
+            activityIndicatorStop()
+        }
+    }
+
+    public var closeBtnClickedHander: (() -> Void)?
+    override public init(frame: CGRect) {
+        super.init(frame: frame)
+        initSubviews()
+    }
+
+    required init?(coder _: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    private func initSubviews() {
+        containView.addSubview(voiceImgView)
+        voiceImgView.image = UIImage(named: "icon_voice")
+
+        containView.addSubview(durationLabel)
+
+        closeBtn.setImage(UIImage(named: "videomk_serach_clear"), for: .normal)
+        closeBtn.setImage(UIImage(named: "videomk_serach_clear"), for: .highlighted)
+        closeBtn.addTarget(self, action: #selector(closeBtnClicked(sender:)), for: .touchUpInside)
+        containView.addSubview(closeBtn)
+
+        containView.addSubview(activityIndicator)
+
+        // 布局
+        voiceImgView.snp.makeConstraints { maker in
+            maker.centerY.equalTo(self.containView)
+            maker.left.equalTo(self.containView).offset(10)
+            maker.width.height.equalTo(20)
+        }
+        durationLabel.snp.makeConstraints { maker in
+            maker.right.equalTo(self.containView).offset(-10)
+            maker.centerY.equalTo(self.containView)
+            maker.height.equalTo(20)
+        }
+        closeBtn.snp.makeConstraints { maker in
+
+            maker.right.equalTo(self.containView).offset(10)
+            maker.top.equalTo(self.containView).offset(-8)
+            maker.width.height.equalTo(20)
+        }
+
+        activityIndicator.snp.makeConstraints { maker in
+
+            maker.right.equalTo(self.containView).offset(-10)
+            maker.centerY.equalTo(self.containView)
+            maker.height.equalTo(20)
+        }
+    }
+
+    private func showTime() {
+        durationLabel.text = duration < 1 ? "1'" : duration.formatDurationToMS()
+    }
+
+    private func initVoiceAnimation() {
+        if animationImages.count > 0 {
+            voiceImgView.animationImages = animationImages
+            voiceImgView.animationDuration = animationDuration
+            voiceImgView.animationRepeatCount = animationRepeatCount
+        }
+    }
+
+    /// 加载圈开始动画
+    public func activityIndicatorStart() {
+        durationLabel.text = ""
+        activityIndicator.startAnimating()
+    }
+
+    /// 加载圈结束动画
+    public func activityIndicatorStop() {
+        activityIndicator.stopAnimating()
+    }
+
+    /// 开始动画
+    public func startAnimation() {
+        voiceImgView.startAnimating()
+    }
+
+    /// 结束动画
+    public func stopAnimation() {
+        voiceImgView.stopAnimating()
+    }
+
+    /// 按照中心点抖动
+    func animation() {
+        let animati = CAKeyframeAnimation(keyPath: "transform.rotation")
+        // rotation 旋转，需要添加弧度值
+        // 角度转弧度
+        animati.values = [angle2Radion(angle: -50), angle2Radion(angle: 50), angle2Radion(angle: -50)]
+        animati.repeatCount = 4
+        layer.add(animati, forKey: nil)
+    }
+
+    // MARK: - 重写交互层的长按和点击事件
+
+    override public func tapGestureRecognizerHandler(sender: UITapGestureRecognizer) {
+        super.tapGestureRecognizerHandler(sender: sender)
+        startAnimation()
+        print("点击了语音气泡")
+    }
+
+    override public func longGestureRecognizerHandler(sender: UILongPressGestureRecognizer) {
+        super.longGestureRecognizerHandler(sender: sender)
+        print("长按了 点击了语音气泡")
+        animation()
+    }
+
+    func angle2Radion(angle: Float) -> Float {
+        return angle / Float(180.0 * Double.pi)
+    }
+
+    // MARK: 关闭按钮点击事件
+
+    @objc
+    func closeBtnClicked(sender _: UIButton) {
+        print("点击了关闭按钮")
+        if let block = closeBtnClickedHander {
+            block()
+        }
+    }
+
+    override public func point(inside point: CGPoint, with _: UIEvent?) -> Bool {
+        if bounds.contains(point) {
+            return true
+        }
+        let p = convert(point, to: closeBtn)
+        if closeBtn.bounds.contains(p) {
+            return true
+        }
+        return false
+    }
+}

BFCommonKit/Classes/BFCategorys/BFColor+Ext.swift

@@ -44,6 +44,40 @@ public extension UIColor {
         return UIColor(red: CGFloat(r) / 255.0, green: CGFloat(g) / 255.0, blue: CGFloat(b) / 255.0, alpha: 1)
     }
 
+    public  class func hexColor(hexadecimal: String,alpha:CGFloat = 1) -> UIColor {
+        var cstr = hexadecimal.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines).uppercased() as NSString
+        if cstr.length < 6 {
+            return UIColor.clear
+        }
+        if cstr.hasPrefix("0X") {
+            cstr = cstr.substring(from: 2) as NSString
+        }
+        if cstr.hasPrefix("#") {
+            cstr = cstr.substring(from: 1) as NSString
+        }
+        if cstr.length != 6 {
+            return UIColor.clear
+        }
+        var range = NSRange()
+        range.location = 0
+        range.length = 2
+        // r
+        let rStr = cstr.substring(with: range)
+        // g
+        range.location = 2
+        let gStr = cstr.substring(with: range)
+        // b
+        range.location = 4
+        let bStr = cstr.substring(with: range)
+        var r: UInt32 = 0x0
+        var g: UInt32 = 0x0
+        var b: UInt32 = 0x0
+        Scanner(string: rStr).scanHexInt32(&r)
+        Scanner(string: gStr).scanHexInt32(&g)
+        Scanner(string: bStr).scanHexInt32(&b)
+        return UIColor(red: CGFloat(r) / 255.0, green: CGFloat(g) / 255.0, blue: CGFloat(b) / 255.0, alpha: alpha)
+    }
+    
     // MARK: - hex (0x000000) -> UIColor
 
     ///

BFCommonKit/Classes/BFCategorys/BFInt+Ext.swift → BFCommonKit/Classes/BFCategorys/BFNumber+Ext.swift

@@ -1,5 +1,5 @@
 //
-//  Int+Ext.swift
+//  BFNumber+Ext.swift
 //  PQSpeed
 //
 //  Created by SanW on 2020/7/20.
@@ -106,3 +106,27 @@ public extension Float64 {
         return result
     }
 }
+
+extension Float {
+    /// 准确的小数尾截取 - 没有进位
+    /*
+     // 11.999003  -> 12.0
+     var pp = 11.999003
+     String(format: "%.1f", pp)  这个方法会进行四舍五入
+     */
+    public func decimalString(_ base: Self = 1) -> String {
+       return "\(self.decimalNumber(base))"
+    }
+    public func decimalNumber(_ base: Self = 1) -> Float {
+        let tempCount: Self = pow(10, base)
+        let temp = self*tempCount
+        
+        let target = Self(Int(temp))
+        let stepone = target/tempCount
+        if stepone.truncatingRemainder(dividingBy: 1) == 0 {
+            return Float(String(format: "%.0f", stepone)) ?? 0.0
+        }else{
+            return stepone
+        }
+    }
+}

BFCommonKit/Classes/BFCategorys/BFUIView+Ext.swift

@@ -377,7 +377,7 @@ public extension UIImageView {
             animationRepeatCount = repeatCount
             startAnimating()
         } else if images == nil && data != nil {
-           PQPHAssetVideoParaseUtil.parasGIFImage(data: data!) { [weak self] _, images, duration in
+            PQPHAssetVideoParaseUtil.parasGIFImage(data: data!) { [weak self] _, images, duration in
                 if images != nil, (images?.count ?? 0) > 0 {
                     self?.displayGIF(images: images!, repeatCount: repeatCount, duration: duration ?? 1)
                 }

BFCommonKit/Classes/BFEnums/Enums.swift

@@ -43,88 +43,88 @@ public  enum  PQVIDEO_PLAY_STATUS {
 /// 页面场景
 public  enum  PAGESOURCE: String {
     /*************** 视频相关pageSource ***************/
-    case sp_category = "shanyinApp-category" //   首页-单列
-    case sp_category_recommend = "shanyinApp-category_recommend" // 由首页单列右划
-    case sp_categoryDouble = "shanyinApp-categoryDouble" // 首页-双列
-    case sp_videoDetail = "shanyinApp-videoDetail" // 视频详情页
-    case sp_videoDetail_search = "shanyinApp-videoDetail_search" //    由搜索结果列表进入
-    case sp_videoDetail_search_recommend = "shanyinApp-videoDetail_search_recommend" // 由搜索结果列表进入
-    case sp_videoDetail_upload = "shanyinApp-videoDetail_upload" //     由我的tab中“作品”列表进入
-    case sp_videoDetail_upload_recommend = "shanyinApp-videoDetail_upload_recommend" // 、由我的tab中“作品”列表进入
-    case sp_videoDetail_favorite = "shanyinApp-videoDetail_favorite" // 由我的喜欢列表进入
-    case sp_videoDetail_share = "shanyinApp-videoDetail_share" // 由我的分享列表进入
-    case sp_videoDetail_favorite_recommend = "shanyinApp-videoDetail_favorite_recommend" // 由我的喜欢列表推荐
-    case sp_userHomePage = "shanyinApp-userHomePage" // 用户个人主页
-    case sp_videoDetail_userHomePage = "shanyinApp-videoDetail_userHomePage" // 由用户个人主页进入
-    case sp_videoDetail_userHomePage_recommend = "shanyinApp-videoDetail_userHomePage_recommend" // 由用户个人主页进入
-    case sp_recommendBottom = "shanyinApp-recommendBottom" //    底部展示的3个相关推荐视频
-    case sp_follow = "shanyinApp-follow" // 关注tab
-    case sp_follow_recommend = "shanyinApp-follow_recommend" // 由关注列表右划
-    case sp_followSingle = "shanyinApp-followSingle" // 关注tab点击顶部个人头像进入某个人的关注
-    case sp_followSingle_recommend = "shanyinApp-followSingle_recommend" // 关注tab点击顶部个人头像进入某个人的关注
+    case sp_category = "speedApp-category" //   首页-单列
+    case sp_category_recommend = "speedApp-category_recommend" // 由首页单列右划
+    case sp_categoryDouble = "speedApp-categoryDouble" // 首页-双列
+    case sp_videoDetail = "speedApp-videoDetail" // 视频详情页
+    case sp_videoDetail_search = "speedApp-videoDetail_search" //    由搜索结果列表进入
+    case sp_videoDetail_search_recommend = "speedApp-videoDetail_search_recommend" // 由搜索结果列表进入
+    case sp_videoDetail_upload = "speedApp-videoDetail_upload" //     由我的tab中“作品”列表进入
+    case sp_videoDetail_upload_recommend = "speedApp-videoDetail_upload_recommend" // 、由我的tab中“作品”列表进入
+    case sp_videoDetail_favorite = "speedApp-videoDetail_favorite" // 由我的喜欢列表进入
+    case sp_videoDetail_share = "speedApp-videoDetail_share" // 由我的分享列表进入
+    case sp_videoDetail_favorite_recommend = "speedApp-videoDetail_favorite_recommend" // 由我的喜欢列表推荐
+    case sp_userHomePage = "speedApp-userHomePage" // 用户个人主页
+    case sp_videoDetail_userHomePage = "speedApp-videoDetail_userHomePage" // 由用户个人主页进入
+    case sp_videoDetail_userHomePage_recommend = "speedApp-videoDetail_userHomePage_recommend" // 由用户个人主页进入
+    case sp_recommendBottom = "speedApp-recommendBottom" //    底部展示的3个相关推荐视频
+    case sp_follow = "speedApp-follow" // 关注tab
+    case sp_follow_recommend = "speedApp-follow_recommend" // 由关注列表右划
+    case sp_followSingle = "speedApp-followSingle" // 关注tab点击顶部个人头像进入某个人的关注
+    case sp_followSingle_recommend = "speedApp-followSingle_recommend" // 关注tab点击顶部个人头像进入某个人的关注
     case sp_mine = "speedApp-mine" // 我的tab
-    case sp_search = "shanyinApp-search" // 搜索页
-    case sp_uploadVideo = "shanyinApp-uploadVideo" // 视频制作入口
+    case sp_search = "speedApp-search" // 搜索页
+    case sp_uploadVideo = "speedApp-uploadVideo" // 视频制作入口
 
     /*************** 活动相关pageSource ***************/
-    case sp_activity_entranceButton = "shanyinApp_playActivity_entranceButton" // 活动活动入口按键
-    case sp_activity_invite = "shanyinApp_playActivity_invite" // H5页面内邀请好友按键
-    case sp_activity_threeDot = "shanyinApp_playActivity_threeDot" // APP右上角…按键
-    case sp_activity_shareFriend = "shanyinApp_playActivity_shareFriend" // 进一步点击分享好友
-    case sp_activity_shareMoment = "shanyinApp_playActivity_shareMoment" // 进一步点击分享朋友圈
-    case sp_activity_openH5 = "shanyinApp_playActivity_completeOpenH5" // 当天完成活动的弹窗->去查看
-    case sp_activity_openH5AndPayment = "shanyinApp_playActivity_completeOpenH5AndPayment" // 当天完成活动的弹窗->报名明日
-    case sp_activity_failOpenH5 = "shanyinApp_playActivity_missionFailWindowOpenH5" // 未成功弹窗->继续活动
-    case sp_activity_success_share = "shanyinApp_playActivity_missionSuccessWindow_share" // 成功弹窗->分享给好友炫耀下
-    case sp_activity_entrance_close = "shanyinApp_playActivity_entrance_close" // 活动入口弹窗->关闭按钮
-    case sp_activity_entranceWindow = "shanyinApp_playActivity_entranceWindow" // 活动入口弹窗
-    case sp_activity_successWindow = "shanyinApp_playActivity_missionSuccessWindow" // 成功弹窗
-    case sp_activity_failWindow = "shanyinApp_playActivity_missionFailWindow" // 未成功弹窗
-    case sp_activity_completeWindow = "shanyinApp_playActivity_missionCompleteWindow" //  当天完成活动的弹窗
+    case sp_activity_entranceButton = "speedApp_playActivity_entranceButton" // 活动活动入口按键
+    case sp_activity_invite = "speedApp_playActivity_invite" // H5页面内邀请好友按键
+    case sp_activity_threeDot = "speedApp_playActivity_threeDot" // APP右上角…按键
+    case sp_activity_shareFriend = "speedApp_playActivity_shareFriend" // 进一步点击分享好友
+    case sp_activity_shareMoment = "speedApp_playActivity_shareMoment" // 进一步点击分享朋友圈
+    case sp_activity_openH5 = "speedApp_playActivity_completeOpenH5" // 当天完成活动的弹窗->去查看
+    case sp_activity_openH5AndPayment = "speedApp_playActivity_completeOpenH5AndPayment" // 当天完成活动的弹窗->报名明日
+    case sp_activity_failOpenH5 = "speedApp_playActivity_missionFailWindowOpenH5" // 未成功弹窗->继续活动
+    case sp_activity_success_share = "speedApp_playActivity_missionSuccessWindow_share" // 成功弹窗->分享给好友炫耀下
+    case sp_activity_entrance_close = "speedApp_playActivity_entrance_close" // 活动入口弹窗->关闭按钮
+    case sp_activity_entranceWindow = "speedApp_playActivity_entranceWindow" // 活动入口弹窗
+    case sp_activity_successWindow = "speedApp_playActivity_missionSuccessWindow" // 成功弹窗
+    case sp_activity_failWindow = "speedApp_playActivity_missionFailWindow" // 未成功弹窗
+    case sp_activity_completeWindow = "speedApp_playActivity_missionCompleteWindow" //  当天完成活动的弹窗
 
     /*************** 上传相关pageSource ***************/
-    case sp_upload_videoSelect = "shanyinApp-upload_videoSelect" //  选视频-进入页面事件
-    case sp_upload_coverSelect = "shanyinApp-upload_coverSelect" //  选封面-进入页面事件
-    case sp_upload_videoPublish = "shanyinApp-upload_videoPublish" //  发布-进入页面事件
+    case sp_upload_videoSelect = "speedApp-upload_videoSelect" //  选视频-进入页面事件
+    case sp_upload_coverSelect = "speedApp-upload_coverSelect" //  选封面-进入页面事件
+    case sp_upload_videoPublish = "speedApp-upload_videoPublish" //  发布-进入页面事件
 
     /*************** tab点击相关pageSource ***************/
-    case sp_categoryTabButton = "shanyinApp-categoryTabButton" //  首页tab
-    case sp_followTabButton = "shanyinApp-followTabButton" //  关注tab
-    case sp_uploadTabButton = "shanyinApp-uploadTabButton" //  上传tab
-    case sp_mineTabButton = "shanyinApp-mineTabButton" //  我的tab
-    case sp_msg_tabBtn = "shanyinApp_msgTabButton" //  消息tab
+    case sp_categoryTabButton = "speedApp-categoryTabButton" //  首页tab
+    case sp_followTabButton = "speedApp-followTabButton" //  关注tab
+    case sp_uploadTabButton = "speedApp-uploadTabButton" //  上传tab
+    case sp_mineTabButton = "speedApp-mineTabButton" //  我的tab
+    case sp_msg_tabBtn = "speedApp_msgTabButton" //  消息tab
 
     /*************** 发布pageSource ***************/
-    case sp_videoMaking = "shanyinApp-videoMaking" // 视频创作
-    case sp_videoCompose_guid = "shanyinApp-videoCompose_guid" // 预览页面
-    case sp_videoCompose_edit = "shanyinApp-videoCompose_edit" // 编辑页面
-    case sp_videoCompose_overview = "shanyinApp-videoCompose_overview" // 总览页面
-    case sp_videoCompose_composition = "shanyinApp-videoCompose_composition" // 合成页面
+    case sp_videoMaking = "speedApp-videoMaking" // 视频创作
+    case sp_videoCompose_guid = "speedApp-videoCompose_guid" // 预览页面
+    case sp_videoCompose_edit = "speedApp-videoCompose_edit" // 编辑页面
+    case sp_videoCompose_overview = "speedApp-videoCompose_overview" // 总览页面
+    case sp_videoCompose_composition = "speedApp-videoCompose_composition" // 合成页面
     case sp_material_search = "vlog-pages/user-videos-share" // 素材搜索上报
 
     /*************** 消息pageSource ***************/
-    case sp_msg_shareSpace = "shanyinApp-message" // 分享空间
-    case sp_msg_shareSpace_detail = "shanyinApp-message_shareSpace" // 分享空间详情
-    case sp_msg_share = "shanyinApp-message_share" // 分享
-    case sp_msg_like = "shanyinApp-message_like" // 喜欢
-    case sp_msg_fans = "shanyinApp-message_fans" // 粉丝
-    case sp_msg_push = "shanyinApp-message_push" // 通知
+    case sp_msg_shareSpace = "speedApp-message" // 分享空间
+    case sp_msg_shareSpace_detail = "speedApp-message_shareSpace" // 分享空间详情
+    case sp_msg_share = "speedApp-message_share" // 分享
+    case sp_msg_like = "speedApp-message_like" // 喜欢
+    case sp_msg_fans = "speedApp-message_fans" // 粉丝
+    case sp_msg_push = "speedApp-message_push" // 通知
 
     /*************** 草稿箱相关pageSource ***************/
-    case sp_draft_projectList = "shanyinApp-projectList" // 草稿箱列表
-    case sp_reproduce_childList = "shanyinApp-reproduceCollection_child" // 再制作子列表页面
-    case sp_reproduce_fatherList = "shanyinApp-reproduceCollection_father" // 再制作父列表页面
-    case sp_reproduce_chilDetailList = "shanyinApp-videoDetail_reproduceCollection_child" // 再制作子列表页面
-    case sp_reproduce_fatherDetailList = "shanyinApp-videoDetail_reproduceCollection_father" // 再制作父列表页面
+    case sp_draft_projectList = "speedApp-projectList" // 草稿箱列表
+    case sp_reproduce_childList = "speedApp-reproduceCollection_child" // 再制作子列表页面
+    case sp_reproduce_fatherList = "speedApp-reproduceCollection_father" // 再制作父列表页面
+    case sp_reproduce_chilDetailList = "speedApp-videoDetail_reproduceCollection_child" // 再制作子列表页面
+    case sp_reproduce_fatherDetailList = "speedApp-videoDetail_reproduceCollection_father" // 再制作父列表页面
     // add by ak
-    case sp_shanyinApp_upload2Compose = "shanyinApp-upload2Compose" // 上传转创作
+    case sp_shanyinApp_upload2Compose = "speedApp-upload2Compose" // 上传转创作
 
     /*************** 卡点视频相关pageSource ***************/
-    case sp_stuck_selectMaterial = "shanyinApp-selectSyncedUpMaterial" // 卡点视频素材选择页
-    case sp_stuck_selectSynceedUpMusic = "shanyinApp-selectSynceedUpMusic" // 卡点视频音乐选择页
-    case sp_stuck_previewSyncedUp = "shanyinApp_previewSyncedUp" // 预览页面曝光上报
-    case sp_stuck_searchSyncedUpMusic = "shanyinApp_searchSyncedUpMusic" // 音乐素材搜索页
-    case sp_stuck_publishSyncedUp = "shanyinApp_publishSyncedUp" // 合成发布页
+    case sp_stuck_selectMaterial = "speedApp-selectSyncedUpMaterial" // 卡点视频素材选择页
+    case sp_stuck_selectSynceedUpMusic = "speedApp-selectSynceedUpMusic" // 卡点视频音乐选择页
+    case sp_stuck_previewSyncedUp = "speedApp_previewSyncedUp" // 预览页面曝光上报
+    case sp_stuck_searchSyncedUpMusic = "speedApp_searchSyncedUpMusic" // 音乐素材搜索页
+    case sp_stuck_publishSyncedUp = "speedApp_publishSyncedUp" // 合成发布页
     
     /*************** 话题相关pageSource ***************/
     case sp_cmunit_collect = "collectAgeGenderPage" // 年龄 / 话题收集页
@@ -147,7 +147,7 @@ public  enum  PAGESOURCE: String {
     case sp_cmunit_mePage = "mePage" // 我的页
     case sp_cmunit_userPage = "homePage" // 个人主页
     //点击上报：首页点击底部“我的”页面入口
-    case sp_shanyinApp_main = "shanyinApp-main"
+    case sp_shanyinApp_main = "speedApp-main"
     //页面曝光上报：“我的”页面曝光
     case sp_shanyinApp_mine = "shanyinApp-mine"
     
@@ -163,80 +163,80 @@ public  enum  PAGESOURCE: String {
 public  enum  objectType: String {
     /*************** tab点击相关pageSource ***************/
 
-    case ot_home_tabBtn = "shanyinApp-categoryTabButton" //  首页tab
-    case ot_follow_tabBtn = "shanyinApp-followTabButton" //  关注tab
-    case ot_up_tabBtn = "shanyinApp-uploadTabButton" //  上传tab
-    case ot_mine_tabBtn = "shanyinApp-mineTabButton" //  我的tab
-    case ot_public_tabBtn = "shanyinApp-publicTabButton" //  发布tab
-    case ot_msg_tabBtn = "shanyinApp_msgTabButton" //  消息tab
+    case ot_home_tabBtn = "speedApp-categoryTabButton" //  首页tab
+    case ot_follow_tabBtn = "speedApp-followTabButton" //  关注tab
+    case ot_up_tabBtn = "speedApp-uploadTabButton" //  上传tab
+    case ot_mine_tabBtn = "speedApp-mineTabButton" //  我的tab
+    case ot_public_tabBtn = "speedApp-publicTabButton" //  发布tab
+    case ot_msg_tabBtn = "speedApp_msgTabButton" //  消息tab
 
     /*************** 上传相关objectType ***************/
-    case ot_up_backBtn = "shanyinApp-uploadBackButton" // 点击左下角叉子
-    case ot_up_nextBtn = "shanyinApp-uploadNextButton" // 点击右下角下一步
-    case ot_up_coverBtn = "shanyinApp-uploadCoverButton" // 点击上传封面
-    case ot_up_pickCoverBtn = "shanyinApp-pickCoverButton" // 点击截取封面
-    case ot_up_publishBtn = "shanyinApp-videoPublishButton" // 点击发布
-    case ot_up_changeCoverBtn = "shanyinApp-changeCoverButton" // 点击选封面返回
-    case ot_up_start = "shanyinApp-uploadStart" // 上传开始事件
-    case ot_up_fail = "shanyinApp-uploadFail" // 上传中断/失败事件
-    case ot_up_restart = "shanyinApp-uploadRestart" // 上传重试事件
-    case ot_up_success = "shanyinApp-uploadSuccess" // 上传完成
-    case ot_up_publishSuccess = "shanyinApp-videoPublishSuccess" // 发布完成
-    case ot_up_viewPopup_guideUsersToShare = "shanyinApp_viewPopup_guideUsersToShare_pubishVideo" // 发布成功弹出分享界面
-    case ot_up_clickWechatMoments_guideUsersToShare = "shanyinApp_clickWechatMoments_guideUsersToShare_pubishVideo" // 分享介面点击微信朋友圈
-    case ot_up_clickWechat_guideUsersToShare = "shanyinApp_clickWechat_guideUsersToShare_pubishVideo"
-    case ot_selectVideoProductionMode = "shanyinApp_viewWindow_selectVideoProductionMode"
+    case ot_up_backBtn = "speedApp-uploadBackButton" // 点击左下角叉子
+    case ot_up_nextBtn = "speedApp-uploadNextButton" // 点击右下角下一步
+    case ot_up_coverBtn = "speedApp-uploadCoverButton" // 点击上传封面
+    case ot_up_pickCoverBtn = "speedApp-pickCoverButton" // 点击截取封面
+    case ot_up_publishBtn = "speedApp-videoPublishButton" // 点击发布
+    case ot_up_changeCoverBtn = "speedApp-changeCoverButton" // 点击选封面返回
+    case ot_up_start = "speedApp-uploadStart" // 上传开始事件
+    case ot_up_fail = "speedApp-uploadFail" // 上传中断/失败事件
+    case ot_up_restart = "speedApp-uploadRestart" // 上传重试事件
+    case ot_up_success = "speedApp-uploadSuccess" // 上传完成
+    case ot_up_publishSuccess = "speedApp-videoPublishSuccess" // 发布完成
+    case ot_up_viewPopup_guideUsersToShare = "speedApp_viewPopup_guideUsersToShare_pubishVideo" // 发布成功弹出分享界面
+    case ot_up_clickWechatMoments_guideUsersToShare = "speedApp_clickWechatMoments_guideUsersToShare_pubishVideo" // 分享介面点击微信朋友圈
+    case ot_up_clickWechat_guideUsersToShare = "speedApp_clickWechat_guideUsersToShare_pubishVideo"
+    case ot_selectVideoProductionMode = "speedApp_viewWindow_selectVideoProductionMode"
     // 分享界面点击微信好友
     /*************** 创作工具相关objectType ***************/
     case ot_makevideo_video = "video" // 视频
     case ot_makevideo_gif = "gif" // 动态图
     case ot_makevideo_jpg = "jpg" // 图片
-    case ot_enterComposeToolButton = "shanyinApp_enterComposeToolButton" // 点击上传tab后-点击发布视频 add by ak & 视频合成入口
-    case ot_enterVideoUploadButton = "shanyinApp_enterVideoUploadButton" // 点击上传tab后-点击上传视频
-    case ot_videoCompose_overviewButton = "shanyinApp_videoCompose_overviewButton" // 点击总览
-    case ot_videoCompose_videoCompositeButton = "shanyinApp_videoCompose_videoCompositeButton" // 点击去发布
-    case ot_videoCompose_videoPublish = "shanyinApp_videoPublishButton" // 发布视频
-    case ot_shanyinApp_searchButton = "shanyinApp_searchButton" // 发布视频
+    case ot_enterComposeToolButton = "speedApp_enterComposeToolButton" // 点击上传tab后-点击发布视频 add by ak & 视频合成入口
+    case ot_enterVideoUploadButton = "speedApp_enterVideoUploadButton" // 点击上传tab后-点击上传视频
+    case ot_videoCompose_overviewButton = "speedApp_videoCompose_overviewButton" // 点击总览
+    case ot_videoCompose_videoCompositeButton = "speedApp_videoCompose_videoCompositeButton" // 点击去发布
+    case ot_videoCompose_videoPublish = "speedApp_videoPublishButton" // 发布视频
+    case ot_shanyinApp_searchButton = "speedApp_searchButton" // 发布视频
     case ot_pageView = "pageView" // 页面访问
     //
     // 图文入口
-    case ot_shanyinApp_clickButton_imageAndTextGenerateVideo = "shanyinApp_clickButton_imageAndTextGenerateVideo"
+    case ot_shanyinApp_clickButton_imageAndTextGenerateVideo = "speedApp_clickButton_imageAndTextGenerateVideo"
     // 电子相册
-    case ot_shanyinApp_clickButton_electronicAlbum = "shanyinApp_clickButton_electronicAlbum"
+    case ot_shanyinApp_clickButton_electronicAlbum = "speedApp_clickButton_electronicAlbum"
     /*************** 消息相关objectType ***************/
-    case ot_msg_fansMsgButton = "shanyinApp_msgTab_fansMsgButton" //  粉丝消息入口
-    case ot_msg_likeMsgButton = "shanyinApp_msgTab_likeMsgButton" //  喜欢消息入口
-    case ot_msg_shareMsgButton = "shanyinApp_msgTab_shareMsgButton" //  分享消息入口
-    case ot_msg_commentMsgButton = "shanyinApp_msgTab_commentMsgButton" //  评论消息入口
-    case ot_msg_systemMsgButton = "shanyinApp_msgTab_systemMsgButton" //  通知消息入口
+    case ot_msg_fansMsgButton = "speedApp_msgTab_fansMsgButton" //  粉丝消息入口
+    case ot_msg_likeMsgButton = "speedApp_msgTab_likeMsgButton" //  喜欢消息入口
+    case ot_msg_shareMsgButton = "speedApp_msgTab_shareMsgButton" //  分享消息入口
+    case ot_msg_commentMsgButton = "speedApp_msgTab_commentMsgButton" //  评论消息入口
+    case ot_msg_systemMsgButton = "speedApp_msgTab_systemMsgButton" //  通知消息入口
 
     /*************** 消息详情相关objectType ***************/
-    case ot_msg_shareSpaceViewTab = "shanyinApp_message_shareSpace_viewTab" // 分享空间详情页观看
-    case ot_msg_shareSpaceLikeTab = "shanyinApp_message_shareSpace_likeTab" // 分享空间详情页喜欢
-    case ot_msg_shareSpaceCommentTab = "shanyinApp_message_shareSpace_commentTab" // 分享空间详情页评论
-    case ot_msg_shareSpaceShareTab = "shanyinApp_message_shareSpace_shareTab" // 分享空间详情页分享
+    case ot_msg_shareSpaceViewTab = "speedApp_message_shareSpace_viewTab" // 分享空间详情页观看
+    case ot_msg_shareSpaceLikeTab = "speedApp_message_shareSpace_likeTab" // 分享空间详情页喜欢
+    case ot_msg_shareSpaceCommentTab = "speedApp_message_shareSpace_commentTab" // 分享空间详情页评论
+    case ot_msg_shareSpaceShareTab = "speedApp_message_shareSpace_shareTab" // 分享空间详情页分享
 
     /*************** 草稿箱相关objectType ***************/
-    case ot_draft_clicktButton = "shanyinApp_clickOpenProjectListButton" // 草稿箱点击入口
-    case ot_draft_editProject = "shanyinApp_editProject" // - 点击 Project Item（草稿箱中的每个项目）
-    case ot_draft_viewProject = "shanyinApp_viewProject" // - 看到 Project Item（草稿箱中的每个项目）
-    case ot_draft_clickEditProject = "shanyinApp_clickEditProject" // - 点击 Project Item 弹出菜单的「编辑」按钮
-    case ot_draft_clickPublishProject = "shanyinApp_clickPublishProject" // - 点击 Project Item 弹出菜单的「去发布」按钮
-    case ot_draft_clickRenameProject = "shanyinApp_clickRenameProject" // - 点击 Project Item 弹出菜单的「重命名」按钮
-    case ot_draft_clickCopyProject = "shanyinApp_clickCopyProject" // - 点击 Project Item 弹出菜单的「复制」按钮
-    case ot_draft_clickDeleteProject = "shanyinApp_clickDeleteProject" // - 点击 Project Item 弹出菜单的「删除」按钮
-    case ot_draft_uploadMaterial = "shanyinApp_uploadMaterial" // - 素材开始上传事件
-    case ot_draft_uploadMatrialSuccess = "shanyinApp_uploadMatrialSuccess" // - 素材上传成功事件
-    case ot_draft_downloadMaterial = "shanyinApp_downloadMaterial" // - 素材开始下载事件
-    case ot_draft_downloadMaterialSuccess = "shanyinApp_downloadMaterialSuccess" // - 素材下载成功事件
-    case ot_videoCompose_mux_complete = "shanyinApp_videoCompose_mux_complete" // 创作工具「合成成功」添加上报参数
-
-    case ot_reproduce_collectionClicButton = "shanyinApp_clickReproduceButton_collection" // - 再创作集合页的「再创作按钮」
-    case ot_reproduce_clickButton = "shanyinApp_clickReProduceButton" // 再创作按钮（右上角）点击上报
-    case ot_reproduce_collectionBar = "shanyinApp_clickReproduceCollectionBar" // 再创作按钮（左下角）点击上报
-    case ot_reproduce_collectionVideo = "shanyinApp_clickReproduceCollectionVideo" // 再创作集合页的「视频」点击上报
-    case ot_reproduce_sameSourceButton = "shanyinApp_viewSameSourceButton" // 再创作查看同款来源按钮
-    case ot_reproduce_saveProjectToDraftBox = "shanyinApp-saveProjectToDraftBox" // 创作工具「保存项目成功」添加上报参数
+    case ot_draft_clicktButton = "speedApp_clickOpenProjectListButton" // 草稿箱点击入口
+    case ot_draft_editProject = "speedApp_editProject" // - 点击 Project Item（草稿箱中的每个项目）
+    case ot_draft_viewProject = "speedApp_viewProject" // - 看到 Project Item（草稿箱中的每个项目）
+    case ot_draft_clickEditProject = "speedApp_clickEditProject" // - 点击 Project Item 弹出菜单的「编辑」按钮
+    case ot_draft_clickPublishProject = "speedApp_clickPublishProject" // - 点击 Project Item 弹出菜单的「去发布」按钮
+    case ot_draft_clickRenameProject = "speedApp_clickRenameProject" // - 点击 Project Item 弹出菜单的「重命名」按钮
+    case ot_draft_clickCopyProject = "speedApp_clickCopyProject" // - 点击 Project Item 弹出菜单的「复制」按钮
+    case ot_draft_clickDeleteProject = "speedApp_clickDeleteProject" // - 点击 Project Item 弹出菜单的「删除」按钮
+    case ot_draft_uploadMaterial = "speedApp_uploadMaterial" // - 素材开始上传事件
+    case ot_draft_uploadMatrialSuccess = "speedApp_uploadMatrialSuccess" // - 素材上传成功事件
+    case ot_draft_downloadMaterial = "speedApp_downloadMaterial" // - 素材开始下载事件
+    case ot_draft_downloadMaterialSuccess = "speedApp_downloadMaterialSuccess" // - 素材下载成功事件
+    case ot_videoCompose_mux_complete = "speedApp_videoCompose_mux_complete" // 创作工具「合成成功」添加上报参数
+
+    case ot_reproduce_collectionClicButton = "speedApp_clickReproduceButton_collection" // - 再创作集合页的「再创作按钮」
+    case ot_reproduce_clickButton = "speedApp_clickReProduceButton" // 再创作按钮（右上角）点击上报
+    case ot_reproduce_collectionBar = "speedApp_clickReproduceCollectionBar" // 再创作按钮（左下角）点击上报
+    case ot_reproduce_collectionVideo = "speedApp_clickReproduceCollectionVideo" // 再创作集合页的「视频」点击上报
+    case ot_reproduce_sameSourceButton = "speedApp_viewSameSourceButton" // 再创作查看同款来源按钮
+    case ot_reproduce_saveProjectToDraftBox = "speedApp-saveProjectToDraftBox" // 创作工具「保存项目成功」添加上报参数
     // add by ak
     case speedApp_viewWindow_upload2Compose // 「上传转创作」：窗口曝光
     case speedApp_clickButton_upload2Compose_addMusic // 「上传转创作」：加音乐 - 按钮点击
@@ -288,69 +288,69 @@ public  enum  objectType: String {
     case ot_shanyinApp_clickButton_syncedUpMusic = "shanyinApp_clickButton_syncedUpMusic"
 
     // 视频播放点击
-    case ot_shanyinApp_clickButton_syncedUpMusicRecreate = "shanyinApp_clickButton_syncedUpMusicRecreate"
-    case ot_shanyinApp_viewButton_syncedUpMusicRecreate = "shanyinApp_viewButton_syncedUpMusicRecreate"
+    case ot_shanyinApp_clickButton_syncedUpMusicRecreate = "speedApp_clickButton_syncedUpMusicRecreate"
+    case ot_shanyinApp_viewButton_syncedUpMusicRecreate = "speedApp_viewButton_syncedUpMusicRecreate"
     // 点击上报：首页点击底部“我的”页面入口
-    case ot_shanyinApp_clickButton_mineTab = "shanyinApp_clickButton_mineTab"
+    case ot_shanyinApp_clickButton_mineTab = "speedApp_clickButton_mineTab"
     // 页面曝光上报：“我的”页面曝光
-    case ot_shanyinApp_viewPage_mineTab = "shanyinApp_viewPage_mineTab"
+    case ot_shanyinApp_viewPage_mineTab = "speedApp_viewPage_mineTab"
     // 编辑标题和封面
-    case ot_shanyinApp_clickButton_changeTitle = "shanyinApp_clickButton_changeTitle"
-    case ot_shanyinApp_clickButton_changeCover = "shanyinApp_clickButton_changeCover"
+    case ot_shanyinApp_clickButton_changeTitle = "speedApp_clickButton_changeTitle"
+    case ot_shanyinApp_clickButton_changeCover = "speedApp_clickButton_changeCover"
     
     //1.2.0版本快慢速
     //点击快慢速
-    case ot_shanyinApp_musicVideoPreview_selectPatternSpeed = "shanyinApp_musicVideoPreview_selectPatternSpeed"
+    case ot_shanyinApp_musicVideoPreview_selectPatternSpeed = "speedApp_musicVideoPreview_selectPatternSpeed"
     //点击跳跃卡点
-    case ot_shanyinApp_musicVideoPreview_selectPatternMusicVideo = "shanyinApp_musicVideoPreview_selectPatternMusicVideo"
+    case ot_shanyinApp_musicVideoPreview_selectPatternMusicVideo = "speedApp_musicVideoPreview_selectPatternMusicVideo"
     //点击仅音乐
-    case ot_shanyinApp_musicVideoPreview_selectPatternBgm = "shanyinApp_musicVideoPreview_selectPatternBgm"
+    case ot_shanyinApp_musicVideoPreview_selectPatternBgm = "speedApp_musicVideoPreview_selectPatternBgm"
     
     //音乐库相统计
     //- 音乐tab点击数
-    case ot_shanyinApp_musicVideoPreview_musicTab = "shanyinApp_musicVideoPreview_musicTab"
+    case ot_shanyinApp_musicVideoPreview_musicTab = "speedApp_musicVideoPreview_musicTab"
     //- 剪辑tab点击
-    case ot_shanyinApp_musicVideoPreview_videoTab = "shanyinApp_musicVideoPreview_videoTab"
+    case ot_shanyinApp_musicVideoPreview_videoTab = "speedApp_musicVideoPreview_videoTab"
     //- 音乐素材曝光数
-    case ot_shanyinApp_musicVideoPreview_musicView = "shanyinApp_musicVideoPreview_musicView"
+    case ot_shanyinApp_musicVideoPreview_musicView = "speedApp_musicVideoPreview_musicView"
     //- 音乐试听数
-    case ot_shanyinApp_musicVideoPreview_musicCategorySelect = "shanyinApp_musicVideoPreview_musicCategorySelect"
+    case ot_shanyinApp_musicVideoPreview_musicCategorySelect = "speedApp_musicVideoPreview_musicCategorySelect"
     //- 音乐使用数
-    case ot_shanyinApp_musicVideoPreview_musicSelect = "shanyinApp_musicVideoPreview_musicSelect"
+    case ot_shanyinApp_musicVideoPreview_musicSelect = "speedApp_musicVideoPreview_musicSelect"
     //- 音乐选框移动数（与原推荐位置不一致）
-    case ot_shanyinApp_musicVideoPreview_musicPeriodSelect = "shanyinApp_musicVideoPreview_musicPeriodSelect"
+    case ot_shanyinApp_musicVideoPreview_musicPeriodSelect = "speedApp_musicVideoPreview_musicPeriodSelect"
     //- 搜索页面曝光
-    case ot_shanyinApp_musicVideoPreview_musicSearch = "shanyinApp_musicVideoPreview_musicSearch"
+    case ot_shanyinApp_musicVideoPreview_musicSearch = "speedApp_musicVideoPreview_musicSearch"
     
     //- 音乐试听数
-    case ot_shanyinApp_musicVideoPreview_musicSearchAudition = "shanyinApp_musicVideoPreview_musicSearchAudition"
+    case ot_shanyinApp_musicVideoPreview_musicSearchAudition = "speedApp_musicVideoPreview_musicSearchAudition"
     //- 音乐使用数
-    case ot_shanyinApp_musicVideoPreview_musicSearchSelect = "shanyinApp_musicVideoPreview_musicSearchSelect"
+    case ot_shanyinApp_musicVideoPreview_musicSearchSelect = "speedApp_musicVideoPreview_musicSearchSelect"
     
     //快慢速模式
     //  - 抛留比例按钮切换点击数
-    case ot_shanyinApp_musicVideoPreview_selectSpeed = "shanyinApp_musicVideoPreview_selectSpeed"
+    case ot_shanyinApp_musicVideoPreview_selectSpeed = "speedApp_musicVideoPreview_selectSpeed"
     //  - 自定义抛留比按钮点击数
-    case ot_shanyinApp_musicVideoPreview_customizeSpeed = "shanyinApp_musicVideoPreview_customizeSpeed"
+    case ot_shanyinApp_musicVideoPreview_customizeSpeed = "speedApp_musicVideoPreview_customizeSpeed"
     //  - 选择节奏
-    case ot_shanyinApp_musicVideoPreview_selectSpeedRhythm = "shanyinApp_musicVideoPreview_selectSpeedRhythm"
+    case ot_shanyinApp_musicVideoPreview_selectSpeedRhythm = "speedApp_musicVideoPreview_selectSpeedRhythm"
     
     // 跳跃卡点模式
     //  - 抛留比例按钮切换点击数
-    case ot_shanyinApp_musicVideoPreview_selectRatio = "shanyinApp_musicVideoPreview_selectRatio"
+    case ot_shanyinApp_musicVideoPreview_selectRatio = "speedApp_musicVideoPreview_selectRatio"
     //  - 自定义抛留比按钮点击数
-    case ot_shanyinApp_musicVideoPreview_customizeRatio = "shanyinApp_musicVideoPreview_customizeRatio"
+    case ot_shanyinApp_musicVideoPreview_customizeRatio = "speedApp_musicVideoPreview_customizeRatio"
     //  - 选择节奏
-    case ot_shanyinApp_musicVideoPreview_selectMusicVideoRhythm = "shanyinApp_musicVideoPreview_selectMusicVideoRhythm"
+    case ot_shanyinApp_musicVideoPreview_selectMusicVideoRhythm = "speedApp_musicVideoPreview_selectMusicVideoRhythm"
    
  
     // 仅配乐模式
     // 循环比例按钮切换点击数
-    case ot_shanyinApp_musicVideoPreview_selectRepeatTimes = "shanyinApp_musicVideoPreview_selectRepeatTimes"
+    case ot_shanyinApp_musicVideoPreview_selectRepeatTimes = "speedApp_musicVideoPreview_selectRepeatTimes"
     //  - 自定义抛留比按钮点击数
-    case ot_shanyinApp_musicVideoPreview_customizeRepeatTimes = "shanyinApp_musicVideoPreview_customizeRepeatTimes"
+    case ot_shanyinApp_musicVideoPreview_customizeRepeatTimes = "speedApp_musicVideoPreview_customizeRepeatTimes"
     //  - 选择节奏
-    case ot_shanyinApp_musicVideoPreview_selectMusicVideoRepeatRhythm = "shanyinApp_musicVideoPreview_selectMusicVideoRepeatRhythm"
+    case ot_shanyinApp_musicVideoPreview_selectMusicVideoRepeatRhythm = "speedApp_musicVideoPreview_selectMusicVideoRepeatRhythm"
         
     /*************** 话题相关objectType ***************/
     case ot_cmunit_syncedBtn = "syncedUpMusicButton" // 音乐视频
@@ -375,6 +375,10 @@ public  enum  objectType: String {
     case ot_cmunit_skipBtn = "skipButton" // 点击「跳过」按钮
     case ot_cmunit_loginButton = "loginButton" // 点击「登录」按钮
     case ot_cmunit_cmtMsgItem = "commentMessageItem" // 评论消息item
+    
+    /*************** 活动相关businessType ***************/
+    case ot_actity_incentive = "weapp_sharer_incentivePlanWindow" // 分享者激励计划活动弹窗的曝光
+    case ot_actity_share = "weapp_share_plan" // 分享者激励计划活动弹窗按钮的点击
 }
 
 // MARK: - 视频上报类型

BFCommonKit/Classes/BFUtility/PQConstant.swift

@@ -127,6 +127,8 @@ public let cTasStorageKey: String = "tas\(cPrimarykey)"
 public let cGameStorageKey: String = "game\(cPrimarykey)"
 public let cSepraStorageKey: String = "sepra\(cPrimarykey)"
 public let cFreeStorageKey: String = "free\(cPrimarykey)"
+public let cShouyyyStorageKey: String = "shouyyy\(cPrimarykey)"
+public let cZhenmonennStorageKey: String = "zhenmonenn\(cPrimarykey)"
 public let cRedImageStorageKey: String = "ic_hbs_enter\(cPrimarykey)"
 public let cNewImageStorageKey: String = "icon_hbs_free\(cPrimarykey)"
 // 当前Tab
@@ -201,7 +203,12 @@ public let cIsShoWedAddBGMPreRemindView: String = "isShoWedAddBGMPreRemindView\(
 public let cShoWedAddBGMRemindView: String = "shoWedAddBGMRemindView\(cPrimarykey)"
 // 刷新已读数
 public let cUpdateMsgNoReadCount: String = "updateMsgNoReadCount\(cPrimarykey)"
-
+// 今日已完成分享次数
+public let cIsTodayFHShareActivity: String = "isTodayFHShareActivity\(cPrimarykey)"
+// 今日是否显示过加入提示
+public let cIsShowTodayJoinActivity: String = "isShowTodayJoinActivity\(cPrimarykey)"
+// 是否取消显示限制
+public let cIsNoForbiddenShareView: String = "isNoForbiddenShareView\(cPrimarykey)"
 // add by ak 是否显示过裁剪引导
 public let cIsShowImageCropGuid: String = "isShowImageCropGuid\(cPrimarykey)"
 // 编辑界面引导是否显示过 add by ak

BFFloat+Ext.swift

@@ -0,0 +1,33 @@
+//
+//  BFFloat+Ext.swift
+//  BFFramework
+//
+//  Created by ak on 2021/10/11.
+//
+
+import Foundation
+
+extension Float {
+    /// 准确的小数尾截取 - 没有进位
+    /*
+     // 11.999003  -> 12.0
+     var pp = 11.999003
+     String(format: "%.1f", pp)  这个方法会进行四舍五入
+     */
+    func decimalString(_ base: Self = 1) -> String {
+       return "\(self.decimalNumber(base))"
+    }
+    func decimalNumber(_ base: Self = 1) -> Float {
+        let tempCount: Self = pow(10, base)
+        let temp = self*tempCount
+        
+        let target = Self(Int(temp))
+        let stepone = target/tempCount
+        if stepone.truncatingRemainder(dividingBy: 1) == 0 {
+            return Float(String(format: "%.0f", stepone)) ?? 0.0
+        }else{
+            return stepone
+        }
+    }
+}
+ 

Example/BFCommonKit.xcodeproj/project.pbxproj

@@ -440,7 +440,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -486,7 +486,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";

Example/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - Alamofire (5.4.3)
+  - Alamofire (5.4.4)
   - BFCommonKit (1.4.9):
     - BFCommonKit/BFBase (= 1.4.9)
     - BFCommonKit/BFCategorys (= 1.4.9)
@@ -8,7 +8,7 @@ PODS:
     - BFCommonKit/BFEnums (= 1.4.9)
     - BFCommonKit/BFUtility (= 1.4.9)
   - BFCommonKit/BFBase (1.4.9):
-    - Alamofire (= 5.4.3)
+    - Alamofire (= 5.4.4)
     - BFCommonKit/BFCategorys
     - BFCommonKit/BFConfig
     - BFCommonKit/BFUtility
@@ -16,22 +16,22 @@ PODS:
     - RealmSwift (= 10.7.6)
     - SnapKit (= 5.0.1)
   - BFCommonKit/BFCategorys (1.4.9):
-    - KingfisherWebP (= 1.3.0)
+    - KingfisherWebP
   - BFCommonKit/BFConfig (1.4.9)
   - BFCommonKit/BFDebug (1.4.9):
     - BFCommonKit/BFCategorys
   - BFCommonKit/BFEnums (1.4.9)
   - BFCommonKit/BFUtility (1.4.9):
-    - Alamofire (= 5.4.3)
+    - Alamofire (= 5.4.4)
     - BFCommonKit/BFCategorys
     - BFCommonKit/BFConfig
     - KeychainAccess (= 4.2.2)
-    - Kingfisher (= 6.3.0)
-    - KingfisherWebP (= 1.3.0)
+    - Kingfisher
+    - KingfisherWebP
     - Toast-Swift (= 5.0.1)
   - FDFullscreenPopGesture (1.1)
   - KeychainAccess (4.2.2)
-  - Kingfisher (6.3.0)
+  - Kingfisher (6.3.1)
   - KingfisherWebP (1.3.0):
     - Kingfisher (~> 6.2)
     - libwebp (>= 1.1.0)
@@ -73,11 +73,11 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  Alamofire: e447a2774a40c996748296fa2c55112fdbbc42f9
-  BFCommonKit: 61380c2c5d74333d4a60fe52a3321c937b2a1f06
+  Alamofire: f3b09a368f1582ab751b3fff5460276e0d2cf5c9
+  BFCommonKit: af7ab17be94765ab4162fb43971167da4f41e0a0
   FDFullscreenPopGesture: a8a620179e3d9c40e8e00256dcee1c1a27c6d0f0
   KeychainAccess: c0c4f7f38f6fc7bbe58f5702e25f7bd2f65abf51
-  Kingfisher: 6c3df386db71d82c0817a429d2c9421a77396529
+  Kingfisher: 016c8b653a35add51dd34a3aba36b580041acc74
   KingfisherWebP: dec17a5eb1af2658791bde1f93ae9a853678f826
   libwebp: 98a37e597e40bfdb4c911fc98f2c53d0b12d05fc
   Realm: ed860452717c8db8f4bf832b6807f7f2ce708839
@@ -87,4 +87,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 5c138dc5d174c9336dd4473cb26265c7619334aa
 
-COCOAPODS: 1.10.2
+COCOAPODS: 1.11.2

UICollectionView+Ext.swift

@@ -0,0 +1,70 @@
+//
+//  UICollectionView+Ext.swift
+//  PQCreativeCommunity
+//
+//  Created by SanW on 2021/8/4.
+//  Copyright © 2021 BytesFlow. All rights reserved.
+//
+
+import Foundation
+import MJRefresh
+
+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 }
+    }
+}