Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

* 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  // 我的证书
  // 模版指引
  // 我的证件
  //
  // 我的证书
  地址选择器逻辑修改
  正式环境 UI走查

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/C/YHCertificateListVC.swift

@@ -115,7 +115,7 @@ extension YHCertificateListVC: UITableViewDelegate, UITableViewDataSource {
                     guard let self = self else { return }
                     if let url = path?.url, !url.isEmpty {
                         print(url)
-                        self.previewFileTool.openXLSXRemoteFile(urlString:url)
+                        self.previewFileTool.openXLSXRemoteFile(urlString:url, fileName:"预览")
                     }
                 }
                 view.show()
@@ -229,7 +229,7 @@ extension YHCertificateListVC {
         }
     }
     
-    func uploadImage(_ img: UIImage, supplementInfo:YHSupplementInfo, successBlock:(()->())?)  {
+    func uploadImage(_ img: UIImage, imageName:String, supplementInfo:YHSupplementInfo, successBlock:(()->())?)  {
         
         // 先OSS上传得到URL
         YHHUD.show(.progress(message: "上传中..."))
@@ -238,7 +238,6 @@ extension YHCertificateListVC {
             guard let self = self else { return }
             YHHUD.hide()
             if let url = url, !url.isEmpty {
-                let imgName = url.lastPathComponent
                 var suffix = "jpg"
                 let suffixName = url.pathExtension.lowercased()
                 if !suffixName.isEmpty {
@@ -247,7 +246,7 @@ extension YHCertificateListVC {
                 
                 // 再调用业务接口
                 let model = YHContentUrl()
-                model.name = imgName
+                model.name = imageName
                 model.url = url
                 model.suffix = suffix
                 self.viewModel.updateCertificateItem(supplementId:supplementInfo.id, urlModel:model, operation: "add", rename: "") {
@@ -274,10 +273,13 @@ extension YHCertificateListVC {
             let size = String(format: "%.2fM", Double(fileData.count)/(1024.0 * 1024.0))
             print("\(size)")
             // 先OSS上传得到URL
+            YHHUD.show(.progress(message: "上传中..."))
             self.viewModel.uploadFile(fileUrl.absoluteString) {
                 [weak self] successUrl, error in
                 guard let self = self else { return }
                 
+                YHHUD.hide()
+                
                 // 再调用业务接口
                 if let successUrl = successUrl, !successUrl.isEmpty {
                     let fileName = successUrl.lastPathComponent
@@ -316,7 +318,7 @@ extension YHCertificateListVC {
             if let url = path?.url, !url.isEmpty {
                 guard let self = self else { return }
                 print(url)
-                self.previewFileTool.openXLSXRemoteFile(urlString:url)
+                self.previewFileTool.openXLSXRemoteFile(urlString:url, fileName: "预览")
             }
         }
          sheetView.uploadFilesBlock = {
@@ -324,7 +326,7 @@ extension YHCertificateListVC {
             guard let self = self else { return }
             print(fileUrl)
              uploadFile(fileUrl, supplementInfo: supplementInfo) {
-                 // 非待上传的进入详情
+                 // 待上传的进入详情
                  DispatchQueue.main.async {
                      let vc = YHCertificateUploadContentListVC()
                      vc.orderId = self.orderId
@@ -335,10 +337,10 @@ extension YHCertificateListVC {
              }
         }
         sheetView.uploadImageBlock = {
-            [weak self] image in
+            [weak self] image, imageName in
             guard let self = self else { return }
-            uploadImage(image, supplementInfo: supplementInfo) {
-                // 非待上传的进入详情
+            uploadImage(image, imageName: imageName, supplementInfo: supplementInfo) {
+                // 待上传的进入详情
                 DispatchQueue.main.async {
                     let vc = YHCertificateUploadContentListVC()
                     vc.orderId = self.orderId

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/C/YHCertificateSearchViewController.swift

@@ -153,7 +153,7 @@ extension YHCertificateSearchViewController: UITableViewDelegate, UITableViewDat
                     guard let self = self else { return }
                     if let url = path?.url, !url.isEmpty {
                         print(url)
-                        self.previewFileTool.openXLSXRemoteFile(urlString:url)
+                        self.previewFileTool.openXLSXRemoteFile(urlString:url, fileName: "预览")
                     }
                 }
                 view.show()
@@ -245,7 +245,7 @@ extension YHCertificateSearchViewController {
         }
     }
     
-    func uploadImage(_ img: UIImage, supplementInfo:YHSupplementInfo)  {
+    func uploadImage(_ img: UIImage, imageName:String, supplementInfo:YHSupplementInfo, successBlock:(()->())?)  {
         
         // 先OSS上传得到URL
         YHHUD.show(.progress(message: "上传中..."))
@@ -254,7 +254,6 @@ extension YHCertificateSearchViewController {
             guard let self = self else { return }
             YHHUD.hide()
             if let url = url, !url.isEmpty {
-                let imgName = url.lastPathComponent
                 var suffix = "jpg"
                 let suffixName = url.pathExtension.lowercased()
                 if !suffixName.isEmpty {
@@ -263,12 +262,15 @@ extension YHCertificateSearchViewController {
                 
                 // 再调用业务接口
                 let model = YHContentUrl()
-                model.name = imgName
+                model.name = imageName
                 model.url = url
                 model.suffix = suffix
                 self.viewModel.updateCertificateItem(supplementId:supplementInfo.id, urlModel:model, operation: "add", rename: "") {
                     success in
                     self.requestList(keyWord: self.searchBar.textField.text)
+                    if success {
+                        successBlock?()
+                    }
                 }
                 return
             }
@@ -281,16 +283,17 @@ extension YHCertificateSearchViewController {
         }
     }
     
-    func uploadFile(_ fileUrl:URL, supplementInfo:YHSupplementInfo) {
+    func uploadFile(_ fileUrl:URL, supplementInfo:YHSupplementInfo, successBlock:(()->())?)  {
         if let fileData = try? Data(contentsOf: fileUrl) {
             // 将文件数据上传到服务器
             let size = String(format: "%.2fM", Double(fileData.count)/(1024.0 * 1024.0))
             print("\(size)")
             // 先OSS上传得到URL
+            YHHUD.show(.progress(message: "上传中..."))
             self.viewModel.uploadFile(fileUrl.absoluteString) {
                 [weak self] successUrl, error in
                 guard let self = self else { return }
-                
+                YHHUD.hide()
                 // 再调用业务接口
                 if let successUrl = successUrl, !successUrl.isEmpty {
                     let fileName = successUrl.lastPathComponent
@@ -302,6 +305,9 @@ extension YHCertificateSearchViewController {
                     self.viewModel.updateCertificateItem(supplementId:supplementInfo.id, urlModel:model, operation: "add", rename: "") {
                         success in
                         self.requestList(keyWord: self.searchBar.textField.text)
+                        if success {
+                            successBlock?()
+                        }
                     }
                     return
                 }
@@ -317,10 +323,8 @@ extension YHCertificateSearchViewController {
         }
     }
     
-    func showUploadSheetView(_ supplementInfo: YHSupplementInfo?) {
-        
-        guard let supplementInfo = supplementInfo else { return }
-        
+    func showUploadSheetView(_ supplementInfo: YHSupplementInfo) {
+                
         let sheetView = YHCertificateUploadSheetView.sheetView()
         sheetView.templateInfo = supplementInfo.templateInfo
         sheetView.clickTemplateBlock = {
@@ -328,19 +332,37 @@ extension YHCertificateSearchViewController {
             if let url = path?.url, !url.isEmpty {
                 guard let self = self else { return }
                 print(url)
-                self.previewFileTool.openXLSXRemoteFile(urlString:url)
+                self.previewFileTool.openXLSXRemoteFile(urlString:url, fileName: "预览")
             }
         }
          sheetView.uploadFilesBlock = {
             [weak self] fileUrl in
             guard let self = self else { return }
             print(fileUrl)
-            uploadFile(fileUrl, supplementInfo: supplementInfo)
+             uploadFile(fileUrl,  supplementInfo: supplementInfo) {
+                 // 待上传的进入详情
+                 DispatchQueue.main.async {
+                     let vc = YHCertificateUploadContentListVC()
+                     vc.orderId = self.orderId
+                     vc.categoryInfo = self.categoryInfo
+                     vc.supplementInfo = supplementInfo
+                     self.navigationController?.pushViewController(vc)
+                 }
+             }
         }
         sheetView.uploadImageBlock = {
-            [weak self] image in
+            [weak self] image, imageName in
             guard let self = self else { return }
-            uploadImage(image, supplementInfo: supplementInfo)
+            uploadImage(image, imageName: imageName, supplementInfo: supplementInfo) {
+                // 待上传的进入详情
+                DispatchQueue.main.async {
+                    let vc = YHCertificateUploadContentListVC()
+                    vc.orderId = self.orderId
+                    vc.categoryInfo = self.categoryInfo
+                    vc.supplementInfo = supplementInfo
+                    self.navigationController?.pushViewController(vc)
+                }
+            }
         }
         sheetView.show()
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/C/YHCertificateUploadContentListVC.swift

@@ -18,10 +18,14 @@ class YHCertificateUploadContentListVC: YHBaseViewController {
             templateArr.removeAll()
             if let uploadInfo = supplementInfo {
                 if uploadInfo.templateInfo.materialPath.count > 0 {
-                    templateArr.append(uploadInfo.templateInfo.materialPath[0])
+                    let template = uploadInfo.templateInfo.materialPath[0]
+                    template.type = 0
+                    templateArr.append(template)
                 }
                 if uploadInfo.templateInfo.guideFilePath.count > 0 {
-                    templateArr.append(uploadInfo.templateInfo.guideFilePath[0])
+                    let guide = uploadInfo.templateInfo.guideFilePath[0]
+                    guide.type = 1
+                    templateArr.append(guide)
                 }
             }
             self.tableView.reloadData()
@@ -116,8 +120,8 @@ class YHCertificateUploadContentListVC: YHBaseViewController {
     
     @objc func didClickUploadBtn() {
         
-        if items.count >= 100 {
-            YHHUD.flash(message: "最多上传100张图片或文件")
+        if items.count >= 99 {
+            YHHUD.flash(message: "已达上限，最多上传99张图片或文件")
             return
         }
         let sheetView = YHCertificateUploadSheetView.sheetView()
@@ -129,9 +133,9 @@ class YHCertificateUploadContentListVC: YHBaseViewController {
             uploadFile(fileUrl)
         }
         sheetView.uploadImageBlock = {
-            [weak self] image in
+            [weak self] image, imageName in
             guard let self = self else { return }
-            uploadImage(image)
+            uploadImage(image, imageName: imageName)
         }
         sheetView.show()
     }
@@ -217,7 +221,12 @@ extension YHCertificateUploadContentListVC: UITableViewDelegate, UITableViewData
                     
                     if editType == .rename { // 重命名
                         IQKeyboardManager.shared.enable = false
-                        renameInputView.textField.text = contentItem.getFileNameWithoutSuffix()
+                        
+                        var name = contentItem.getFileNameWithoutSuffix()
+                        if name.count > 30 {
+                            name = name[safe: ..<30]!
+                        }
+                        renameInputView.textField.text = name
                         renameInputView.textField.becomeFirstResponder()
                         
                     } else if editType == .delete { // 删除
@@ -235,7 +244,7 @@ extension YHCertificateUploadContentListVC: UITableViewDelegate, UITableViewData
                         print(contentItem.url)
                         self.viewModel.getPublicImageUrl(contentItem.url) { success, error in
                             if let success = success {
-                                self.previewFileTool.openXLSXRemoteFile(urlString: success)
+                                self.previewFileTool.openXLSXRemoteFile(urlString: success, fileName:contentItem.name)
                             }
                         }
                     }
@@ -407,7 +416,7 @@ extension YHCertificateUploadContentListVC: UITableViewDelegate, UITableViewData
                 let path = templateArr[indexPath.row]
                 print(path.url)
                 if !path.url.isEmpty {
-                    self.previewFileTool.openXLSXRemoteFile(urlString:path.url)
+                    self.previewFileTool.openXLSXRemoteFile(urlString:path.url, fileName:"预览")
                 }
             }
              
@@ -491,7 +500,13 @@ extension YHCertificateUploadContentListVC {
                 }
             }
             
-            self.uploadBtn.alpha = (items.count >= 100 ? 0.5 : 1.0)
+            if categoryInfo.checkStatus == YHCertificateUploadStatus.finish.rawValue {
+                self.uploadBtn.isHidden = true
+            } else {
+                self.uploadBtn.isHidden = false
+                self.uploadBtn.alpha = (items.count >= 99 ? 0.5 : 1.0)
+            }
+            
             self.tableView.reloadData()
             
             if let errorMsg = error?.errorMsg, errorMsg.count > 0 {
@@ -502,7 +517,7 @@ extension YHCertificateUploadContentListVC {
 
     
     
-    func uploadImage(_ img: UIImage) {
+    func uploadImage(_ img: UIImage, imageName:String) {
         
         // 先OSS上传得到URL
         YHHUD.show(.progress(message: "上传中..."))
@@ -511,7 +526,6 @@ extension YHCertificateUploadContentListVC {
             guard let self = self else { return }
             YHHUD.hide()
             if let url = url, !url.isEmpty {
-                let imgName = url.lastPathComponent
                 var suffix = "jpg"
                 let suffixName = url.pathExtension.lowercased()
                 if !suffixName.isEmpty {
@@ -520,7 +534,7 @@ extension YHCertificateUploadContentListVC {
                 
                 // 再调用业务接口
                 let model = YHContentUrl()
-                model.name = imgName
+                model.name = imageName
                 model.url = url
                 model.suffix = suffix
                 self.viewModel.updateCertificateItem(supplementId:supplementInfo.id, urlModel:model, operation: "add", rename: "") {
@@ -544,10 +558,11 @@ extension YHCertificateUploadContentListVC {
             let size = String(format: "%.2fM", Double(fileData.count)/(1024.0 * 1024.0))
             print("\(size)")
             // 先OSS上传得到URL
+            YHHUD.show(.progress(message: "上传中..."))
             self.viewModel.uploadFile(fileUrl.absoluteString) {
                 [weak self] successUrl, error in
                 guard let self = self else { return }
-                
+                YHHUD.hide()
                 // 再调用业务接口
                 if let successUrl = successUrl, !successUrl.isEmpty {
                     let fileName = successUrl.lastPathComponent

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/M/YHCertificateModel.swift

@@ -250,6 +250,8 @@ class YHTemplateInfo: SmartCodable {
 class YHMaterialPath: SmartCodable {
     var name: String = ""
     var url: String = ""
+    // 自定义类型 0：模版 1：指引
+    var type: Int = 0
 
     enum CodingKeys: String, CodingKey {
         case name = "name"
@@ -260,7 +262,8 @@ class YHMaterialPath: SmartCodable {
         
     }
 
-    init(name: String = "", url: String = "") {
+    init(type:Int,  name: String = "", url: String = "") {
+        self.type = type
         self.name = name
         self.url = url
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/V/YHCertificateInfoCell.swift

@@ -63,8 +63,8 @@ class YHCertificateInfoCell: UITableViewCell {
         if !model.typeName.isEmpty {
             typeStr = model.typeName
         }
-        if !model.nameExtra.userName.isEmpty {
-            ownerStr = model.nameExtra.userName
+        if !model.nameExtra.applicant.isEmpty {
+            ownerStr = model.nameExtra.applicant
         }
         infoLabel.text = "类型: \(typeStr) 所属人: \(ownerStr)"
 
@@ -124,6 +124,7 @@ class YHCertificateInfoCell: UITableViewCell {
         templateButton.clipsToBounds = true
         templateButton.backgroundColor = .brandMainColor8
         templateButton.addTarget(self, action: #selector(didTemplateBtnClicked), for: .touchUpInside)
+        templateButton.YH_clickEdgeInsets = UIEdgeInsets(top: 20, left: 20, bottom: 20, right: 20)
         
         nameTextView.attributed.text = """
         \("资料名称", .foreground(UIColor.mainTextColor), .font(UIFont.PFSC_M(ofSize: 16))) \(.view(templateButton, .original(.center))))

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/V/YHCertificateSearchBar.swift

@@ -12,6 +12,7 @@ class YHCertificateSearchBar: UIView {
 
     static let height = 40.0
     static let cancelBtnHeight = height-8.0
+    static let maxWordsCount = 50
     
     var textChange:((String?)->Void)?
     var searchBlock:((String?)->Void)?
@@ -39,6 +40,7 @@ class YHCertificateSearchBar: UIView {
         textField.textColor = UIColor.mainTextColor
         textField.clearButtonMode = .whileEditing
         textField.addTarget(self, action: #selector(textFieldChanged(textField:)), for: .editingChanged)
+        textField.delegate = self
         return textField
     }()
     
@@ -115,3 +117,20 @@ class YHCertificateSearchBar: UIView {
         }
     }
 }
+
+extension YHCertificateSearchBar: UITextFieldDelegate {
+    
+    func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
+        
+        if string.isEmpty == true { // 点击删除
+            return true
+        }
+        
+        var newText = (textField.text! as NSString).replacingCharacters(in: range, with: string)
+        if newText.count > Self.maxWordsCount {
+            YHHUD.flash(message: "搜索限制最多\(Self.maxWordsCount)个字符")
+            return false
+        }
+        return true
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/V/YHCertificateTemplateCell.swift

@@ -72,7 +72,18 @@ class YHCertificateSampleTemplateView: UIView {
 class YHCertificateTemplateCell: UITableViewCell {
 
     static let cellReuseIdentifier = "YHCertificateTemplateCell"
-    var templatePath: YHMaterialPath?
+    var templatePath: YHMaterialPath? {
+        didSet {
+            if let path = templatePath {
+                
+                var title = "查看证件示例模版"
+                if path.type == 1 { // 指引
+                    title = "查看证件操作指引"
+                }
+                templateView.titleLabel.text = title
+            }
+        }
+    }
     
     lazy var templateView: YHCertificateSampleTemplateView = {
         let view = YHCertificateSampleTemplateView(frame:CGRectZero)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/V/YHCertificateTemplateSheetView.swift

@@ -140,12 +140,16 @@ class YHCertificateTemplateSheetView: UIView {
         }
         
         templateArr.removeAll()
-      
+        
         if model.materialPath.count > 0 {
-            templateArr.append(model.materialPath[0])
+            let template = model.materialPath[0]
+            template.type = 0
+            templateArr.append(template)
         }
         if model.guideFilePath.count > 0 {
-            templateArr.append(model.guideFilePath[0])
+            let guide = model.guideFilePath[0]
+            guide.type = 1
+            templateArr.append(guide)
         }
         self.tableView.reloadData()
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/V/YHCertificateUploadSheetView.swift

@@ -64,10 +64,14 @@ class YHCertificateUploadSheetView: UIView {
             templateArr.removeAll()
             if let templateInfo = templateInfo {
                 if templateInfo.materialPath.count > 0 {
-                    templateArr.append(templateInfo.materialPath[0])
+                    let template = templateInfo.materialPath[0]
+                    template.type = 0
+                    templateArr.append(template)
                 }
                 if templateInfo.guideFilePath.count > 0 {
-                    templateArr.append(templateInfo.guideFilePath[0])
+                    let guide = templateInfo.guideFilePath[0]
+                    guide.type = 1
+                    templateArr.append(guide)
                 }
             }
             let totalHeight = calculateHeight()
@@ -89,7 +93,7 @@ class YHCertificateUploadSheetView: UIView {
     // 上传文件
     var uploadFilesBlock:((URL)->())?
     // 上传图片
-    var uploadImageBlock:((UIImage)->())?
+    var uploadImageBlock:((UIImage, String)->())?
     // 点击模版
     var clickTemplateBlock:((YHMaterialPath?)->())?
     
@@ -300,6 +304,7 @@ extension YHCertificateUploadSheetView: UITableViewDelegate, UITableViewDataSour
                     dismiss()
                     
                 } else if operationItem.type == .photo {
+                    
                     selectPhoto()
                 
                 } else if operationItem.type == .camera {
@@ -430,17 +435,22 @@ extension YHCertificateUploadSheetView: (UIImagePickerControllerDelegate & UINav
         }
         
         if !authorization {
-            
             YHHUD.flash(message: "请在设置中打开相册权限")
             return
         }
         
-        if UIImagePickerController.isSourceTypeAvailable(.photoLibrary){
-            let imagePicker = UIImagePickerController()
-            imagePicker.delegate = self
-            imagePicker.sourceType = .photoLibrary
-            // 这一句，开始调用图库
-            UIViewController.current?.present(imagePicker,animated: true)
+        let isMultiSelect = false
+        if !isMultiSelect {
+            if UIImagePickerController.isSourceTypeAvailable(.photoLibrary){
+                let imagePicker = UIImagePickerController()
+                imagePicker.delegate = self
+                imagePicker.sourceType = .photoLibrary
+                // 这一句，开始调用图库
+                UIViewController.current?.present(imagePicker,animated: true)
+            }
+            
+        } else {
+            
         }
     }
     
@@ -448,7 +458,20 @@ extension YHCertificateUploadSheetView: (UIImagePickerControllerDelegate & UINav
         
         if let image = info[UIImagePickerController.InfoKey.originalImage] as? UIImage {
         
-            uploadImageBlock?(image)
+            // 若无照片名称使用时间字符串
+            let dateFormatter = DateFormatter()
+            dateFormatter.dateFormat = "yyyy-MM-dd"
+            let dateString = dateFormatter.string(from: Date())
+            var imageName = dateString
+
+            // 获取照片的名称
+            if let imageUrl = info[.imageURL] as? URL {
+                let lastComponent = imageUrl.lastPathComponent
+                if !imageName.isEmpty {
+                    imageName = lastComponent
+                }
+            }
+            uploadImageBlock?(image, imageName)
             self.dismiss()
 
         } else {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/V/YHFileRenameInputView.swift

@@ -18,6 +18,7 @@ import UIKit
 class YHFileRenameInputView: UIView {
     
     static let height = 217.0
+    static let maxWordsCount = 30
     var editBlock:((String?)->Void)?
     lazy var blackMaskView: UIView = {
         let view = UIView(frame:UIScreen.main.bounds)
@@ -72,6 +73,7 @@ class YHFileRenameInputView: UIView {
         textField.font = UIFont.PFSC_M(ofSize: 16)
         textField.tintColor = UIColor.brandMainColor
         textField.textColor = UIColor.mainTextColor
+        textField.delegate = self
         return textField
     }()
     
@@ -203,4 +205,21 @@ extension YHFileRenameInputView  {
     }
 }
 
+extension YHFileRenameInputView: UITextFieldDelegate {
+    
+    func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
+        
+        if string.isEmpty == true { // 点击删除
+            return true
+        }
+        
+        var newText = (textField.text! as NSString).replacingCharacters(in: range, with: string)
+        if newText.count > Self.maxWordsCount {
+            YHHUD.flash(message: "重命名限制最多30个字符")
+            return false
+        }
+        return true
+    }
+}
+
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/VM/YHCertificateViewModel.swift

@@ -169,9 +169,11 @@ class YHCertificateViewModel: YHBaseViewModel {
             printLog("model 是 ==> \(json)")
             let dic = json.data
             
-            if code == NetWorkCode.success.rawValue {
+            if json.code == 200 {
                 guard let result = YHUploadCertificateInfo.deserialize(dict: dic as? Dictionary ) else {
-                    callBack(nil, YHErrorModel(errorCode:Int32(json.code), errorMsg:"解析失败".local))
+                    let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
+                    
+                    callBack(nil, err)
                     return
                 }
                 callBack(result, nil)
@@ -187,20 +189,14 @@ class YHCertificateViewModel: YHBaseViewModel {
     }
     
     // 上传/重命名/删除 证件
-    func updateCertificates(params:[String : Any], isSilient:Bool = false, callBack:@escaping ((Bool, YHErrorModel?)->())) {
+    func updateCertificates(params:[String : Any], callBack:@escaping ((Bool, YHErrorModel?)->())) {
         
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Certificate.certificateUploadApi
         
-        if !isSilient {
-            YHHUD.show(.progress(message: "数据加载中..."))
-        }
          
         let _ = YHNetRequest.postRequest(url: strUrl, params:params) { json, code in
             
-            if !isSilient {
-                YHHUD.hide()
-            }
-            if code == NetWorkCode.success.rawValue {
+            if json.code == 200 {
                 callBack(true, nil)
             } else {
                 let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
@@ -208,9 +204,6 @@ class YHCertificateViewModel: YHBaseViewModel {
             }
             
         } failBlock: { err in
-            if !isSilient {
-                YHHUD.hide()
-            }
             callBack(false, err)
         }
     }
@@ -234,7 +227,15 @@ class YHCertificateViewModel: YHBaseViewModel {
             "operation" : operation,
         ]
     
-        YHHUD.show(.progress(message: "数据加载中..."))
+        var msg = ""
+        if operation == "add" {
+            msg = "上传中"
+        } else if operation == "del" {
+            msg = "删除中"
+        } else if operation == "rename" {
+            msg = "重命名中"
+        }
+        YHHUD.show(.progress(message: msg))
         self.updateCertificates(params: params) {
             
             [weak self] success, error in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/VM/YHFilePreviewTool.swift

@@ -16,7 +16,7 @@ class YHFilePreviewTool: NSObject {
         self.targetVC = targetVC
     }
     
-    func openXLSXRemoteFile(urlString: String) {
+    func openXLSXRemoteFile(urlString: String, fileName: String?) {
         guard let url = URL(string: urlString) else { return }
         
         let configuration = URLSessionConfiguration.default
@@ -36,7 +36,7 @@ class YHFilePreviewTool: NSObject {
                 try? fileManager.moveItem(at: tempLocalUrl, to: destination)
                 
                 // 打开文件
-                self.openXLSXFile(at: destination)
+                self.openXLSXFile(at: destination, fileName: fileName)
                 
             } else {
                 print("Error downloading the file: \(error?.localizedDescription ?? "Unknown error")")
@@ -49,8 +49,13 @@ class YHFilePreviewTool: NSObject {
         task.resume()
     }
      
-    func openXLSXFile(at fileURL: URL) {
+    func openXLSXFile(at fileURL: URL, fileName: String?) {
+        
         let controller = UIDocumentInteractionController(url: fileURL)
+        // 设置标题显示
+        if let fileName = fileName, !fileName.isEmpty {
+            controller.name = fileName
+        }
         controller.delegate = self
         DispatchQueue.main.async {
             controller.presentPreview(animated: true)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/M/YHEducationRequestViewModel.swift

@@ -30,14 +30,20 @@ class YHEducationRequestViewModel {
            YHHUD.hide()
            guard let self = self else { return }
            printLog("model 是 ==> \(json)")
-           let dic = json.data as? [AnyHashable : Any]
-           guard let resultModel = YHEducationListInfo.deserialize(dict: dic) else {
-
-               callBackBlock(false,nil)
-               return
+           
+           if json.code == 200 {
+               let dic = json.data as? [AnyHashable : Any]
+               guard let resultModel = YHEducationListInfo.deserialize(dict: dic) else {
+                   let error = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
+                   callBackBlock(false,error)
+                   return
+               }
+               listInfo = resultModel
+               callBackBlock(true,nil)
+           } else {
+               let error = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg)
+               callBackBlock(false, error)
            }
-           listInfo = resultModel
-           callBackBlock(true,nil)
            
        } failBlock: { err in
            callBackBlock(false,err)
@@ -56,14 +62,22 @@ class YHEducationRequestViewModel {
             YHHUD.hide()
             guard let self = self else { return }
             printLog("model 是 ==> \(json)")
-            let dic = json.data as? [AnyHashable : Any]
-            guard let resultModel = YHEducationDetailInfo.deserialize(dict: dic) else {
+            
+            if json.code == 200 {
+                let dic = json.data as? [AnyHashable : Any]
+                guard let resultModel = YHEducationDetailInfo.deserialize(dict: dic) else {
+                    let error = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
+
+                    callBackBlock(false,error)
+                    return
+                }
+                educationDetailInfo = resultModel
+                callBackBlock(true,nil)
+            } else {
+                let error = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg)
+                callBackBlock(false,error)
 
-                callBackBlock(false,nil)
-                return
             }
-            educationDetailInfo = resultModel
-            callBackBlock(true,nil)
             
         } failBlock: { err in
             callBackBlock(false,err)
@@ -86,10 +100,12 @@ class YHEducationRequestViewModel {
             }
             guard let self = self else { return }
             printLog("model 是 ==> \(json)")
-            if json.code == NetWorkCode.success.rawValue {
+            if json.code == 200 {
                 callBackBlock(true,nil)
             } else {
-                callBackBlock(false, nil)
+                let error = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg)
+                               callBackBlock(false,error)
+                callBackBlock(false, error)
             }
             
         } failBlock: { err in
@@ -109,10 +125,12 @@ class YHEducationRequestViewModel {
             YHHUD.hide()
             guard let self = self else { return }
             printLog("model 是 ==> \(json)")
-            if json.code == NetWorkCode.success.rawValue {
+            if json.code == 200 {
                 callBackBlock(true,nil)
             } else {
-                callBackBlock(false, nil)
+                let error = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg)
+                               callBackBlock(false,error)
+                callBackBlock(false, error)
             }
             
         } failBlock: { err in
@@ -132,10 +150,12 @@ class YHEducationRequestViewModel {
             YHHUD.hide()
             guard let self = self else { return }
             printLog("model 是 ==> \(json)")
-            if json.code == NetWorkCode.success.rawValue {
+            if json.code == 200 {
                 callBackBlock(true,nil)
             } else {
-                callBackBlock(false, nil)
+                let error = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg)
+                               callBackBlock(false,error)
+                callBackBlock(false, error)
             }
             
         } failBlock: { err in
@@ -155,10 +175,12 @@ class YHEducationRequestViewModel {
             YHHUD.hide()
             guard let self = self else { return }
             printLog("model 是 ==> \(json)")
-            if json.code == NetWorkCode.success.rawValue {
+            if json.code == 200 {
                 callBackBlock(true,nil)
             } else {
-                callBackBlock(false, nil)
+                let error = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg)
+                               callBackBlock(false,error)
+                callBackBlock(false, error)
             }
             
         } failBlock: { err in
@@ -178,19 +200,28 @@ class YHEducationRequestViewModel {
             YHHUD.hide()
             guard let self = self else { return }
             printLog("model 是 ==> \(json)")
-            if let dic = json.data as? [AnyHashable : Any] {
-                guard let quaDict = dic["qua_data"] as? [AnyHashable : Any] ,  let resultModel = YHQualificationDetailInfo.deserialize(dict:quaDict  as? [AnyHashable : Any]) else {
+            
+            if json.code == 200 {
+                if let dic = json.data as? [AnyHashable : Any] {
+                    guard let quaDict = dic["qua_data"] as? [AnyHashable : Any] ,  let resultModel = YHQualificationDetailInfo.deserialize(dict:quaDict  as? [AnyHashable : Any]) else {
 
+                        let error = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
+                        callBackBlock(false,error)
+
+                        return
+                    }
+                    qualificationDetailInfo = resultModel
+                    callBackBlock(true,nil)
+                    return
+                    
+                } else {
                     callBackBlock(false,nil)
                     return
                 }
-                qualificationDetailInfo = resultModel
-                callBackBlock(true,nil)
-                return
-                
             } else {
-                callBackBlock(false,nil)
-                return
+                let error = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg)
+                              callBackBlock(false,error)
+
             }
 
         } failBlock: { err in
@@ -214,10 +245,12 @@ class YHEducationRequestViewModel {
             }
             guard let self = self else { return }
             printLog("model 是 ==> \(json)")
-            if json.code == NetWorkCode.success.rawValue {
+            if json.code == 200 {
                 callBackBlock(true,nil)
             } else {
-                callBackBlock(false, nil)
+                let error = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg)
+                callBackBlock(false,error)
+
             }
             
         } failBlock: { err in
@@ -239,14 +272,21 @@ class YHEducationRequestViewModel {
            printLog("model 是 ==> \(json)")
            let dic = json.data as? [AnyHashable : Any]
            
-           guard let dic = dic, let list = dic["list"] as? [[String:Any]], let results = [YHCollegeInfo].deserialize(array: list) as? [YHCollegeInfo] else {
+           if json.code == 200 {
+               guard let dic = dic, let list = dic["list"] as? [[String:Any]], let results = [YHCollegeInfo].deserialize(array: list) as? [YHCollegeInfo] else {
+
+                   let error = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
+                   callBackBlock(false,error)
+                   return
+               }
+               collegeList = results
+               callBackBlock(true,nil)
+           } else {
+               let error = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg)
+               callBackBlock(false,error)
 
-               callBackBlock(false,nil)
-               return
            }
            
-           collegeList = results
-           callBackBlock(true,nil)
            
        } failBlock: { err in
            callBackBlock(false,err)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/M/YHFamilyRequestViewModel.swift

@@ -22,9 +22,10 @@ class YHFamilyRequestViewModel {
             printLog("model 是 ==> \(json)")
             let dic = json.data
             
-            if code == NetWorkCode.success.rawValue {
+            if json.code == 200 {
                 guard let resultModel = YHFamilyMemberGroupInfo.deserialize(dict: dic as? Dictionary ) else {
-                    callBackBlock(nil, YHErrorModel(errorCode:Int32(json.code), errorMsg:"解析失败".local))
+                    let error = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
+                    callBackBlock(nil, error)
                     return
                 }
                 _ = resultModel.checkDefaultValue()
@@ -55,7 +56,7 @@ class YHFamilyRequestViewModel {
                YHHUD.hide()
            }
            printLog("model 是 ==> \(json)")
-           if json.code == NetWorkCode.success.rawValue {
+           if json.code == 200 {
                callBackBlock(true,nil)
            } else {
                callBackBlock(false, YHErrorModel(errorCode:json.code, errorMsg:json.msg))
@@ -75,7 +76,7 @@ class YHFamilyRequestViewModel {
         let _ = YHNetRequest.postRequest(url: strUrl, params:params) { json, code in
             YHHUD.hide()
             printLog("model 是 ==> \(json)")
-            if json.code == NetWorkCode.success.rawValue {
+            if json.code == 200 {
                 callBackBlock(true,nil)
             } else {
                 callBackBlock(false, YHErrorModel(errorCode:json.code, errorMsg:json.msg))
@@ -95,7 +96,7 @@ class YHFamilyRequestViewModel {
         let _ = YHNetRequest.postRequest(url: strUrl, params:["order_id":orderId]) { json, code in
             YHHUD.hide()
             printLog("model 是 ==> \(json)")
-            if json.code == NetWorkCode.success.rawValue {
+            if json.code == 200 {
                 callBackBlock(true,nil)
             } else {
                 callBackBlock(false, YHErrorModel(errorCode:json.code, errorMsg:json.msg))
@@ -119,9 +120,10 @@ class YHFamilyRequestViewModel {
             YHHUD.hide()
              
             let dic = json.data
-            if code == NetWorkCode.success.rawValue {
+            if json.code == 200 {
                 guard let resultModel = YHFamilyMember.deserialize(dict: dic as? Dictionary ) else {
-                    callBackBlock(nil, YHErrorModel(errorCode:Int32(json.code), errorMsg:"解析失败".local))
+                    let error = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
+                    callBackBlock(nil, error)
                     return
                 }
                 _ = resultModel.checkDefaultValue()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/C/YHMainApplicantInformationViewController.swift

@@ -161,6 +161,7 @@ extension YHMainApplicantInformationViewController: UITableViewDelegate, UITable
             return cell
         } else {
             let cell = tableView.dequeueReusableCell(withClass: YHMainInformationTableViewCell.self)
+            cell.country = self.viewModel.mainModel.address.country
             cell.dataSource = dataSource?[indexPath.row]
             cell.informationBlock = {[weak self] model in
                 guard let self = self else { return }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/V/YHItemView.swift

@@ -19,6 +19,7 @@ class YHItemView: UIView {
     var rightButton: UIButton!
     var showPromptLabel: UILabel!
     var longTimeButton:UIButton!
+    var country: String = ""
     var dataSource: YHItemModel? {
         didSet {
             updateAllViews()
@@ -412,7 +413,17 @@ class YHItemView: UIView {
         case .normal:
             printLog("不需要跳转")
         case .address:
-            let addressPicker = YHAddressViewController()
+            var provice = ""
+            if country.contains("台湾") {
+                provice = "台湾省"
+            }
+            if country.contains("香港") {
+                provice = "香港特别行政区"
+            }
+            if country.contains("澳门") {
+                provice = "澳门特别行政区"
+            }
+            let addressPicker = YHAddressViewController(selectProvince: provice)
             addressPicker.backLocationStringController = { (address,province,city,area) in
                 self.dataSource?.message = address
                 self.dataSource?.value = [province, city]

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/V/YHMainInformationTableViewCell.swift

@@ -14,6 +14,7 @@ class YHMainInformationTableViewCell: UITableViewCell {
     var centerView: UIView!
     var titleLabel: UILabel!
     var mainItemView: UIView!
+    var country: String = ""
     var dataSource: YHSectionItemModel?{
         didSet {
             updateAllViews()
@@ -122,6 +123,7 @@ class YHMainInformationTableViewCell: UITableViewCell {
             
             let itemView = YHItemView()
             itemView.dataSource = data
+            itemView.country = country
             itemView.block = {[weak self] model in
                 guard let self = self else { return }
                 if let block = self.informationBlock {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/C/YHWorkExperienceViewController.swift

@@ -459,6 +459,7 @@ extension YHWorkExperienceViewController: UITableViewDelegate, UITableViewDataSo
             }
         } else {
             let cell = tableView.dequeueReusableCell(withClass: YHWorkExperienceTableViewCell.self)
+            cell.country = self.viewModel.mainModel.location.country
             cell.dataSource = baseDataSource?[indexPath.row]
             cell.workExperienceBlock = {[weak self] model in
                 guard let self = self else { return }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/V/YHCountryHotView.swift

@@ -56,6 +56,7 @@ class YHCountryHotView: UIView {
             button.setTitle(dataSource[i], for: .normal)
             button.setTitleColor(UIColor.mainTextColor, for: .normal)
             button.setBackgroundColor(color: UIColor.contentBkgColor, forState: .normal)
+            button.setBackgroundColor(color: UIColor.tipsColor.withAlphaComponent(0.08), forState: .highlighted)
             button.titleLabel?.font = UIFont.PFSC_R(ofSize: 13)
             button.layer.cornerRadius = 16
             button.tag = 3000 + i

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/V/YHWorkExampleTypeView.swift

@@ -72,6 +72,7 @@ class YHWorkExampleTypeView: UIView {
             button.setTitle(dataSource[i], for: .normal)
             button.setTitleColor(UIColor.mainTextColor, for: .normal)
             button.setBackgroundColor(color: UIColor.contentBkgColor, forState: .normal)
+            button.setBackgroundColor(color: UIColor.tipsColor.withAlphaComponent(0.08), forState: .highlighted)
             button.titleLabel?.font = UIFont.PFSC_R(ofSize: 13)
             button.layer.cornerRadius = 16
             button.tag = 3000 + i

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/V/YHWorkExperienceItemView.swift

@@ -21,7 +21,7 @@ class YHWorkExperienceItemView: UIView {
     var rightButton: UIButton!
     var showPromptLabel: UILabel!
     var longTimeButton:UIButton!
-
+    var country: String = ""
     var dataSource: YHWorkExperienceModel? {
         didSet {
             updateAllViews()
@@ -381,7 +381,17 @@ class YHWorkExperienceItemView: UIView {
         case .normal:
             printLog("不需要跳转")
         case .address:
-            let addressPicker = YHAddressViewController()
+            var provice = ""
+            if country.contains("台湾") {
+                provice = "台湾省"
+            }
+            if country.contains("香港") {
+                provice = "香港特别行政区"
+            }
+            if country.contains("澳门") {
+                provice = "澳门特别行政区"
+            }
+            let addressPicker = YHAddressViewController(selectProvince: provice)
             addressPicker.backLocationStringController = { (address,province,city,area) in
                 self.dataSource?.message = address
                 self.dataSource?.value = [province, city]
@@ -399,6 +409,12 @@ class YHWorkExperienceItemView: UIView {
             if dataSource?.id == .id10 {
                 title = "请选择离职日期"
             }
+            if dataSource?.id == .id21 {
+                title = "请选择高管在职开始时间"
+            }
+            if dataSource?.id == .id22 {
+                title = "请选择高管在职结束时间"
+            }
             YHDatePickView.show(type: .yyyymm, title: title) { date in
                 self.dataSource?.message = date
                 self.updateAllViews()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/V/YHWorkExperienceTableViewCell.swift

@@ -16,6 +16,7 @@ class YHWorkExperienceTableViewCell: UITableViewCell {
     var centerView: UIView!
     var titleLabel: UILabel!
     var mainItemView: UIView!
+    var country: String = ""
     var dataSource: YHSectionWorkExperienceModel?{
         didSet {
             updateAllViews()
@@ -134,6 +135,7 @@ class YHWorkExperienceTableViewCell: UITableViewCell {
                 }
                 let itemView = YHWorkExperienceItemView()
                 itemView.dataSource = data
+                itemView.country = country
                 itemView.block = {[weak self] model in
                     guard let self = self else { return }
                     if let block = self.workExperienceBlock {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/ViewModel/YHCompanyViewModel.swift

@@ -14,14 +14,10 @@ class YHCompanyViewModel: YHBaseViewModel {
     }
     
     func requestCompany(_ key: String, callBackBlock:@escaping (_ success: [YHCompanyModelListModel]?, _ error:YHErrorModel?)->()) {
-//        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.company + "?company_name=\(key)&page_size=20&current_page=1"
-        
-        
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.company
         let params = ["company_name":key,"page_size":20,"current_page":1] as [String : Any]
         
         let _ = YHNetRequest.getRequest(url: strUrl,params: params) { [weak self] json, code in
-//        let _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in
             //1. json字符串 转 对象
             guard self != nil else { return }
             if json.code == 200 {