Skip to content

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

其他信息的录入

parent 6df7e4ce
Hide whitespace changes
Inline Side-by-side
Showing with 120 additions and 19 deletions
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/C/YHOtherInfoFillViewController.swift
View file @ bcf2ce35
...@@ -237,6 +237,7 @@ extension YHOtherInfoFillViewController : UITableViewDelegate,UITableViewDataSou ...@@ -237,6 +237,7 @@ extension YHOtherInfoFillViewController : UITableViewDelegate,UITableViewDataSou
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withClass: YHOtherInfoFillCell.self) let cell = tableView.dequeueReusableCell(withClass: YHOtherInfoFillCell.self)
cell.selectionStyle = .none
cell.block = { cell.block = {
self.homeTableView.reloadData() self.homeTableView.reloadData()
} }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/V/YHOtherInfoFillCell.swift
View file @ bcf2ce35
...@@ -69,7 +69,7 @@ extension YHOtherInfoFillCell { ...@@ -69,7 +69,7 @@ extension YHOtherInfoFillCell {
@objc func didClickAddBtn() { @objc func didClickAddBtn() {
printLog("点击了 添加按钮") printLog("点击了 添加按钮")
var model = Residence() let model = Residence()
dataModel?.residences.append(model) dataModel?.residences.append(model)
self.block?() self.block?()
} }
...@@ -78,25 +78,24 @@ extension YHOtherInfoFillCell { ...@@ -78,25 +78,24 @@ extension YHOtherInfoFillCell {
guard let dataModel = dataModel else { return} guard let dataModel = dataModel else { return}
contentView.removeSubviews() contentView.removeSubviews()
contentView.backgroundColor = .clear contentView.backgroundColor = .clear
backgroundColor = .clear
//居住信息 //1.居住信息
let holdView1 = UIView() let holdView1 = createHoldView()
holdView1.backgroundColor = .white
holdView1.layer.cornerRadius = kCornerRadius6
holdView1.clipsToBounds = true
contentView.addSubview(holdView1) contentView.addSubview(holdView1)
holdView1.snp.makeConstraints { make in holdView1.snp.makeConstraints { make in
make.edges.equalTo(0) make.top.left.right.equalToSuperview()
} }
do { do {
var lastTargetView : UIView! var lastTargetView : UIView!
if dataModel.residences.count > 1 { if dataModel.residences.count > 1 {
for (index,item) in dataModel.residences.enumerated() { for (index,item) in dataModel.residences.enumerated() {
if index == 0 { if index == 0 {
let sessionView = YHOtherInfoSessionView(frame: .zero) let sessionView = YHOtherInfoSessionView(frame: .zero)
sessionView.type = 3
sessionView.updateTitle(title: "居住信息")
holdView1.addSubview(sessionView) holdView1.addSubview(sessionView)
sessionView.snp.makeConstraints { make in sessionView.snp.makeConstraints { make in
make.top.equalToSuperview() make.top.equalToSuperview()
...@@ -117,6 +116,8 @@ extension YHOtherInfoFillCell { ...@@ -117,6 +116,8 @@ extension YHOtherInfoFillCell {
lastTargetView = residenceView lastTargetView = residenceView
} else { } else {
let sessionView = YHOtherInfoSessionView(frame: .zero) let sessionView = YHOtherInfoSessionView(frame: .zero)
let title = "居住信息" + String(index + 1)
sessionView.updateTitle(title: title)
sessionView.type = 1 sessionView.type = 1
sessionView.tag = index sessionView.tag = index
sessionView.block = { tag in sessionView.block = { tag in
...@@ -148,6 +149,8 @@ extension YHOtherInfoFillCell { ...@@ -148,6 +149,8 @@ extension YHOtherInfoFillCell {
} else { } else {
let sessionView = YHOtherInfoSessionView(frame: .zero) let sessionView = YHOtherInfoSessionView(frame: .zero)
sessionView.type = 3
sessionView.updateTitle(title: "居住信息")
holdView1.addSubview(sessionView) holdView1.addSubview(sessionView)
sessionView.snp.makeConstraints { make in sessionView.snp.makeConstraints { make in
make.top.equalToSuperview() make.top.equalToSuperview()
...@@ -180,11 +183,89 @@ extension YHOtherInfoFillCell { ...@@ -180,11 +183,89 @@ extension YHOtherInfoFillCell {
make.right.equalToSuperview().offset(-18) make.right.equalToSuperview().offset(-18)
make.height.equalTo(44) make.height.equalTo(44)
make.bottom.equalToSuperview().offset(-18) make.bottom.equalToSuperview().offset(-18).priority(.high)
} }
addBtn.layoutIfNeeded() addBtn.layoutIfNeeded()
dotLineLayer.path = UIBezierPath(roundedRect: CGRect(x: 0, y: 0, width: KScreenWidth - 18 * 2 - 16 * 2, height: 44), cornerRadius: kCornerRadius6).cgPath dotLineLayer.path = UIBezierPath(roundedRect: CGRect(x: 0, y: 0, width: KScreenWidth - 18 * 2 - 16 * 2, height: 44), cornerRadius: kCornerRadius6).cgPath
} }
holdView1.layoutIfNeeded()
//2.语言水平
let holdView2 = createHoldView()
contentView.addSubview(holdView2)
holdView2.snp.makeConstraints { make in
make.top.equalTo(holdView1.snp.bottom).offset(18).priority(.low)
make.left.right.equalToSuperview()
}
do {
let sessionView = YHOtherInfoSessionView(frame: .zero)
sessionView.updateTitle(title: "语言水平")
holdView2.addSubview(sessionView)
sessionView.snp.makeConstraints { make in
make.top.equalToSuperview()
make.left.equalToSuperview().offset(18)
make.right.equalToSuperview().offset(-18)
make.height.equalTo(YHOtherInfoSessionView.viewH)
}
let view = YHOtherSelecteItemView()
view.updateKeyName(name: "您的语言水平与下列哪一项符合", keyValue: "")
view.type = 2
holdView2.addSubview(view)
view.snp.makeConstraints { make in
make.top.equalTo(sessionView.snp.bottom)
make.left.equalToSuperview().offset(18)
make.right.equalToSuperview().offset(-18)
make.height.equalTo(YHOtherSelecteItemView.getViewHBy(type: 2))
make.bottom.equalToSuperview()
}
}
//3.语言水平
let holdView3 = createHoldView()
contentView.addSubview(holdView3)
holdView3.snp.makeConstraints { make in
make.top.equalTo(holdView2.snp.bottom).offset(18)
make.left.right.bottom.equalToSuperview()
}
do {
let sessionView = YHOtherInfoSessionView(frame: .zero)
sessionView.updateTitle(title: "专业技能行业")
holdView3.addSubview(sessionView)
sessionView.snp.makeConstraints { make in
make.top.equalToSuperview()
make.left.equalToSuperview().offset(18)
make.right.equalToSuperview().offset(-18)
make.height.equalTo(YHOtherInfoSessionView.viewH)
}
let view = YHOtherSelecteItemView()
view.updateKeyName(name: "最能代表你的专业技能的行业", keyValue: "")
view.type = 2
holdView3.addSubview(view)
view.snp.makeConstraints { make in
make.top.equalTo(sessionView.snp.bottom)
make.left.equalToSuperview().offset(18)
make.right.equalToSuperview().offset(-18)
make.height.equalTo(YHOtherSelecteItemView.getViewHBy(type: 2))
make.bottom.equalToSuperview()
}
}
}
func createHoldView() -> UIView {
let holdView1 = UIView()
holdView1.backgroundColor = .white
holdView1.layer.cornerRadius = kCornerRadius6
holdView1.clipsToBounds = true
return holdView1
} }
} }
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/V/YHOtherInfoSessionView.swift
View file @ bcf2ce35
...@@ -11,17 +11,19 @@ import UIKit ...@@ -11,17 +11,19 @@ import UIKit
class YHOtherInfoSessionView: UIView { class YHOtherInfoSessionView: UIView {
static let viewH : CGFloat = 52 static let viewH : CGFloat = 52
typealias Block = (Int) -> () typealias Block = (Int) -> ()
var block: Block? var block: Block?
//0-默认只有title 1-带删除按钮 2-有subNameLabel //0-默认只有title 1-带删除按钮 2-有subNameLabel 3-带默认图标
var type : Int = 0 { var type : Int = 0 {
didSet { didSet {
if type == 1 { if type == 1 {
delButton.isHidden = false delButton.isHidden = false
} else if type == 2 { } else if type == 2 {
subNameLable.isHidden = false subNameLable.isHidden = false
} else if type == 3 {
iconImageV.isHidden = false
} }
} }
} }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/V/YHOtherResidenceFillView.swift
View file @ bcf2ce35
...@@ -25,6 +25,7 @@ extension YHOtherResidenceFillView { ...@@ -25,6 +25,7 @@ extension YHOtherResidenceFillView {
func setupUI() { func setupUI() {
//1.国家 //1.国家
let view = YHOtherSelecteItemView() let view = YHOtherSelecteItemView()
view.updateKeyName(name: "国家", keyValue: "")
addSubview(view) addSubview(view)
view.snp.makeConstraints { make in view.snp.makeConstraints { make in
make.top.left.right.equalToSuperview() make.top.left.right.equalToSuperview()
...@@ -34,6 +35,7 @@ extension YHOtherResidenceFillView { ...@@ -34,6 +35,7 @@ extension YHOtherResidenceFillView {
//2.开始时间 //2.开始时间
let view2 = YHOtherSelecteItemView() let view2 = YHOtherSelecteItemView()
view2.updateKeyName(name: "开始时间", keyValue: "")
addSubview(view2) addSubview(view2)
view2.snp.makeConstraints { make in view2.snp.makeConstraints { make in
make.top.equalTo(view.snp.bottom) make.top.equalTo(view.snp.bottom)
...@@ -43,6 +45,7 @@ extension YHOtherResidenceFillView { ...@@ -43,6 +45,7 @@ extension YHOtherResidenceFillView {
//3.结束时间 //3.结束时间
let view3 = YHOtherSelecteItemView() let view3 = YHOtherSelecteItemView()
view3.updateKeyName(name: "结束时间", keyValue: "")
addSubview(view3) addSubview(view3)
view3.snp.makeConstraints { make in view3.snp.makeConstraints { make in
make.top.equalTo(view2.snp.bottom) make.top.equalTo(view2.snp.bottom)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/V/YHOtherSelecteItemView.swift
View file @ bcf2ce35
...@@ -13,7 +13,12 @@ class YHOtherSelecteItemView: UIView { ...@@ -13,7 +13,12 @@ class YHOtherSelecteItemView: UIView {
static let viewH : CGFloat = 52 // type == 1时的高度 static let viewH : CGFloat = 52 // type == 1时的高度
static let viewH2 : CGFloat = 88 //type == 2时的高度 static let viewH2 : CGFloat = 88 //type == 2时的高度
var type : Int = 1 //1- 一行布局 2-2行布局 //1- 一行布局 2-2行布局
var type : Int = 1 {
didSet {
layoutIfNeeded()
}
}
//获取高度 //获取高度
static func getViewHBy(type : Int)->CGFloat { static func getViewHBy(type : Int)->CGFloat {
...@@ -99,16 +104,18 @@ class YHOtherSelecteItemView: UIView { ...@@ -99,16 +104,18 @@ class YHOtherSelecteItemView: UIView {
make.height.equalTo(0.5) make.height.equalTo(0.5)
} }
titleLabel.snp.makeConstraints { make in
make.top.left.bottom.equalToSuperview()
make.width.equalTo(64)
}
subHoldView.snp.makeConstraints { make in subHoldView.snp.makeConstraints { make in
make.top.right.bottom.equalToSuperview() make.bottom.equalTo(bottomLine.snp.top)
make.left.equalTo(titleLabel.snp.right) make.right.left.equalToSuperview()
make.height.equalTo(52)
} }
titleLabel.snp.makeConstraints { make in
make.bottom.equalTo(subHoldView.snp.top)
make.left.right.equalToSuperview()
make.height.equalTo(20)
}
} else { } else {
} }
...@@ -142,3 +149,10 @@ extension YHOtherSelecteItemView { ...@@ -142,3 +149,10 @@ extension YHOtherSelecteItemView {
} }
} }
} }
extension YHOtherSelecteItemView {
func updateKeyName(name : String, keyValue : String) {
title = name
textField.text = keyValue
}
}
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