Browse Source

Merge branch 'demo'

* demo:
  导出时禁止播放
  修改默认熟悉
harry 3 years ago
parent
commit
fd9b04aecb
2 changed files with 27 additions and 21 deletions
  1. 2 2
      Introduce.xcodeproj/project.pbxproj
  2. 25 19
      Introduce/Record/INVideoExportController.swift

+ 2 - 2
Introduce.xcodeproj/project.pbxproj

@@ -422,7 +422,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 0.5;
+				CURRENT_PROJECT_VERSION = 0.51;
 				DEVELOPMENT_TEAM = UH52C8A7SN;
 				ENABLE_BITCODE = NO;
 				EXCLUDED_ARCHS = "";
@@ -460,7 +460,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 0.5;
+				CURRENT_PROJECT_VERSION = 0.51;
 				DEVELOPMENT_TEAM = UH52C8A7SN;
 				ENABLE_BITCODE = NO;
 				EXCLUDED_ARCHS = "";

+ 25 - 19
Introduce/Record/INVideoExportController.swift

@@ -24,6 +24,7 @@ class INVideoExportController: BFBaseViewController {
     var hasSaveOnly = false
     var saveAllUlr = URL(fileURLWithPath: "aaa")
     var saveOnlyUlr = URL(fileURLWithPath: "aaa")
+    var isExporting = false
     
     // 播放进度
     lazy var progreddL : UILabel = {
@@ -56,31 +57,31 @@ class INVideoExportController: BFBaseViewController {
     }()
     
     lazy var saveAllBtn:UIButton = {
-        let saveAllBtn = UIButton()
-        saveAllBtn.setImage(UIImage(named: "export_saveall_n"), for: .normal)
-        saveAllBtn.setImage(UIImage(named: "export_saveall_h"), for: .selected)
-        saveAllBtn.addTarget(self, action: #selector(saveAllAction(btn:)), for: .touchUpInside)
-        saveAllBtn.isSelected = true
-        return saveAllBtn
+        let btn = UIButton()
+        btn.setImage(UIImage(named: "export_saveall_n"), for: .normal)
+        btn.setImage(UIImage(named: "export_saveall_h"), for: .selected)
+        btn.addTarget(self, action: #selector(saveAllAction(btn:)), for: .touchUpInside)
+        return btn
     }()
     
     lazy var saveOnlyBtn:UIButton = {
-        let saveOnlyBtn = UIButton()
-        saveOnlyBtn.setImage(UIImage(named: "export_saveonly_n"), for: .normal)
-        saveOnlyBtn.setImage(UIImage(named: "export_saveonly_h"), for: .selected)
-        saveOnlyBtn.addTarget(self, action: #selector(saveOnlyAction(btn:)), for: .touchUpInside)
-        return saveOnlyBtn
+        let btn = UIButton()
+        btn.setImage(UIImage(named: "export_saveonly_n"), for: .normal)
+        btn.setImage(UIImage(named: "export_saveonly_h"), for: .selected)
+        btn.addTarget(self, action: #selector(saveOnlyAction(btn:)), for: .touchUpInside)
+        btn.isSelected = true
+        return btn
     }()
     
     lazy var exportBtn : UIButton = {
-        let exportBtn = UIButton()
-        exportBtn.setTitle(" 保存到相册", for: .normal)
-        exportBtn.setTitleColor(.white, for: .normal)
-        exportBtn.setImage(UIImage(named: "export_btn"), for: .normal)
-        exportBtn.backgroundColor = ThemeStyleColor
-        exportBtn.addCorner(roundingCorners: .allCorners, corner: 8)
-        exportBtn.addTarget(self, action: #selector(saveToPhotoNow), for: .touchUpInside)
-        return exportBtn
+        let btn = UIButton()
+        btn.setTitle(" 保存到相册", for: .normal)
+        btn.setTitleColor(.white, for: .normal)
+        btn.setImage(UIImage(named: "export_btn"), for: .normal)
+        btn.backgroundColor = ThemeStyleColor
+        btn.addCorner(roundingCorners: .allCorners, corner: 8)
+        btn.addTarget(self, action: #selector(saveToPhotoNow), for: .touchUpInside)
+        return btn
     }()
     
     lazy var bottomView:UIView = {
@@ -129,6 +130,7 @@ class INVideoExportController: BFBaseViewController {
                 guard let sself = self else {
                     return
                 }
+                self?.isExporting = false
                 sself.bottomView.isHidden = false
                 sself.progreddL.isHidden = false
                 sself.progressView.isHidden = true
@@ -338,6 +340,10 @@ class INVideoExportController: BFBaseViewController {
     }
     
     @objc func play(){
+        if isExporting {
+            self.avplayer.pause()
+            return
+        }
         if self.avplayer.currentItem != nil {
             if self.avplayer.timeControlStatus == .playing {
                 self.avplayer.pause()