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

* 'master' of https://git.yishihui.com/iOS/BFRecordScreenKit:
  不足一秒的回撤

BFRecordScreenKit/Classes/BFVoiceRecordManager.swift

@@ -9,31 +9,30 @@ import BFCommonKit
 import BFMediaKit
 import Foundation
 
-class BFVoiceRecordManager:NSObject {
+class BFVoiceRecordManager: NSObject {
     // 录音相关
     var audioRecorder: BFRecorderManager?
     // 录音结果回调
     var endRecordHandle: ((PQVoiceModel?, Error?) -> Void)?
-    
-    var cancelRecordHandle: ((Error?) -> Void)?
+    var recordHandle: ((PQVoiceModel?, Error?) -> Void)?
+    var cancelRecordHandle: ((PQVoiceModel?) -> Void)?
 
     var recorderFilePath: String = ""
     var beginRecordTime: Date = Date()
     var voiceModel: PQVoiceModel?
-    
-    //字幕的回调
+
+    // 字幕的回调
     var subtitleRecordHandle: ((String?) -> Void)?
-    //进度回调
+    // 进度回调
     var recorderProgrossHandle: ((Float64?) -> Void)?
-    
-    
+
     /// 初始化方法
     /// - Parameters:
     ///   - token: NLS
     ///   - appid: NLS
-    public init(token:String,appid:String){
+    public init(token: String, appid: String) {
         super.init()
-        audioRecorder = BFRecorderManager.init(token, appid: appid)
+        audioRecorder = BFRecorderManager(token, appid: appid)
         audioRecorder?.delegate = self
     }
 
@@ -51,45 +50,41 @@ class BFVoiceRecordManager:NSObject {
         BFLog(1, message: "开始录制")
         audioRecorder?.startRecord(recorderFilePath)
         beginRecordTime = Date()
-
     }
 
     /// 取消音频录制
     func cancleRecord() {
         stopRecord(isCancel: true)
-        cancelRecordHandle?(nil)
+        cancelRecordHandle?(voiceModel)
     }
 
     /// 结束音频录制
     func endRecord() {
         stopRecord(isCancel: false)
     }
+
     /// 停止录制 1，正常停止 2，取消停止
     /// - Parameter isCancel: 是否为取消
-    func stopRecord(isCancel: Bool) {
+    func stopRecord(isCancel _: Bool) {
 //        if !(audioRecorder?.voiceRecorder.isStarted() ?? false) {
 //            BFLog(message: "不是录制状态")
 //            return
 //        }
         audioRecorder?.stopRecord()
     }
- 
 }
+
 // MARK: - 录音机回调
-extension BFVoiceRecordManager: BFRecorderManagerDelegate{
-    
-    public func recorderProgress(_: BFRecorderManager, recoderTime:Double){
+
+extension BFVoiceRecordManager: BFRecorderManagerDelegate {
+    public func recorderProgress(_: BFRecorderManager, recoderTime: Double) {
         BFLog(message: "录音机进度:\(recoderTime)")
         recorderProgrossHandle?(recoderTime)
     }
-    public func recorderDidStop(_ outfile: String) {
-        if Date().timeIntervalSince(beginRecordTime) < 1 {
-            cShowHUB(superView: nil, msg: "说话时间太短")
-        }
 
+    public func recorderDidStop(_ outfile: String) {
         let duration = Date().timeIntervalSince(beginRecordTime)
-        if  duration > 1 {
-       
+        if duration > 1 {
             // 处理降噪
             let noiseFilePath = outfile.replacingOccurrences(of: ".wav", with: "_noise_\(1)_.wav")
             BFLog(1, message: "降噪后地址：\(noiseFilePath) 原地址：\(outfile)")
@@ -99,7 +94,7 @@ extension BFVoiceRecordManager: BFRecorderManagerDelegate{
                 model.duration = "\(duration)"
                 endRecordHandle?(model, nil)
             }
-  
+
 //            // 删除录制的原文件
 //            do {
 //                try FileManager.default.removeItem(atPath: outfile)
@@ -107,13 +102,13 @@ extension BFVoiceRecordManager: BFRecorderManagerDelegate{
 //            } catch {
 //                print("Failed to remove recorder file. \(outfile)")
 //            }
+        } else {
+            cShowHUB(superView: nil, msg: "说话时间太短")
+            cancelRecordHandle?(voiceModel)
         }
     }
-    
+
     public func eventCallback(_: BFRecorderManager, asrResult: String) {
-        
         subtitleRecordHandle?(asrResult)
     }
-
 }
- 

BFRecordScreenKit/Classes/RecordScreen/Controller/BFRecordScreenController.swift

@@ -31,6 +31,7 @@ public class BFRecordScreenController: BFBaseViewController {
     public var recordRndHandle: ((_ currentRecord: PQVoiceModel?) -> Void)?
     // 字幕按钮点击上报
     public var subTitleBtnClickHandle: ((_ isOn: Bool) -> Void)?
+
     // MARK: - 录制参数
 
     public var assets = [PHAsset]()
@@ -98,12 +99,11 @@ public class BFRecordScreenController: BFBaseViewController {
                                          AVEncoderBitDepthHintKey: 16, // 位深
                                          AVEncoderAudioQualityKey: AVAudioQuality.medium.rawValue] // 音频质量
 
-    public var haveSpeakVolume : Float = 0.0
-    public var noSpeakVolume : Float = 1.0
-    
-    //录音管理器
-    var recorderManager : BFVoiceRecordManager?
- 
+    public var haveSpeakVolume: Float = 0.0
+    public var noSpeakVolume: Float = 1.0
+
+    // 录音管理器
+    var recorderManager: BFVoiceRecordManager?
 
     // MARK: - 视图参数
 
@@ -293,7 +293,6 @@ public class BFRecordScreenController: BFBaseViewController {
         return audioSettingView
     }()
 
-
     lazy var progressThumV: BFVideoThumbProgressView = {
         let vv = BFVideoThumbProgressView(frame: CGRect(x: 0, y: 54, width: cScreenWidth, height: 50))
         vv.dragStartHandle = { [weak self] in
@@ -386,20 +385,20 @@ public class BFRecordScreenController: BFBaseViewController {
         BFRecordScreenViewModel.getNlsAccessToken { [weak self] token, appkey in
             BFLog(message: "nls appkey is \(appkey), token is \(token)")
 
-            self?.recorderManager = BFVoiceRecordManager.init(token: token, appid: appkey)
-        
-            //录音取消
+            self?.recorderManager = BFVoiceRecordManager(token: token, appid: appkey)
+
+            // 录音取消
             self?.recorderManager?.cancelRecordHandle = { _ in
             }
-            //录音进度
-            self?.recorderManager?.recorderProgrossHandle = {[weak self] progress in
-                BFLog(1, message: "curr:录音进度--\(progress) \(self?.recordStartTime ) \(self?.isRecording)")
-                self?.drawProgressIndication(progress:progress ?? 0)
+            // 录音进度
+            self?.recorderManager?.recorderProgrossHandle = { [weak self] progress in
+                BFLog(1, message: "curr:录音进度--\(progress) \(self?.recordStartTime) \(self?.isRecording)")
+                self?.drawProgressIndication(progress: progress ?? 0)
             }
-            
-            //录音字幕回调
-            self?.recorderManager?.subtitleRecordHandle = {[weak self] asrResult in
-                if(asrResult == nil){
+
+            // 录音字幕回调
+            self?.recorderManager?.subtitleRecordHandle = { [weak self] asrResult in
+                if asrResult == nil {
                     BFLog(message: "识别结果为空？？？？不能生成字幕数据")
                     return
                 }
@@ -407,16 +406,15 @@ public class BFRecordScreenController: BFBaseViewController {
 
                 let payload = dicResult?["payload"] as? [String: Any]
 
-                
                 BFLog(message: "识别结果:) \((payload?["result"])!) startTime:\(self?.recorderManager?.voiceModel?.startTime ?? 0.0)")
                 DispatchQueue.main.async {
                     // 1，保存字幕数据 begin_time是开始出现文字的时间，time 是结束文字出现的时间 单位都为毫秒，都是相对于录制音频数据整段时间。self.recorderManager.voiceModel?.startTime 为开始的录制的时间，开始和结束都要加上这个时差
 
                     let newSubtitle = PQEditSubTitleModel()
-                    
-                    //这里加300ms 是因为返回结果为了切到字，时长提前一些时间，具体时间官方没说和原音频有关系。这里我们先延后300ms 单位：毫秒。
+
+                    // 这里加300ms 是因为返回结果为了切到字，时长提前一些时间，具体时间官方没说和原音频有关系。这里我们先延后300ms 单位：毫秒。
                     newSubtitle.timelineIn = (self?.recorderManager?.voiceModel?.startTime ?? 0.0) + Float64((((payload?["begin_time"]) as? Int) ?? 0) + 300) / 1000.0
-                  
+
                     newSubtitle.timelineOut = (self?.recorderManager?.voiceModel?.startTime ?? 0.0) + Float64(((payload?["time"]) as? Int) ?? 0) / 1000.0
                     var showText = ((payload?["result"]) as? String) ?? ""
                     if showText.count > subtitleMaxlength {
@@ -430,9 +428,8 @@ public class BFRecordScreenController: BFBaseViewController {
 
                     self?.itemModels[self?.currItemModelIndex ?? 0].titleStickers.append(newSubtitle)
                 }
-                
             }
-            //录音结束
+            // 录音结束
             self?.recorderManager?.endRecordHandle = { [weak self] voideModel, _ in
                 if let sself = self, let model = voideModel, FileManager.default.fileExists(atPath: model.wavFilePath ?? "") {
                     // 加入到语音数组里
@@ -455,7 +452,7 @@ public class BFRecordScreenController: BFBaseViewController {
                         return CMTimeRangeGetIntersection(originRange, otherRange: newRange).duration.seconds > 0
                     }
                     BFLog(1, message: "添加录音文件:\(model.startTime) -- \(model.endTime)")
-                    
+
                     var event = sself.events.last
                     if event != nil {
                         event!.deletedVoices = deletedVoices
@@ -473,7 +470,7 @@ public class BFRecordScreenController: BFBaseViewController {
                         model.endTime = sself.currentAssetProgress.seconds
                         self?.isEndPlay = true
                     }
-                    DispatchQueue.main.async {[weak self] in
+                    DispatchQueue.main.async { [weak self] in
                         // 录音完，重绘撤销按钮，更新录音按钮，
                         self?.changeWithDrawBtnLayout(true)
                         // 注：在录制结束时矫正当前位置，避免跟指针无法对其
@@ -486,6 +483,16 @@ public class BFRecordScreenController: BFBaseViewController {
                     sself.recordStartTime = 0
                 }
             }
+            self?.recorderManager?.cancelRecordHandle = { [weak self] _ in
+                // 取消录制以后重置进度
+                self?.withdrawAction()
+                // 重置录制开始时间
+                self?.recordStartTime = 0
+                /// 重置进度
+                self?.resetCurrentProgress()
+                // 移除
+                self?.indirectionView?.deleteItem(isCurrent: true)
+            }
         }
 
         view.backgroundColor = .black
@@ -517,8 +524,6 @@ public class BFRecordScreenController: BFBaseViewController {
             try? AVAudioSession.sharedInstance().setCategory(.playAndRecord, options: .defaultToSpeaker)
         }
 
-        
- 
         avatarView.recordEndCallBack = { _, materialsModel in
             BFLog(message: "新录制完成::::\(materialsModel?.locationPath ?? "")")
         }
@@ -573,7 +578,6 @@ public class BFRecordScreenController: BFBaseViewController {
     /// 更新字幕，在回放时使用
     /// - Parameter time: 当前播放的进度
     func updateSubtitle(time: CMTime) {
-        
         BFLog(message: "currTime is \(CMTimeGetSeconds(time))")
         var findShowSubtitle: PQEditSubTitleModel?
         for (index, subtitle) in itemModels[currItemModelIndex].titleStickers.enumerated() {
@@ -812,12 +816,11 @@ public class BFRecordScreenController: BFBaseViewController {
         pause()
         isRecording = true
 
-        if(self.recorderManager == nil){
+        if recorderManager == nil {
             BFLog(message: "录音机初始化错误！！！")
             return
-            
         }
-        
+
         let model = PQVoiceModel()
         // 开始时间
         model.startTime = currentAssetProgress.seconds
@@ -832,7 +835,6 @@ public class BFRecordScreenController: BFBaseViewController {
 
         isRecording = true
 
-
         if !avatarView.isHidden {
             avatarView.beginRecord()
         }
@@ -851,7 +853,6 @@ public class BFRecordScreenController: BFBaseViewController {
     }
 
     @objc func endRecord() {
- 
         // 存储录音
         isRecording = false
         pause()
@@ -901,7 +902,7 @@ public class BFRecordScreenController: BFBaseViewController {
                         }
                     }
                     jumpTime = model.startTime
-                    
+
                     if itemModels[currItemModelIndex].mediaType == .IMAGE {
                         itemModels[currItemModelIndex].materialDuraion = jumpTime
                     }
@@ -930,7 +931,7 @@ public class BFRecordScreenController: BFBaseViewController {
                 }
             } else {}
             events.removeLast()
-    
+
             let dur = itemModels[currItemModelIndex].materialDuraion
             if dur > 0 {
                 changeProgress(progress: Float(jumpTime / dur))
@@ -992,7 +993,7 @@ public class BFRecordScreenController: BFBaseViewController {
     }
 
     // 是否吸附在录音首尾处
-    func searchStopAtRecordRange(needAdsorb:Bool = false) {
+    func searchStopAtRecordRange(needAdsorb: Bool = false) {
         pauseTime = currentAssetProgress.seconds
 
         // TODO: 滑动，播放暂停，撤销时，判断是否停止录音区间，是则删除相关录音，画笔，头像，字幕
@@ -1007,7 +1008,7 @@ public class BFRecordScreenController: BFBaseViewController {
             if needAdsorb {
                 if fabs(elems[0].1.endTime - currentAssetProgress.seconds) < 0.5 {
                     BFLog(1, message: "吸附在录音结尾")
-    //                changeWithDrawBtnLayout(false)
+                    //                changeWithDrawBtnLayout(false)
                     changeProgress(progress: Float(elems[0].1.endTime / itemModels[currItemModelIndex].materialDuraion))
                     progressThumV.progress = elems[0].1.endTime
 
@@ -1018,7 +1019,7 @@ public class BFRecordScreenController: BFBaseViewController {
                 } else {
                     if fabs(elems[0].1.startTime - currentAssetProgress.seconds) < 0.5 {
                         BFLog(1, message: "吸附在录音开始")
-    //                    changeWithDrawBtnLayout(true)
+                        //                    changeWithDrawBtnLayout(true)
                         changeProgress(progress: Float(elems[0].1.startTime / itemModels[currItemModelIndex].materialDuraion))
                         progressThumV.progress = elems[0].1.startTime
                     }
@@ -1028,15 +1029,14 @@ public class BFRecordScreenController: BFBaseViewController {
 
                     BFLog(1, message: "停在了录音区间里 \(isStopAtRecordRange)")
                 }
-            }else{
+            } else {
                 deleteRecordBtn.isHidden = false
                 recordBtn.isHidden = true
 
                 isStopAtRecordRange = elems.first!.0
                 BFLog(1, message: "停在了录音区间里 \(isStopAtRecordRange)")
-
             }
-            
+
         } else {
             deleteRecordBtn.isHidden = true
             recordBtn.isHidden = false
@@ -1192,7 +1192,7 @@ public class BFRecordScreenController: BFBaseViewController {
 
     func play() {
         BFLog(1, message: "开始播放 \(currentAssetProgress.seconds)")
- 
+
         isNormalPlaying = true
         if isEndPlay {
             isEndPlay = false
@@ -1215,7 +1215,7 @@ public class BFRecordScreenController: BFBaseViewController {
             // 处理图片音频播放
             imageRecordPlay()
         }
-        
+
         deleteRecordBtn.isHidden = true
         recordBtn.isHidden = false
     }
@@ -1299,8 +1299,8 @@ public class BFRecordScreenController: BFBaseViewController {
             assetPlayer?.replaceCurrentItem(with: item)
         } else {
             assetPlayer = AVPlayer(playerItem: item)
-            assetPlayer?.volume = self.noSpeakVolume
-            
+            assetPlayer?.volume = noSpeakVolume
+
             avplayerTimeObserver?.invalidate()
             avplayerTimeObserver = assetPlayer?.addPeriodicTimeObserver(forInterval: CMTime(value: 1, timescale: 1000), queue: DispatchQueue.global()) { [weak self] time in
                 // 进度监控
@@ -1411,10 +1411,10 @@ public class BFRecordScreenController: BFBaseViewController {
             }
         }
     }
-    
-    func drawProgressIndication(progress:Double) {
+
+    func drawProgressIndication(progress: Double) {
         if indirectionView == nil {
-            indirectionView = BFIndirectionProgressView(frame: progressThumV.progessIndicateBackV.bounds , percenWidth: itemModels[currItemModelIndex].mediaType == .IMAGE ? (progressThumV.thumbImageWidth ) / 2 : 0, totalDuration: itemModels[currItemModelIndex ].materialDuraion )
+            indirectionView = BFIndirectionProgressView(frame: progressThumV.progessIndicateBackV.bounds, percenWidth: itemModels[currItemModelIndex].mediaType == .IMAGE ? progressThumV.thumbImageWidth / 2 : 0, totalDuration: itemModels[currItemModelIndex].materialDuraion)
             progressThumV.progessIndicateBackV.addSubview((indirectionView)!)
         }
         // 更新录制进度
@@ -1422,21 +1422,20 @@ public class BFRecordScreenController: BFBaseViewController {
         // 注：在录制停止时，视频播放器进度依然在走，误差在80毫秒左右
         if isRecording {
             let ratioX = 0.08
-            indirectionView?.setProgress(start: recordStartTime , progress: (progress) - ratioX)
+            indirectionView?.setProgress(start: recordStartTime, progress: progress - ratioX)
         }
-        if itemModels[currItemModelIndex ].mediaType == .IMAGE {
+        if itemModels[currItemModelIndex].mediaType == .IMAGE {
             imageRecordProgress(isRecord: true, progress: progress)
         }
-
     }
-  
+
     // 修正视频旋转方向，因为自己录制的竖屏视频会预览为横屏
     func reloadMaterial(recordItem: BFRecordItemModel) {
         if let path = recordItem.localPath, let cell: BFImageCoverViewCell = collectionView.cellForItem(at: IndexPath(item: currItemModelIndex, section: 0)) as? BFImageCoverViewCell {
             setVideoPlay(item: recordItem.playItem, imageView: cell.playView)
             setAudioPlay(item: recordItem.playItem)
             playBtn = cell.playBtn
-            
+
             let degress = degressFromVideoFile(url: URL(fileURLWithPath: path))
             switch degress {
             case 90:
@@ -1450,7 +1449,6 @@ public class BFRecordScreenController: BFBaseViewController {
             }
         }
     }
-
 }
 
 extension BFRecordScreenController: GPUImageMovieDelegate {
@@ -1472,9 +1470,6 @@ extension BFRecordScreenController: AVAudioPlayerDelegate {
     }
 }
 
-
-
-
 // MARK: - UICollectionViewDelegate
 
 /// UICollectionViewDelegate
@@ -1541,7 +1536,7 @@ extension BFRecordScreenController: UICollectionViewDelegate, UICollectionViewDa
             itemModels[currItemModelIndex].events = events
             events = itemModels[page].events
             searchStopAtRecordRange()
-            
+
             // 更新当前page
             pauseTime = 0
             currItemModelIndex = page
@@ -1552,9 +1547,8 @@ extension BFRecordScreenController: UICollectionViewDelegate, UICollectionViewDa
             if changeItemHandle != nil {
                 changeItemHandle!(page)
             }
-            
-//            movie?.startProcessing()
 
+//            movie?.startProcessing()
         }
     }
 
@@ -1609,11 +1603,17 @@ public extension BFRecordScreenController {
         }
         BFLog(1, message: "图片录音进度：\(progress),currentAssetProgress=\(currentAssetProgress),\(itemModels[currItemModelIndex].materialDuraion)")
         if itemModels[currItemModelIndex].mediaType == .IMAGE {
-            DispatchQueue.main.async { [weak self] in
-                self?.progreddL.text = String(format: "%@", (self?.currentAssetProgress.seconds ?? 0).formatDurationToHMS())
-                self?.progressThumV.progress = (self?.currentAssetProgress.seconds ?? 0)
-                self?.updateSubtitle(time: self?.currentAssetProgress ?? CMTime.zero)
-            }
+            /// 重置进度
+            resetCurrentProgress()
+        }
+    }
+    
+    /// 重置进度
+    func resetCurrentProgress() {
+        DispatchQueue.main.async { [weak self] in
+            self?.progreddL.text = String(format: "%@", (self?.currentAssetProgress.seconds ?? 0).formatDurationToHMS())
+            self?.progressThumV.progress = (self?.currentAssetProgress.seconds ?? 0)
+            self?.updateSubtitle(time: self?.currentAssetProgress ?? CMTime.zero)
         }
     }
 }

BFRecordScreenKit/Classes/RecordScreen/View/BFIndirectionProgressView.swift

@@ -125,9 +125,14 @@ class BFIndirectionProgressView: UIView {
 
     /// 删除某个view
     /// - Parameter index: <#index description#>
-    func deleteItem(index: Int = 0) {
-        if index >= 0, index < subviews.count {
-            subviews[index].removeFromSuperview()
+    func deleteItem(index: Int = 0,isCurrent:Bool = false) {
+        if isCurrent {
+            currentItem?.removeFromSuperview()
+            currentItem = nil
+        } else {
+            if index >= 0, index < subviews.count {
+                subviews[index].removeFromSuperview()
+            }
         }
     }