Merge branch 'master' into dev

* master:
  封面图渲染

# Conflicts:
#	BFRecordScreenKit/Classes/RecordScreen/View/Cell/BFImageCoverViewCell.swift

BFRecordScreenKit/Classes/RecordScreen/Controller/BFRecordScreenController.swift

@@ -1379,12 +1379,15 @@ public class BFRecordScreenController: BFBaseViewController {
     
         if !isDragingProgressSlder, isStopAtRecordRange != -1, isStopAtRecordRange < itemModels[currItemModelIndex].voiceStickers.count {
             let model = itemModels[currItemModelIndex].voiceStickers[isStopAtRecordRange]
-            itemModels[currItemModelIndex].voiceStickers.remove(at: isStopAtRecordRange)
-            indirectionView?.deleteItem(index: isStopAtRecordRange)
+
+            // 撤销记录点
             var event = WithDrawModel(type: 3, timestamp: currentAssetProgress, recordItem: rscurrentManager.recordItem!.mutableCopy() as! BFRecordItemModel)
             event.deletedTittles = deleteTitles(voiceModel: model)
             events.append(event)
 
+            itemModels[currItemModelIndex].voiceStickers.remove(at: isStopAtRecordRange)
+            indirectionView?.deleteItem(index: isStopAtRecordRange)
+
             rscurrentManager.deleteRecord(at: currentAssetProgress)
             
             if currMediaType != .Video{

BFRecordScreenKit/Classes/RecordScreen/View/BFIndirectionProgressView.swift

@@ -61,7 +61,7 @@ class BFIndirectionProgressView: UIView {
         subviews.forEach { vv in
             vv.removeFromSuperview()
         }
-
+        
         items?.forEach { [weak self] model in
             _ = createItemView(minX: model.startCMTime.seconds * CGFloat(self?.percenWidth ?? 0), width: (model.endCMTime.seconds - model.startCMTime.seconds) * CGFloat(self?.percenWidth ?? 0))
         }

BFRecordScreenKit/Classes/RecordScreen/View/Cell/BFImageCoverViewCell.swift

@@ -55,10 +55,6 @@ open class BFImageCoverViewCell: UICollectionViewCell {
         super.init(frame: frame)
         contentView.addSubview(playView)
         contentView.addSubview(playBtn)
-        
-        if(recordItem?.mediaType == .Image){
-            contentView.addSubview(playImageView)
-        }
     }
 
     public required init?(coder _: NSCoder) {
@@ -85,6 +81,9 @@ open class BFImageCoverViewCell: UICollectionViewCell {
 //        }
     
         if(recordItem?.mediaType == .Image){
+            if playImageView.superview == nil {
+                contentView.addSubview(playImageView)                
+            }
             playImageView.image = coverImg
         }else{
             playImageView.removeFromSuperview()