Merge branch 'dev' of https://git.yishihui.com/iOS/BFRecordScreenKit into dev

合并代码

BFRecordScreenKit/Classes/RecordScreen/Controller/BFRecordScreenCameraManager.swift

@@ -528,7 +528,7 @@ class BFRecordScreenCameraManager: BFRecordScreenBaseManager {
             CMTimeCompare(mode.timelineCMIn, currentAssetProgress) <= 0 && CMTimeCompare(currentAssetProgress, mode.timelineCMOut) < 0
         }) {
             // true 代表需要换源
-            let su = (assetPlayer?.currentItem?.asset as? AVURLAsset)?.url.lastPathComponent != (mod.locationPath as NSString?)?.lastPathComponent
+            let su = (avplayer.currentItem?.asset as? AVURLAsset)?.url.lastPathComponent != (mod.locationPath as NSString?)?.lastPathComponent
             
             if !su {
                 if avplayer.timeControlStatus == .paused {
@@ -589,10 +589,10 @@ class BFRecordScreenCameraManager: BFRecordScreenBaseManager {
             }
             // 如果离结束大于0.7s，代表还有下一段视频
             if ((wself.recordItem?.materialDuraion ?? .zero) - wself.currentAssetProgress).seconds > 0.7 {
-                wself.findNextModel()
+//                wself.findNextModel()
                 wself.setCoverImage(wself.currentAssetProgress)
 
-                wself.prepareToPlayNext()
+//                wself.prepareToPlayNext()
             } else {
                 // 播放到末尾了
                 wself.dele?.isEndPlay = true
@@ -703,12 +703,16 @@ class BFRecordScreenCameraManager: BFRecordScreenBaseManager {
         dele?.progreddL.text = String(format: "%@", currentAssetProgress.seconds.formatDurationToHMS())
         dele?.progressThumV.progress = currentAssetProgress
         dele?.updateSubtitle(time: currentAssetProgress)
-
+        
+        let p = CGPoint(x: currentAssetProgress.seconds * 70.0 / 5.0, y: 0)
+        cameraProgressV?.progressView.contentOffset = p
+        
         BFLog(1, message: "curr: \(currentAssetProgress.seconds)")
         
         if currTime.seconds >= (recordItem?.materialDuraion.seconds ?? 0) {
-            dele?.pause()
+            dele?.isEndPlay = true
             isPlaying = false
+            dele?.pause()
             return
         }