Skip to content

G
galaxy-iOS
Commit 3d5063a9 authored by pete谢兆麟's avatar pete谢兆麟
Browse files
Options

新增受养人 细节调整 大屏幕适配等

parent c98bafc6
Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 46 deletions
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/C/YHAddAdoptersViewController.swift
View file @ 3d5063a9
......@@ -200,6 +200,11 @@ extension YHAddAdoptersViewController: UITableViewDelegate, UITableViewDataSourc
guard let self = self else { return }
let vc = YHAdopterNewPeopleViewController()
vc.id = model.id
var spouse = "子女"
if model.is_spouse == 1 {
spouse = "配偶"
}
vc.titleText = "新增" + spouse
self.navigationController?.pushViewController(vc)
}
return cell
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/C/YHAdoptedChinaTravelViewController.swift
View file @ 3d5063a9
......@@ -115,6 +115,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.firstLabelName = "中国旅行证"
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
View file @ 3d5063a9
......@@ -126,6 +126,7 @@ extension YHAdopterBirthViewController: UITableViewDelegate, UITableViewDataSour
if indexPath.row == 2 {
let cell = tableView.dequeueReusableCell(withClass: YHAdopterResidentTableViewCell.self)
cell.firstImageName = "service_adopter_card_birth_front"
cell.firstLabelName = "出生医学证明页"
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
View file @ 3d5063a9
......@@ -115,6 +115,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.firstLabelName = "中国居留许可签证"
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
View file @ 3d5063a9
......@@ -143,6 +143,8 @@ extension YHAdopterChinaViewController: UITableViewDelegate, UITableViewDataSour
let cell = tableView.dequeueReusableCell(withClass: YHAdopterTravelCardTableViewCell.self)
cell.firstImageName = "service_adopter_card_id_front"
cell.lastImageName = "service_adopter_card_id_back"
cell.firstLabelName = "身份证人像面"
cell.lastLabelName = "身份证国徽面"
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
View file @ 3d5063a9
......@@ -116,6 +116,7 @@ extension YHAdopterIdCardViewController: UITableViewDelegate, UITableViewDataSou
if indexPath.row == 1 {
let cell = tableView.dequeueReusableCell(withClass: YHAdopterResidentTableViewCell.self)
cell.firstImageName = "service_adopter_card_idcard_front"
cell.firstLabelName = "证件照"
cell.urls = urls
cell.state = model.status
cell.urlBlock = { [weak self] url, index in
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/C/YHAdopterNewPeopleViewController.swift
View file @ 3d5063a9
......@@ -72,7 +72,11 @@ class YHAdopterNewPeopleViewController: YHBaseViewController {
stepView = {
let step = YHStepView()
step.dataSource = ["完善配偶信息", "上传配偶资料"]
if titleText == "新增子女" {
step.dataSource = ["完善子女信息", "上传子女资料"]
} else {
step.dataSource = ["完善配偶信息", "上传配偶资料"]
}
return step
}()
view.addSubview(stepView)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/C/YHAdopterResidentViewController.swift
View file @ 3d5063a9
......@@ -126,6 +126,7 @@ extension YHAdopterResidentViewController: UITableViewDelegate, UITableViewDataS
if indexPath.row == 2 {
let cell = tableView.dequeueReusableCell(withClass: YHAdopterResidentTableViewCell.self)
cell.firstImageName = "service_adopter_card_resident_front"
cell.firstLabelName = "户口个人页"
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
View file @ 3d5063a9
......@@ -133,6 +133,8 @@ extension YHAdopterTravelViewController: UITableViewDelegate, UITableViewDataSou
let cell = tableView.dequeueReusableCell(withClass: YHAdopterTravelCardTableViewCell.self)
cell.firstImageName = "service_adopter_card_travel_front"
cell.lastImageName = "service_adopter_card_travel_back"
cell.firstLabelName = "证件页1"
cell.lastLabelName = "证件页2"
cell.urls = urls
cell.state = model.status
cell.urlBlock = { [weak self] url, index in
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/V/YHAdopterCardExampleView.swift
View file @ 3d5063a9
......@@ -24,7 +24,7 @@ class YHAdopterCardExampleView: UIView {
data = ["service_adopter_example_china"]
centerView.snp.remakeConstraints { make in
make.left.right.bottom.equalToSuperview()
make.height.equalTo(691)
make.height.equalTo(CGFloat(691).scaleSizeFrom375px(size: 691))
}
}
if type == .resident {
......@@ -32,7 +32,7 @@ class YHAdopterCardExampleView: UIView {
data = ["service_adopter_example_resident"]
centerView.snp.remakeConstraints { make in
make.left.right.bottom.equalToSuperview()
make.height.equalTo(667)
make.height.equalTo(CGFloat(667).scaleSizeFrom375px(size: 667))
}
}
if type == .birth {
......@@ -40,15 +40,15 @@ class YHAdopterCardExampleView: UIView {
data = ["service_adopter_example_birth"]
centerView.snp.remakeConstraints { make in
make.left.right.bottom.equalToSuperview()
make.height.equalTo(453)
make.height.equalTo(CGFloat(453).scaleSizeFrom375px(size: 453))
}
}
if type == .marry {
titleLabel.text = "出生医学证明示例 (仅供参考)"
titleLabel.text = "结婚证示例模版"
data = ["service_adopter_example_marry"]
centerView.snp.remakeConstraints { make in
make.left.right.bottom.equalToSuperview()
make.height.equalTo(691)
make.height.equalTo(CGFloat(691).scaleSizeFrom375px(size: 691))
}
}
if type == .other {
......@@ -57,7 +57,7 @@ class YHAdopterCardExampleView: UIView {
data = ["service_adopter_example_other1", "service_adopter_example_other2","service_adopter_example_other3","service_adopter_example_other4"]
centerView.snp.remakeConstraints { make in
make.left.right.bottom.equalToSuperview()
make.height.equalTo(701)
make.height.equalTo(CGFloat(701).scaleSizeFrom375px(size: 801))
}
}
......@@ -66,7 +66,7 @@ class YHAdopterCardExampleView: UIView {
data = ["service_adopter_example_travel"]
centerView.snp.remakeConstraints { make in
make.left.right.bottom.equalToSuperview()
make.height.equalTo(689)
make.height.equalTo(CGFloat(689).scaleSizeFrom375px(size: 689))
}
}
......@@ -75,7 +75,7 @@ class YHAdopterCardExampleView: UIView {
data = ["service_adopter_example_chinalife"]
centerView.snp.remakeConstraints { make in
make.left.right.bottom.equalToSuperview()
make.height.equalTo(422)
make.height.equalTo(CGFloat(422).scaleSizeFrom375px(size: 422))
}
}
......@@ -84,7 +84,7 @@ class YHAdopterCardExampleView: UIView {
data = ["service_adopter_example_chinatravel"]
centerView.snp.remakeConstraints { make in
make.left.right.bottom.equalToSuperview()
make.height.equalTo(659)
make.height.equalTo(CGFloat(659).scaleSizeFrom375px(size: 659))
}
}
}
......@@ -245,38 +245,38 @@ extension YHAdopterCardExampleView: UITableViewDelegate, UITableViewDataSource {
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
guard let type = type else { return 0 }
if type == .china {
return 507 + 20
return CGFloat(507).scaleSizeFrom375px(size: 507) + 20
}
if type == .resident {
return 482 + 20
return CGFloat(482).scaleSizeFrom375px(size: 482) + 20
}
if type == .birth {
return 269 + 20
return CGFloat(269).scaleSizeFrom375px(size: 269) + 20
}
if type == .marry {
return 968 + 20
return CGFloat(968).scaleSizeFrom375px(size: 968) + 20
}
if type == .travel {
return 508 + 20
return CGFloat(508).scaleSizeFrom375px(size: 508) + 20
}
if type == .chinaLife {
return 238 + 20
return CGFloat(238).scaleSizeFrom375px(size: 238) + 20
}
if type == .chinaTravel {
return 476 + 20
return CGFloat(476).scaleSizeFrom375px(size: 476) + 20
}
if type == .other {
if indexPath.row == 0 {
return 204 + 20
return CGFloat(204).scaleSizeFrom375px(size: 204) + 20
}
if indexPath.row == 1 {
return 147 + 20
return CGFloat(147).scaleSizeFrom375px(size: 147) + 20
}
if indexPath.row == 2 {
return 91 + 20
return CGFloat(91).scaleSizeFrom375px(size: 91) + 20
}
if indexPath.row == 3 {
return 91 + 20
return CGFloat(91).scaleSizeFrom375px(size: 91) + 20
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/V/YHAdopterCardOtherGuideView.swift
View file @ 3d5063a9
......@@ -263,19 +263,19 @@ extension YHAdopterCardOtherGuideView: UITableViewDelegate, UITableViewDataSourc
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
if indexPath.row == 1 {
return 204 + 20
return CGFloat(204).scaleSizeFrom375px(size: 204) + 20
}
if indexPath.row == 2 {
return 147 + 20
return CGFloat(147).scaleSizeFrom375px(size: 147) + 20
}
if indexPath.row == 3 {
return 91 + 20
return CGFloat(91).scaleSizeFrom375px(size: 91) + 20
}
if indexPath.row == 4 {
return 91 + 20
return CGFloat(91).scaleSizeFrom375px(size: 91) + 20
}
return 68 + 20
return CGFloat(68).scaleSizeFrom375px(size: 68) + 20
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/V/YHAdopterCardTableViewCell.swift
View file @ 3d5063a9
......@@ -192,7 +192,7 @@ class YHAdopterCardTableViewCell: UITableViewCell {
moreButton.setImage(UIImage(named: "service_adopter_income_fail"), for: .normal)
}
if data.status == 3 {
moreButton.setTitle("已完成", for: .normal)
moreButton.setTitle("已通过", for: .normal)
moreButton.setTitleColor(UIColor(hex: 0x3cc694), for: .normal)
moreButton.setImage(UIImage(named: "service_adopter_income_success"), for: .normal)
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/V/YHAdopterIncomeTitleTableViewCell.swift
View file @ 3d5063a9
......@@ -183,14 +183,14 @@ class YHAdopterIncomeTitleTableViewCell: UITableViewCell {
failLabel.isHidden = true
subTitleLabel.text = "审核中"
}
if data.status == 2 {
if data.status == 3 {
subTitleLabel.textColor = UIColor(hex: 0x3cc694)
subTitleLabel.backgroundColor = UIColor(hex: 0xf0fbf7)
failImageView.isHidden = true
failLabel.isHidden = true
subTitleLabel.text = "已完成"
}
if data.status == 3 {
if data.status == 2 {
subTitleLabel.textColor = UIColor(hex: 0xf81d22)
subTitleLabel.backgroundColor = UIColor(hex: 0xfff2f2)
failImageView.isHidden = false
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/V/YHAdopterMarryCardTableViewCell.swift
View file @ 3d5063a9
......@@ -34,7 +34,7 @@ class YHAdopterMarryCardTableViewCell: UITableViewCell {
guard let url = success else { return }
self.frontImageButton.kf.setBackgroundImage(with: URL(string: url), for: .normal, completionHandler: { _ in
self.frontDeleteButton.isHidden = false
if self.state == 1 || self.state == 2 {
if self.state == 1 || self.state == 3 {
self.frontDeleteButton.isHidden = true
}
})
......@@ -47,7 +47,7 @@ class YHAdopterMarryCardTableViewCell: UITableViewCell {
guard let url = success else { return }
self.frontImageButton.kf.setBackgroundImage(with: URL(string: url), for: .normal, completionHandler: { _ in
self.thirdDeleteButton.isHidden = false
if self.state == 1 || self.state == 2 {
if self.state == 1 || self.state == 3 {
self.thirdDeleteButton.isHidden = true
}
})
......@@ -60,7 +60,7 @@ class YHAdopterMarryCardTableViewCell: UITableViewCell {
guard let url = success else { return }
self.backSurfaceImageButton.kf.setBackgroundImage(with: URL(string: url), for: .normal, completionHandler: { _ in
self.backSurfaceDeleteButton.isHidden = false
if self.state == 1 || self.state == 2 {
if self.state == 1 || self.state == 3 {
self.backSurfaceDeleteButton.isHidden = true
}
})
......@@ -72,7 +72,7 @@ class YHAdopterMarryCardTableViewCell: UITableViewCell {
var state: Int? {
didSet {
if state == 1 || state == 2 {
if state == 1 || state == 3 {
frontDeleteButton.isHidden = true
backSurfaceDeleteButton.isHidden = true
thirdDeleteButton.isHidden = true
......@@ -179,7 +179,7 @@ class YHAdopterMarryCardTableViewCell: UITableViewCell {
make.left.equalTo(20)
make.top.equalTo(60)
make.height.equalTo(99)
make.width.equalTo(160)
make.width.equalTo(CGFloat(160).fix)
}
frontDeleteButton = {
......@@ -211,7 +211,7 @@ class YHAdopterMarryCardTableViewCell: UITableViewCell {
make.right.equalTo(-20)
make.top.equalTo(60)
make.height.equalTo(99)
make.width.equalTo(160)
make.width.equalTo(CGFloat(160).fix)
}
backSurfaceDeleteButton = {
......@@ -243,7 +243,7 @@ class YHAdopterMarryCardTableViewCell: UITableViewCell {
make.left.equalTo(20)
make.top.equalTo(219)
make.height.equalTo(99)
make.width.equalTo(160)
make.width.equalTo(CGFloat(160).fix)
}
thirdDeleteButton = {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/V/YHAdopterResidentTableViewCell.swift
View file @ 3d5063a9
......@@ -22,6 +22,11 @@ class YHAdopterResidentTableViewCell: UITableViewCell {
frontImageButton.setBackgroundImage(UIImage(named: firstImageName), for: .normal)
}
}
var firstLabelName: String = "" {
didSet {
frontLabel.text = firstLabelName
}
}
var urls: [String]? {
didSet {
guard let firstUrl = urls?.first, firstUrl.count != 0 else { return }
......@@ -31,7 +36,7 @@ class YHAdopterResidentTableViewCell: UITableViewCell {
guard let url = success else { return }
self.frontImageButton.kf.setBackgroundImage(with: URL(string: url), for: .normal, completionHandler: { _ in
self.frontDeleteButton.isHidden = false
if self.state == 1 || self.state == 2 {
if self.state == 1 || self.state == 3 {
self.frontDeleteButton.isHidden = true
}
})
......@@ -42,7 +47,7 @@ class YHAdopterResidentTableViewCell: UITableViewCell {
var state: Int? {
didSet {
if state == 1 || state == 2 {
if state == 1 || state == 3 {
frontDeleteButton.isHidden = true
}
}
......@@ -115,7 +120,7 @@ class YHAdopterResidentTableViewCell: UITableViewCell {
make.left.equalTo(20)
make.top.equalTo(60)
make.height.equalTo(99)
make.width.equalTo(160)
make.width.equalTo(CGFloat(160).fix)
}
frontDeleteButton = {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/V/YHAdopterTravelCardTableViewCell.swift
View file @ 3d5063a9
......@@ -28,7 +28,17 @@ class YHAdopterTravelCardTableViewCell: UITableViewCell {
}
var lastImageName: String = "" {
didSet {
backSurfaceImageButton.setBackgroundImage(UIImage(named: firstImageName), for: .normal)
backSurfaceImageButton.setBackgroundImage(UIImage(named: lastImageName), for: .normal)
}
}
var firstLabelName: String = "" {
didSet {
frontLabel.text = firstLabelName
}
}
var lastLabelName: String = "" {
didSet {
backSurfaceLabel.text = firstLabelName
}
}
var urls: [String]? {
......@@ -40,7 +50,7 @@ class YHAdopterTravelCardTableViewCell: UITableViewCell {
guard let url = success else { return }
self.frontImageButton.kf.setBackgroundImage(with: URL(string: url), for: .normal, completionHandler: { _ in
self.frontDeleteButton.isHidden = false
if self.state == 1 || self.state == 2 {
if self.state == 1 || self.state == 3 {
self.frontDeleteButton.isHidden = true
}
})
......@@ -53,7 +63,7 @@ class YHAdopterTravelCardTableViewCell: UITableViewCell {
guard let url = success else { return }
self.backSurfaceImageButton.kf.setBackgroundImage(with: URL(string: url), for: .normal, completionHandler: { _ in
self.backSurfaceDeleteButton.isHidden = false
if self.state == 1 || self.state == 2 {
if self.state == 1 || self.state == 3 {
self.backSurfaceDeleteButton.isHidden = true
}
})
......@@ -65,7 +75,7 @@ class YHAdopterTravelCardTableViewCell: UITableViewCell {
var state: Int? {
didSet {
if state == 1 || state == 2 {
if state == 1 || state == 3 {
frontDeleteButton.isHidden = true
backSurfaceDeleteButton.isHidden = true
}
......@@ -156,7 +166,7 @@ class YHAdopterTravelCardTableViewCell: UITableViewCell {
make.left.equalTo(20)
make.top.equalTo(60)
make.height.equalTo(99)
make.width.equalTo(160)
make.width.equalTo(CGFloat(160).fix)
}
frontDeleteButton = {
......@@ -188,7 +198,7 @@ class YHAdopterTravelCardTableViewCell: UITableViewCell {
make.right.equalTo(-20)
make.top.equalTo(60)
make.height.equalTo(99)
make.width.equalTo(160)
make.width.equalTo(CGFloat(160).fix)
}
backSurfaceDeleteButton = {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/V/YHCardUploadView.swift
View file @ 3d5063a9
......@@ -19,6 +19,7 @@ class YHCardUploadView: UIView {
var viewModel: YHBaseViewModel = YHBaseViewModel()
var firstUrl: String = ""
var defaultImageName: String = "service_adopter_card_other_front"
var defaultName: String = "相关证件1"
var url: String? {
didSet {
guard let firstUrl = url, firstUrl.count != 0 else {
......@@ -71,7 +72,7 @@ class YHCardUploadView: UIView {
let label = UILabel()
label.font = UIFont.PFSC_R(ofSize: 12)
label.textColor = UIColor.subTextColor
label.text = "证件页1"
label.text = defaultName
label.textAlignment = .center
return label
}()
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceOrderProgressTableViewCell.swift
View file @ 3d5063a9
......@@ -142,6 +142,13 @@ extension YHServiceOrderProgressTableViewCell {
if model.type == 25 {
titleLabel.text = "赴港行程指引"
messageLabel.text = "请根据指引清单提前规划赴港行程"
progressImageView.isHidden = true
progressLabel.isHidden = true
messageLabel.snp.remakeConstraints { make in
make.top.equalTo(49)
make.left.equalTo(21)
make.right.equalTo(-21)
}
}
if model.type == 26 {
......@@ -330,6 +337,13 @@ extension YHServiceOrderProgressTableViewCell {
messageLabel.text = "请根据指引清单提前规划赴港行程"
buttonLabel.text = "去查看"
messageLabel.textColor = UIColor.yhGreyColor50
progressImageView.isHidden = true
progressLabel.isHidden = true
messageLabel.snp.remakeConstraints { make in
make.top.equalTo(49)
make.left.equalTo(21)
make.right.equalTo(-21)
}
}
if model.type == 26 {
......
galaxy/galaxy/Classes/Tools/Extention/CGFloat+Extention.swift
View file @ 3d5063a9
......@@ -18,4 +18,14 @@ extension CGFloat {
// 应用换算比例
return size * scale
}
var fix: CGFloat {
let screenWidth = UIScreen.main.bounds.width
// 假设设计稿基于375pt宽度，iPhone 6的屏幕宽度
let baseWidth: CGFloat = 375.0
// 计算换算比例
let scale = screenWidth / baseWidth
// 应用换算比例
return self * scale
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment