|
@@ -532,19 +532,19 @@ class PQStuckPointPublicController: PQBaseViewController {
|
|
|
make.height.equalTo(22)
|
|
|
}
|
|
|
shareWechatBtn.snp.makeConstraints { make in
|
|
|
- make.right.equalTo(view.snp_centerX).offset(-cDefaultMargin)
|
|
|
+ make.right.equalTo(view.snp.centerX).offset(-cDefaultMargin)
|
|
|
make.width.equalTo(164)
|
|
|
make.height.equalTo(52)
|
|
|
- make.bottom.equalTo(finishedBtn.snp_top).offset(-32)
|
|
|
+ make.bottom.equalTo(finishedBtn.snp.top).offset(-32)
|
|
|
}
|
|
|
shareFriendBtn.snp.makeConstraints { make in
|
|
|
- make.left.equalTo(view.snp_centerX).offset(cDefaultMargin)
|
|
|
+ make.left.equalTo(view.snp.centerX).offset(cDefaultMargin)
|
|
|
make.width.bottom.height.equalTo(shareWechatBtn)
|
|
|
}
|
|
|
|
|
|
inputBackView.snp.makeConstraints { make in
|
|
|
make.centerX.equalToSuperview()
|
|
|
- make.bottom.equalTo(shareWechatBtn.snp_top).offset(-16)
|
|
|
+ make.bottom.equalTo(shareWechatBtn.snp.top).offset(-16)
|
|
|
make.width.equalTo(343)
|
|
|
make.height.equalTo(109)
|
|
|
}
|
|
@@ -566,21 +566,21 @@ class PQStuckPointPublicController: PQBaseViewController {
|
|
|
coverImageTitle.snp.makeConstraints { make in
|
|
|
make.left.equalToSuperview()
|
|
|
make.width.equalTo(50)
|
|
|
- make.top.equalTo(coverImageView.snp_bottom).offset(isWidth ? 0 : -23)
|
|
|
+ make.top.equalTo(coverImageView.snp.bottom).offset(isWidth ? 0 : -23)
|
|
|
make.height.equalTo(23)
|
|
|
}
|
|
|
|
|
|
remindLab.snp.makeConstraints { make in
|
|
|
make.centerX.equalToSuperview()
|
|
|
- make.bottom.equalTo(inputBackView.snp_top).offset(-16).priorityHigh()
|
|
|
+ make.bottom.equalTo(inputBackView.snp.top).offset(-16).priorityHigh()
|
|
|
make.height.equalTo(44)
|
|
|
make.top.greaterThanOrEqualTo(5)
|
|
|
- make.bottom.lessThanOrEqualTo(inputBackView.snp_top).offset(-5)
|
|
|
+ make.bottom.lessThanOrEqualTo(inputBackView.snp.top).offset(-5)
|
|
|
}
|
|
|
|
|
|
titleLabel.snp.makeConstraints { make in
|
|
|
make.height.equalTo(48)
|
|
|
- make.left.equalTo(coverImageView.snp_right).offset(12)
|
|
|
+ make.left.equalTo(coverImageView.snp.right).offset(12)
|
|
|
make.right.equalToSuperview().offset(-14)
|
|
|
make.top.equalToSuperview().offset(10)
|
|
|
}
|
|
@@ -588,7 +588,7 @@ class PQStuckPointPublicController: PQBaseViewController {
|
|
|
pinView.snp.makeConstraints { make in
|
|
|
make.height.width.equalTo(72)
|
|
|
make.right.equalToSuperview()
|
|
|
- make.bottom.equalTo(inputBackView.snp_bottom)
|
|
|
+ make.bottom.equalTo(inputBackView.snp.bottom)
|
|
|
}
|
|
|
|
|
|
publicTitleView.snp.makeConstraints { make in
|
|
@@ -867,7 +867,7 @@ extension PQStuckPointPublicController {
|
|
|
}
|
|
|
}
|
|
|
exporter.completion = { [weak self] url in
|
|
|
- BFLog(message: "无水印的视频导出完成: \(url) 生成视频时长为:\(CMTimeGetSeconds(AVAsset(url: url).duration))")
|
|
|
+ BFLog(message: "无水印的视频导出完成: \(String(describing: url)) 生成视频时长为:\(CMTimeGetSeconds(AVAsset(url: (url ?? URL(string: "https://media.w3.org/2010/05/sintel/trailer.mp4")!)).duration))")
|
|
|
|
|
|
// 导出完成后取消导出
|
|
|
if self?.exporter != nil {
|
|
@@ -1648,12 +1648,12 @@ extension PQStuckPointPublicController {
|
|
|
watermarkMovieExporter.start(playeTimeRange: playeTimeRange)
|
|
|
BFLog(message: "开始导出")
|
|
|
}
|
|
|
- watermarkMovieExporter.progressClosure = { [weak self] _, _, progress in
|
|
|
+ watermarkMovieExporter.progressClosure = { _, _, progress in
|
|
|
BFLog(message: "带水印的合成进度 \(progress) ")
|
|
|
|
|
|
}
|
|
|
watermarkMovieExporter.completion = { [weak self] url in
|
|
|
- BFLog(message: "有水印的视频导出完成: \(url) 生成视频时长为:\(CMTimeGetSeconds(AVAsset(url: url).duration))")
|
|
|
+ BFLog(message: "有水印的视频导出完成: \(String(describing: url)) 生成视频时长为:\(CMTimeGetSeconds(AVAsset(url: url ?? URL(string: "https://media.w3.org/2010/05/sintel/trailer.mp4")!).duration))")
|
|
|
|
|
|
// 导出完成后取消导出
|
|
|
if self?.watermarkMovieExporter != nil {
|
|
@@ -1794,12 +1794,12 @@ extension PQStuckPointPublicController {
|
|
|
self.endMovieExporter.start(playeTimeRange: CMTimeRange.init(start: CMTime.zero, duration: CMTimeMakeWithSeconds(Float64(bgMovieInfo.out), preferredTimescale: BASE_FILTER_TIMESCALE)))
|
|
|
BFLog(message: "开始导出")
|
|
|
}
|
|
|
- self.endMovieExporter.progressClosure = { [weak self] _, _, progress in
|
|
|
+ self.endMovieExporter.progressClosure = { _, _, progress in
|
|
|
BFLog(message: "片尾合成进度 \(progress) ")
|
|
|
|
|
|
}
|
|
|
self.endMovieExporter.completion = { [weak self] url in
|
|
|
- BFLog(message: "片尾的视频导出完成: \(url) 生成视频时长为:\(CMTimeGetSeconds(AVAsset(url: url).duration))")
|
|
|
+ BFLog(message: "片尾的视频导出完成: \(String(describing: url)) 生成视频时长为:\(CMTimeGetSeconds(AVAsset(url: url ?? URL(string: "https://media.w3.org/2010/05/sintel/trailer.mp4")!).duration))")
|
|
|
|
|
|
// 导出完成后取消导出
|
|
|
if self?.endMovieExporter != nil {
|