|
@@ -799,7 +799,7 @@ public class BFRecordScreenController: BFBaseViewController {
|
|
wself.itemModels[wself.currItemModelIndex ].titleStickers.remove(at: index)
|
|
wself.itemModels[wself.currItemModelIndex ].titleStickers.remove(at: index)
|
|
wself.subtitleLabel.text = ""
|
|
wself.subtitleLabel.text = ""
|
|
} else {
|
|
} else {
|
|
- wself.loadingView.isHidden = false
|
|
|
|
|
|
+ wself.loadingView.loadShow()
|
|
wself.tts?.runNextTask()
|
|
wself.tts?.runNextTask()
|
|
//更新已经变音数据
|
|
//更新已经变音数据
|
|
// 更新数据
|
|
// 更新数据
|
|
@@ -860,7 +860,7 @@ public class BFRecordScreenController: BFBaseViewController {
|
|
wself.voiceIconView.setNetImage(url: "\(wself.mSelectVoiced?.avatarUrl ?? "")")
|
|
wself.voiceIconView.setNetImage(url: "\(wself.mSelectVoiced?.avatarUrl ?? "")")
|
|
if(!wself.voiceChangeStickerFinish(itemIndex: wself.currItemModelIndex)){
|
|
if(!wself.voiceChangeStickerFinish(itemIndex: wself.currItemModelIndex)){
|
|
|
|
|
|
- wself.loadingView.loading()
|
|
|
|
|
|
+ wself.loadingView.loadShow()
|
|
}
|
|
}
|
|
//静默转换语音
|
|
//静默转换语音
|
|
wself.tts?.runNextTask()
|
|
wself.tts?.runNextTask()
|
|
@@ -2146,6 +2146,11 @@ public class BFRecordScreenController: BFBaseViewController {
|
|
}
|
|
}
|
|
|
|
|
|
func play() {
|
|
func play() {
|
|
|
|
+ //如果当前段有没有转完的发音人显示 Loadingview
|
|
|
|
+ if(!voiceChangeStickerFinish(itemIndex: currItemModelIndex,isShowLoadView: true)){
|
|
|
|
+
|
|
|
|
+ return
|
|
|
|
+ }
|
|
BFLog(1, message: "开始播放 \(currentAssetProgress.seconds)")
|
|
BFLog(1, message: "开始播放 \(currentAssetProgress.seconds)")
|
|
recorderManager?.voiceModel = nil
|
|
recorderManager?.voiceModel = nil
|
|
events.append(WithDrawModel(type: 1, timestamp: currentAssetProgress, recordItem: rscurrentManager.recordItem!))
|
|
events.append(WithDrawModel(type: 1, timestamp: currentAssetProgress, recordItem: rscurrentManager.recordItem!))
|
|
@@ -2823,7 +2828,7 @@ extension BFRecordScreenController: BFTTSManagerDelegte{
|
|
loadingView.titleL.text = "变音中 \(itemModels[currItemModelIndex].voiceChangeStickers.count / itemModels[currItemModelIndex].titleStickers.count)%"
|
|
loadingView.titleL.text = "变音中 \(itemModels[currItemModelIndex].voiceChangeStickers.count / itemModels[currItemModelIndex].titleStickers.count)%"
|
|
|
|
|
|
if(voiceChangeStickerFinish(itemIndex: currItemModelIndex)){
|
|
if(voiceChangeStickerFinish(itemIndex: currItemModelIndex)){
|
|
- loadingView.isHidden = true
|
|
|
|
|
|
+ loadingView.loadHidden()
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|
|
@@ -2859,8 +2864,8 @@ extension BFRecordScreenController: BFTTSManagerDelegte{
|
|
|
|
|
|
/// 查看发音人文件是否已经全都完成,如果没有完成不能进行预览,合成操作
|
|
/// 查看发音人文件是否已经全都完成,如果没有完成不能进行预览,合成操作
|
|
/// - Parameter itemIndex: 段落 ID ,不传值是所有段落
|
|
/// - Parameter itemIndex: 段落 ID ,不传值是所有段落
|
|
- /// - Returns: 是否全都完成
|
|
|
|
- func voiceChangeStickerFinish(itemIndex:Int = -100) -> Bool{
|
|
|
|
|
|
+ /// - Returns: 是否全都完成 true 是全部完成
|
|
|
|
+ public func voiceChangeStickerFinish(itemIndex:Int = -100,isShowLoadView:Bool = false) -> Bool{
|
|
if(mSelectVoiced == nil){
|
|
if(mSelectVoiced == nil){
|
|
return true
|
|
return true
|
|
}
|
|
}
|
|
@@ -2885,6 +2890,10 @@ extension BFRecordScreenController: BFTTSManagerDelegte{
|
|
if(FinishCount < AllCount){
|
|
if(FinishCount < AllCount){
|
|
isFinish = false
|
|
isFinish = false
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ if(isShowLoadView && !isFinish){
|
|
|
|
+ loadingView.loadShow()
|
|
|
|
+ }
|
|
|
|
|
|
return isFinish
|
|
return isFinish
|
|
}
|
|
}
|