|
@@ -621,15 +621,15 @@ class BFRecordScreenCameraManager : BFRecordScreenBaseManager{
|
|
|
|
|
|
wself.progreddL?.text = CMTimeGetSeconds(progress).formatDurationToHMS()
|
|
|
if wself.recordItem?.thumbImgs.count ?? 0 > 0 {
|
|
|
- wself.cameraProgressV?.updateCellWidth(index: wself.recordItem!.thumbImgs.count - 1, progress: progress)
|
|
|
+ wself.cameraProgressV?.updateCellWidth(progress: progress, increaseTime: wself.increaseTime)
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
|
|
|
// 添加新的缩略图
|
|
|
- func addNewThumb(){
|
|
|
+ func addNewThumb(_ img:UIImage){
|
|
|
if let progressThumV = cameraProgressV {
|
|
|
- progressThumV.addThumbImages()
|
|
|
+ progressThumV.addThumbImages(img)
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -664,9 +664,13 @@ extension BFRecordScreenCameraManager : GPUImageVideoCameraDelegate {
|
|
|
|
|
|
if img != nil {
|
|
|
// BFLog(1, message: "取一张缩略图出来 \(dur.seconds), \(wself.recordItem?.thumbImgs.count ?? 0)")
|
|
|
- wself.recordItem?.thumbImgs.append(img!)
|
|
|
wself.videoModel.thumImgs?.append(img!)
|
|
|
- wself.addNewThumb()
|
|
|
+ if let videoStickers = wself.recordItem?.videoStickers {
|
|
|
+ wself.recordItem?.thumbImgs = videoStickers.map({ mod in
|
|
|
+ mod.thumImgs!
|
|
|
+ }).flatMap{$0}
|
|
|
+ }
|
|
|
+ wself.addNewThumb(img!)
|
|
|
}
|
|
|
}
|
|
|
}
|