Skip to content

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

Merge commit 'f73f5bf5' into xiezhaolin

parents c7451495 f73f5bf5
Hide whitespace changes
Inline Side-by-side
Showing with 435 additions and 127 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 16539637
......@@ -186,6 +186,7 @@
A58556C02B6C82AF003746B2 /* YHScoreResultBaseModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A58556BF2B6C82AF003746B2 /* YHScoreResultBaseModel.swift */; };
A58556C22B6C8412003746B2 /* YHScoreResultModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A58556C12B6C8412003746B2 /* YHScoreResultModel.swift */; };
A58951C52B398D1000225C19 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A58951C42B398D1000225C19 /* Launch Screen.storyboard */; };
A592BFEF2B9AB720004C04A9 /* YHWholeScreenTipsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A592BFEE2B9AB720004C04A9 /* YHWholeScreenTipsView.swift */; };
A596C39F2B84D9100067BBB8 /* YHOtherResidenceFillView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A596C3992B84D9100067BBB8 /* YHOtherResidenceFillView.swift */; };
A596C3A02B84D9100067BBB8 /* YHOtherInfoFillCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A596C39A2B84D9100067BBB8 /* YHOtherInfoFillCell.swift */; };
A596C3A12B84D9100067BBB8 /* YHOtherTextViewItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A596C39B2B84D9100067BBB8 /* YHOtherTextViewItemView.swift */; };
......@@ -510,6 +511,7 @@
A58556BF2B6C82AF003746B2 /* YHScoreResultBaseModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHScoreResultBaseModel.swift; sourceTree = "<group>"; };
A58556C12B6C8412003746B2 /* YHScoreResultModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHScoreResultModel.swift; sourceTree = "<group>"; };
A58951C42B398D1000225C19 /* Launch Screen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; };
A592BFEE2B9AB720004C04A9 /* YHWholeScreenTipsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHWholeScreenTipsView.swift; sourceTree = "<group>"; };
A596C3992B84D9100067BBB8 /* YHOtherResidenceFillView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHOtherResidenceFillView.swift; sourceTree = "<group>"; };
A596C39A2B84D9100067BBB8 /* YHOtherInfoFillCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHOtherInfoFillCell.swift; sourceTree = "<group>"; };
A596C39B2B84D9100067BBB8 /* YHOtherTextViewItemView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHOtherTextViewItemView.swift; sourceTree = "<group>"; };
......@@ -1440,6 +1442,7 @@
A5ACE9112B4564F7002C94D2 /* YhOverlayView.swift */,
A5ACE9122B4564F7002C94D2 /* YhCacheTool.swift */,
A5ACE9132B4564F7002C94D2 /* YhConstant.swift */,
A592BFEE2B9AB720004C04A9 /* YHWholeScreenTipsView.swift */,
);
path = Helper;
sourceTree = "<group>";
......@@ -2048,6 +2051,7 @@
044CC6252B873F330083FF76 /* YHCollegeSearchViewController.swift in Sources */,
0468D42B2B55019900CFB916 /* YHAnalytics.swift in Sources */,
A5ACE93C2B4564F7002C94D2 /* UIColor+Extension.swift in Sources */,
A592BFEF2B9AB720004C04A9 /* YHWholeScreenTipsView.swift in Sources */,
04E86E4F2B8479B700A35F4B /* YHWorkIntroductionItemView.swift in Sources */,
040ED4612B9173DE005CA3F8 /* YHHKIDCardModel.swift in Sources */,
044CC62D2B876C980083FF76 /* YHSheetPickerViewType.swift in Sources */,
......@@ -2272,7 +2276,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
......@@ -2292,7 +2296,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.1.6;
MARKETING_VERSION = 0.1.7;
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
......@@ -2314,7 +2318,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
......@@ -2334,7 +2338,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.1.6;
MARKETING_VERSION = 0.1.7;
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/Education&Qualification(学历专业资格填写)/C/YHEducationDetailVC.swift
View file @ 16539637
......@@ -70,7 +70,7 @@ class YHEducationDetailVC: YHBaseViewController {
bottomView.saveBlock = {
[weak self] in
guard let self = self else { return }
saveDetailInfo(isNeedPop: true, isShowToast: true)
saveDetailInfo(isSubmit:false, isNeedPop: true, isShowToast: true)
}
bottomView.submitBlock = {
......@@ -227,9 +227,7 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
}
if isEditEnd {
loadInfo()
if detailId != 0 {
saveDetailInfo(isNeedPop: false, isShowToast:false)
}
saveInfoSilent()
}
}
return cell
......@@ -310,9 +308,7 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
detailInfo.college = ""
}
loadInfo()
if detailId != 0 {
saveDetailInfo(isNeedPop: false, isShowToast:false)
}
saveInfoSilent()
}
self.navigationController?.pushViewController(vc)
......@@ -323,9 +319,7 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
guard let self = self else { return }
detailInfo.teachingFormat = item.title
loadInfo()
if detailId != 0 {
saveDetailInfo(isNeedPop: false, isShowToast:false)
}
saveInfoSilent()
}
} else if detailItem.type == .educationTime || detailItem.type == .graduateTime { // 入学及毕业年月
......@@ -340,9 +334,7 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
detailInfo.graduateTime = date
}
loadInfo()
if detailId != 0 {
saveDetailInfo(isNeedPop: false, isShowToast:false)
}
saveInfoSilent()
}
} else if detailItem.type == .educationDegree { // 学位
......@@ -352,9 +344,7 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
guard let self = self else { return }
detailInfo.degree = item.title
loadInfo()
if detailId != 0 {
saveDetailInfo(isNeedPop: false, isShowToast:false)
}
saveInfoSilent()
}
} else if detailItem.type == .degreeType { // 学位类型
......@@ -364,9 +354,7 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
guard let self = self else { return }
detailInfo.degreeType = selectItem.title
loadInfo()
if detailId != 0 {
saveDetailInfo(isNeedPop: false, isShowToast:false)
}
saveInfoSilent()
}
} else if detailItem.type == .educationCountry { // 上课国家/地区
......@@ -377,9 +365,7 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
guard let self = self else { return }
detailInfo.schoolAddress.country = country
loadInfo()
if detailId != 0 {
saveDetailInfo(isNeedPop: false, isShowToast:false)
}
saveInfoSilent()
}
self.navigationController?.pushViewController(vc)
......@@ -400,9 +386,7 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
}
detailInfo.schoolAddress.area = citys
loadInfo()
if detailId != 0 {
saveDetailInfo(isNeedPop: false, isShowToast:false)
}
saveInfoSilent()
}
self.present(vc, animated: true)
}
......@@ -488,7 +472,7 @@ extension YHEducationDetailVC {
YHHUD.flash(message: "资料还未填完")
return
}
saveDetailInfo(isNeedPop: true, isShowToast: true)
saveDetailInfo(isSubmit:true, isNeedPop: true, isShowToast: true)
}
// 检查填写信息完整性
......@@ -516,25 +500,14 @@ extension YHEducationDetailVC {
return true
}
func saveInfoSilent() {
if detailId != 0 {
saveDetailInfo(isSubmit:false, isNeedPop: false, isShowToast: false)
}
}
// 保存信息 isNeedPop：保存成功后是否退出该页面
func saveDetailInfo(isNeedPop:Bool, isShowToast:Bool) {
// detailInfo.toDictionary() 对于值为空的字段不会添加 而后台需要 所以如下处理
// let dict:[String : Any] = [
// "order_id":
// "id": detailInfo.id,
// "admission_time": detailInfo.admissionTime,
// "background": detailInfo.major,
// "college": detailInfo.college,
// "degree_type": detailInfo.degreeType,
// "graduate_time": detailInfo.graduateTime,
// "professional": detailInfo.major,
// "school_address_aboard": "",
// "type": detailInfo.teachingFormat,
// "school_address": ["country": detailInfo.schoolAddress.country,
// "area": detailInfo.schoolAddress.area,
// "foreign": detailInfo.schoolAddress.foreign],
// ]
func saveDetailInfo(isSubmit:Bool, isNeedPop:Bool, isShowToast:Bool) {
guard var dict:[String:Any] = detailInfo.toDictionary() else { return }
dict["order_id"] = self.orderId
......@@ -542,9 +515,10 @@ extension YHEducationDetailVC {
self.educationRequest.saveEducationInfo(params: dict, isSilent: !isShowToast) {
[weak self] success, error in
guard let self = self else { return }
if success {
if isShowToast {
YHHUD.flash(message: "保存成功")
YHHUD.flash(message: isSubmit ? "提交成功":"保存成功" )
}
if isNeedPop {
self.navigationController?.popViewController(animated: true)
......@@ -552,7 +526,11 @@ extension YHEducationDetailVC {
} else {
if isShowToast {
YHHUD.flash(message: "保存失败")
var errorMsg = isSubmit ? "提交失败" : "保存失败"
if let errMsg = error?.errorMsg, errMsg.count > 0 {
errorMsg = errMsg
}
YHHUD.flash(message: errorMsg)
}
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/Education&Qualification(学历专业资格填写)/C/YHEducationInfoListVC.swift
View file @ 16539637
......@@ -494,6 +494,12 @@ extension YHEducationInfoListVC {
guard let self = self else { return }
if success {
requestEducationInfo()
} else {
var errorMsg = "删除失败"
if let errMsg = error?.errorMsg, errMsg.count > 0 {
errorMsg = errMsg
}
YHHUD.flash(message: errorMsg)
}
}
}
......@@ -506,6 +512,12 @@ extension YHEducationInfoListVC {
guard let self = self else { return }
if success {
requestEducationInfo()
} else {
var errorMsg = "删除失败"
if let errMsg = error?.errorMsg, errMsg.count > 0 {
errorMsg = errMsg
}
YHHUD.flash(message: errorMsg)
}
}
}
......@@ -525,6 +537,12 @@ extension YHEducationInfoListVC {
if success {
requestEducationInfo()
self.navigationController?.popViewController()
} else {
var errorMsg = isSubmit ? "提交失败" : "保存失败"
if let errMsg = error?.errorMsg, errMsg.count > 0 {
errorMsg = errMsg
}
YHHUD.flash(message: errorMsg)
}
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/Education&Qualification(学历专业资格填写)/C/YHQualificationDetailVC.swift
View file @ 16539637
......@@ -68,7 +68,7 @@ class YHQualificationDetailVC: YHBaseViewController {
bottomView.saveBlock = {
[weak self] in
guard let self = self else { return }
saveDetailInfo(isNeedPop: true, isShowToast: true)
saveDetailInfo(isSubmit:false, isNeedPop: true, isShowToast: true)
}
bottomView.submitBlock = {
[weak self] in
......@@ -201,9 +201,7 @@ extension YHQualificationDetailVC : UITableViewDelegate, UITableViewDataSource {
}
if isEditEnd {
loadInfo()
if detailId != 0 {
saveDetailInfo(isNeedPop: false, isShowToast: false)
}
saveInfoSilent()
}
}
return cell
......@@ -269,9 +267,7 @@ extension YHQualificationDetailVC : UITableViewDelegate, UITableViewDataSource {
guard let self = self else { return }
detailInfo.certName = selectItem.title
loadInfo()
if detailId != 0 {
saveDetailInfo(isNeedPop: false, isShowToast: false)
}
saveInfoSilent()
}
} else if detailItem.type == .conferTime { // 授权年份
......@@ -281,33 +277,29 @@ extension YHQualificationDetailVC : UITableViewDelegate, UITableViewDataSource {
guard let self = self else { return }
detailInfo.issuingYear = Int(date) ?? 2024
loadInfo()
if detailId != 0 {
saveDetailInfo(isNeedPop: false, isShowToast: false)
}
saveInfoSilent()
}
} else if detailItem.type == .conferCountry { // 授权国家/地区
let vc = YHSelectCountryViewController()
vc.backLocationStringController = {
[weak self] country in
guard let self = self else { return }
detailInfo.issuingAddr.country = country
loadInfo()
if detailId != 0 {
saveDetailInfo(isNeedPop: false, isShowToast: false)
}
}
self.navigationController?.pushViewController(vc)
vc.backLocationStringController = {
[weak self] country in
guard let self = self else { return }
detailInfo.issuingAddr.country = country
loadInfo()
saveInfoSilent()
}
self.navigationController?.pushViewController(vc)
} else if detailItem.type == .conferCity { // 授权城市
if detailInfo.isCollegeInAboard() { return }
let vc = YHAddressViewController()
vc.backLocationStringController = {
[weak self] (string1, string2, string3, string4) in
guard let self = self else { return }
[weak self] (string1, string2, string3, string4) in
guard let self = self else { return }
var citys:[String] = []
if !isEmptyString(string2) {
citys.append(string2)
......@@ -315,12 +307,10 @@ extension YHQualificationDetailVC : UITableViewDelegate, UITableViewDataSource {
if !isEmptyString(string3) {
citys.append(string3)
}
detailInfo.issuingAddr.area = citys
loadInfo()
if detailId != 0 {
saveDetailInfo(isNeedPop: false, isShowToast: false)
}
}
detailInfo.issuingAddr.area = citys
loadInfo()
saveInfoSilent()
}
self.present(vc, animated: true)
}
}
......@@ -392,10 +382,16 @@ extension YHQualificationDetailVC {
}
}
func saveInfoSilent() {
if detailId != 0 {
saveDetailInfo(isSubmit:false, isNeedPop: false, isShowToast: false)
}
}
// 保存数据
// @param isNeedPop：保存成功后是否需要退出该页面
// @param isShowToast: 请求完成后是否弹Toast
func saveDetailInfo(isNeedPop:Bool, isShowToast:Bool) {
func saveDetailInfo(isSubmit:Bool, isNeedPop:Bool, isShowToast:Bool) {
var dict:[String : Any] = ["orderId":self.orderId]
let quaDict:[String : Any] = detailInfo.toDictionary() ?? [:]
......@@ -408,7 +404,7 @@ extension YHQualificationDetailVC {
guard let self = self else { return }
if success {
if isShowToast {
YHHUD.flash(message: "保存成功")
YHHUD.flash(message: isSubmit ? "提交成功":"保存成功" )
}
if isNeedPop {
self.navigationController?.popViewController(animated: true)
......@@ -416,7 +412,11 @@ extension YHQualificationDetailVC {
} else {
if isShowToast {
YHHUD.flash(message: "保存失败")
var errorMsg = isSubmit ? "提交失败" : "保存失败"
if let errMsg = error?.errorMsg, errMsg.count > 0 {
errorMsg = errMsg
}
YHHUD.flash(message: errorMsg)
}
}
}
......@@ -433,7 +433,7 @@ extension YHQualificationDetailVC {
return
}
saveDetailInfo(isNeedPop: true, isShowToast: true)
saveDetailInfo(isSubmit:true, isNeedPop: true, isShowToast: true)
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Certificates(证书上传和证书信息)/YHCertificateInfoController.swift
View file @ 16539637
......@@ -326,7 +326,7 @@ extension YHCertificateInfoController : UITableViewDelegate, UITableViewDataSour
}
} else if detailItem.type == .certificateType { // 选择证件类别
let type = self.familyMember?.certificates.passport.passPortType ?? 0
let type = self.familyMember?.certificates.passport.passPortType ?? 3
YHSheetPickerView.show(type: .certificate, selectIndex:type) {
[weak self] selectItem in
guard let self = self else { return }
......@@ -404,7 +404,7 @@ extension YHCertificateInfoController : UITableViewDelegate, UITableViewDataSour
|| familyMember.certificates.passport.issueAt.count <= 0
|| familyMember.certificates.passport.issueDateStartAt.count <= 0
|| familyMember.certificates.passport.issueDateEndAt.count <= 0
|| familyMember.certificates.passport.passPortType == -1
|| familyMember.certificates.passport.passPortType == 0
{
return false
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Child(子女)/YHChildInfoContainerVC.swift
View file @ 16539637
......@@ -184,7 +184,7 @@ class YHChildInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
if let targetVC = getCurrentStepViewController() {
if targetVC.nextStep() {
saveInfo(isSubmit: true, isShowLoading: true) {
[weak self] success, error in
[weak self] success in
guard let self = self else { return }
if success {
// 当前步骤已是最后一步
......@@ -239,14 +239,14 @@ extension YHChildInfoContainerVC {
// @param isSubmit:是否为提交 false为保存 true为提交
// @param isShowLoading: 是否展示loading和toast
func saveInfo(isSubmit:Bool, isShowLoading:Bool, callBack:((Bool, String?)->Void)?) {
func saveInfo(isSubmit:Bool, isShowLoading:Bool, callBack:((Bool)->Void)?) {
guard let child = child else { return }
guard let info = child.toDictionary() else { return }
let dict:[String: Any] = ["order_id":child.orderId,
"relation":child.relation,
"step":isSubmit ? currentStep : 0,
"step":currentStep,
"next":isSubmit,
"info":info]
......@@ -254,10 +254,18 @@ extension YHChildInfoContainerVC {
[weak self] success, error in
guard let self = self else { return }
if isShowLoading {
YHHUD.flash(message: success ? "保存成功" : "保存失败")
if success {
YHHUD.flash(message:isSubmit ? "提交成功" : "保存成功")
} else {
var msg = isSubmit ? "提交失败" : "保存失败"
if let errorMsg = error?.errorMsg, errorMsg.count > 0 {
msg = errorMsg
}
YHHUD.flash(message:msg)
}
}
if let callBack = callBack {
callBack(success, error?.errorMsg)
callBack(success)
}
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Parents&Brothers(父母和兄弟姐妹)/YHBrotherInfoVC.swift
View file @ 16539637
......@@ -64,7 +64,7 @@ class YHBrotherInfoVC: YHBaseViewController {
[weak self] in
guard let self = self else { return }
self.saveInfo(isSubmit: true, isLoading: true) {
[weak self] success, msg in
[weak self] success in
if success {
self?.navigationController?.popViewController(animated: true)
}
......@@ -544,7 +544,7 @@ extension YHBrotherInfoVC {
}
// isSubmit 是否是提交 isSilent:是否显示toast
func saveInfo(isSubmit:Bool, isLoading:Bool, callBack:((Bool, String?)->Void)?) {
func saveInfo(isSubmit:Bool, isLoading:Bool, callBack:((Bool)->Void)?) {
if isSubmit {
let isChecked = checkIntegrity()
......@@ -569,10 +569,18 @@ extension YHBrotherInfoVC {
self.familyRequest.addOrSaveFamilyMember(params:dict, isShowLoading: isLoading) { success, error in
if isLoading {
YHHUD.flash(message: success ? "保存成功" : "保存失败")
if success {
YHHUD.flash(message:"保存成功")
} else {
var msg = "保存失败"
if let errorMsg = error?.errorMsg, errorMsg.count > 0 {
msg = errorMsg
}
YHHUD.flash(message:msg)
}
}
if let callBack = callBack {
callBack(success, error?.errorMsg)
callBack(success)
}
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Parents&Brothers(父母和兄弟姐妹)/YHParentInfoVC.swift
View file @ 16539637
......@@ -66,7 +66,7 @@ class YHParentInfoVC: YHBaseViewController {
[weak self] in
guard let self = self else { return }
self.saveInfo(isSubmit: true, isLoading: true) {
[weak self] success, msg in
[weak self] success in
if success {
self?.navigationController?.popViewController(animated: true)
}
......@@ -583,7 +583,7 @@ extension YHParentInfoVC {
}
// isSubmit 是否是提交 isSilent:是否显示toast
func saveInfo(isSubmit:Bool, isLoading:Bool, callBack:((Bool, String?)->Void)?) {
func saveInfo(isSubmit:Bool, isLoading:Bool, callBack:((Bool)->Void)?) {
if isSubmit {
let isChecked = checkIntegrity()
......@@ -608,10 +608,18 @@ extension YHParentInfoVC {
self.familyRequest.addOrSaveFamilyMember(params:dict, isShowLoading: isLoading) { success, error in
if isLoading {
YHHUD.flash(message: success ? "保存成功" : "保存失败")
if success {
YHHUD.flash(message:"保存成功")
} else {
var msg = "保存失败"
if let errorMsg = error?.errorMsg, errorMsg.count > 0 {
msg = errorMsg
}
YHHUD.flash(message:msg)
}
}
if let callBack = callBack {
callBack(success, error?.errorMsg)
callBack(success)
}
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Spouse(配偶)/YHSpouseInfoContainerVC.swift
View file @ 16539637
......@@ -202,24 +202,32 @@ class YHSpouseInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
extension YHSpouseInfoContainerVC {
// isSubmit:是否为提交 false为保存 true为提交
func saveInfo(isSubmit:Bool, isLoading:Bool, callBack:((Bool, String?)->Void)?) {
func saveInfo(isSubmit:Bool, isLoading:Bool, callBack:((Bool)->Void)?) {
guard let spouse = spouse else { return }
guard let info = spouse.toDictionary() else { return }
let dict:[String: Any] = ["order_id":orderId,
"relation":spouse.relation,
"step":isSubmit ? currentStep : 0,
"step":currentStep,
"next":isSubmit,
"info":info]
self.familyRequest.addOrSaveFamilyMember(params:dict, isShowLoading: isLoading) {
[weak self] success, error in
success, error in
if isLoading {
YHHUD.flash(message: success ? "保存成功" : "保存失败")
if success {
YHHUD.flash(message:isSubmit ? "提交成功" : "保存成功")
} else {
var msg = isSubmit ? "提交失败" : "保存失败"
if let errorMsg = error?.errorMsg, errorMsg.count > 0 {
msg = errorMsg
}
YHHUD.flash(message:msg)
}
}
if let callBack = callBack {
callBack(success, error?.errorMsg)
callBack(success)
}
}
}
......@@ -233,7 +241,7 @@ extension YHSpouseInfoContainerVC {
if let targetVC = getCurrentStepViewController() {
if targetVC.nextStep() {
saveInfo(isSubmit: true, isLoading: true) {
[weak self] success, tips in
[weak self] success in
guard let self = self else { return }
if success {
// 当前步骤已是最后一步
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/YHFamilyMemberInfoListVC.swift
View file @ 16539637
......@@ -259,6 +259,12 @@ extension YHFamilyMemberInfoListVC {
guard let self = self else { return }
if success {
self.requestFamilyInfo()
} else {
var errorMsg = "添加失败"
if let errMsg = error?.errorMsg, errMsg.count > 0 {
errorMsg = errMsg
}
YHHUD.flash(message: errorMsg)
}
}
}
......@@ -272,7 +278,11 @@ extension YHFamilyMemberInfoListVC {
if success {
YHHUD.flash(message: "删除成功".local)
} else {
YHHUD.flash(message: "删除失败".local)
var errorMsg = "删除失败"
if let errMsg = error?.errorMsg, errMsg.count > 0 {
errorMsg = errMsg
}
YHHUD.flash(message: errorMsg)
}
if let callBack = callBack {
callBack(success)
......@@ -285,9 +295,15 @@ extension YHFamilyMemberInfoListVC {
self.familyRequest.submitAllFamilyInfo(orderId: self.orderId) {
success, error in
if success {
YHHUD.flash(message: "保存成功")
YHHUD.flash(message: "提交成功")
self.navigationController?.popViewController()
} else {
YHHUD.flash(message: "保存失败")
var errorMsg = "提交失败"
if let errMsg = error?.errorMsg, errMsg.count > 0 {
errorMsg = errMsg
}
YHHUD.flash(message: errorMsg)
}
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/M/YHFamilyInitialInfo.swift
View file @ 16539637
......@@ -670,6 +670,7 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
sex = 1
}
return self
}
......@@ -1077,7 +1078,7 @@ class YHCNIdentityCard: SmartCodable {
var issueDateEndAt: String = ""
var imgFront: String = ""
var imgBack: String = ""
var passPortType: Int = -1
var passPortType: Int = 0
enum CodingKeys: String, CodingKey {
case id = "id"
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/V/YHOtherInfoSessionView.swift
View file @ 16539637
......@@ -35,7 +35,7 @@ class YHOtherInfoSessionView: UIView {
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
//title
private lazy var nameLable : UILabel = {
let lable0 = UILabel(text: "居住信息")
......@@ -109,6 +109,12 @@ class YHOtherInfoSessionView: UIView {
make.height.width.equalTo(16)
}
let tap : UITapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(tapButton(gestureRecognizer:)))
iconImageV.isUserInteractionEnabled = true
iconImageV.addGestureRecognizer(tap)
iconImageV.backgroundColor = .red//for test hjl
//delButton
addSubview(delButton)
......@@ -120,6 +126,10 @@ class YHOtherInfoSessionView: UIView {
}
delButton.addTarget(self, action: #selector(clickDeleteBtn), for: .touchUpInside)
}
@objc func tapButton(gestureRecognizer:UITapGestureRecognizer) {
YHWholeScreenTipsView.show(type: .residenceInfo, targetView: iconImageV)
}
}
extension YHOtherInfoSessionView {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/V/YHOtherResidenceFillView.swift
View file @ 16539637
......@@ -43,6 +43,14 @@ class YHOtherResidenceFillView: UIView {
make.left.right.equalToSuperview()
}
endView.showLongTimeButtonFlag = true
endView.block = {[weak self] flag, text in
guard let self = self else { return }
self.endView.updateKeyName(name: "结束时间", keyValue: "")
self.dataModel?.end_time = text
self.layoutIfNeeded()
}
endView.snp.makeConstraints { make in
make.top.equalTo(startView.snp.bottom)
make.left.right.equalToSuperview()
......@@ -109,7 +117,14 @@ extension YHOtherResidenceFillView {
startView.updateKeyName(name: "开始时间", keyValue: dataModel.start_time)
startView.needCheckFlag = dataModel.needCheckFlag
endView.updateKeyName(name: "结束时间", keyValue: dataModel.end_time)
if dataModel.end_time == "至今" || dataModel.end_time == "8888-01-01" {
endView.longTimeButton.isSelected = true
endView.updateKeyName(name: "结束时间", keyValue: "")
} else {
endView.longTimeButton.isSelected = false
endView.updateKeyName(name: "结束时间", keyValue: dataModel.end_time)
}
endView.needCheckFlag = dataModel.needCheckFlag
layoutIfNeeded()
......@@ -132,7 +147,7 @@ extension YHOtherResidenceFillView {
@objc func tapStartDate(_ gestureRecognizer: UIPanGestureRecognizer) {
YHDatePickView.show(type: .yyyymmdd) { date in
YHDatePickView.show(type: .yyyymm,title: "请选择开始时间") { date in
printLog(date)
self.startView.updateKeyName(name: "开始时间", keyValue: date)
......@@ -142,11 +157,14 @@ extension YHOtherResidenceFillView {
}
@objc func tapEndDate(_ gestureRecognizer: UIPanGestureRecognizer) {
YHDatePickView.show(type: .yyyymmdd) { date in
printLog(date)
self.endView.updateKeyName(name: "结束时间", keyValue: date)
self.dataModel?.end_time = date
self.layoutIfNeeded()
if !endView.longTimeButton.isSelected {
YHDatePickView.show(type: .yyyymm,title: "请选择结束时间") { date in
printLog(date)
self.endView.updateKeyName(name: "结束时间", keyValue: date)
self.dataModel?.end_time = date
self.layoutIfNeeded()
}
}
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/V/YHOtherSelecteItemView.swift
View file @ 16539637
......@@ -16,9 +16,6 @@ enum YHOtherSelecteItemType: Int {
class YHOtherSelecteItemView: UIView {
static let viewH : CGFloat = 52 // type == 1时的高度
static let viewH2 : CGFloat = 88 //type == 2时的高度
//1- 一行布局 2-2行布局
var type : Int = 1 {
......@@ -33,11 +30,31 @@ class YHOtherSelecteItemView: UIView {
}
}
//获取高度
static func getViewHBy(type : Int)->CGFloat {
return type == 1 ? viewH : viewH2
var showLongTimeButtonFlag : Bool = false {
didSet {
layoutMyUI()
}
}
typealias ItemBlock = (_ flag: Bool, _ text: String) -> ()
var block: ItemBlock?
lazy var longTimeButton = {
let button = UIButton(type: .custom)
button.setImage(UIImage(named: "main_time_normal"), for: .normal)
button.setImage(UIImage(named: "main_time_select"), for: .selected)
button.setTitleColor(UIColor.mainTextColor, for: .normal)
button.setTitle("长期", for: .normal)
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
button.contentHorizontalAlignment = .right
button.addTarget(self, action: #selector(longTimeButtonClick), for: .touchUpInside)
button.imageEdgeInsets = UIEdgeInsets(top: 10, left: 0, bottom: 10, right: 30)
button.isSelected = false
button.isHidden = true
return button
}()
override init(frame: CGRect) {
super.init(frame: frame)
setupUI()
......@@ -102,6 +119,9 @@ class YHOtherSelecteItemView: UIView {
return view
}()
private let rightIcon = UIImageView()
override func layoutSubviews() {
super.layoutSubviews()
......@@ -110,6 +130,9 @@ class YHOtherSelecteItemView: UIView {
}
extension YHOtherSelecteItemView {
func setupUI() {
addSubview(bottomLine)
......@@ -118,7 +141,6 @@ extension YHOtherSelecteItemView {
addSubview(noTextTipsLable)
title = "开始时间"
let rightIcon = UIImageView()
rightIcon.image = UIImage(named: "form_right_arrow")
rightIcon.contentMode = .scaleAspectFill
......@@ -133,6 +155,26 @@ extension YHOtherSelecteItemView {
make.right.equalTo(rightIcon.snp.left).offset(-4)
make.bottom.top.left.equalToSuperview()
}
//
addSubview(longTimeButton)
longTimeButton.snp.makeConstraints { make in
make.right.equalToSuperview()
make.centerY.equalToSuperview()
make.height.equalTo(32)
make.width.equalTo(43)
}
}
@objc func longTimeButtonClick() {
longTimeButton.isSelected = !longTimeButton.isSelected
if longTimeButton.isSelected {
block?(true,"8888-01-01")
textField.placeholder = ""
} else {
block?(false,"")//for test hjl
textField.placeholder = "请选择"
}
}
}
......@@ -222,14 +264,71 @@ extension YHOtherSelecteItemView {
make.left.equalTo(titleLabel.snp.right).offset(40)
}
bottomLine.snp.remakeConstraints { make in
make.top.equalTo(titleLabel.snp.bottom).offset(kMargin)
make.bottom.left.right.equalToSuperview()
make.height.equalTo(0.5)
}
}
if showLongTimeButtonFlag {
rightIcon.snp.removeConstraints()
rightIcon.isHidden = true
longTimeButton.snp.removeConstraints()
longTimeButton.isHidden = false
if longTimeButton.isSelected {
longTimeButton.snp.remakeConstraints { make in
make.centerX.equalToSuperview()
make.centerY.equalToSuperview()
make.height.equalTo(32)
make.width.equalTo(43)
}
textField.snp.removeConstraints()
textField.snp.makeConstraints { make in
make.right.equalToSuperview()
make.bottom.top.left.equalToSuperview()
}
} else {
longTimeButton.snp.remakeConstraints { make in
make.right.equalToSuperview()
make.centerY.equalToSuperview()
make.height.equalTo(32)
make.width.equalTo(43)
}
textField.snp.removeConstraints()
textField.snp.makeConstraints { make in
make.right.equalTo(longTimeButton.snp.left).offset(-4)
make.bottom.top.left.equalToSuperview()
}
}
} else {
rightIcon.snp.removeConstraints()
rightIcon.isHidden = false
rightIcon.snp.makeConstraints { make in
make.centerY.equalToSuperview()
make.right.equalToSuperview()
make.width.height.equalTo(20)
}
longTimeButton.snp.removeConstraints()
longTimeButton.isHidden = true
textField.snp.removeConstraints()
textField.snp.makeConstraints { make in
make.right.equalTo(rightIcon.snp.left).offset(-4)
make.bottom.top.left.equalToSuperview()
}
}
} else if type == 2 {
if needCheckFlag == true {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/V/YHPreviewInfoQuestionAndAnswerItemView.swift
View file @ 16539637
......@@ -89,7 +89,7 @@ extension YHPreviewInfoQuestionAndAnswerItemView {
nameLable.text = model.question
subtitleLable.text = model.answer
if let remark = model.remark {
if let remark = model.remark,remark.isEmpty == false {
subtitleLable.snp.makeConstraints { make in
make.top.equalTo(nameLable.snp.bottom).offset(8)
make.right.equalToSuperview()
......
galaxy/galaxy/Classes/Modules/Login(登录)/C/YHLoginViewController.swift
View file @ 16539637
......@@ -6,7 +6,6 @@
//
import UIKit
//import SnapKit
import DeviceKit
class YHLoginViewController: YHBaseViewController {
......
galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift
View file @ 16539637
......@@ -103,9 +103,40 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
return img
}()
let bigView : UIView = UIView()
let smallButton : UIButton = UIButton(type: .custom)
override func viewDidLoad() {
super.viewDidLoad()
initView()
view.addSubview(bigView)
bigView.backgroundColor = .green
bigView.snp.makeConstraints { make in
make.top.equalTo(200)
make.width.equalTo(200)
make.height.equalTo(200)
make.left.equalTo(200)
}
smallButton.addTarget(self, action: #selector(clickBtn), for: .touchUpInside)
smallButton.backgroundColor = .red
bigView.addSubview(smallButton)
smallButton.snp.makeConstraints { make in
make.top.equalTo(100)
make.left.equalTo(100)
make.width.equalTo(100)
make.height.equalTo(100)
}
view.layoutIfNeeded()
let crect = smallButton.convert(smallButton.frame, to: UIApplication.shared.yhKeyWindow())
return
}
@objc func clickBtn() {
}
func checkLogin()->Bool {
......
galaxy/galaxy/Classes/Tools/Helper/YHWholeScreenTipsView.swift 0 → 100644
View file @ 16539637
//
// YHWholeScreenTipsView.swift
// galaxy
//
// Created by davidhuangA on 2024/3/8.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
enum YHWholeScreenTipsViewType : Int {
case unKnow //默认情况
case residenceInfo //居住信息
}
class YHWholeScreenTipsView: UIView {
lazy var blackMaskView: UIView = {
let view = UIView()
view.backgroundColor = UIColor(hex: 0x000000, alpha: 0.1)
let tap = UITapGestureRecognizer(target: self, action: #selector(dismiss))
view.addGestureRecognizer(tap)
return view
}()
lazy var whiteContentView: UIView = {
let view = UIView()
view.backgroundColor = UIColor(hex: 0x222222, alpha: 0.9)
view.layer.cornerRadius = kCornerRadius6
view.clipsToBounds = true
return view
}()
lazy var contentLable : UILabel = {
let lable = UILabel()
lable.text = "依日期顺序列出你自出生后曾居住12个月或更长时间的所有国家或地区，包括你的现居国家或地区"
lable.font = UIFont.PFSC_R(ofSize: 14)
lable.textColor = .white
lable.numberOfLines = 0
return lable
}()
init(type: YHWholeScreenTipsViewType, targetView : UIView) {
super.init(frame: UIScreen.main.bounds)
contentLable.text = getTitleBy(type: type)
self.createUI(targetView : targetView)
}
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
private func getTitleBy(type : YHWholeScreenTipsViewType)-> String {
switch type {
case .residenceInfo:
return "依日期顺序列出你自出生后曾居住12个月或更长时间的所有国家或地区，包括你的现居国家或地区"
default:
return "--"
}
}
func show() {
UIApplication.shared.yhKeyWindow()?.addSubview(self)
}
static func show(type:YHWholeScreenTipsViewType, targetView : UIView) {
let view = YHWholeScreenTipsView(type: type,targetView : targetView)
view.show()
}
@objc func dismiss() {
self.removeFromSuperview()
}
func createUI(targetView : UIView) {
addSubview(blackMaskView)
addSubview(whiteContentView)
whiteContentView.addSubview(contentLable)
blackMaskView.snp.makeConstraints { make in
make.edges.equalTo(0)
}
let rrrrr = targetView.convert(targetView.bounds, to: UIApplication.shared.yhKeyWindow())
let left = rrrrr.origin.x
let top = rrrrr.origin.y + targetView.height + 5
whiteContentView.snp.makeConstraints { make in
make.left.equalToSuperview().offset(left)
make.top.equalToSuperview().offset(top)
make.width.equalTo(214)
}
contentLable.snp.makeConstraints { make in
make.top.left.equalTo(12)
make.right.bottom.equalTo(-12)
}
}
}
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