Commit 78be0533 authored by Steven杜宇's avatar Steven杜宇

// 原则批

parent 7e16af23
......@@ -351,6 +351,8 @@
04AF58C42B4FC51C0066011A /* YHLocalizable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04AF58C32B4FC51C0066011A /* YHLocalizable.swift */; };
04AF82D62C25542D0028CE2A /* YHInterestTopicLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04AF82D52C25542D0028CE2A /* YHInterestTopicLayout.swift */; };
04AF82D82C291E960028CE2A /* YHMatchUserViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04AF82D72C291E960028CE2A /* YHMatchUserViewModel.swift */; };
04B360E32C60A346001EB053 /* YHPrinciplePhotoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B360E22C60A346001EB053 /* YHPrinciplePhotoCell.swift */; };
04B360E52C60B5D3001EB053 /* YHPrinciplePhotoCollectCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B360E42C60B5D3001EB053 /* YHPrinciplePhotoCollectCell.swift */; };
04B9EE5A2C06CC3100A4018D /* YHCodeSueecssViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B9EE582C06CC3100A4018D /* YHCodeSueecssViewController.swift */; };
04B9EE5B2C06CC3100A4018D /* YHOtherLoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B9EE592C06CC3100A4018D /* YHOtherLoginViewController.swift */; };
04C693622B723AB8004C1758 /* YHMySettingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C693612B723AB8004C1758 /* YHMySettingViewController.swift */; };
......@@ -981,6 +983,8 @@
04AF58C32B4FC51C0066011A /* YHLocalizable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHLocalizable.swift; sourceTree = "<group>"; };
04AF82D52C25542D0028CE2A /* YHInterestTopicLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHInterestTopicLayout.swift; sourceTree = "<group>"; };
04AF82D72C291E960028CE2A /* YHMatchUserViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMatchUserViewModel.swift; sourceTree = "<group>"; };
04B360E22C60A346001EB053 /* YHPrinciplePhotoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPrinciplePhotoCell.swift; sourceTree = "<group>"; };
04B360E42C60B5D3001EB053 /* YHPrinciplePhotoCollectCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPrinciplePhotoCollectCell.swift; sourceTree = "<group>"; };
04B9EE582C06CC3100A4018D /* YHCodeSueecssViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHCodeSueecssViewController.swift; sourceTree = "<group>"; };
04B9EE592C06CC3100A4018D /* YHOtherLoginViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHOtherLoginViewController.swift; sourceTree = "<group>"; };
04C693612B723AB8004C1758 /* YHMySettingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMySettingViewController.swift; sourceTree = "<group>"; };
......@@ -2183,6 +2187,8 @@
0472CBA02C5A11640096F48F /* YHPrincipleGroupReviewListCell.swift */,
0472CBA12C5A11640096F48F /* YHPrincipleGroupUploadCell.swift */,
0409BEEA2C5B41D4003FCFD7 /* YHPrincipleUnapprovedCell.swift */,
04B360E22C60A346001EB053 /* YHPrinciplePhotoCell.swift */,
04B360E42C60B5D3001EB053 /* YHPrinciplePhotoCollectCell.swift */,
);
path = V;
sourceTree = "<group>";
......@@ -3497,6 +3503,7 @@
buildActionMask = 2147483647;
files = (
04A671592B9F18C800C1FB91 /* YHCertificateUploadSheetView.swift in Sources */,
04B360E52C60B5D3001EB053 /* YHPrinciplePhotoCollectCell.swift in Sources */,
0425E6422BA95B1B00A5E763 /* YHSchemeTableFooterView.swift in Sources */,
A567E5B42BD7643D00D5D5A0 /* YHHkLifeAndIdView.swift in Sources */,
045EEEBD2B9F171A0022A143 /* YHWorkExampleTypeView.swift in Sources */,
......@@ -3719,6 +3726,7 @@
043D2C8C2C0F037B00172438 /* YHServiceOrderSearchViewModel.swift in Sources */,
0468D4262B495A5400CFB916 /* YHPickPhoneAddressViewController.swift in Sources */,
A5FD45232C523DD300908AD9 /* YHJsApi.swift in Sources */,
04B360E32C60A346001EB053 /* YHPrinciplePhotoCell.swift in Sources */,
04213B292C48EF5300797900 /* YHHomeInformationViewController.swift in Sources */,
048B2A4D2BC7DAE800A93BF0 /* YHMyLikeViewModel.swift in Sources */,
04C693622B723AB8004C1758 /* YHMySettingViewController.swift in Sources */,
......
......@@ -24,7 +24,7 @@ class YHPrincipleReviewListVC: YHBaseViewController {
tableView.register(UITableViewCell.self, forCellReuseIdentifier: "UITableViewCell")
tableView.register(YHPrincipleGroupReviewListCell.self, forCellReuseIdentifier: YHPrincipleGroupReviewListCell.cellReuseIdentifier)
tableView.register(YHPrincipleGroupUploadCell.self, forCellReuseIdentifier: YHPrincipleGroupUploadCell.cellReuseIdentifier)
tableView.register(YHPrincipleUnapprovedCell.self, forCellReuseIdentifier: YHPrincipleUnapprovedCell.cellReuseIdentifier)
tableView.register(YHPrinciplePhotoCell.self, forCellReuseIdentifier: YHPrinciplePhotoCell.cellReuseIdentifier)
return tableView
}()
......@@ -48,7 +48,10 @@ class YHPrincipleReviewListVC: YHBaseViewController {
"主申人的曾用名证明文件.pdf"]
let m3 = YHPrincleGroupModel()
m3.fileList = []
m3.fileList = ["新公司在职证明.pdf",
"主申人的曾用名证明文件.pdf",
"主申人的曾用名证明文件.pdf",
"无刑事罪行记录证明.pdf"]
let m4 = YHPrincleGroupModel()
m4.fileList = ["新公司在职证明.pdf",
......@@ -103,7 +106,9 @@ extension YHPrincipleReviewListVC: UITableViewDelegate, UITableViewDataSource {
return cell
}
let cell = tableView.dequeueReusableCell(withIdentifier: YHPrincipleUnapprovedCell.cellReuseIdentifier, for: indexPath) as! YHPrincipleUnapprovedCell
// YHPrinciplePhotoCell
// YHPrincipleUnapprovedCell
let cell = tableView.dequeueReusableCell(withIdentifier: YHPrinciplePhotoCell.cellReuseIdentifier, for: indexPath) as! YHPrinciplePhotoCell
if 0 <= indexPath.section && indexPath.section < items.count {
let model = items[indexPath.section]
......
//
// YHPrinciplePhotoCell.swift
// galaxy
//
// Created by edy on 2024/8/5.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHPrinciplePhotoCell: UITableViewCell {
static let cellReuseIdentifier = "YHPrinciplePhotoCell"
var itemModel:YHPrincleGroupModel?
var items: [String] = []
var expandClick:((Bool)->())?
lazy var iconImgView:UIImageView = {
let view = UIImageView(image: UIImage(named: "custom_service_icon_right"))
return view
}()
lazy var titleLabel: UILabel = {
let label = UILabel()
label.font = UIFont.PFSC_R(ofSize: 15)
label.textColor = UIColor.mainTextColor
label.text = "申请资料已递交港府留档"
return label
}()
lazy var whiteView: UIView = {
let view = UIView()
view.backgroundColor = .white
view.layer.cornerRadius = 6.0
view.clipsToBounds = true
return view
}()
lazy var expandBtn:UIButton = {
let btn = UIButton()
btn.setImage(UIImage(named: "custom_service_expand_0"), for: .normal)
btn.addTarget(self, action: #selector(didExpandBtnClicked), for: .touchUpInside)
return btn
}()
lazy var collectView = {
let flowLayout = UICollectionViewFlowLayout()
flowLayout.minimumLineSpacing = 0.0
flowLayout.scrollDirection = .vertical
let collectinoView = UICollectionView(frame: .zero, collectionViewLayout: flowLayout)
collectinoView.contentInset = UIEdgeInsets(top: 0, left: 16, bottom: 0, right: 16)
collectinoView.backgroundColor = UIColor.white
collectinoView.register(YHPrinciplePhotoCollectCell.self, forCellWithReuseIdentifier:YHPrinciplePhotoCollectCell.cellReuseIdentifier)
collectinoView.delegate = self
collectinoView.dataSource = self
collectinoView.backgroundColor = .clear
collectinoView.isScrollEnabled = false
return collectinoView
}()
lazy var timeLabel: UILabel = {
let label = UILabel()
label.font = UIFont.PFSC_M(ofSize: 13)
label.textColor = UIColor(hex: 0x121A26, alpha: 0.3)
label.numberOfLines = 0
label.text = "最新更新时间:2024-04-19 19:50:12\n已累计为您查询 4 次"
return label
}()
required init?(coder: NSCoder) {
super.init(coder: coder)
}
override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
super.init(style: style, reuseIdentifier: reuseIdentifier)
setupUI()
}
@objc func didExpandBtnClicked() {
guard let model = itemModel else { return }
expandClick?(!model.isExpand)
}
func updateModel(_ model:YHPrincleGroupModel) {
itemModel = model
items.removeAll()
items.append(contentsOf: model.fileList)
whiteView.isHidden = !model.isExpand
let imgName = model.isExpand ? "custom_service_expand_1" : "custom_service_expand_0"
expandBtn.setImage(UIImage(named: imgName), for: .normal)
expandBtn.isHidden = items.count <= 0
if !model.isExpand || items.count <= 0 {
whiteView.removeSubviews()
whiteView.snp.remakeConstraints { make in
make.top.equalTo(titleLabel.snp.bottom).offset(0.0)
make.height.equalTo(0.0)
make.left.equalTo(20)
make.right.equalTo(-20)
make.bottom.equalTo(-32)
}
self.setNeedsLayout()
self.layoutIfNeeded()
return
}
whiteView.removeSubviews()
whiteView.addSubview(collectView)
whiteView.addSubview(timeLabel)
whiteView.snp.remakeConstraints { make in
make.top.equalTo(titleLabel.snp.bottom).offset(16.0)
make.left.equalTo(20)
make.right.equalTo(-20)
make.bottom.equalTo(-32)
}
let imgHeight = items.count == 1 ? 170.0 : 80.0
let titleGap = items.count == 1 ? 16.0 : 12.0
let titleHeight = 18.0
let row = items.count/2 + items.count%2
let totalHeight = Double(row) * (imgHeight + titleGap + titleHeight + 16.0)
collectView.snp.remakeConstraints { make in
make.top.equalTo(16.0)
make.left.right.equalToSuperview()
make.height.equalTo(totalHeight)
}
collectView.reloadData()
timeLabel.snp.remakeConstraints { make in
make.left.equalTo(16.0)
make.right.equalTo(-16.0)
make.top.equalTo(collectView.snp.bottom).offset(-10.0)
make.bottom.equalTo(-16)
}
self.setNeedsLayout()
self.layoutIfNeeded()
}
func setupUI() {
self.selectionStyle = .none
contentView.backgroundColor = UIColor.init(hex: 0xf8f9fb)
contentView.addSubview(iconImgView)
contentView.addSubview(titleLabel)
contentView.addSubview(expandBtn)
contentView.addSubview(whiteView)
whiteView.addSubview(collectView)
whiteView.addSubview(timeLabel)
iconImgView.snp.makeConstraints { make in
make.left.equalTo(20)
make.width.height.equalTo(15.0)
make.centerY.equalTo(titleLabel)
}
titleLabel.snp.makeConstraints { make in
make.left.equalTo(iconImgView.snp.right).offset(6)
make.right.equalTo(expandBtn.snp.left)
make.top.equalTo(0)
make.height.equalTo(20)
}
expandBtn.snp.makeConstraints { make in
make.width.height.equalTo(20.0)
make.centerY.equalTo(titleLabel)
make.right.equalTo(-20.0)
}
whiteView.snp.makeConstraints { make in
make.top.equalTo(titleLabel.snp.bottom).offset(0.0)
make.height.equalTo(0.0)
make.left.equalTo(20)
make.right.equalTo(-20)
make.bottom.equalTo(-32)
}
collectView.snp.makeConstraints { make in
make.left.right.top.equalToSuperview()
make.height.equalTo(0)
}
timeLabel.snp.makeConstraints { make in
make.left.equalTo(16.0)
make.right.equalTo(-16.0)
make.top.equalTo(collectView.snp.bottom)
make.height.equalTo(0.0)
}
}
}
extension YHPrinciplePhotoCell: UICollectionViewDelegateFlowLayout, UICollectionViewDelegate, UICollectionViewDataSource {
func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
return items.count
}
func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
let imgWidth = items.count == 1 ? KScreenWidth-36.0*2.0: (KScreenWidth-36.0*2.0-15.0)/2.0
let imgHeight = items.count == 1 ? 170.0 : 80.0
let titleGap = items.count == 1 ? 16.0 : 12.0
let titleHeight = 18.0
return CGSizeMake(imgWidth, imgHeight + titleGap + titleHeight + 16.0)
}
func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
let cell = collectionView.dequeueReusableCell(withReuseIdentifier: YHPrinciplePhotoCollectCell.cellReuseIdentifier, for: indexPath) as! YHPrinciplePhotoCollectCell
cell.isSinglePhoto = items.count == 1
return cell
}
private func collectionView(collectionView: UICollectionView, didSelectItemAtIndexPath indexPath: NSIndexPath) {
print("index is \(indexPath.row)")
}
}
//
// YHPrinciplePhotoCollectCell.swift
// galaxy
//
// Created by edy on 2024/8/5.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHPrinciplePhotoCollectCell: UICollectionViewCell {
static let cellReuseIdentifier = "YHPrinciplePhotoCollectCell"
lazy var imgView: UIImageView = {
let imgView = UIImageView()
imgView.layer.cornerRadius = 3.0
imgView.clipsToBounds = true
imgView.backgroundColor = .red
return imgView
}()
lazy var titleLabel: UILabel = {
let label = UILabel()
label.font = UIFont.PFSC_M(ofSize: 12)
label.textColor = UIColor(hex: 0x94A3B8)
label.textAlignment = .center
label.text = "XXXXXX"
return label
}()
override init(frame: CGRect) {
super.init(frame: frame)
createUI()
}
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
var isSinglePhoto: Bool = false {
didSet {
let imgHeight = isSinglePhoto ? 170.0 : 80.0
let gap = isSinglePhoto ? 16.0 : 12.0
imgView.snp.updateConstraints { make in
make.height.equalTo(imgHeight)
}
titleLabel.snp.updateConstraints { make in
make.top.equalTo(imgView.snp.bottom).offset(gap)
}
self.setNeedsLayout()
self.layoutIfNeeded()
}
}
func createUI() {
self.addSubview(imgView)
self.addSubview(titleLabel)
imgView.snp.makeConstraints { make in
make.left.right.top.equalToSuperview()
make.height.equalTo(80.0)
}
titleLabel.snp.makeConstraints { make in
make.top.equalTo(imgView.snp.bottom).offset(12.0)
make.left.right.equalToSuperview()
make.height.equalTo(18.0)
}
}
}
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