|
@@ -117,9 +117,10 @@ public class BFRecordScreenController: BFBaseViewController {
|
|
sself.events.removeLast()
|
|
sself.events.removeLast()
|
|
sself.events.append(event!)
|
|
sself.events.append(event!)
|
|
}
|
|
}
|
|
-
|
|
|
|
sself.itemModels[sself.currItemModelIndex].voiceStickers.append(model)
|
|
sself.itemModels[sself.currItemModelIndex].voiceStickers.append(model)
|
|
-
|
|
|
|
|
|
+ if sself.itemModels[sself.currItemModelIndex].mediaType == .IMAGE {
|
|
|
|
+ sself.itemModels[sself.currItemModelIndex].materialDuraion = sself.itemModels[sself.currItemModelIndex].materialDuraion + (Double(model.duration ?? "0") ?? 0)
|
|
|
|
+ }
|
|
sself.drawOrUpdateRecordProgessLable()
|
|
sself.drawOrUpdateRecordProgessLable()
|
|
|
|
|
|
sself.currentPlayRecordIndex = -3 // 刚录音完,不需要播放录音
|
|
sself.currentPlayRecordIndex = -3 // 刚录音完,不需要播放录音
|
|
@@ -479,7 +480,7 @@ public class BFRecordScreenController: BFBaseViewController {
|
|
break
|
|
break
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- if findShowSubtitle != nil && subtitleSettingView.subtitle.setting.subtitleIsShow {
|
|
|
|
|
|
+ if findShowSubtitle != nil, subtitleSettingView.subtitle.setting.subtitleIsShow {
|
|
subtitleLabel.text = findShowSubtitle?.text
|
|
subtitleLabel.text = findShowSubtitle?.text
|
|
setSubtitleStyle(settingModel: subtitleSettingView.subtitle.setting)
|
|
setSubtitleStyle(settingModel: subtitleSettingView.subtitle.setting)
|
|
|
|
|
|
@@ -1234,7 +1235,7 @@ extension BFRecordScreenController: UICollectionViewDelegate, UICollectionViewDa
|
|
} else {
|
|
} else {
|
|
cell = BFImageCoverViewCell.gpuImageViewCell(collectionView: collectionView, indexPath: indexPath)
|
|
cell = BFImageCoverViewCell.gpuImageViewCell(collectionView: collectionView, indexPath: indexPath)
|
|
}
|
|
}
|
|
- recordItem.fetchCoverImg = { [weak self,weak cell] _ in
|
|
|
|
|
|
+ recordItem.fetchCoverImg = { [weak self, weak cell] _ in
|
|
cell?.addData()
|
|
cell?.addData()
|
|
if recordItem.mediaType == .IMAGE {
|
|
if recordItem.mediaType == .IMAGE {
|
|
self?.progressThumV.recordItem = recordItem
|
|
self?.progressThumV.recordItem = recordItem
|
|
@@ -1274,9 +1275,9 @@ extension BFRecordScreenController: UICollectionViewDelegate, UICollectionViewDa
|
|
let currCell: BFVideoCoverViewCell? = collectionView.cellForItem(at: IndexPath(item: currItemModelIndex, section: 0)) as? BFVideoCoverViewCell
|
|
let currCell: BFVideoCoverViewCell? = collectionView.cellForItem(at: IndexPath(item: currItemModelIndex, section: 0)) as? BFVideoCoverViewCell
|
|
setAudioPlay(item: recordItem.playItem)
|
|
setAudioPlay(item: recordItem.playItem)
|
|
setVideoPlay(item: recordItem.playItem, imageView: currCell?.playView)
|
|
setVideoPlay(item: recordItem.playItem, imageView: currCell?.playView)
|
|
- if changeItemHandle != nil {
|
|
|
|
- changeItemHandle!(currItemModelIndex)
|
|
|
|
- }
|
|
|
|
|
|
+ }
|
|
|
|
+ if changeItemHandle != nil {
|
|
|
|
+ changeItemHandle!(currItemModelIndex)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|