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

合并代码

BFRecordScreenKit/Classes/RecordScreen/Controller/BFRecordScreenCameraManager.swift

@@ -267,16 +267,20 @@ class BFRecordScreenCameraManager : BFRecordScreenBaseManager{
             let cameraSuccess = wself.recordFinishedResult && ((wself.videoModel.timelineCMOut - wself.videoModel.timelineCMIn).seconds > 1)
             if cameraSuccess {
                 wself.increaseTime = wself.videoModel.timelineCMOut - wself.currentAssetProgress
+                
                 wself.currentAssetProgress = wself.videoModel.timelineCMOut
+                
                 wself.recordEndCallBack?(true, wself.videoModel)
+                // 更新各录音时间点，在插入的时候
+                wself.coculationTotalDur()
+                
                 wself.updateUI(progress: wself.currentAssetProgress)
                 if let img = wself.videoModel.thumImgs?.last{
                     wself.cameraProgressV?.changeSepline(img: img)
                 }
-                wself.coculationTotalDur()
             }else {
-                wself.videoModel.locationPath = "nil"
                 wself.recordEndCallBack?(false, nil)
+                wself.videoModel.locationPath = "nil"
             }
         }
     }
@@ -296,9 +300,9 @@ class BFRecordScreenCameraManager : BFRecordScreenBaseManager{
                 if !su {
                     if let finalPath = PQBridgeObject.p_setupFileRename(vpath), finalPath.count > 0 {
                         let dur = AVURLAsset(url: URL(fileURLWithPath: finalPath))
-                        BFLog(1, message: "文件时长camera:\(wself.recordItem?.videoStickers.count ?? 0),   \(wself.videoModel.timelineCMIn.seconds)~\(wself.videoModel.timelineCMOut.seconds),  \(dur.duration.seconds)")
 
                         wself.videoModel.timelineCMOut = wself.videoModel.timelineCMIn + CMTime(seconds: dur.duration.seconds, preferredTimescale: 1000)
+                        BFLog(1, message: "文件时长camera:\(wself.recordItem?.videoStickers.count ?? 0),   \(wself.videoModel.timelineCMIn.seconds)~\(wself.videoModel.timelineCMOut.seconds),  \(dur.duration.seconds)")
                         wself.videoModel.locationPath = finalPath
                     }else{
                         cShowHUB(superView: nil, msg: "shoot_tips_least".BFLocale)
@@ -361,16 +365,27 @@ class BFRecordScreenCameraManager : BFRecordScreenBaseManager{
                 }
             }
             
-            coculationTotalDur()
-
+            item.materialDuraion = item.videoStickers.last?.timelineCMOut ?? .zero
         }
         changeRecordMaterail()
         BFLog(1, message: "delete: video- \(recordItem?.videoStickers.count ?? 0), voice-\(recordItem?.voiceStickers.count ?? 0)")
     }
     
     func coculationTotalDur(){
-        recordItem?.materialDuraion = recordItem?.voiceStickers.reduce(.zero, { partialResult, voice in
-            voice.endCMTime - voice.startCMTime + partialResult
+
+        if videoModel.locationPath != "nil" {
+            recordItem?.videoStickers.forEach({ mod in
+                if mod != videoModel, mod.timelineCMOut.seconds > videoModel.timelineCMIn.seconds {
+                    mod.timelineCMIn = mod.timelineCMIn + videoModel.timelineCMOut - videoModel.timelineCMIn
+                    mod.timelineCMOut = mod.timelineCMOut + videoModel.timelineCMOut - videoModel.timelineCMIn
+                }
+            })
+        }
+
+//        resetThumbImg()
+        
+        recordItem?.materialDuraion = recordItem?.videoStickers.reduce(.zero, { partialResult, voice in
+            voice.timelineCMOut - voice.timelineCMIn + partialResult
         }) ?? .zero
     }
     
@@ -581,6 +596,8 @@ class BFRecordScreenCameraManager : BFRecordScreenBaseManager{
             avplayerReplaceItem(newItem: AVPlayerItem(url: URL(fileURLWithPath: mod.locationPath)))
 
 //            prepareToPlayNext(needPlay: false)
+        }else{
+            playerCoverIV.isHidden = true
         }
     }
     
@@ -638,6 +655,8 @@ class BFRecordScreenCameraManager : BFRecordScreenBaseManager{
         cameraProgressV?.progressView.contentOffset = p
     }
     
+    /// 更新录音进度
+    /// - Parameter progress: 当前的进度
     func updateUI(progress:CMTime){
         DispatchQueue.main.async {[weak self] in
             guard let wself = self else { return }
@@ -648,14 +667,6 @@ class BFRecordScreenCameraManager : BFRecordScreenBaseManager{
             if wself.recordItem?.thumbImgs.count ?? 0 > 0, let sticker = wself.recordItem?.videoStickers.first(where: { mod in
                 CMTimeCompare(mod.timelineCMIn, progress) <= 0 && CMTimeCompare(mod.timelineCMOut, progress) >= 0
             }) {
-                wself.recordItem?.videoStickers.forEach({ mod in
-                    if mod.timelineCMOut.seconds > progress.seconds {
-//                        BFLog(1, message: "insert before: \(mod.timelineCMIn.seconds)")
-                        mod.timelineCMIn = mod.timelineCMIn + wself.increaseTime
-                        mod.timelineCMOut = mod.timelineCMOut + wself.increaseTime
-//                        BFLog(1, message: "insert after: \(mod.timelineCMIn.seconds)")
-                    }
-                })
                 wself.cameraProgressV?.updateCellWidth(sticker: sticker, progress: progress)
             }
             

BFRecordScreenKit/Classes/RecordScreen/Controller/BFRecordScreenController.swift

@@ -1111,12 +1111,12 @@ public class BFRecordScreenController: BFBaseViewController {
                     // ********** 开始处理冲突的录制部分
                     wself.overrideRecordDeal(model: model)
                     
-                }else if wself.currMediaType == .Image {
+                }else {
 
-                    if let recordItem = wself.rsimanager.recordItem {
+                    if let recordItem = wself.rscurrentManager.recordItem {
                         
                         let duration = model.endCMTime - model.startCMTime
-                        
+
                         recordItem.voiceStickers.forEach({ mod in
                             if mod.startCMTime.seconds >= model.startCMTime.seconds {
                                 mod.startCMTime = mod.startCMTime + duration
@@ -1137,6 +1137,7 @@ public class BFRecordScreenController: BFBaseViewController {
                                 mod.timelineOut = mod.timelineOut + duration
                             }
                         })
+                        
                     }
                 }
                 
@@ -1171,7 +1172,7 @@ public class BFRecordScreenController: BFBaseViewController {
                     wself.indirectionView?.resetCurrentItem(start: model.startCMTime.seconds, end: model.endCMTime.seconds)
 
                     // 重置底部蓝色录音条
-                    wself.resetAllIndirectionView()
+//                    wself.resetAllIndirectionView()
                     
                     // 矫正进度
                     wself.resetCurrentProgress()
@@ -2655,11 +2656,13 @@ extension BFRecordScreenController: UICollectionViewDelegate, UICollectionViewDa
 //            progressThumV.recordItem = recordItem
             DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) { [weak self] in
                 guard let wself = self else { return }
-                
+
                 /// 重绘录音进度视图
-                wself.resetAllIndirectionView()
+//                wself.resetAllIndirectionView()
                 // 重绘录音进度
                 wself.recordBtn.isEnabled = true
+                wself.searchStopAtRecordRange()
+
             }
             // 更新缩略图
             // progressThumV.isHidden = false
@@ -2677,7 +2680,6 @@ extension BFRecordScreenController: UICollectionViewDelegate, UICollectionViewDa
                 currentPlayRecordIndex = voice.0
             }
             
-            searchStopAtRecordRange()
             changeWithDrawBtnLayout(0)
             pauseTime = 0