Bladeren bron

Merge branch 'dev' into 1.3.0

harry 3 jaren geleden
bovenliggende
commit
a2d40e7819

+ 18 - 2
BFRecordScreenKit/Classes/RecordScreen/Controller/BFRecordScreenController.swift

@@ -446,6 +446,10 @@ public class BFRecordScreenController: BFBaseViewController {
         btn.imageEdgeInsets = UIEdgeInsets(top: -20, left: 4, bottom: 0, right: -4)
         btn.adjustsImageWhenHighlighted = false
         btn.titleEdgeInsets = UIEdgeInsets(top: 20, left: -40, bottom: -20, right: 0)
+        btn.layer.shadowOpacity = 0.4
+        btn.layer.shadowColor = UIColor.black.cgColor
+        btn.layer.shadowOffset = CGSize(width: 0, height: 2)
+        btn.layer.shadowRadius = 2
         return btn
     }()
 
@@ -459,6 +463,10 @@ public class BFRecordScreenController: BFBaseViewController {
         btn.addTarget(self, action: #selector(soundSetting), for: .touchDown)
         btn.imageEdgeInsets = UIEdgeInsets(top: -20, left: 4, bottom: 0, right: -4)
         btn.titleEdgeInsets = UIEdgeInsets(top: 20, left: -40, bottom: -20, right: 0)
+        btn.layer.shadowOpacity = 0.4
+        btn.layer.shadowColor = UIColor.black.cgColor
+        btn.layer.shadowOffset = CGSize(width: 0, height: 2)
+        btn.layer.shadowRadius = 2
         return btn
     }()
     
@@ -472,6 +480,10 @@ public class BFRecordScreenController: BFBaseViewController {
         btn.imageEdgeInsets = UIEdgeInsets(top: -20, left: 4, bottom: 0, right: -4)
         btn.adjustsImageWhenHighlighted = false
         btn.titleEdgeInsets = UIEdgeInsets(top: 20, left: -40, bottom: -20, right: 0)
+        btn.layer.shadowOpacity = 0.4
+        btn.layer.shadowColor = UIColor.black.cgColor
+        btn.layer.shadowOffset = CGSize(width: 0, height: 2)
+        btn.layer.shadowRadius = 2
         return btn
     }()
     
@@ -670,6 +682,9 @@ public class BFRecordScreenController: BFBaseViewController {
 
     @objc func didBecomeActive() {
         BFLog(message: "进入活跃状态")
+        
+        loadingView.startGIF()
+        
     }
 
     @objc func willResignActive() {
@@ -2904,6 +2919,7 @@ extension BFRecordScreenController: BFTTSManagerDelegte{
         voice.ttsTaskID = model.tTtaskId
         voice.recordId = model.recordId
         voice.voice = model.fontName
+        BFLog(message: "加入到了段落 id\(Int(model.itemModelIndex))")
         itemModels[Int(model.itemModelIndex)].voiceChangeStickers.append(voice)
         
      
@@ -2984,7 +3000,7 @@ extension BFRecordScreenController: BFTTSManagerDelegte{
     //指量加入 TTS 任务,1切换发音人了,2,删除段落后
     func bathPushTask(){
         //使用不包含方法
-        for itemModel in itemModels{
+        for (idx,itemModel) in itemModels.enumerated(){
             for title in itemModel.titleStickers{
                 //加入变音缓存,
                 let ttsModel = BFTTSTaskModel.init()
@@ -2993,7 +3009,7 @@ extension BFRecordScreenController: BFTTSManagerDelegte{
                 ttsModel.fontName = mSelectVoiced?.voice ?? ""
                 ttsModel.recordId = title.recordId ?? ""
                 ttsModel.tTtaskId = getUniqueId(desc: "tTtaskId")
-                ttsModel.itemModelIndex = Int32(itemModel.index)
+                ttsModel.itemModelIndex = Int32(idx)
                 ttsModel.text = title.text
                 tts?.pushTaskCache(ttsModel, autoTranslate:false)
                 

+ 6 - 0
BFRecordScreenKit/Classes/RecordScreen/View/BFLoadingView.swift

@@ -79,6 +79,12 @@ class BFLoadingView: UIView {
         loadingImage.displayGIF(data: nil, images: gifImages, repeatCount: .max, duration: duration ?? 2)
     }
     
+    //启动动画
+    public func startGIF(){
+        loadingImage.displayGIF(data: nil, images: gifImages, repeatCount: .max, duration: duration ?? 2)
+    }
+    
+    
     public func removeLoading(){
         isHidden = true
         loadingImage.removePlayGIF()