Commit 5f4426bc authored by David黄金龙's avatar David黄金龙

香港法定日期 获取及逻辑

parent 9ebbd822
...@@ -61,8 +61,18 @@ class YHCertificateAppointViewController: YHBaseViewController { ...@@ -61,8 +61,18 @@ class YHCertificateAppointViewController: YHBaseViewController {
return tableView return tableView
}() }()
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
if !viewModel.isHKHolidaysOKFlag {
loadHKHolidays()
}
}
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
loadHKHolidays()
createUI() createUI()
} }
...@@ -139,6 +149,7 @@ class YHCertificateAppointViewController: YHBaseViewController { ...@@ -139,6 +149,7 @@ class YHCertificateAppointViewController: YHBaseViewController {
group.arr = waitAppointMembers.deepCopy() group.arr = waitAppointMembers.deepCopy()
item5.model = group item5.model = group
item5.placeList = self.viewModel.placeList item5.placeList = self.viewModel.placeList
item5.arrHkHolidays = self.viewModel.dataModelForHkHolidays?.legaldays ?? []
items2.append(item5) items2.append(item5)
} else { // 申请人不是统一赴港激活签证 } else { // 申请人不是统一赴港激活签证
...@@ -152,6 +163,7 @@ class YHCertificateAppointViewController: YHBaseViewController { ...@@ -152,6 +163,7 @@ class YHCertificateAppointViewController: YHBaseViewController {
} }
item6.model = group1 item6.model = group1
item6.placeList = self.viewModel.placeList item6.placeList = self.viewModel.placeList
item6.arrHkHolidays = self.viewModel.dataModelForHkHolidays?.legaldays ?? []
items2.append(item6) items2.append(item6)
} }
...@@ -443,6 +455,11 @@ extension YHCertificateAppointViewController { ...@@ -443,6 +455,11 @@ extension YHCertificateAppointViewController {
extension YHCertificateAppointViewController { extension YHCertificateAppointViewController {
func loadHKHolidays() {
viewModel.getHKHolidays { success, error in
}
}
// memberId 申请人id // memberId 申请人id
// select 点击选择 // select 点击选择
// groupLevel 是分的第几组 从0开始计数 // groupLevel 是分的第几组 从0开始计数
...@@ -484,6 +501,7 @@ extension YHCertificateAppointViewController { ...@@ -484,6 +501,7 @@ extension YHCertificateAppointViewController {
} }
newItem.model = group1 newItem.model = group1
newItem.placeList = self.viewModel.placeList newItem.placeList = self.viewModel.placeList
newItem.arrHkHolidays = self.viewModel.dataModelForHkHolidays?.legaldays ?? []
items2.append(newItem) items2.append(newItem)
} else { // 如果操作的当前批次不是最后一批 需要更新后面几批的选中状态 } else { // 如果操作的当前批次不是最后一批 需要更新后面几批的选中状态
......
...@@ -36,6 +36,9 @@ class YHAppointItem { ...@@ -36,6 +36,9 @@ class YHAppointItem {
var model : YHSelectGroupMemberModel? // type = .confirmGoHKInfo 时候的赋值 var model : YHSelectGroupMemberModel? // type = .confirmGoHKInfo 时候的赋值
// 办证地点选择列表 // 办证地点选择列表
var placeList: [YHMakeCertificatePlaceModel] = [] var placeList: [YHMakeCertificatePlaceModel] = []
var arrHkHolidays:[String]? //香港法定节假日
init(type: YHAppointItemType) { init(type: YHAppointItemType) {
self.type = type self.type = type
} }
......
...@@ -16,15 +16,30 @@ class YHCerAppointViewModel: NSObject { ...@@ -16,15 +16,30 @@ class YHCerAppointViewModel: NSObject {
var appointResult: YHAppointHKResultModel = YHAppointHKResultModel() var appointResult: YHAppointHKResultModel = YHAppointHKResultModel()
//香港节假日 //香港节假日
var dataModelForHkLegalDays : YHHKLegaldaysModel? var dataModelForHkHolidays : YHHKLegaldaysModel?
var isHKHolidaysOKFlag : Bool = false
var isRequestFlag : Bool = false
// 获取香港节假日 // 获取香港节假日
func getHKHolidays(callback:((_ success: Bool, _ error: YHErrorModel?)->())?) { func getHKHolidays(callback:((_ success: Bool, _ error: YHErrorModel?)->())?) {
if isHKHolidaysOKFlag {
return
}
if isRequestFlag {
return
}
isRequestFlag = true
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.AppointHK.hkholidaysApi let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.AppointHK.hkholidaysApi
let _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in let _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in
self?.isRequestFlag = false
//1. json字符串 转 对象 //1. json字符串 转 对象
guard let self = self else { return } guard let self = self else { return }
printLog("model 是 ==> \(json)") printLog("model 是 ==> \(json)")
...@@ -36,7 +51,8 @@ class YHCerAppointViewModel: NSObject { ...@@ -36,7 +51,8 @@ class YHCerAppointViewModel: NSObject {
callback?(false, err) callback?(false, err)
return return
} }
self.dataModelForHkLegalDays = resultModel self.isHKHolidaysOKFlag = true
self.dataModelForHkHolidays = resultModel
callback?(true, nil) callback?(true, nil)
} else { } else {
...@@ -47,6 +63,7 @@ class YHCerAppointViewModel: NSObject { ...@@ -47,6 +63,7 @@ class YHCerAppointViewModel: NSObject {
} }
} failBlock: { err in } failBlock: { err in
self.isRequestFlag = false
self.hkUsers = [] self.hkUsers = []
callback?(false, err) callback?(false, err)
} }
......
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