1.merge stuckpoint

BFFramework/Classes/Stuckpoint/Controller/PQStuckPointEditerController.swift

@@ -255,7 +255,7 @@ class PQStuckPointEditerController: PQBaseViewController {
         pointEditRemindLab.backgroundColor = .clear
         pointEditRemindLab.textAlignment = .left
         pointEditRemindLab.font = UIFont.boldSystemFont(ofSize: 14)
-        pointEditRemindLab.textColor = .black
+        pointEditRemindLab.textColor = PQBFConfig.shared.styleTitleColor
         pointEditRemindLab.text = "卡点模式"
         return pointEditRemindLab
     }()
@@ -266,7 +266,7 @@ class PQStuckPointEditerController: PQBaseViewController {
         speedTitleLab.backgroundColor = .clear
         speedTitleLab.textAlignment = .left
         speedTitleLab.font = UIFont.boldSystemFont(ofSize: 14)
-        speedTitleLab.textColor = .black
+        speedTitleLab.textColor = PQBFConfig.shared.styleTitleColor
         speedTitleLab.text = "节奏变化"
         return speedTitleLab
     }()
@@ -938,7 +938,7 @@ class PQStuckPointEditerController: PQBaseViewController {
         }) as? PQStuckPointMaterialController
 
         if materialVC != nil, materialVC?.isToPublicHandle != nil {
-            materialVC?.isToPublicHandle!(isReCreate, selectedTotalDuration, selectedDataCount, selectedImageDataCount, mStickers, stuckPointMusicData, tempModel)
+            materialVC?.isToPublicHandle!(isReCreate, selectedTotalDuration, selectedDataCount, selectedImageDataCount, mStickers, stuckPointMusicData, tempModel,currentCreateStickersModel,modelSpeed_maxSpeed,modelSpeed_minSpeed,Float(finallyStuckPoints.last ?? 0) - Float(finallyStuckPoints.first ?? 0),getClipAudioRange(),playeTimeRange)
         } else {
             if finallyStuckPoints.count == 0 {
                 cShowHUB(superView: nil, msg: "无卡点信息，返回重新选择音乐")

BFFramework/Classes/Stuckpoint/Controller/PQStuckPointMaterialController.swift

@@ -12,7 +12,8 @@ import BFCommonKit
 import BFMaterialKit
 
 public class PQStuckPointMaterialController: PQBaseViewController {
-    public var isToPublicHandle:((_ isReCreate:Bool,_ selectedTotalDuration: Float64,_ selectedDataCount:Int,_ selectedImageDataCount: Int,_ mStickers: [PQEditVisionTrackMaterialsModel]?,_ stuckPointMusicData: PQVoiceModel?,_ editProjectModel: PQEditProjectModel?) -> Void)?
+    public var isToPublicHandle:((_ isReCreate:Bool,_ selectedTotalDuration: Float64,_ selectedDataCount:Int,_ selectedImageDataCount: Int,_ mStickers: [PQEditVisionTrackMaterialsModel]?,_ stuckPointMusicData: PQVoiceModel?,_ editProjectModel: PQEditProjectModel?,_ rhythmMode:createStickersModel,_ speedMin:Float,_ speedMax:Float,_ audioTime:Float,_ clipAudioRange:CMTimeRange,_ playeTimeRange:CMTimeRange) -> Void)?
+               
     // 按钮高
     let choseBtnH: CGFloat = cDefaultMargin * 3
     // 按钮宽