Commit ea572067 authored by Steven杜宇's avatar Steven杜宇

// 家庭

parent faaae409
...@@ -48,28 +48,28 @@ class YHFamilyInfoItem { ...@@ -48,28 +48,28 @@ class YHFamilyInfoItem {
var action:YHFamilyInfoActionType = .none var action:YHFamilyInfoActionType = .none
var isMust: Bool = false var isMust: Bool = false
var title: String = "" var title: String = ""
var detail: String = "" var value: String = ""
var previousTitle: String = "" var previousTitle: String = ""
var previousDetail: String = "" var previousValue: String = ""
var options:[YHFamilyInfoOption] = []
var isEditMode: Bool = false var isEditMode: Bool = false
var isShowPreviousInfo: Bool = false var isShowPreviousInfo: Bool = false
var options:[YHFamilyInfoOption] = []
required init() { required init() {
} }
init(id: YHFamilyInfoType, action: YHFamilyInfoActionType, isMust: Bool, title: String, detail: String, previousTitle: String, previousDetail: String, options:[YHFamilyInfoOption] = [], isEditMode: Bool, isShowPreviousInfo: Bool) { init(id: YHFamilyInfoType, action: YHFamilyInfoActionType, isMust: Bool, title: String, value: String, previousTitle: String, previousValue: String, options: [YHFamilyInfoOption] = [], isEditMode: Bool, isShowPreviousInfo: Bool) {
self.id = id self.id = id
self.action = action self.action = action
self.isMust = isMust self.isMust = isMust
self.title = title self.title = title
self.detail = detail self.value = value
self.previousTitle = previousTitle self.previousTitle = previousTitle
self.previousDetail = previousDetail self.previousValue = previousValue
self.options = options
self.isEditMode = isEditMode self.isEditMode = isEditMode
self.isShowPreviousInfo = isShowPreviousInfo self.isShowPreviousInfo = isShowPreviousInfo
self.options = options
} }
} }
......
...@@ -175,10 +175,10 @@ class YHInfoItemView: UIView { ...@@ -175,10 +175,10 @@ class YHInfoItemView: UIView {
if item.action == .select { if item.action == .select {
if item.id == .marriage { if item.id == .marriage {
YHSheetPickerView.show(type:.marriage, selectTitle: item.detail) { YHSheetPickerView.show(type:.marriage, selectTitle: item.value) {
[weak self] item in [weak self] item in
guard let self = self else { return } guard let self = self else { return }
self.item.detail = item.title self.item.value = item.title
self.detailLabel.text = item.title self.detailLabel.text = item.title
} }
...@@ -195,7 +195,7 @@ class YHInfoItemView: UIView { ...@@ -195,7 +195,7 @@ class YHInfoItemView: UIView {
if !isEmptyString(string3) { if !isEmptyString(string3) {
address += string3 address += string3
} }
self.item.detail = address self.item.value = address
self.detailLabel.text = address self.detailLabel.text = address
} }
UIViewController.current?.present(vc, animated: true) UIViewController.current?.present(vc, animated: true)
...@@ -203,7 +203,7 @@ class YHInfoItemView: UIView { ...@@ -203,7 +203,7 @@ class YHInfoItemView: UIView {
} else if item.id == .declareNation { } else if item.id == .declareNation {
let vc = YHSelectCountryViewController() let vc = YHSelectCountryViewController()
vc.backLocationStringController = { (country) in vc.backLocationStringController = { (country) in
self.item.detail = country self.item.value = country
self.detailLabel.text = country self.detailLabel.text = country
} }
UIViewController.current?.navigationController?.pushViewController(vc) UIViewController.current?.navigationController?.pushViewController(vc)
...@@ -225,14 +225,14 @@ class YHInfoItemView: UIView { ...@@ -225,14 +225,14 @@ class YHInfoItemView: UIView {
titleLabel.attributed.text = title titleLabel.attributed.text = title
let isTextEdit = item.isEditMode && item.action == .edit let isTextEdit = item.isEditMode && item.action == .edit
detailLabel.text = item.detail detailLabel.text = item.value
detailLabel.isHidden = isTextEdit detailLabel.isHidden = isTextEdit
textField.isHidden = !isTextEdit textField.isHidden = !isTextEdit
let isSelectSheet = item.isEditMode && item.action == .select let isSelectSheet = item.isEditMode && item.action == .select
clickRowBtn.isHidden = !isSelectSheet clickRowBtn.isHidden = !isSelectSheet
textField.text = item.detail textField.text = item.value
rightBtn.isHidden = !item.isEditMode rightBtn.isHidden = !item.isEditMode
if item.action == .edit { if item.action == .edit {
rightBtn.setImage(UIImage(named: "family_info_del"), for: .normal) rightBtn.setImage(UIImage(named: "family_info_del"), for: .normal)
...@@ -240,7 +240,7 @@ class YHInfoItemView: UIView { ...@@ -240,7 +240,7 @@ class YHInfoItemView: UIView {
rightBtn.setImage(UIImage(named: "family_info_arrow"), for: .normal) rightBtn.setImage(UIImage(named: "family_info_arrow"), for: .normal)
} }
previousTitleLabel.text = item.previousTitle previousTitleLabel.text = item.previousTitle
previousDetailLabel.text = item.previousDetail previousDetailLabel.text = item.previousValue
previousContentView.isHidden = !item.isShowPreviousInfo previousContentView.isHidden = !item.isShowPreviousInfo
detailLabel.snp.remakeConstraints { make in detailLabel.snp.remakeConstraints { make in
...@@ -277,7 +277,8 @@ extension YHInfoItemView: UITextFieldDelegate { ...@@ -277,7 +277,8 @@ extension YHInfoItemView: UITextFieldDelegate {
// YHHUD.flash(message: "限制最多\(Self.maxWordsCount)个字符") // YHHUD.flash(message: "限制最多\(Self.maxWordsCount)个字符")
// return false // return false
// } // }
self.item.detail = newText self.item.value = newText
self.updateItem(item)
return true return true
} }
} }
...@@ -413,7 +414,7 @@ class YHInfoOptionView: UIView { ...@@ -413,7 +414,7 @@ class YHInfoOptionView: UIView {
title = mustTag + title title = mustTag + title
} }
titleLabel.attributed.text = title titleLabel.attributed.text = title
detailLabel.text = item.detail detailLabel.text = item.value
detailLabel.isHidden = item.isEditMode detailLabel.isHidden = item.isEditMode
optionsView.isHidden = !item.isEditMode optionsView.isHidden = !item.isEditMode
...@@ -441,7 +442,7 @@ class YHInfoOptionView: UIView { ...@@ -441,7 +442,7 @@ class YHInfoOptionView: UIView {
} }
previousTitleLabel.text = item.previousTitle previousTitleLabel.text = item.previousTitle
previousDetailLabel.text = item.previousDetail previousDetailLabel.text = item.previousValue
previousContentView.isHidden = !item.isShowPreviousInfo previousContentView.isHidden = !item.isShowPreviousInfo
previousContentView.snp.remakeConstraints { make in previousContentView.snp.remakeConstraints { make in
make.left.right.equalToSuperview() make.left.right.equalToSuperview()
...@@ -461,7 +462,7 @@ class YHInfoOptionView: UIView { ...@@ -461,7 +462,7 @@ class YHInfoOptionView: UIView {
let isSelect = (selectIndex == index) let isSelect = (selectIndex == index)
option.isSelect = isSelect option.isSelect = isSelect
if isSelect { if isSelect {
item.detail = option.value item.value = option.value
} }
} }
self.updateItem(item) self.updateItem(item)
......
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