Browse Source

Merge branch 'dev' of https://git.yishihui.com/iOS/BFRecordScreenKit into dev
合并代码

jsonwang 3 years ago
parent
commit
de034af8f3

+ 9 - 1
BFRecordScreenKit/Classes/RecordScreen/Controller/BFRecordScreenCameraManager.swift

@@ -520,7 +520,7 @@ class BFRecordScreenCameraManager : BFRecordScreenBaseManager{
                      execute: self.dispatchWorkItem!
                  )
             }
-            
+             
        
         }
     }
@@ -612,6 +612,8 @@ class BFRecordScreenCameraManager : BFRecordScreenBaseManager{
             }
             
             BFLog(1, message: "endPlay:\(wself.currentAssetProgress.seconds), 总时长:\(wself.recordItem!.materialDuraion.seconds), currplayer:\(wself.avplayer.currentItem?.currentTime().seconds ?? 0)")
+            
+            // 判断录音是否还在播放
             if wself.recordPlayer?.timeControlStatus == .playing{
                 wself.recordPlayer?.pause()
                 wself.cancelDispatchWorkItem()
@@ -638,8 +640,13 @@ class BFRecordScreenCameraManager : BFRecordScreenBaseManager{
     override func pause() {
         avplayer.pause()
         recordPlayer?.pause()
+        
+        timerr?.invalidate()
+        timerr = nil
+        
         if currentAssetProgress == recordItem?.materialDuraion {
             camera?.resumeCameraCapture()
+            playerCoverIV.isHidden = true
         }
       
         cancelDispatchWorkItem()
@@ -660,6 +667,7 @@ class BFRecordScreenCameraManager : BFRecordScreenBaseManager{
 //            prepareToPlayNext(needPlay: false)
         }else{
             playerCoverIV.isHidden = true
+            avplayerReplaceItem(newItem: nil)
         }
     }
     

+ 0 - 1
BFRecordScreenKit/Classes/RecordScreen/Controller/BFRecordScreenImageManager.swift

@@ -86,7 +86,6 @@ class BFRecordScreenImageManager : BFRecordScreenBaseManager{
     override func pause() {
         timerr?.invalidate()
         timerr = nil
-        
     }
     
     override func deleteRecord(at: CMTime) {