Skip to content

G
galaxy-iOS
Commit 1f2fba82 authored by Steven杜宇's avatar Steven杜宇
Browse files
Options

// 方案

parent 8ae114bf
Hide whitespace changes
Inline Side-by-side
Showing with 172 additions and 111 deletions
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyNewScheme(我的方案)/C/YHMyNewSchemeViewController.swift
View file @ 1f2fba82
......@@ -37,7 +37,7 @@ class YHMyNewSchemeViewController: YHBaseViewController {
tableView.contentInsetAdjustmentBehavior = .never
}
tableView.showsVerticalScrollIndicator = false
tableView.backgroundColor = .init(hex: 0x090B26)
tableView.backgroundColor = .clear
tableView.separatorStyle = .none
tableView.delegate = self
tableView.dataSource = self
......@@ -56,6 +56,77 @@ class YHMyNewSchemeViewController: YHBaseViewController {
return tableView
}()
lazy var bgView: UIView = {
let view = UIView()
view.backgroundColor = .red
let bgImgView = UIImageView(image: UIImage(named: "my_scheme_head_img"))
view.addSubview(bgImgView)
let leftWheatearImgV = UIImageView(image: UIImage(named: "my_scheme_wheatear_left"))
view.addSubview(leftWheatearImgV)
let rightWheatearImgV = UIImageView(image: UIImage(named: "my_scheme_wheatear_right"))
view.addSubview(rightWheatearImgV)
view.addSubview(titleLabel)
view.addSubview(subTitleLabel)
bgImgView.snp.makeConstraints { make in
make.left.equalTo(-0)
make.right.equalTo(0)
make.top.equalToSuperview()
make.height.equalTo(416.0)
}
leftWheatearImgV.snp.makeConstraints { make in
make.left.equalTo(35)
make.top.equalTo(27)
make.width.equalTo(65)
make.height.equalTo(80)
}
rightWheatearImgV.snp.makeConstraints { make in
make.right.equalTo(-35)
make.top.equalTo(27)
make.width.equalTo(65)
make.height.equalTo(80)
}
titleLabel.snp.makeConstraints { make in
make.top.equalTo(27)
make.height.equalTo(34)
make.centerX.equalToSuperview()
}
subTitleLabel.snp.makeConstraints { make in
make.left.equalTo(leftWheatearImgV.snp.left).offset(38)
make.right.equalTo(rightWheatearImgV.snp.right).offset(-38)
make.top.equalTo(titleLabel.snp.bottom).offset(8)
}
return view
}()
lazy var titleLabel: UILabel = {
let label = UILabel()
label.font = UIFont.PFSC_B(ofSize: 24)
label.textColor = .white
label.text = "尊敬的先生"
return label
}()
lazy var subTitleLabel: UILabel = {
let label = UILabel()
label.numberOfLines = 0
label.font = UIFont.PFSC_R(ofSize: 14)
label.textColor = .white
label.textAlignment = .center
label.text = "您好，根据您的信息，这是我们为您定制的申请方案，方案详情如下："
return label
}()
lazy var bottomLogoView: UIView = {
let view = UIView(frame: CGRectMake(0, 0, KScreenWidth, 66+k_Height_safeAreaInsetsBottom()))
......@@ -97,10 +168,19 @@ class YHMyNewSchemeViewController: YHBaseViewController {
gk_navBarAlpha = 1
gk_navBackgroundImage = UIImage(named: "my_scheme_nav")
gk_backImage = UIImage(named: "back_icon_white")
view.backgroundColor = .init(hex: 0x090B26)
self.view.addSubview(bgView)
self.view.addSubview(tableView)
bgView.snp.makeConstraints { make in
make.left.right.equalToSuperview()
make.top.equalTo(k_Height_NavigationtBarAndStatuBar)
make.height.equalTo(415)
}
tableView.snp.makeConstraints { make in
make.left.right.bottom.equalToSuperview()
make.left.equalTo(8.5)
make.right.equalTo(-8.5)
make.bottom.equalToSuperview()
make.top.equalTo(k_Height_NavigationtBarAndStatuBar)
}
tableView.reloadData()
......@@ -109,7 +189,7 @@ class YHMyNewSchemeViewController: YHBaseViewController {
func requestData() {
items.removeAll()
let isPass = false
let isPass = true
if isPass {
let item1 = YHSchemeItem(type: .evaluate)
let item2 = YHSchemeItem(type: .hkRequireList)
......@@ -154,48 +234,65 @@ extension YHMyNewSchemeViewController : UITableViewDelegate, UITableViewDataSour
if 0 <= indexPath.section, indexPath.section < items.count {
let arr = items[indexPath.section]
var targetCell: UITableViewCell? = nil
if 0 <= indexPath.row && indexPath.row < arr.count {
let item = arr[indexPath.row]
if item.type == .evaluate {
let evaluationCell = tableView.dequeueReusableCell(withIdentifier: YHComprehensiveEvaluationCell.cellReuseIdentifier, for: indexPath) as! YHComprehensiveEvaluationCell
return evaluationCell
let cell = tableView.dequeueReusableCell(withIdentifier: YHComprehensiveEvaluationCell.cellReuseIdentifier, for: indexPath) as! YHComprehensiveEvaluationCell
targetCell = cell
return cell
}
if item.type == .hkRequireList {
let listCell = tableView.dequeueReusableCell(withIdentifier: YHHKRequiredItemListCell.cellReuseIdentifier, for: indexPath) as! YHHKRequiredItemListCell
return listCell
let cell = tableView.dequeueReusableCell(withIdentifier: YHHKRequiredItemListCell.cellReuseIdentifier, for: indexPath) as! YHHKRequiredItemListCell
targetCell = cell
return cell
}
if item.type == .industryLocation {
let listCell = tableView.dequeueReusableCell(withIdentifier: YHIndustryLocationCell.cellReuseIdentifier, for: indexPath) as! YHIndustryLocationCell
return listCell
let cell = tableView.dequeueReusableCell(withIdentifier: YHIndustryLocationCell.cellReuseIdentifier, for: indexPath) as! YHIndustryLocationCell
targetCell = cell
return cell
}
if item.type == .materialList {
let listCell = tableView.dequeueReusableCell(withIdentifier: YHMaterialListCell.cellReuseIdentifier, for: indexPath) as! YHMaterialListCell
return listCell
let cell = tableView.dequeueReusableCell(withIdentifier: YHMaterialListCell.cellReuseIdentifier, for: indexPath) as! YHMaterialListCell
targetCell = cell
return cell
}
if item.type == .documentList {
let listCell = tableView.dequeueReusableCell(withIdentifier: YHDocumentListCell.cellReuseIdentifier, for: indexPath) as! YHDocumentListCell
return listCell
let cell = tableView.dequeueReusableCell(withIdentifier: YHDocumentListCell.cellReuseIdentifier, for: indexPath) as! YHDocumentListCell
targetCell = cell
return cell
}
if item.type == .improveScheme {
let listCell = tableView.dequeueReusableCell(withIdentifier: YHImproveSchemeCell.cellReuseIdentifier, for: indexPath) as! YHImproveSchemeCell
return listCell
let cell = tableView.dequeueReusableCell(withIdentifier: YHImproveSchemeCell.cellReuseIdentifier, for: indexPath) as! YHImproveSchemeCell
targetCell = cell
return cell
}
if item.type == .modifyInfo {
let listCell = tableView.dequeueReusableCell(withIdentifier: YHModifySchemeInfoCell.cellReuseIdentifier, for: indexPath) as! YHModifySchemeInfoCell
return listCell
let cell = tableView.dequeueReusableCell(withIdentifier: YHModifySchemeInfoCell.cellReuseIdentifier, for: indexPath) as! YHModifySchemeInfoCell
targetCell = cell
return cell
}
if item.type == .improveTarget {
let listCell = tableView.dequeueReusableCell(withIdentifier: YHImproveTargetCell.cellReuseIdentifier, for: indexPath) as! YHImproveTargetCell
return listCell
let cell = tableView.dequeueReusableCell(withIdentifier: YHImproveTargetCell.cellReuseIdentifier, for: indexPath) as! YHImproveTargetCell
targetCell = cell
return cell
}
// 最后一个cell切底部圆角
let corner = UIRectCorner(rawValue: UIRectCorner.bottomLeft.rawValue | UIRectCorner.bottomRight.rawValue)
if indexPath.row == arr.count-1 {
targetCell?.createCorner(CGSizeMake(6.0, 6.0), corner)
} else {
targetCell?.layer.mask = nil
}
}
}
......@@ -230,3 +327,15 @@ extension YHMyNewSchemeViewController : UITableViewDelegate, UITableViewDataSour
return 12.0
}
}
extension YHMyNewSchemeViewController: UIScrollViewDelegate {
func scrollViewDidScroll(_ scrollView: UIScrollView) {
let scrollY = scrollView.contentOffset.y
if scrollY >= 0.0 {
bgView.frame.origin.y = k_Height_NavigationtBarAndStatuBar-scrollY
} else {
bgView.frame.origin.y = k_Height_NavigationtBarAndStatuBar
}
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyNewScheme(我的方案)/V/YHComprehensiveEvaluationCell.swift
View file @ 1f2fba82
......@@ -56,75 +56,8 @@ class YHComprehensiveEvaluationCell: UITableViewCell {
}()
lazy var bgView: UIView = {
let view = UIView()
let bgImgView = UIImageView(image: UIImage(named: "my_scheme_head_img"))
view.addSubview(bgImgView)
let leftWheatearImgV = UIImageView(image: UIImage(named: "my_scheme_wheatear_left"))
view.addSubview(leftWheatearImgV)
let rightWheatearImgV = UIImageView(image: UIImage(named: "my_scheme_wheatear_right"))
view.addSubview(rightWheatearImgV)
view.addSubview(titleLabel)
view.addSubview(subTitleLabel)
bgImgView.snp.makeConstraints { make in
make.top.left.right.equalToSuperview()
make.height.equalTo(416.0)
}
leftWheatearImgV.snp.makeConstraints { make in
make.left.equalTo(35)
make.top.equalTo(27)
make.width.equalTo(65)
make.height.equalTo(80)
}
rightWheatearImgV.snp.makeConstraints { make in
make.right.equalTo(-35)
make.top.equalTo(27)
make.width.equalTo(65)
make.height.equalTo(80)
}
titleLabel.snp.makeConstraints { make in
make.top.equalTo(27)
make.height.equalTo(34)
make.centerX.equalToSuperview()
}
subTitleLabel.snp.makeConstraints { make in
make.left.equalTo(leftWheatearImgV.snp.left).offset(38)
make.right.equalTo(rightWheatearImgV.snp.right).offset(-38)
make.top.equalTo(titleLabel.snp.bottom).offset(8)
}
return view
}()
lazy var titleLabel: UILabel = {
let label = UILabel()
label.font = UIFont.PFSC_B(ofSize: 24)
label.textColor = .white
label.text = "尊敬的先生"
return label
}()
lazy var subTitleLabel: UILabel = {
let label = UILabel()
label.numberOfLines = 0
label.font = UIFont.PFSC_R(ofSize: 14)
label.textColor = .white
label.textAlignment = .center
label.text = "您好，根据您的信息，这是我们为您定制的申请方案，方案详情如下："
return label
}()
lazy var blueBgView: UIView = {
let view = UIView()
view.backgroundColor = .init(UIColor(hex: 0x0D1025))
view.backgroundColor = .clear
return view
}()
......@@ -147,7 +80,6 @@ class YHComprehensiveEvaluationCell: UITableViewCell {
selectionStyle = .none
contentView.backgroundColor = .clear
contentView.clipsToBounds = true
backgroundColor = .clear
contentView.addSubview(bgView)
......@@ -158,19 +90,21 @@ class YHComprehensiveEvaluationCell: UITableViewCell {
yellowContentView.addSubview(tipsLabel)
bgView.snp.makeConstraints { make in
make.left.right.top.equalToSuperview()
make.left.equalTo(0)
make.right.equalTo(0)
make.top.equalToSuperview()
make.height.equalTo(416)
}
whiteBottomView.snp.makeConstraints { make in
make.left.equalTo(8.5)
make.right.equalTo(-8.5)
make.height.equalTo(10000)
make.left.equalTo(0)
make.right.equalTo(0)
make.top.equalTo(bgView.snp.bottom).offset(0)
make.bottom.equalToSuperview()
}
markImgV.snp.makeConstraints { make in
make.left.equalTo(32)
make.left.equalTo(24)
make.width.equalTo(4)
make.height.equalTo(16)
make.centerY.equalTo(evaluationLabel)
......@@ -184,8 +118,8 @@ class YHComprehensiveEvaluationCell: UITableViewCell {
}
yellowContentView.snp.makeConstraints { make in
make.left.equalTo(32)
make.right.equalTo(-32)
make.left.equalTo(24)
make.right.equalTo(-24)
make.top.equalTo(evaluationLabel.snp.bottom).offset(16)
make.bottom.equalTo(-24)
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyNewScheme(我的方案)/V/YHDocumentListCell.swift
View file @ 1f2fba82
......@@ -87,8 +87,8 @@ class YHDocumentListCell: UITableViewCell {
whiteContentView.addSubview(rightBtn)
whiteContentView.snp.makeConstraints { make in
make.left.equalTo(8.5)
make.right.equalTo(-8.5)
make.left.equalTo(0)
make.right.equalTo(0)
make.top.bottom.equalToSuperview()
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyNewScheme(我的方案)/V/YHHKRequiredItemListCell.swift
View file @ 1f2fba82
......@@ -131,14 +131,14 @@ class YHHKRequiredItemListCell: UITableViewCell {
listView.addSubview(topView)
whiteBgView.snp.makeConstraints { make in
make.left.equalTo(8.5)
make.right.equalTo(-8.5)
make.left.equalTo(0)
make.right.equalTo(0)
make.top.bottom.equalToSuperview()
}
listView.snp.makeConstraints { make in
make.left.equalTo(32)
make.right.equalTo(-32)
make.left.equalTo(24)
make.right.equalTo(-24)
make.top.equalToSuperview()
make.bottom.equalTo(-26)
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyNewScheme(我的方案)/V/YHImproveSchemeCell.swift
View file @ 1f2fba82
......@@ -85,8 +85,8 @@ class YHImproveSchemeCell: UITableViewCell {
whiteContentView.addSubview(rightBtn)
whiteContentView.snp.makeConstraints { make in
make.left.equalTo(8.5)
make.right.equalTo(-8.5)
make.left.equalTo(0)
make.right.equalTo(0)
make.top.bottom.equalToSuperview()
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyNewScheme(我的方案)/V/YHImproveTargetCell.swift
View file @ 1f2fba82
......@@ -142,8 +142,8 @@ class YHImproveTargetCell: UITableViewCell {
whiteContentView.addSubview(bottomBtn)
whiteContentView.snp.makeConstraints { make in
make.left.equalTo(8.5)
make.right.equalTo(-8.5)
make.left.equalTo(0)
make.right.equalTo(0)
make.top.bottom.equalToSuperview()
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyNewScheme(我的方案)/V/YHIndustryLocationCell.swift
View file @ 1f2fba82
......@@ -89,8 +89,8 @@ class YHIndustryLocationCell: UITableViewCell {
whiteContentView.addSubview(tips3Label)
whiteContentView.snp.makeConstraints { make in
make.left.equalTo(8.5)
make.right.equalTo(-8.5)
make.left.equalTo(0)
make.right.equalTo(0)
make.top.bottom.equalToSuperview()
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyNewScheme(我的方案)/V/YHMaterialListCell.swift
View file @ 1f2fba82
......@@ -97,8 +97,8 @@ class YHMaterialListCell: UITableViewCell {
whiteContentView.addSubview(rightBtn)
whiteContentView.snp.makeConstraints { make in
make.left.equalTo(8.5)
make.right.equalTo(-8.5)
make.left.equalTo(0)
make.right.equalTo(0)
make.top.bottom.equalToSuperview()
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyNewScheme(我的方案)/V/YHModifySchemeInfoCell.swift
View file @ 1f2fba82
......@@ -51,8 +51,8 @@ class YHModifySchemeInfoCell: UITableViewCell {
whiteContentView.addSubview(bottomBtn)
whiteContentView.snp.makeConstraints { make in
make.left.equalTo(8.5)
make.right.equalTo(-8.5)
make.left.equalTo(0)
make.right.equalTo(0)
make.top.bottom.equalToSuperview()
}
......@@ -64,4 +64,15 @@ class YHModifySchemeInfoCell: UITableViewCell {
make.height.equalTo(46)
}
}
// override func layoutSubviews() {
// super.layoutSubviews()
// let path = UIBezierPath(roundedRect:whiteContentView.bounds,
// byRoundingCorners:UIRectCorner(rawValue: UIRectCorner.bottomLeft.rawValue | UIRectCorner.bottomRight.rawValue),
// cornerRadii: CGSizeMake(6, 6))
// let layer = CAShapeLayer()
// layer.frame = whiteContentView.bounds
// layer.path = path.cgPath
// self.whiteContentView.layer.mask = layer
// }
}
galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift
View file @ 1f2fba82
......@@ -349,6 +349,13 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
return
}
if true {
let vc = YHMyNewSchemeViewController()
// let vc = YHImproveSchemeViewController()
self.navigationController?.pushViewController(vc)
return
}
let item: PersonalModuleItem = items[indexPath.row]
switch item.type {
case .myCard://我的名片
......
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