|
@@ -187,7 +187,6 @@ public class BFRecordScreenController: BFBaseViewController {
|
|
didSet{
|
|
didSet{
|
|
if isEndPlay {
|
|
if isEndPlay {
|
|
recordBtn.isHidden = (currMediaType != .Video) ? false : true
|
|
recordBtn.isHidden = (currMediaType != .Video) ? false : true
|
|
- recordBtn.alpha = recordBtn.isHidden ? 0 : 1
|
|
|
|
if currMediaType == .Video {
|
|
if currMediaType == .Video {
|
|
deleteRecordBtn.isHidden = true
|
|
deleteRecordBtn.isHidden = true
|
|
}
|
|
}
|
|
@@ -1372,13 +1371,12 @@ public class BFRecordScreenController: BFBaseViewController {
|
|
DispatchQueue.main.async {[weak self] in
|
|
DispatchQueue.main.async {[weak self] in
|
|
guard let wself = self else { return }
|
|
guard let wself = self else { return }
|
|
wself.recordBtn.isHidden = false
|
|
wself.recordBtn.isHidden = false
|
|
- wself.recordBtn.alpha = 1
|
|
|
|
|
|
|
|
if voiceModel?.currIndex == wself.currItemModelIndex {
|
|
if voiceModel?.currIndex == wself.currItemModelIndex {
|
|
if wself.currMediaType == .Image {
|
|
if wself.currMediaType == .Image {
|
|
wself.rscurrentManager.currentAssetProgress = CMTime(seconds: wself.recorderManager?.voiceModel?.startCMTime.seconds ?? 0, preferredTimescale: 1000)
|
|
wself.rscurrentManager.currentAssetProgress = CMTime(seconds: wself.recorderManager?.voiceModel?.startCMTime.seconds ?? 0, preferredTimescale: 1000)
|
|
if wself.currentAssetProgress.seconds >= wself.itemModels[wself.currItemModelIndex].materialDuraion.seconds {
|
|
if wself.currentAssetProgress.seconds >= wself.itemModels[wself.currItemModelIndex].materialDuraion.seconds {
|
|
- wself.rscurrentManager.currentAssetProgress = CMTime(seconds: wself.itemModels[wself.currItemModelIndex].materialDuraion.seconds, preferredTimescale: 1000)
|
|
|
|
|
|
+ wself .rscurrentManager.currentAssetProgress = CMTime(seconds: wself.itemModels[wself.currItemModelIndex].materialDuraion.seconds, preferredTimescale: 1000)
|
|
}
|
|
}
|
|
wself.resetCurrentProgress()
|
|
wself.resetCurrentProgress()
|
|
}
|
|
}
|
|
@@ -1703,14 +1701,12 @@ public class BFRecordScreenController: BFBaseViewController {
|
|
deleteRecordBtn.isHidden = false
|
|
deleteRecordBtn.isHidden = false
|
|
recordBtn.isHidden = true
|
|
recordBtn.isHidden = true
|
|
// add by ak 这里 isHidden 无效
|
|
// add by ak 这里 isHidden 无效
|
|
- recordBtn.alpha = 0
|
|
|
|
|
|
|
|
BFLog(1, message: "停在了录音区间里 \(isStopAtRecordRange), currTime:\(currentAssetProgress.seconds), 录音范围:\(startTime!.seconds) - \(endTime!.seconds)")
|
|
BFLog(1, message: "停在了录音区间里 \(isStopAtRecordRange), currTime:\(currentAssetProgress.seconds), 录音范围:\(startTime!.seconds) - \(endTime!.seconds)")
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
deleteRecordBtn.isHidden = false
|
|
deleteRecordBtn.isHidden = false
|
|
recordBtn.isHidden = true
|
|
recordBtn.isHidden = true
|
|
- recordBtn.alpha = 0
|
|
|
|
|
|
|
|
BFLog(1, message: "停在了录音区间里 \(isStopAtRecordRange), currTime:\(currentAssetProgress.seconds), 录音范围:\(startTime!.seconds) - \(endTime!.seconds)")
|
|
BFLog(1, message: "停在了录音区间里 \(isStopAtRecordRange), currTime:\(currentAssetProgress.seconds), 录音范围:\(startTime!.seconds) - \(endTime!.seconds)")
|
|
}
|
|
}
|
|
@@ -1718,7 +1714,6 @@ public class BFRecordScreenController: BFBaseViewController {
|
|
} else {
|
|
} else {
|
|
deleteRecordBtn.isHidden = true
|
|
deleteRecordBtn.isHidden = true
|
|
recordBtn.isHidden = false
|
|
recordBtn.isHidden = false
|
|
- recordBtn.alpha = 1
|
|
|
|
|
|
|
|
isStopAtRecordRange = -1
|
|
isStopAtRecordRange = -1
|
|
BFLog(1, message: "停在了录音区间外 \(isStopAtRecordRange), currTime:\(currentAssetProgress.seconds)")
|
|
BFLog(1, message: "停在了录音区间外 \(isStopAtRecordRange), currTime:\(currentAssetProgress.seconds)")
|
|
@@ -2228,12 +2223,15 @@ public class BFRecordScreenController: BFBaseViewController {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- if (rscurrentManager.recordItem?.voiceStickers.filter({ model in
|
|
|
|
|
|
+ let list = rscurrentManager.recordItem?.voiceStickers.filter({ model in
|
|
CMTimeCompare(model.startCMTime, currentAssetProgress) <= 0 && CMTimeCompare(currentAssetProgress, model.endCMTime) < 0
|
|
CMTimeCompare(model.startCMTime, currentAssetProgress) <= 0 && CMTimeCompare(currentAssetProgress, model.endCMTime) < 0
|
|
- })) != nil{
|
|
|
|
|
|
+ })
|
|
|
|
+ if (list?.count ?? 0) > 0 {
|
|
recordBtn.isHidden = true
|
|
recordBtn.isHidden = true
|
|
|
|
+ deleteRecordBtn.isHidden = false
|
|
}else{
|
|
}else{
|
|
recordBtn.isHidden = false
|
|
recordBtn.isHidden = false
|
|
|
|
+ deleteRecordBtn.isHidden = true
|
|
}
|
|
}
|
|
|
|
|
|
} else {
|
|
} else {
|
|
@@ -2519,7 +2517,6 @@ public extension BFRecordScreenController {
|
|
wself.resetCurrentProgress()
|
|
wself.resetCurrentProgress()
|
|
// 录制播放结束后显示录制按钮
|
|
// 录制播放结束后显示录制按钮
|
|
wself.recordBtn.isHidden = false
|
|
wself.recordBtn.isHidden = false
|
|
- wself.recordBtn.alpha = 1
|
|
|
|
} else {
|
|
} else {
|
|
// 注:矫正进度--一段录音播放结束后当前指针应该到当前录音结束点
|
|
// 注:矫正进度--一段录音播放结束后当前指针应该到当前录音结束点
|
|
let next = wself.itemModels[wself.currItemModelIndex ].voiceStickers[(recordInfo?.0 ?? 0) + 1].startCMTime
|
|
let next = wself.itemModels[wself.currItemModelIndex ].voiceStickers[(recordInfo?.0 ?? 0) + 1].startCMTime
|