|
@@ -24,6 +24,7 @@ class INVideoExportController: BFBaseViewController {
|
|
|
|
|
|
let coverIV : UIImageView = {
|
|
let coverIV : UIImageView = {
|
|
let iv = UIImageView()
|
|
let iv = UIImageView()
|
|
|
|
+ iv.backgroundColor = .black
|
|
iv.alpha = 0.5
|
|
iv.alpha = 0.5
|
|
iv.contentMode = .scaleAspectFit
|
|
iv.contentMode = .scaleAspectFit
|
|
return iv
|
|
return iv
|
|
@@ -437,18 +438,18 @@ class INVideoExportController: BFBaseViewController {
|
|
saveToPhotoBtn.snp.makeConstraints { make in
|
|
saveToPhotoBtn.snp.makeConstraints { make in
|
|
make.left.right.equalTo(completeBtn)
|
|
make.left.right.equalTo(completeBtn)
|
|
make.height.equalTo(46)
|
|
make.height.equalTo(46)
|
|
- make.bottom.equalTo(completeBtn.snp.top).offset(-10)
|
|
|
|
|
|
+ make.bottom.equalTo(completeBtn.snp.top).offset(-25)
|
|
}
|
|
}
|
|
|
|
|
|
saveAllBtn.snp.makeConstraints { make in
|
|
saveAllBtn.snp.makeConstraints { make in
|
|
make.left.equalTo(completeBtn)
|
|
make.left.equalTo(completeBtn)
|
|
- make.bottom.equalTo(saveToPhotoBtn.snp.top).offset(-21)
|
|
|
|
|
|
+ make.bottom.equalTo(saveToPhotoBtn.snp.top).offset(-15)
|
|
make.height.equalTo(70)
|
|
make.height.equalTo(70)
|
|
make.top.equalTo(28)
|
|
make.top.equalTo(28)
|
|
}
|
|
}
|
|
|
|
|
|
saveOnlyBtn.snp.makeConstraints { make in
|
|
saveOnlyBtn.snp.makeConstraints { make in
|
|
- make.left.equalTo(saveAllBtn.snp.right).offset(16)
|
|
|
|
|
|
+// make.left.equalTo(saveAllBtn.snp.right).offset(16)
|
|
make.top.height.width.equalTo(saveAllBtn)
|
|
make.top.height.width.equalTo(saveAllBtn)
|
|
make.right.equalTo(completeBtn)
|
|
make.right.equalTo(completeBtn)
|
|
}
|
|
}
|
|
@@ -597,12 +598,12 @@ class INVideoExportController: BFBaseViewController {
|
|
}
|
|
}
|
|
|
|
|
|
if isExporting {
|
|
if isExporting {
|
|
- whetherCancelExport {[weak self] in
|
|
|
|
- self?.export.cancelExport()
|
|
|
|
- self?.resetViewStatus()
|
|
|
|
- self?.saveAllAction(btn: btn)
|
|
|
|
- }
|
|
|
|
- return
|
|
|
|
|
|
+ export.cancelExport()
|
|
|
|
+ resetViewStatus()
|
|
|
|
+// whetherCancelExport {[weak self] in
|
|
|
|
+// self?.saveAllAction(btn: btn)
|
|
|
|
+// }
|
|
|
|
+// return
|
|
}
|
|
}
|
|
|
|
|
|
btn.isSelected = true
|
|
btn.isSelected = true
|
|
@@ -628,12 +629,12 @@ class INVideoExportController: BFBaseViewController {
|
|
return
|
|
return
|
|
}
|
|
}
|
|
if isExporting {
|
|
if isExporting {
|
|
- whetherCancelExport {[weak self ] in
|
|
|
|
- self?.export.cancelExport()
|
|
|
|
- self?.resetViewStatus()
|
|
|
|
- self?.saveOnlyAction(btn: btn)
|
|
|
|
- }
|
|
|
|
- return
|
|
|
|
|
|
+ export.cancelExport()
|
|
|
|
+ resetViewStatus()
|
|
|
|
+// whetherCancelExport {[weak self ] in
|
|
|
|
+// self?.saveOnlyAction(btn: btn)
|
|
|
|
+// }
|
|
|
|
+// return
|
|
}
|
|
}
|
|
|
|
|
|
btn.isSelected = true
|
|
btn.isSelected = true
|