//

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

@@ -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: "") {
@@ -338,9 +337,9 @@ 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()

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

@@ -245,7 +245,7 @@ extension YHCertificateSearchViewController {
         }
     }
     
-    func uploadImage(_ img: UIImage, supplementInfo:YHSupplementInfo)  {
+    func uploadImage(_ img: UIImage, imageName:String, supplementInfo:YHSupplementInfo)  {
         
         // 先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,7 +262,7 @@ 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: "") {
@@ -339,9 +338,9 @@ extension YHCertificateSearchViewController {
             uploadFile(fileUrl, supplementInfo: supplementInfo)
         }
         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)
         }
         sheetView.show()
     }

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

@@ -129,9 +129,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 +217,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 { // 删除
@@ -502,7 +507,7 @@ extension YHCertificateUploadContentListVC {
 
     
     
-    func uploadImage(_ img: UIImage) {
+    func uploadImage(_ img: UIImage, imageName:String) {
         
         // 先OSS上传得到URL
         YHHUD.show(.progress(message: "上传中..."))
@@ -511,7 +516,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 +524,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: "") {

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

@@ -89,7 +89,7 @@ class YHCertificateUploadSheetView: UIView {
     // 上传文件
     var uploadFilesBlock:((URL)->())?
     // 上传图片
-    var uploadImageBlock:((UIImage)->())?
+    var uploadImageBlock:((UIImage, String)->())?
     // 点击模版
     var clickTemplateBlock:((YHMaterialPath?)->())?
     
@@ -448,7 +448,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)
         }
     }

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()