1.图片录制结束的删除操作

BFRecordScreenKit/Classes/RecordScreen/Controller/BFRecordScreenController.swift

@@ -494,30 +494,31 @@ public class BFRecordScreenController: BFBaseViewController {
                         continue
                     }
                 }
-                for (item,index) in deletedVoices {
+                for (item, index) in deletedVoices {
                     BFLog(message: "录制结束需要删除的录音文件：\(index)-\(item.wavFilePath ?? "")-\(item.startTime)-\(item.endTime)-\(item.endTime - item.startTime)")
                 }
                 // 删除冲突的音频
-                deletedVoices.forEach { (m,i) in
+                deletedVoices.forEach { m, _ in
                     sself.itemModels[sself.currItemModelIndex].voiceStickers.removeAll { tempM in
-                        return m.wavFilePath == tempM.wavFilePath
+                        m.wavFilePath == tempM.wavFilePath
                     }
                 }
                 BFLog(1, message: "添加录音文件:\(model.startTime) -- \(model.endTime)")
                 sself.itemModels[sself.currItemModelIndex].voiceStickers.append(model)
                 // 如果是图片素材同时有需要删除的录音时需要调整录音文件开始结束时间
                 if sself.itemModels[sself.currItemModelIndex].mediaType == .IMAGE {
-                    if deletedVoices.count > 0  {
+                    if deletedVoices.count > 0 {
                         // 如果是图片先排序在计算区间
                         sself.itemModels[sself.currItemModelIndex].voiceStickers = sself.itemModels[sself.currItemModelIndex].voiceStickers.sorted { voice1, voice2 in
                             voice1.startTime < voice2.startTime
                         }
                         for (index, item) in sself.itemModels[sself.currItemModelIndex].voiceStickers.enumerated() {
-//                            if index > 0,let duration = item.endTime - item.startTime {
-//                                // 注：开始时间减去duration or 等一前一段录音的结束时间
-//                                item.startTime = sself.itemModels[sself.currItemModelIndex].voiceStickers[index - 1].endTime
-//                                item.endTime -= deleteDuration
-//                            }
+                            if index > 0 {
+                                // 注：开始时间减去duration or 等一前一段录音的结束时间
+                                let tempDuration = item.endTime - item.startTime
+                                item.startTime = sself.itemModels[sself.currItemModelIndex].voiceStickers[index - 1].endTime
+                                item.endTime = item.startTime + tempDuration
+                            }
                             BFLog(message: "录制结束重新排序录音文件：\(index)-\(item.wavFilePath ?? "")-\(item.startTime)-\(item.endTime)-\(item.endTime - item.startTime)")
                         }
                     }