Skip to content

G
galaxy-iOS
Commit cab4dae4 authored by David黄金龙's avatar David黄金龙
Browse files
Options

Merge commit '36d096b0' into davidhuang 

* commit '36d096b0':
  // 学历信息
parents fbe56f99 36d096b0
Hide whitespace changes
Inline Side-by-side
Showing with 97 additions and 11 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ cab4dae4
......@@ -8,6 +8,7 @@
/* Begin PBXBuildFile section */
04010B952B6A1DE90093F3BB /* YHSaveAndSubmitView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04010B942B6A1DE90093F3BB /* YHSaveAndSubmitView.swift */; };
040FA3372B6F701E0069D17F /* File.swift in Sources */ = {isa = PBXBuildFile; fileRef = 040FA3362B6F701E0069D17F /* File.swift */; };
041B52872B5657B3007EBCEB /* IMAppKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041B52862B5657B3007EBCEB /* IMAppKey.swift */; };
041B528B2B5E15F1007EBCEB /* YHFormItemQuestionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041B528A2B5E15F1007EBCEB /* YHFormItemQuestionCell.swift */; };
041B528D2B5E58FA007EBCEB /* YHFormItemDoubleChoiceCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041B528C2B5E58FA007EBCEB /* YHFormItemDoubleChoiceCell.swift */; };
......@@ -227,6 +228,7 @@
/* Begin PBXFileReference section */
04010B942B6A1DE90093F3BB /* YHSaveAndSubmitView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSaveAndSubmitView.swift; sourceTree = "<group>"; };
040FA3362B6F701E0069D17F /* File.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = File.swift; sourceTree = "<group>"; };
041B52862B5657B3007EBCEB /* IMAppKey.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IMAppKey.swift; sourceTree = "<group>"; };
041B528A2B5E15F1007EBCEB /* YHFormItemQuestionCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFormItemQuestionCell.swift; sourceTree = "<group>"; };
041B528C2B5E58FA007EBCEB /* YHFormItemDoubleChoiceCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFormItemDoubleChoiceCell.swift; sourceTree = "<group>"; };
......@@ -449,6 +451,14 @@
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
040FA3352B6F700F0069D17F /* M */ = {
isa = PBXGroup;
children = (
040FA3362B6F701E0069D17F /* File.swift */,
);
path = M;
sourceTree = "<group>";
};
041B52852B565798007EBCEB /* IM */ = {
isa = PBXGroup;
children = (
......@@ -1068,6 +1078,7 @@
A5ACE91E2B4564F7002C94D2 /* Base */ = {
isa = PBXGroup;
children = (
040FA3352B6F700F0069D17F /* M */,
A5ACE91F2B4564F7002C94D2 /* C */,
A5ACE9232B4564F7002C94D2 /* V */,
);
......@@ -1514,6 +1525,7 @@
A5234E2A2B6E349600A33433 /* YHBasicInfoFillBottomView.swift in Sources */,
04A7BC912B6B7B89000E8D47 /* YHTwoOptionAlertView.swift in Sources */,
0468D4792B68A08600CFB916 /* YHAddressViewController.swift in Sources */,
040FA3372B6F701E0069D17F /* File.swift in Sources */,
A5ACE9562B4564F7002C94D2 /* YHBouncesContentView.swift in Sources */,
042FBBCB2B65058000F9DE23 /* YHChildBasicInfoVC.swift in Sources */,
A5ACE9302B4564F7002C94D2 /* Algorithm.swift in Sources */,
......
galaxy/galaxy/Classes/Base/M/File.swift 0 → 100644
View file @ cab4dae4
//
// File.swift
// galaxy
//
// Created by edy on 2024/2/4.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import Alamofire
struct ArrayEncoding: ParameterEncoding {
func encode(_ urlRequest: URLRequestConvertible, with parameters: Parameters?) throws -> URLRequest {
var request = try URLEncoding().encode(urlRequest, with: parameters)
request.url = URL(string: request.url!.absoluteString.replacingOccurrences(of: "%5B%5D=", with: "="))
return request
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/C/YHSpouseBasicInfoVC.swift
View file @ cab4dae4
......@@ -137,14 +137,12 @@ class YHSpouseBasicInfoVC: YHBaseViewController {
if let degreeArr = spouse.hasDegreeJson, !degreeArr.isEmpty {
for degreeInfo in degreeArr {
let item = YHFormDetailItem(type: .degreeDetailInfo)
item.value = degreeInfo.toJSONString()
arr2.append(item)
}
} else { // 学位数组为空则添加一个
let item = YHFormDetailItem(type: .degreeDetailInfo)
let newDegree = YHHasDegreeJson()
spouse.hasDegreeJson = [newDegree]
item.value = newDegree.toJSONString()
arr2.append(item)
}
// 添加一行增加学历学位信息
......@@ -274,6 +272,13 @@ extension YHSpouseBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
if cellType == .addItem { // 新增item cell
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemAddCell.cellReuseIdentifier, for: indexPath) as! YHFormItemAddCell
cell.title = item.getTitle()
cell.clickBlock = {
[weak self] in
guard let self = self else { return }
let newDegree = YHHasDegreeJson()
self.spouse?.hasDegreeJson?.append(newDegree)
self.loadBasicInfo()
}
return cell
}
......@@ -384,6 +389,15 @@ extension YHSpouseBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
} else {
cell.degree = ""
}
if let address = degreeInfo.address {
if let addressIndex = Int(address), let subType = YHPickerViewDegreeLocationType(rawValue: addressIndex) {
cell.degreePlace = YHFormPickerViewSubType.degreeLocation(subType).title
} else {
cell.degreePlace = ""
}
} else {
cell.degreePlace = ""
}
cell.degreeClickBlock = {
YHFormPickerView.show(type: .degree) { [weak self] selectType in
guard let self = self else { return }
......@@ -392,9 +406,9 @@ extension YHSpouseBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
}
}
cell.areaClickBlock = {
YHFormPickerView.show(type: .degree) { [weak self] selectType in
YHFormPickerView.show(type: .degreeLocation) { [weak self] selectType in
guard let self = self else { return }
degreeInfo.degree = String(selectType.index)
degreeInfo.address = String(selectType.index)
self.loadBasicInfo()
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/C/YHSpouseInfoVC.swift
View file @ cab4dae4
......@@ -158,11 +158,12 @@ extension YHSpouseInfoVC {
guard let spouse = spouse else { return }
guard let info = spouse.toDictionary() else { return }
let arr = spouse.hasDegreeJson
let arr = info["has_degree_json"] as! [[String:Any]]
let parmas:[String:Any] = info
let dict:[String: Any] = ["orderId":self.orderId,
"relation":spouse.relationType.rawValue,
"step":spouse.step,
"step":0,
"next":false,
"info":info]
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/M/YHFamilyRequestViewModel.swift
View file @ cab4dae4
......@@ -28,7 +28,10 @@ class YHFamilyRequestViewModel {
return
}
printLog("model 是 ==> \(model)")
let dic = model.data?.peel
let dic = model.data?.peel as? [AnyHashable : Any]
let spouse = dic?["spouse"] as? [String: Any]
let arr = spouse?["has_degree_json"]
guard let resultModel = YHFamilyMemberGroupInfo.deserialize(dict: dic as? [AnyHashable : Any]) else {
callBackBlock(false,nil)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/View/PickerView/YHFormPickerView.swift
View file @ cab4dae4
......@@ -46,6 +46,8 @@ enum YHFormPickerViewType: Int {
case certificate
// 在港身份
case identity
// 颁发地区
case degreeLocation
}
......@@ -60,6 +62,7 @@ enum YHFormPickerViewSubType {
case gender(YHPickerViewGenderType)
case certificate(YHPickerViewCertificateType)
case identity(YHPickerViewIdentityType)
case degreeLocation(YHPickerViewDegreeLocationType)
var title:String {
switch self {
......@@ -136,6 +139,10 @@ enum YHFormPickerViewSubType {
case .identity(.other):
return "其他".local
case .degreeLocation(.domestic):
return "国内 (颁发)".local
case .degreeLocation(.forgin):
return "国外 (颁发)".local
}
return ""
}
......@@ -217,6 +224,12 @@ enum YHFormPickerViewSubType {
return 3
case .identity(.other):
return 4
case .degreeLocation(.domestic):
return 1
case .degreeLocation(.forgin):
return 2
}
}
......@@ -310,6 +323,13 @@ enum YHPickerViewHasDegreeType: Int {
case hasDegree = 1
}
enum YHPickerViewDegreeLocationType:Int {
// 国内
case domestic = 1
// 国外
case forgin = 2
}
class YHFormPickerViewItem {
......@@ -467,9 +487,15 @@ class YHFormPickerView: UIView {
YHFormPickerViewItem(type: .identity(.visit)),
YHFormPickerViewItem(type: .identity(.other))],
// 是否拥有学位
.ownDegree:
[YHFormPickerViewItem(type: .ownDegree(.noDegree)),
YHFormPickerViewItem(type: .ownDegree(.hasDegree))]
YHFormPickerViewItem(type: .ownDegree(.hasDegree))],
// 学位颁发地区
.degreeLocation:
[YHFormPickerViewItem(type: .degreeLocation(.domestic)),
YHFormPickerViewItem(type: .degreeLocation(.forgin))],
]
}()
......@@ -619,6 +645,8 @@ class YHFormPickerView: UIView {
return "选择在港身份"
case .ownDegree:
return "是否拥有学位"
case .degreeLocation:
return "选择学位"
}
}
}
......@@ -766,6 +794,13 @@ extension YHFormPickerView {
} else if title == "有学位".local {
return .ownDegree(.hasDegree)
}
case .degreeLocation:
if title == "国内 (颁发)".local {
return .degreeLocation(.domestic)
} else if title == "国外 (颁发)".local {
return .degreeLocation(.forgin)
}
}
return .none
}
......
galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift
View file @ cab4dae4
......@@ -8,6 +8,7 @@
import Foundation
import Alamofire
import CryptoSwift
import UIKit
//class YHNetErrorModel {
// var responseStatusCode: Int = 0
......@@ -92,7 +93,8 @@ class YHNetRequest: NSObject {
print("sign = \(sign)")
requestHeader.add(name:"sign",value:sign)
requestHeader.add(name: "token", value: "eyJpdiI6InhISTlXZjA2cXE5Z2pqMDZDa2NrTkE9PSIsInZhbHVlIjoiR3NkRVR0dVdjWE5GN2N3UmNiU0xobVYzZTR6SXlGXC9XVEhWV0xcL1F1YXVBOU9jRDlFZ2pOanBcL1RBMUVkUDlRQ2xhREx0c3dKeHNJQjMwaVVuYkloZHBiUXQzZkJlS2dTWDJrTE90K2FpM0FDWm10a3FFUGZpdW90TDNscStud0tSenRRV2kyV3JVbEZ6eXppUHZ5ajFQMXpBejh0YUZ4Z0VPZkwwdEtwXC9mNjh4bWQySGpSS2pzVkJ1Y3ZrbGFKdGVsMkhkRXJrTlRHbzkxcVdkcE1yWXRja2xDRHVmRUhhdU9ybkJmXC9VRVJnY2RXeVpXMzZVc2h2eUsxYVRmSXR0QXB1WjVsaDBLTllVOEtKWUhSTE5yNXFvYWlaQzdQSWZ0T0V2VTZwTFJjb25OZGdYbE1lNHZOZ0ZWcWhWWkhnUm8rWGJqSE1Jdm1DY3hlWVliY2F0YkplZFwvQ0pMMndtdHFBQUF0MjJYTFNZYk14Tzh0d0g1K2c2M1U2bXFZY3JUbXptbEhCSXR5R3hFZ0JHNmpXTHgzeTJvc0Z2UXpENk5LOTlBN0VjWE8rNmYzTklBN3d0YVVPb2VyS0lNK3FINUZlTmR6UTlBdENuZEtDKzE3emwxMGxvaEc1Sm1mc0E3Y251cU5xcjd4ZzdSbHNNQ2xoRUc4VUJTR24zQ1lRSE5VRGtUd0s0ZTljSlRxRmdwMFVqY0RsMjQwcm1SaVdSN29lNjYrd1JDSlwvSUtiSWpneFpuR2VzeUFBbzNBUUh2MnNVTFZ5bXVLTGVLNFM5TjdzdXpaM1ZFRDdvRUVlRFF0QUY4d2pXcmF4NkFwMGVodXRVUFlxVGhVRmVpYlwvRUJFT05idFhyeXp4TUtcLzN0MlVcL3ZIc2dWSncxaW55TDVUVXFIWjZZMUdHakJKVnpzRkxGeE52RWdLaW9WT0tCb3pTQW1xelNwaTRaQmtGeEpITjVEUU44Q3VGSnBGdzdOcFRyTE9sYmFTT3RrMDJYU3l0XC9PcVJ1OXo2MUpJdm5XSHZFZ0lIMGh5OGR2TEJkNTZjVHFKM1hSYnVEbm9vVFU1VUUzcmRDZ3JhZWRYQWZ1cU9aajVKMHdOMGpxczBSVU5GejNrNzk3bnVBa210dFdCblVBaUs5Y0VIWmxCdE04UlV6T2NEN3ZTN2E0MEhRYmlCNGk3V2xZN1R2ZUM4cVVZZ1Rlb1BndmFcL2phemNnbEhKb05QeHhxa1BldFFqK2ErcWZmYWs1RnNPWEpNK0x4MFo4MTU4OEttZTNxeDMrcCtkNUVwSUd4b1krOXRFdU1UNVFxZyszXC9Lb21TSG5hSFI2OVRVWmxIRm9UcTRlU2kyNWF6K1pQR3lMK1MyS0FvQ2ZFaTViTmdybm1xQ1BscVMzM2tjeUFCQVlvZFdPMTJTb2ttZDl2Q3BuTXVvTnJkUDRpa0g5cE4rWlRcL1l2MWdNdmY0MFVsMFArWWYzWVNmMW5oUnkwWk1mTVc3WUluU3dyQUM4TTZBbHJac0lOMDNiYVhVWks2TCs3QnN0VDlOXC9xaEwyUEtmblVmOXpcL3hoekQ1K3JKWVozVWxrdElKbTdWTHpaMnk2bXFQQ0VJalR1TVpIc1d4bmJjVVIwdTR1VXY1M1wvMEJMODVTWkNreVpCVmh3MWRDeERROGh5YnVsMkVKV2poMFwvYnZHakMycHJmQjUycDQ3b3laUUlTSjdmaDdFMnFtTHhIN1RvUnhhcUhCWXkybkhoMlFwZUVtM0VPUVZrcXp3S0lLMFwvOUtvZnhibE1ZUnp0bGVkcGdqTlp0dGV0cGhCa3hjUmxZXC96SWRFXC83OWxEUnRma1MyYnZqWGhMN0lSM0x2Z0NCTWxIR0pUYjByWDN4Y3JCT3JLTzFzUWkzS3NYTDVDZVJ3MmhEbXlXSENqYWc9PSIsIm1hYyI6Ijc1YmU5YTE4ZGEwNzExZGJlZWQ0MzZhNGVkNWE1NGMzYmE1YWFjNjBhYTgxYjFlYjUyN2M1Yzc4ZjkwNTcyNmMifQ==")
requestHeader.add(name: "token", value: "eyJpdiI6IlViSTIyb3VvNkVhUjliSFByY0Z3WXc9PSIsInZhbHVlIjoiZEFZbXpWUWlXa2NLcTBLazEzNXlia2VtQ0VXN2h3UjdXMVluZFBZWFwvZjJlbXZ5T1wvUkZcLysrN1ZyRTRoU3FDY3U4ejBUcllkdUo2WUlSRHF3dlhuT3BqVjBTWEI0UkhubStCbE5tcU84dUxZaWxmVWxLXC9tczVBVFhUeW02MmdoSEN6V0w5Y1ViUWsxNmZPK1MxU2RJSEQ3ak9Zak92T2FRdzRVWGphRkRxOXFvaXd2XC9aUjkxRGw0VU1VOGc1U2dXNVpnWmtpQWZCeFwvcVlkbTBKVnNUMzZJUjhTY0dOd25Qc2NuYlRzelZKMG1laGNRY2Vjc3dmdFdCb3VUazFuc0NIbzh1SjJYQWFrWFwvTTFDYnhBNFB6VHJSU0c3XC9mZDZnXC9xQXJaRElYcERGaDQzZzRKTHFpREcyd040OFRpdlpNMm80S1kxZk1nbVJSTVpHWEJtWXFudHVUcm55VWxFb3ZtaFwvS1REYzl4cDFzdUdUT25JckRqblJGUEdERVVIU0JUaVFySDhrdmdWRDNkYlRFbHBqSzhjdkZXMWhBWHRuVG5IbCsxMXFjZWVGM25lNXVjbnNpdGlaYVZlamVUbmZqZkRcL1BzQVVtRUZUR0pCV0RXZjhVajZSMEp5bG5mNVU2c0lZRXQrcm9TaFl6MVUzVjc4VnN3cVF4c3JmYWxJWHBOaG44dFd2bHp6T3AwQkJGN2JcL2V0XC9RTEgyU3RkblM0dFNSeUZuUDQrYzhMZFM5SnlPc25GMzB2d2RiWVlTZXlKa3JlYmRCSlMxd1RYdWRsSzVnaHIrb3d5YnZOZXpvd2RrRTVqS2xyR0xMVjhDQ0J2ZTgyeVdjaWJ3d3puQlUreW5ZM3I5UzlxaDE0VEZHMEdyNE9CUXRtcUpoQzBYWUFYOFRITGhZeVQxSnN6TlpLdm96QmdEYmxFSGtiVnZjT1V2WVQxUHRmNnVnOTlic0VPWHM2dG45Z0toNGpWSTRLXC9CVGQ1RUc2bnpDbStMVnBaa0E3OXFYdFA0YUNSMWdNOUptbThsRHg2Q3YxY25vbjBWWElrQ3ZXT3FlR0VYd2dqRllkeVZzQVI4TzV6Q2wreWhCOHo2WUVxbHZ5S2VIbDdBWmdrTW9CVFkrQXpmaDJkZGN4b1BUMnl2TFFrcjhrU0lFT2VMQkVtOUVLWTBJWEdNbDgzYjlrbDJSQmVYdXJkcGFUNFwvaUduV1VSZzJRRVV2S0tOR3ozYVBwSWlCNHNxaFNZOElNQWNUWVByQ0tQUmFLMjNIRU5yNlZvcnJ3Q1wvTVU0cHkrMkJGdHhBVUVDN1R3K1lBVkd2NHhSVXBlK0pIZEY1THpuRGpcL1o3N0l4ZDgwN1pcL3JhZmpjMzIxd2pFbXFJM1RBOTY0Ykd1TjYwZ3NSZjh5Kzd2cUlHZzJpVTErOUhNSTJxTGQ1cU5NZ2xtekllSnJ2NUZyZjc4MXRjR1d0TG5yOVIxbWtleGJxdGIxTXd3RXdOcU5hamE2YmhJdXk4ZjB6V1VSdWZnZHYxNkQ3SXE0cEY3RUxDUmNXcEEyMVA3b2FqQzJ3UzloZ1BLaytmdXJweUVTbWtYZzEzbzNKcWFYQVJtck81R1UrQU1rUDVFcmpvMm14cVBXc3ByQTlkNGNZVU1hcU83bHBTaGJsU0lYSHljYUEzXC9NSmlidnQ0WU5oeVE1OFJweWVtMGYyXC9DbW1ERDBMRFFmUWRBS3NUemRXSW10cmdzTkVnWTZDQ0d6YzNHNldVVGpiaXlIUWVqdnlcL2dmRGx6VDZOZ0d2bEtnK0RQTFcxanliWWU0Ym5wT1FrUTBtaEhzZlAxZXArSDRNaVRWcVowR2JMWlFuMGNPS2hseFE2eUg3MGJVa1lBcDljRk1LT2hTZUdKckw4SWxxK01FUnY4dHZaY2JSaHc9PSIsIm1hYyI6ImJjYTRlNzljYjc3NTg0NWNiOWQxN2UxYzJmNmRhNjNlMmE1ZGE4YzRkNTZiNzJjNGZiYjM0M2U4ZmIxZmViOWYifQ==")
headers = requestHeader
}
......@@ -139,7 +141,9 @@ class YHNetRequest: NSObject {
///不使用缓存
AF.sessionConfiguration.requestCachePolicy = .reloadIgnoringCacheData
AF.sessionConfiguration.timeoutIntervalForRequest = 20
httpRequest = AF.request(self.url!,method: self.requestType,parameters: self.params,encoding: URLEncoding(destination: .queryString),headers: requestHeaders,interceptor: nil,requestModifier: nil)
let encoding = (self.requestType == .get ? URLEncoding(destination: .queryString) : JSONEncoding()) as ParameterEncoding
httpRequest = AF.request(self.url!, method: self.requestType,parameters: self.params, encoding:encoding, headers: requestHeaders, interceptor: nil, requestModifier: nil)
httpRequest?.responseString(completionHandler: { string in
#if DEBUG
......
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