|
@@ -72,11 +72,13 @@ class PQStuckPointPublicController: PQBaseViewController {
|
|
|
|
|
|
|
|
|
private var watermarkMovieExporter: PQCompositionExporter!
|
|
|
- private var watermarkMovieLocalURL: URL?
|
|
|
+
|
|
|
+ private var watermarkMovieLocalURL: URL?
|
|
|
|
|
|
private var endMovieExporter: PQCompositionExporter!
|
|
|
- private var endMovieLocalURL: URL?
|
|
|
-
|
|
|
+
|
|
|
+ private var endMovieLocalURL: URL?
|
|
|
+
|
|
|
private var saveMovieLocalURL: URL?
|
|
|
|
|
|
|
|
@@ -620,6 +622,7 @@ class PQStuckPointPublicController: PQBaseViewController {
|
|
|
}
|
|
|
|
|
|
deinit {
|
|
|
+ BFLog(message: "发布界面析构 1")
|
|
|
view.endEditing(true)
|
|
|
PQNotification.removeObserver(self)
|
|
|
|
|
@@ -827,7 +830,7 @@ extension PQStuckPointPublicController {
|
|
|
BFLog(message: "开始导出")
|
|
|
}
|
|
|
exporter.progressClosure = { [weak self] _, _, progress in
|
|
|
- BFLog(message: "合成进度 \(progress)")
|
|
|
+ BFLog(message: "正片合成进度 \(progress)")
|
|
|
let useProgress = progress > 1 ? 1 : progress
|
|
|
if progress > 0, Int(useProgress * 100) > (self?.exportProgrss ?? 0) {
|
|
|
|