wenweiwei 3 년 전
부모
커밋
dc4e0154d0

+ 7 - 0
BFCommonKit/Classes/BFEnums/Enums.swift

@@ -963,3 +963,10 @@ public enum statusBarStyle {
     case light
     case dark
 }
+
+// 创建不同玩法的类型 (1:跳跃卡点,2:快慢速,3:仅配乐)
+public enum createStickersModel: Int {
+    case createStickersModelPoint = 1 // 跳跃卡点
+    case createStickersModelSpeed = 2 // 快慢速
+    case createStickersModelOnlyMusic = 3 // 仅配乐
+}

+ 0 - 1
BFCommonKit/Classes/BFModels/PQReCreateModel.swift

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

+ 0 - 2
BFCommonKit/Classes/BFProtocols/BFProtocols.swift

@@ -105,8 +105,6 @@ public protocol BFVideoItemProtocol {
     var isShareList: Bool { get set } // 是否是分享列表
     var uplpadBucketKey: String? { get set } // 上传视频地址
     var uplpadStatus: Int { get set } // 上传视频状态  1-上传中 2-上传完成 3-上传失败 4-发布中 4-发布完成
-    // MARK: SanW--待修改-2021.12.09
-//    var uplpadRequest: Any? { get set }
     var stsToken: [String: Any]? { get set } // 上传信息
     var localPath: String? { get set } // 地址
     var progress: Float { get set }

+ 0 - 6
Example/BFCommonKit.xcodeproj/project.pbxproj

@@ -271,10 +271,7 @@
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-BFCommonKit_Example/Pods-BFCommonKit_Example-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework",
-				"${BUILT_PRODUCTS_DIR}/AliyunOSSiOS/AliyunOSSiOS.framework",
-				"${BUILT_PRODUCTS_DIR}/BFAnalyzeKit/BFAnalyzeKit.framework",
 				"${BUILT_PRODUCTS_DIR}/BFCommonKit/BFCommonKit.framework",
-				"${BUILT_PRODUCTS_DIR}/BFNetRequestKit/BFNetRequestKit.framework",
 				"${BUILT_PRODUCTS_DIR}/KeychainAccess/KeychainAccess.framework",
 				"${BUILT_PRODUCTS_DIR}/Kingfisher/Kingfisher.framework",
 				"${BUILT_PRODUCTS_DIR}/KingfisherWebP/KingfisherWebP.framework",
@@ -287,10 +284,7 @@
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Alamofire.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AliyunOSSiOS.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BFAnalyzeKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BFCommonKit.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BFNetRequestKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/KeychainAccess.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Kingfisher.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/KingfisherWebP.framework",

+ 2 - 22
Example/Podfile.lock

@@ -1,11 +1,5 @@
 PODS:
   - Alamofire (5.4.4)
-  - AliyunOSSiOS (2.10.10)
-  - BFAnalyzeKit (0.1.0):
-    - BFCommonKit/BFEnums
-    - BFCommonKit/BFEnv
-    - BFCommonKit/BFProtocols
-    - BFNetRequestKit
   - BFCommonKit (1.5.2):
     - BFCommonKit/BFCategorys (= 1.5.2)
     - BFCommonKit/BFConfig (= 1.5.2)
@@ -38,14 +32,10 @@ PODS:
     - Toast-Swift (= 5.0.1)
   - BFCommonKit/BFVendors (1.5.2)
   - BFCommonKit/BFVendorsUtils (1.5.2):
-    - AliyunOSSiOS (= 2.10.10)
-    - BFAnalyzeKit
     - BFCommonKit/BFEnums
     - BFCommonKit/BFProtocols
     - BFCommonKit/BFUtility
     - RealmSwift (= 10.7.6)
-  - BFNetRequestKit (1.0.1):
-    - Alamofire (= 5.4.4)
   - KeychainAccess (4.2.2)
   - Kingfisher (6.3.1)
   - KingfisherWebP (1.3.0):
@@ -69,14 +59,11 @@ PODS:
   - Toast-Swift (5.0.1)
 
 DEPENDENCIES:
-  - BFAnalyzeKit (from `../../../BFAnalyzeKit/Trunk`)
   - BFCommonKit (from `../`)
-  - BFNetRequestKit (from `../../../BFNetRequestKit/Trunk`)
 
 SPEC REPOS:
   trunk:
     - Alamofire
-    - AliyunOSSiOS
     - KeychainAccess
     - Kingfisher
     - KingfisherWebP
@@ -87,19 +74,12 @@ SPEC REPOS:
     - Toast-Swift
 
 EXTERNAL SOURCES:
-  BFAnalyzeKit:
-    :path: "../../../BFAnalyzeKit/Trunk"
   BFCommonKit:
     :path: "../"
-  BFNetRequestKit:
-    :path: "../../../BFNetRequestKit/Trunk"
 
 SPEC CHECKSUMS:
   Alamofire: f3b09a368f1582ab751b3fff5460276e0d2cf5c9
-  AliyunOSSiOS: b8f1dfc229cd9abf68c8ee0cb245c2d66e00dd96
-  BFAnalyzeKit: 457ecf2fcb09cb83417e2adea50f98c60a50ddec
-  BFCommonKit: 564eefcf3bc7baca3b803ad6abf9f589e5a4bbf8
-  BFNetRequestKit: 1d074023eafe7c272fab4ed3a608e685902235d0
+  BFCommonKit: a16175825b1aec5fcce898ec7beea0927bd06840
   KeychainAccess: c0c4f7f38f6fc7bbe58f5702e25f7bd2f65abf51
   Kingfisher: 016c8b653a35add51dd34a3aba36b580041acc74
   KingfisherWebP: dec17a5eb1af2658791bde1f93ae9a853678f826
@@ -109,6 +89,6 @@ SPEC CHECKSUMS:
   RealmSwift: e31c4ddbcc42ac879313d656b86f9ca539f6f4f4
   Toast-Swift: 9b6a70f28b3bf0b96c40d46c0c4b9d6639846711
 
-PODFILE CHECKSUM: b69df9a7366c6db16be3bae28aac930ce675a035
+PODFILE CHECKSUM: 735b3e9cb011b0a45fb212e7b8996fce7706781f
 
 COCOAPODS: 1.11.2