|
@@ -57,12 +57,7 @@ public class BFRecordScreenController: BFBaseViewController {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- var isEndPlay = false {
|
|
|
|
- didSet {
|
|
|
|
- // 如果是图片的话在播放停止时不需要隐藏录制
|
|
|
|
- recordBtn.isHidden = (itemModels[currItemModelIndex].mediaType == .IMAGE && isEndPlay) ? false : isEndPlay
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ var isEndPlay = false
|
|
|
|
|
|
var isNormalPlaying = false { // 是否正在播放
|
|
var isNormalPlaying = false { // 是否正在播放
|
|
didSet {
|
|
didSet {
|
|
@@ -1287,6 +1282,7 @@ public class BFRecordScreenController: BFBaseViewController {
|
|
// isStopAtRecordRange = -1
|
|
// isStopAtRecordRange = -1
|
|
// BFLog(1, message: "停在了录音区间外 \(isStopAtRecordRange)")
|
|
// BFLog(1, message: "停在了录音区间外 \(isStopAtRecordRange)")
|
|
searchStopAtRecordRange(needAdsorb: false)
|
|
searchStopAtRecordRange(needAdsorb: false)
|
|
|
|
+ return
|
|
} else {
|
|
} else {
|
|
if fabs(elems[0].1.startCMTime.seconds - currentAssetProgress.seconds) < 0.5 {
|
|
if fabs(elems[0].1.startCMTime.seconds - currentAssetProgress.seconds) < 0.5 {
|
|
BFLog(1, message: "吸附在录音开始")
|
|
BFLog(1, message: "吸附在录音开始")
|
|
@@ -1559,9 +1555,9 @@ public class BFRecordScreenController: BFBaseViewController {
|
|
subtitleBtn.isHidden = false
|
|
subtitleBtn.isHidden = false
|
|
soundSettingBtn.isHidden = false
|
|
soundSettingBtn.isHidden = false
|
|
withDrawBtn.isHidden = false
|
|
withDrawBtn.isHidden = false
|
|
- recordBtn.isHidden = isRecording ? false : isEndPlay
|
|
|
|
- let su = isEndPlay
|
|
|
|
- isEndPlay = su
|
|
|
|
|
|
+// recordBtn.isHidden = isRecording ? false : isEndPlay
|
|
|
|
+ recordBtn.isHidden = (itemModels[currItemModelIndex].mediaType == .IMAGE && isEndPlay) ? false : isEndPlay
|
|
|
|
+
|
|
assetPlayer?.pause()
|
|
assetPlayer?.pause()
|
|
recordPlayer?.pause()
|
|
recordPlayer?.pause()
|
|
recordStartPlayTime = CMTime.zero
|
|
recordStartPlayTime = CMTime.zero
|
|
@@ -1668,6 +1664,7 @@ public class BFRecordScreenController: BFBaseViewController {
|
|
|
|
|
|
sself.isNormalPlaying = false
|
|
sself.isNormalPlaying = false
|
|
sself.isEndPlay = true
|
|
sself.isEndPlay = true
|
|
|
|
+ sself.recordBtn.isHidden = (sself.itemModels[sself.currItemModelIndex].mediaType == .IMAGE) ? false : true
|
|
|
|
|
|
sself.subtitleBtn.isHidden = false
|
|
sself.subtitleBtn.isHidden = false
|
|
sself.soundSettingBtn.isHidden = false
|
|
sself.soundSettingBtn.isHidden = false
|