Bladeren bron

1,添加变音排序

jsonwang 3 jaren geleden
bovenliggende
commit
9a1ab71679
1 gewijzigde bestanden met toevoegingen van 7 en 8 verwijderingen
  1. 7 8
      BFRecordScreenKit/Classes/RecordScreen/Controller/BFRecordScreenController.swift

+ 7 - 8
BFRecordScreenKit/Classes/RecordScreen/Controller/BFRecordScreenController.swift

@@ -1959,14 +1959,7 @@ public class BFRecordScreenController: BFBaseViewController {
 //        }
         
         //add by ak 使用的音频数据
-        var  useVoiceStickers = [PQVoiceModel]()
-        if(itemModels[currItemModelIndex].voiceChangeStickers.count > 0){
-            useVoiceStickers = itemModels[currItemModelIndex].voiceChangeStickers
-        }else{
-            useVoiceStickers = itemModels[currItemModelIndex].voiceStickers
-        }
-        
-
+        let  useVoiceStickers = itemModels[currItemModelIndex].getUsedVoices()
         if useVoiceStickers.first(where: { m in
             CMTimeCompare(m.startCMTime, currentT) <= 0 && CMTimeCompare(currentT, m.endCMTime) <= 0
         }) != nil {
@@ -2159,6 +2152,12 @@ public class BFRecordScreenController: BFBaseViewController {
             m1.startCMTime.seconds < m2.endCMTime.seconds
         })
         
+        //add by ak 变音排序
+        itemModels[currItemModelIndex].voiceChangeStickers.sort(by: { m1, m2 in
+            m1.startCMTime.seconds < m2.endCMTime.seconds
+        })
+        
+        
         isNormalPlaying = true
         if isEndPlay || (currMediaType == .Image && CMTimeCompare(currentAssetProgress, itemModels[currItemModelIndex].materialDuraion) >= 0) {
             isEndPlay = false