ソースを参照

添加模式参数

jsonwang 3 年 前
コミット
36fdc3456a

+ 3 - 1
BFFramework/Classes/Base/ViewModel/PQBaseViewModel.swift

@@ -467,11 +467,13 @@ extension PQBaseViewModel {
     ///   - videoFromScene:上传场景 1:普通上传 2:创作工具,3:普通上传转创作工具,4:后台转换加工,5:卡点视频制作
     ///   - completeHander: <#completeHander description#>
     /// - Returns: <#description#>
-    public class func saveProject(draftboxId: String?, sdata: String, videoFromScene: videoFromScene, completeHander: @escaping (_ projectId: String?, _ msg: String?) -> Void) {
+    public class func saveProject(draftboxId: String?, sdata: String, videoFromScene: videoFromScene, rhythmMode:createStickersModel, 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
         SWNetRequest.postRequestData(url: PQENVUtil.shared.clipapiapi + saveProjectUrl, parames: parames) { response, _, error, _ in
             if error != nil {
                 completeHander(nil, error?.msg)

+ 6 - 3
BFFramework/Classes/Stuckpoint/Controller/PQStuckPointPublicController.swift

@@ -52,6 +52,9 @@ class PQStuckPointPublicController: PQBaseViewController {
     //已经选择标题内容,加一个属性接收 使用有不在主线不能直接使用 titleLabel text
     var selectTitle:String = ""
     
+    //add by ak 玩法类型 调用 producevideo/saveProject 时使用
+    var rhythmMode:createStickersModel = .createStickersModelPoint
+    
     //add by ak 是否是再创作模式
     var isReCreate:Bool = false
     // 预览大小
@@ -765,13 +768,13 @@ extension PQStuckPointPublicController {
         if isSaveDraftSuccess {
             let sdata = editProjectModel?.sData?.toJSONString(prettyPrint: false) ?? ""
             let draftboxId: String? = editProjectModel?.draftboxId
-            PQBaseViewModel.saveProject(draftboxId: draftboxId, sdata: sdata, videoFromScene: .stuckPoint) { [weak self] projectId, msg in
+            PQBaseViewModel.saveProject(draftboxId: draftboxId, sdata: sdata, videoFromScene: .stuckPoint,rhythmMode: rhythmMode) { [weak self] projectId, msg in
                 BFLog(message: "生成的项目id1111 :\(projectId ?? ""),msg = \(msg ?? "")")
                 if projectId == nil || (projectId?.count ?? 0) <= 0 {
-                    PQBaseViewModel.saveProject(draftboxId: draftboxId, sdata: sdata, videoFromScene: .stuckPoint) { [weak self] projectId, msg in
+                    PQBaseViewModel.saveProject(draftboxId: draftboxId, sdata: sdata, videoFromScene: .stuckPoint,rhythmMode: self?.rhythmMode ?? .createStickersModelPoint) { [weak self] projectId, msg in
                         BFLog(message: "生成的项目id222 :\(projectId ?? ""),msg = \(msg ?? "")")
                         if projectId == nil || (projectId?.count ?? 0) <= 0 {
-                            PQBaseViewModel.saveProject(draftboxId: draftboxId, sdata: sdata, videoFromScene: .stuckPoint) { [weak self] projectId, msg in
+                            PQBaseViewModel.saveProject(draftboxId: draftboxId, sdata: sdata, videoFromScene: .stuckPoint,rhythmMode: self?.rhythmMode ?? .createStickersModelPoint) { [weak self] projectId, msg in
                                 BFLog(message: "生成的项目id 3333:\(projectId ?? ""),msg = \(msg ?? "")")
                                 if projectId != nil, (projectId?.count ?? 0) > 0 {
                                     self?.editProjectModel?.projectId = projectId ?? ""