|
@@ -420,9 +420,19 @@ public class BFRecordScreenController: BFBaseViewController {
|
|
|
lazy var musicCutView: BFMusicCutView = {
|
|
|
let musicCutView = BFMusicCutView(frame: CGRect(x: 0, y: 0, width: cScreenWidth, height: cScreenHeigth))
|
|
|
musicCutView.isHidden = true
|
|
|
- musicCutView.cutTimeHandle = {[weak self] startTime ,endTime ,musicInfo in
|
|
|
+ musicCutView.cutTimeHandle = {[weak self] iscancel ,endTime ,musicInfo in
|
|
|
guard let wself = self else { return }
|
|
|
- wself.hadChoosed(music:musicInfo)
|
|
|
+
|
|
|
+ if(!iscancel){
|
|
|
+ wself.hadChoosed(music:musicInfo)
|
|
|
+ }
|
|
|
+
|
|
|
+ //add by ak
|
|
|
+ wself.soundSettingBtn.isHidden = false
|
|
|
+ wself.cameraFlipBtn.isHidden = false
|
|
|
+ wself.voiceSettingBtn.isHidden = false
|
|
|
+ wself.subtitleBtn.isHidden = false
|
|
|
+ wself.addMusicBtn.isHidden = false
|
|
|
}
|
|
|
return musicCutView
|
|
|
}()
|
|
@@ -1450,10 +1460,11 @@ public class BFRecordScreenController: BFBaseViewController {
|
|
|
guard let wself = self else { return }
|
|
|
wself.musicCutView.isHidden = false
|
|
|
wself.musicCutView.bgmData = model
|
|
|
-// UIView.animate(withDuration: 0.2) {
|
|
|
-// // 显示裁剪视图
|
|
|
-// v.frame = CGRect(x: 0, y: cScreenHeigth - 220, width: cScreenWidth, height: 100)
|
|
|
-// }
|
|
|
+ wself.musicCutView.frame = CGRect(x: 0, y: cScreenHeigth + 220, width: cScreenWidth, height: cScreenHeigth)
|
|
|
+ UIView.animate(withDuration: 0.1) {
|
|
|
+ // 显示裁剪视图
|
|
|
+ wself.musicCutView.frame = CGRect(x: 0, y:0, width: cScreenWidth, height: cScreenHeigth)
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -2661,7 +2672,7 @@ public class BFRecordScreenController: BFBaseViewController {
|
|
|
model.wavFilePath = musicUrl
|
|
|
wself.loadingView.removeLoading()
|
|
|
}else{
|
|
|
- cShowHUB(superView: wself.view, msg: "音乐下载失败")
|
|
|
+ cShowHUB(superView: wself.view, msg: "音乐下载失败,请重新尝试")
|
|
|
wself.bgmModel = nil
|
|
|
wself.addMusicBtn.setTitle("选择音乐", for: .normal)
|
|
|
}
|