Skip to content

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

完成 我的评分的UI

parent 2f8ad61f
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 255 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 20a64040
......@@ -165,7 +165,6 @@
A5FD63DA2B66060800D1D9DA /* YHScoreOptionsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63D92B66060800D1D9DA /* YHScoreOptionsView.swift */; };
A5FD63DC2B6628F600D1D9DA /* scoreOptionData.plist in Resources */ = {isa = PBXBuildFile; fileRef = A5FD63DB2B6628F600D1D9DA /* scoreOptionData.plist */; };
A5FD63DF2B6639AD00D1D9DA /* YHScoreDataModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63DE2B6639AD00D1D9DA /* YHScoreDataModel.swift */; };
A5FD63E12B66592300D1D9DA /* YHScoreItemCellForAge.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63E02B66592300D1D9DA /* YHScoreItemCellForAge.swift */; };
A5FD63E42B678AC000D1D9DA /* YHPersonInformMainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63E32B678AC000D1D9DA /* YHPersonInformMainViewController.swift */; };
A5FD63E62B67908000D1D9DA /* YHPersonInfoControllerHoldViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63E52B67908000D1D9DA /* YHPersonInfoControllerHoldViewController.swift */; };
A5FD63E82B67D8EA00D1D9DA /* YHMainApplicantInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63E72B67D8EA00D1D9DA /* YHMainApplicantInfoViewController.swift */; };
......@@ -375,7 +374,6 @@
A5FD63D92B66060800D1D9DA /* YHScoreOptionsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHScoreOptionsView.swift; sourceTree = "<group>"; };
A5FD63DB2B6628F600D1D9DA /* scoreOptionData.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = scoreOptionData.plist; sourceTree = "<group>"; };
A5FD63DE2B6639AD00D1D9DA /* YHScoreDataModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHScoreDataModel.swift; sourceTree = "<group>"; };
A5FD63E02B66592300D1D9DA /* YHScoreItemCellForAge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHScoreItemCellForAge.swift; sourceTree = "<group>"; };
A5FD63E32B678AC000D1D9DA /* YHPersonInformMainViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPersonInformMainViewController.swift; sourceTree = "<group>"; };
A5FD63E52B67908000D1D9DA /* YHPersonInfoControllerHoldViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPersonInfoControllerHoldViewController.swift; sourceTree = "<group>"; };
A5FD63E72B67D8EA00D1D9DA /* YHMainApplicantInfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMainApplicantInfoViewController.swift; sourceTree = "<group>"; };
......@@ -623,6 +621,14 @@
name = Frameworks;
sourceTree = "<group>";
};
A5167B282B69FD770084C08F /* 我的评分 */ = {
isa = PBXGroup;
children = (
A5FD63CC2B64E2D600D1D9DA /* YHScoreDetailViewController.swift */,
);
path = "我的评分";
sourceTree = "<group>";
};
A5573EC52B317BFF00D98EC0 = {
isa = PBXGroup;
children = (
......@@ -876,11 +882,11 @@
A5ACE9182B4564F7002C94D2 /* C */ = {
isa = PBXGroup;
children = (
A5167B282B69FD770084C08F /* 我的评分 */,
A5FD63E22B6782EF00D1D9DA /* 个人信息表 */,
A5ACE9192B4564F7002C94D2 /* YHServiceCenterMainViewController.swift */,
A514E5DB2B60A2B700C93951 /* YHServiceCenterSecondViewController.swift */,
A5FD63BC2B623C2C00D1D9DA /* YHInformationPerfectListVC.swift */,
A5FD63CC2B64E2D600D1D9DA /* YHScoreDetailViewController.swift */,
);
path = C;
sourceTree = "<group>";
......@@ -1028,7 +1034,6 @@
A5FD63D72B6603A500D1D9DA /* YHScoreResultView.swift */,
A5FD63D92B66060800D1D9DA /* YHScoreOptionsView.swift */,
A5FD63DB2B6628F600D1D9DA /* scoreOptionData.plist */,
A5FD63E02B66592300D1D9DA /* YHScoreItemCellForAge.swift */,
);
path = "我的评分";
sourceTree = "<group>";
......@@ -1344,7 +1349,6 @@
042FBBB92B627C0F00F9DE23 /* YHCertificateInfo.swift in Sources */,
A5FD63EA2B67D95100D1D9DA /* YHFamilyMemberViewController.swift in Sources */,
A5ACE93F2B4564F7002C94D2 /* UIViewController+Extension.swift in Sources */,
A5FD63E12B66592300D1D9DA /* YHScoreItemCellForAge.swift in Sources */,
042FBBD62B67BDD500F9DE23 /* YHBrotherInfoVC.swift in Sources */,
A5ACE9472B4564F7002C94D2 /* YHHUD.swift in Sources */,
A5ACE9412B4564F7002C94D2 /* Dictionary+Extension.swift in Sources */,
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHScoreDetailViewController.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/我的评分/YHScoreDetailViewController.swift
View file @ 20a64040
......@@ -27,24 +27,14 @@ class YHScoreDetailViewController: YHBaseViewController {
var homeTableView: YHGestureTableView = {
let tableView = YHGestureTableView(frame: .zero, style:.plain)
let tableView = YHGestureTableView(frame: .zero, style:.grouped)
tableView.backgroundColor = .clear
tableView.separatorStyle = .none
tableView.showsHorizontalScrollIndicator = false
tableView.showsVerticalScrollIndicator = false
tableView.rowHeight = UITableView.automaticDimension
tableView.register(YHScorePersonInfoCell.self,forCellReuseIdentifier: YHScorePersonInfoCell.cellReuseIdentifier)
tableView.register(YHScoreItemCell.self,forCellReuseIdentifier: YHScoreItemCell.cellReuseIdentifier)
tableView.register(YHScoreItemCellForAge.self,forCellReuseIdentifier: YHScoreItemCellForAge.cellReuseIdentifier)
// tableView.register(YHDavidCell1.self,forCellReuseIdentifier: YHDavidCell1.cellReuseIdentifier)
// tableView.register(YHDavidCell3.self,forCellReuseIdentifier: YHDavidCell3.cellReuseIdentifier)
// tableView.register(YHDavidCell2.self,forCellReuseIdentifier: YHDavidCell2.cellReuseIdentifier)
// tableView.register(YHDavidCell4.self,forCellReuseIdentifier: YHDavidCell4.cellReuseIdentifier)
// tableView.register(YHDavidCell5.self,forCellReuseIdentifier: YHDavidCell5.cellReuseIdentifier)
return tableView
}()
......@@ -102,10 +92,13 @@ extension YHScoreDetailViewController {
extension YHScoreDetailViewController : UITableViewDelegate,UITableViewDataSource {
func numberOfSections(in tableView: UITableView) -> Int {
return 1
return 2
}
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
if section == 0 {
return 1
}
return 6
}
......@@ -132,17 +125,12 @@ extension YHScoreDetailViewController : UITableViewDelegate,UITableViewDataSourc
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
if indexPath.row == 0 {
if indexPath.section == 0 {
let cell = tableView.dequeueReusableCell(withClass: YHScorePersonInfoCell.self)
return cell
} else if indexPath.row == 1 {
let cell = tableView.dequeueReusableCell(withClass: YHScoreItemCellForAge.self)
cell.optionData = self.serviceCenterMainReqVM.localScoreData?[indexPath.row]
return cell
}
let cell = tableView.dequeueReusableCell(withClass: YHScoreItemCell.self)
cell.optionData = self.serviceCenterMainReqVM.localScoreData?[indexPath.row]
cell.optionData = self.serviceCenterMainReqVM.localScoreData?[indexPath.row + 1]
return cell
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/M/我的评分/YHScoreDataModel.swift
View file @ 20a64040
......@@ -24,16 +24,16 @@ class YHScoreDataModel: SmartCodable {
subscript(_ index : Int) -> YHScoreSessionModel? {
if index == 1 {
return age_score
} else if index == 2 {
return language_score
} else if index == 2 {
return education_score
} else if index == 3 {
return background_score
} else if index == 4 {
return work_experience_score
} else if index == 4 {
return talent_list_score
} else if index == 5 {
return education_score
return language_score
} else if index == 6 {
return talent_list_score
return background_score
}
return nil
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/我的评分/YHScoreItemCell.swift
View file @ 20a64040
......@@ -11,12 +11,6 @@ import AttributedString
class YHScoreItemCell: UITableViewCell {
static let cellReuseIdentifier = "YHScoreItemCell"
// var dataModel : YHContactItemModel? {
// didSet {
//// updateUI()
// }
// }
var optionData : YHScoreSessionModel? {
didSet {
updateUI()
......@@ -33,13 +27,10 @@ class YHScoreItemCell: UITableViewCell {
override func awakeFromNib() {
super.awakeFromNib()
// Initialization code
}
override func setSelected(_ selected: Bool, animated: Bool) {
super.setSelected(selected, animated: animated)
// Configure the view for the selected state
}
override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
......@@ -64,6 +55,17 @@ extension YHScoreItemCell {
func setupUI() {
backgroundColor = .clear
contentView.backgroundColor = .clear
}
func updateUI() {
guard let arrData = optionData?.options else {
return
}
for view in holdView.subviews {
view.removeFromSuperview()
}
holdView.removeFromSuperview()
contentView.addSubview(holdView)
......@@ -72,12 +74,6 @@ extension YHScoreItemCell {
make.bottom.equalToSuperview().offset(-14)
}
//
let view1 = UIView()
holdView.addSubview(view1)
view1.snp.makeConstraints { make in
make.top.left.right.equalToSuperview()
}
titleView = YHScoreTitleView()
holdView.addSubview(titleView)
......@@ -87,6 +83,7 @@ extension YHScoreItemCell {
make.right.equalTo(-18)
make.height.equalTo(YHScoreTitleView.viewH)
}
titleView.updateWith(optionData?.name, optionData?.score)
let resultView = YHScoreResultView()
......@@ -98,60 +95,35 @@ extension YHScoreItemCell {
make.height.equalTo(YHScoreTitleView.viewH)
}
scoreOptionsView1 = YHScoreOptionsView()
holdView.addSubview(scoreOptionsView1)
scoreOptionsView1.snp.makeConstraints { make in
make.top.equalTo(resultView.snp.bottom)
make.left.equalTo(titleView.snp.left)
make.right.equalTo(titleView.snp.right)
}
scoreOptionsView2 = YHScoreOptionsView()
holdView.addSubview(scoreOptionsView2)
scoreOptionsView2.snp.makeConstraints { make in
make.top.equalTo(scoreOptionsView1.snp.bottom)
make.left.equalTo(titleView.snp.left)
make.right.equalTo(titleView.snp.right)
}
scoreOptionsView3 = YHScoreOptionsView()
holdView.addSubview(scoreOptionsView3)
scoreOptionsView3.snp.makeConstraints { make in
make.top.equalTo(scoreOptionsView2.snp.bottom)
make.left.equalTo(titleView.snp.left)
make.right.equalTo(titleView.snp.right)
}
scoreOptionsView4 = YHScoreOptionsView()
holdView.addSubview(scoreOptionsView4)
scoreOptionsView4.snp.makeConstraints { make in
make.top.equalTo(scoreOptionsView3.snp.bottom)
make.left.equalTo(titleView.snp.left)
make.right.equalTo(titleView.snp.right)
make.bottom.equalToSuperview()
}
}
func updateUI() {
guard let arrData = optionData?.options else {
return
}
titleView.updateWith(optionData?.name, optionData?.score)
var tagView : UIView = resultView
for (index,item) in arrData.enumerated() {
if index == 0 {
scoreOptionsView1.dataModel = item
} else if index == 1 {
scoreOptionsView2.dataModel = item
} else if index == 2 {
scoreOptionsView3.dataModel = item
} else if index == 3 {
scoreOptionsView4.dataModel = item
let optionView = YHScoreOptionsView()
optionView.dataModel = item
holdView.addSubview(optionView)
if index == arrData.count - 1 {
optionView.snp.makeConstraints { make in
make.top.equalTo(tagView.snp.bottom)
make.left.equalTo(titleView.snp.left)
make.right.equalTo(titleView.snp.right)
make.bottom.equalToSuperview()
}
optionView.bottomLine.isHidden = true
} else {
optionView.snp.makeConstraints { make in
make.top.equalTo(tagView.snp.bottom)
make.left.equalTo(titleView.snp.left)
make.right.equalTo(titleView.snp.right)
}
optionView.bottomLine.isHidden = false
}
tagView = optionView
}
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/我的评分/YHScoreItemCellForAge.swift deleted 100644 → 0
View file @ 2f8ad61f
//
// YHScoreItemCellForAge.swift
// galaxy
//
// Created by davidhuangA on 2024/1/28.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
import AttributedString
class YHScoreItemCellForAge: UITableViewCell {
static let cellReuseIdentifier = "YHScoreItemCellForAge"
var optionData : YHScoreSessionModel? {
didSet {
updateUI()
}
}
private lazy var holdView : UIView = {
let view = UIView()
view.backgroundColor = .white
view.layer.cornerRadius = 12
view.clipsToBounds = true
return view
}()
override func awakeFromNib() {
super.awakeFromNib()
// Initialization code
}
override func setSelected(_ selected: Bool, animated: Bool) {
super.setSelected(selected, animated: animated)
// Configure the view for the selected state
}
override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
super.init(style: style, reuseIdentifier: reuseIdentifier)
setupUI()
}
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
var titleView : YHScoreTitleView!
private var scoreOptionsView1 : YHScoreOptionsView!
private var scoreOptionsView2 : YHScoreOptionsView!
private var scoreOptionsView3 : YHScoreOptionsView!
private var scoreOptionsView4 : YHScoreOptionsView!
}
extension YHScoreItemCellForAge {
func setupUI() {
backgroundColor = .clear
contentView.backgroundColor = .clear
contentView.addSubview(holdView)
holdView.snp.makeConstraints { make in
make.top.right.left.equalToSuperview()
make.bottom.equalToSuperview().offset(-14)
}
titleView = YHScoreTitleView()
holdView.addSubview(titleView)
titleView.snp.makeConstraints { make in
make.top.equalToSuperview()
make.left.equalTo(18)
make.right.equalTo(-18)
make.height.equalTo(YHScoreTitleView.viewH)
}
let resultView = YHScoreResultView()
holdView.addSubview(resultView)
resultView.snp.makeConstraints { make in
make.top.equalTo(titleView.snp.bottom)
make.left.equalTo(titleView.snp.left)
make.right.equalTo(titleView.snp.right)
make.height.equalTo(YHScoreTitleView.viewH)
}
scoreOptionsView1 = YHScoreOptionsView()
holdView.addSubview(scoreOptionsView1)
scoreOptionsView1.snp.makeConstraints { make in
make.top.equalTo(resultView.snp.bottom)
make.left.equalTo(titleView.snp.left)
make.right.equalTo(titleView.snp.right)
}
scoreOptionsView2 = YHScoreOptionsView()
holdView.addSubview(scoreOptionsView2)
scoreOptionsView2.snp.makeConstraints { make in
make.top.equalTo(scoreOptionsView1.snp.bottom)
make.left.equalTo(titleView.snp.left)
make.right.equalTo(titleView.snp.right)
}
scoreOptionsView3 = YHScoreOptionsView()
holdView.addSubview(scoreOptionsView3)
scoreOptionsView3.snp.makeConstraints { make in
make.top.equalTo(scoreOptionsView2.snp.bottom)
make.left.equalTo(titleView.snp.left)
make.right.equalTo(titleView.snp.right)
}
scoreOptionsView4 = YHScoreOptionsView()
holdView.addSubview(scoreOptionsView4)
scoreOptionsView4.snp.makeConstraints { make in
make.top.equalTo(scoreOptionsView3.snp.bottom)
make.left.equalTo(titleView.snp.left)
make.right.equalTo(titleView.snp.right)
make.bottom.equalToSuperview()
}
}
func updateUI() {
guard let arrData = optionData?.options else {
return
}
titleView.updateWith(optionData?.name, optionData?.score)
for (index,item) in arrData.enumerated() {
if index == 0 {
scoreOptionsView1.dataModel = item
} else if index == 1 {
scoreOptionsView2.dataModel = item
} else if index == 2 {
scoreOptionsView3.dataModel = item
} else if index == 3 {
scoreOptionsView4.dataModel = item
}
}
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/我的评分/YHScoreOptionsView.swift
View file @ 20a64040
......@@ -19,14 +19,6 @@ class YHScoreOptionsView: UIView {
fatalError("init(coder:) has not been implemented")
}
// lazy var nameLable : UILabel = {
// let lable0 = UILabel()
// lable0.textColor = UIColor(hex: 0x4E4E4E)
// lable0.font = UIFont.PingFangScR(ofSize: 14)
// lable0.numberOfLines = 0
// lable0.lineBreakMode = .byWordWrapping
// return lable0
// }()
private lazy var nameTextView : UITextView = {
let lable0 = UITextView()
......@@ -40,7 +32,7 @@ class YHScoreOptionsView: UIView {
}()
private lazy var bottomLine : UIView = {
lazy var bottomLine : UIView = {
let view = UIView()
view.backgroundColor = UIColor(hex:0xF0F0F0)
return view
......@@ -74,13 +66,6 @@ private extension YHScoreOptionsView {
make.height.equalTo(0.5)
}
// addSubview(nameLable)
// nameLable.snp.makeConstraints { make in
// make.top.equalTo(16)
// make.left.right.equalToSuperview()
// make.bottom.equalTo(bottomLine.snp.top).offset(-16)
// }
addSubview(nameTextView)
nameTextView.snp.makeConstraints { make in
make.top.equalTo(16)
......
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