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

BFRecordScreenKit/Classes/RecordScreen/Controller/BFRecordScreenController.swift

@@ -961,10 +961,18 @@ public class BFRecordScreenController: BFBaseViewController {
                 if let modelIndex = itemModels[currItemModelIndex].voiceStickers.firstIndex(where: { mod in
                     mod.startTime == action.timestamp
                 }) {
+                    // 移除音频
                     let model = itemModels[currItemModelIndex].voiceStickers[modelIndex]
                     itemModels[currItemModelIndex].voiceStickers.remove(at: modelIndex)
-                    // 移除音频
                     indirectionView?.deleteItem(index: modelIndex)
+                    // 删除对应字幕
+                    let deleteTitiles = deleteTitles(voiceModel: model)
+                    for title in deleteTitiles{
+                        itemModels[currItemModelIndex].titleStickers.removeAll { model in
+                            title.0.timelineIn == model.timelineIn
+                        }
+                    } 
+                    //恢复被覆盖的音频
                     var tuples = action.deletedVoices
                     if tuples != nil, tuples!.count > 0 {
                         tuples!.sort { tuple1, tuple2 in
@@ -974,7 +982,7 @@ public class BFRecordScreenController: BFBaseViewController {
                             itemModels[currItemModelIndex].voiceStickers.insert(tuple.0, at: tuple.1)
                         }
                     }
-                    // 恢复字幕
+                    //恢复被覆盖的字幕
                     let titleTuples = action.deletedTittles
                     if titleTuples != nil, titleTuples!.count > 0 {
                         titleTuples?.forEach { titleTuple in

BFRecordScreenKit/Classes/RecordScreen/View/BFStripSwithView.swift

@@ -67,7 +67,7 @@ open class BFStripSwithView: UIView {
                 let itemBtn = UIButton(type: .custom)
                 itemBtn.frame = CGRect(x: CGFloat(index) * (itemSpace + margin), y: (frame.height - itemHeight) / 2, width: margin, height: itemHeight)
                 itemBtn.tag = index + 1
-                itemBtn.addTarget(self, action: #selector(changeSwitch(sender:)), for: .touchUpInside)
+//                itemBtn.addTarget(self, action: #selector(changeSwitch(sender:)), for: .touchUpInside)
                 itemBtn.addCorner(corner: itemHeight / 2)
                 itemBtn.backgroundColor = itemNormalColor
                 if itemBtn.tag == currentIndex + 1 {