|
@@ -93,7 +93,8 @@ public class BFRecordScreenController: BFBaseViewController {
|
|
|
}
|
|
|
let itemModel = itemModels[currItemModelIndex]
|
|
|
currMediaType = itemModel.mediaType ?? .Video
|
|
|
-
|
|
|
+ isEndPlay = false
|
|
|
+
|
|
|
switch itemModel.mediaType {
|
|
|
case .Image:
|
|
|
rscurrentManager = rsimanager
|
|
@@ -108,7 +109,7 @@ public class BFRecordScreenController: BFBaseViewController {
|
|
|
progressThumV.isHidden = false
|
|
|
cameraProgressThumV.isHidden = true
|
|
|
progreddL.isHidden = false
|
|
|
-
|
|
|
+
|
|
|
case .Camera:
|
|
|
rscurrentManager = rscmanager
|
|
|
recordBtn.setTitle("record_ly".BFLocale, for: .normal)
|
|
@@ -125,6 +126,7 @@ public class BFRecordScreenController: BFBaseViewController {
|
|
|
let cell = collectionView.cellForItem(at: IndexPath(item: currItemModelIndex, section: 0)) as? BFImageCoverViewCell
|
|
|
if cell != nil {
|
|
|
if currMediaType == .Camera {
|
|
|
+ // 摄像头要旋转视频角度
|
|
|
cell!.playView.setInputRotation(GPUImageRotationMode(rawValue: 2), at: 0)
|
|
|
progressThumV.isHidden = true
|
|
|
|
|
@@ -144,10 +146,10 @@ public class BFRecordScreenController: BFBaseViewController {
|
|
|
rscurrentManager.playView = cell!.playView
|
|
|
}
|
|
|
|
|
|
+ rscurrentManager.dele = self
|
|
|
rscurrentManager.progreddL = progreddL
|
|
|
rscurrentManager.recordPlayer = recordPlayer
|
|
|
rscurrentManager.progressThumV = progressThumV
|
|
|
- rscurrentManager.dele = self
|
|
|
progressThumV.recordItem = itemModel
|
|
|
rscurrentManager.recordItem = itemModel
|
|
|
rscurrentManager.resetEnv()
|
|
@@ -288,6 +290,7 @@ public class BFRecordScreenController: BFBaseViewController {
|
|
|
btn.addTarget(self, action: #selector(playbtnDown(btn:)), for: .touchDown)
|
|
|
btn.addTarget(self, action: #selector(playbtnCancle(btn:)), for: .touchCancel)
|
|
|
btn.center = view.center
|
|
|
+ btn.isHidden = true
|
|
|
return btn
|
|
|
}()
|
|
|
|
|
@@ -1962,21 +1965,9 @@ public class BFRecordScreenController: BFBaseViewController {
|
|
|
BFLog(1, message: "暂停播放")
|
|
|
isNormalPlaying = false
|
|
|
|
|
|
-// // ---- 修复暂停播放回退问题
|
|
|
-// avplayerTimeObserver?.invalidate()
|
|
|
-// avplayerTimeObserver = nil
|
|
|
-// recordPlayerTimeObserver?.invalidate()
|
|
|
-// recordPlayerTimeObserver = nil
|
|
|
- // ----
|
|
|
-
|
|
|
subtitleBtn.isHidden = false
|
|
|
soundSettingBtn.isHidden = false
|
|
|
withDrawBtn.isHidden = false
|
|
|
-// recordBtn.isHidden = (currMediaType != .Video && isEndPlay) ? false : isEndPlay
|
|
|
-// recordBtn.alpha = 1
|
|
|
-// if !recordBtn.isHidden {
|
|
|
-// deleteRecordBtn.isHidden = true
|
|
|
-// }
|
|
|
|
|
|
assetPlayer.pause()
|
|
|
recordPlayer.pause()
|
|
@@ -2394,7 +2385,7 @@ extension BFRecordScreenController: UICollectionViewDelegate, UICollectionViewDa
|
|
|
playBtn.isSelected = (recordItem.mediaType != .Video && recordItem.voiceStickers.count <= 0)
|
|
|
playBtn.isHidden = playBtn.isSelected
|
|
|
// 重绘录音区域
|
|
|
- progressThumV.recordItem = recordItem
|
|
|
+// progressThumV.recordItem = recordItem
|
|
|
DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) { [weak self] in
|
|
|
guard let wself = self else { return }
|
|
|
|