新增受养人逻辑添加

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/C/YHAdoptedChinaTravelViewController.swift

@@ -114,6 +114,7 @@ extension YHAdoptedChinaTravelViewController: UITableViewDelegate, UITableViewDa
         }
         if indexPath.row == 1 {
             let cell = tableView.dequeueReusableCell(withClass: YHAdopterResidentTableViewCell.self)
+            cell.firstImageName = "service_adopter_card_china_travel_front"
             cell.urls = urls
             cell.state = model.status
             cell.urlBlock = { [weak self] url, index in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/C/YHAdopterBirthViewController.swift

@@ -125,6 +125,7 @@ extension YHAdopterBirthViewController: UITableViewDelegate, UITableViewDataSour
         }
         if indexPath.row == 2 {
             let cell = tableView.dequeueReusableCell(withClass: YHAdopterResidentTableViewCell.self)
+            cell.firstImageName = "service_adopter_card_birth_front"
             cell.urls = urls
             cell.state = model.status
             cell.urlBlock = { [weak self] url, index in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/C/YHAdopterChinaLifeViewController.swift

@@ -114,6 +114,7 @@ extension YHAdopterChinaLifeViewController: UITableViewDelegate, UITableViewData
         }
         if indexPath.row == 1 {
             let cell = tableView.dequeueReusableCell(withClass: YHAdopterResidentTableViewCell.self)
+            cell.firstImageName = "service_adopter_card_china_life_front"
             cell.urls = urls
             cell.state = model.status
             cell.urlBlock = { [weak self] url, index in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/C/YHAdopterChinaViewController.swift

@@ -141,6 +141,8 @@ extension YHAdopterChinaViewController: UITableViewDelegate, UITableViewDataSour
             }
             if indexPath.row == 2 {
                 let cell = tableView.dequeueReusableCell(withClass: YHAdopterTravelCardTableViewCell.self)
+                cell.firstImageName = "service_adopter_card_id_front"
+                cell.lastImageName = "service_adopter_card_id_back"
                 cell.urls = urls
                 cell.state = model.status
                 cell.urlBlock = { [weak self] url, index in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/C/YHAdopterIdCardViewController.swift

@@ -115,6 +115,7 @@ extension YHAdopterIdCardViewController: UITableViewDelegate, UITableViewDataSou
         }
         if indexPath.row == 1 {
             let cell = tableView.dequeueReusableCell(withClass: YHAdopterResidentTableViewCell.self)
+            cell.firstImageName = "service_adopter_card_idcard_front"
             cell.urls = urls
             cell.state = model.status
             cell.urlBlock = { [weak self] url, index in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/C/YHAdopterIncomeDetailViewController.swift

@@ -258,7 +258,10 @@ extension YHAdopterIncomeDetailViewController: UITableViewDelegate, UITableViewD
                     maxCount = 9
                 }
                 let sheetView = YHCertificateUploadSheetView.sheetView()
+                sheetView.tips = "支持的文件格式为jpg/jpeg、png、pdf，最多可上传10张图片或文件"
                 sheetView.maxSelectImageCount = maxCount
+                sheetView.fileTypes = [ "public.image",
+                                        "com.adobe.pdf"]
                 sheetView.uploadFilesBlock = {
                     [weak self] fileUrl in
                     guard let self = self else { return }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/C/YHAdopterResidentViewController.swift

@@ -125,6 +125,7 @@ extension YHAdopterResidentViewController: UITableViewDelegate, UITableViewDataS
         }
         if indexPath.row == 2 {
             let cell = tableView.dequeueReusableCell(withClass: YHAdopterResidentTableViewCell.self)
+            cell.firstImageName = "service_adopter_card_resident_front"
             cell.urls = urls
             cell.state = model.status
             cell.urlBlock = { [weak self] url, index in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/C/YHAdopterTravelViewController.swift

@@ -131,6 +131,8 @@ extension YHAdopterTravelViewController: UITableViewDelegate, UITableViewDataSou
             }
             if indexPath.row == 1 {
                 let cell = tableView.dequeueReusableCell(withClass: YHAdopterTravelCardTableViewCell.self)
+                cell.firstImageName = "service_adopter_card_travel_front"
+                cell.lastImageName = "service_adopter_card_travel_back"
                 cell.urls = urls
                 cell.state = model.status
                 cell.urlBlock = { [weak self] url, index in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/V/YHAdopterMarryCardTableViewCell.swift

@@ -168,7 +168,7 @@ class YHAdopterMarryCardTableViewCell: UITableViewCell {
         frontImageButton = {
             let button = YHCardButton()
             button.setContent("card_upload", "点击上传")
-            button.setBackgroundImage(UIImage(named: "service_cn_card_front"), for: .normal)
+            button.setBackgroundImage(UIImage(named: "service_adopter_card_marry_front"), for: .normal)
             button.addTarget(self, action: #selector(frontImageClick), for: .touchUpInside)
             button.layer.cornerRadius = 4
             button.clipsToBounds = true
@@ -200,7 +200,7 @@ class YHAdopterMarryCardTableViewCell: UITableViewCell {
         backSurfaceImageButton = {
             let button = YHCardButton()
             button.setContent("card_upload", "点击上传")
-            button.setBackgroundImage(UIImage(named: "service_cn_card_back"), for: .normal)
+            button.setBackgroundImage(UIImage(named: "service_adopter_card_marry_second"), for: .normal)
             button.addTarget(self, action: #selector(backSurfaceImageClick), for: .touchUpInside)
             button.layer.cornerRadius = 4
             button.clipsToBounds = true
@@ -232,7 +232,7 @@ class YHAdopterMarryCardTableViewCell: UITableViewCell {
         thirdImageButton = {
             let button = YHCardButton()
             button.setContent("card_upload", "点击上传")
-            button.setBackgroundImage(UIImage(named: "service_cn_card_front"), for: .normal)
+            button.setBackgroundImage(UIImage(named: "service_adopter_card_marry_back"), for: .normal)
             button.addTarget(self, action: #selector(thirdImageClick), for: .touchUpInside)
             button.layer.cornerRadius = 4
             button.clipsToBounds = true
@@ -355,19 +355,19 @@ class YHAdopterMarryCardTableViewCell: UITableViewCell {
     
     @objc func frontDeleteClick() {
         frontDeleteButton.isHidden = true
-        frontImageButton.setBackgroundImage(UIImage(named: "service_hk_card_front"), for: .normal)
+        frontImageButton.setBackgroundImage(UIImage(named: "service_adopter_card_marry_front"), for: .normal)
         frontImageButton.setContent("card_upload", "点击上传")
     }
     
     @objc func backSurfaceDeleteClick() {
         backSurfaceDeleteButton.isHidden = true
-        backSurfaceImageButton.setBackgroundImage(UIImage(named: "service_hk_card_back"), for: .normal)
+        backSurfaceImageButton.setBackgroundImage(UIImage(named: "service_adopter_card_marry_second"), for: .normal)
         backSurfaceImageButton.setContent("card_upload", "点击上传")
     }
     
     @objc func thirdDeleteClick() {
         thirdDeleteButton.isHidden = true
-        thirdImageButton.setBackgroundImage(UIImage(named: "service_hk_card_back"), for: .normal)
+        thirdImageButton.setBackgroundImage(UIImage(named: "service_adopter_card_marry_back"), for: .normal)
         thirdImageButton.setContent("card_upload", "点击上传")
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/V/YHAdopterResidentTableViewCell.swift

@@ -17,6 +17,11 @@ class YHAdopterResidentTableViewCell: UITableViewCell {
     var activityIndicator: UIActivityIndicatorView!
     var viewModel: YHBaseViewModel = YHBaseViewModel()
     var firstUrl: String = ""
+    var firstImageName: String = "" {
+        didSet {
+            frontImageButton.setBackgroundImage(UIImage(named: firstImageName), for: .normal)
+        }
+    }
     var urls: [String]? {
         didSet {
             guard let firstUrl = urls?.first, firstUrl.count != 0 else { return }
@@ -99,7 +104,7 @@ class YHAdopterResidentTableViewCell: UITableViewCell {
         frontImageButton = {
             let button = YHCardButton()
             button.setContent("card_upload", "点击上传")
-            button.setBackgroundImage(UIImage(named: "service_cn_card_front"), for: .normal)
+            button.setBackgroundImage(UIImage(named: firstImageName), for: .normal)
             button.addTarget(self, action: #selector(frontImageClick), for: .touchUpInside)
             button.layer.cornerRadius = 4
             button.clipsToBounds = true
@@ -170,7 +175,7 @@ class YHAdopterResidentTableViewCell: UITableViewCell {
     
     @objc func frontDeleteClick() {
         frontDeleteButton.isHidden = true
-        frontImageButton.setBackgroundImage(UIImage(named: "service_hk_card_front"), for: .normal)
+        frontImageButton.setBackgroundImage(UIImage(named: firstImageName), for: .normal)
         frontImageButton.setContent("card_upload", "点击上传")
     }
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/V/YHAdopterTravelCardTableViewCell.swift

@@ -21,6 +21,16 @@ class YHAdopterTravelCardTableViewCell: UITableViewCell {
     var viewModel: YHBaseViewModel = YHBaseViewModel()
     var firstUrl: String = ""
     var lastUrl: String = ""
+    var firstImageName: String = "" {
+        didSet {
+            frontImageButton.setBackgroundImage(UIImage(named: firstImageName), for: .normal)
+        }
+    }
+    var lastImageName: String = "" {
+        didSet {
+            backSurfaceImageButton.setBackgroundImage(UIImage(named: firstImageName), for: .normal)
+        }
+    }
     var urls: [String]? {
         didSet {
             guard let firstUrl = urls?.first, firstUrl.count != 0 else { return }
@@ -135,7 +145,7 @@ class YHAdopterTravelCardTableViewCell: UITableViewCell {
         frontImageButton = {
             let button = YHCardButton()
             button.setContent("card_upload", "点击上传")
-            button.setBackgroundImage(UIImage(named: "service_cn_card_front"), for: .normal)
+            button.setBackgroundImage(UIImage(named: firstImageName), for: .normal)
             button.addTarget(self, action: #selector(frontImageClick), for: .touchUpInside)
             button.layer.cornerRadius = 4
             button.clipsToBounds = true
@@ -167,7 +177,7 @@ class YHAdopterTravelCardTableViewCell: UITableViewCell {
         backSurfaceImageButton = {
             let button = YHCardButton()
             button.setContent("card_upload", "点击上传")
-            button.setBackgroundImage(UIImage(named: "service_cn_card_back"), for: .normal)
+            button.setBackgroundImage(UIImage(named: lastImageName), for: .normal)
             button.addTarget(self, action: #selector(backSurfaceImageClick), for: .touchUpInside)
             button.layer.cornerRadius = 4
             button.clipsToBounds = true
@@ -264,13 +274,13 @@ class YHAdopterTravelCardTableViewCell: UITableViewCell {
     
     @objc func frontDeleteClick() {
         frontDeleteButton.isHidden = true
-        frontImageButton.setBackgroundImage(UIImage(named: "service_hk_card_front"), for: .normal)
+        frontImageButton.setBackgroundImage(UIImage(named: firstImageName), for: .normal)
         frontImageButton.setContent("card_upload", "点击上传")
     }
     
     @objc func backSurfaceDeleteClick() {
         backSurfaceDeleteButton.isHidden = true
-        backSurfaceImageButton.setBackgroundImage(UIImage(named: "service_hk_card_back"), for: .normal)
+        backSurfaceImageButton.setBackgroundImage(UIImage(named: lastImageName), for: .normal)
         backSurfaceImageButton.setContent("card_upload", "点击上传")
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/V/YHCardUploadView.swift

@@ -18,7 +18,7 @@ class YHCardUploadView: UIView {
     var frontDeleteButton: UIButton!
     var viewModel: YHBaseViewModel = YHBaseViewModel()
     var firstUrl: String = ""
-    var defaultImageName: String = "service_hk_card_front"
+    var defaultImageName: String = "service_adopter_card_other_front"
     var url: String? {
         didSet {
             guard let firstUrl = url, firstUrl.count != 0 else {
@@ -85,7 +85,7 @@ class YHCardUploadView: UIView {
         frontImageButton = {
             let button = YHCardButton()
             button.setContent("card_upload", "点击上传")
-            button.setBackgroundImage(UIImage(named: "service_cn_card_front"), for: .normal)
+            button.setBackgroundImage(UIImage(named: "service_adopter_card_other_front"), for: .normal)
             button.addTarget(self, action: #selector(frontImageClick), for: .touchUpInside)
             button.layer.cornerRadius = 4
             button.clipsToBounds = true

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/新增受养人/service_adopter_card_birth_front.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "service_adopter_card_birth_front@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "service_adopter_card_birth_front@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/新增受养人/service_adopter_card_china_life_front.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "service_adopter_card_china_life_front@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "service_adopter_card_china_life_front@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/新增受养人/service_adopter_card_china_travel_front.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "service_adopter_card_china_travel_front@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "service_adopter_card_china_travel_front@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/新增受养人/service_adopter_card_id_back.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "service_adopter_card_id_back@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "service_adopter_card_id_back@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/新增受养人/service_adopter_card_id_front.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "service_adopter_card_id_front@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "service_adopter_card_id_front@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/新增受养人/service_adopter_card_idcard_front.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "service_adopter_card_idcard_front@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "service_adopter_card_idcard_front@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/新增受养人/service_adopter_card_marry_back.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "service_adopter_card_marry_back@3x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "service_adopter_card_marry_back@3x 1.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/新增受养人/service_adopter_card_marry_front.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "service_adopter_card_marry_front@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "service_adopter_card_marry_front@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/新增受养人/service_adopter_card_marry_second.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "service_adopter_card_marry_second@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "service_adopter_card_marry_second@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/新增受养人/service_adopter_card_other_front.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "service_adopter_card_other_front@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "service_adopter_card_other_front@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/新增受养人/service_adopter_card_resident_front.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "service_adopter_card_resident_front@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "service_adopter_card_resident_front@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/新增受养人/service_adopter_card_travel_back.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "service_adopter_card_travel_back@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "service_adopter_card_travel_back@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/新增受养人/service_adopter_card_travel_front.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "service_adopter_card_travel_front@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "service_adopter_card_travel_front@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}