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

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -29,6 +29,7 @@
 		0435FA7F2BA178C100024EAE /* YHCommonAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0435FA7E2BA178C100024EAE /* YHCommonAlertView.swift */; };
 		0435FA812BA186D600024EAE /* YHMyFileMethodTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0435FA802BA186D600024EAE /* YHMyFileMethodTableViewCell.swift */; };
 		0435FA832BA2DEB100024EAE /* YHCardButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0435FA822BA2DEB100024EAE /* YHCardButton.swift */; };
+		044378A42BFC848C001F95AE /* loginBkg.mov in Resources */ = {isa = PBXBuildFile; fileRef = 044378A32BFC848C001F95AE /* loginBkg.mov */; };
 		044413FD2BC386DA00784A14 /* YHServiceViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044413FC2BC386DA00784A14 /* YHServiceViewController.swift */; };
 		044413FF2BC391F000784A14 /* YHServiceListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044413FE2BC391F000784A14 /* YHServiceListViewController.swift */; };
 		044414012BC3979800784A14 /* YHServerHKLifeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044414002BC3979800784A14 /* YHServerHKLifeViewController.swift */; };
@@ -420,7 +421,6 @@
 		A5DE0D3C2BB9016200976FE1 /* YHEmailInputAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5DE0D3B2BB9016200976FE1 /* YHEmailInputAlertView.swift */; };
 		A5DF3D462BF72BA1003D5F03 /* YHTestViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5DF3D452BF72BA0003D5F03 /* YHTestViewController.swift */; };
 		A5DF3D482BF9A1D0003D5F03 /* YHPhoneLiginWithVideoBkgViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5DF3D472BF9A1D0003D5F03 /* YHPhoneLiginWithVideoBkgViewController.swift */; };
-		A5DF3D4C2BF9A348003D5F03 /* loginBkg.mov in Resources */ = {isa = PBXBuildFile; fileRef = A5DF3D4B2BF9A348003D5F03 /* loginBkg.mov */; };
 		A5DF3D4E2BF9FDAC003D5F03 /* YHCodeSueecssWithVideoBkgViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5DF3D4D2BF9FDAC003D5F03 /* YHCodeSueecssWithVideoBkgViewController.swift */; };
 		A5E69D512BA304D400411932 /* DIN Alternate Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A5E69D502BA304D400411932 /* DIN Alternate Bold.ttf */; };
 		A5EF21312BA6DF94005027E6 /* YHMineSchemeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5EF21302BA6DF94005027E6 /* YHMineSchemeViewController.swift */; };
@@ -492,6 +492,7 @@
 		0435FA7E2BA178C100024EAE /* YHCommonAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCommonAlertView.swift; sourceTree = "<group>"; };
 		0435FA802BA186D600024EAE /* YHMyFileMethodTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyFileMethodTableViewCell.swift; sourceTree = "<group>"; };
 		0435FA822BA2DEB100024EAE /* YHCardButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCardButton.swift; sourceTree = "<group>"; };
+		044378A32BFC848C001F95AE /* loginBkg.mov */ = {isa = PBXFileReference; lastKnownFileType = video.quicktime; path = loginBkg.mov; sourceTree = "<group>"; };
 		044413FC2BC386DA00784A14 /* YHServiceViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServiceViewController.swift; sourceTree = "<group>"; };
 		044413FE2BC391F000784A14 /* YHServiceListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServiceListViewController.swift; sourceTree = "<group>"; };
 		044414002BC3979800784A14 /* YHServerHKLifeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServerHKLifeViewController.swift; sourceTree = "<group>"; };
@@ -893,7 +894,6 @@
 		A5DE0D3B2BB9016200976FE1 /* YHEmailInputAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHEmailInputAlertView.swift; sourceTree = "<group>"; };
 		A5DF3D452BF72BA0003D5F03 /* YHTestViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHTestViewController.swift; sourceTree = "<group>"; };
 		A5DF3D472BF9A1D0003D5F03 /* YHPhoneLiginWithVideoBkgViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPhoneLiginWithVideoBkgViewController.swift; sourceTree = "<group>"; };
-		A5DF3D4B2BF9A348003D5F03 /* loginBkg.mov */ = {isa = PBXFileReference; lastKnownFileType = video.quicktime; path = loginBkg.mov; sourceTree = "<group>"; };
 		A5DF3D4D2BF9FDAC003D5F03 /* YHCodeSueecssWithVideoBkgViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCodeSueecssWithVideoBkgViewController.swift; sourceTree = "<group>"; };
 		A5E69D502BA304D400411932 /* DIN Alternate Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "DIN Alternate Bold.ttf"; sourceTree = "<group>"; };
 		A5EF21302BA6DF94005027E6 /* YHMineSchemeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMineSchemeViewController.swift; sourceTree = "<group>"; };
@@ -2384,7 +2384,7 @@
 		A5DF3D492BF9A2E4003D5F03 /* videos */ = {
 			isa = PBXGroup;
 			children = (
-				A5DF3D4B2BF9A348003D5F03 /* loginBkg.mov */,
+				044378A32BFC848C001F95AE /* loginBkg.mov */,
 			);
 			path = videos;
 			sourceTree = "<group>";
@@ -2528,7 +2528,7 @@
 				04EA2E712BF74FA200AE80B0 /* shouye.json in Resources */,
 				A5E69D512BA304D400411932 /* DIN Alternate Bold.ttf in Resources */,
 				04EA2E702BF74FA200AE80B0 /* shipin.json in Resources */,
-				A5DF3D4C2BF9A348003D5F03 /* loginBkg.mov in Resources */,
+				044378A42BFC848C001F95AE /* loginBkg.mov in Resources */,
 				047619ED2BA9B9C900F45358 /* area.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

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

@@ -73,7 +73,7 @@ class YHFamilyMemberViewModel : YHBaseViewModel{
         if model.birth.count != 0 {
             if mainModel.relationType != .child {
                 // 孩子生日设置大于18岁后必须设置为不能随行 导致证件上传和证件信息页面隐藏 会产生异常
-                mainModel.birthday = model.birth.toTimeString()
+                mainModel.birthday = model.birth
             }
         }
         if model.gender.count != 0 {
@@ -84,10 +84,10 @@ class YHFamilyMemberViewModel : YHBaseViewModel{
             }
         }
         if model.term_begins.count != 0 {
-            mainModel.certificates.cnIdentityCard.issueDateStartAt = model.term_begins.toTimeString()
+            mainModel.certificates.cnIdentityCard.issueDateStartAt = model.term_begins
         }
         if model.end_of_term.count != 0 {
-            mainModel.certificates.cnIdentityCard.issueDateEndAt = model.end_of_term.toTimeString()
+            mainModel.certificates.cnIdentityCard.issueDateEndAt = model.end_of_term
         }
         if model.issuing_authority.count != 0 {
             mainModel.certificates.cnIdentityCard.issueAt = model.issuing_authority
@@ -108,7 +108,7 @@ class YHFamilyMemberViewModel : YHBaseViewModel{
         if model.birth.count != 0 {
             if mainModel.relationType != .child {
                 // 孩子生日设置大于18岁后必须设置为不能随行 导致证件上传和证件信息页面隐藏 会产生异常
-                mainModel.birthday = model.birth.toTimeString()
+                mainModel.birthday = model.birth
             }
         }
         if model.gender.count != 0 {
@@ -119,10 +119,10 @@ class YHFamilyMemberViewModel : YHBaseViewModel{
             }
         }
         if model.term_begins.count != 0 {
-            mainModel.certificates.hkMacaoPass.issueDateStartAt = model.term_begins.toTimeString()
+            mainModel.certificates.hkMacaoPass.issueDateStartAt = model.term_begins
         }
         if model.end_of_term.count != 0 {
-            mainModel.certificates.hkMacaoPass.issueDateEndAt = model.end_of_term.toTimeString()
+            mainModel.certificates.hkMacaoPass.issueDateEndAt = model.end_of_term
         }
         if model.issuing_authority.count != 0 {
             mainModel.certificates.hkMacaoPass.issueAt = model.issuing_authority
@@ -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

@@ -347,7 +347,7 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
             mainModel.username = model.name
         }
         if model.birth.count != 0 {
-            mainModel.birthday = model.birth.toTimeString()
+            mainModel.birthday = model.birth
         }
         if model.gender.count != 0 {
             if model.gender == "女" {
@@ -357,10 +357,10 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
             }
         }
         if model.term_begins.count != 0 {
-            mainModel.certificates.hk_macao_pass.issue_date_start_at = model.term_begins.toTimeString()
+            mainModel.certificates.hk_macao_pass.issue_date_start_at = model.term_begins
         }
         if model.end_of_term.count != 0 {
-            mainModel.certificates.hk_macao_pass.issue_date_end_at = model.end_of_term.toTimeString()
+            mainModel.certificates.hk_macao_pass.issue_date_end_at = model.end_of_term
         }
         if model.issuing_authority.count != 0 {
             mainModel.certificates.hk_macao_pass.issue_at = model.issuing_authority
@@ -375,7 +375,7 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
             mainModel.username = model.name
         }
         if model.birth.count != 0 {
-            mainModel.birthday = model.birth.toTimeString()
+            mainModel.birthday = model.birth
         }
         if model.gender.count != 0 {
             if model.gender == "女" {
@@ -385,10 +385,10 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
             }
         }
         if model.term_begins.count != 0 {
-            mainModel.certificates.cn_identity_card.issue_date_start_at = model.term_begins.toTimeString()
+            mainModel.certificates.cn_identity_card.issue_date_start_at = model.term_begins
         }
         if model.end_of_term.count != 0 {
-            mainModel.certificates.cn_identity_card.issue_date_end_at = model.end_of_term.toTimeString()
+            mainModel.certificates.cn_identity_card.issue_date_end_at = model.end_of_term
         }
         if model.issuing_authority.count != 0 {
             mainModel.certificates.cn_identity_card.issue_at = model.issuing_authority
@@ -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

@@ -80,7 +80,7 @@ extension YHServiceOrderProgressTableViewCell {
             }
             if model.type == 3 {
                 titleLabel.text = "我的评分"
-                messageLabel.text = "您的评分报告还没生成哦~"
+                messageLabel.text = "如果显示后端问题"
             }
             if model.type == 4 {
                 titleLabel.text = "我的方案"
@@ -124,7 +124,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
                 }
@@ -210,10 +210,7 @@ extension YHServiceOrderProgressTableViewCell {
             }
             if model.type == 2 {
                 titleLabel.text = "我的信息"
-                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 aaa: ASAttributedString = .init("了哦~", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor(hex: 0x94a3b8)))
-                messageLabel.attributed.text = a + aa + aaa
+                messageLabel.attributed.text = "如果显示后端问题"
             }
             if model.type == 3 {
                 titleLabel.text = "我的评分"

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 {
         // 签字列表