Browse Source

1,修改国际化文字,2修改导出模式化的实现方式

jsonwang 3 years ago
parent
commit
3a1b6c8e03

BIN
Introduce/Assets.xcassets/Export/export_saveall_h.imageset/export_saveall_h.png


BIN
Introduce/Assets.xcassets/Export/export_saveall_h.imageset/export_saveall_h@2x.png


BIN
Introduce/Assets.xcassets/Export/export_saveall_h.imageset/export_saveall_h@3x.png


BIN
Introduce/Assets.xcassets/Export/export_saveall_n.imageset/export_saveall_n.png


BIN
Introduce/Assets.xcassets/Export/export_saveall_n.imageset/export_saveall_n@2x.png


BIN
Introduce/Assets.xcassets/Export/export_saveall_n.imageset/export_saveall_n@3x.png


BIN
Introduce/Assets.xcassets/Export/export_saveonly_h.imageset/export_saveonly_h.png


BIN
Introduce/Assets.xcassets/Export/export_saveonly_h.imageset/export_saveonly_h@2x.png


BIN
Introduce/Assets.xcassets/Export/export_saveonly_h.imageset/export_saveonly_h@3x.png


BIN
Introduce/Assets.xcassets/Export/export_saveonly_n.imageset/export_saveonly_n.png


BIN
Introduce/Assets.xcassets/Export/export_saveonly_n.imageset/export_saveonly_n@2x.png


BIN
Introduce/Assets.xcassets/Export/export_saveonly_n.imageset/export_saveonly_n@3x.png


+ 6 - 6
Introduce/Record/INIntroduceController.swift

@@ -56,14 +56,14 @@ class INIntroduceController: BFBaseViewController {
         leftButton(image: nil, imageName: nil, tintColor: .white)
 
         exportBtn.backgroundColor = UIColor.hexColor(hexadecimal: "#389AFF")
-        exportBtn.setTitle("导出", for: .normal)
+        exportBtn.setTitle("option_export".BFLocale, for: .normal)
         exportBtn.addCorner(corner: 4)
         exportBtn.titleLabel?.font = UIFont.boldSystemFont(ofSize: 16)
         exportBtn.addTarget(self, action: #selector(exportAction), for: .touchUpInside)
         navHeadImageView?.addSubview(exportBtn)
         exportBtn.frame = CGRect(x: (navHeadImageView?.frame.width ?? 0) - 12 - 60, y: 0, width: 60, height: 36)
         exportBtn.center.y = backButton?.center.y ?? 0
-
+        exportBtn.titleLabel?.adjustsFontSizeToFitWidth = true
         addChild(recordScreenVC)
         recordScreenVC.view.frame = view.frame
         view.addSubview(recordScreenVC.view)
@@ -106,11 +106,11 @@ class INIntroduceController: BFBaseViewController {
 
     override func backBtnClick() {
   
-        let alertController = UIAlertController(title: "退出将不会保存当前操作",
+        let alertController = UIAlertController(title: "compose_tips_exit".BFLocale,
                        message: "", preferredStyle: .alert)
-        let cancelAction = UIAlertAction(title: "不退出", style: .default, handler: nil)
+        let cancelAction = UIAlertAction(title: "option_not exit".BFLocale, style: .default, handler: nil)
 
-        let okAction = UIAlertAction(title: "确认退出", style: .cancel, handler: {[weak self]
+        let okAction = UIAlertAction(title: "option_exit".BFLocale, style: .cancel, handler: {[weak self]
            action in
            print("点击了确定")
            self?.recordScreenVC.backBtnClick()
@@ -134,7 +134,7 @@ class INIntroduceController: BFBaseViewController {
             model.voiceStickers.count + partialResult
         })
         if count == 0 {
-            cShowHUB(superView: nil, msg: "需要录制才可以导出")
+            cShowHUB(superView: nil, msg: "compose_tips_export".BFLocale)
             return
         }
         

+ 6 - 6
Introduce/Record/INPhotoVideosController.swift

@@ -18,7 +18,7 @@ class INPhotoVideosController: BFBaseViewController {
     // 按钮高
     let choseBtnH: CGFloat = cDefaultMargin * 3
     // 按钮宽
-    let choseBtnW: CGFloat = cDefaultMargin * 6
+    let choseBtnW: CGFloat = cDefaultMargin * 9
     // 间隔
     let margin: CGFloat = 12
 
@@ -45,7 +45,7 @@ class INPhotoVideosController: BFBaseViewController {
         let changeCollecBtn = UIButton(frame: CGRect(x: cDefaultMargin * 5, y: cDevice_iPhoneStatusBarHei, width: cScreenWidth - cDefaultMargin * 10, height: cDefaultMargin * 4))
         changeCollecBtn.titleLabel?.lineBreakMode = .byTruncatingTail
         changeCollecBtn.tintColor = BFConfig.shared.styleTitleColor
-        changeCollecBtn.setTitle("我的相册", for: .normal)
+        changeCollecBtn.setTitle("album_title".BFLocale, for: .normal)
         changeCollecBtn.setImage(UIImage.moduleImage(named: "icon_selected_down", moduleName: "BFMaterialKit", isAssets: false)?.withRenderingMode(.alwaysTemplate), for: .normal)
         changeCollecBtn.setImage(UIImage.moduleImage(named: "icon_selected_up", moduleName: "BFMaterialKit", isAssets: false)?.withRenderingMode(.alwaysTemplate), for: .selected)
         changeCollecBtn.setTitleColor(BFConfig.shared.styleTitleColor, for: .normal)
@@ -173,7 +173,7 @@ class INPhotoVideosController: BFBaseViewController {
         let nextBtn = UIButton(type: .custom)
         nextBtn.frame = CGRect(x: cScreenWidth - 94, y: 10, width: 78, height: 36)
         nextBtn.backgroundColor = UIColor.hexColor(hexadecimal: "#389AFF")
-        nextBtn.setTitle("下一步", for: .normal)
+        nextBtn.setTitle("option_next".BFLocale, for: .normal)
         nextBtn.titleLabel?.font = UIFont.boldSystemFont(ofSize: 16)
         nextBtn.layer.cornerRadius = 4
         nextBtn.addTarget(self, action: #selector(nextBtnClick(sender:)), for: .touchUpInside)
@@ -237,8 +237,8 @@ class INPhotoVideosController: BFBaseViewController {
                 let dur = (phasset.mediaType == .video) ?  phasset.duration : 0
                 return (partialResult ?? 0.0) + dur
             }), totalDura > 7200{
-                let alertController = UIAlertController(title: nil, message: "素材总时长不能超过2小时", preferredStyle: UIAlertController.Style.alert)
-                let cancelAction = UIAlertAction(title: "确定", style: .default, handler: nil)
+                let alertController = UIAlertController(title: nil, message: "album_tips_maxtime".BFLocale, preferredStyle: UIAlertController.Style.alert)
+                let cancelAction = UIAlertAction(title: "option_ok".BFLocale, style: .default, handler: nil)
                 alertController.addAction(cancelAction)
                 self.present(alertController, animated: true, completion: nil)
                 return
@@ -252,7 +252,7 @@ class INPhotoVideosController: BFBaseViewController {
             vc.assets = assets
             navigationController?.pushViewController(vc, animated: true)
         } else {
-            cShowHUB(superView: nil, msg: "需要选择一个视频")
+            cShowHUB(superView: nil, msg: "album_tips_least".BFLocale)
         }
     }
 

+ 46 - 2
Introduce/Record/INVideoExportController.swift

@@ -90,6 +90,16 @@ class INVideoExportController: BFBaseViewController {
         btn.addTarget(self, action: #selector(saveAllAction(btn:)), for: .touchUpInside)
         return btn
     }()
+    
+    lazy var saveAllBtnTips: UILabel = {
+        let la = UILabel()
+        la.textColor = .white
+        la.textAlignment = .center
+        la.text = "savemode_all".BFLocale
+        la.font = UIFont.systemFont(ofSize: 14)
+        return la
+    }()
+    
 
     lazy var saveOnlyBtn: UIButton = {
         let btn = UIButton()
@@ -98,10 +108,19 @@ class INVideoExportController: BFBaseViewController {
         btn.addTarget(self, action: #selector(saveOnlyAction(btn:)), for: .touchUpInside)
         return btn
     }()
+    lazy var saveOnlyBtnTips: UILabel = {
+        let la = UILabel()
+        la.textColor = .white
+        la.textAlignment = .center
+        la.text = "savemode_onlyrecord".BFLocale
+        la.font = UIFont.systemFont(ofSize: 14)
+        return la
+    }()
+    
 
     lazy var completeBtn: UIButton = {
         let btn = UIButton()
-        btn.setTitle("回到首页", for: .normal)
+        btn.setTitle("option_Finish".BFLocale, for: .normal)
         btn.titleLabel?.font = UIFont.systemFont(ofSize: 14)
         btn.setTitleColor(UIColor.hexColor(hexadecimal: "#6B6B6B"), for: .normal)
         btn.setTitleColor(.gray, for: .disabled)
@@ -415,8 +434,11 @@ class INVideoExportController: BFBaseViewController {
         backV.addSubview(progressL)
         
         bottomView.addSubview(saveAllBtn)
+        saveAllBtn.addSubview(saveAllBtnTips)
         bottomView.addSubview(saveOnlyBtn)
+        saveOnlyBtn.addSubview(saveOnlyBtnTips)
         bottomView.addSubview(saveToPhotoBtn)
+        
         bottomView.addSubview(completeBtn)
         
         errorView.snp.makeConstraints { make in
@@ -481,6 +503,11 @@ class INVideoExportController: BFBaseViewController {
             make.top.equalTo(28)
             make.centerX.equalToSuperview().offset(-82 - 6.5)
         }
+        saveAllBtnTips.snp.makeConstraints { make in
+            make.bottom.equalToSuperview().offset(-7)
+            make.left.equalToSuperview().offset(2)
+            make.right.equalToSuperview().offset(-2)
+        }
 
         saveOnlyBtn.snp.makeConstraints { make in
 //            make.left.equalTo(saveAllBtn.snp.right).offset(16)
@@ -488,6 +515,12 @@ class INVideoExportController: BFBaseViewController {
             make.left.equalTo(saveAllBtn.snp.right).offset(13)
             make.right.equalTo(completeBtn)
         }
+        
+        saveOnlyBtnTips.snp.makeConstraints { make in
+            make.bottom.equalToSuperview().offset(-7)
+            make.left.equalToSuperview().offset(2)
+            make.right.equalToSuperview().offset(-2)
+        }
 
 //        DispatchQueue.main.asyncAfter(deadline: .now() + 0) { [weak self] in
 //            guard let sself = self else {
@@ -582,10 +615,15 @@ class INVideoExportController: BFBaseViewController {
 //            saveAllBtn.setImage(UIImage(named: "export_saveall_h"), for: .disabled)
             saveAllBtn.setImage(UIImage(named: "export_saveall_h"), for: .normal)
             saveOnlyBtn.setImage(UIImage(named: "export_saveonly_n"), for: .normal)
+            saveAllBtnTips.textColor = UIColor.hexColor(hexadecimal: "#389AFF")
+            saveOnlyBtnTips.textColor = UIColor(red: 0.696, green: 0.696, blue: 0.696, alpha: 1)
         }else{
 //            saveAllBtn.setImage(UIImage(named: "export_saveall_n"), for: .disabled)
             saveAllBtn.setImage(UIImage(named: "export_saveall_n"), for: .normal)
             saveOnlyBtn.setImage(UIImage(named: "export_saveonly_h"), for: .normal)
+            
+            saveOnlyBtnTips.textColor = UIColor.hexColor(hexadecimal: "#389AFF")
+            saveAllBtnTips.textColor = UIColor(red: 0.696, green: 0.696, blue: 0.696, alpha: 1)
         }
         
         saveToPhotoBtn.isEnabled = false
@@ -650,6 +688,10 @@ class INVideoExportController: BFBaseViewController {
         
         btn.isSelected = true
         saveOnlyBtn.isSelected = false
+        
+        saveAllBtnTips.textColor = UIColor.hexColor(hexadecimal: "#389AFF")
+        saveOnlyBtnTips.textColor = UIColor(red: 0.696, green: 0.696, blue: 0.696, alpha: 1)
+        
         avplayer.pause()
         
         if !hasExportAll {
@@ -682,6 +724,8 @@ class INVideoExportController: BFBaseViewController {
         
         btn.isSelected = true
         saveAllBtn.isSelected = false
+        saveOnlyBtnTips.textColor = UIColor.hexColor(hexadecimal: "#389AFF")
+        saveAllBtnTips.textColor = UIColor(red: 0.696, green: 0.696, blue: 0.696, alpha: 1)
         avplayer.pause()
         if !hasExportOnly {
             exportNow()
@@ -789,7 +833,7 @@ class INVideoExportController: BFBaseViewController {
         let alertController = UIAlertController(title: msg,
                        message: "", preferredStyle: .alert)
         let cancelAction = UIAlertAction(title: "option_cancel".BFLocale, style: .default, handler: nil)
-        let okAction = UIAlertAction(title: "确定", style: .default) {[weak self] action in
+        let okAction = UIAlertAction(title: "option_ok".BFLocale, style: .default) {[weak self] action in
             guard let sself = self else {
                 return
             }