Skip to content

G
galaxy-iOS
Commit f1bba6bd authored by DavidHuang's avatar DavidHuang
Browse files
Options

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

parents f4b21a65 35f3b3ff
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 15 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ f1bba6bd
......@@ -1109,6 +1109,9 @@
04AE20312D13B6E500891D24 /* YHGCChildBasicInfoVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04AE20302D13B6E500891D24 /* YHGCChildBasicInfoVC.swift */; };
04AE20332D13B72F00891D24 /* YHGCChildPrimaryInfoVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04AE20322D13B72F00891D24 /* YHGCChildPrimaryInfoVC.swift */; };
04AE20372D13B7CF00891D24 /* YHGCChildInfoContainerVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04AE20362D13B7CF00891D24 /* YHGCChildInfoContainerVC.swift */; };
04AE203B2D13C01B00891D24 /* YHGCEducationInfoListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04AE203A2D13C01B00891D24 /* YHGCEducationInfoListVC.swift */; };
04AE203D2D13C14900891D24 /* YHGCEducationDetailVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04AE203C2D13C14900891D24 /* YHGCEducationDetailVC.swift */; };
04AE203F2D13C36500891D24 /* YHGCQualificationDetailVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04AE203E2D13C36500891D24 /* YHGCQualificationDetailVC.swift */; };
04EA376D2BEA06EF00DBAF64 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 04EA376C2BEA06EF00DBAF64 /* WebKit.framework */; };
04EA376F2BEA071600DBAF64 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 04EA376E2BEA070500DBAF64 /* libc++.tbd */; };
6203A87EDC96313BBE789D9C /* Pods_galaxy.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 987C69D43AE8D85DC1930DCF /* Pods_galaxy.framework */; };
......@@ -2256,6 +2259,9 @@
04AE20302D13B6E500891D24 /* YHGCChildBasicInfoVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCChildBasicInfoVC.swift; sourceTree = "<group>"; };
04AE20322D13B72F00891D24 /* YHGCChildPrimaryInfoVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCChildPrimaryInfoVC.swift; sourceTree = "<group>"; };
04AE20362D13B7CF00891D24 /* YHGCChildInfoContainerVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCChildInfoContainerVC.swift; sourceTree = "<group>"; };
04AE203A2D13C01B00891D24 /* YHGCEducationInfoListVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCEducationInfoListVC.swift; sourceTree = "<group>"; };
04AE203C2D13C14900891D24 /* YHGCEducationDetailVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCEducationDetailVC.swift; sourceTree = "<group>"; };
04AE203E2D13C36500891D24 /* YHGCQualificationDetailVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCQualificationDetailVC.swift; sourceTree = "<group>"; };
04EA376C2BEA06EF00DBAF64 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
04EA376E2BEA070500DBAF64 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
04FA8B2D2C084C7E00ABE43F /* ATAuthSDK.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = ATAuthSDK.bundle; path = "galaxy/Classes/Modules/AutoLogin(一键登录)/framework/ATAuthSDK_D.framework/ATAuthSDK.bundle"; sourceTree = "<group>"; };
......@@ -5894,6 +5900,7 @@
04AE200D2D12CFAF00891D24 /* ServiceProcess(我的信息流程) */ = {
isa = PBXGroup;
children = (
04AE20382D13BAC400891D24 /* Education&Qualification(学历专业资格填写) */,
04AE201C2D13AF1800891D24 /* FamilyMember(家庭成员) */,
04AE20092D12CFAF00891D24 /* ApplicationType(申请类别) */,
04AE200C2D12CFAF00891D24 /* BaseInformation(基本资料) */,
......@@ -5924,8 +5931,8 @@
04AE201D2D13AF3D00891D24 /* C */ = {
isa = PBXGroup;
children = (
04AE202F2D13B6A800891D24 /* Child(子女) */,
04AE202A2D13B54500891D24 /* Certificates(证书上传和证书信息) */,
04AE202F2D13B6A800891D24 /* Child(子女) */,
04AE20232D13B0D300891D24 /* Spouse(配偶) */,
04AE20212D13AFF200891D24 /* YHGCFamilyMemberInfoListVC.swift */,
);
......@@ -5982,6 +5989,24 @@
path = "Child(子女)";
sourceTree = "<group>";
};
04AE20382D13BAC400891D24 /* Education&Qualification(学历专业资格填写) */ = {
isa = PBXGroup;
children = (
04AE20392D13C00400891D24 /* C */,
);
path = "Education&Qualification(学历专业资格填写)";
sourceTree = "<group>";
};
04AE20392D13C00400891D24 /* C */ = {
isa = PBXGroup;
children = (
04AE203A2D13C01B00891D24 /* YHGCEducationInfoListVC.swift */,
04AE203C2D13C14900891D24 /* YHGCEducationDetailVC.swift */,
04AE203E2D13C36500891D24 /* YHGCQualificationDetailVC.swift */,
);
path = C;
sourceTree = "<group>";
};
04E86E212B81E9FA00A35F4B /* Recovered References */ = {
isa = PBXGroup;
children = (
......@@ -6733,6 +6758,7 @@
045C11532D12CA5F00BD2DC0 /* YHLookResignResultStateOneTableViewCell.swift in Sources */,
045C11542D12CA5F00BD2DC0 /* YHWorkExperienceCompanyModel.swift in Sources */,
045C11552D12CA5F00BD2DC0 /* YHResignInfoItemView.swift in Sources */,
04AE203B2D13C01B00891D24 /* YHGCEducationInfoListVC.swift in Sources */,
045C11562D12CA5F00BD2DC0 /* YHHUDSquareBaseView.swift in Sources */,
045C11572D12CA5F00BD2DC0 /* YHCountryHotView.swift in Sources */,
045C11582D12CA5F00BD2DC0 /* YHPreviewBaseViewController.swift in Sources */,
......@@ -6741,6 +6767,7 @@
045C115B2D12CA5F00BD2DC0 /* YHHKRecordItemDetailType.swift in Sources */,
045C115C2D12CA5F00BD2DC0 /* YHHUDContainerView.swift in Sources */,
045C115D2D12CA5F00BD2DC0 /* YHOrderTipsView.swift in Sources */,
04AE203F2D13C36500891D24 /* YHGCQualificationDetailVC.swift in Sources */,
045C115E2D12CA5F00BD2DC0 /* YHInvitationWithGiftsSelectItemView.swift in Sources */,
045C115F2D12CA5F00BD2DC0 /* YHAITabIndicatorView.swift in Sources */,
045C11602D12CA5F00BD2DC0 /* YHHKRecordsFamilyMembers.swift in Sources */,
......@@ -6800,6 +6827,7 @@
045C11972D12CA5F00BD2DC0 /* YHHUDRotatingImageView.swift in Sources */,
045C11982D12CA5F00BD2DC0 /* YHCerAppointViewModel.swift in Sources */,
045C11992D12CA5F00BD2DC0 /* YHPayMembersCell.swift in Sources */,
04AE203D2D13C14900891D24 /* YHGCEducationDetailVC.swift in Sources */,
045C119A2D12CA5F00BD2DC0 /* YHValidateCodeInputView.swift in Sources */,
045C119B2D12CA5F00BD2DC0 /* YHButlerServiceMessage.swift in Sources */,
045C119C2D12CA5F00BD2DC0 /* YHSubmitAllInfoCheckView.swift in Sources */,
......@@ -7448,7 +7476,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 6;
CURRENT_PROJECT_VERSION = 7;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -7592,7 +7620,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 6;
CURRENT_PROJECT_VERSION = 7;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -7799,7 +7827,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 6;
CURRENT_PROJECT_VERSION = 7;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -7846,7 +7874,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 6;
CURRENT_PROJECT_VERSION = 7;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员)/C/Child(子女)/YHGCChildInfoContainerVC.swift
View file @ f1bba6bd
......@@ -80,10 +80,10 @@ class YHGCChildInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
}()
let primaryInfoVC = YHChildPrimaryInfoVC()
let uploadVC = YHCertificateUploadVC()
let certificateVC = YHCertificateInfoController()
let basicInfoVC = YHChildBasicInfoVC()
let primaryInfoVC = YHGCChildPrimaryInfoVC()
let uploadVC = YHGCCertificateUploadVC()
let certificateVC = YHGCCertificateInfoController()
let basicInfoVC = YHGCChildBasicInfoVC()
override func viewDidLoad() {
super.viewDidLoad()
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员)/C/Spouse(配偶)/YHGCSpouseInfoContainerVC.swift
View file @ f1bba6bd
......@@ -77,10 +77,10 @@ class YHGCSpouseInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
return view
}()
let primaryInfoVC = YHSpousePrimaryInfoVC()
let uploadVC = YHCertificateUploadVC()
let certificateVC = YHCertificateInfoController()
let basicInfoVC = YHSpouseBasicInfoVC()
let primaryInfoVC = YHGCSpousePrimaryInfoVC()
let uploadVC = YHGCCertificateUploadVC()
let certificateVC = YHGCCertificateInfoController()
let basicInfoVC = YHGCSpouseBasicInfoVC()
override func viewDidLoad() {
super.viewDidLoad()
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员)/C/YHGCFamilyMemberInfoListVC.swift
View file @ f1bba6bd
......@@ -587,7 +587,7 @@ extension YHGCFamilyMemberInfoListVC : UITableViewDelegate, UITableViewDataSourc
// 配偶
if detailItem.relationType == .spouse {
let vc = YHSpouseInfoContainerVC()
let vc = YHGCSpouseInfoContainerVC()
vc.spouse = detailItem
vc.mainApplicantInfo = self.familyMemberInfo?.applicant
vc.orderId = orderId
......@@ -606,7 +606,7 @@ extension YHGCFamilyMemberInfoListVC : UITableViewDelegate, UITableViewDataSourc
// 子女
if detailItem.relationType == .child {
let vc = YHChildInfoContainerVC()
let vc = YHGCChildInfoContainerVC()
vc.child = detailItem
vc.mainApplicantInfo = self.familyMemberInfo?.applicant
vc.orderId = orderId
......
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