|
@@ -1342,6 +1342,10 @@ public class BFRecordScreenController: BFBaseViewController {
|
|
changeWithDrawBtnLayout(0)
|
|
changeWithDrawBtnLayout(0)
|
|
isEndPlay = (progress == 1)
|
|
isEndPlay = (progress == 1)
|
|
recorderManager?.voiceModel = nil
|
|
recorderManager?.voiceModel = nil
|
|
|
|
+ // 视频拖动到最后隐藏录制按钮
|
|
|
|
+ if itemModels[currItemModelIndex].mediaType == .VIDEO && currentAssetProgress.seconds >= itemModels[currItemModelIndex].materialDuraion {
|
|
|
|
+ recordBtn.isHidden = true
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
// 是否吸附在录音首尾处
|
|
// 是否吸附在录音首尾处
|
|
@@ -1653,7 +1657,7 @@ public class BFRecordScreenController: BFBaseViewController {
|
|
}
|
|
}
|
|
|
|
|
|
isNormalPlaying = true
|
|
isNormalPlaying = true
|
|
- if isEndPlay {
|
|
|
|
|
|
+ if isEndPlay || (itemModels[currItemModelIndex].mediaType == .IMAGE && currentAssetProgress.seconds >= itemModels[currItemModelIndex].materialDuraion) {
|
|
isEndPlay = false
|
|
isEndPlay = false
|
|
assetPlayer?.seek(to: CMTime.zero)
|
|
assetPlayer?.seek(to: CMTime.zero)
|
|
progressThumV.progress = 0
|
|
progressThumV.progress = 0
|
|
@@ -2149,7 +2153,7 @@ public extension BFRecordScreenController {
|
|
func startPlayRecord(time: CMTime) {
|
|
func startPlayRecord(time: CMTime) {
|
|
// 播放对应的录音音频
|
|
// 播放对应的录音音频
|
|
if itemModels[currItemModelIndex].mediaType == .IMAGE {
|
|
if itemModels[currItemModelIndex].mediaType == .IMAGE {
|
|
- if itemModels[currItemModelIndex].materialDuraion <= 0 || currentAssetProgress.seconds >= itemModels[currItemModelIndex].materialDuraion {
|
|
|
|
|
|
+ if itemModels[currItemModelIndex].materialDuraion <= 0 {
|
|
playBtn.isSelected = true
|
|
playBtn.isSelected = true
|
|
return
|
|
return
|
|
}
|
|
}
|