|
@@ -1374,14 +1374,12 @@ public class BFRecordScreenController: BFBaseViewController {
|
|
DispatchQueue.main.async {[weak self] in
|
|
DispatchQueue.main.async {[weak self] in
|
|
guard let wself = self else { return }
|
|
guard let wself = self else { return }
|
|
wself.recordBtn.isHidden = false
|
|
wself.recordBtn.isHidden = false
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
|
|
+
|
|
if voiceModel?.currIndex == wself.currItemModelIndex {
|
|
if voiceModel?.currIndex == wself.currItemModelIndex {
|
|
if wself.currMediaType == .Image {
|
|
if wself.currMediaType == .Image {
|
|
- wself.rscurrentManager.currentAssetProgress = CMTime(seconds: wself.recorderManager?.voiceModel?.startCMTime.seconds ?? 0, preferredTimescale: 1000)
|
|
|
|
|
|
+ wself.rscurrentManager.currentAssetProgress = CMTime(seconds: voiceModel?.startCMTime.seconds ?? 0, preferredTimescale: 1000)
|
|
if wself.currentAssetProgress.seconds >= wself.itemModels[wself.currItemModelIndex].materialDuraion.seconds {
|
|
if wself.currentAssetProgress.seconds >= wself.itemModels[wself.currItemModelIndex].materialDuraion.seconds {
|
|
- wself .rscurrentManager.currentAssetProgress = CMTime(seconds: wself.itemModels[wself.currItemModelIndex].materialDuraion.seconds, preferredTimescale: 1000)
|
|
|
|
|
|
+ wself.rscurrentManager.currentAssetProgress = CMTime(seconds: wself.itemModels[wself.currItemModelIndex].materialDuraion.seconds, preferredTimescale: 1000)
|
|
}
|
|
}
|
|
wself.resetCurrentProgress()
|
|
wself.resetCurrentProgress()
|
|
}
|
|
}
|
|
@@ -2267,7 +2265,9 @@ public class BFRecordScreenController: BFBaseViewController {
|
|
} else {
|
|
} else {
|
|
percenWidth = progressThumV.progessIndicateBackV.frame.width / CGFloat(itemModels[currItemModelIndex].materialDuraion.seconds)
|
|
percenWidth = progressThumV.progessIndicateBackV.frame.width / CGFloat(itemModels[currItemModelIndex].materialDuraion.seconds)
|
|
}
|
|
}
|
|
- indirectionView = BFIndirectionProgressView(frame: CGRect(origin: progressThumV.progessIndicateBackV.origin, size: CGSize(width: progressThumV.progressView.contentSize.width, height: progressThumV.progessIndicateBackV.frame.height)), percenWidth: percenWidth, totalDuration: itemModels[currItemModelIndex].materialDuraion.seconds)
|
|
|
|
|
|
+ // progressThumV.progressView.contentSize
|
|
|
|
+ // progressThumV.progessIndicateBackV.origin
|
|
|
|
+ indirectionView = BFIndirectionProgressView(frame: CGRect(x: progressThumV.progessIndicateBackV.x, y: 44, width: progressThumV.progressView.contentSize.width, height: 6), percenWidth: percenWidth, totalDuration: itemModels[currItemModelIndex].materialDuraion.seconds)
|
|
progressThumV.progressView.addSubview((indirectionView)!)
|
|
progressThumV.progressView.addSubview((indirectionView)!)
|
|
}
|
|
}
|
|
// 更新录制进度
|
|
// 更新录制进度
|