فهرست منبع

进入前台判断之前的状态再恢复

harry 3 سال پیش
والد
کامیت
34a345b247
2فایلهای تغییر یافته به همراه12 افزوده شده و 6 حذف شده
  1. 1 1
      Introduce/Record/INIntroduceController.swift
  2. 11 5
      Introduce/Record/INVideoExportController.swift

+ 1 - 1
Introduce/Record/INIntroduceController.swift

@@ -124,7 +124,7 @@ class INIntroduceController: BFBaseViewController {
             model.voiceStickers.count + partialResult
         })
         if count == 0 {
-            cShowHUB(superView: nil, msg: "需要添加录制才能合成")
+            cShowHUB(superView: nil, msg: "需要录制才可以导出")
             return
         }
         

+ 11 - 5
Introduce/Record/INVideoExportController.swift

@@ -31,6 +31,7 @@ class INVideoExportController: BFBaseViewController {
             }
         }
     }
+    var enterBackgroundCancleExport = false
 
     // 预览播放进度
     var sliderView: BFVideoPlayerSliderView?
@@ -287,6 +288,7 @@ class INVideoExportController: BFBaseViewController {
         BFLog(message: "进入到后台")
         
         if isExporting {
+            enterBackgroundCancleExport = true
             self.export.cancelExport()
         }else{
             if let sbtn = sliderView?.viewWithTag(1) as? UIButton {
@@ -299,11 +301,15 @@ class INVideoExportController: BFBaseViewController {
 
     @objc func willEnterForeground() {
         BFLog(message: "进入到前台")
-        export.startExprot(synthesisAll: saveAllBtn.isSelected)
-        //重启播放器
-        if let sbtn = sliderView?.viewWithTag(1) as? UIButton {
-            sbtn.isSelected = false
-            avplayer.play()
+        if enterBackgroundCancleExport {
+            export.startExprot(synthesisAll: saveAllBtn.isSelected)
+            enterBackgroundCancleExport = false
+        }else {
+            //重启播放器
+            if let sbtn = sliderView?.viewWithTag(1) as? UIButton {
+                sbtn.isSelected = false
+                avplayer.play()
+            }            
         }
     }