1.merge community

BFFramework/Classes/Base/ViewModel/PQBaseViewModel.swift

@@ -469,13 +469,14 @@ extension PQBaseViewModel {
     ///   - videoFromScene:上传场景 1：普通上传 2：创作工具，3：普通上传转创作工具，4：后台转换加工，5：卡点视频制作
     ///   - completeHander: <#completeHander description#>
     /// - Returns: <#description#>
-    public class func saveProject(draftboxId: String?, sdata: String, videoFromScene: videoFromScene, rhythmMode:createStickersModel, completeHander: @escaping (_ projectId: String?, _ msg: String?) -> Void) {
+    public class func saveProject(draftboxId: String?, sdata: String, videoFromScene: videoFromScene, rhythmMode:createStickersModel? = nil, completeHander: @escaping (_ projectId: String?, _ msg: String?) -> Void) {
         var parames: [String: Any] = ["sdata": sdata,"fromScene": videoFromScene.rawValue]
         if draftboxId != nil {
             parames["draftboxId"] = draftboxId
         }
-       
-        parames["rhythmMode"] = rhythmMode.rawValue
+        if rhythmMode != nil {
+            parames["rhythmMode"] = rhythmMode!.rawValue
+        }
         BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.clipapiapi + saveProjectUrl, parames: parames, commonParams: commonParams()) { response, _, error, _ in
             if error != nil {
                 completeHander(nil, error?.msg)

BFFramework/Classes/PModels/PQVideoListModel.swift

@@ -116,7 +116,7 @@ public protocol BFVideoItemProtocol {
     // 发布视频来源类型
     var videoFromScene: videoFromScene { get set }
     // extParams: 额外参数-传入发布页 - 主要中秋红包塞活动使用
-    var extParams:String? { get set }
+    var extParams:String { get set }
     // 话题信息
     var topicData: [String: Any]? { get set }
 }