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

* 'master' of https://git.yishihui.com/iOS/BFFramework:
  UI 调整成 和设计稿一致
  修改加载bundle 视频资源方式
  1，修改 LOG 2， 更换取bfframeworkd 图片资源

BFFramework/Classes/PQGPUImage/akfilters/PQImageFilter.swift

@@ -42,7 +42,7 @@ open class PQImageFilter: PQBaseFilter {
         newImage = UIImage(contentsOfFile: documensDirectory + sticker.locationPath)
         //try find image file frome in BFFramework bundle
         if(newImage == nil){
-            newImage = UIImage().BF_Image(named: sticker.locationPath)
+            newImage = UIImage.moduleImage(named: sticker.locationPath, moduleName: "BFFramework",isAssets: false)
         }
 
         // 如果是预览时 对原图进行缩放处理
@@ -132,7 +132,7 @@ open class PQImageFilter: PQBaseFilter {
         // 取纹理坐标
         var textureCoordinates = PQGPUImageTools.getTextureCoordinates(sticker: mSticker!, textureSize: newImage!.size, cannvasSize: inputSize)
 
-        BFLog(2, message: "textureCoordinates is \(textureCoordinates)")
+        BFLog(2, message: "textureCoordinates is \(textureCoordinates) image size :\(newImage!.size ) cannvasSize:\(inputSize)")
 
         // imageTexture 有可能被析构导致黑屏
         if imageTexture == 0 && newImage?.cgImage != nil {

BFFramework/Classes/PQGPUImage/akfilters/PQMovieFilter.swift

@@ -151,7 +151,7 @@ class PQMovieFilter: PQBaseFilter {
             2,try find move file from bfframework bundle e.g. 库 bundle 的地址 "/var/containers/Bundle/Application/AD663220-6AF2-4841-AF82-071C10D78959/MusicVideoPlus.app/BFFramework.bundle/endMovieA.mp4"
             */
             var videoFilePath = movieSticker.locationPath
-            if (!videoFilePath.contains("var/mobile/Media")) && (!videoFilePath.contains("BFFramework.bundle")) {
+            if (!videoFilePath.contains("var/mobile/Media")) && (!videoFilePath.contains("BFFramework_Resources.bundle")) {
                 videoFilePath = documensDirectory + videoFilePath
             }
             BFLog(2, message: "视频地址 \(String(describing: videoFilePath))")

BFFramework/Classes/Stuckpoint/View/PQEditPublicTitleView.swift

@@ -136,7 +136,7 @@ class PQEditPublicTitleView: UIView {
 
         inputBgView.snp.makeConstraints { make in
             make.left.equalToSuperview().offset(16)
-            make.width.equalTo(min(343, cScreenWidth-32))
+            make.right.equalToSuperview().offset(-16)
             make.height.equalTo(68)
             make.top.equalToSuperview().offset(20)
         }
@@ -292,7 +292,7 @@ class PQEditPublicTitleViewContentCell: UICollectionViewCell {
   
         lineView.snp.makeConstraints { make in
            
-            make.right.equalToSuperview().offset(-64)
+            make.right.equalToSuperview().offset(-16)
             make.left.equalToSuperview().offset(16)
             make.bottom.equalToSuperview().offset(-1)
             make.height.equalTo(1)