浏览代码

图片撤销的缩略图不正确优化

胡志强 3 年之前
父节点
当前提交
9a14d587ba

+ 5 - 1
BFRecordScreenKit/Classes/RecordScreen/Controller/BFRecordScreenBaseManager.swift

@@ -21,7 +21,11 @@ class BFRecordScreenBaseManager : NSObject{
     var progreddL : UILabel?
     var progressThumV: BFVideoThumbProgressView?
     
-    var recordItem : BFRecordItemModel?
+    var recordItem : BFRecordItemModel?{
+        didSet{
+            progressThumV?.recordItem = recordItem
+        }
+    }
     
     var playView : GPUImageView?
     var filter = GPUImageFilter()

+ 3 - 1
BFRecordScreenKit/Classes/RecordScreen/Controller/BFRecordScreenController.swift

@@ -1536,6 +1536,8 @@ public class BFRecordScreenController: BFBaseViewController {
             cShowHUB(superView: nil, msg: "shoot_tips_least".BFLocale)
             recorderManager?.cancelTitleService()
         }
+        
+        events.removeLast()
         // 删除文件
         recorderManager?.deleteFile(outfile: voiceModel?.wavFilePath ?? "")
         var subtitleCount = itemModels[currItemModelIndex].titleStickers.count
@@ -1731,7 +1733,7 @@ public class BFRecordScreenController: BFBaseViewController {
             // 摄像和图片都可以走插入录制功能
             if (currMediaType == .Camera && (endTime! - currentAssetProgress).seconds < 2 * 5 / 70.0)
                 || (currMediaType == .Image && ((endTime! - currentAssetProgress).seconds < 2 * 2.0 / 70.0))
-                || (currMediaType == .Image && ((endTime! - currentAssetProgress).seconds < 2 * (rscurrentManager.recordItem!.materialDuraion.seconds / Double(rscurrentManager.recordItem!.thumbImgs.count)) / 70.0)){
+                || (currMediaType == .Video && ((endTime! - currentAssetProgress).seconds < 2 * (rscurrentManager.recordItem!.materialDuraion.seconds / Double(rscurrentManager.recordItem!.thumbImgs.count)) / 70.0)){
                 canInsertVideo = true
                 
                 changeProgress(changCMTime: endTime!)

+ 1 - 11
BFRecordScreenKit/Classes/RecordScreen/View/ProgressView/BFVideoThumbProgressView.swift

@@ -16,28 +16,18 @@ class BFVideoThumbProgressView: BFProgressBaseView {
     override var recordItem: BFRecordItemModel? {
         didSet {
             // 指针回归
-//            BFLog(1, message: "new recorditem")
             progress = .zero
+            
             if recordItem?.mediaType == .Video {
-                
                 DispatchQueue.main.async {[weak self] in
                     guard let wself = self else { return }
                     wself.dealWithVideoThumb()
                 }
-//                recordItem?.fetchAVUrlAssetCallBack = {[weak self] in
-//                    DispatchQueue.main.async {[weak self] in
-//                        guard let wself = self else { return }
-//                        wself.dealWithVideoThumb()
-//                    }
-//                }
-            
             } else if recordItem?.mediaType == .Image {
                 DispatchQueue.main.async {[weak self] in
                     guard let wself = self else { return }
                     wself.dealWithImageThumb()
                 }
-      
-                
             }
         }
     }