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

合并代码

BFRecordScreenKit/Classes/BFRecordExport.swift

@@ -397,10 +397,9 @@ public class BFRecordExport {
                     let outSeconds = CMTimeGetSeconds(AVAsset(url: url).duration)
 
                     let exportEndTime = Date().timeIntervalSince1970
-//                    BFLog(1, message: "视频导出完成: \(String(describing: url)) 生成视频时长为：\(outSeconds) 总用时:\(exportEndTime - tempBeginExport)")
-                    print("生成视频时长为：\(outSeconds) 总用时:\(exportEndTime - tempBeginExport)")
+                    BFLog(1, message: "生成视频时长为：\(outSeconds) 总用时:\(exportEndTime - tempBeginExport)")
                     if testFor {
-                        cShowHUB(superView: nil, msg: (outSeconds == 0) ? "合成失败请重试。" : "总用时:\(exportEndTime - tempBeginExport)")
+                        cShowHUB(superView: nil, msg: (outSeconds == 0) ? "合成失败请重试。" : String(format: "总用时: %.2f", exportEndTime - tempBeginExport))
                     }
 
                     self?.exportCompletion?(nil, url)

BFRecordScreenKit/Classes/RecordScreen/Controller/BFRecordScreenController.swift

@@ -771,8 +771,10 @@ public class BFRecordScreenController: BFBaseViewController {
             setSubtitleStyle(settingModel: subtitleSettingView.subtitle.setting)
 
         } else {
-            subtitleLabel.text = ""
-            subtitleLabel.backgroundColor = UIColor.clear
+            if subtitleLabel.text?.count ?? 0 > 0 {
+                subtitleLabel.text = ""
+                subtitleLabel.backgroundColor = UIColor.clear                
+            }
         }
     }
 
@@ -2077,6 +2079,7 @@ extension BFRecordScreenController: UICollectionViewDelegate, UICollectionViewDa
             searchStopAtRecordRange()
             // 切换要更新当前录制index，避免在录制完以后切换素材这种时候为-3会拦截
             currentPlayRecordIndex = -1
+            showSubtitleIndex = -1
             // 重置播放器
             assetPlayer?.seek(to: CMTime.zero)
             recordPlayer?.seek(to: CMTime.zero)