Skip to content

G
galaxy-iOS
Commit d31f0396 authored by David黄金龙's avatar David黄金龙
Browse files
Options

其他信息 错误提示

parent d15c81e6
Hide whitespace changes
Inline Side-by-side
Showing with 168 additions and 34 deletions
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/OtherInformation(其他信息)/V/YHOtherInfoFillCell.swift
View file @ d31f0396
...@@ -241,7 +241,7 @@ extension YHOtherInfoFillCell { ...@@ -241,7 +241,7 @@ extension YHOtherInfoFillCell {
// let tap = UITapGestureRecognizer(target: self, action: #selector(tapViewItem)) // let tap = UITapGestureRecognizer(target: self, action: #selector(tapViewItem))
// view.addGestureRecognizer(tap) // view.addGestureRecognizer(tap)
languageViewNew.needCheckFlag = dataModel.needCheckFlag
languageViewNew.dataModel = dataModel.language_detail_new_data languageViewNew.dataModel = dataModel.language_detail_new_data
languageViewNew.block = { model in languageViewNew.block = { model in
if let tmpModel = model { if let tmpModel = model {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/OtherInformation(其他信息)/V/YHOtherLanguageSelecteView.swift
View file @ d31f0396
...@@ -14,12 +14,6 @@ class YHOtherLanguageSelecteView: UIView { ...@@ -14,12 +14,6 @@ class YHOtherLanguageSelecteView: UIView {
typealias Block = (LanguageDetailModel?) -> () typealias Block = (LanguageDetailModel?) -> ()
var block: Block? var block: Block?
var needCheckFlag : Bool = false {
didSet {
layoutIfNeeded()
}
}
override init(frame: CGRect) { override init(frame: CGRect) {
super.init(frame: frame) super.init(frame: frame)
setupUI() setupUI()
...@@ -45,6 +39,7 @@ class YHOtherLanguageSelecteView: UIView { ...@@ -45,6 +39,7 @@ class YHOtherLanguageSelecteView: UIView {
label.textColor = .failColor label.textColor = .failColor
label.font = UIFont.PFSC_R(ofSize: 12) label.font = UIFont.PFSC_R(ofSize: 12)
label.text = "请选择" label.text = "请选择"
label.isHidden = true
return label return label
}() }()
...@@ -58,6 +53,13 @@ class YHOtherLanguageSelecteView: UIView { ...@@ -58,6 +53,13 @@ class YHOtherLanguageSelecteView: UIView {
private var arrLanguageOptions : [YHSingleOptionalItemsView] = [] private var arrLanguageOptions : [YHSingleOptionalItemsView] = []
var needCheckFlag : Bool = false
// {
// didSet {
// layoutIfNeeded()
// }
// }
var dataModel : [LanguageDetailModel] = [] { var dataModel : [LanguageDetailModel] = [] {
didSet { didSet {
updateUI() updateUI()
...@@ -74,7 +76,7 @@ class YHOtherLanguageSelecteView: UIView { ...@@ -74,7 +76,7 @@ class YHOtherLanguageSelecteView: UIView {
extension YHOtherLanguageSelecteView { extension YHOtherLanguageSelecteView {
func setupUI() { func setupUI() {
noTextTipsLable.text = "请选择" noTextTipsLable.text = "请选择语言水平"
let str = "* " + "您的语言水平与下列哪一项符合（多选）" let str = "* " + "您的语言水平与下列哪一项符合（多选）"
let attributes: [NSAttributedString.Key: Any] = [ let attributes: [NSAttributedString.Key: Any] = [
...@@ -182,8 +184,16 @@ extension YHOtherLanguageSelecteView { ...@@ -182,8 +184,16 @@ extension YHOtherLanguageSelecteView {
item.snp.removeConstraints() item.snp.removeConstraints()
} }
noTextTipsLable.snp.removeConstraints()
if dataModel.count == 3 { if dataModel.count == 3 {
var hasSelectedOneFlag : Bool = false
for (_,item) in dataModel.enumerated() {
hasSelectedOneFlag = item.select || hasSelectedOneFlag
}
var lastView : UIView? var lastView : UIView?
var offsetY : CGFloat = 12.0 var offsetY : CGFloat = 12.0
...@@ -193,6 +203,7 @@ extension YHOtherLanguageSelecteView { ...@@ -193,6 +203,7 @@ extension YHOtherLanguageSelecteView {
multiCheckView.dataModel = item multiCheckView.dataModel = item
let optionView = arrLanguageOptions[index] let optionView = arrLanguageOptions[index]
optionView.needCheckFlag = needCheckFlag
optionView.dataModel = item optionView.dataModel = item
if index == 0 { if index == 0 {
...@@ -224,6 +235,7 @@ extension YHOtherLanguageSelecteView { ...@@ -224,6 +235,7 @@ extension YHOtherLanguageSelecteView {
if let tttView = lastView { if let tttView = lastView {
if item.select { if item.select {
noTextTipsLable.isHidden = true
//展示选择项 //展示选择项
multiCheckView.snp.remakeConstraints { make in multiCheckView.snp.remakeConstraints { make in
make.top.equalTo(tttView.snp.bottom).offset(offsetY) make.top.equalTo(tttView.snp.bottom).offset(offsetY)
...@@ -245,13 +257,47 @@ extension YHOtherLanguageSelecteView { ...@@ -245,13 +257,47 @@ extension YHOtherLanguageSelecteView {
} else { } else {
optionView.isHidden = true optionView.isHidden = true
multiCheckView.snp.remakeConstraints { make in
make.top.equalTo(tttView.snp.bottom).offset(offsetY) if !needCheckFlag {
make.left.right.equalToSuperview() noTextTipsLable.isHidden = true
make.height.equalTo(YHOtherMultipleChoiceItemView.viewH) multiCheckView.snp.remakeConstraints { make in
make.top.equalTo(tttView.snp.bottom).offset(offsetY)
make.left.right.equalToSuperview()
make.height.equalTo(YHOtherMultipleChoiceItemView.viewH)
make.bottom.equalToSuperview()
}
} else {
make.bottom.equalToSuperview() if hasSelectedOneFlag {
noTextTipsLable.isHidden = true
multiCheckView.snp.remakeConstraints { make in
make.top.equalTo(tttView.snp.bottom).offset(offsetY)
make.left.right.equalToSuperview()
make.height.equalTo(YHOtherMultipleChoiceItemView.viewH)
make.bottom.equalToSuperview()
}
} else {
noTextTipsLable.isHidden = false
multiCheckView.snp.remakeConstraints { make in
make.top.equalTo(tttView.snp.bottom).offset(offsetY)
make.left.right.equalToSuperview()
make.height.equalTo(YHOtherMultipleChoiceItemView.viewH)
// make.bottom.equalToSuperview()
}
noTextTipsLable.snp.remakeConstraints { make in
make.top.equalTo(multiCheckView.snp.bottom).offset(8)
make.left.right.equalToSuperview()
make.bottom.equalToSuperview().offset(-8)
}
}
} }
} }
} }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/OtherInformation(其他信息)/V/YHSingleOptionalItemsView.swift
View file @ d31f0396
...@@ -10,14 +10,7 @@ import UIKit ...@@ -10,14 +10,7 @@ import UIKit
class YHSingleOptionalItemsView: UIView { class YHSingleOptionalItemsView: UIView {
//提示lable
private lazy var noTextTipsLable: UILabel = {
let label = UILabel()
label.textColor = .failColor
label.font = UIFont.PFSC_R(ofSize: 12)
label.text = "请选择"
return label
}()
//输入名称 //输入名称
private lazy var languageTextField:UITextField = { private lazy var languageTextField:UITextField = {
...@@ -64,6 +57,27 @@ class YHSingleOptionalItemsView: UIView { ...@@ -64,6 +57,27 @@ class YHSingleOptionalItemsView: UIView {
var needCheckFlag : Bool = false
//提示lable
private lazy var noTextTipsLable: UILabel = {
let label = UILabel()
label.textColor = .failColor
label.font = UIFont.PFSC_R(ofSize: 12)
label.text = "请输入"
label.isHidden = true
return label
}()
//提示lable
private lazy var noTextTipsLable2: UILabel = {
let label = UILabel()
label.textColor = .failColor
label.font = UIFont.PFSC_R(ofSize: 12)
label.text = "请选择"
label.isHidden = true
return label
}()
//数据结构 //数据结构
var dataModel : LanguageDetailModel? { var dataModel : LanguageDetailModel? {
didSet { didSet {
...@@ -81,6 +95,10 @@ class YHSingleOptionalItemsView: UIView { ...@@ -81,6 +95,10 @@ class YHSingleOptionalItemsView: UIView {
private extension YHSingleOptionalItemsView { private extension YHSingleOptionalItemsView {
func setupUI() { func setupUI() {
addSubview(noTextTipsLable)
addSubview(noTextTipsLable2)
addSubview(textFieldHoldView) addSubview(textFieldHoldView)
textFieldHoldView.isHidden = true textFieldHoldView.isHidden = true
textFieldHoldView.snp.makeConstraints { make in textFieldHoldView.snp.makeConstraints { make in
...@@ -113,7 +131,7 @@ private extension YHSingleOptionalItemsView { ...@@ -113,7 +131,7 @@ private extension YHSingleOptionalItemsView {
model.other_instructions = textField.text ?? "" model.other_instructions = textField.text ?? ""
// self.block?(model) // self.block?(model)
updateUI()//for test hjl
NotificationCenter.default.post(name: Notification.Name(rawValue: "com.yinhe.myCertificate.wechat.otherInfo_remark_notification"), object: model) NotificationCenter.default.post(name: Notification.Name(rawValue: "com.yinhe.myCertificate.wechat.otherInfo_remark_notification"), object: model)
} }
...@@ -126,25 +144,92 @@ private extension YHSingleOptionalItemsView { ...@@ -126,25 +144,92 @@ private extension YHSingleOptionalItemsView {
optionsHoldView.snp.removeConstraints() optionsHoldView.snp.removeConstraints()
optionsHoldView.removeSubviews() optionsHoldView.removeSubviews()
var hasSelectedOneFlag : Bool = false
for(_,item) in model.options.enumerated() {
hasSelectedOneFlag = hasSelectedOneFlag || item.select
}
if model.id == 3 { if model.id == 3 {
//其他
languageTextField.text = model.other_instructions languageTextField.text = model.other_instructions
textFieldHoldView.isHidden = false textFieldHoldView.isHidden = false
optionsHoldView.snp.remakeConstraints() { make in
make.top.equalTo(textFieldHoldView.snp.bottom).offset(8) var tagView : UIView = textFieldHoldView
make.left.right.equalToSuperview() //1.输入框 是否有数据
if needCheckFlag,let txt = languageTextField.text,txt.isEmpty {
make.bottom.equalToSuperview() // 需要检查 且 输入框无数据
noTextTipsLable.isHidden = false
noTextTipsLable.snp.removeConstraints()
noTextTipsLable.snp.remakeConstraints { make in
make.top.equalTo(textFieldHoldView.snp.bottom).offset(8)
make.left.right.equalToSuperview()
// make.bottom.equalToSuperview()
}
tagView = noTextTipsLable
} else {
noTextTipsLable.isHidden = true
} }
//2.是否进行了选择
if needCheckFlag,!hasSelectedOneFlag {
//需要检查 且 未选择
optionsHoldView.snp.remakeConstraints() { make in
make.top.equalTo(tagView.snp.bottom).offset(8)
make.left.right.equalToSuperview()
}
noTextTipsLable2.isHidden = false
noTextTipsLable2.snp.removeConstraints()
noTextTipsLable2.snp.remakeConstraints { make in
make.top.equalTo(optionsHoldView.snp.bottom).offset(8)
make.left.right.equalToSuperview()
make.bottom.equalToSuperview()
}
} else {
noTextTipsLable2.isHidden = true
optionsHoldView.snp.remakeConstraints() { make in
make.top.equalTo(tagView.snp.bottom).offset(8)
make.left.right.equalToSuperview()
make.bottom.equalToSuperview()
}
}
} else { } else {
//非其他选项
textFieldHoldView.isHidden = true textFieldHoldView.isHidden = true
optionsHoldView.snp.remakeConstraints() { make in noTextTipsLable.isHidden = true
make.top.equalToSuperview()
make.left.right.equalToSuperview() if needCheckFlag,!hasSelectedOneFlag {
//需要检查 且 未选择
optionsHoldView.snp.remakeConstraints() { make in
make.top.equalToSuperview()
make.left.right.equalToSuperview()
// make.bottom.equalToSuperview()
}
noTextTipsLable2.snp.removeConstraints()
noTextTipsLable2.isHidden = false
noTextTipsLable2.snp.remakeConstraints { make in
make.top.equalTo(optionsHoldView.snp.bottom).offset(8)
make.left.right.equalToSuperview()
make.bottom.equalToSuperview().offset(-8)
}
make.bottom.equalToSuperview() } else {
noTextTipsLable2.isHidden = true
optionsHoldView.snp.remakeConstraints() { make in
make.top.equalToSuperview()
make.left.right.equalToSuperview()
make.bottom.equalToSuperview()
}
} }
} }
...@@ -152,6 +237,9 @@ private extension YHSingleOptionalItemsView { ...@@ -152,6 +237,9 @@ private extension YHSingleOptionalItemsView {
var lastView : UIView? var lastView : UIView?
arrHoldView.removeAll() arrHoldView.removeAll()
for(index,item) in model.options.enumerated() { for(index,item) in model.options.enumerated() {
let tmpOption = YHOtherSingleChoiceItemView() let tmpOption = YHOtherSingleChoiceItemView()
tmpOption.dataModel = item tmpOption.dataModel = 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