Skip to content

G
galaxy-iOS
Commit f4b6313e authored by pete谢兆麟's avatar pete谢兆麟
Browse files
Options

Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop 

# Conflicts:
#	galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift
parents bc2980f9 b2dc3556
Hide whitespace changes
Inline Side-by-side
Showing with 1057 additions and 89 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ f4b6313e
......@@ -128,6 +128,10 @@
04358E042C77322700811928 /* YHHaveGrabbedNumberListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04358E032C77322700811928 /* YHHaveGrabbedNumberListCell.swift */; };
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 */; };
04358E102C78819F00811928 /* YHCancelAppointAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04358E0F2C78819F00811928 /* YHCancelAppointAlertView.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 */; };
......@@ -689,6 +693,7 @@
A5D5ADEF2BB90FBC0039FA6B /* YHCheckEamilAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5D5ADEE2BB90FBB0039FA6B /* YHCheckEamilAlertView.swift */; };
A5DE0D3C2BB9016200976FE1 /* YHEmailInputAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5DE0D3B2BB9016200976FE1 /* YHEmailInputAlertView.swift */; };
A5DF3D462BF72BA1003D5F03 /* YHTestViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5DF3D452BF72BA0003D5F03 /* YHTestViewController.swift */; };
A5DF9C632C78733200CE48E6 /* YHHKLegaldaysModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5DF9C622C78733200CE48E6 /* YHHKLegaldaysModel.swift */; };
A5E69D512BA304D400411932 /* DIN Alternate Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A5E69D502BA304D400411932 /* DIN Alternate Bold.ttf */; };
A5EB6C6F2C69FB9A0081FB6C /* YHOfficalLetterListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5EB6C672C69FB9A0081FB6C /* YHOfficalLetterListModel.swift */; };
A5EB6C702C69FB9A0081FB6C /* YHOfficialApprovalResultVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5EB6C692C69FB9A0081FB6C /* YHOfficialApprovalResultVC.swift */; };
......@@ -877,6 +882,10 @@
04358E032C77322700811928 /* YHHaveGrabbedNumberListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHaveGrabbedNumberListCell.swift; sourceTree = "<group>"; };
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>"; };
04358E0F2C78819F00811928 /* YHCancelAppointAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCancelAppointAlertView.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>"; };
......@@ -1448,6 +1457,7 @@
A5D5ADEE2BB90FBB0039FA6B /* YHCheckEamilAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCheckEamilAlertView.swift; sourceTree = "<group>"; };
A5DE0D3B2BB9016200976FE1 /* YHEmailInputAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHEmailInputAlertView.swift; sourceTree = "<group>"; };
A5DF3D452BF72BA0003D5F03 /* YHTestViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHTestViewController.swift; sourceTree = "<group>"; };
A5DF9C622C78733200CE48E6 /* YHHKLegaldaysModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHKLegaldaysModel.swift; sourceTree = "<group>"; };
A5E69D502BA304D400411932 /* DIN Alternate Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "DIN Alternate Bold.ttf"; sourceTree = "<group>"; };
A5EB6C672C69FB9A0081FB6C /* YHOfficalLetterListModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHOfficalLetterListModel.swift; sourceTree = "<group>"; };
A5EB6C692C69FB9A0081FB6C /* YHOfficialApprovalResultVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHOfficialApprovalResultVC.swift; sourceTree = "<group>"; };
......@@ -1649,6 +1659,8 @@
04256E222C76D22400A37BA4 /* YHAppointItem.swift */,
04256E1A2C75C60C00A37BA4 /* YHHKMemberModel.swift */,
04256E1C2C75C74200A37BA4 /* YHAppointHKResultModel.swift */,
04358E092C7835B000811928 /* YHMakeCertificatePlaceModel.swift */,
A5DF9C622C78733200CE48E6 /* YHHKLegaldaysModel.swift */,
);
path = M;
sourceTree = "<group>";
......@@ -1668,12 +1680,15 @@
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 */,
04358E0F2C78819F00811928 /* YHCancelAppointAlertView.swift */,
);
path = V;
sourceTree = "<group>";
......@@ -4209,6 +4224,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 */,
......@@ -4316,6 +4332,7 @@
A5ACE94A2B4564F7002C94D2 /* YHHUDProgressView.swift in Sources */,
04A271232BABFF3200652B1B /* YHCertificateUploadTypeCell.swift in Sources */,
04B360F32C636525001EB053 /* YHPrincipleWaitResultViewController.swift in Sources */,
04358E0A2C7835B000811928 /* YHMakeCertificatePlaceModel.swift in Sources */,
A582B2412BB95998009D098C /* YHHKPlanTipsCell.swift in Sources */,
A5D0012C2BABC84A001F003C /* YHFileListBottomView.swift in Sources */,
0485DFDC2C670C7200B50293 /* YHPrincipleSendMailView.swift in Sources */,
......@@ -4478,6 +4495,7 @@
045EEF102B9F171A0022A143 /* YHMainApplicantInformationViewModel.swift in Sources */,
044413FF2BC391F000784A14 /* YHServiceListViewController.swift in Sources */,
0493B3DC2BA7EFE600AF9393 /* YHCertificateSearchViewController.swift in Sources */,
A5DF9C632C78733200CE48E6 /* YHHKLegaldaysModel.swift in Sources */,
0430E65A2C7436CD000511E2 /* YHAdopterNewPeopleViewModel.swift in Sources */,
04256E1D2C75C74200A37BA4 /* YHAppointHKResultModel.swift in Sources */,
04CE1ADB2C2AD91F001CB80A /* YHActivityTitleItemView.swift in Sources */,
......@@ -4780,6 +4798,7 @@
045EEECA2B9F171A0022A143 /* YHMyDocumentsListViewController.swift in Sources */,
049D62C52C6F272800E811A1 /* YHRiskWarningCell.swift in Sources */,
04358E062C77334B00811928 /* YHHaveGrabbedNumberInfoView.swift in Sources */,
04358E102C78819F00811928 /* YHCancelAppointAlertView.swift in Sources */,
045EEF052B9F171A0022A143 /* YHFormItemExpireDateCell.swift in Sources */,
043B0A352C1190C6008A9BBA /* YHSelectFileSheetView.swift in Sources */,
0430E6462C73171E000511E2 /* YHAdopterStepTableViewCell.swift in Sources */,
......@@ -4788,6 +4807,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 */,
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/C/YHCertificateAppointViewController.swift
View file @ f4b6313e
......@@ -14,8 +14,11 @@ class YHCertificateAppointViewController: YHBaseViewController {
var sections: [[YHAppointItem]] = []
// 第一个section数据组
var items1: [YHAppointItem] = []
// 只装选人的cell
var items2: [YHAppointItem] = []
// 只装抢号中、已抢号
var items3: [YHAppointItem] = []
var waitList: [YHAppointMemberGroupModel] = []
var successList: [YHAppointMemberGroupModel] = []
......@@ -36,7 +39,7 @@ class YHCertificateAppointViewController: YHBaseViewController {
lazy var tableView: UITableView = {
let tableView = UITableView(frame:.zero, style:.grouped)
tableView.estimatedSectionHeaderHeight = 16.0
tableView.estimatedSectionHeaderHeight = 0.01
tableView.estimatedSectionFooterHeight = 0.01
tableView.contentInsetAdjustmentBehavior = .never
tableView.showsVerticalScrollIndicator = false
......@@ -58,8 +61,18 @@ class YHCertificateAppointViewController: YHBaseViewController {
return tableView
}()
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
if !viewModel.isHKHolidaysOKFlag {
loadHKHolidays()
}
}
override func viewDidLoad() {
super.viewDidLoad()
loadHKHolidays()
createUI()
}
......@@ -74,6 +87,7 @@ class YHCertificateAppointViewController: YHBaseViewController {
make.left.right.bottom.equalToSuperview()
make.top.equalTo(k_Height_NavigationtBarAndStatuBar)
}
requetHKPlaceList()
requestData()
}
......@@ -102,7 +116,8 @@ class YHCertificateAppointViewController: YHBaseViewController {
sections.removeAll()
items1.removeAll()
items2.removeAll()
items3.removeAll()
// *赴港办证
let item1 = YHAppointItem(type: .goHKMakeCertificate)
items1.append(item1)
......@@ -130,15 +145,27 @@ class YHCertificateAppointViewController: YHBaseViewController {
if self.isAllMembersGo { // 申请人统一赴港激活签证
let item5 = YHAppointItem(type: .confirmGoHKInfo)
let group = YHSelectGroupMemberModel()
group.arr = waitAppointMembers.deepCopy()
item5.model = group
item5.placeList = self.viewModel.placeList
item5.arrHkHolidays = self.viewModel.dataModelForHkHolidays?.legaldays ?? []
items2.append(item5)
} else { // 申请人不是统一赴港激活签证
let item6 = YHAppointItem(type: .confirmGoHKInfo)
item6.itemIndex = 0
let model1 = YHSelectGroupMemberModel()
model1.arr = waitAppointMembers
item6.model = model1
let group1 = YHSelectGroupMemberModel()
group1.arr = waitAppointMembers.deepCopy().map {
var member = $0
member.isSelected = true
return member
}
item6.model = group1
item6.placeList = self.viewModel.placeList
item6.arrHkHolidays = self.viewModel.dataModelForHkHolidays?.legaldays ?? []
items2.append(item6)
}
} else { // 有预约过的人员
......@@ -152,26 +179,33 @@ class YHCertificateAppointViewController: YHBaseViewController {
// 赴港办理抢号中批次
if self.waitList.count > 0 {
let item6 = YHAppointItem(type: .grabingNumberBatch)
items2.append(item6)
items3.append(item6)
}
// 赴港办理已抢号批次
if self.successList.count > 0 {
let item7 = YHAppointItem(type: .haveGrabedNumberBatch)
items2.append(item7)
items3.append(item7)
}
}
refreshData()
}
func refreshData() {
sections.removeAll()
if items1.count > 0 {
sections.append(items1)
}
if items2.count > 0 {
sections.append(items2)
}
if items3.count > 0 {
sections.append(items3)
}
self.tableView.reloadData()
}
}
......@@ -278,6 +312,11 @@ extension YHCertificateAppointViewController: UITableViewDelegate, UITableViewDa
let cell = tableView.dequeueReusableCell(withIdentifier: YHSelectApplicantGroupCell.cellReuseIdentifier, for: indexPath) as! YHSelectApplicantGroupCell
cell.dataModel = arr[indexPath.row]
cell.isShowSelectUserView = !self.isAllMembersGo
cell.selectBlock = {
[weak self] member, isSelect, groupIndex in
guard let self = self else { return }
self.selectMember(member, select: isSelect, groupLevel: groupIndex)
}
return cell
}
......@@ -289,15 +328,28 @@ extension YHCertificateAppointViewController: UITableViewDelegate, UITableViewDa
[weak self] groupModel in
guard let self = self else { return }
// 抢号中点击取消预约
YHHUD.show(.progress(message: "加载中..."))
self.viewModel.cancelAppoint(orderId: orderId, reservationId: groupModel.id) { success in
YHHUD.hide()
if !success {
YHHUD.flash(message: "取消失败")
return
let alert = YHCancelAppointAlertView.alertView()
alert.memberNamesText = groupModel.getMemberNames()
alert.selectBlock = {
[weak self] sure in
guard let self = self else { return }
if !sure {
return
}
YHHUD.show(.progress(message: "加载中..."))
self.viewModel.cancelAppoint(orderId: orderId, reservationId: groupModel.id) { success in
YHHUD.hide()
if !success {
YHHUD.flash(message: "取消失败")
return
}
self.requestData()
}
}
self.requestData()
}
alert.show()
}
return cell
}
......@@ -386,7 +438,7 @@ extension YHCertificateAppointViewController {
waitAppointMembers.removeAll()
for user in users {
if user.isAtLeast11Years() { // 不小于11岁的人才能预约赴港
user.isSelectedFlag = true
user.isSelected = true
waitAppointMembers.append(user)
} else {
......@@ -405,5 +457,116 @@ extension YHCertificateAppointViewController {
completion?()
}
}
func requetHKPlaceList() {
viewModel.getMakeCerPlaceList { success, error in
}
}
}
extension YHCertificateAppointViewController {
func loadHKHolidays() {
viewModel.getHKHolidays { success, error in
}
}
// memberId 申请人id
// select 点击选择
// groupLevel 是分的第几组 从0开始计数
func selectMember(_ currentMember: YHHKMemberModel, select:Bool, groupLevel:Int) {
// 获取当前批的成员组
var currentMembers:[YHHKMemberModel] = []
// 先改变点击当前批的选择状态
if 0 <= groupLevel, groupLevel < items2.count {
let item = items2[groupLevel]
if let members = item.model?.arr {
currentMembers = members
for member in members {
if member.id == currentMember.id {
member.isSelected = select
}
}
}
}
if !select { // 如果操作是取消
// 如果操作的当前批次是最后一批，则需要分新批次
if groupLevel == items2.count-1 {
// 进行分批
let newItem = YHAppointItem(type: .confirmGoHKInfo)
// 批次+1
newItem.itemIndex = groupLevel+1
let group1 = YHSelectGroupMemberModel()
// 找出上一批未选中的人
let needMembers = currentMembers.filter {
return $0.isSelected == false
}
// 在下一批中默认全选中
group1.arr = needMembers.deepCopy().map {
let item = $0
item.isSelected = true
return item
}
newItem.model = group1
newItem.placeList = self.viewModel.placeList
newItem.arrHkHolidays = self.viewModel.dataModelForHkHolidays?.legaldays ?? []
items2.append(newItem)
} else { // 如果操作的当前批次不是最后一批 需要更新后面几批的选中状态
let nextGroupIndex = groupLevel+1
let newMember = currentMember.copy() as! YHHKMemberModel
newMember.isSelected = true
if 0 <= groupLevel, groupLevel < items2.count {
let item = items2[nextGroupIndex]
if var members = item.model?.arr {
members.append(newMember)
item.model?.arr = members
}
}
}
} else { // 如果操作是选中
// 肯定会有下一层因为之前取消过
let nextGroupIndex = groupLevel+1
if 0 <= nextGroupIndex, nextGroupIndex < items2.count {
for i in nextGroupIndex..<items2.count {
let item = items2[i]
if var members = item.model?.arr {
// 下几批的组员中都要删除该人
members = members.filter { $0.id != currentMember.id }
item.model?.arr = members
}
}
}
}
// 无论是选中还是反选 检测下面所有批次有无全未选数组，有则删除该批
let nextGroupIndex = groupLevel+1
if 0 <= nextGroupIndex, nextGroupIndex < items2.count {
var i = nextGroupIndex
while i < items2.count {
let item = items2[i]
if let members = item.model?.arr {
let a = members.filter {
return $0.isSelected == true
}
// 数组中全未选
if a.count <= 0 {
items2.remove(at: i)
} else {
i += 1
}
}
}
}
refreshData()
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/M/YHAppointItem.swift
View file @ f4b6313e
......@@ -34,6 +34,11 @@ class YHAppointItem {
var itemIndex : Int = 0
var type: YHAppointItemType = .none
var model : YHSelectGroupMemberModel? // type = .confirmGoHKInfo 时候的赋值
// 办证地点选择列表
var placeList: [YHMakeCertificatePlaceModel] = []
var arrHkHolidays:[String]? //香港法定节假日
init(type: YHAppointItemType) {
self.type = type
}
......@@ -46,6 +51,9 @@ class YHSelectGroupMemberModel {
//赴港办证时间类型
var dateTye : Int = 0 //0 - 具体日期 1-具体时段
// 具体日期
var detailDateStr : String = ""
//开始时间
var startDateStr : String = ""
......@@ -53,5 +61,5 @@ class YHSelectGroupMemberModel {
var endDateStr : String = ""
//办证地点
var hkPlaceName : String = ""
var hkPlace : YHMakeCertificatePlaceModel = YHMakeCertificatePlaceModel()
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/M/YHHKLegaldaysModel.swift 0 → 100644
View file @ f4b6313e
//
// YHHKLegaldaysModel.swift
// galaxy
//
// Created by davidhuangA on 2024/8/23.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
import SmartCodable
class YHHKLegaldaysModel: SmartCodable {
var legaldays: [String] = []
required init() {
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/M/YHHKMemberModel.swift
View file @ f4b6313e
......@@ -9,7 +9,20 @@
import UIKit
import SmartCodable
class YHHKMemberModel: SmartCodable {
// [YHHKMemberModel] 数组实现神拷贝
extension Array where Element == YHHKMemberModel {
func deepCopy() -> [YHHKMemberModel] {
var results: [YHHKMemberModel] = []
for item in self {
let newItem = item.copy()
results.append(newItem as! YHHKMemberModel)
}
return results
}
}
class YHHKMemberModel: SmartCodable, NSCopying {
var id: Int = 0
var name: String = ""
......@@ -20,7 +33,8 @@ class YHHKMemberModel: SmartCodable {
var url: String = ""
var approvalDate: String = ""
var isSelectedFlag : Bool = false //本地使用
// 自定义
var isSelected: Bool = false //本地使用
enum CodingKeys: String, CodingKey {
case id = "id"
......@@ -37,7 +51,7 @@ class YHHKMemberModel: SmartCodable {
}
init(id: Int, name: String, type: String, fileNum: String, birthday: String, isCheck: Int, url: String, approvalDate: String) {
init(id: Int, name: String, type: String, fileNum: String, birthday: String, isCheck: Int, url: String, approvalDate: String, isSelected: Bool) {
self.id = id
self.name = name
self.type = type
......@@ -46,6 +60,12 @@ class YHHKMemberModel: SmartCodable {
self.isCheck = isCheck
self.url = url
self.approvalDate = approvalDate
self.isSelected = isSelected
}
func copy(with zone: NSZone? = nil) -> Any {
return YHHKMemberModel(id: self.id, name: self.name, type: self.type, fileNum: self.fileNum, birthday: self.birthday, isCheck: self.isCheck, url: self.url, approvalDate: self.approvalDate, isSelected: isSelected)
}
func isAtLeast11Years() -> Bool {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/M/YHMakeCertificatePlaceModel.swift 0 → 100644
View file @ f4b6313e
//
// YHMakeCertificatePlaceModel.swift
// galaxy
//
// Created by edy on 2024/8/23.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
import SmartCodable
class YHMakeCertificatePlaceModel: SmartCodable {
var id: Int = 0
var name: String = ""
// 自定义
var isSelect: Bool = false
required init() {
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/V/YHCancelAppointAlertView.swift 0 → 100644
View file @ f4b6313e
//
// YHCancelAppointAlertView.swift
// galaxy
//
// Created by edy on 2024/8/23.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
import AttributedString
class YHCancelAppointAlertView: UIView {
let baseTag = 9527
var selectBlock:((Bool)->())?
var memberNamesText: String = "" {
didSet {
let a: ASAttributedString = .init("取消预约后，不可恢复，您可重新预约！成员：", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor(alpha: 0.7)))
let b: ASAttributedString = .init("\(memberNamesText)", .font(UIFont.PFSC_B(ofSize: 14)),.foreground(UIColor.brandMainColor))
detailLabel.attributed.text = a+b
}
}
// 底层蒙版
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 iconImgView: UIImageView = {
let view = UIImageView(image: UIImage(named: "cs_family_risk"))
return view
}()
lazy var titleLabel: UILabel = {
let label = UILabel()
label.textAlignment = .center
label.font = UIFont.PFSC_M(ofSize: 17)
label.textColor = UIColor.mainTextColor
label.text = "取消预约"
return label
}()
lazy var detailLabel: UILabel = {
var label = UILabel()
label.numberOfLines = 0
label.font = UIFont.PFSC_R(ofSize: 14.0)
return label
}()
lazy var cancelBtn: UIButton = {
let button = UIButton()
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
button.setTitle("否", for: .normal)
button.setTitleColor(UIColor.white, for: .normal)
button.backgroundColor = .brandMainColor
button.tag = baseTag + 0
button.layer.cornerRadius = kCornerRadius3
return button
}()
lazy var confirmBtn: UIButton = {
let button = UIButton()
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
button.setTitle("是", for: .normal)
button.setTitleColor(UIColor.brandMainColor, for: .normal)
button.backgroundColor = .white
button.layer.borderWidth = 1.0
button.tag = baseTag + 1
button.layer.borderColor = UIColor.brandMainColor.cgColor
button.layer.cornerRadius = kCornerRadius3
return button
}()
@objc func didConfirmBtnClicked(_ sender:UIButton) {
let tag = sender.tag-self.baseTag
dismiss()
selectBlock?(tag == 1)
}
static func alertView() -> YHCancelAppointAlertView {
let view = YHCancelAppointAlertView(frame: UIScreen.main.bounds)
return view
}
@objc func show() {
UIApplication.shared.yhKeyWindow()?.addSubview(self)
}
@objc func dismiss() {
self.removeFromSuperview()
}
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
override init(frame: CGRect) {
super.init(frame: frame)
createUI()
}
func createUI() {
self.addSubview(blackMaskView)
self.addSubview(whiteContentView)
whiteContentView.addSubview(iconImgView)
whiteContentView.addSubview(titleLabel)
whiteContentView.addSubview(detailLabel)
whiteContentView.addSubview(confirmBtn)
whiteContentView.addSubview(cancelBtn)
confirmBtn.addTarget(self, action: #selector(didConfirmBtnClicked(_:)), for: .touchUpInside)
cancelBtn.addTarget(self, action: #selector(didConfirmBtnClicked(_:)), for: .touchUpInside)
blackMaskView.snp.makeConstraints { make in
make.edges.equalToSuperview()
}
whiteContentView.snp.makeConstraints { make in
make.left.equalTo(38)
make.right.equalTo(-38)
make.centerY.equalToSuperview()
}
iconImgView.snp.makeConstraints { make in
make.width.height.equalTo(53)
make.top.equalTo(30)
make.centerX.equalToSuperview()
}
titleLabel.snp.makeConstraints { make in
make.top.equalTo(iconImgView.snp.bottom).offset(16)
make.height.equalTo(24)
make.left.equalTo(21)
make.right.equalTo(-21)
}
detailLabel.snp.makeConstraints { make in
make.left.equalTo(21)
make.right.equalTo(-21)
make.top.equalTo(titleLabel.snp.bottom).offset(8)
}
confirmBtn.snp.makeConstraints { make in
make.top.equalTo(detailLabel.snp.bottom).offset(30)
make.left.equalTo(21)
make.right.equalTo(cancelBtn.snp.left).offset(-8)
make.bottom.equalTo(-21)
make.height.equalTo(45)
make.width.equalTo(cancelBtn)
}
cancelBtn.snp.makeConstraints { make in
make.centerY.equalTo(confirmBtn)
make.height.equalTo(45)
make.right.equalTo(-21)
}
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/V/YHHKPlaceInfoCell.swift 0 → 100644
View file @ f4b6313e
//
// 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)
}
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/V/YHInfoItemSelectSheetView.swift
View file @ f4b6313e
......@@ -12,30 +12,43 @@ class YHInfoItemSelectSheetView: UIView {
var titleMaxWidth = 112.0
var clickBlock: (()->())?
var title: String = "" {
didSet {
titleLabel.text = title
}
}
var placeHolder: String = ""
var detail: String = "" {
didSet {
if detail.isEmpty {
// 显示placeHolder
detailLabel.text = self.placeHolder
detailLabel.textColor = .placeHolderColor
detailLabel.textAlignment = .right
return
}
detailLabel.text = detail
detailLabel.textColor = .mainTextColor
detailLabel.textAlignment = .left
}
}
var isShowDetailOneline:Bool = false {
didSet {
detailLabel.textAlignment = isShowDetailOneline ? .right : .left
// detailLabel.textAlignment = isShowDetailOneline ? .right : .left
detailLabel.numberOfLines = isShowDetailOneline ? 1 : 0
detailLabel.snp.remakeConstraints { make in
make.top.equalTo(16)
make.left.equalTo(titleLabel.snp.right)
make.right.equalTo(arrowImgView.snp.left)
make.bottom.equalTo(-16)
if isShowDetailOneline {
make.height.equalTo(20)
} else {
make.left.equalTo(titleLabel.snp.right)
}
}
self.setNeedsLayout()
......@@ -53,13 +66,15 @@ class YHInfoItemSelectSheetView: UIView {
let label = UILabel()
label.numberOfLines = 0
label.font = UIFont.PFSC_R(ofSize: 14)
label.textColor = .mainTextColor
return label
}()
lazy var detailLabel: UILabel = {
private lazy var detailLabel: UILabel = {
let label = UILabel()
label.numberOfLines = 0
label.font = UIFont.PFSC_M(ofSize: 14)
label.textColor = .mainTextColor
return label
}()
......@@ -76,12 +91,19 @@ class YHInfoItemSelectSheetView: UIView {
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
@objc func didSelectView() {
clickBlock?()
}
func createUI() {
self.addSubview(titleLabel)
self.addSubview(detailLabel)
self.addSubview(arrowImgView)
self.addSubview(lineView)
let tap = UITapGestureRecognizer(target: self, action: #selector(didSelectView))
self.addGestureRecognizer(tap)
lineView.snp.makeConstraints { make in
make.left.equalTo(0)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/V/YHSelectApplicantCell.swift
View file @ f4b6313e
......@@ -52,7 +52,7 @@ class YHSelectApplicantCell: UICollectionViewCell {
func updateApplicantInfo(_ applicant: YHHKMemberModel) {
nameLabel.text = applicant.name
let imgName = applicant.isSelectedFlag ? "login_privacy_agree" : "login_privacy_disagree_glay"
let imgName = applicant.isSelected ? "login_privacy_agree" : "login_privacy_disagree_glay"
selectImgView.image = UIImage(named: imgName)
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/V/YHSelectApplicantGroupCell.swift
View file @ f4b6313e
......@@ -9,16 +9,6 @@
import UIKit
import AttributedString
class YHSelectApplicantInfo {
var name: String = ""
var isSelect: Bool = false
init(name: String, isSelect: Bool) {
self.name = name
self.isSelect = isSelect
}
}
class YHSelectApplicantGroupCell: UITableViewCell {
static let cellReuseIdentifier = "YHSelectApplicantGroupCell"
......@@ -30,6 +20,9 @@ class YHSelectApplicantGroupCell: UITableViewCell {
}
}
// param 选中的用户 是否选中 选中的用户是第几批
var selectBlock: ((_ member: YHHKMemberModel, _ isSelect: Bool, _ groupIndex: Int)->())?
var isShowSelectUserView: Bool = true {
didSet {
......@@ -104,8 +97,8 @@ class YHSelectApplicantGroupCell: UITableViewCell {
lazy var collectionView: UICollectionView = {
let layout = UICollectionViewFlowLayout()
layout.scrollDirection = .vertical
layout.minimumInteritemSpacing = 0
layout.minimumLineSpacing = 16
layout.minimumInteritemSpacing = 0.0
layout.minimumLineSpacing = 16.0
let collectView = UICollectionView(frame:.zero, collectionViewLayout: layout)
collectView.delegate = self
......@@ -123,7 +116,12 @@ class YHSelectApplicantGroupCell: UITableViewCell {
view.options = ["具体日期", "具体时段"]
view.selectIndex = 0
view.selectBlock = {
index in
[weak self] index in
guard let self = self else { return }
if let model = dataModel?.model {
model.dateTye = index
self.updateUI()
}
}
return view
}()
......@@ -132,14 +130,46 @@ class YHSelectApplicantGroupCell: UITableViewCell {
let view = YHInfoItemSelectSheetView(frame: .zero)
view.isShowDetailOneline = true
view.title = "具体日期"
view.detail = "2024-03-14 ～ 2024-03-14"
view.placeHolder = "请选择具体日期"
view.detail = ""
view.clickBlock = {
[weak self] in
guard let self = self else { return }
if let model = dataModel?.model {
if model.dateTye == 0 { // 选择具体时间
self.selectDetailDate()
} else { // 具体时段
self.selectDurationTime()
}
}
}
return view
}()
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
}()
......@@ -238,7 +268,8 @@ extension YHSelectApplicantGroupCell: UICollectionViewDelegate, UICollectionView
// 返回每个单元格的大小
func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
return CGSize(width: floorl(collectionView.width/3.0), height: 20)
let listWidth = KScreenWidth-(14.0+18.0+16.0)*2.0
return CGSize(width: floorl(listWidth/3.0), height: 20)
}
// 返回自定义单元格
......@@ -256,10 +287,18 @@ extension YHSelectApplicantGroupCell: UICollectionViewDelegate, UICollectionView
func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
if let arr = dataModel?.model?.arr {
if 0 <= indexPath.item && indexPath.item < arr.count {
let text = arr[indexPath.item]
printLog(text)
if let dataModel = self.dataModel, let model = dataModel.model {
if 0 <= indexPath.item && indexPath.item < model.arr.count {
let member = model.arr[indexPath.item]
let selectArr = model.arr.filter {
return $0.isSelected == true
}
if selectArr.count == 1, member.isSelected == true, member.id == selectArr[0].id {
// 分组中仅有一个选中用户 且点击的是该用户
YHHUD.flash(message: "一个批次最少需要选中一个申请个人")
return
}
selectBlock?(member, !member.isSelected, dataModel.itemIndex)
}
}
}
......@@ -272,13 +311,35 @@ private extension YHSelectApplicantGroupCell {
return
}
let a: ASAttributedString = .init("*", .font(UIFont.PFSC_M(ofSize: 17)),.foreground(UIColor.failColor))
let b: ASAttributedString = .init("请您确认第\(model.itemIndex + 1)批赴港信息", .font(UIFont.PFSC_M(ofSize: 17)),.foreground(UIColor.mainTextColor))
titleLabel.attributed.text = a+b
collectionView.reloadData()
collectionView.snp.updateConstraints { make in
make.height.equalTo(self.getCollectionViewHeight())
let isShowSelectList = self.isShowSelectUserView
self.isShowSelectUserView = isShowSelectList
// 时间选择UI更新
optionsView.selectIndex = 0
if let model = dataModel?.model {
if model.dateTye == 0 { // 具体时间
optionsView.selectIndex = 0
timeSelectView.placeHolder = "请选择具体日期"
timeSelectView.detail = model.detailDateStr
} else { // 具体时段
optionsView.selectIndex = 1
timeSelectView.placeHolder = "请选择具体时段"
if !model.startDateStr.isEmpty, !model.endDateStr.isEmpty {
self.timeSelectView.detail = "\(model.startDateStr) ~ \(model.endDateStr)"
} else {
self.timeSelectView.detail = ""
}
}
// 办证地点更新
self.locationSelectView.detail = model.hkPlace.name
}
}
......@@ -299,4 +360,47 @@ private extension YHSelectApplicantGroupCell {
}
return 0.0
}
// 选择具体日期
func selectDetailDate() {
YHDatePickView.show(type: .yyyymmdd, title:"选择意向赴港时间".local, lastIsTaday: false, currentDay:"") {
[weak self] dateStr in
guard let self = self else { return }
timeSelectView.detail = dateStr
if let model = dataModel?.model {
model.detailDateStr = dateStr
}
}
}
// 选择时间段
func selectDurationTime() {
let view = YHRangeDatePickerSheetView.sheetView()
view.block = {
[weak self] (startDate,endDate) in
guard let self = self else { return }
let format = DateFormatter()
format.dateFormat = "yyyy-MM-dd"
let startDateStr = format.string(from: startDate)
let endDateStr = format.string(from: endDate)
printLog("\(startDateStr) ~ \(endDateStr)")
if !startDateStr.isEmpty, !endDateStr.isEmpty {
self.timeSelectView.detail = "\(startDateStr) ~ \(endDateStr)"
} else {
self.timeSelectView.detail = ""
}
if let model = dataModel?.model {
model.startDateStr = startDateStr
model.endDateStr = endDateStr
}
}
view.show() //for test hjl
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/V/YHSelectHKPlaceListView.swift 0 → 100644
View file @ f4b6313e
//
// 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 selectModel: YHMakeCertificatePlaceModel? = nil
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)
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)
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() {
if let model = self.selectModel {
selectBlock?(model)
}
self.dismiss()
}
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.addSubview(whiteContentView)
whiteContentView.addSubview(titleLabel)
whiteContentView.addSubview(cancelBtn)
whiteContentView.addSubview(confirmBtn)
whiteContentView.addSubview(lineView)
whiteContentView.addSubview(tableView)
cancelBtn.addTarget(self, action: #selector(dismiss), for: .touchUpInside)
confirmBtn.addTarget(self, action: #selector(sure), for: .touchUpInside)
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]
selectModel = model
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
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/VM/YHCerAppointViewModel.swift
View file @ f4b6313e
......@@ -12,8 +12,63 @@ class YHCerAppointViewModel: NSObject {
var serviceArr: [YHServiceItem] = []
var hkUsers: [YHHKMemberModel] = []
var placeList: [YHMakeCertificatePlaceModel] = []
var appointResult: YHAppointHKResultModel = YHAppointHKResultModel()
//香港节假日
var dataModelForHkHolidays : YHHKLegaldaysModel?
var isHKHolidaysOKFlag : Bool = false
var isRequestFlag : Bool = false
// 获取香港节假日
func getHKHolidays(callback:((_ success: Bool, _ error: YHErrorModel?)->())?) {
if isHKHolidaysOKFlag {
return
}
if isRequestFlag {
return
}
isRequestFlag = true
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.AppointHK.hkholidaysApi
let _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in
self?.isRequestFlag = false
//1. json字符串 转 对象
guard let self = self else { return }
printLog("model 是 ==> \(json)")
if json.code == 200 {
let dic = json.data
guard let resultModel = YHHKLegaldaysModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
callback?(false, err)
return
}
self.isHKHolidaysOKFlag = true
self.dataModelForHkHolidays = resultModel
callback?(true, nil)
} else {
let err = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg.isEmpty ? "" : json.msg)
self.hkUsers = []
callback?(false, err)
}
} failBlock: { err in
self.isRequestFlag = false
self.hkUsers = []
callback?(false, err)
}
}
// 获取香港服务列表
func getServicelist(_ callBack: @escaping (_ success: Bool,_ error: YHErrorModel?)->()) {
......@@ -212,6 +267,45 @@ class YHCerAppointViewModel: NSObject {
callback?(false)
}
}
func getMakeCerPlaceList(callback:((_ success: Bool, _ error: YHErrorModel?)->())?) {
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.AppointHK.cerPlaceList
let _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in
//1. json字符串 转 对象
guard let self = self else { return }
printLog("model 是 ==> \(json)")
if json.code == 200 {
let dic = json.data
guard let arr = [YHMakeCertificatePlaceModel].deserialize(array: dic as? [Any]) else {
let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
self.placeList = []
callback?(false, err)
return
}
self.placeList.removeAll()
for user in arr {
if let user = user {
self.placeList.append(user)
}
}
callback?(true, nil)
} else {
let err = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg.isEmpty ? "" : json.msg)
self.placeList = []
callback?(false, err)
}
} failBlock: { err in
self.placeList = []
callback?(false, err)
}
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/VisaPayment(4电子签字缴费)/C/YHVisaPaymentVC.swift
View file @ f4b6313e
......@@ -131,7 +131,7 @@ private extension YHVisaPaymentVC {
}
}
orderID = 133874//for test hjl
// orderID = 133874//for test hjl
view.addSubview(tableView)
view.addSubview(bottomView)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/VisaPayment(4电子签字缴费)/V/YHPayMemberContentItems.swift
View file @ f4b6313e
......@@ -90,7 +90,14 @@ extension YHPayMemberContentItems {
make.top.equalTo(lastView.snp.bottom).offset(kMargin)
make.left.right.equalToSuperview()
}
item.updateUI(title: "可缴费时间段：",detail: "\(model.min_pay_time) - \(model.max_pay_time)",showBtn: false)
if model.min_pay_time.isYHEmpty() {
item.updateUI(title: "可缴费时间段：",detail: "\(model.max_pay_time)前",showBtn: false)
} else {
item.updateUI(title: "可缴费时间段：",detail: "\(model.min_pay_time) - \(model.max_pay_time)",showBtn: false)
}
lastView = item
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/VisaPayment(4电子签字缴费)/V/YHVisaPayTypeCell.swift
View file @ f4b6313e
......@@ -101,20 +101,43 @@ private extension YHVisaPayTypeCell {
PHPhotoLibrary.requestAuthorization { status in
if status == .authorized {
// 保存图片到相册
UIImageWriteToSavedPhotosAlbum(image, nil, nil, nil)
DispatchQueue.main.async {
YHHUD.flash(message: "保存成功")
}
// 保存UIImage对象到相册
UIImageWriteToSavedPhotosAlbum(image, self, #selector(self.image(_:didFinishSavingWithError:contextInfo:)), nil)
//
//// DispatchQueue.main.async {
//// YHHUD.flash(message: "保存成功")
//// }
//
//
// UIImageWriteToSavedPhotosAlbum(
} else {
YHHUD.flash(message: "保存失败，请检查系统权限")
}
}
}
@objc func image(_ image: UIImage, didFinishSavingWithError error: Error?, contextInfo: UnsafeMutableRawPointer?) {
// 保存完成后的处理逻辑
if let error = error {
print("保存照片失败：\(error.localizedDescription)")
YHHUD.flash(message: "保存失败")
} else {
print("保存照片成功")
YHHUD.flash(message: "保存成功")
}
}
/// 长按
@objc func onLongPress(_ press: UILongPressGestureRecognizer) {
if press.state == .began {
saveImage(UIImage(named: "visaPay_qr") ?? UIImage())
if let image = self.qrCodeImageView.image {
saveImage(image)
} else {
YHHUD.flash(message: "保存失败")
}
}
}
......
galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift
View file @ f4b6313e
......@@ -346,20 +346,13 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
return
}
// if true {
// // test dy
//// if let orderID = UserDefaults.standard.value(forKey: "orderIdForPreview") as? Int {
//// let vc = YHFamilyInfoConfirmViewController()
//// vc.orderId = orderID
//// self.navigationController?.pushViewController(vc)
//// }
//
if true {
let vc = YHCertificateAppointViewController()
vc.orderId = 151085
self.navigationController?.pushViewController(vc)
return
// }
}
let item: PersonalModuleItem = items[indexPath.row]
switch item.type {
......
galaxy/galaxy/Classes/Tools/Extention/String+Extension.swift
View file @ f4b6313e
......@@ -277,5 +277,23 @@ extension String {
}
return nil
//方法二 保存图片的时候有问题
// let data = self.data(using: String.Encoding.ascii)
// let filter = CIFilter(name: "CIQRCodeGenerator")
// filter?.setValue(data, forKey: "inputMessage")
// filter?.setValue("H", forKey: "inputCorrectionLevel") // 设置二维码的容错率
//
// // 获取生成的二维码CIImage
// guard let outputImage = filter?.outputImage else { return nil }
//
// // 将CIImage转换为UIImage
// let scaleX = 5.0
// let scaleY = 5.0
// let transformedImage = outputImage.transformed(by: CGAffineTransform(scaleX: scaleX, y: scaleY))
// let qrCodeImage = UIImage(ciImage: transformedImage)
//
// return qrCodeImage
}
}
galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift
View file @ f4b6313e
......@@ -434,7 +434,11 @@ class YHAllApiName {
}
//赴港办证预约
struct AppointHK {
// 获取香港节假日
static let hkholidaysApi = "super-app/holiday/get"
// 所有赴港人员列表
static let hkMembers = "super-app/order/hk/user"
// 获取港府预约结果
......@@ -445,7 +449,8 @@ class YHAllApiName {
static let saveNeedGoHK = "super-app/order/hk/save-need-to-hk"
// 取消预约
static let cancelAppoint = "super-app/reservation/cancel"
// 港府办证地点列表
static let cerPlaceList = "super-app/order/hk/select-position-list"
}
// 新增受养人
......
galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/客服段/办证段/4电子签字缴费/visaPay_qr.imageset/Contents.json deleted 100644 → 0
View file @ bc2980f9
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "image 56@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "image 56@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 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