浏览代码

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

wenweiwei 3 年之前
父节点
当前提交
5d42271090
共有 1 个文件被更改,包括 8 次插入4 次删除
  1. 8 4
      Introduce/Record/INVideoExportController.swift

+ 8 - 4
Introduce/Record/INVideoExportController.swift

@@ -78,8 +78,7 @@ class INVideoExportController: BFBaseViewController {
 
 
     lazy var completeBtn: UIButton = {
     lazy var completeBtn: UIButton = {
         let btn = UIButton()
         let btn = UIButton()
-        btn.setTitle("完成", for: .normal)
-//        btn.setTitleColor(.white, for: .normal)
+        btn.setTitle("回到首页", for: .normal)
         btn.setTitleColor(UIColor.hexColor(hexadecimal: "#B1B1B1"), for: .normal)
         btn.setTitleColor(UIColor.hexColor(hexadecimal: "#B1B1B1"), for: .normal)
         btn.setTitleColor(.gray, for: .disabled)
         btn.setTitleColor(.gray, for: .disabled)
         btn.addTarget(self, action: #selector(completeAction), for: .touchUpInside)
         btn.addTarget(self, action: #selector(completeAction), for: .touchUpInside)
@@ -92,6 +91,7 @@ class INVideoExportController: BFBaseViewController {
         btn.setTitleColor(.white, for: .normal)
         btn.setTitleColor(.white, for: .normal)
         btn.setTitleColor(.lightGray, for: .disabled)
         btn.setTitleColor(.lightGray, for: .disabled)
         btn.setImage(UIImage(named: "export_btn"), for: .normal)
         btn.setImage(UIImage(named: "export_btn"), for: .normal)
+        btn.adjustsImageWhenDisabled = true
         btn.backgroundColor = ThemeStyleColor
         btn.backgroundColor = ThemeStyleColor
         btn.addCorner(roundingCorners: .allCorners, corner: 8)
         btn.addCorner(roundingCorners: .allCorners, corner: 8)
         btn.addTarget(self, action: #selector(saveToPhotoNow), for: .touchUpInside)
         btn.addTarget(self, action: #selector(saveToPhotoNow), for: .touchUpInside)
@@ -204,6 +204,10 @@ class INVideoExportController: BFBaseViewController {
 
 
                 sself.isExporting = false
                 sself.isExporting = false
 //                sself.bottomView.isHidden = false
 //                sself.bottomView.isHidden = false
+                
+                sself.saveAllBtn.setImage(UIImage(named: "export_saveall_n"), for: .normal)
+                sself.saveOnlyBtn.setImage(UIImage(named: "export_saveonly_n"), for: .normal)
+                
                 sself.saveAllBtn.isEnabled = true
                 sself.saveAllBtn.isEnabled = true
                 sself.saveOnlyBtn.isEnabled = true
                 sself.saveOnlyBtn.isEnabled = true
                 sself.saveToPhotoBtn.isEnabled = true
                 sself.saveToPhotoBtn.isEnabled = true
@@ -597,7 +601,7 @@ class INVideoExportController: BFBaseViewController {
         if (!hasSaveOnly && !saveOnlyUlr.absoluteString.contains("aaa"))
         if (!hasSaveOnly && !saveOnlyUlr.absoluteString.contains("aaa"))
             || (!hasSaveAll && !saveAllUlr.absoluteString.contains("aaa")) {
             || (!hasSaveAll && !saveAllUlr.absoluteString.contains("aaa")) {
             
             
-            let alertController = UIAlertController(title: "合成的视频尚未保存到相册",
+            let alertController = UIAlertController(title: "你还未保存视频哦,是否需要保存视频再离开?",
                            message: "", preferredStyle: .alert)
                            message: "", preferredStyle: .alert)
             let cancelAction = UIAlertAction(title: "不保存", style: .default){[weak self] action in
             let cancelAction = UIAlertAction(title: "不保存", style: .default){[weak self] action in
                 guard let sself = self else {
                 guard let sself = self else {
@@ -606,7 +610,7 @@ class INVideoExportController: BFBaseViewController {
                 sself.export.cancelExport()
                 sself.export.cancelExport()
                 sself.navigationController?.popToRootViewController(animated: true)
                 sself.navigationController?.popToRootViewController(animated: true)
             }
             }
-            let okAction = UIAlertAction(title: "确认保存", style: .default) {[weak self] action in
+            let okAction = UIAlertAction(title: "保存视频", style: .default) {[weak self] action in
                 guard let sself = self else {
                 guard let sself = self else {
                     return
                     return
                 }
                 }