Ver código fonte

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

wenweiwei 3 anos atrás
pai
commit
6da61dc22b

+ 3 - 2
BFRecordScreenKit/Classes/RecordScreen/Controller/BFRecordScreenController.swift

@@ -458,7 +458,7 @@ public class BFRecordScreenController: BFBaseViewController {
                 newSubtitle.taskID = (header?["task_id"] as? String) ?? ""
 
                 // 这里加300ms 是因为返回结果为了切到字,时长提前一些时间,具体时间官方没说和原音频有关系。这里我们先延后300ms 单位:毫秒。
-
+                
                 newSubtitle.timelineIn = (self?.recorderManager?.voiceModel?.startTime ?? 0.0) + Float64((((payload?["begin_time"]) as? Int) ?? 0) + 300) / 1000.0
 
                 newSubtitle.timelineOut = (self?.recorderManager?.voiceModel?.startTime ?? 0.0) + Float64(((payload?["time"]) as? Int) ?? 0) / 1000.0
@@ -555,7 +555,6 @@ public class BFRecordScreenController: BFBaseViewController {
                     self?.resetCurrentProgress()
                     self?.deleteRecordBtn.isHidden = true
                     self?.recordBtn.isHidden = (self?.itemModels[self?.currItemModelIndex ?? 0].mediaType == .IMAGE && (self?.isEndPlay ?? false)) ? false : (self?.isEndPlay ?? false)
-                    self?.recorderManager?.voiceModel = nil
                 }
                 sself.currentPlayRecordIndex = -3 // 刚录音完,不需要播放录音
                 BFLog(3, message: "重置播放index-\(#function) = \(sself.currentPlayRecordIndex)")
@@ -1172,6 +1171,7 @@ public class BFRecordScreenController: BFBaseViewController {
         searchStopAtRecordRange(needAdsorb: true)
         changeWithDrawBtnLayout(0)
         isEndPlay = (progress == 1)
+        recorderManager?.voiceModel = nil
     }
 
     // 是否吸附在录音首尾处
@@ -1431,6 +1431,7 @@ public class BFRecordScreenController: BFBaseViewController {
 
     func play() {
         BFLog(1, message: "开始播放 \(currentAssetProgress.seconds)")
+        recorderManager?.voiceModel = nil
 
         isNormalPlaying = true
         if isEndPlay {