1.接入公共库

BFFramework.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'BFFramework'
-  s.version          = '0.1.1'
+  s.version          = '1.0.0'
   s.summary          = 'Byte fllow 基础组件库'
   s.swift_version    = '5.0'
 # This description is used to generate tags and improve search results.
@@ -49,18 +49,13 @@ TODO: Add long description of the pod here.
     # 排除非 ios 平台的文件
     # s.ios.exclude_files = 'framework/Source/Mac', 'framework/Source/Linux', 'framework/Source/Operations/Shaders/ConvertedShaders_GL.swift'
 
-    s.dependency 'Alamofire','4.9.1' # 网络请求库
-    s.dependency 'SnapKit','4.2.0' # 布局库
-    s.dependency 'Kingfisher','6.3.0' # 图片加载库
-    s.dependency 'KingfisherWebP','1.3.0' # 加载WebP格式图片库 使用https://github.com/webmproject/libwebp.git地址可以不翻
-    s.dependency 'RealmSwift','10.7.2' # Realm数据库
+    s.dependency 'BFNetRequestKit'
+    s.dependency 'BFCommonKit'
+#    s.dependency 'BFCommonKit', :path => '/Users/sanw/Desktop/BytesFlow/Person/Projects/BFCommonKit/'
     s.dependency 'ObjectMapper','4.2.0' # json转model库
-    s.dependency 'KeychainAccess','4.2.2' # 钥匙串库
-    s.dependency 'Toast-Swift','5.0.1' # Toast提示组件
     s.dependency 'AliyunOSSiOS','2.10.8' # 阿里云组件
     s.dependency 'WechatOpenSDK-Swift','1.8.7.1' # 微信组件
     s.dependency 'MJRefresh','3.6.1' # 刷新组件
-    s.dependency 'FDFullscreenPopGesture' ,'1.1'
     s.dependency 'LMJHorizontalScrollText' ,'2.0.2'
     s.dependency 'TXLiteAVSDK_Player','8.7.10102' # 腾讯播放器组件
     s.dependency 'Bugly','2.5.90' #crash log 收集

BFFramework/Classes/BFFramework_custom_umbrella.h

@@ -10,13 +10,10 @@
 #define AliyunOSSiOSAK_Bridging_Header
 
 #import "AliyunOSSiOS/AliyunOSSiOS.h"
-#import "PQBridgeObject.h"
 #import "MJRefresh/MJRefresh.h"
-#import "FDFullscreenPopGesture/UINavigationController+FDFullscreenPopGesture.h"
 #import "DES3Util.h"
 #import "LMJHorizontalScrollText/LMJHorizontalScrollText.h"
 #import "FBShimmeringView.h"
-#import "UIControl+NXCategory.h"
 #import <TXLiteAVSDK_Player/TXLiteAVSDK.h>
 #import <Bugly/Bugly.h>
 

BFFramework/Classes/BFModules/BFUtility/PQAliOssUtil.swift

@@ -7,6 +7,8 @@
 //
 
 import UIKit
+import BFCommonKit
+import BFNetRequestKit
 
 // MARK: - 阿里OSS工具类
 

BFFramework/Classes/BFModules/BFUtility/PQSingletoRealmUtil.swift

@@ -8,6 +8,7 @@
 
 import RealmSwift
 import UIKit
+import BFCommonKit
 
 public class PQSingletoRealmUtil: NSObject {
     public  var schemaVersion : UInt64 = 32

BFFramework/Classes/BFModules/BFUtility/PQSingletoSourcesFileUtil.swift

@@ -8,6 +8,7 @@
 //
 
 import UIKit
+import BFCommonKit
 
 public class PQSingletoSourcesFileUtil: NSObject {
     static public let shared = PQSingletoSourcesFileUtil()

BFFramework/Classes/BFModules/BFUtility/PQSingletoVideoPlayer.swift

@@ -8,6 +8,7 @@
 //
 
 import UIKit
+import BFCommonKit
 
 public class PQSingletoVideoPlayer: NSObject {
     public static let shared = PQSingletoVideoPlayer()

BFFramework/Classes/Base/Controller/PQPhotoAlbumController.swift

@@ -8,6 +8,8 @@
 
 import Photos
 import UIKit
+import BFCommonKit
+
 /// 相册集
 open class PQPhotoAlbumController: PQBaseViewController {
     public  var selectedHandle: ((_ selectedData: PQUploadModel?) -> Void)? // 选中/取消选中的回调

BFFramework/Classes/Base/Controller/PQPhotoMaterialController.swift

@@ -8,6 +8,7 @@
 
 import Photos
 import UIKit
+import BFCommonKit
 
 class PQPhotoMaterialController: PQBaseViewController {
     // 是否显示素材标识

BFFramework/Classes/Base/View/PQActivityIndicatorView.swift

@@ -7,7 +7,8 @@
 //  功能： 显示 UIActivityIndicatorView
 
 import UIKit
-
+import BFCommonKit
+ 
 class PQActivityIndicatorView: UIView {
     func showHud(isCovered: Bool = false) {
         hideHud()

BFFramework/Classes/Base/View/PQAssetCategoryCell.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import BFCommonKit
 
 public class PQAssetCategoryCell: UICollectionViewCell {
     public var representedAssetIdentifier: String!

BFFramework/Classes/Base/View/PQBaseVideoInfoView.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import BFCommonKit
 
 open class PQBaseVideoInfoView: UIView {
     lazy public var imageView: UIImageView = {

BFFramework/Classes/Base/View/PQChoseMaterialCell.swift

@@ -9,6 +9,7 @@
 import Kingfisher
 import UIKit
 import Photos
+import BFCommonKit
 
 public class PQChoseMaterialCell: UICollectionViewCell {
     // 是否显示素材标识

BFFramework/Classes/Base/View/PQSectionHeadView.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import BFCommonKit
 
 public class PQSectionHeadView: UIView {
     // 清除按钮回调

BFFramework/Classes/Base/View/PQSelectedOprationView.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import BFCommonKit
 
 // MARK: - 选择操作view
 

BFFramework/Classes/Base/ViewModel/PQBaseViewModel.swift

@@ -10,6 +10,8 @@ import Alamofire
 import UIKit
 import ObjectMapper
 import RealmSwift
+import BFCommonKit
+import BFNetRequestKit
 
 public class PQBaseViewModel: NSObject {
     
@@ -26,7 +28,7 @@ public class PQBaseViewModel: NSObject {
     ///   - completeHander: completeHander description
     /// - Returns: <#description#>
     public class func searchBGMListData(_ keyWord: String?, _ pageNum: Int = 1, _ pageSize: Int = 30,videoCount: Int = 0, imageCount: Int = 0, totalDuration: Float64 = 0, completeHander: @escaping (_ bgmList: [PQVoiceModel], _ msg: String?) -> Void) {
-        SWNetRequest.postRequestData(url: PQENVUtil.shared.materialSearchApi + searchBGMMaterialUrl, parames: ["keyWord": keyWord ?? "", "pageNo": pageNum, "pageSize": pageSize], encoding: JSONEncoding.default) { response, _, error, _ in
+        BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.materialSearchApi + searchBGMMaterialUrl, parames: ["keyWord": keyWord ?? "", "pageNo": pageNum, "pageSize": pageSize], commonParams: commonParams(), encoding: JSONEncoding.default) { response, _, error, _ in
             DispatchQueue.global().async {
                 var bgmList = Array<PQVoiceModel>.init()
                 if response is NSNull || response == nil {
@@ -61,7 +63,7 @@ public class PQBaseViewModel: NSObject {
             completeHander(true)
             return
         }
-        SWNetRequest.postRequestData(url: PQENVUtil.shared.longvideoapi + systemAppConfigUrl, parames: nil) { response, _, _, _ in
+        BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.longvideoapi + systemAppConfigUrl, parames: nil, commonParams: commonParams()) { response, _, _, _ in
             if response != nil, !(response is NSNull), (response as! [String: Any]).keys.contains("needLogin") {
                 let needLogin: String = "\((response as! [String: Any])["needLogin"] ?? "0")"
                 saveUserDefaults(key: cNeedLoginKey, value: needLogin)
@@ -78,7 +80,7 @@ public class PQBaseViewModel: NSObject {
     /// - Parameter completeHander: <#completeHander description#>
     /// - Returns: <#description#>
     public class func systemBaseConfig(completeHander: @escaping (_ isSuccess: Bool) -> Void) {
-        SWNetRequest.postRequestData(url: PQENVUtil.shared.longvideoapi + systemConfigUrl, parames: nil) { _, _, _, _ in
+        BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.longvideoapi + systemConfigUrl, parames: nil, commonParams: commonParams()) { _, _, _, _ in
             completeHander(true)
         }
     }
@@ -91,7 +93,7 @@ public class PQBaseViewModel: NSObject {
     ///   - completeHander: <#completeHander description#>
     /// - Returns: <#description#>
     public class func deleteVideo(videoId: Int, completeHander: @escaping (_ isSuccess: Bool,_ videoId: Int, _ msg: String?) -> Void) {
-        SWNetRequest.postRequestData(url: PQENVUtil.shared.longvideoapi + deleteVideoUrl, parames: ["videoId": videoId]) { response, _, error, _ in
+        BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.longvideoapi + deleteVideoUrl, parames: ["videoId": videoId], commonParams: commonParams()) { response, _, error, _ in
             if response != nil {
                 postNotification(name: cDeleteVideoSuccessKey, userInfo: ["videoId": "\(videoId)"])
                 completeHander(true,videoId, nil)
@@ -107,7 +109,7 @@ public class PQBaseViewModel: NSObject {
     ///   - completeHander: <#completeHander description#>
     /// - Returns: <#description#>
     public class func hateVideo(videoId: Int, completeHander: @escaping (_ isSuccess: Bool, _ msg: String?) -> Void) {
-        SWNetRequest.postRequestData(url: PQENVUtil.shared.longvideoapi + hateVideoUrl, parames: ["videoId": videoId]) { response, _, error, _ in
+        BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.longvideoapi + hateVideoUrl, parames: ["videoId": videoId], commonParams: commonParams()) { response, _, error, _ in
             if response != nil {
                 completeHander(true, nil)
             } else {
@@ -140,7 +142,7 @@ public class PQBaseViewModel: NSObject {
         } else {
             params["pageNo"] = pageNo
         }
-        SWNetRequest.postRequestData(url: url, parames: params) { response, _, error, _ in
+        BFNetRequestAdaptor.postRequestData(url: url, parames: params, commonParams: commonParams()) { response, _, error, _ in
             BFLog(message: "当前线程:\(Thread.isMainThread) ")
             DispatchQueue.global().async {
                 BFLog(message: "当前线程 global:\(Thread.isMainThread) ")
@@ -188,7 +190,7 @@ public class PQBaseViewModel: NSObject {
         } else {
             url = url + reportVideoListUrl
         }
-        SWNetRequest.postRequestData(url: url, parames: nil) { response, _, _, _ in
+        BFNetRequestAdaptor.postRequestData(url: url, parames: nil, commonParams: commonParams()) { response, _, _, _ in
             var reportList = Array<PQBaseModel>.init()
             if response is NSNull || response == nil {
                 completeHander(reportList)
@@ -232,7 +234,7 @@ public class PQBaseViewModel: NSObject {
             url = url + reportVideoUrl
             params["videoId"] = uniqueId
         }
-        SWNetRequest.postRequestData(url: url, parames: params) { _, _, _, _ in
+        BFNetRequestAdaptor.postRequestData(url: url, parames: params, commonParams: commonParams()) { _, _, _, _ in
             completeHander(true)
         }
     }
@@ -249,7 +251,7 @@ public class PQBaseViewModel: NSObject {
         } else {
             url = url + unBannedUserUrl
         }
-        SWNetRequest.postRequestData(url: url, parames: ["targetUid": targetUid]) { _, _, _, _ in
+        BFNetRequestAdaptor.postRequestData(url: url, parames: ["targetUid": targetUid], commonParams: commonParams()) { _, _, _, _ in
             postNotification(name: cBannedNotiKey, userInfo: ["userId": targetUid, "isBanned": isBanned ? 1 : 0])
             completeHander(true, isBanned)
         }
@@ -261,7 +263,7 @@ public class PQBaseViewModel: NSObject {
     ///   - completeHander: <#completeHander description#>
     /// - Returns: <#description#>
     public class func isBannedUser(targetUid: Int, completeHander: @escaping (_ isSuccess: Bool, _ isBanned: Bool) -> Void) {
-        SWNetRequest.postRequestData(url: PQENVUtil.shared.longvideoapi + isBannedUserUrl, parames: ["targetUid": targetUid]) { response, _, _, _ in
+        BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.longvideoapi + isBannedUserUrl, parames: ["targetUid": targetUid], commonParams: commonParams()) { response, _, _, _ in
             if response == nil {
                 completeHander(false, false)
             } else {
@@ -274,7 +276,7 @@ public class PQBaseViewModel: NSObject {
     /// - Parameter completeHander: <#completeHander description#>
     /// - Returns: <#description#>
     class public func bannedUserList(completeHander: @escaping (_ listData: [PQUserInfoModel]?) -> Void) {
-        SWNetRequest.postRequestData(url: PQENVUtil.shared.longvideoapi + bannedUserListUrl, parames: nil) { response, _, _, _ in
+        BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.longvideoapi + bannedUserListUrl, parames: nil, commonParams: commonParams()) { response, _, _, _ in
             var listData = Array<PQUserInfoModel>.init()
             if response is NSNull || response == nil {
                 completeHander(listData)
@@ -307,7 +309,7 @@ public class PQBaseViewModel: NSObject {
             url = url + videoDetailUrl
             params = ["videoId": videoId]
         }
-        SWNetRequest.postRequestData(url: url, parames: params) { response, _, error, _ in
+        BFNetRequestAdaptor.postRequestData(url: url, parames: params, commonParams: commonParams()) { response, _, error, _ in
             if response is NSNull || response == nil {
                 completeHander(nil, error?.code, error?.msg)
                 return
@@ -332,7 +334,7 @@ public class PQBaseViewModel: NSObject {
     }
 
     public class func h5ShareLinkInfo(videoId: String, pageSource: PAGESOURCE, completeHander: @escaping (_ shareLinkPath: String?, _ mag: String?) -> Void) {
-        SWNetRequest.postRequestData(url: PQENVUtil.shared.longvideoapi + h5ShareLinkUrl, parames: ["videoId": videoId, "pageSource": pageSource.rawValue, "h5WxRootPageSource": pageSource.rawValue]) { response, _, _, _ in
+        BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.longvideoapi + h5ShareLinkUrl, parames: ["videoId": videoId, "pageSource": pageSource.rawValue, "h5WxRootPageSource": pageSource.rawValue], commonParams: commonParams()) { response, _, _, _ in
             if response is NSNull || response == nil {
                 completeHander(nil, "获取分享地址失败")
                 return
@@ -342,7 +344,7 @@ public class PQBaseViewModel: NSObject {
     }
 
     public class func wxFriendShareInfo(videoId: String, completeHander: @escaping (_ shareImagePath: String?, _ shareTitle: String?, _ shareWeappRawId: String?, _ mag: String?) -> Void) {
-        SWNetRequest.postRequestData(url: PQENVUtil.shared.longvideoapi + wxFriendUrl, parames: ["videoId": videoId]) { response, _, _, _ in
+        BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.longvideoapi + wxFriendUrl, parames: ["videoId": videoId], commonParams: commonParams()) { response, _, _, _ in
             if response is NSNull || response == nil {
                 completeHander(nil, nil, nil, "获取分享好友数据失败")
                 return
@@ -355,7 +357,7 @@ public class PQBaseViewModel: NSObject {
     /// 获取白名单设置
     /// - Returns: <#description#>
     public class func datashowAllowData(completeHander: @escaping (_ isShowInfo: Bool, _ msg: String?) -> Void) {
-        SWNetRequest.postRequestData(url: PQENVUtil.shared.longvideoapi + datashowAllowUrl, parames: ["mid": getMachineCode()], encoding: JSONEncoding.default) { response, _, _, _ in
+        BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.longvideoapi + datashowAllowUrl, parames: ["mid": getMachineCode()], commonParams: commonParams(), encoding: JSONEncoding.default) { response, _, _, _ in
             if response is NSNull || response == nil {
                 completeHander(false, "获取白名单数据失败")
                 return
@@ -368,7 +370,7 @@ public class PQBaseViewModel: NSObject {
     /// add by ak 取 STS token
     /// - Parameter completeHander: completeHander description
     public class func getStsToken(completeHander: @escaping completeHander) {
-        SWNetRequest.postRequestData(url: PQENVUtil.shared.longvideoapi + getStsTokenUrl, parames: ["fileType": "2", "type": 1]) { response, _, error, _ in
+        BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.longvideoapi + getStsTokenUrl, parames: ["fileType": "2", "type": 1], commonParams: commonParams()) { response, _, error, _ in
             if error != nil {
                 completeHander(nil, error?.msg)
                 return
@@ -381,7 +383,7 @@ public class PQBaseViewModel: NSObject {
     /// - Parameter completeHander: <#completeHander description#>
     /// - Returns: <#description#>
     public class func ossTempToken(completeHander: @escaping completeHander) {
-        SWNetRequest.postRequestData(url: PQENVUtil.shared.longvideoapi + ossTempTokenUrl, parames: ["type": "2", "fileType": "1"]) { response, _, _, _ in
+        BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.longvideoapi + ossTempTokenUrl, parames: ["type": "2", "fileType": "1"], commonParams: commonParams()) { response, _, _, _ in
             completeHander(response as? [String: Any], nil)
         }
     }
@@ -391,7 +393,7 @@ public class PQBaseViewModel: NSObject {
     /// - Returns: <#description#>
     public class func getBaseConfig(completeHander: @escaping (_ titles: Array<String>?) -> Void) {
       
-        SWNetRequest.postRequestData(url: PQENVUtil.shared.longvideoapi + getBaseConfigURL, parames: nil) { response, _, _, _ in
+        BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.longvideoapi + getBaseConfigURL, parames: nil, commonParams: commonParams()) { response, _, _, _ in
             if response != nil, !(response is NSNull) {
  
                 let responseDic = response as! [String: Any]
@@ -447,7 +449,7 @@ extension PQBaseViewModel {
          "title": "string",
          "updateTimestamp": 0
          */
-        SWNetRequest.postRequestData(url: PQENVUtil.shared.clipapiapi + saveDraftboxUrl, parames: parames) { response, _, error, _ in
+        BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.clipapiapi + saveDraftboxUrl, parames: parames, commonParams: commonParams()) { response, _, error, _ in
             if error != nil {
                 completeHander(nil, error?.msg)
                 return
@@ -472,7 +474,7 @@ extension PQBaseViewModel {
         if draftboxId != nil {
             parames["draftboxId"] = draftboxId
         }
-        SWNetRequest.postRequestData(url: PQENVUtil.shared.clipapiapi + saveProjectUrl, parames: parames) { response, _, error, _ in
+        BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.clipapiapi + saveProjectUrl, parames: parames, commonParams: commonParams()) { response, _, error, _ in
             if error != nil {
                 completeHander(nil, error?.msg)
                 return
@@ -492,7 +494,7 @@ extension PQBaseViewModel {
         if projectId != nil {
             parames["projectId"] = projectId
         }
-        SWNetRequest.postRequestData(url: PQENVUtil.shared.clipapiapi + updateProjectUrl, parames: parames) { response, _, error, _ in
+        BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.clipapiapi + updateProjectUrl, parames: parames, commonParams: commonParams()) { response, _, error, _ in
             if error != nil {
                 completeHander(nil, error?.msg)
                 return
@@ -510,7 +512,7 @@ extension PQBaseViewModel {
     ///   - completeHander: <#completeHander description#>
     /// - Returns: <#description#>
     public class func reportSendVideo(_ projectId: String, _ videoId: String, videoFromScene: videoFromScene, completeHander: @escaping (_ isSeccess: Bool, _ msg: String?) -> Void) {
-        SWNetRequest.postRequestData(url: PQENVUtil.shared.clipapiapi + reportSendVideoUrl, parames: ["projectId": projectId, "videoId": videoId, "fromScene": videoFromScene.rawValue]) { _, _, error, _ in
+        BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.clipapiapi + reportSendVideoUrl, parames: ["projectId": projectId, "videoId": videoId, "fromScene": videoFromScene.rawValue], commonParams: commonParams()) { _, _, error, _ in
 
             BFLog(message: "发布视频后上报:projectId = \(projectId),videoId = \(videoId)")
             if error != nil {
@@ -529,7 +531,7 @@ extension PQBaseViewModel {
     ///   - completeHander: <#completeHander description#>
     public class func listUserDraftbox(lastTimestamp: Int, pageSize: Int = 10, isSelected: Bool = false, completeHander: @escaping (_ projectList: [PQEditProjectModel]?, _ msg: String?) -> Void) {
         let params: [String: Any] = ["pageSize": pageSize, "lastTimestamp": lastTimestamp]
-        SWNetRequest.postRequestData(url: PQENVUtil.shared.clipapiapi + listUserDraftboxUrl, parames: params) { response, _, error, _ in
+        BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.clipapiapi + listUserDraftboxUrl, parames: params, commonParams: commonParams()) { response, _, error, _ in
             if error?.code == -1009 || error?.code == -1001 {
                 cShowHUB(superView: nil, msg: "网络不可用")
             }
@@ -561,7 +563,7 @@ extension PQBaseViewModel {
     /// - Parameter completeHander: <#completeHander description#>
     /// - Returns: <#description#>
     public class func draftboxUserCount(completeHander: @escaping (_ draftboxCount: Int, _ msg: String?) -> Void) {
-        SWNetRequest.postRequestData(url: PQENVUtil.shared.clipapiapi + draftboxUserCountUrl, parames: nil) { response, _, error, _ in
+        BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.clipapiapi + draftboxUserCountUrl, parames: nil, commonParams: commonParams()) { response, _, error, _ in
             if response is NSNull || response == nil {
                 completeHander(0, error?.msg)
                 return
@@ -585,7 +587,7 @@ extension PQBaseViewModel {
             url = url + deleteDraftboxUrl
             params["draftboxId"] = draftboxIds ?? ""
         }
-        SWNetRequest.postRequestData(url: url, parames: params) { _, _, error, _ in
+        BFNetRequestAdaptor.postRequestData(url: url, parames: params, commonParams: commonParams()) { _, _, error, _ in
             completeHander(error == nil, error?.msg)
         }
     }
@@ -597,7 +599,7 @@ extension PQBaseViewModel {
     ///   - copyType: 复制类型（1：复制自己的项目，2：创建副本(复制别人的项目) 3:再创作）
     ///   - completeHander: <#completeHander description#>
     public class func copyDraftbox(draftboxId: String?, title: String, copyType: Int, completeHander: @escaping (_ newDraftboxId: String?, _ msg: String?) -> Void) {
-        SWNetRequest.postRequestData(url: PQENVUtil.shared.clipapiapi + copyDraftboxUrl, parames: ["draftboxId": draftboxId ?? "", "title": title, "copyType": copyType]) { response, _, error, _ in
+        BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.clipapiapi + copyDraftboxUrl, parames: ["draftboxId": draftboxId ?? "", "title": title, "copyType": copyType], commonParams: commonParams()) { response, _, error, _ in
             if response is NSNull || response == nil {
                 completeHander(nil, error?.msg)
                 return
@@ -612,7 +614,7 @@ extension PQBaseViewModel {
     ///   - title: 标题
     ///   - completeHander: <#completeHander description#>
     public class func updateDraftBoxTitle(draftboxId: String?, title: String, completeHander: @escaping (_ newDraftData: PQEditProjectModel?, _ msg: String?) -> Void) {
-        SWNetRequest.postRequestData(url: PQENVUtil.shared.clipapiapi + updateDraftboxTitleUrl, parames: ["draftboxId": draftboxId ?? "", "title": title]) { response, _, error, _ in
+        BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.clipapiapi + updateDraftboxTitleUrl, parames: ["draftboxId": draftboxId ?? "", "title": title], commonParams: commonParams()) { response, _, error, _ in
             if response is NSNull || response == nil {
                 completeHander(nil, error?.msg)
                 return
@@ -627,7 +629,7 @@ extension PQBaseViewModel {
     ///   - completeHander: <#completeHander description#>
     public class func draftboxGetSdata(draftboxId: String?, completeHander: @escaping (_ projectModel: PQEditSdataModel?, _ msg: String?) -> Void) {
         let params: [String: Any] = ["draftboxId": draftboxId ?? ""]
-        SWNetRequest.postRequestData(url: PQENVUtil.shared.clipapiapi + draftboxGetSdataUrl, parames: params) { response, _, error, _ in
+        BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.clipapiapi + draftboxGetSdataUrl, parames: params, commonParams: commonParams()) { response, _, error, _ in
 
             if response is NSNull || response == nil {
                 completeHander(nil, error?.msg)

BFFramework/Classes/Base/ViewModel/PQDownloadFileManager.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import BFCommonKit
 
 class PQDownloadFileManager: NSObject {
     /// 创建文件

BFFramework/Classes/Base/ViewModel/PQDownloadManager.swift

@@ -8,6 +8,8 @@
 //
 
 import UIKit
+import BFCommonKit
+import BFNetRequestKit
 
 // MARK: - 下载管理
 

BFFramework/Classes/Base/ViewModel/PQSessionManager.swift

@@ -7,6 +7,8 @@
 //
 
 import UIKit
+import BFCommonKit
+import BFNetRequestKit
 
 open class PQSessionManager: NSObject {
     public var downloadTaskDatas: [String: PQDownloadModel] = Dictionary<String, PQDownloadModel>.init()

BFFramework/Classes/Base/ViewModel/PQUploadViewModel.swift

@@ -7,6 +7,8 @@
 //
 
 import UIKit
+import BFCommonKit
+import BFNetRequestKit
 
 public class PQUploadViewModel: NSObject {
     /// 发布视频
@@ -25,7 +27,7 @@ public class PQUploadViewModel: NSObject {
         if coverImgPath != nil && (coverImgPath?.count ?? 0) > 0 {
             params["coverImgPath"] = coverImgPath
         }
-        SWNetRequest.postRequestData(url: PQENVUtil.shared.longvideoapi + videoSendUrl, parames: params) { response, _, error, _ in
+        BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.longvideoapi + videoSendUrl, parames: params, commonParams: commonParams()) { response, _, error, _ in
             if error != nil {
                 completeHander(nil, nil, error?.msg)
                 return
@@ -79,7 +81,7 @@ public class PQUploadViewModel: NSObject {
     ///   - completeHander: <#completeHander description#>
     /// - Returns: <#description#>
    public class func updateVideo(title: String, videoId: String, coverImgPath: String, descr: String, completeHander: @escaping (_ videoData: PQVideoListModel?, _ msg: String?) -> Void) {
-        SWNetRequest.postRequestData(url: PQENVUtil.shared.longvideoapi + updateVideoUrl, parames: ["title": title, "videoId": videoId, "coverImgPath": coverImgPath, "descr": descr, "viewStatus": 1, "barrageSwitch": 1]) { response, _, error, _ in
+        BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.longvideoapi + updateVideoUrl, parames: ["title": title, "videoId": videoId, "coverImgPath": coverImgPath, "descr": descr, "viewStatus": 1, "barrageSwitch": 1], commonParams: commonParams()) { response, _, error, _ in
             if error != nil {
                 completeHander(nil, error?.msg)
                 return
@@ -99,7 +101,7 @@ public class PQUploadViewModel: NSObject {
     ///   - completeHander: <#completeHander description#>
     /// - Returns: <#description#>
     class public func vodeoCoverImageList(videoId: String, videoPath: String, totalTime: Int, videoHeight: CGFloat, videoWidth: CGFloat, completeHander: @escaping (_ coverImages: [PQUploadModel]?, _ msg: String?) -> Void) {
-        SWNetRequest.postRequestData(url: PQENVUtil.shared.longvideoapi + vodeoCoverImageUrl, parames: ["id": videoId, "videoPath": videoPath, "totalTime": totalTime]) { response, _, error, _ in
+        BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.longvideoapi + vodeoCoverImageUrl, parames: ["id": videoId, "videoPath": videoPath, "totalTime": totalTime], commonParams: commonParams()) { response, _, error, _ in
             if error != nil {
                 completeHander(nil, error?.msg)
                 return

BFFramework/Classes/EventTrack/Model/PQVideoMakeEventTrackModel.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import BFCommonKit
 
 public class PQVideoMakeEventTrackModel: NSObject {
     // 进入创作工具的入口

BFFramework/Classes/EventTrack/ViewModel/PQEventTrackViewModel.swift

@@ -7,6 +7,8 @@
 //
 
 import UIKit
+import BFCommonKit
+import BFNetRequestKit
 
 // MARK: - 埋点数据上报
 
@@ -46,7 +48,7 @@ public class PQEventTrackViewModel: NSObject {
             if extParams != nil, (extParams?.keys.count ?? 0) > 0 {
                 tempParams["extParams"] = dictionaryToJsonString(extParams!)
             }
-            SWNetRequest.postRequestData(url: PQENVUtil.shared.commonapi + staticsFrontendReportUrl, parames: tempParams) { _, _, _, _ in
+            BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.commonapi + staticsFrontendReportUrl, parames: tempParams,commonParams: commonParams()) { _, _, _, _ in
                 BFLog(message: "\(remindmsg ?? "基础")埋点数据上报:\(tempParams)")
             }
         }
@@ -174,7 +176,7 @@ public class PQEventTrackViewModel: NSObject {
             if tempExtParams.keys.count > 0 {
                 params["extParams"] = dictionaryToJsonString(tempExtParams)
             }
-            SWNetRequest.postRequestData(url: url, parames: params) { response, _, error, _ in
+            BFNetRequestAdaptor.postRequestData(url: url, parames: params,commonParams: commonParams()) { response, _, error, _ in
                 BFLog(message: "播放相关数据上报：\(String(describing: error)),\(response ?? [:])")
             }
         }
@@ -241,7 +243,7 @@ public class PQEventTrackViewModel: NSObject {
             if abInfoData != nil, !(abInfoData?.isEmpty ?? true) {
                 params["abInfoData"] = abInfoData
             }
-            SWNetRequest.postRequestData(url: url, parames: params) { response, _, error, _ in
+            BFNetRequestAdaptor.postRequestData(url: url, parames: params,commonParams: commonParams()) { response, _, error, _ in
                 BFLog(message: "用户点击分享数据上报：\(String(describing: error)),\(response ?? [:])")
             }
         }
@@ -319,7 +321,7 @@ public class PQEventTrackViewModel: NSObject {
             if firstParams == nil || ((firstParams?.count ?? 0) <= 0) {
                 saveUserDefaults(key: cFirstParams, value: dictionaryToJsonString(params) ?? "")
             }
-            SWNetRequest.postRequestData(url: PQENVUtil.shared.commonapi + staticsFrontendReportUrl, parames: params) { response, _, error, _ in
+            BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.commonapi + staticsFrontendReportUrl, parames: params,commonParams: commonParams()) { response, _, error, _ in
                 BFLog(message: "冷热启动上报：\(String(describing: error)),\(response ?? [:]),params = \(params)")
                 if PQSingletoMemoryUtil.shared.isColdLaunch {
                     PQSingletoMemoryUtil.shared.coldLaunchStatus = error == nil ? 2 : 3
@@ -357,7 +359,7 @@ public class PQEventTrackViewModel: NSObject {
             if params.keys.contains("aps"){
                 params.removeValue(forKey: "aps")
             }
-            SWNetRequest.postRequestData(url: PQENVUtil.shared.longvideoapi + pushActionReportUrl, parames: params) { response, _, error, _ in
+            BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.longvideoapi + pushActionReportUrl, parames: params,commonParams: commonParams()) { response, _, error, _ in
                 BFLog(message: "推送点击数据上报：\(String(describing: error)),\(response ?? [:])")
             }
         }
@@ -369,7 +371,7 @@ public class PQEventTrackViewModel: NSObject {
     /// - Returns: <#description#>
     public class func reportPushDeviceTokenUpload(registerId: String, deviceToken: String, completeHander: @escaping (_ isSuccess: Bool) -> Void) {
         DispatchQueue.global().async {
-            SWNetRequest.postRequestData(url: PQENVUtil.shared.longvideoapi + pushDeviceTokenReportUrl, parames: ["registerId": registerId, "deviceToken": deviceToken, "brand": cPushChannel]) { response, _, error, _ in
+            BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.longvideoapi + pushDeviceTokenReportUrl, parames: ["registerId": registerId, "deviceToken": deviceToken, "brand": cPushChannel],commonParams: commonParams()) { response, _, error, _ in
                 completeHander(error == nil ? true : false)
                 BFLog(message: "deviceToken数据上报：\(String(describing: error)),\(response ?? [:])")
             }
@@ -386,7 +388,7 @@ public class PQEventTrackViewModel: NSObject {
     public class func searchReportUpload(keyWord: String, searchType: Int, searchNumber: Int = 10, reportType: Int = 2) {
         DispatchQueue.global().async {
             let params: [String: Any] = ["keyWord": keyWord, "searchType": searchType, "searchNumber": searchNumber, "reportType": reportType]
-            SWNetRequest.postRequestData(url: PQENVUtil.shared.longvideoapi + searchReportUrl, parames: params) { response, _, error, _ in
+            BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.longvideoapi + searchReportUrl, parames: params,commonParams: commonParams()) { response, _, error, _ in
                 BFLog(message: "搜索数据上报:\(String(describing: error)),\(response ?? [:])")
             }
         }
@@ -516,7 +518,7 @@ public class PQEventTrackViewModel: NSObject {
             if tempExtParams.keys.count > 0 {
                 tempParams["extParams"] = dictionaryToJsonString(tempExtParams)
             }
-            SWNetRequest.postRequestData(url: PQENVUtil.shared.longvideoapi + messagePeportUrl, parames: tempParams) { _, _, _, _ in
+            BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.longvideoapi + messagePeportUrl, parames: tempParams,commonParams: commonParams()) { _, _, _, _ in
                 BFLog(message: "\(remindmsg ?? "基础")埋点数据上报:\(tempParams)")
             }
         }

BFFramework/Classes/PModels/PQDownloadModel.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import BFNetRequestKit
 
 // MARK: - 文件扩展名
 

BFFramework/Classes/PModels/PQLoginUserInfo.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import BFCommonKit
 
 // MARK: - 登录用户信息
 

BFFramework/Classes/PModels/PQReCreateModel.swift

@@ -8,6 +8,7 @@
 
 import RealmSwift
 import UIKit
+import BFCommonKit
 
 public class PQReCreateModel: Object {
     @objc dynamic public var canReproduce: Int = 0 // 是否可以被再创作，1：是，0：否

BFFramework/Classes/PModels/PQUploadModel.swift

@@ -9,6 +9,7 @@
 
 import Photos
 import UIKit
+import BFCommonKit
 
 open class PQUploadModel: PQBaseModel {
    public var image: UIImage? // 图片

BFFramework/Classes/PModels/PQUserInfoModel.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import BFCommonKit
 
 open class PQUserInfoModel: PQBaseModel {
     public  var avatarUrl: String? // 头像地址

BFFramework/Classes/PModels/PQVideoListModel.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import BFCommonKit
 
 open class PQVideoListModel: PQBaseModel {
     @objc required public init() {

BFFramework/Classes/PModels/editDarftModels/PQEditAudioTrackMaterialModel.swift

@@ -9,6 +9,7 @@
 import Foundation
 import ObjectMapper
 import RealmSwift
+import BFCommonKit
 
 public class PQEditAudioTrackMaterialModel: PQEditBaseModel {
     /**

BFFramework/Classes/PModels/editDarftModels/PQEditAudioTrackModel.swift

@@ -15,6 +15,8 @@ import Foundation
 
 import ObjectMapper
 import RealmSwift
+import BFCommonKit
+
 public class PQEditAudioTrackModel: PQEditBaseModel {
     public var audioTrackMaterials: List<PQEditAudioTrackMaterialModel> = List<PQEditAudioTrackMaterialModel>.init()
     @objc dynamic public var count: Int = 0

BFFramework/Classes/PModels/editDarftModels/PQEditBaseModel.swift

@@ -8,6 +8,7 @@
 
 import ObjectMapper
 import RealmSwift
+import BFCommonKit
 
 // 自定义时长转换协议，服务单位为微秒，我们使用 S
 public let timeTransform = TransformOf<Float64, Float64>(fromJSON: { (value: Float64?) -> Float64? in

BFFramework/Classes/PModels/editDarftModels/PQEditFileMergeTable.swift

@@ -8,6 +8,8 @@
 
 import RealmSwift
 import UIKit
+import BFCommonKit
+
 public class PQEditFileMergeTable: Object {
     // 草稿箱ID 服务端生成
     @objc dynamic public var draftboxId: String = ""

BFFramework/Classes/PModels/editDarftModels/PQEditProjectModel.swift

@@ -26,6 +26,8 @@
 import Foundation
 import ObjectMapper
 import RealmSwift
+import BFCommonKit
+
 public class PQEditProjectModel: PQEditBaseModel {
     // 大 JSON 结构化数据
     @objc dynamic public var sData: PQEditSdataModel?

BFFramework/Classes/PModels/editDarftModels/PQEditSdataModel.swift

@@ -9,6 +9,8 @@
 import ObjectMapper
 import RealmSwift
 import UIKit
+import BFCommonKit
+
 public class PQEditSdataModel: PQEditBaseModel {
     @objc dynamic public var systemParam: PQEditSystemParamModel?
     @objc dynamic public var videoMetaData: PQEditVideoMetaDataModel?

BFFramework/Classes/PModels/editDarftModels/PQEditSectionModel.swift

@@ -15,6 +15,8 @@ import Foundation
 import AVFoundation
 import ObjectMapper
 import RealmSwift
+import BFCommonKit
+
 public class PQEditSectionModel: PQEditBaseModel {
     @objc dynamic public var addAutoEffect: Int = 0
     @objc dynamic public var sectionDuration: Float64 = 0 {

BFFramework/Classes/PModels/editDarftModels/PQEditSectionTimelineModel.swift

@@ -14,6 +14,7 @@
 import Foundation
 import ObjectMapper
 import RealmSwift
+import BFCommonKit
 
 public class PQEditSectionTimelineModel: PQEditBaseModel {
     @objc dynamic public var audioTrack: PQEditAudioTrackModel?

BFFramework/Classes/PModels/editDarftModels/PQEditSubtitleInfoModel.swift

@@ -9,6 +9,8 @@
 import ObjectMapper
 import RealmSwift
 import UIKit
+import BFCommonKit
+
 public class PQEditSubtitleInfoModel: PQEditBaseModel {
     @objc dynamic public var layoutType: String = ""
     @objc dynamic public var text: String = "" {

BFFramework/Classes/PModels/editDarftModels/PQEditVisionTrackMaterialsModel.swift

@@ -18,6 +18,7 @@ import Photos
 
 import ObjectMapper
 import RealmSwift
+import BFCommonKit
 
 public class PQEditVisionTrackMaterialsModel: PQEditBaseModel {
     @objc dynamic public var width: Float = 0

BFFramework/Classes/PModels/editDarftModels/PQEditVisionTrackModel.swift

@@ -14,6 +14,8 @@
 import Foundation
 import ObjectMapper
 import RealmSwift
+import BFCommonKit
+
 public class PQEditVisionTrackModel: PQEditBaseModel {
     @objc dynamic public var count: Int = 0
     @objc dynamic public var duration: Float64 = 0

BFFramework/Classes/PQGPUImage/Source/iOS/MovieOutput.swift

@@ -1,4 +1,5 @@
 import AVFoundation
+import BFCommonKit
 
 public protocol AudioEncodingTarget {
     func activateAudioTrack()

BFFramework/Classes/PQGPUImage/Source/iOS/SpeakerOutput.swift

@@ -10,6 +10,7 @@
 import AudioToolbox
 import AVFoundation
 import Foundation
+import BFCommonKit
 
 public class SpeakerOutput: AudioEncodingTarget {
     public var changesAudioSession = true

BFFramework/Classes/PQGPUImage/akfilters/Extension/String+Video.swift

@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import BFCommonKit
 
 public extension Namespace where Base == String {
     static func formatTime(_ time: Int) -> String {

BFFramework/Classes/PQGPUImage/akfilters/PQBaseFilter.swift

@@ -7,6 +7,7 @@
 //  功能：所有 filter 基类
 
 import UIKit
+import BFCommonKit
 
 // 时间精度
 public let BASE_FILTER_TIMESCALE:Int32 = 1_000_000

BFFramework/Classes/PQGPUImage/akfilters/PQGPUImageDebugFilter.swift

@@ -10,6 +10,7 @@ import UIKit
 import OpenGLES
 
 import AVFoundation
+import BFCommonKit
 
 open class PQGPUImageDebug: BasicOperation {
     // ui label

BFFramework/Classes/PQGPUImage/akfilters/PQGPUImageFilterGroup.swift

@@ -7,7 +7,7 @@
 //
 
 import Foundation
-
+import BFCommonKit
 
 open class PQGPUImageFilterGroup: PQBaseFilter{
     

BFFramework/Classes/PQGPUImage/akfilters/PQGPUImageTools.swift

@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import BFCommonKit
 
 #if GLES
     import OpenGLES

BFFramework/Classes/PQGPUImage/akfilters/PQGifFilter.swift

@@ -8,6 +8,7 @@
 
 import Foundation
 import UIKit
+import BFCommonKit
 
 open class PQGifFilter: PQBaseFilter {
     var gifImageCount: Int = 0

BFFramework/Classes/PQGPUImage/akfilters/PQImageFilter.swift

@@ -10,6 +10,7 @@ import Foundation
 import Kingfisher
 import KingfisherWebP
 import UIKit
+import BFCommonKit
 
 open class PQImageFilter: PQBaseFilter {
     var widthOfImage: Int32!

BFFramework/Classes/PQGPUImage/akfilters/PQMovieFilter.swift

@@ -51,6 +51,7 @@
 
 import Foundation
 import UIKit
+import BFCommonKit
 
 class PQMovieFilter: PQBaseFilter {
     public var runBenchmark = false

BFFramework/Classes/PQGPUImage/akfilters/PQMovieInput.swift

@@ -8,6 +8,7 @@
 
 import AVFoundation
 import VideoToolbox
+import BFCommonKit
 
 public protocol PQMovieInputDelegate: AnyObject {
 

BFFramework/Classes/PQGPUImage/akfilters/PQSubTitleFilter.swift

@@ -8,10 +8,9 @@
 
 import Foundation
 import UIKit
-
 import OpenGLES
-
 import AVFoundation
+import BFCommonKit
 
 // add by ak  if have alpha used discard
 public let AlphaPassthroughFragmentShader = "varying highp vec2 textureCoordinate;\n \n uniform sampler2D inputImageTexture;\n \n void main()\n {\n     lowp vec4 color = texture2D(inputImageTexture, textureCoordinate);\n     if (color.a < 1.0) \n     {\n         discard;\n     } \n     else\n     {\n         gl_FragColor = color;\n     }\n }\n "

BFFramework/Classes/PQGPUImage/akfilters/Tools/NXAVAssetExportSession.swift

@@ -7,6 +7,7 @@
 //  功能：根据原视频导出新格式视频 如 修改fps
 
 import UIKit
+import BFCommonKit
 
 class NXAVAssetExportSession: NSObject {
     // 使用 Core Animation 框架。设置视频水印、视频标题、动画浮层等。

BFFramework/Classes/PQGPUImage/akfilters/Tools/PQCompositionExporter.swift

@@ -9,7 +9,7 @@
 import AVFoundation
 import Foundation
 import ObjectMapper
-// import GPUImage
+import BFCommonKit
 
 public class PQCompositionExporter {
     public var progressClosure: ((_ currTime: Float, _ duration: Float, _ progress: Float) -> Void)?

BFFramework/Classes/Stuckpoint/Controller/PQStuckPointEditerController.swift

@@ -16,6 +16,7 @@ import Foundation
 import ObjectMapper
 import RealmSwift
 import UIKit
+import BFCommonKit
 
 class PQStuckPointEditerController: PQBaseViewController {
     // 是否导出视频成功
@@ -249,7 +250,7 @@ class PQStuckPointEditerController: PQBaseViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        leftButton(image: "icon_detail_back", tintColor: PQBFConfig.shared.styleTitleColor)
+        leftButton(image: UIImage.init(named: "icon_detail_back"), tintColor: PQBFConfig.shared.styleTitleColor)
         navHeadImageView?.addSubview(nextBtn)
         navHeadImageView?.addSubview(musicNameView)
         // 添加子视图

BFFramework/Classes/Stuckpoint/Controller/PQStuckPointMaterialController.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import BFCommonKit
 
 public class PQStuckPointMaterialController: PQBaseViewController {
     // 按钮高
@@ -198,7 +199,7 @@ public class PQStuckPointMaterialController: PQBaseViewController {
 
     override public func viewDidLoad() {
         super.viewDidLoad()
-        leftButton(image: "upload_delete", tintColor: PQBFConfig.shared.styleTitleColor)
+        leftButton(image: UIImage.init(named: "upload_delete"), tintColor: PQBFConfig.shared.styleTitleColor)
         navHeadImageView?.addSubview(changeCollecBtn)
         navHeadImageView?.frame.size.height = cDevice_iPhoneNavBarAndStatusBarHei + margin * 2 + choseBtnH
         navHeadImageView?.addSubview(choseLocalAllBtn)

BFFramework/Classes/Stuckpoint/Controller/PQStuckPointMaterialDetailController.swift

@@ -9,6 +9,7 @@
 import Kingfisher
 import KingfisherWebP
 import UIKit
+import BFCommonKit
 
 class PQStuckPointMaterialDetailController: PQBaseViewController {
     var materialData: PQEditVisionTrackMaterialsModel?
@@ -129,7 +130,7 @@ class PQStuckPointMaterialDetailController: PQBaseViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        leftButton(image: "icon_detail_back", tintColor: PQBFConfig.shared.styleTitleColor)
+        leftButton(image: UIImage.init(named: "icon_detail_back"), tintColor: PQBFConfig.shared.styleTitleColor)
         navHeadImageView?.backgroundColor = UIColor.clear
         let width = CGFloat(materialData?.width ?? Float(preViewWidth))
         let height = CGFloat(materialData?.height ?? Float(preViewHeight))

BFFramework/Classes/Stuckpoint/Controller/PQStuckPointMusicContentController.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import BFCommonKit
 
 class PQStuckPointMusicContentController: PQBaseViewController {
     var itemList: [Any] = Array<Any>.init() // 所有分类数据
@@ -32,11 +33,12 @@ class PQStuckPointMusicContentController: PQBaseViewController {
     var contentType: stuckPointMusicContentType = .catagery {
         didSet {
             if contentType == .page || contentType == .serach {
-                collectionView.addRefreshView(type: .REFRESH_TYPE_FOOTER) { [weak self] isRefresh in
-                    if self?.refreshHandle != nil {
-                        self?.refreshHandle!(isRefresh, self?.contentType ?? .catagery)
-                    }
-                }
+                // SanW - 待修改 - 
+//                collectionView.addRefreshView(type: .REFRESH_TYPE_FOOTER) { [weak self] isRefresh in
+//                    if self?.refreshHandle != nil {
+//                        self?.refreshHandle!(isRefresh, self?.contentType ?? .catagery)
+//                    }
+//                }
             } else {
                 lastIndexPath = IndexPath(item: 0, section: 0)
             }

BFFramework/Classes/Stuckpoint/Controller/PQStuckPointMusicController.swift

@@ -8,6 +8,8 @@
 
 import AVFoundation
 import UIKit
+import BFCommonKit
+
 class PQStuckPointMusicController: PQBaseViewController {
     // 选中的总时长
     var selectedTotalDuration: Float64 = 0
@@ -224,7 +226,7 @@ class PQStuckPointMusicController: PQBaseViewController {
         disablePopGesture().popGestureHandle = { [weak self] in
             self?.backBtnClick()
         }
-        leftButton(image: "icon_detail_back", tintColor: PQBFConfig.shared.styleTitleColor)
+        leftButton(image: UIImage.init(named: "icon_detail_back"), tintColor: PQBFConfig.shared.styleTitleColor)
         setTitle(title: "选择音乐主题", color: PQBFConfig.shared.styleTitleColor)
         view.addSubview(searchTF)
         addKeyboardObserver()

BFFramework/Classes/Stuckpoint/Controller/PQStuckPointMusicSearchController.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import BFCommonKit
 
 class PQStuckPointMusicSearchController: PQStuckPointMusicContentController {
     // 选中的总时长

BFFramework/Classes/Stuckpoint/Controller/PQStuckPointPublicController.swift

@@ -10,6 +10,8 @@ import ObjectMapper
 import Photos
 import UIKit
 import WechatOpenSDK
+import BFCommonKit
+
 class PQStuckPointPublicController: PQBaseViewController {
     private var isShared: Bool = false // 是否在分享
     private var isExportSuccess: Bool = false // 是否导出完成
@@ -418,7 +420,7 @@ class PQStuckPointPublicController: PQBaseViewController {
         // 注册上传成功的通知
         addNotification(self, selector: #selector(uploadSuccess(notify:)), name: cUploadSuccessKey, object: nil)
         PQNotification.addObserver(self, selector: #selector(didBecomeActiveNotification), name: UIApplication.didBecomeActiveNotification, object: nil)
-        leftButton(image: "icon_detail_back", tintColor: PQBFConfig.shared.styleTitleColor)
+        leftButton(image: UIImage.init(named: "icon_detail_back"), tintColor: PQBFConfig.shared.styleTitleColor)
         navHeadImageView?.backgroundColor = UIColor.clear
         lineView?.removeFromSuperview()
         view.addSubview(bgTopView)
@@ -1242,8 +1244,8 @@ extension PQStuckPointPublicController {
         if(publicTitleView.inputTV.text.count > 0){
             publicTitleView.inputTV.text = titleLabel.text
         }
-  
-        PQEventTrackViewModel.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_shanyinApp_clickButton_changeTitle, pageSource: .sp_stuck_publishSyncedUp, eventData:  ["videoId":videoData?.uniqueId ?? "","rootPageSource":isReCreate ? "shanyinApp-main-syncedUpMusicRecreate" :"shanyinApp-main-syncedUpMusic"], remindmsg: "")
+        // SanW - 待修改 -
+//        PQEventTrackViewModel.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_shanyinApp_clickButton_changeTitle, pageSource: .sp_stuck_publishSyncedUp, eventData:  ["videoId":videoData?.uniqueId ?? "","rootPageSource":isReCreate ? "shanyinApp-main-syncedUpMusicRecreate" :"shanyinApp-main-syncedUpMusic"], remindmsg: "")
     }
     
     @objc func settingCoverImage() {
@@ -1282,15 +1284,15 @@ extension PQStuckPointPublicController {
            //        imageSelected.updataVideoData = updataVideoData
             self?.navigationController?.pushViewController(imageSelected, animated: true)
         }
-        
-        PQEventTrackViewModel.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_shanyinApp_clickButton_changeCover, pageSource: .sp_stuck_publishSyncedUp, eventData:  ["videoId":videoData?.uniqueId ?? "","rootPageSource":isReCreate ? "shanyinApp-main-syncedUpMusicRecreate" :"shanyinApp-main-syncedUpMusic"], remindmsg: "")
+        // SanW - 待修改 -
+//        PQEventTrackViewModel.baseReportUpload(businessType: .bt_buttonClick, objectType: .ot_shanyinApp_clickButton_changeCover, pageSource: .sp_stuck_publishSyncedUp, eventData:  ["videoId":videoData?.uniqueId ?? "","rootPageSource":isReCreate ? "shanyinApp-main-syncedUpMusicRecreate" :"shanyinApp-main-syncedUpMusic"], remindmsg: "")
    
     }
     
     //更新标题或封面
     func updateCoverImagegOrTitle() {
-        
-        PQLoadingHUB.shared.showHUB(isMode: true)
+        // SanW - 待修改 -
+//        PQLoadingHUB.shared.showHUB(isMode: true)
         
         PQBaseViewModel.ossTempToken { [weak self] response, msg in
             let image: UIImage = (self?.uploadData?.image)!

BFFramework/Classes/Stuckpoint/Model/PQStuckPointMusicTagsModel.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import BFCommonKit
 
 public class PQStuckPointMusicTagsModel: NSObject {
     public var parentTagId: Int64? // 父级 ID（如果是第一层，值为 0） ,

BFFramework/Classes/Stuckpoint/Model/PQVoiceModel.swift

@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import BFCommonKit
 
 public enum voiceStatue: Int {
     case isLoading = 0 // 加载中

BFFramework/Classes/Stuckpoint/View/PQCustomSwitchView.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import BFCommonKit
 
 class PQCustomSwitchView: UIView {
     /// 当前选中的item

BFFramework/Classes/Stuckpoint/View/PQCuttingPointView.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import BFCommonKit
 
 class PQCuttingPointView: UIView {
     lazy var pointView: UIView = {

BFFramework/Classes/Stuckpoint/View/PQEditPublicCoverImageView.swift

@@ -6,6 +6,7 @@
 //  功能：选择封面
 
 import Foundation
+import BFCommonKit
 
 class PQEditPublicCoverImageView: UIView {
     

BFFramework/Classes/Stuckpoint/View/PQEditPublicTitleView.swift

@@ -6,6 +6,7 @@
 //  功能：编辑标题
 
 import Foundation
+import BFCommonKit
 
 class PQEditPublicTitleView: UIView {
     
@@ -35,7 +36,8 @@ class PQEditPublicTitleView: UIView {
         inputTV.backgroundColor = .clear
         inputTV.textColor = .black
         inputTV.maxTextLength = 30
-        inputTV.placeHolderDefultPoint = CGPoint(x: 5, y: 0)
+        // SanW - 待修改
+//        inputTV.placeHolderDefultPoint = CGPoint(x: 5, y: 0)
         inputTV.tintColor = UIColor.hexColor(hexadecimal: PQBFConfig.shared.styleColor.rawValue)
         inputTV.placeHolder = "我见过你眼中的春与秋，胜过我见过的所有山川河流"
         inputTV.showsVerticalScrollIndicator = false

BFFramework/Classes/Stuckpoint/View/PQSelectedMaterialListView.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import BFCommonKit
 
 class PQSelectedMaterialListView: UIView {
     var photoData: [PQEditVisionTrackMaterialsModel] = Array<PQEditVisionTrackMaterialsModel>.init() // 相册数据

BFFramework/Classes/Stuckpoint/View/PQStuckPointCuttingView.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import BFCommonKit
 
 class PQStuckPointCuttingView: UIView {
     // 视频时长

BFFramework/Classes/Stuckpoint/View/PQStuckPointLoadingView.swift

@@ -8,6 +8,7 @@
 
 import Kingfisher
 import UIKit
+import BFCommonKit
 
 class PQStuckPointLoadingView: UIView {
     var cancelHandle: ((_ sender: UIButton) -> Void)?

BFFramework/Classes/Stuckpoint/View/PQStuckPointMaterialHeadView.swift

@@ -8,6 +8,8 @@
 
 import SnapKit
 import UIKit
+import BFCommonKit
+
 class PQStuckPointMaterialHeadView: UIView {
     lazy var iconImageView: UIImageView = {
         let iconImageView = UIImageView(image: UIImage().BF_Image(named: "videomk_netMaterial_selected"))

BFFramework/Classes/Stuckpoint/View/PQStuckPointMusicContentCell.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import BFCommonKit
 
 class PQStuckPointMusicContentCell: UICollectionViewCell {
     // 按钮点击的回调

BFFramework/Classes/Stuckpoint/View/PQStuckPointMusicTagsContentCell.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import BFCommonKit
 
 class PQStuckPointMusicTagsContentCell: UICollectionViewCell {
     lazy var titleLab: UILabel = {

BFFramework/Classes/Stuckpoint/View/PQStuckPointSearchEmptyCell.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import BFCommonKit
 
 class PQStuckPointSearchEmptyCell: UICollectionViewCell {
     lazy var emptyImageView: UIImageView = {

BFFramework/Classes/Stuckpoint/View/PQVideoCutingOprateView.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import BFCommonKit
 
 class PQVideoCutingOprateView: UIView {
     // 距离左边间隔

BFFramework/Classes/Stuckpoint/ViewModel/PQGPUImagePlayerView.swift

@@ -10,6 +10,7 @@ import AVFoundation
 import AVKit
 import UIKit
 import ObjectMapper
+import BFCommonKit
 
 // import GPUImage
 struct AVAssetKey {

BFFramework/Classes/Stuckpoint/ViewModel/PQPlayerViewModel.swift

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

BFFramework/Classes/Stuckpoint/ViewModel/PQStuckPointViewModel.swift

@@ -7,6 +7,8 @@
 //
 
 import UIKit
+import BFCommonKit
+import BFNetRequestKit
 
 public class PQStuckPointViewModel: NSObject {
     /// 获取卡点音乐分类列表
@@ -16,7 +18,7 @@ public class PQStuckPointViewModel: NSObject {
     ///   - pageSize: 音乐列表每页个数（默认 20）
     ///   - complateHandle: <#complateHandle description#>
     class func stuckPointMusicCategoryList(parentTagId: Int64 = 0, pageSize _: Int = 20, complateHandle: @escaping (_ categoryList: [PQStuckPointMusicTagsModel], _ msg: String?, _ tagAttributes: ([UICollectionViewLayoutAttributes], CGFloat)?) -> Void) {
-        SWNetRequest.postRequestData(url: PQENVUtil.shared.longvideoapi + stuckPointMusicCategoryUrl, parames: ["parentTagId": parentTagId]) { response, _, error, _ in
+        BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.longvideoapi + stuckPointMusicCategoryUrl, parames: ["parentTagId": parentTagId], commonParams: commonParams()) { response, _, error, _ in
             var tagsList = Array<PQStuckPointMusicTagsModel>.init()
             if response is NSNull || response == nil {
                 complateHandle(tagsList, error?.msg, nil)
@@ -77,7 +79,7 @@ public class PQStuckPointViewModel: NSObject {
     ///   - complateHandle: <#complateHandle description#>
     /// - Returns: <#description#>
     class func stuckPointMusicPageList(tagId: Int64, parentTagId: Int64 = 0, pageNum: Int = 1, pageSize: Int = 20,videoCount: Int = 0, imageCount: Int = 0, totalDuration: Float64 = 0, complateHandle: @escaping (_ musicPageList: [PQVoiceModel], _ msg: String?) -> Void) {
-        SWNetRequest.postRequestData(url: PQENVUtil.shared.longvideoapi + stuckPointMusicPageUrl, parames: ["tagId": tagId, "parentTagId": parentTagId, "pageNum": pageNum, "pageSize": pageSize]) { response, _, error, _ in
+        BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.longvideoapi + stuckPointMusicPageUrl, parames: ["tagId": tagId, "parentTagId": parentTagId, "pageNum": pageNum, "pageSize": pageSize], commonParams: commonParams()) { response, _, error, _ in
             var musicPageList = Array<PQVoiceModel>.init()
             if response is NSNull || response == nil {
                 complateHandle(musicPageList, error?.msg)
@@ -108,7 +110,7 @@ public class PQStuckPointViewModel: NSObject {
     ///   - complateHandle: <#complateHandle description#>
     /// - Returns: description
     class func stuckPointMusicDetailData(musicId: String, originType: Int, complateHandle: @escaping (_ musicDetaiData: PQVoiceModel?, _ msg: String?) -> Void) {
-        SWNetRequest.postRequestData(url: PQENVUtil.shared.longvideoapi + stuckPointMusicDetailUrl, parames: ["musicId": musicId, "originType": originType]) { response, _, error, _ in
+        BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.longvideoapi + stuckPointMusicDetailUrl, parames: ["musicId": musicId, "originType": originType], commonParams: commonParams()) { response, _, error, _ in
             if response is NSNull || response == nil {
                 complateHandle(nil, error?.msg)
                 return
@@ -126,7 +128,7 @@ public class PQStuckPointViewModel: NSObject {
     /// - Parameter projectId: 项目id
     /// - Returns: <#description#>
     class public func stuckPointProjectMusicInfo(projectId: String, complateHandle: @escaping (_ musicDetaiData: PQVoiceModel?, _ msg: String?) -> Void) {
-        SWNetRequest.postRequestData(url: PQENVUtil.shared.longvideoapi + stuckPointProjectMusicInfoUrl, parames: ["projectId": projectId]) { response, _, error, _ in
+        BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.longvideoapi + stuckPointProjectMusicInfoUrl, parames: ["projectId": projectId], commonParams: commonParams()) { response, _, error, _ in
             if response is NSNull || response == nil {
                 complateHandle(nil, error?.msg)
                 return

BFFramework/Classes/Utils/PQSingletoMemoryUtil.swift

@@ -8,6 +8,8 @@
 
 import UIKit
 import Photos
+import BFCommonKit
+
 // MARK: - 内存缓存数据
 
 /// 内存缓存数据

BFFramework/Classes/Utils/PQSingletonEnvUtil.swift

@@ -8,6 +8,7 @@
 
 import Foundation
 import KeychainAccess
+import BFCommonKit
 
 // add by ak 开发和发布版本的不同设置  1 为正式版本发布的苹果  0 是测试 XXXX 上传苹果前要检查
 public let DEVELOPMENT_ENVIRONMENT: Int = 1

BFFramework/Classes/Utils/PQThirdPlatformUtil.swift

@@ -10,6 +10,7 @@ import Kingfisher
 import UIKit
 import UserNotifications
 import WechatOpenSDK
+import BFCommonKit
 
 // MARK: - Bugly初始化工具类
 

BFFramework/Classes/selectImage/PQImageCropVC.swift

@@ -11,6 +11,7 @@
 // let vc = PQImageCropVC(frame: (self.navigationController?.view.frame)!, image: image, aspectWidth:9, aspectHeight: 16)
 
 import UIKit
+import BFCommonKit
 
 class PQImageCropVC: PQBaseViewController, UIScrollViewDelegate {
     var uploadData: PQUploadModel?

BFFramework/Classes/selectImage/PQImageSelectedController.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import BFCommonKit
 
 class PQImageSelectedController: PQUploadController {
     var updataVideoData: PQVideoListModel? // 如果updataVideoData不为空则为修改视频

BFFramework/Classes/selectImage/PQSelecteVideoItemCell.swift

@@ -8,6 +8,8 @@
 
 import Photos
 import UIKit
+import BFCommonKit
+
 class PQSelecteVideoItemCell: UICollectionViewCell {
     var representedAssetIdentifier: String!
     lazy var videoImageView: UIImageView = {

BFFramework/Classes/selectImage/PQUploadController.swift

@@ -9,6 +9,7 @@
 import MobileCoreServices
 import Photos
 import UIKit
+import BFCommonKit
 
 let playerHeaderH: CGFloat = cScreenWidth * (250 / 375)