1、完善 头像的展示

2、处理 其他信息 填写的bug

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

@@ -12,7 +12,7 @@ import Alamofire
 class YHBaseViewModel {
     // 上传方法
     func uploadImage(_ image: UIImage, callBackBlock:@escaping (_ success: String?, _ error:YHErrorModel?)->()) {
-        let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OOS.upload
+        let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OSS.uploadApi
         let boundary = UUID().uuidString
         let headers: HTTPHeaders = [
             "Content-type": "multipart/form-data; boundary=\(boundary)",
@@ -29,11 +29,11 @@ class YHBaseViewModel {
         } failBlock: { err in
             callBackBlock(nil, err)
         }
-
     }
     
+    //换取一张
     func getPublicImageUrl(_ url: String, callBackBlock:@escaping (_ success: String?, _ error:YHErrorModel?)->()) {
-        let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OOS.getPublic
+        let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OSS.getPublicApi
         let param: [String: Any] = ["fileUrl": url]
         let _ = YHNetRequest.getRequest(url: strUrl, params: param) { [weak self] json, code in
             //1. json字符串 转 对象
@@ -48,5 +48,23 @@ class YHBaseViewModel {
             callBackBlock(nil,err)
         }
     }
-
+    
+    
+    //换取多张图片
+    func getPublicImageUrls(_ url: [String], callBackBlock:@escaping (_ success: [String : Any]?, _ error:YHErrorModel?)->()) {
+        let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OSS.getPublicApi
+        let param: [String: Any] = ["fileUrl": url]
+        let _ = YHNetRequest.getRequest(url: strUrl, params: param) { [weak self] json, code in
+            //1. json字符串 转 对象
+            guard let _ = self else { return }
+            if json.code == 200 {
+                callBackBlock(json.data as? [String : Any], nil)//使用的同学完善
+            } else {
+                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
+                callBackBlock(nil, error)
+            }
+        } failBlock: { err in
+            callBackBlock(nil,err)
+        }
+    }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/V/YHOtherYesOrNoItemView.swift

@@ -136,21 +136,21 @@ private extension YHOtherYesOrNoItemView {
             make.left.right.equalToSuperview()
         }
         
-        answer1Btn.snp.makeConstraints { make in
+        answer2Btn.snp.makeConstraints { make in
             make.size.equalTo(CGSize(width: btnWidth, height: btnHeight))
             make.left.equalTo(titleLabel.snp.left)
             make.top.equalTo(titleLabel.snp.bottom).offset(12)
         }
         
-        answer2Btn.snp.makeConstraints { make in
+        answer1Btn.snp.makeConstraints { make in
             make.size.equalTo(CGSize(width: btnWidth, height: btnHeight))
-            make.left.equalTo(answer1Btn.snp.right).offset(12)
-            make.top.equalTo(answer1Btn.snp.top)
+            make.left.equalTo(answer2Btn.snp.right).offset(12)
+            make.top.equalTo(answer2Btn.snp.top)
         }
         
         addSubview(bottomLine)
         bottomLine.snp.makeConstraints { make in
-            make.top.equalTo(answer1Btn.snp.bottom).offset(12)
+            make.top.equalTo(answer2Btn.snp.bottom).offset(12)
             make.left.right.equalToSuperview()
             make.height.equalTo(0.5)
             make.bottom.equalToSuperview()
@@ -180,7 +180,7 @@ private extension YHOtherYesOrNoItemView {
             answer1Btn.isSelected = false
             updateAnswerButton(answer1Btn, false)
         }
-        self.block?(answer2Btn.isSelected == true ? 1 : 2)
+        self.block?(answer2Btn.isSelected == true ? 1 : 2)//是-1 否-2
         
         layoutMyUI()
     }
@@ -197,10 +197,11 @@ private extension YHOtherYesOrNoItemView {
 extension YHOtherYesOrNoItemView {
     func updateUI(title : String , answer : Int) {
         self.title = title
+        //是-1 否-2
         if answer == 2 {
-            didClickResponseBtn(btn: answer2Btn)
-        } else if answer == 1 {
             didClickResponseBtn(btn: answer1Btn)
+        } else if answer == 1 {
+            didClickResponseBtn(btn: answer2Btn)
         }
         
         layoutMyUI()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/C/YHPreviewMainViewController.swift

@@ -134,6 +134,8 @@ extension YHPreviewMainViewController {
                     self.nameLable.text = title
                     self.phoneLable.text = self.previewVM.mainApplicationInfoPreviewModel?.mobile ?? "-"
                     
+                    self.handleHeaderIcon()
+                    
                 } else {
                     
                 }
@@ -144,6 +146,19 @@ extension YHPreviewMainViewController {
         }
     }
     
+    private func handleHeaderIcon() {
+        
+        //缺少头像字段
+//        guard let model = previewVM.mainApplicationInfoPreviewModel,let icon = model. else {
+//            return
+//        }
+//        previewVM.getPublicImageUrl(imgString) {[weak self] success, error in
+//            guard let self = self else { return }
+//            guard success != nil else { return }
+//            self.resultView.kf.setImage(with: URL(string: success))
+//        }
+    }
+    
     private func initView()->Void {
         gk_navigationBar.isHidden = false
         gk_backStyle = .black

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/V/YHPreviewInfoCertificatePictureItemView.swift

@@ -9,6 +9,10 @@
 import UIKit
 
 class YHPreviewInfoCertificatePictureItemView: UIView {
+    lazy var requestVM : YHBaseViewModel =  {
+        let r = YHBaseViewModel()
+        return r
+    }()
     
     var dataModel : YHPersonInfoCellModel2? {
         didSet {
@@ -147,6 +151,35 @@ extension YHPreviewInfoCertificatePictureItemView {
         cellTitleLable.text = dataModel.cellTitle
         frontLable.text = dataModel.idType == 1 ? "身份证头像面" : "港澳通行证正面"
         backLable.text = dataModel.idType == 1 ? "身份证国徽面" : "港澳通行证反面"
+        
+        //获取头像
+        handleCardImage()
+    }
+    
+    
+    private func handleCardImage() {
+        guard let dataModel = dataModel else { return }
+        
+        let url = dataModel.frontUrl
+//        let url = "https://upload-cdn.galaxy-immi.com/crm/test/files/1709370416082.png?Expires=1709697934&OSSAccessKeyId=LTAI5tJPQC4La6LWbcNoz61u&Signature=eKv4J8STMXSHFyJvozmHPgJdmY4%3D&v=1709696134"
+        if url.isEmpty == false {
+            self.requestVM.getPublicImageUrl(url) {[weak self] success, error in
+                guard let self = self else { return }
+                guard success != nil else { return }
+                self.frontImagV.kf.setImage(with: URL(string: success))
+            }
+        }
+        
+        
+//        let url2 = "https://upload-cdn.galaxy-immi.com/crm/test/files/1709370416082.png?Expires=1709697934&OSSAccessKeyId=LTAI5tJPQC4La6LWbcNoz61u&Signature=eKv4J8STMXSHFyJvozmHPgJdmY4%3D&v=1709696134"
+        let url2 = dataModel.backUrl
+        if url2.isEmpty == false {
+            self.requestVM.getPublicImageUrl(url2) {[weak self] success, error in
+                guard let self = self else { return }
+                guard success != nil else { return }
+                self.backImagV.kf.setImage(with: URL(string: success))
+            }
+        }
     }
 }
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience(工作经验)/C/YHImageViewController.swift

@@ -12,7 +12,7 @@ class YHImageViewController: YHBaseViewController {
     var resultView: UIImageView!
     var resultButton: UIButton!
     var imgString: String!
-    var viewModel: YHWorkExperienceViewModel!
+    var viewModel: YHBaseViewModel!
 
     override func viewDidLoad() {
         super.viewDidLoad()

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

@@ -169,8 +169,9 @@ class YHAllApiName {
         static let previewWorkExpInfoApi = "infoflow/work/preview"
     }
     
-    struct OOS {
-        static let upload = "oss/upload/storage"
-        static let getPublic = "oss/storage/convertToPublicURL"
+    struct OSS {
+        static let uploadApi = "oss/upload/storage"
+        static let getPublicApi = "oss/storage/convertToPublicURL"
+        static let getPublicUrlsApi = "oss/storage/batchConvertToPublicURL"
     }
 }

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/个人信息表/person_info_id_back.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "截屏2023-03-21 16.03 1.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "截屏2023-03-21 16.03 1@2x.png",
+      "filename" : "Rectangle 2533@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "截屏2023-03-21 16.03 1@3x.png",
+      "filename" : "Rectangle 2533@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/个人信息表/person_info_id_front.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "截屏2023-03-21 16.11 1.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "截屏2023-03-21 16.11 1@2x.png",
+      "filename" : "Rectangle 2532@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "截屏2023-03-21 16.11 1@3x.png",
+      "filename" : "Rectangle 2532@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }