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

* 'master' of https://git.yishihui.com/iOS/BFFramework:
  适配创作工具模式进退场时间
  适配创作工具的 进场和退场时间
  设置不同背景色

BFFramework/Classes/PQGPUImage/akfilters/PQImageFilter.swift

@@ -126,7 +126,7 @@ open class PQImageFilter: PQBaseFilter {
 
         BFLog(2, message: " image filter 当前时间: \(currTime) \(newImage!.size)")
 
-//        if currTime >= mSticker!.timelineIn && currTime <= mSticker!.timelineOut {
+        if currTime >= mSticker!.timelineIn && currTime <= mSticker!.timelineOut {
         BFLog(2, message: " 显示图片当前时间: \(currTime) 开始时间：\(mSticker!.timelineIn) 结束时间：\(mSticker!.timelineOut)  \(String(describing: newImage?.size))")
         // 取纹理坐标
         var textureCoordinates = PQGPUImageTools.getTextureCoordinates(sticker: mSticker!, textureSize: newImage!.size, cannvasSize: inputSize)
@@ -169,6 +169,7 @@ open class PQImageFilter: PQBaseFilter {
                              vertexBufferObject: PQGPUImageTools.NXGenerateVBO(for: verticesPoint),
                              
                              inputTextures: [texturePropertiesimagetwo])
-        releaseIncomingFramebuffers()
+            releaseIncomingFramebuffers()
+        }
     }
 }

BFFramework/Classes/PQGPUImage/akfilters/PQMovieFilter.swift

@@ -211,6 +211,10 @@ class PQMovieFilter: PQBaseFilter {
             startTimeStamp = currentTime
         }
         
+        if CMTimeGetSeconds(currentTime) >= stickerInfo!.timelineIn && CMTimeGetSeconds(currentTime) <= stickerInfo!.timelineOut {
+        
+     
+        
         //视频素材开始裁剪时间
         let stickerModelIn = CMTime(value: Int64((moveSticker?.model_in ?? 0)  * Float64(BASE_FILTER_TIMESCALE)), timescale: BASE_FILTER_TIMESCALE)
         
@@ -225,6 +229,7 @@ class PQMovieFilter: PQBaseFilter {
         readNextVideoFrame(showTimeStamp: showtimeStamp)
     
         framebufferIndex = framebufferIndex + 1
+        }
  
     }
 

BFFramework/Classes/Stuckpoint/ViewModel/PQGPUImagePlayerView.swift

@@ -158,6 +158,9 @@ public class PQGPUImagePlayerView: UIView {
         view.delegate = self
         let tap = UITapGestureRecognizer(target: self, action: #selector(RenderViewOnclick))
         view.addGestureRecognizer(tap)
+ 
+        view.backgroundRenderColor =  Color.init(red: Float(PQBFConfig.shared.styleBackGroundColor.rgbaf[0]), green: Float(PQBFConfig.shared.styleBackGroundColor.rgbaf[1]), blue: Float(PQBFConfig.shared.styleBackGroundColor.rgbaf[2]))
+
         return view
     }()
 
@@ -225,6 +228,7 @@ public class PQGPUImagePlayerView: UIView {
     override public init(frame: CGRect) {
         super.init(frame: frame)
 
+        
         addSubview(renderView)
         addSubview(progressLab)
         addSubview(playMaskView)