ocr 替换

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

@@ -156,7 +156,7 @@ class YHFamilyMemberViewModel : YHBaseViewModel{
     }
     
     func requestCnIDCardMessage(_ url: String, isBack: Int, callBackBlock:@escaping (_ success: Bool, _ error:YHErrorModel?)->()) {
-        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.OrderInformation.cnIdCard
+        let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OCR.cn
         let params: [String : Any] = ["url": url,
                                       "is_back": isBack]
         let _ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, code in
@@ -180,7 +180,7 @@ class YHFamilyMemberViewModel : YHBaseViewModel{
     }
     
     func requestHkIDCardMessage(_ url: String, isBack: Int, callBackBlock:@escaping (_ success: Bool, _ error:YHErrorModel?)->()) {
-        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.OrderInformation.hkIdCard
+        let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OCR.hk
         let params: [String : Any] = ["url": url,
                                       "is_back": isBack]
         let _ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, code in

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

@@ -501,7 +501,7 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
     }
     
     func requestCnIDCardMessage(_ url: String, isBack: Int, callBackBlock:@escaping (_ success: Bool, _ error:YHErrorModel?)->()) {
-        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.OrderInformation.cnIdCard
+        let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OCR.cn
         let params: [String : Any] = ["url": url,
                                       "is_back": isBack]
         let _ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, code in
@@ -525,7 +525,7 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
     }
     
     func requestHkIDCardMessage(_ url: String, isBack: Int, callBackBlock:@escaping (_ success: Bool, _ error:YHErrorModel?)->()) {
-        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.OrderInformation.hkIdCard
+        let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OCR.hk
         let params: [String : Any] = ["url": url,
                                       "is_back": isBack]
         let _ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, code in

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

@@ -387,8 +387,8 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
     
     func requestFileMessage(_ url: String, callBackBlock:@escaping (_ success: Bool, _ model: YHFileContent?,_ error:YHErrorModel?)->()) {
 //        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.ocrFileContent + "?file_url=\(url)"
-        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.ocrFileContent
-        let params: [String : Any] = ["file_url": url]
+        let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OCR.normal
+        let params: [String : Any] = ["url": url]
         let _ = YHNetRequest.getRequest(url: strUrl,params: params) { [weak self] json, code in
             //1. json字符串 转 对象
             guard let self = self else { return }

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

@@ -67,8 +67,8 @@ class YHWorkIntroductionViewModel: YHBaseViewModel {
     func requestFileMessage(_ url: String, callBackBlock:@escaping (_ success: Bool, _ model: YHFileContent?,_ error:YHErrorModel?)->()) {
 //        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.ocrFileContent + "?file_url=\(url)"
         
-        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.ocrFileContent
-        let param: [String: Any] = ["file_url": url]
+        let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OCR.normal
+        let param: [String: Any] = ["url": url]
         let _ = YHNetRequest.getRequest(url: strUrl,params:param) { [weak self] json, code in
             //1. json字符串 转 对象
             guard let self = self else { return }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceOrderProgressTableViewCell.swift

@@ -109,7 +109,7 @@ extension YHServiceOrderProgressTableViewCell {
                     messageLabel.attributed.text = a + aa + aaa
                 } else {
                     let a: ASAttributedString = .init("您的信息被", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor(hex: 0x94a3b8)))
-                    let aa: ASAttributedString = .init(NSAttributedString(string: "驳回"), .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.warnColor))
+                    let aa: ASAttributedString = .init(NSAttributedString(string: "驳回"), .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.failColor))
                     let aaa: ASAttributedString = .init("了哦～", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor(hex: 0x94a3b8)))
                     messageLabel.attributed.text = a + aa + aaa
                 }

galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift

@@ -195,6 +195,12 @@ class YHAllApiName {
         static let getID = "ossv2/sts/auth"
     }
     
+    struct OCR {
+        static let cn = "ocr/id_card/recognize"
+        static let hk = "ocr/permit/recognize"
+        static let normal = "ocr/advanced/recognize"
+    }
+    
     //我的签字
     struct Signature {
         // 签字列表