|
@@ -433,7 +433,7 @@ public class BFRecordScreenController: BFBaseViewController {
|
|
|
|
|
|
recorderManager?.recorderProgrossHandle = { [weak self] progress in
|
|
recorderManager?.recorderProgrossHandle = { [weak self] progress in
|
|
BFLog(1, message: "curr:录音进度--\(progress) \(self?.recordStartTime ?? 0) \(self?.isRecording ?? false)")
|
|
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)
|
|
self?.changeWithDrawBtnLayout(2)
|
|
|
|
|
|
- if deletedVoices.count == 0 {
|
|
+ self?.indirectionView?.resetCurrentItem(start: model.startTime, end: model.endTime)
|
|
- self?.indirectionView?.resetCurrentItem(start: model.startTime, end: model.endTime)
|
|
+ if deletedVoices.count > 0 {
|
|
- } else {
|
|
|
|
|
|
|
|
self?.resetAllIndirectionView()
|
|
self?.resetAllIndirectionView()
|
|
}
|
|
}
|
|
@@ -928,7 +927,7 @@ public class BFRecordScreenController: BFBaseViewController {
|
|
BFLog(message: "录音机初始化错误!!!")
|
|
BFLog(message: "录音机初始化错误!!!")
|
|
return
|
|
return
|
|
}
|
|
}
|
|
-
|
|
+
|
|
view.isUserInteractionEnabled = false
|
|
view.isUserInteractionEnabled = false
|
|
|
|
|
|
let model = PQVoiceModel()
|
|
let model = PQVoiceModel()
|
|
@@ -968,7 +967,7 @@ public class BFRecordScreenController: BFBaseViewController {
|
|
isRecording = false
|
|
isRecording = false
|
|
progressThumV.progressView.isUserInteractionEnabled = true
|
|
progressThumV.progressView.isUserInteractionEnabled = true
|
|
collectionView.isScrollEnabled = true
|
|
collectionView.isScrollEnabled = true
|
|
-
|
|
+
|
|
view.isUserInteractionEnabled = true
|
|
view.isUserInteractionEnabled = true
|
|
recorderManager?.stopRecord(isCancel: false)
|
|
recorderManager?.stopRecord(isCancel: false)
|
|
|
|
|
|
@@ -1162,7 +1161,7 @@ public class BFRecordScreenController: BFBaseViewController {
|
|
|
|
|
|
|
|
|
|
let elems = itemModels[currItemModelIndex].voiceStickers.enumerated().filter { elem in
|
|
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
|
|
isEndPlay = false
|