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

* 'youhua-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  优化证件上传逻辑

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Certificates(证书上传和证书信息)/YHCertificateUploadVC.swift

@@ -81,6 +81,8 @@ extension YHCertificateUploadVC: UITableViewDelegate, UITableViewDataSource {
         let cell = tableView.dequeueReusableCell(withClass: YHIdentityCardCell.self)
         cell.type = YHCardType(rawValue: indexPath.row) ?? .identity
         cell.viewModel = viewModel
+        cell.backSurfaceDeleteButton.isHidden = true
+        cell.frontDeleteButton.isHidden = true
         cell.informationBlock = {[weak self] type, image, isLeft in
             guard let self = self else { return }
             

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

@@ -28,8 +28,9 @@ class YHIdentityCardCell: UITableViewCell {
                     self.viewModel.getPublicImageUrl(viewModel.mainModel.certificates.cnIdentityCard.imgFront) {[weak self] success, error in
                         guard let self = self else { return }
                         guard let url = success else { return }
-                        self.frontImageButton.kf.setBackgroundImage(with: URL(string: url), for: .normal)
-                        self.frontDeleteButton.isHidden = false
+                        self.frontImageButton.kf.setBackgroundImage(with: URL(string: url), for: .normal, completionHandler:  { _ in
+                            self.frontDeleteButton.isHidden = false
+                        })
                         self.frontImageButton.setContent("", "")
                     }
                 }
@@ -37,8 +38,9 @@ class YHIdentityCardCell: UITableViewCell {
                     self.viewModel.getPublicImageUrl(viewModel.mainModel.certificates.cnIdentityCard.imgBack) {[weak self] success, error in
                         guard let self = self else { return }
                         guard let url = success else { return }
-                        self.backSurfaceImageButton.kf.setBackgroundImage(with: URL(string: url), for: .normal)
-                        self.backSurfaceDeleteButton.isHidden = false
+                        self.backSurfaceImageButton.kf.setBackgroundImage(with: URL(string: url), for: .normal, completionHandler:  { _ in
+                            self.backSurfaceDeleteButton.isHidden = false
+                        })
                         self.backSurfaceImageButton.setContent("", "")
                     }
                 }
@@ -47,8 +49,9 @@ class YHIdentityCardCell: UITableViewCell {
                     self.viewModel.getPublicImageUrl(viewModel.mainModel.certificates.hkMacaoPass.imgFront) {[weak self] success, error in
                         guard let self = self else { return }
                         guard let url = success else { return }
-                        self.frontImageButton.kf.setBackgroundImage(with: URL(string: url), for: .normal)
-                        self.frontDeleteButton.isHidden = false
+                        self.frontImageButton.kf.setBackgroundImage(with: URL(string: url), for: .normal, completionHandler:  { _ in
+                            self.frontDeleteButton.isHidden = false
+                        })
                         self.frontImageButton.setContent("", "")
                     }
                 }
@@ -56,8 +59,9 @@ class YHIdentityCardCell: UITableViewCell {
                     self.viewModel.getPublicImageUrl(viewModel.mainModel.certificates.hkMacaoPass.imgBack) {[weak self] success, error in
                         guard let self = self else { return }
                         guard let url = success else { return }
-                        self.backSurfaceImageButton.kf.setBackgroundImage(with: URL(string: url), for: .normal)
-                        self.backSurfaceDeleteButton.isHidden = false
+                        self.backSurfaceImageButton.kf.setBackgroundImage(with: URL(string: url), for: .normal, completionHandler:  { _ in
+                            self.backSurfaceDeleteButton.isHidden = false
+                        })
                         self.backSurfaceImageButton.setContent("", "")
                     }
                 }

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

@@ -164,6 +164,8 @@ extension YHMainApplicantInformationViewController: UITableViewDelegate, UITable
             let cell = tableView.dequeueReusableCell(withClass: YHMainInformationCardTableViewCell.self)
             cell.type = YHCardType(rawValue: indexPath.row) ?? .identity
             cell.viewModel = viewModel
+            cell.backSurfaceDeleteButton.isHidden = true
+            cell.frontDeleteButton.isHidden = true
             cell.informationBlock = {[weak self] type, image, isLeft in
                 guard let self = self else { return }
                 

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

@@ -35,8 +35,9 @@ class YHMainInformationCardTableViewCell: UITableViewCell {
                     self.viewModel.getPublicImageUrl(viewModel.mainModel.certificates.cn_identity_card.img_front) {[weak self] success, error in
                         guard let self = self else { return }
                         guard let url = success else { return }
-                        self.frontImageButton.kf.setBackgroundImage(with: URL(string: url), for: .normal)
-                        self.frontDeleteButton.isHidden = false
+                        self.frontImageButton.kf.setBackgroundImage(with: URL(string: url), for: .normal, completionHandler:  { _ in
+                            self.frontDeleteButton.isHidden = false
+                        })
                         self.frontImageButton.setContent("", "")
                     }
                 }
@@ -44,8 +45,9 @@ class YHMainInformationCardTableViewCell: UITableViewCell {
                     self.viewModel.getPublicImageUrl(viewModel.mainModel.certificates.cn_identity_card.img_back) {[weak self] success, error in
                         guard let self = self else { return }
                         guard let url = success else { return }
-                        self.backSurfaceImageButton.kf.setBackgroundImage(with: URL(string: url), for: .normal)
-                        self.backSurfaceDeleteButton.isHidden = false
+                        self.backSurfaceImageButton.kf.setBackgroundImage(with: URL(string: url), for: .normal, completionHandler:  { _ in
+                            self.backSurfaceDeleteButton.isHidden = false
+                        })
                         self.backSurfaceImageButton.setContent("", "")
                     }
                 }
@@ -54,8 +56,9 @@ class YHMainInformationCardTableViewCell: UITableViewCell {
                     self.viewModel.getPublicImageUrl(viewModel.mainModel.certificates.hk_macao_pass.img_front) {[weak self] success, error in
                         guard let self = self else { return }
                         guard let url = success else { return }
-                        self.frontImageButton.kf.setBackgroundImage(with: URL(string: url), for: .normal)
-                        self.frontDeleteButton.isHidden = false
+                        self.frontImageButton.kf.setBackgroundImage(with: URL(string: url), for: .normal, completionHandler:  { _ in
+                            self.frontDeleteButton.isHidden = false
+                        })
                         self.frontImageButton.setContent("", "")
                     }
                 }
@@ -63,8 +66,9 @@ class YHMainInformationCardTableViewCell: UITableViewCell {
                     self.viewModel.getPublicImageUrl(viewModel.mainModel.certificates.hk_macao_pass.img_back) {[weak self] success, error in
                         guard let self = self else { return }
                         guard let url = success else { return }
-                        self.backSurfaceImageButton.kf.setBackgroundImage(with: URL(string: url), for: .normal)
-                        self.backSurfaceDeleteButton.isHidden = false
+                        self.backSurfaceImageButton.kf.setBackgroundImage(with: URL(string: url), for: .normal, completionHandler:  { _ in
+                            self.backSurfaceDeleteButton.isHidden = false
+                        })
                         self.backSurfaceImageButton.setContent("", "")
                     }
                 }