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

BFRecordScreenKit/Classes/BFRecordExport.swift

@@ -194,7 +194,12 @@ public class BFRecordExport {
             }
             let outputSize:CGSize = CGSize(width: 1080.0, height: 1080 * CGFloat(Int(UIScreen.main.bounds.size.height / UIScreen.main.bounds.size.width)))
             BFLog(message: "输出视频大小:\(outputSize)")
-            filters.append(PQSubTitleFilter.init(st: titleStickers, inputSize: outputSize))
+            
+            //add by ak 有字幕数据 & 显示字幕开关打开 添加字幕filter
+            if(titleStickers.count > 0 && ( titleStickers.first?.setting.subtitleIsShow ?? true)){
+                filters.append(PQSubTitleFilter.init(st: titleStickers, inputSize: outputSize))
+            }
+            
             
             exporter = PQCompositionExporter(asset: composition, videoComposition: nil, audioMix: audioMix, filters: filters, animationTool: nil, exportURL: outPutMP4URL)
  

BFRecordScreenKit/Classes/RecordScreen/Controller/BFRecordScreenController.swift

@@ -479,7 +479,7 @@ public class BFRecordScreenController: BFBaseViewController {
                 break
             }
         }
-        if findShowSubtitle != nil {
+        if findShowSubtitle != nil && subtitleSettingView.subtitle.setting.subtitleIsShow {
             subtitleLabel.text = findShowSubtitle?.text
             setSubtitleStyle(settingModel: subtitleSettingView.subtitle.setting)