Commit ddcff9ff authored by Steven杜宇's avatar Steven杜宇

// 办证地点选择逻辑

parent 4d2b09a0
......@@ -127,6 +127,8 @@
04358E062C77334B00811928 /* YHHaveGrabbedNumberInfoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04358E052C77334B00811928 /* YHHaveGrabbedNumberInfoView.swift */; };
04358E082C77657000811928 /* YHReAppointViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04358E072C77657000811928 /* YHReAppointViewController.swift */; };
04358E0A2C7835B000811928 /* YHMakeCertificatePlaceModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04358E092C7835B000811928 /* YHMakeCertificatePlaceModel.swift */; };
04358E0C2C7836BB00811928 /* YHSelectHKPlaceListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04358E0B2C7836BB00811928 /* YHSelectHKPlaceListView.swift */; };
04358E0E2C78395200811928 /* YHHKPlaceInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04358E0D2C78395200811928 /* YHHKPlaceInfoCell.swift */; };
0435FA7F2BA178C100024EAE /* YHCommonAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0435FA7E2BA178C100024EAE /* YHCommonAlertView.swift */; };
0435FA812BA186D600024EAE /* YHMyFileMethodTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0435FA802BA186D600024EAE /* YHMyFileMethodTableViewCell.swift */; };
0435FA832BA2DEB100024EAE /* YHCardButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0435FA822BA2DEB100024EAE /* YHCardButton.swift */; };
......@@ -875,6 +877,8 @@
04358E052C77334B00811928 /* YHHaveGrabbedNumberInfoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHaveGrabbedNumberInfoView.swift; sourceTree = "<group>"; };
04358E072C77657000811928 /* YHReAppointViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHReAppointViewController.swift; sourceTree = "<group>"; };
04358E092C7835B000811928 /* YHMakeCertificatePlaceModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMakeCertificatePlaceModel.swift; sourceTree = "<group>"; };
04358E0B2C7836BB00811928 /* YHSelectHKPlaceListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSelectHKPlaceListView.swift; sourceTree = "<group>"; };
04358E0D2C78395200811928 /* YHHKPlaceInfoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHKPlaceInfoCell.swift; sourceTree = "<group>"; };
0435FA7E2BA178C100024EAE /* YHCommonAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCommonAlertView.swift; sourceTree = "<group>"; };
0435FA802BA186D600024EAE /* YHMyFileMethodTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyFileMethodTableViewCell.swift; sourceTree = "<group>"; };
0435FA822BA2DEB100024EAE /* YHCardButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCardButton.swift; sourceTree = "<group>"; };
......@@ -1667,12 +1671,14 @@
04256E262C77127600A37BA4 /* YHWaitAppointMembersCell.swift */,
04256DF12C734E7E00A37BA4 /* YHGrabFileCell.swift */,
04256DF52C736A0800A37BA4 /* YHServiceItemCell.swift */,
04358E0D2C78395200811928 /* YHHKPlaceInfoCell.swift */,
04256DE32C72E3FA00A37BA4 /* YHInfoItemOptionView.swift */,
04256DE92C73263A00A37BA4 /* YHInfoItemSelectSheetView.swift */,
04256DEB2C732F6900A37BA4 /* YHGrabingNumberListView.swift */,
04358E052C77334B00811928 /* YHHaveGrabbedNumberInfoView.swift */,
04256DEF2C733B2D00A37BA4 /* YHGrabNumberInfoView.swift */,
04256DF32C73626900A37BA4 /* YHServiceSelectAlertView.swift */,
04358E0B2C7836BB00811928 /* YHSelectHKPlaceListView.swift */,
);
path = V;
sourceTree = "<group>";
......@@ -4205,6 +4211,7 @@
A5FD63BD2B623C2C00D1D9DA /* YHInformationPerfectListVC.swift in Sources */,
045EEE8D2B9F171A0022A143 /* YHPreviewInfoCell.swift in Sources */,
047AA3E22C4A66CE009C4554 /* YHLifeItemTableViewCell.swift in Sources */,
04358E0C2C7836BB00811928 /* YHSelectHKPlaceListView.swift in Sources */,
0430E6782C74A53F000511E2 /* YHAdopterMarryCardTableViewCell.swift in Sources */,
A5765B262C771F86002CD3C1 /* YHRangeDatePickerView.swift in Sources */,
048FA0362BFDE04000AD3BA9 /* YHSubmitAllInfoSuccessAlertView.swift in Sources */,
......@@ -4784,6 +4791,7 @@
04FD85742C219CFD00BEF9C5 /* YHMatchResultListViewController.swift in Sources */,
045EEEB72B9F171A0022A143 /* YHWorkItemAddView.swift in Sources */,
0430E65C2C744187000511E2 /* YHAdopterCardModel.swift in Sources */,
04358E0E2C78395200811928 /* YHHKPlaceInfoCell.swift in Sources */,
A5ACE9372B4564F7002C94D2 /* YHBaseUrlManager.swift in Sources */,
04EA230A2BB5172F009DA928 /* YHDocumentPromptTableViewCell.swift in Sources */,
A5EB6C6F2C69FB9A0081FB6C /* YHOfficalLetterListModel.swift in Sources */,
......
......@@ -74,6 +74,7 @@ class YHCertificateAppointViewController: YHBaseViewController {
make.left.right.bottom.equalToSuperview()
make.top.equalTo(k_Height_NavigationtBarAndStatuBar)
}
requetHKPlaceList()
requestData()
}
......@@ -130,6 +131,10 @@ class YHCertificateAppointViewController: YHBaseViewController {
if self.isAllMembersGo { // 申请人统一赴港激活签证
let item5 = YHAppointItem(type: .confirmGoHKInfo)
let group = YHSelectGroupMemberModel()
group.arr = waitAppointMembers
item5.model = group
item5.placeList = self.viewModel.placeList
items2.append(item5)
} else { // 申请人不是统一赴港激活签证
......@@ -138,6 +143,7 @@ class YHCertificateAppointViewController: YHBaseViewController {
let model1 = YHSelectGroupMemberModel()
model1.arr = waitAppointMembers
item6.model = model1
item6.placeList = self.viewModel.placeList
items2.append(item6)
}
......@@ -405,5 +411,12 @@ extension YHCertificateAppointViewController {
completion?()
}
}
func requetHKPlaceList() {
viewModel.getMakeCerPlaceList { success, error in
}
}
}
......@@ -34,6 +34,8 @@ class YHAppointItem {
var itemIndex : Int = 0
var type: YHAppointItemType = .none
var model : YHSelectGroupMemberModel? // type = .confirmGoHKInfo 时候的赋值
// 办证地点选择列表
var placeList: [YHMakeCertificatePlaceModel] = []
init(type: YHAppointItemType) {
self.type = type
}
......@@ -56,5 +58,5 @@ class YHSelectGroupMemberModel {
var endDateStr : String = ""
//办证地点
var hkPlaceName : String = ""
var hkPlace : YHMakeCertificatePlaceModel = YHMakeCertificatePlaceModel()
}
......@@ -14,6 +14,9 @@ class YHMakeCertificatePlaceModel: SmartCodable {
var id: Int = 0
var name: String = ""
// 自定义
var isSelect: Bool = false
required init() {
}
......
//
// YHHKPlaceInfoCell.swift
// galaxy
//
// Created by edy on 2024/8/23.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHHKPlaceInfoCell: UITableViewCell {
static let cellReuseIdentifier = "YHHKPlaceInfoCell"
let selectTextColor = UIColor.mainTextColor
let unselectTextColor = UIColor.mainTextColor(alpha: 0.3)
let selectFont = UIFont.PFSC_M(ofSize: 14)
let unselectFont = UIFont.PFSC_R(ofSize: 14)
let selectBgColor = UIColor.init(hex: 0xF0F4FB)
let unselectBgColor = UIColor.white
func updateModel(_ model: YHMakeCertificatePlaceModel) {
detailLabel.text = model.name
detailLabel.textColor = model.isSelect ? selectTextColor : unselectTextColor
detailLabel.font = model.isSelect ? selectFont : unselectFont
whiteView.backgroundColor = model.isSelect ? selectBgColor : unselectBgColor
}
lazy var whiteView: UIView = {
let view = UIView()
view.backgroundColor = unselectBgColor
view.layer.cornerRadius = 3.0
return view
}()
lazy var detailLabel: UILabel = {
let label = UILabel()
label.numberOfLines = 0
label.textColor = self.unselectTextColor
label.font = self.unselectFont
return label
}()
required init?(coder: NSCoder) {
super.init(coder: coder)
}
override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
super.init(style: style, reuseIdentifier: reuseIdentifier)
setupUI()
}
func setupUI() {
self.selectionStyle = .none
self.backgroundColor = .clear
self.contentView.backgroundColor = .clear
contentView.addSubview(self.whiteView)
self.whiteView.addSubview(detailLabel)
whiteView.snp.makeConstraints { make in
make.edges.equalToSuperview()
}
detailLabel.snp.makeConstraints { make in
make.left.equalTo(16)
make.right.equalTo(-16)
make.top.equalTo(12)
make.bottom.equalTo(-12)
}
}
}
......@@ -146,7 +146,26 @@ class YHSelectApplicantGroupCell: UITableViewCell {
lazy var locationSelectView: YHInfoItemSelectSheetView = {
let view = YHInfoItemSelectSheetView(frame: .zero)
view.title = "港府办证地点"
view.detail = "九龙办事处(长沙湾) "
view.placeHolder = "请选择"
view.detail = ""
view.clickBlock = {
[weak self] in
guard let self = self else { return }
if let arr = dataModel?.placeList, arr.count > 0 {
let listView = YHSelectHKPlaceListView.listView()
listView.listArr = arr
listView.selectBlock = {
[weak self] selectPlace in
guard let self = self else { return }
view.detail = selectPlace.name
if let model = dataModel?.model {
model.hkPlace = selectPlace
self.updateUI()
}
}
listView.show()
}
}
return view
}()
......@@ -288,6 +307,7 @@ private extension YHSelectApplicantGroupCell {
make.height.equalTo(self.getCollectionViewHeight())
}
// 时间选择UI更新
optionsView.selectIndex = 0
if let model = dataModel?.model {
if model.dateTye == 0 { // 具体时间
......@@ -305,6 +325,9 @@ private extension YHSelectApplicantGroupCell {
self.timeSelectView.detail = ""
}
}
// 办证地点更新
self.locationSelectView.detail = model.hkPlace.name
}
}
......
//
// YHSelectHKPlaceListView.swift
// galaxy
//
// Created by edy on 2024/8/23.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHSelectHKPlaceListView: UIView {
static func listView() -> YHSelectHKPlaceListView {
let view = YHSelectHKPlaceListView(frame: UIScreen.main.bounds)
return view
}
var selectBlock: ((YHMakeCertificatePlaceModel)->())?
var listArr:[YHMakeCertificatePlaceModel] = [] {
didSet {
self.tableView.reloadData()
}
}
// 底层蒙版
lazy var blackMaskView: UIView = {
let view = UIView()
view.backgroundColor = .alertMaskColor
return view
}()
lazy var whiteContentView: UIView = {
let view = UIView()
view.backgroundColor = .white
view.layer.cornerRadius = kCornerRadius6
return view
}()
lazy var tableView: UITableView = {
let tableView = UITableView(frame: CGRect.zero, style:.grouped)
if #available(iOS 15.0, *) {
tableView.sectionHeaderTopPadding = 0.0
}
tableView.estimatedSectionHeaderHeight = 0.1
tableView.estimatedSectionFooterHeight = 0.1
tableView.contentInsetAdjustmentBehavior = .never
tableView.showsVerticalScrollIndicator = false
tableView.backgroundColor = .clear
tableView.separatorStyle = .none
tableView.bounces = false
tableView.register(YHHKPlaceInfoCell.self, forCellReuseIdentifier: YHHKPlaceInfoCell.cellReuseIdentifier)
tableView.delegate = self
tableView.dataSource = self
tableView.isScrollEnabled = false
return tableView
}()
var titleLabel: UILabel = {
let label = UILabel()
label.text = "港府办证地点选择"
label.font = UIFont.PFSC_M(ofSize: 17)
label.textColor = UIColor.mainTextColor
label.textAlignment = .center
return label
}()
var cancelBtn: UIButton = {
let button = UIButton(type: .custom)
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
button.contentHorizontalAlignment = .center
button.setTitle("取消", for: .normal)
button.setTitleColor( UIColor.mainTextColor, for: .normal)
button.addTarget(self, action: #selector(dismiss), for: .touchUpInside)
return button
}()
var confirmBtn: UIButton = {
let button = UIButton(type: .custom)
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
button.contentHorizontalAlignment = .center
button.setTitle("确定", for: .normal)
button.setTitleColor( UIColor.brandMainColor, for: .normal)
button.addTarget(self, action: #selector(sure), for: .touchUpInside)
return button
}()
var lineView: UIView = {
let view = UIView()
view.backgroundColor = UIColor.separatorColor
return view
}()
func show() {
UIApplication.shared.yhKeyWindow()?.addSubview(self)
}
@objc func dismiss() {
self.removeFromSuperview()
}
@objc func sure() {
}
override init(frame: CGRect) {
super.init(frame: frame)
createUI()
}
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
func createUI() {
self.addSubview(blackMaskView)
self.didAddSubview(whiteContentView)
whiteContentView.didAddSubview(titleLabel)
whiteContentView.didAddSubview(cancelBtn)
whiteContentView.didAddSubview(confirmBtn)
whiteContentView.didAddSubview(lineView)
whiteContentView.didAddSubview(tableView)
blackMaskView.snp.makeConstraints { make in
make.edges.equalToSuperview()
}
whiteContentView.snp.makeConstraints { make in
make.height.equalTo(403)
make.left.right.bottom.equalToSuperview()
}
titleLabel.snp.makeConstraints { make in
make.top.equalTo(0)
make.height.equalTo(51)
make.centerX.equalToSuperview()
}
cancelBtn.snp.makeConstraints { make in
make.left.equalTo(16)
make.height.equalTo(51)
make.width.equalTo(38)
make.centerY.equalTo(titleLabel)
}
confirmBtn.snp.makeConstraints { make in
make.right.equalTo(-16)
make.height.equalTo(51)
make.width.equalTo(38)
make.centerY.equalTo(titleLabel)
}
lineView.snp.makeConstraints { make in
make.left.equalTo(16)
make.top.equalTo(titleLabel.snp.bottom)
make.height.equalTo(1)
make.right.equalTo(-16)
}
tableView.snp.makeConstraints { make in
make.top.equalTo(lineView.snp.bottom).offset(12)
make.left.equalTo(16)
make.right.equalTo(-16)
make.bottom.equalTo(-34)
}
}
}
extension YHSelectHKPlaceListView: UITableViewDelegate, UITableViewDataSource {
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return listArr.count
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: YHHKPlaceInfoCell.cellReuseIdentifier, for: indexPath) as! YHHKPlaceInfoCell
if 0 <= indexPath.row && indexPath.row < listArr.count {
let model = listArr[indexPath.row]
cell.updateModel(model)
}
return cell
}
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
return UITableView.automaticDimension
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
if 0 <= indexPath.row && indexPath.row < listArr.count {
let model = listArr[indexPath.row]
for item in listArr {
item.isSelect = (model.id == item.id)
}
self.tableView.reloadData()
}
}
private func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> CGFloat {
return 0.1
}
private func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> CGFloat {
return 0.1
}
func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
let view = UIView()
return view
}
func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
let view = UIView()
return view
}
}
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