Merge branch 'master' of https://git.yishihui.com/iOS/BFFramework

合并代码

BFFramework/Classes/Stuckpoint/Controller/PQStuckPointEditerController.swift

@@ -1092,6 +1092,7 @@ class PQStuckPointEditerController: PQBaseViewController {
         PQSingletoMemoryUtil.shared.allExportSession.forEach { _, exportSession in
             exportSession.cancelExport()
         }
+        self.synchroMarskView.removeMarskView()
         BFLog(1, message: "卡点视频预览界面release")
     }
 }

BFFramework/Classes/Stuckpoint/Controller/PQStuckPointPublicController.swift

@@ -35,7 +35,7 @@ class PQStuckPointPublicController: PQBaseViewController {
     // 最大的宽度
     private var maxWidth: CGFloat = cScreenWidth
     // 最大的高度
-    private var maxHeight: CGFloat = 385
+    private var maxHeight: CGFloat = cScreenHeigth > 568 ? 385 : 385*cScreenHeigth/818
     // 开始导出的时间
     private let startExportDate: Float64 = Date().timeIntervalSince1970
     // 导出结束的时间
@@ -1345,6 +1345,7 @@ extension PQStuckPointPublicController {
         }
 
         playBtn.isHidden = true
+        playerHeaderCoverImageView.isHidden = true
         avPlayer.play()
     }
 

BFFramework/Classes/Stuckpoint/ViewModel/PQPlayerViewModel.swift

@@ -670,7 +670,7 @@ extension PQPlayerViewModel {
                     
                     clipTotalDuration = clipTotalDuration + Float(CMTimeGetSeconds(trackTimeRange.duration))
                 }
-                BFLog(1, message: "原音频时长短：count = \(count),startTime = \(startTime),trackTimeRange = \(trackTimeRange)")
+//                BFLog(1, message: "原音频时长短：count = \(count),startTime = \(startTime),trackTimeRange = \(trackTimeRange)")
                 let parameters = mixAudioTrack(audioAsset: originAsset, startTime: startTime, trackTimeRange: trackTimeRange, volume: volume, composition: composition)
                 if parameters != nil {
                     tempParameters.append(parameters!)
@@ -684,7 +684,7 @@ extension PQPlayerViewModel {
             let startTime = CMTime(value: CMTimeValue(clipTotalDuration * Float(playerTimescaleInt)), timescale: playerTimescaleInt)
             
             let trackTimeRange = CMTimeRange(start: startTime, end: CMTime(value: CMTimeValue((CMTimeGetSeconds(startTime) + row) * Double(playerTimescaleInt)), timescale: playerTimescaleInt))
-            BFLog(1, message: "最后一小段音乐时长短：count = \(count),startTime = \(startTime),trackTimeRange = \(trackTimeRange)")
+            BFLog(1, message: "最后一小段音乐时长短：count = \(count),startTime = \(CMTimeShow(startTime)),trackTimeRange = \(CMTimeRangeShow(trackTimeRange))")
             let parameters = mixAudioTrack(audioAsset: originAsset, startTime: startTime, trackTimeRange: trackTimeRange, volume: volume, composition: composition)
             if parameters != nil {
                 tempParameters.append(parameters!)