소스 검색

1.解决有重合录音时移除操作

wenweiwei 3 년 전
부모
커밋
d009201913

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

@@ -433,7 +433,7 @@ public class BFRecordScreenController: BFBaseViewController {
         // 录音进度
         recorderManager?.recorderProgrossHandle = { [weak self] progress in
             BFLog(1, message: "curr:录音进度--\(progress) \(self?.recordStartTime ?? 0) \(self?.isRecording ?? false)")
-            self?.drawProgressIndication(progress: (progress.isNaN || progress.isInfinite) ? progress : 0)
+            self?.drawProgressIndication(progress: (progress.isNaN || progress.isInfinite) ? 0 : progress)
         }
 
         // 录音字幕回调
@@ -527,9 +527,8 @@ public class BFRecordScreenController: BFBaseViewController {
                     // 录音完,重绘撤销按钮,更新录音按钮,
                     self?.changeWithDrawBtnLayout(2)
                     // 注:在录制结束时矫正当前位置,避免跟指针无法对其
-                    if deletedVoices.count == 0 {
-                        self?.indirectionView?.resetCurrentItem(start: model.startTime, end: model.endTime)
-                    } else {
+                    self?.indirectionView?.resetCurrentItem(start: model.startTime, end: model.endTime)
+                    if deletedVoices.count > 0 {
                         /// 重绘录音进度视图
                         self?.resetAllIndirectionView()
                     }
@@ -928,7 +927,7 @@ public class BFRecordScreenController: BFBaseViewController {
             BFLog(message: "录音机初始化错误!!!")
             return
         }
-        
+
         view.isUserInteractionEnabled = false
 
         let model = PQVoiceModel()
@@ -968,7 +967,7 @@ public class BFRecordScreenController: BFBaseViewController {
         isRecording = false
         progressThumV.progressView.isUserInteractionEnabled = true
         collectionView.isScrollEnabled = true
-        
+
         view.isUserInteractionEnabled = true
         recorderManager?.stopRecord(isCancel: false)
 //        changeWithDrawBtnLayout(2)
@@ -1162,7 +1161,7 @@ public class BFRecordScreenController: BFBaseViewController {
 
         // TODO: 滑动,播放暂停,撤销时,判断是否停止录音区间,是则删除相关录音,画笔,头像,字幕
         let elems = itemModels[currItemModelIndex].voiceStickers.enumerated().filter { elem in
-            (elem.1.startTime) <= self.currentAssetProgress.seconds && (elem.1.endTime) > self.currentAssetProgress.seconds
+            elem.1.startTime <= self.currentAssetProgress.seconds && elem.1.endTime > self.currentAssetProgress.seconds
         }
 
         isEndPlay = false

+ 2 - 0
BFRecordScreenKit/Classes/RecordScreen/View/BFIndirectionProgressView.swift

@@ -82,6 +82,7 @@ class BFIndirectionProgressView: UIView {
     /// 检测并创建item
     /// - Parameter start: <#start description#>
     func detectionAndCreateItem(start: CGFloat = 0, progress: Float64) {
+        BFLog(message: "检测并创建item:\(start)")
         if currentItem == nil {
             currentItem = detectionItem(start: start, progress: progress)
         }
@@ -116,6 +117,7 @@ class BFIndirectionProgressView: UIView {
         currentItem?.frame.origin.x = start * percenWidth
         currentItem?.frame.size.width = (end - start) * percenWidth
         currentItem = nil
+        BFLog(message: "重置currentItem:\(start)")
     }
 
     /// 删除某个view