|
@@ -67,6 +67,8 @@ public class BFRecordScreenController: BFBaseViewController {
|
|
var isNormalPlaying = false { // 是否正在播放
|
|
var isNormalPlaying = false { // 是否正在播放
|
|
didSet {
|
|
didSet {
|
|
playBtn.isSelected = isNormalPlaying
|
|
playBtn.isSelected = isNormalPlaying
|
|
|
|
+ withDrawBtn.isHidden = isNormalPlaying
|
|
|
|
+
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -496,7 +498,7 @@ public class BFRecordScreenController: BFBaseViewController {
|
|
// 矫正进度
|
|
// 矫正进度
|
|
self?.resetCurrentProgress()
|
|
self?.resetCurrentProgress()
|
|
self?.deleteRecordBtn.isHidden = true
|
|
self?.deleteRecordBtn.isHidden = true
|
|
- self?.recordBtn.isHidden = false
|
|
|
|
|
|
+ self?.recordBtn.isHidden = self?.isEndPlay ?? false
|
|
}
|
|
}
|
|
sself.currentPlayRecordIndex = -3 // 刚录音完,不需要播放录音
|
|
sself.currentPlayRecordIndex = -3 // 刚录音完,不需要播放录音
|
|
// 重置录制开始时间
|
|
// 重置录制开始时间
|
|
@@ -1059,6 +1061,8 @@ public class BFRecordScreenController: BFBaseViewController {
|
|
BFLog(1, message: "isDragingProgressSlder : \(isDragingProgressSlder)")
|
|
BFLog(1, message: "isDragingProgressSlder : \(isDragingProgressSlder)")
|
|
searchStopAtRecordRange(needAdsorb: true)
|
|
searchStopAtRecordRange(needAdsorb: true)
|
|
changeWithDrawBtnLayout(false)
|
|
changeWithDrawBtnLayout(false)
|
|
|
|
+ isEndPlay = (progress == 1)
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
// 是否吸附在录音首尾处
|
|
// 是否吸附在录音首尾处
|
|
@@ -1300,7 +1304,7 @@ public class BFRecordScreenController: BFBaseViewController {
|
|
subtitleBtn.isHidden = false
|
|
subtitleBtn.isHidden = false
|
|
soundSettingBtn.isHidden = false
|
|
soundSettingBtn.isHidden = false
|
|
withDrawBtn.isHidden = false
|
|
withDrawBtn.isHidden = false
|
|
- recordBtn.isHidden = false
|
|
|
|
|
|
+ recordBtn.isHidden = isEndPlay
|
|
// movie?.cancelProcessing()
|
|
// movie?.cancelProcessing()
|
|
assetPlayer?.pause()
|
|
assetPlayer?.pause()
|
|
recordPlayer?.pause()
|
|
recordPlayer?.pause()
|
|
@@ -1397,16 +1401,10 @@ public class BFRecordScreenController: BFBaseViewController {
|
|
|
|
|
|
NotificationCenter.default.addObserver(forName: .AVPlayerItemDidPlayToEndTime, object: assetPlayer?.currentItem, queue: .main) { [weak self] notify in
|
|
NotificationCenter.default.addObserver(forName: .AVPlayerItemDidPlayToEndTime, object: assetPlayer?.currentItem, queue: .main) { [weak self] notify in
|
|
BFLog(1, message: "AVPlayerItemDidPlayToEndTime = \(notify)")
|
|
BFLog(1, message: "AVPlayerItemDidPlayToEndTime = \(notify)")
|
|
-// if (self?.currItemModelIndex ?? 0) < ((self?.itemModels.count ?? 0) - 1) {
|
|
|
|
-// self?.collectionView.setContentOffset(CGPoint(x: CGFloat((self?.currItemModelIndex ?? 0) + 1) * (self?.collectionView.frame.width ?? 0), y: 0), animated: true)
|
|
|
|
-// } else {
|
|
|
|
-// }
|
|
|
|
|
|
+
|
|
self?.isNormalPlaying = false
|
|
self?.isNormalPlaying = false
|
|
- // self?.assetPlayer?.seek(to: CMTime.zero)
|
|
|
|
- // self?.progressThumV.progress = 0
|
|
|
|
self?.isEndPlay = true
|
|
self?.isEndPlay = true
|
|
- // self?.currentPlayRecordIndex = -1
|
|
|
|
- self?.recordBtn.isHidden = true
|
|
|
|
|
|
+
|
|
if self?.isRecording ?? false {
|
|
if self?.isRecording ?? false {
|
|
self?.endRecord()
|
|
self?.endRecord()
|
|
cShowHUB(superView: nil, msg: "此视频已录制到头了哦")
|
|
cShowHUB(superView: nil, msg: "此视频已录制到头了哦")
|