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

BFRecordScreenKit/Classes/BFRecordExport.swift

@@ -120,16 +120,14 @@ public class BFRecordExport {
                     videoStickers.append(sticker)
                     BFLog(1, message: "image sticker - timIn:\(sticker.timelineIn), modIn:\(sticker.model_in), dur:\(duration)")
                     
-                    var subDur = 0.0
                     for titleS in itemModel.titleStickers {
-                        let leng = titleS.timelineOut - titleS.timelineIn
+//                        let leng = titleS.timelineOut - titleS.timelineIn
                         let newTitleSticker = PQEditSubTitleModel()
                         titleStickers.append(newTitleSticker)
                         newTitleSticker.text = titleS.text
                         newTitleSticker.setting = titleS.setting
-                        newTitleSticker.timelineIn = totalDur + subDur
-                        newTitleSticker.timelineOut = totalDur + subDur + leng
-                        subDur += leng
+                        newTitleSticker.timelineIn = totalDur + titleS.timelineIn
+                        newTitleSticker.timelineOut = totalDur + titleS.timelineOut
                     }
                     
                     totalDur += duration
@@ -405,8 +403,9 @@ public class BFRecordExport {
                     let exportEndTime = Date().timeIntervalSince1970
 //                    BFLog(1, message: "视频导出完成: \(String(describing: url)) 生成视频时长为：\(outSeconds) 总用时:\(exportEndTime - tempBeginExport)")
                     print("生成视频时长为：\(outSeconds) 总用时:\(exportEndTime - tempBeginExport)")
-                    
-                    cShowHUB(superView: nil, msg: (outSeconds == 0) ? "合成失败请重试。" : "合成成功")
+#if ForTest
+                    cShowHUB(superView: nil, msg: (outSeconds == 0) ? "合成失败请重试。" : "合成成功，总用时:\(exportEndTime - tempBeginExport)")
+#endif
                     self?.exportCompletion?(nil, url)
 
                 } else {