Skip to content

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

Merge commit '08454c94' into xiezhaolin

parents 12ccba0c 08454c94
Show whitespace changes
Inline Side-by-side
Showing with 117 additions and 48 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 35be2008
......@@ -2316,7 +2316,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
......@@ -2358,7 +2358,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/Education&Qualification(学历专业资格填写)/C/YHCollegeSearchViewController.swift
View file @ 35be2008
......@@ -14,6 +14,7 @@ class YHCollegeSearchViewController: YHBaseViewController {
var searchCollegeName:String?
var selectBlock:((String?)->Void)?
var colleges:[YHCollegeInfo] = []
var lastSearchTime:TimeInterval = 0.0
let educationRequest:YHEducationRequestViewModel = YHEducationRequestViewModel()
lazy var searchBar: YHSearchBar = {
......@@ -90,8 +91,11 @@ class YHCollegeSearchViewController: YHBaseViewController {
[weak self] text in
guard let self = self else { return }
searchCollegeName = text
if Date().timeIntervalSince1970 * 1000 - lastSearchTime * 1000 >= 500 {
lastSearchTime = Date().timeIntervalSince1970
searchCollege()
}
}
searchBar.confirmBlock = {
[weak self] in
guard let self = self else { return }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/Education&Qualification(学历专业资格填写)/C/YHEducationDetailVC.swift
View file @ 35be2008
......@@ -236,13 +236,6 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemSelectSheetCell.cellReuseIdentifier, for: indexPath) as! YHFormItemSelectSheetCell
cell.isShowTipsButton = (detailItem.type == .degreeType)
cell.tipsBtnClickBlock = nil
if detailItem.type == .degreeType {
cell.tipsBtnClickBlock = {
[weak self] in
guard let self = self else { return }
YHHUD.flash(message: "该内容在学位证上，通常是授予后面，如授予“理学”学士学位，则填理学")
}
}
cell.placeHolder = detailItem.placeHolder
cell.isMust = detailItem.isNeed
cell.title = detailItem.getTitle()
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Child(子女)/YHChildPrimaryInfoVC.swift
View file @ 35be2008
......@@ -96,7 +96,8 @@ class YHChildPrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
arr2.append(item22)
}
let placeHolder = (isLiveInChina ? "请填写小区、楼栋、单元室等".local : "请填写国外居住地".local)
let item23 = YHFormDetailItem(type: .detailAddress, value:child.address.details, placeHolder: placeHolder, tips:placeHolder)
let detailAddress = isLiveInChina ? child.address.details : child.address.foreign
let item23 = YHFormDetailItem(type:.detailAddress, value:detailAddress, placeHolder:placeHolder, tips:placeHolder)
arr2.append(item23)
if !isLiveInChina {// 在国外
......@@ -291,10 +292,15 @@ extension YHChildPrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
cell.textChange = {
[weak self] (text, isEditEnd) in
guard let self = self else { return }
guard let child = child else { return }
if detailItem.type == .detailAddress {
self.child?.address.details = text ?? ""
if child.address.isInChina() {
child.address.details = text ?? ""
} else {
child.address.foreign = text ?? ""
}
}
if isEditEnd {
self.loadInfo()
save()
......@@ -455,16 +461,20 @@ extension YHChildPrimaryInfoVC {
if isEmptyString(child.nationality) {
return false
}
if !child.isLiveTother() { // 没有与主申请人同住
if isEmptyString(child.address.country) {
return false
}
if child.address.isInChina() {
if isEmptyArray(child.address.area) {
return false
}
if isEmptyString(child.address.details) {
return false
}
if child.address.isInChina() {
if isEmptyArray(child.address.area) {
} else { // 住在国外
if isEmptyString(child.address.foreign) {
return false
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Spouse(配偶)/YHSpouseInfoContainerVC.swift
View file @ 35be2008
......@@ -263,6 +263,19 @@ extension YHSpouseInfoContainerVC {
}
}
func requestDetail() {
// if orderId <= 0 || spouse.id <= 0 {
// print("订单号或成员id不存在")
// return
// }
// self.familyRequest.requestFamilyMemberInfo(orderId:orderId, detailId:spouse.id) {
// [weak self] detail, error in
// if let detail = detail {
// spouse = detail
// }
// }
}
// 【WARNING!】步骤step和在数组中的下标有时候并不是一一对应
func getArrayIndexOfCurrentStep() ->Int? {
for (i, item) in stepVCs.enumerated() {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Spouse(配偶)/YHSpousePrimaryInfoVC.swift
View file @ 35be2008
......@@ -97,7 +97,8 @@ class YHSpousePrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
let placeHolder = (isLiveInChina ? "请填写小区、楼栋、单元室等".local : "请填写国外居住地".local)
let tips = (isLiveInChina ? "请填写小区、楼栋、单元室等".local : "请填写国外居住地".local)
let item23 = YHFormDetailItem(type:.detailAddress, value:spouse.address.details, placeHolder:placeHolder, tips:tips)
let detailAddress = isLiveInChina ? spouse.address.details : spouse.address.foreign
let item23 = YHFormDetailItem(type:.detailAddress, value:detailAddress, placeHolder:placeHolder, tips:tips)
arr2.append(item23)
if !isLiveInChina {// 在国外
......@@ -245,7 +246,16 @@ extension YHSpousePrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
cell.textChange = {
[weak self] (text, isEditEnd) in
guard let self = self else { return }
self.spouse?.address.details = text ?? ""
guard let spouse = spouse else { return }
if detailItem.type == .detailAddress {
if spouse.address.isInChina() {
spouse.address.details = text ?? ""
} else {
spouse.address.foreign = text ?? ""
}
}
if isEditEnd {
self.loadInfo()
save()
......@@ -377,12 +387,15 @@ extension YHSpousePrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
if isEmptyString(spouse.address.country) {
return false
}
if spouse.address.isInChina() {
if isEmptyArray(spouse.address.area) {
return false
}
if isEmptyString(spouse.address.details) {
return false
}
if spouse.address.isInChina() {
if isEmptyArray(spouse.address.area) {
} else { // 住在国外
if isEmptyString(spouse.address.foreign) {
return false
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/YHFamilyMemberInfoListVC.swift
View file @ 35be2008
......@@ -115,15 +115,15 @@ class YHFamilyMemberInfoListVC: YHBaseViewController {
}
@objc func didClickSubmitBtn() {
let isChecked = checkIntegrity()
isNeedShowError = !isChecked
self.tableView .reloadData()
if !isChecked {
YHHUD.flash(message: "资料还未填完")
return
}
// let isChecked = checkIntegrity()
// isNeedShowError = !isChecked
//
// self.tableView .reloadData()
//
// if !isChecked {
// YHHUD.flash(message: "资料还未填完")
// return
// }
submit()
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/M/YHFamilyRequestViewModel.swift
View file @ 35be2008
......@@ -15,7 +15,6 @@ class YHFamilyRequestViewModel {
func getFamilyInfo(params:[String:Any], callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Family.familyInfoApi
// let strUrl = "http://192.168.34.187:8808/" + YHAllApiName.Family.familyInfoApi
YHHUD.show(.progress(message: "数据加载中..."))
......@@ -24,17 +23,22 @@ class YHFamilyRequestViewModel {
guard let self = self else { return }
printLog("model 是 ==> \(json)")
let dic = json.data as? [AnyHashable : Any]
guard let resultModel = YHFamilyMemberGroupInfo.deserialize(dict: dic) else {
let dic = json.data
callBackBlock(false,nil)
if code == NetWorkCode.success.rawValue {
guard let resultModel = YHFamilyMemberGroupInfo.deserialize(dict: dic as? Dictionary ) else {
callBackBlock(false, YHErrorModel(errorCode:Int32(json.code), errorMsg:"解析失败".local))
return
}
familyInfo = resultModel.checkDefaultValue()
callBackBlock(true,nil)
} else {
let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
callBackBlock(false, error)
}
} failBlock: { err in
callBackBlock(false,err)
}
......@@ -60,7 +64,7 @@ class YHFamilyRequestViewModel {
if json.code == NetWorkCode.success.rawValue {
callBackBlock(true,nil)
} else {
callBackBlock(false, nil)
callBackBlock(false, YHErrorModel(errorCode:json.code, errorMsg:json.msg))
}
} failBlock: { err in
......@@ -80,7 +84,7 @@ class YHFamilyRequestViewModel {
if json.code == NetWorkCode.success.rawValue {
callBackBlock(true,nil)
} else {
callBackBlock(false, nil)
callBackBlock(false, YHErrorModel(errorCode:json.code, errorMsg:json.msg))
}
} failBlock: { err in
......@@ -100,11 +104,41 @@ class YHFamilyRequestViewModel {
if json.code == NetWorkCode.success.rawValue {
callBackBlock(true,nil)
} else {
callBackBlock(false, nil)
callBackBlock(false, YHErrorModel(errorCode:json.code, errorMsg:json.msg))
}
} failBlock: { err in
callBackBlock(false,err)
}
}
func requestFamilyMemberInfo(orderId:Int, detailId:Int, callBackBlock:@escaping (_ detail: YHFamilyMember?, _ error:YHErrorModel?)->()) {
YHHUD.show(.progress(message: "数据加载中..."))
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Family.familyInfoDetailApi
let _ = YHNetRequest.postRequest(url: strUrl, params:["order_id":orderId]) { json, code in
YHHUD.hide()
printLog("model 是 ==> \(json)")
YHHUD.hide()
let dic = json.data
if code == NetWorkCode.success.rawValue {
guard let resultModel = YHFamilyMember.deserialize(dict: dic as? Dictionary ) else {
callBackBlock(nil, YHErrorModel(errorCode:Int32(json.code), errorMsg:"解析失败".local))
return
}
callBackBlock(resultModel, nil)
} else {
let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
callBackBlock(nil, error)
}
} failBlock: { err in
callBackBlock(nil, err)
}
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/V/YHFormItemSelectSheetCell.swift
View file @ 35be2008
......@@ -171,9 +171,7 @@ class YHFormItemSelectSheetCell: UITableViewCell {
}
@objc func didTipsButtonClicked() {
if let tipsBtnClickBlock = tipsBtnClickBlock {
tipsBtnClickBlock()
}
YHWholeScreenTipsView.show(type: .residenceInfo, targetView: tipsButton)
}
func setTips(_ tips:String?, isShow:Bool) {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/V/YHOtherInfoSessionView.swift
View file @ 35be2008
......@@ -100,7 +100,6 @@ class YHOtherInfoSessionView: UIView {
make.height.equalTo(20)
}
//iconImageV
addSubview(iconImageV)
iconImageV.snp.makeConstraints { make in
......@@ -113,9 +112,6 @@ class YHOtherInfoSessionView: UIView {
iconImageV.isUserInteractionEnabled = true
iconImageV.addGestureRecognizer(tap)
iconImageV.backgroundColor = .red//for test hjl
//delButton
addSubview(delButton)
delButton.snp.makeConstraints { make in
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/V/YHOtherResidenceFillView.swift
View file @ 35be2008
......@@ -120,9 +120,11 @@ extension YHOtherResidenceFillView {
if dataModel.end_time == "至今" || dataModel.end_time == "8888-01-01" {
endView.longTimeButton.isSelected = true
endView.textField.placeholder = ""
endView.updateKeyName(name: "结束时间", keyValue: "")
} else {
endView.longTimeButton.isSelected = false
endView.textField.placeholder = "请选择"
endView.updateKeyName(name: "结束时间", keyValue: dataModel.end_time)
}
endView.needCheckFlag = dataModel.needCheckFlag
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/V/YHOtherSelecteItemView.swift
View file @ 35be2008
......@@ -45,7 +45,7 @@ class YHOtherSelecteItemView: UIView {
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.setTitle("至今", for: .normal)
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
button.contentHorizontalAlignment = .right
button.addTarget(self, action: #selector(longTimeButtonClick), for: .touchUpInside)
......@@ -74,7 +74,7 @@ class YHOtherSelecteItemView: UIView {
return label
}()
private lazy var textField: UITextField = {
lazy var textField: UITextField = {
let label = UITextField()
label.placeholder = "请选择"
label.isEnabled = false
......@@ -169,7 +169,7 @@ extension YHOtherSelecteItemView {
@objc func longTimeButtonClick() {
longTimeButton.isSelected = !longTimeButton.isSelected
if longTimeButton.isSelected {
block?(true,"8888-01-01")
block?(true,"至今")
textField.placeholder = ""
} else {
block?(false,"")//for test hjl
......
galaxy/galaxy/Classes/Tools/Helper/YHWholeScreenTipsView.swift
View file @ 35be2008
......@@ -11,6 +11,7 @@ import UIKit
enum YHWholeScreenTipsViewType : Int {
case unKnow //默认情况
case residenceInfo //居住信息
case degreeType //学位类型
case company //用人单位介绍
}
......@@ -58,6 +59,8 @@ class YHWholeScreenTipsView: UIView {
switch type {
case .residenceInfo:
return "依日期顺序列出你自出生后曾居住12个月或更长时间的所有国家或地区，包括你的现居国家或地区"
case .degreeType:
return "该内容在学位证上，通常是授予后面，如授予“理学”学士学位，则填理学"
case .company:
return "可先填写用人单位名称，选择指定的用人单位后，系统将为您自动填写单位介绍"
default:
......
galaxy/galaxy/Classes/Tools/NetWork/NetBaseModel.swift
View file @ 35be2008
......@@ -12,6 +12,7 @@ import HandyJSON
enum NetWorkCode: Int {
case success = 200
case parseFail = 9527
}
struct NetBaseModel: SmartCodable {
......@@ -35,6 +36,6 @@ struct TestModel: SmartCodable {
struct NetWorkBaseModel: HandyJSON {
var data : Any?
var code : Int = -1
var code : Int32 = -1
var msg : String = ""
}
galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift
View file @ 35be2008
......@@ -55,6 +55,8 @@ class YHAllApiName {
static let deleteFamilyMemberApi = "infoflow/family/delete"
// 提交家庭成员信息
static let submitAllFamilyInfoApi = "infoflow/family/submit"
// 某个家庭成员性情
static let familyInfoDetailApi = "infoflow/information/member"
}
struct Education {
......
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