|
@@ -511,7 +511,7 @@ public class BFRecordScreenController: BFBaseViewController {
|
|
|
|
|
|
|
|
|
|
|
|
- recorderManager?.endRecordHandle = { [weak self] voideModel, _ in
|
|
|
+ recorderManager?.endRecordHandle = { [weak self, weak recorderManager] voideModel, _ in
|
|
|
if let sself = self, let model = voideModel, FileManager.default.fileExists(atPath: model.wavFilePath ?? "") {
|
|
|
|
|
|
model.endCMTime = sself.currentAssetProgress
|
|
@@ -599,6 +599,7 @@ public class BFRecordScreenController: BFBaseViewController {
|
|
|
}
|
|
|
sself.currentPlayRecordIndex = -3
|
|
|
BFLog(3, message: "重置播放index-\(#function) = \(sself.currentPlayRecordIndex)")
|
|
|
+ recorderManager?.voiceModel = nil
|
|
|
}
|
|
|
}
|
|
|
recorderManager?.cancelRecordHandle = { [weak self] voiceModel in
|
|
@@ -634,9 +635,6 @@ public class BFRecordScreenController: BFBaseViewController {
|
|
|
bottomeView.addSubview(progreddL)
|
|
|
|
|
|
bottomeView.addSubview(recordBtn)
|
|
|
- if itemModels[currItemModelIndex].mediaType == .IMAGE {
|
|
|
- recordBtn.isEnabled = true
|
|
|
- }
|
|
|
bottomeView.addSubview(deleteRecordBtn)
|
|
|
bottomeView.addSubview(withDrawBtn)
|
|
|
|
|
@@ -1571,8 +1569,11 @@ public class BFRecordScreenController: BFBaseViewController {
|
|
|
DispatchQueue.main.async { [weak self, weak itemModel] in
|
|
|
self?.progressThumV.recordItem = itemModel
|
|
|
self?.progressThumV.isHidden = false
|
|
|
+ self?.recordBtn.isEnabled = true
|
|
|
}
|
|
|
}
|
|
|
+ } else {
|
|
|
+ recordBtn.isEnabled = true
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -1623,7 +1624,6 @@ public class BFRecordScreenController: BFBaseViewController {
|
|
|
} else {
|
|
|
assetPlayer = AVPlayer(playerItem: item)
|
|
|
assetPlayer?.volume = noSpeakVolume
|
|
|
- recordBtn.isEnabled = true
|
|
|
avplayerTimeObserver?.invalidate()
|
|
|
avplayerTimeObserver = assetPlayer?.addPeriodicTimeObserver(forInterval: CMTime(value: 1, timescale: 1000), queue: DispatchQueue.global()) { [weak self] time in
|
|
|
|
|
@@ -1886,6 +1886,8 @@ extension BFRecordScreenController: UICollectionViewDelegate, UICollectionViewDa
|
|
|
BFLog(1, message: "滚动结束")
|
|
|
let page = Int((scrollView.contentOffset.x + scrollView.frame.width / 2) / scrollView.frame.width)
|
|
|
if page != currItemModelIndex {
|
|
|
+
|
|
|
+ recordBtn.isEnabled = false
|
|
|
|
|
|
pause()
|
|
|
|
|
@@ -1905,9 +1907,11 @@ extension BFRecordScreenController: UICollectionViewDelegate, UICollectionViewDa
|
|
|
playBtn.isSelected = (recordItem.mediaType == .IMAGE && recordItem.voiceStickers.count <= 0)
|
|
|
|
|
|
progressThumV.recordItem = recordItem
|
|
|
- DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) { [weak self] in
|
|
|
+ DispatchQueue.main.asyncAfter(deadline: .now() + 0.2) { [weak self] in
|
|
|
|
|
|
self?.resetAllIndirectionView()
|
|
|
+
|
|
|
+ self?.recordBtn.isEnabled = true
|
|
|
}
|
|
|
|
|
|
progressThumV.isHidden = false
|
|
@@ -1927,8 +1931,6 @@ extension BFRecordScreenController: UICollectionViewDelegate, UICollectionViewDa
|
|
|
if recordItem.mediaType == .VIDEO {
|
|
|
reloadMaterial()
|
|
|
assetPlayer?.seek(to: .zero, toleranceBefore: CMTime(value: 1, timescale: 1_000_000), toleranceAfter: CMTime(value: 1, timescale: 1_000_000))
|
|
|
- } else {
|
|
|
- recordBtn.isEnabled = true
|
|
|
}
|
|
|
if changeItemHandle != nil {
|
|
|
changeItemHandle!(page)
|