瀏覽代碼

修复拖动裁剪区域引起的首张图片黑屏问题

huzhiqiang 3 年之前
父節點
當前提交
e037d8c55c

+ 1 - 1
BFFramework/Classes/PQGPUImage/akfilters/PQImageFilter.swift

@@ -37,7 +37,7 @@ open class PQImageFilter: PQBaseFilter {
             FilterLog(message: "图片数据为空,创建失败")
             FilterLog(message: "图片数据为空,创建失败")
             return
             return
         }
         }
-        print("mSticker path : \(String(describing: mSticker!.locationPath))")
+//        print("mSticker path : \(String(describing: mSticker!.locationPath))")
 
 
         newImage = UIImage(contentsOfFile: documensDirectory + sticker.locationPath)
         newImage = UIImage(contentsOfFile: documensDirectory + sticker.locationPath)
 
 

+ 5 - 2
BFFramework/Classes/Stuckpoint/Controller/PQStuckPointEditerController.swift

@@ -144,7 +144,7 @@ class PQStuckPointEditerController: PQBaseViewController {
         }
         }
         /// 拖缀结束的回调 type - 1-拖动左边裁剪结束 2--拖动右边裁剪结束 3-进度条拖动结束 4-滑动结束
         /// 拖缀结束的回调 type - 1-拖动左边裁剪结束 2--拖动右边裁剪结束 3-进度条拖动结束 4-滑动结束
         stuckPointCuttingView.videoDidEndDragging = { [weak self] type, startTime, endTime, progress in
         stuckPointCuttingView.videoDidEndDragging = { [weak self] type, startTime, endTime, progress in
-            BFLog(message: "拖拽结束返回--type = \(type),startTime = \(startTime),endTime = \(endTime),progress = \(progress)")
+            BFLog(1, message: "拖拽结束返回--type = \(type),startTime = \(startTime),endTime = \(endTime),progress = \(progress)")
             self?.playerView.pause()
             self?.playerView.pause()
             self?.musicEditBGView.pausePlayer()
             self?.musicEditBGView.pausePlayer()
 
 
@@ -1041,7 +1041,7 @@ class PQStuckPointEditerController: PQBaseViewController {
         PQSingletoMemoryUtil.shared.allExportSession.forEach { _, exportSession in
         PQSingletoMemoryUtil.shared.allExportSession.forEach { _, exportSession in
             exportSession.cancelExport()
             exportSession.cancelExport()
         }
         }
-        BFLog(message: "卡点视频预览界面销毁")
+        BFLog(1, message: "卡点视频预览界面release")
     }
     }
 }
 }
 
 
@@ -1140,6 +1140,9 @@ extension PQStuckPointEditerController {
                                 if deepCopySticker != nil {
                                 if deepCopySticker != nil {
                                     deepCopySticker?.generateDefaultValues()
                                     deepCopySticker?.generateDefaultValues()
                                     stickers.append(deepCopySticker!)
                                     stickers.append(deepCopySticker!)
+                                    
+                                    BFLog(1, message: "测试人员index is 纯图片 timelineOut:\(deepCopySticker!.timelineIn) timelineOut :\(deepCopySticker!.timelineOut)")
+
                                 }
                                 }
                             }
                             }
                         }
                         }

+ 8 - 7
BFFramework/Classes/Stuckpoint/ViewModel/PQGPUImagePlayerView.swift

@@ -213,13 +213,13 @@ public class PQGPUImagePlayerView: UIView {
 
 
     }()
     }()
 
 
+    //进度的开始时间
+    var showProgressStartTime:Float = 0.0
+
     required public init?(coder _: NSCoder) {
     required public init?(coder _: NSCoder) {
         fatalError("init(coder:) has not been implemented")
         fatalError("init(coder:) has not been implemented")
     }
     }
     
     
-    //进度的开始时间
-    var showProgressStartTime:Float = 0.0
-
     override public init(frame: CGRect) {
     override public init(frame: CGRect) {
         super.init(frame: frame)
         super.init(frame: frame)
 
 
@@ -351,6 +351,7 @@ public class PQGPUImagePlayerView: UIView {
         stop()
         stop()
         movie = nil
         movie = nil
         speaker = nil
         speaker = nil
+        BFLog(1, message: "play view release")
     }
     }
 
 
     /// XXXX 这里的 URL 使用的是全路径 ,如果不是全的会 crash ,方便复用 (不用处理业务的文件放在哪里)
     /// XXXX 这里的 URL 使用的是全路径 ,如果不是全的会 crash ,方便复用 (不用处理业务的文件放在哪里)
@@ -550,23 +551,23 @@ public class PQGPUImagePlayerView: UIView {
     func changeFilter(currTime: Float64) {
     func changeFilter(currTime: Float64) {
         let  starts:CFTimeInterval = CFAbsoluteTimeGetCurrent()
         let  starts:CFTimeInterval = CFAbsoluteTimeGetCurrent()
          
          
-        FilterLog(message: " 要查找的 currTime is \(currTime)")
+        BFLog(message: " 要查找的 currTime is \(currTime)")
         //1,删除已经显示过的 filter
         //1,删除已经显示过的 filter
         self.cacheFilters.removeAll(where: {(filter) -> Bool in
         self.cacheFilters.removeAll(where: {(filter) -> Bool in
 
 
-            (currTime > (filter.stickerInfo?.timelineOut ?? 0.0))
+            (Int(currTime * 1000) > Int((filter.stickerInfo?.timelineOut ?? 0.0) * 1000))
         })
         })
  
  
         // 2,找出一个要显示的 fitler
         // 2,找出一个要显示的 fitler
         let showIndex = cacheFilters.firstIndex(where: { (filter) -> Bool in
         let showIndex = cacheFilters.firstIndex(where: { (filter) -> Bool in
-            (currTime >= (filter.stickerInfo?.timelineIn ?? 0.0) && currTime <= (filter.stickerInfo?.timelineOut ?? 0.0))
+            (Int(currTime * 1000) >= Int((filter.stickerInfo?.timelineIn ?? 0.0) * 1000) && Int(currTime * 1000) <= Int((filter.stickerInfo?.timelineOut ?? 0.0) * 1000))
         })
         })
   
   
         if(showIndex == nil){
         if(showIndex == nil){
           
           
             FilterLog(message: "缓存没有查找到?出现数据错误!!!!")
             FilterLog(message: "缓存没有查找到?出现数据错误!!!!")
             for (index,bsFilter )in cacheFilters.enumerated() {
             for (index,bsFilter )in cacheFilters.enumerated() {
-                print( "22222缓存操作   没要查找到要查找的显示是为:\(currTime) 缓存数据timeline in :\(bsFilter.stickerInfo?.timelineIn ?? 0.0)) timelineOut:\(bsFilter.stickerInfo?.timelineOut ?? 0.0) 缓存数 \(cacheFilters.count) index: \(index)")
+                BFLog(1, message: "22222缓存操作   没要查找到要查找的显示是为:\(currTime) 缓存数据timeline in :\(bsFilter.stickerInfo?.timelineIn ?? 0.0)) timelineOut:\(bsFilter.stickerInfo?.timelineOut ?? 0.0) 缓存数 \(cacheFilters.count) index: \(index)")
             }
             }
             
             
             return
             return

+ 2 - 2
BFFramework/Classes/Utils/PQCommonMethodUtil.swift

@@ -135,7 +135,7 @@ public func kf_imageCacheImage(originUrl: String, completeHandle: @escaping (_ i
 /** 打印 */
 /** 打印 */
 public func BFLog<T>( _ type : Int = 0, message: T) {
 public func BFLog<T>( _ type : Int = 0, message: T) {
  
  
-    if type == 2 {
+    if type == 0 {
         let logger = NXLogger.shared
         let logger = NXLogger.shared
         
         
         logger.level = .info
         logger.level = .info
@@ -144,7 +144,7 @@ public func BFLog<T>( _ type : Int = 0, message: T) {
         logger.d(message as? String ?? "")
         logger.d(message as? String ?? "")
         
         
         BuglyLog.level(.warn, logs: message as? String)
         BuglyLog.level(.warn, logs: message as? String)
-    }else if type == 1 {
+    }else if type == 3 {
 #if DEBUG
 #if DEBUG
         let file = (#file as NSString).lastPathComponent;
         let file = (#file as NSString).lastPathComponent;
         let dateFmt = DateFormatter()
         let dateFmt = DateFormatter()