添加港澳通行证 的ocr反面接口

galaxy/galaxy/Classes/Base/C/YHBaseViewModel.swift

@@ -39,63 +39,86 @@ class YHBaseViewModel {
     //小白条信息
     var smallWhiteBarInfo : YHSmallWhiteBarInfo?
     
-    //港澳通行证 ocr 信息
-    var hkMacoCardOcrInfo : YHCardOcrModel?
-    
-    //中国身份证 ocr 信息
-    var chinaCardOcrInfo : YHCardOcrModel?
-    
-    
-    
-    
-    
-    
     // MARK: 接口
-    //3、orc识别 中国身份证
-    func getChinaCardInfoByOcr(_ url: String, isBack: Int, callBackBlock:@escaping (_ success: Bool, _ error:YHErrorModel?)->()) {
+    //3、orc识别 中国身份证 正/反面
+    func getChinaCardInfoByOcr(_ url: String, isBack: Int, callBackBlock:@escaping (_ success: Bool, _ model:YHCardOcrModel?)->()) {
         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
             //1. json字符串 转 对象
-            guard let self = self else { return }
+            guard let self = self else {
+                callBackBlock(false,nil)
+                return
+            }
             if json.code == 200 {
                 let dic = json.data
                 guard let result = YHCardOcrModel.deserialize(dict:dic as? [AnyHashable: Any]) else {
                     callBackBlock(false, nil)
                     return
                 }
-                callBackBlock(true, nil)
+                callBackBlock(true, result)
             } else {
                 let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
-                callBackBlock(false, error)
+                callBackBlock(false, nil)
             }
         } failBlock: { err in
-            callBackBlock(false,err)
+            callBackBlock(false,nil)
         }
     }
     
-    //2、orc识别 港澳通行证
-    func getHKCardInfoByOcr(_ url: String, isBack: Int, callBackBlock:@escaping (_ success: Bool, _ error:YHErrorModel?)->()) {
+    //2.2、orc识别 港澳通行证 背面
+    func getHKCardBackInfoByOcr(_ url: String, isBack: Int, callBackBlock:@escaping (_ success: Bool, _ model:YHCardOcrModel?)->()) {
+        let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OCR.hkmacowBackInfoApi
+        let params: [String : Any] = ["url": url,
+                                      "is_back": isBack]
+        let _ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, code in
+            //1. json字符串 转 对象
+            guard let self = self else {
+                callBackBlock(false, nil)
+                return
+            }
+            if json.code == 200 {
+                let dic = json.data
+                guard let result = YHCardOcrModel.deserialize(dict:dic as? [AnyHashable: Any]) else {
+                    callBackBlock(false, nil)
+                    return
+                }
+                
+                callBackBlock(true, result)
+            } else {
+                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
+                callBackBlock(false, nil)
+            }
+        } failBlock: { err in
+            callBackBlock(false,nil)
+        }
+    }
+    
+    //2、orc识别 港澳通行证 正面
+    func getHKCardInfoByOcr(_ url: String, isBack: Int, callBackBlock:@escaping (_ success: Bool, _ model:YHCardOcrModel?)->()) {
         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
             //1. json字符串 转 对象
-            guard let self = self else { return }
+            guard let self = self else {
+                callBackBlock(false, nil)
+                return
+            }
             if json.code == 200 {
                 let dic = json.data
                 guard let result = YHCardOcrModel.deserialize(dict:dic as? [AnyHashable: Any]) else {
                     callBackBlock(false, nil)
                     return
                 }
-                callBackBlock(true, nil)
+                callBackBlock(true, result)
             } else {
                 let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
-                callBackBlock(false, error)
+                callBackBlock(false, nil)
             }
         } failBlock: { err in
-            callBackBlock(false,err)
+            callBackBlock(false, nil)
         }
     }
     

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

@@ -221,10 +221,6 @@ class YHAllApiName {
         static let updateInformation = "infoflow/order-information/update_information"
         // 主申请人国家信息
         static let countryInformation = "infoflow/country"
-        // 主申请人中国
-        static let cnIdCard = "infoflow/order-information/get_id_card"
-        // 主申请人港澳通行证
-        static let hkIdCard = "infoflow/order-information/get_hk_macao_pass"
     }
     
     struct WorkExperience {
@@ -300,8 +296,12 @@ class YHAllApiName {
     struct OCR {
         //中国身份证识别
         static let cn = "ocr/id_card/recognize"
-        //港澳通行证识别
+        //ocr港澳通行证识别 正面信息
         static let hk = "ocr/permit/recognize"
+        
+        // ocr港澳通行证 背面信息
+        static let hkmacowBackInfoApi = "infoflow/order-information/get_hk_macao_pass"
+        
         //普通文本识别 - eg：图片中扣字
         static let normal = "ocr/advanced/recognize"
         //小白条识别