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

合并代码

BFFramework/Classes/Base/View/PQChoseMaterialCell.swift

@@ -66,7 +66,8 @@ class PQChoseMaterialCell: UICollectionViewCell {
     lazy var choseBtn: UIButton = {
         let choseBtn = UIButton(type: .custom)
         choseBtn.setBackgroundImage(UIImage.init().BF_Image(named:  "videomk_chose_nomal"), for: .normal)
-        choseBtn.setBackgroundImage(UIImage.init().BF_Image(named:  "videomk_chose_selected"), for: .selected)
+        choseBtn.setBackgroundImage(UIImage.init().BF_Image(named:  "videomk_chose_selected").withRenderingMode(.alwaysTemplate), for: .selected)
+        choseBtn.tintColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
         choseBtn.setTitleColor(UIColor.white, for: .normal)
         choseBtn.titleLabel?.font = UIFont.systemFont(ofSize: 12)
         choseBtn.tag = 1

BFFramework/Classes/Enums/Enums.swift

@@ -117,7 +117,7 @@ public enum PAGESOURCE: String {
     case sp_reproduce_fatherDetailList = "speedApp-videoDetail_reproduceCollection_father" // 再制作父列表页面
     // add by ak
     case sp_speedApp_upload2Compose = "speedApp-upload2Compose" // 上传转创作
-    
+
     /*************** 卡点视频相关pageSource ***************/
     case sp_stuck_selectMaterial = "speedApp-selectSyncedUpMaterial" // 卡点视频素材选择页
     case sp_stuck_selectSynceedUpMusic = "speedApp-selectSynceedUpMusic" // 卡点视频音乐选择页
@@ -223,7 +223,7 @@ enum objectType: String {
     case speedApp_clickButton_addMusic // 「创作工具页」：添加音乐 - 按钮点击
     case speedApp_viewButton_addMusicTip // 创作工具页」：添加音乐提示 - 按钮曝光
     case speedApp_clickButton_addMusicTip // 「创作工具页」：添加音乐提示 - 按钮点击
-    
+
     /*************** 卡点视频相关objectType ***************/
     case ot_click_syncedUpMusic = "speedApp_clickButton_syncedUpMusic" // 弹出面板中点击「卡点视频」按键
     case ot_view_selectSyncedUpMaterial = "speedApp_viewWindow_selectSyncedUpMaterial" // 曝光上报：卡点视频素材选择页
@@ -250,7 +250,6 @@ enum objectType: String {
     case ot_click_shareWechat = "speedApp_clickButton_shareWechat" // 点击上报：分享微信
     case ot_click_shareWechatMoment = "speedApp_clickButton_shareWechatMoment" // 点击上报：分享朋友圈
     case ot_click_finished = "speedApp_clickButton_finished" // 点击上报：完成
-
 }
 
 // MARK: - 视频上报类型
@@ -724,4 +723,11 @@ public enum videoFromScene: Int {
     case stuckPoint = 5 // 卡点视频制作
 }
 
+// MARK: - 风格
 
+/// 风格
+public enum styleColor: String {
+    case nomal = "#F1034D"
+    case green = "#3DC1C1"
+    case red = "#EE0051"
+}

BFFramework/Classes/Stuckpoint/Controller/PQStuckPointEditerController.swift

@@ -45,7 +45,7 @@ class PQStuckPointEditerController: PQBaseViewController {
         nextBtn.setTitle("去合成", for: .normal)
         nextBtn.titleLabel?.font = UIFont.systemFont(ofSize: 13)
         nextBtn.addTarget(self, action: #selector(nextBtnClick(sender:)), for: .touchUpInside)
-        nextBtn.backgroundColor = UIColor.hexColor(hexadecimal: "#EE0051")
+        nextBtn.backgroundColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
         nextBtn.setTitleColor(UIColor.hexColor(hexadecimal: "#FFFFFF"), for: .normal)
         nextBtn.uxy_acceptEventInterval = 0.5
         nextBtn.addCorner(corner: 3)

BFFramework/Classes/Stuckpoint/Controller/PQStuckPointMaterialController.swift

@@ -93,7 +93,7 @@ public class PQStuckPointMaterialController: PQBaseViewController {
         let choseLineView = UIView(frame: CGRect(x: 0, y: 0, width: 25, height: 2))
         choseLineView.frame.origin.y = (navHeadImageView?.frame.maxY ?? 0) - 5
         choseLineView.center.x = choseLocalVideoBtn.center.x
-        choseLineView.backgroundColor = UIColor.hexColor(hexadecimal: "#EE0051")
+        choseLineView.backgroundColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
         return choseLineView
     }()
 
@@ -293,7 +293,7 @@ public class PQStuckPointMaterialController: PQBaseViewController {
         selectedImageDataCount = imageCount
         confirmBtn.isSelected = (selectedDataCount > 0 && (imageCount >= 2 || selectedDataCount > imageCount))
         if confirmBtn.isSelected {
-            confirmBtn.backgroundColor = UIColor.hexColor(hexadecimal: "#EE0051")
+            confirmBtn.backgroundColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
 //            if !materialHeadView.isHidden {
 //                UIView.animate(withDuration: 0.5, delay: 0, options: .allowUserInteraction) { [weak self] in
 //                    // 调整位置
@@ -320,7 +320,7 @@ public class PQStuckPointMaterialController: PQBaseViewController {
             bottomRemindLab.attributedText = att
         } else {
             let att = NSMutableAttributedString(string: "素材总时长 \(totalDuration.formatDurationToHMS())")
-            att.setAttributes([.foregroundColor: UIColor.hexColor(hexadecimal: "#EE0051")], range: NSRange(location: 6, length: "\(totalDuration.formatDurationToHMS())".count))
+            att.setAttributes([.foregroundColor: UIColor.hexColor(hexadecimal: PQBFConfig.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/PQStuckPointPublicController.swift

@@ -196,7 +196,7 @@ class PQStuckPointPublicController: PQBaseViewController {
     lazy var progressView: UIProgressView = {
         let progressView = UIProgressView(progressViewStyle: .default)
         progressView.trackTintColor = UIColor(white: 0, alpha: 0.5)
-        progressView.progressTintColor = UIColor(red: 238 / 255.0, green: 0, blue: 81 / 255.0, alpha: 0.7)
+        progressView.progressTintColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
         progressView.transform = CGAffineTransform(scaleX: 1.0, y: playerHeaderView.frame.height / 3.0)
         return progressView
     }()
@@ -789,7 +789,7 @@ extension PQStuckPointPublicController {
         oprationBgView.removeFromSuperview()
         playBtn.isHidden = true
         finishedBtn.isSelected = true
-        finishedBtn.backgroundColor = UIColor.hexColor(hexadecimal: "#EE0051")
+        finishedBtn.backgroundColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
         avPlayer.replaceCurrentItem(with: AVPlayerItem(url: URL(fileURLWithPath: (exportLocalURL?.absoluteString ?? "").replacingOccurrences(of: "file:///", with: ""))))
         avPlayer.play()
         if isError {

BFFramework/Classes/Stuckpoint/View/PQCuttingPointView.swift

@@ -12,12 +12,13 @@ class PQCuttingPointView: UIView {
     lazy var pointView: UIView = {
         let pointView = UIView()
         pointView.addCorner(corner: 1.5)
-        pointView.backgroundColor = UIColor.hexColor(hexadecimal: "#EE0351")
+        pointView.backgroundColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
         return pointView
     }()
 
     lazy var dragingImageView: UIImageView = {
-        let dragingImageView = UIImageView(image: UIImage.init().BF_Image(named:  "stuckPoint_dragingImage"))
+        let dragingImageView = UIImageView(image: UIImage.init().BF_Image(named:  "stuckPoint_dragingImage").withRenderingMode(.alwaysTemplate))
+        dragingImageView.tintColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
         return dragingImageView
     }()
 

BFFramework/Classes/Stuckpoint/View/PQStuckPointMusicContentCell.swift

@@ -70,13 +70,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: "#F1034D")
+        confirmBtn.backgroundColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
         return confirmBtn
     }()
 
     lazy var remindView: UIView = {
         let remindView = UIView()
-        remindView.backgroundColor = UIColor.hexColor(hexadecimal: "#F1034D")
+        remindView.backgroundColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
         remindView.addCorner(corner: 3)
         return remindView
     }()
@@ -150,7 +150,7 @@ class PQStuckPointMusicContentCell: UICollectionViewCell {
                 titleLab.font = UIFont.systemFont(ofSize: 14)
             }
             contentView.backgroundColor = UIColor.hexColor(hexadecimal: ((bgmData as? PQStuckPointMusicTagsModel)?.isSelected ?? false) ? "#111111" : "#212121")
-            titleLab.textColor = UIColor.hexColor(hexadecimal: ((bgmData as? PQStuckPointMusicTagsModel)?.isSelected ?? false) ? "#F1034D" : "#CCCCCC")
+            titleLab.textColor = UIColor.hexColor(hexadecimal: ((bgmData as? PQStuckPointMusicTagsModel)?.isSelected ?? false) ? PQBFConfig.shared.styleColor.rawValue : "#CCCCCC")
             remindView.isHidden = !((bgmData as? PQStuckPointMusicTagsModel)?.isSelected ?? false)
         }
     }

BFFramework/Classes/Stuckpoint/View/PQStuckPointMusicTagsContentCell.swift

@@ -43,9 +43,9 @@ class PQStuckPointMusicTagsContentCell: UICollectionViewCell {
     func addData() {
         titleLab.text = "\(tagData?.tagName ?? "")"
         if tagData?.isSelected ?? false {
-            titleLab.textColor = UIColor.hexColor(hexadecimal: "#F1034D")
+            titleLab.textColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
             titleLab.layer.borderWidth = 0.5
-            titleLab.layer.borderColor = UIColor.hexColor(hexadecimal: "#F1034D").cgColor
+            titleLab.layer.borderColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue).cgColor
         } else {
             titleLab.textColor = UIColor.hexColor(hexadecimal: "#CCCCCC")
             titleLab.layer.borderWidth = 0

BFFramework/Classes/Stuckpoint/View/PQVideoCutingOprateView.swift

@@ -59,17 +59,19 @@ class PQVideoCutingOprateView: UIView {
     lazy var durationLabel: UILabel = {
         let durationLabel = UILabel()
         durationLabel.font = UIFont.systemFont(ofSize: 11, weight: .medium)
-        durationLabel.backgroundColor = UIColor(red: 238 / 255, green: 0, blue: 81 / 255, alpha: 0.3)
+        durationLabel.backgroundColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
+        durationLabel.alpha = 0.1
         durationLabel.textColor = UIColor.white
         durationLabel.textAlignment = .center
         return durationLabel
     }()
 
     lazy var leftOprateView: UIImageView = {
-        let leftOprateView = UIImageView(image:UIImage.init().BF_Image(named:  "videomk_crop_left"))
+        let leftOprateView = UIImageView(image:UIImage.init().BF_Image(named:  "videomk_crop_left").withRenderingMode(.alwaysTemplate))
+        leftOprateView.tintColor = UIColor.white
         leftOprateView.contentMode = .scaleAspectFill
         leftOprateView.isUserInteractionEnabled = true
-        leftOprateView.backgroundColor = UIColor.white
+        leftOprateView.backgroundColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
         let panGes = UIPanGestureRecognizer(target: self, action: #selector(panGesture(gesture:)))
         panGes.maximumNumberOfTouches = 1
         panGes.minimumNumberOfTouches = 1
@@ -78,10 +80,11 @@ class PQVideoCutingOprateView: UIView {
     }()
 
     lazy var rightOprateView: UIImageView = {
-        let rightOprateView = UIImageView(image: UIImage.init().BF_Image(named:  "videomk_crop_right"))
+        let rightOprateView = UIImageView(image: UIImage.init().BF_Image(named:  "videomk_crop_right").withRenderingMode(.alwaysTemplate))
+        rightOprateView.tintColor = UIColor.white
+        rightOprateView.backgroundColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
         rightOprateView.contentMode = .scaleAspectFill
         rightOprateView.isUserInteractionEnabled = true
-        rightOprateView.backgroundColor = UIColor.white
         let panGes = UIPanGestureRecognizer(target: self, action: #selector(panGesture(gesture:)))
         panGes.maximumNumberOfTouches = 1
         panGes.minimumNumberOfTouches = 1
@@ -91,13 +94,13 @@ class PQVideoCutingOprateView: UIView {
 
     lazy var topLineView: UIImageView = {
         let topLineView = UIImageView()
-        topLineView.backgroundColor = UIColor.white
+        topLineView.backgroundColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
         return topLineView
     }()
 
     lazy var bottomLineView: UIImageView = {
         let bottomLineView = UIImageView()
-        bottomLineView.backgroundColor = UIColor.white
+        bottomLineView.backgroundColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
         return bottomLineView
     }()
 

BFFramework/Classes/Utils/PQBFConfig.swift

@@ -0,0 +1,25 @@
+//
+//  PQBFConfig.swift
+//  BFFramework
+//
+//  Created by SanW on 2021/6/4.
+//
+
+import UIKit
+
+public class PQBFConfig: NSObject {
+    public static let shared = PQBFConfig()
+    public var styleColor: styleColor = .green
+
+    override private init() {
+        super.init()
+    }
+
+    override public func copy() -> Any {
+        return self
+    }
+
+    override public func mutableCopy() -> Any {
+        return self
+    }
+}

Example/BFFramework.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

Example/BFFramework/ViewController.swift

@@ -6,11 +6,8 @@
 //  Copyright (c) 2021 287971051@qq.com. All rights reserved.
 //
 
-import UIKit
-//import NXFramework_Swift
-
 import BFFramework
-
+import UIKit
 
 class ViewController: UIViewController {
     override func viewDidLoad() {
@@ -18,11 +15,10 @@ class ViewController: UIViewController {
         view.backgroundColor = .white
 
         navigationItem.rightBarButtonItem = UIBarButtonItem(title: "下一个", style: UIBarButtonItemStyle.plain, target: self, action: Selector(("next:")))
- 
         let btn = UIButton(type: .contactAdd)
-        btn.frame =  CGRect(x: 100, y: 100, width: 100, height: 100)
+        btn.frame = CGRect(x: 100, y: 100, width: 100, height: 100)
         view.addSubview(btn)
- 
+
         btn.addTarget(self, action: #selector(btnClicked), for: .touchUpInside)
     }
 
@@ -34,6 +30,7 @@ class ViewController: UIViewController {
     @objc func btnClicked() -> String {
         print("打开界面")
         BFLog(message: "ssssss")
+        PQBFConfig.shared.styleColor = .green
         navigationController?.pushViewController(PQStuckPointMaterialController(), animated: true)
         return "111"
     }

Example/Podfile.lock

@@ -78,4 +78,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: fbceb8d678f3260ea2e79f17e99b626365bfef4d
 
-COCOAPODS: 1.10.1
+COCOAPODS: 1.10.0

Example/Pods/Manifest.lock

@@ -78,4 +78,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: fbceb8d678f3260ea2e79f17e99b626365bfef4d
 
-COCOAPODS: 1.10.1
+COCOAPODS: 1.10.0