Skip to content

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

完善 个人信息预览 ---- 其他信息填写 的UI

parent 5baeea8d
Show whitespace changes
Inline Side-by-side
Showing with 184 additions and 26 deletions
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/C/YHOtherInfoPreviewViewController.swift
View file @ 74c366be
......@@ -42,6 +42,39 @@ private extension YHOtherInfoPreviewViewController {
let model3 = YHPreviewInfoSessionModel(cellType: .idCardInfoType, cellTitle: "居住信息", cellData1: arr)
arrData.append(model3)
}
do {
//语言能力
let tmp0 = YHPreviewQuestionAndAnswerModel(question: "中文及英文", answer: "国外大学（英语国家）毕业，英文授课，获得学位证。（如为中外联合办学，在中国上课的，不算）")
let arr = [tmp0]
let model1 = YHPreviewInfoSessionModel(cellType: .questionAndAnswer, cellTitle: "语言能力", cellData0: arr)
arrData.append(model1)
}
do {
//专业技能行业
let tmp0 = YHPreviewQuestionAndAnswerModel(question: "1、最能代表你的专业技能的行业是？（单选）", answer: "无",remark: "我的自定义专业我的自定义专业我的自定义专业我的自定义专业我的自定义专业我的自定义专业我的自定义专业我的自定义专业我的自定义专业我的自定义专业我的自定义专业我的自定义专业我的自定义专业我的自定义专业我的自定义专业我的自定义专业")
let arr = [tmp0]
let model1 = YHPreviewInfoSessionModel(cellType: .questionAndAnswer, cellTitle: "专业技能行业", cellData0: arr)
arrData.append(model1)
}
do {
//专业技能行业
let tmp0 = YHPreviewQuestionAndAnswerModel(question: "1、您是否有行业内的专业资格证书？", answer: "否")
let tmp1 = YHPreviewQuestionAndAnswerModel(question: "2、您是否在期刊或杂志上发表论文、文章、书籍等（与工作、资质有关的）？", answer: "是")
let tmp2 = YHPreviewQuestionAndAnswerModel(question: "3、您是否有大学奖学金证明、专利证书、获奖证书（工作单位颁发的可以）？", answer: "是")
let tmp3 = YHPreviewQuestionAndAnswerModel(question: "4、您是否被媒体采访过，专访您的文章被发表在杂志上或网络上？", answer: "是")
let tmp4 = YHPreviewQuestionAndAnswerModel(question: "5、专业奖项：", answer: "这里是一片文案说明说明示例，这里是一片文案说明说明示例，这里是一片文案说明说明示例，这里是一片文案说明说明示例，这里是一片文案说明说明示例，这里是一片文案说明说明示例")
let tmp5 = YHPreviewQuestionAndAnswerModel(question: "6、学业奖项：", answer: "--")
let tmp6 = YHPreviewQuestionAndAnswerModel(question: "7、其他资料：", answer: "这里是一片文案说明说明示例，这里是一片文案说明说明示例，这里是一片文案说明说明示例，这里是一片文案说明说明示例，这里是一片文案说明说明示例，这里是一片文案说明。")
let arr = [tmp0,tmp1,tmp2,tmp3,tmp4,tmp5,tmp6]
let model1 = YHPreviewInfoSessionModel(cellType: .questionAndAnswer, cellTitle: "辅助资料", cellData0: arr)
arrData.append(model1)
}
}
func setupUI() {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/M/YHPreviewQuestionAndAnswerModel.swift
View file @ 74c366be
......@@ -12,6 +12,11 @@ import UIKit
struct YHPreviewQuestionAndAnswerModel {
var question : String = ""
var answer : String = ""
var remark : String?
init(question: String, answer: String, remark: String? = nil) {
self.question = question
self.answer = answer
self.remark = remark
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/V/YHPreviewInfoCell.swift
View file @ 74c366be
......@@ -51,7 +51,7 @@ extension YHPreviewInfoCell {
if model?.cellType == .countryInfoType {
guard let model = model else { return }
let view = YHPreviewInfoQuestionAndAnswerItemsView(frame: .zero)
let view = YHPreviewInfoCertificateInformationItemsView(frame: .zero)
view.dataModel = model
holdView.addSubview(view)
view.snp.makeConstraints { make in
......@@ -82,6 +82,14 @@ extension YHPreviewInfoCell {
else if model?.cellType == .questionAndAnswer {
guard let model = model else { return }
let view = YHPreviewInfoQuestionAndAnswerItemsView(frame: .zero)
view.dataModel = model
holdView.addSubview(view)
view.snp.makeConstraints { make in
make.edges.equalTo(0)
}
}
else {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/V/YHPreviewInfoNameAndSubNameItemsView.swift
View file @ 74c366be
......@@ -7,9 +7,65 @@
//
import UIKit
class YHPreviewInfoNameAndSubNameItemsView: UIView {
var dataModel : YHPreviewInfoSessionModel? {
didSet {
updateUI()
}
}
}
extension YHPreviewInfoNameAndSubNameItemsView {
func updateUI() {
guard let model = dataModel else { return }
guard let arrData = model.cellData0,arrData.count > 0 else { return }
let sessionView = YHPreviewInfoSingleLineTitleView()
sessionView.updateTitle(title: model.cellTitle)
addSubview(sessionView)
sessionView.snp.makeConstraints { make in
make.top.equalToSuperview()
make.right.equalToSuperview().offset(-18)
make.left.equalToSuperview().offset(18)
make.height.equalTo(YHPreviewInfoSingleLineTitleView.viewH)
}
if arrData.count == 1 {
let item = arrData[0]
let cellView = YHPreviewInfoNameAndSubNameItemView()
cellView.update(title: item.question, subtitle: item.answer)
addSubview(cellView)
cellView.snp.makeConstraints { make in
make.top.equalTo(sessionView.snp.bottom)
make.right.equalToSuperview().offset(-18)
make.left.equalToSuperview().offset(18)
make.bottom.equalToSuperview().offset(-21)
}
} else {
var tmp : UIView = sessionView
for(index,item) in arrData.enumerated() {
let cellView = YHPreviewInfoNameAndSubNameItemView()
cellView.update(title: item.question, subtitle: item.answer)
addSubview(cellView)
if index == arrData.count - 1 {
cellView.snp.makeConstraints { make in
make.top.equalTo(tmp.snp.bottom)
make.right.equalToSuperview().offset(-18)
make.left.equalToSuperview().offset(18)
make.bottom.equalToSuperview().offset(-21)
}
} else {
cellView.snp.makeConstraints { make in
make.top.equalTo(tmp.snp.bottom)
make.right.equalToSuperview().offset(-18)
make.left.equalToSuperview().offset(18)
}
}
tmp = cellView
}
}
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/V/YHPreviewInfoQuestionAndAnswerItemView.swift
View file @ 74c366be
......@@ -40,22 +40,44 @@ class YHPreviewInfoQuestionAndAnswerItemView: UIView {
return lable0
}()
private lazy var remarkTextField : UITextView = {
let lable0 = UITextView(frame: .zero)
lable0.contentInset = UIEdgeInsets(top: 12, left: 12, bottom: 12, right: 12)
//remarkLable
private lazy var remarkLable : UILabel = {
let lable0 = UILabel(text: "--")
lable0.textColor = UIColor.labelTextColor2
lable0.font = UIFont.PFSC_R(ofSize: 14)
lable0.backgroundColor = .contentBkgColor
lable0.layer.cornerRadius = kCornerRadius6
lable0.clipsToBounds = true
lable0.isEditable = false
lable0.isSelectable = false
lable0.isScrollEnabled = false
lable0.text = "我是测试数据哈"
lable0.isHidden = true
lable0.numberOfLines = 0
lable0.lineBreakMode = .byWordWrapping
lable0.text = "--"
return lable0
}()
private lazy var remarkHoldView : UIView = {
let view = UIView()
view.backgroundColor = .contentBkgColor
view.layer.cornerRadius = kCornerRadius6
view.clipsToBounds = true
view.isHidden = true
return view
}()
// private lazy var remarkTextField : UITextView = {
// let lable0 = UITextView(frame: .zero)
// lable0.contentInset = UIEdgeInsets(top: 20, left: 12, bottom: 12, right: 12)
// lable0.textColor = UIColor.labelTextColor2
// lable0.font = UIFont.PFSC_R(ofSize: 14)
// lable0.backgroundColor = .contentBkgColor
// lable0.layer.cornerRadius = kCornerRadius6
// lable0.clipsToBounds = true
// lable0.isEditable = false
// lable0.isSelectable = false
// lable0.isScrollEnabled = false
// lable0.text = "我是测试数据哈"
// lable0.isHidden = true
// return lable0
// }()
private func setupUI() {
addSubview(nameLable)
nameLable.snp.makeConstraints { make in
......@@ -64,7 +86,6 @@ class YHPreviewInfoQuestionAndAnswerItemView: UIView {
make.right.equalToSuperview()
make.height.equalTo(20)
}
// nameLable.setContentCompressionResistancePriority(.required, for: .horizontal)
addSubview(subtitleLable)
subtitleLable.snp.makeConstraints { make in
......@@ -72,24 +93,59 @@ class YHPreviewInfoQuestionAndAnswerItemView: UIView {
make.right.equalToSuperview()
make.left.equalToSuperview()
make.bottom.equalToSuperview().offset(-18)
make.bottom.equalToSuperview()
}
addSubview(remarkTextField)
remarkTextField.snp.makeConstraints { make in
addSubview(remarkHoldView)
remarkHoldView.snp.makeConstraints { make in
make.top.equalTo(subtitleLable.snp.bottom).offset(8)
make.right.equalToSuperview()
make.left.equalToSuperview()
// make.bottom.equalToSuperview().offset(-18)
}
remarkHoldView.addSubview(remarkLable)
remarkLable.snp.makeConstraints { make in
make.top.left.equalTo(12)
make.bottom.right.equalTo(-12)
}
}
var dataModel : YHPreviewQuestionAndAnswerModel? {
didSet {
updateUI()
}
}
}
extension YHPreviewInfoQuestionAndAnswerItemView {
func update(title : String,subtitle : String) {
nameLable.text = title
subtitleLable.text = subtitle
func updateUI() {
guard let model = dataModel else { return }
nameLable.text = model.question
subtitleLable.text = model.answer
if let remark = model.remark {
remarkLable.text = remark
subtitleLable.snp.removeConstraints()
subtitleLable.snp.makeConstraints { make in
make.top.equalTo(nameLable.snp.bottom).offset(8)
make.right.equalToSuperview()
make.left.equalToSuperview()
}
remarkHoldView.isHidden = false
remarkHoldView.snp.removeConstraints()
remarkHoldView.snp.makeConstraints { make in
make.top.equalTo(subtitleLable.snp.bottom).offset(8)
make.right.equalToSuperview()
make.left.equalToSuperview()
make.bottom.equalToSuperview()
}
} else {
}
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/V/YHPreviewInfoQuestionAndAnswerItemsView.swift
View file @ 74c366be
......@@ -33,8 +33,8 @@ extension YHPreviewInfoQuestionAndAnswerItemsView {
if arrData.count == 1 {
let item = arrData[0]
let cellView = YHPreviewInfoNameAndSubNameItemView()
cellView.update(title: item.question, subtitle: item.answer)
let cellView = YHPreviewInfoQuestionAndAnswerItemView()
cellView.dataModel = item
addSubview(cellView)
cellView.snp.makeConstraints { make in
make.top.equalTo(sessionView.snp.bottom)
......@@ -45,8 +45,8 @@ extension YHPreviewInfoQuestionAndAnswerItemsView {
} else {
var tmp : UIView = sessionView
for(index,item) in arrData.enumerated() {
let cellView = YHPreviewInfoNameAndSubNameItemView()
cellView.update(title: item.question, subtitle: item.answer)
let cellView = YHPreviewInfoQuestionAndAnswerItemView()
cellView.dataModel = item
addSubview(cellView)
if index == arrData.count - 1 {
......
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