Commit 2f7389b1 authored by Steven杜宇's avatar Steven杜宇

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

parents c4f530ff 9b77dd70
...@@ -30,7 +30,7 @@ platform :ios do ...@@ -30,7 +30,7 @@ platform :ios do
uat = "uat" uat = "uat"
#打包正使用的分支 #打包正使用的分支
myPack_branch = uat myPack_branch = develop_branch
# 打adhoc包 执行命令 fastlane galaxyTest # 打adhoc包 执行命令 fastlane galaxyTest
lane :galaxyTest do lane :galaxyTest do
......
...@@ -300,6 +300,10 @@ ...@@ -300,6 +300,10 @@
047AA3F82C5CC7B0009C4554 /* YHShareStepView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047AA3F72C5CC7B0009C4554 /* YHShareStepView.swift */; }; 047AA3F82C5CC7B0009C4554 /* YHShareStepView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047AA3F72C5CC7B0009C4554 /* YHShareStepView.swift */; };
047AA3FA2C60739E009C4554 /* YHInvitationWithGiftsSelectItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047AA3F92C60739E009C4554 /* YHInvitationWithGiftsSelectItemView.swift */; }; 047AA3FA2C60739E009C4554 /* YHInvitationWithGiftsSelectItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047AA3F92C60739E009C4554 /* YHInvitationWithGiftsSelectItemView.swift */; };
047AA3FC2C61EE7F009C4554 /* YHSignAppendStepView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047AA3FB2C61EE7F009C4554 /* YHSignAppendStepView.swift */; }; 047AA3FC2C61EE7F009C4554 /* YHSignAppendStepView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047AA3FB2C61EE7F009C4554 /* YHSignAppendStepView.swift */; };
047AA4092C65C1AC009C4554 /* YHOfficialApprovalResultVC2.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047AA4042C65C1AC009C4554 /* YHOfficialApprovalResultVC2.swift */; };
047AA40A2C65C1AC009C4554 /* YHOffivialApprovalSuccessView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047AA4062C65C1AC009C4554 /* YHOffivialApprovalSuccessView.swift */; };
047AA40B2C65C1AC009C4554 /* YHOffivialApprovalGuildLineCheckView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047AA4072C65C1AC009C4554 /* YHOffivialApprovalGuildLineCheckView.swift */; };
047AA40C2C65C1AC009C4554 /* YHOffivialApprovalSuccessCheckView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047AA4082C65C1AC009C4554 /* YHOffivialApprovalSuccessCheckView.swift */; };
0480976B2BA15269000B9DCA /* YHCertificateInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0480976A2BA15269000B9DCA /* YHCertificateInfoCell.swift */; }; 0480976B2BA15269000B9DCA /* YHCertificateInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0480976A2BA15269000B9DCA /* YHCertificateInfoCell.swift */; };
0480976D2BA158A1000B9DCA /* YHCertificateListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0480976C2BA158A1000B9DCA /* YHCertificateListVC.swift */; }; 0480976D2BA158A1000B9DCA /* YHCertificateListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0480976C2BA158A1000B9DCA /* YHCertificateListVC.swift */; };
048097712BA18D66000B9DCA /* YHCertificateSearchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 048097702BA18D66000B9DCA /* YHCertificateSearchBar.swift */; }; 048097712BA18D66000B9DCA /* YHCertificateSearchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 048097702BA18D66000B9DCA /* YHCertificateSearchBar.swift */; };
...@@ -601,10 +605,7 @@ ...@@ -601,10 +605,7 @@
A5EF213B2BA6EC98005027E6 /* YHQuestionAndAnswerCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5EF213A2BA6EC98005027E6 /* YHQuestionAndAnswerCell.swift */; }; A5EF213B2BA6EC98005027E6 /* YHQuestionAndAnswerCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5EF213A2BA6EC98005027E6 /* YHQuestionAndAnswerCell.swift */; };
A5F886B42C61CEA700B63CF5 /* YHPictureReviewManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5F886B32C61CEA700B63CF5 /* YHPictureReviewManager.swift */; }; A5F886B42C61CEA700B63CF5 /* YHPictureReviewManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5F886B32C61CEA700B63CF5 /* YHPictureReviewManager.swift */; };
A5F886B62C61F76200B63CF5 /* YHLongtapPictureSheetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5F886B52C61F76100B63CF5 /* YHLongtapPictureSheetView.swift */; }; A5F886B62C61F76200B63CF5 /* YHLongtapPictureSheetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5F886B52C61F76100B63CF5 /* YHLongtapPictureSheetView.swift */; };
A5F886BA2C62475C00B63CF5 /* YHOfficialApprovalResultVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5F886B92C62475C00B63CF5 /* YHOfficialApprovalResultVC.swift */; };
A5F8AC082B9F414000A21EFA /* YHCustomTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5F8AC072B9F414000A21EFA /* YHCustomTextView.swift */; }; A5F8AC082B9F414000A21EFA /* YHCustomTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5F8AC072B9F414000A21EFA /* YHCustomTextView.swift */; };
A5F9E9F72C637FC5005BCA73 /* YHOffivialApprovalGuildLineCheckView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5F9E9F62C637FC5005BCA73 /* YHOffivialApprovalGuildLineCheckView.swift */; };
A5F9E9FA2C63A673005BCA73 /* YHOffivialApprovalSuccessCheckView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5F9E9F92C63A673005BCA73 /* YHOffivialApprovalSuccessCheckView.swift */; };
A5F9EA012C647506005BCA73 /* flower2.json in Resources */ = {isa = PBXBuildFile; fileRef = A5F9EA002C647506005BCA73 /* flower2.json */; }; A5F9EA012C647506005BCA73 /* flower2.json in Resources */ = {isa = PBXBuildFile; fileRef = A5F9EA002C647506005BCA73 /* flower2.json */; };
A5FD45232C523DD300908AD9 /* YHJsApi.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD45222C523DD300908AD9 /* YHJsApi.swift */; }; A5FD45232C523DD300908AD9 /* YHJsApi.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD45222C523DD300908AD9 /* YHJsApi.swift */; };
A5FD63BD2B623C2C00D1D9DA /* YHInformationPerfectListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63BC2B623C2C00D1D9DA /* YHInformationPerfectListVC.swift */; }; A5FD63BD2B623C2C00D1D9DA /* YHInformationPerfectListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63BC2B623C2C00D1D9DA /* YHInformationPerfectListVC.swift */; };
...@@ -949,6 +950,10 @@ ...@@ -949,6 +950,10 @@
047AA3F72C5CC7B0009C4554 /* YHShareStepView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHShareStepView.swift; sourceTree = "<group>"; }; 047AA3F72C5CC7B0009C4554 /* YHShareStepView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHShareStepView.swift; sourceTree = "<group>"; };
047AA3F92C60739E009C4554 /* YHInvitationWithGiftsSelectItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHInvitationWithGiftsSelectItemView.swift; sourceTree = "<group>"; }; 047AA3F92C60739E009C4554 /* YHInvitationWithGiftsSelectItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHInvitationWithGiftsSelectItemView.swift; sourceTree = "<group>"; };
047AA3FB2C61EE7F009C4554 /* YHSignAppendStepView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSignAppendStepView.swift; sourceTree = "<group>"; }; 047AA3FB2C61EE7F009C4554 /* YHSignAppendStepView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSignAppendStepView.swift; sourceTree = "<group>"; };
047AA4042C65C1AC009C4554 /* YHOfficialApprovalResultVC2.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHOfficialApprovalResultVC2.swift; sourceTree = "<group>"; };
047AA4062C65C1AC009C4554 /* YHOffivialApprovalSuccessView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHOffivialApprovalSuccessView.swift; sourceTree = "<group>"; };
047AA4072C65C1AC009C4554 /* YHOffivialApprovalGuildLineCheckView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHOffivialApprovalGuildLineCheckView.swift; sourceTree = "<group>"; };
047AA4082C65C1AC009C4554 /* YHOffivialApprovalSuccessCheckView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHOffivialApprovalSuccessCheckView.swift; sourceTree = "<group>"; };
0480976A2BA15269000B9DCA /* YHCertificateInfoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateInfoCell.swift; sourceTree = "<group>"; }; 0480976A2BA15269000B9DCA /* YHCertificateInfoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateInfoCell.swift; sourceTree = "<group>"; };
0480976C2BA158A1000B9DCA /* YHCertificateListVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateListVC.swift; sourceTree = "<group>"; }; 0480976C2BA158A1000B9DCA /* YHCertificateListVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateListVC.swift; sourceTree = "<group>"; };
048097702BA18D66000B9DCA /* YHCertificateSearchBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateSearchBar.swift; sourceTree = "<group>"; }; 048097702BA18D66000B9DCA /* YHCertificateSearchBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateSearchBar.swift; sourceTree = "<group>"; };
...@@ -1257,10 +1262,7 @@ ...@@ -1257,10 +1262,7 @@
A5EF213A2BA6EC98005027E6 /* YHQuestionAndAnswerCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHQuestionAndAnswerCell.swift; sourceTree = "<group>"; }; A5EF213A2BA6EC98005027E6 /* YHQuestionAndAnswerCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHQuestionAndAnswerCell.swift; sourceTree = "<group>"; };
A5F886B32C61CEA700B63CF5 /* YHPictureReviewManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPictureReviewManager.swift; sourceTree = "<group>"; }; A5F886B32C61CEA700B63CF5 /* YHPictureReviewManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPictureReviewManager.swift; sourceTree = "<group>"; };
A5F886B52C61F76100B63CF5 /* YHLongtapPictureSheetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHLongtapPictureSheetView.swift; sourceTree = "<group>"; }; A5F886B52C61F76100B63CF5 /* YHLongtapPictureSheetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHLongtapPictureSheetView.swift; sourceTree = "<group>"; };
A5F886B92C62475C00B63CF5 /* YHOfficialApprovalResultVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHOfficialApprovalResultVC.swift; sourceTree = "<group>"; };
A5F8AC072B9F414000A21EFA /* YHCustomTextView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHCustomTextView.swift; sourceTree = "<group>"; }; A5F8AC072B9F414000A21EFA /* YHCustomTextView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHCustomTextView.swift; sourceTree = "<group>"; };
A5F9E9F62C637FC5005BCA73 /* YHOffivialApprovalGuildLineCheckView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHOffivialApprovalGuildLineCheckView.swift; sourceTree = "<group>"; };
A5F9E9F92C63A673005BCA73 /* YHOffivialApprovalSuccessCheckView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHOffivialApprovalSuccessCheckView.swift; sourceTree = "<group>"; };
A5F9EA002C647506005BCA73 /* flower2.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = flower2.json; sourceTree = "<group>"; }; A5F9EA002C647506005BCA73 /* flower2.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = flower2.json; sourceTree = "<group>"; };
A5FD45222C523DD300908AD9 /* YHJsApi.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHJsApi.swift; sourceTree = "<group>"; }; A5FD45222C523DD300908AD9 /* YHJsApi.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHJsApi.swift; sourceTree = "<group>"; };
A5FD63BC2B623C2C00D1D9DA /* YHInformationPerfectListVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHInformationPerfectListVC.swift; sourceTree = "<group>"; }; A5FD63BC2B623C2C00D1D9DA /* YHInformationPerfectListVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHInformationPerfectListVC.swift; sourceTree = "<group>"; };
...@@ -2256,13 +2258,13 @@ ...@@ -2256,13 +2258,13 @@
path = "PrincipleBatch(原则批)"; path = "PrincipleBatch(原则批)";
sourceTree = "<group>"; sourceTree = "<group>";
}; };
0472CBA62C5A11640096F48F /* CustomerService(客服段) */ = { 0472CBA62C5A11640096F48F /* CustomerService */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
A5F886B72C6242F100B63CF5 /* OfficialApprovalBatch(正式批) */, 047AA4022C65C1AC009C4554 /* OfficialApprovalBatch */,
0472CBA52C5A11640096F48F /* PrincipleBatch(原则批) */, 0472CBA52C5A11640096F48F /* PrincipleBatch(原则批) */,
); );
path = "CustomerService(客服段)"; path = CustomerService;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
0477E1762BA41AF100436346 /* M */ = { 0477E1762BA41AF100436346 /* M */ = {
...@@ -2354,6 +2356,33 @@ ...@@ -2354,6 +2356,33 @@
path = VM; path = VM;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
047AA4022C65C1AC009C4554 /* OfficialApprovalBatch */ = {
isa = PBXGroup;
children = (
047AA4032C65C1AC009C4554 /* C */,
047AA4052C65C1AC009C4554 /* V */,
);
path = "\U001dOfficialApprovalBatch";
sourceTree = "<group>";
};
047AA4032C65C1AC009C4554 /* C */ = {
isa = PBXGroup;
children = (
047AA4042C65C1AC009C4554 /* YHOfficialApprovalResultVC2.swift */,
);
path = C;
sourceTree = "<group>";
};
047AA4052C65C1AC009C4554 /* V */ = {
isa = PBXGroup;
children = (
047AA4062C65C1AC009C4554 /* YHOffivialApprovalSuccessView.swift */,
047AA4072C65C1AC009C4554 /* YHOffivialApprovalGuildLineCheckView.swift */,
047AA4082C65C1AC009C4554 /* YHOffivialApprovalSuccessCheckView.swift */,
);
path = V;
sourceTree = "<group>";
};
04808C022B4686510056D53C /* Frameworks */ = { 04808C022B4686510056D53C /* Frameworks */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
...@@ -3131,7 +3160,7 @@ ...@@ -3131,7 +3160,7 @@
A5ACE9162B4564F7002C94D2 /* IntelligentService(服务中心) */ = { A5ACE9162B4564F7002C94D2 /* IntelligentService(服务中心) */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
0472CBA62C5A11640096F48F /* CustomerService(客服段) */, 0472CBA62C5A11640096F48F /* CustomerService */,
A525D22C2BA837C5001A84F5 /* FileList(文件清单) */, A525D22C2BA837C5001A84F5 /* FileList(文件清单) */,
A525D22A2BA836D6001A84F5 /* MyScheme(我的方案) */, A525D22A2BA836D6001A84F5 /* MyScheme(我的方案) */,
045EEE1B2B9F171A0022A143 /* MySignature(我的签字) */, 045EEE1B2B9F171A0022A143 /* MySignature(我的签字) */,
...@@ -3335,32 +3364,6 @@ ...@@ -3335,32 +3364,6 @@
path = "PictureReview(图片预览)"; path = "PictureReview(图片预览)";
sourceTree = "<group>"; sourceTree = "<group>";
}; };
A5F886B72C6242F100B63CF5 /* OfficialApprovalBatch(正式批) */ = {
isa = PBXGroup;
children = (
A5F9E9F82C637FCC005BCA73 /* V */,
A5F886B82C62436A00B63CF5 /* C */,
);
path = "\U001dOfficialApprovalBatch(正式批)";
sourceTree = "<group>";
};
A5F886B82C62436A00B63CF5 /* C */ = {
isa = PBXGroup;
children = (
A5F886B92C62475C00B63CF5 /* YHOfficialApprovalResultVC.swift */,
);
path = C;
sourceTree = "<group>";
};
A5F9E9F82C637FCC005BCA73 /* V */ = {
isa = PBXGroup;
children = (
A5F9E9F62C637FC5005BCA73 /* YHOffivialApprovalGuildLineCheckView.swift */,
A5F9E9F92C63A673005BCA73 /* YHOffivialApprovalSuccessCheckView.swift */,
);
path = V;
sourceTree = "<group>";
};
A5F9EA022C647D32005BCA73 /* tabbar */ = { A5F9EA022C647D32005BCA73 /* tabbar */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
...@@ -3642,6 +3645,7 @@ ...@@ -3642,6 +3645,7 @@
045EEE9B2B9F171A0022A143 /* YHWorkExperienceViewModel.swift in Sources */, 045EEE9B2B9F171A0022A143 /* YHWorkExperienceViewModel.swift in Sources */,
04AD31772C22DE6600DF5655 /* YHEditInterestViewController.swift in Sources */, 04AD31772C22DE6600DF5655 /* YHEditInterestViewController.swift in Sources */,
045EEEC22B9F171A0022A143 /* YHOtherInfoFillViewController.swift in Sources */, 045EEEC22B9F171A0022A143 /* YHOtherInfoFillViewController.swift in Sources */,
047AA40B2C65C1AC009C4554 /* YHOffivialApprovalGuildLineCheckView.swift in Sources */,
045EEE7C2B9F171A0022A143 /* YHPreviewInfoSessionModel.swift in Sources */, 045EEE7C2B9F171A0022A143 /* YHPreviewInfoSessionModel.swift in Sources */,
049A48AA2B49536000D0C641 /* YHAboutUsAdvantageCell.swift in Sources */, 049A48AA2B49536000D0C641 /* YHAboutUsAdvantageCell.swift in Sources */,
04B360EB2C60E88C001EB053 /* YHPrincipleCongratulationAlertView.swift in Sources */, 04B360EB2C60E88C001EB053 /* YHPrincipleCongratulationAlertView.swift in Sources */,
...@@ -3706,7 +3710,6 @@ ...@@ -3706,7 +3710,6 @@
044D0BFC2C21635B00C5CF5E /* YHInformationAuthorizationStepOneViewController.swift in Sources */, 044D0BFC2C21635B00C5CF5E /* YHInformationAuthorizationStepOneViewController.swift in Sources */,
045EEEBF2B9F171A0022A143 /* YHWorkFileItemView.swift in Sources */, 045EEEBF2B9F171A0022A143 /* YHWorkFileItemView.swift in Sources */,
04AF58C42B4FC51C0066011A /* YHLocalizable.swift in Sources */, 04AF58C42B4FC51C0066011A /* YHLocalizable.swift in Sources */,
A5F886BA2C62475C00B63CF5 /* YHOfficialApprovalResultVC.swift in Sources */,
A520124F2BABCE05008655EA /* YHFileListContentView.swift in Sources */, A520124F2BABCE05008655EA /* YHFileListContentView.swift in Sources */,
04CE1AE12C2AD91F001CB80A /* YHActivityDetailItemView.swift in Sources */, 04CE1AE12C2AD91F001CB80A /* YHActivityDetailItemView.swift in Sources */,
A517A4E42BB6C4BB000DEECD /* YHDocumentUploadView.swift in Sources */, A517A4E42BB6C4BB000DEECD /* YHDocumentUploadView.swift in Sources */,
...@@ -3800,7 +3803,6 @@ ...@@ -3800,7 +3803,6 @@
04174D642BCD52BD000BA46D /* YHDeviceInfoViewController.swift in Sources */, 04174D642BCD52BD000BA46D /* YHDeviceInfoViewController.swift in Sources */,
0472E25E2C534723008EAB6E /* YHLifeDetailViewController.swift in Sources */, 0472E25E2C534723008EAB6E /* YHLifeDetailViewController.swift in Sources */,
A5ACE92E2B4564F7002C94D2 /* YHValidateCodeInputView.swift in Sources */, A5ACE92E2B4564F7002C94D2 /* YHValidateCodeInputView.swift in Sources */,
A5F9E9FA2C63A673005BCA73 /* YHOffivialApprovalSuccessCheckView.swift in Sources */,
045EEED82B9F171A0022A143 /* YHQuestionInfo.swift in Sources */, 045EEED82B9F171A0022A143 /* YHQuestionInfo.swift in Sources */,
A567E5B82BD7643D00D5D5A0 /* YHSearchItemLayout.swift in Sources */, A567E5B82BD7643D00D5D5A0 /* YHSearchItemLayout.swift in Sources */,
A567E5A02BD7643D00D5D5A0 /* YHHomeWebViewController.swift in Sources */, A567E5A02BD7643D00D5D5A0 /* YHHomeWebViewController.swift in Sources */,
...@@ -3825,6 +3827,7 @@ ...@@ -3825,6 +3827,7 @@
04CE1AE22C2AD91F001CB80A /* YHActivityApplyInfoItemView.swift in Sources */, 04CE1AE22C2AD91F001CB80A /* YHActivityApplyInfoItemView.swift in Sources */,
045EEEC52B9F171A0022A143 /* YHOtherPickerView.swift in Sources */, 045EEEC52B9F171A0022A143 /* YHOtherPickerView.swift in Sources */,
045EEE842B9F171A0022A143 /* YHPreviewBasiceInformationViewController.swift in Sources */, 045EEE842B9F171A0022A143 /* YHPreviewBasiceInformationViewController.swift in Sources */,
047AA40A2C65C1AC009C4554 /* YHOffivialApprovalSuccessView.swift in Sources */,
A5ACE9282B4564F7002C94D2 /* YHSmsCodeView.swift in Sources */, A5ACE9282B4564F7002C94D2 /* YHSmsCodeView.swift in Sources */,
0499E3002C056EE30037E646 /* YHOneKeyLoginView.swift in Sources */, 0499E3002C056EE30037E646 /* YHOneKeyLoginView.swift in Sources */,
043D2C8C2C0F037B00172438 /* YHServiceOrderSearchViewModel.swift in Sources */, 043D2C8C2C0F037B00172438 /* YHServiceOrderSearchViewModel.swift in Sources */,
...@@ -3994,6 +3997,7 @@ ...@@ -3994,6 +3997,7 @@
04C8F4832B7216D800ADF59B /* YHUserInfoHeaderView.swift in Sources */, 04C8F4832B7216D800ADF59B /* YHUserInfoHeaderView.swift in Sources */,
045EEEAF2B9F171A0022A143 /* YHWorkExperienceTextItemView.swift in Sources */, 045EEEAF2B9F171A0022A143 /* YHWorkExperienceTextItemView.swift in Sources */,
A5ACE9492B4564F7002C94D2 /* YHHUDSuccessView.swift in Sources */, A5ACE9492B4564F7002C94D2 /* YHHUDSuccessView.swift in Sources */,
047AA4092C65C1AC009C4554 /* YHOfficialApprovalResultVC2.swift in Sources */,
04B360EF2C620975001EB053 /* YHPrincipleUploadStatusCell.swift in Sources */, 04B360EF2C620975001EB053 /* YHPrincipleUploadStatusCell.swift in Sources */,
045EEE9C2B9F171A0022A143 /* YHCompanyViewModel.swift in Sources */, 045EEE9C2B9F171A0022A143 /* YHCompanyViewModel.swift in Sources */,
A58556BA2B6BCF1A003746B2 /* YHPersonInfoFillStepModel.swift in Sources */, A58556BA2B6BCF1A003746B2 /* YHPersonInfoFillStepModel.swift in Sources */,
...@@ -4023,7 +4027,6 @@ ...@@ -4023,7 +4027,6 @@
04FD85682C21277800BEF9C5 /* YHMyNameCardAvatarInfoCell.swift in Sources */, 04FD85682C21277800BEF9C5 /* YHMyNameCardAvatarInfoCell.swift in Sources */,
A566A79A2C219FA400980D06 /* YHHomeSalonAreaView.swift in Sources */, A566A79A2C219FA400980D06 /* YHHomeSalonAreaView.swift in Sources */,
04213B312C4917BD00797900 /* YHHomeInfoDetailViewController.swift in Sources */, 04213B312C4917BD00797900 /* YHHomeInfoDetailViewController.swift in Sources */,
A5F9E9F72C637FC5005BCA73 /* YHOffivialApprovalGuildLineCheckView.swift in Sources */,
A5ACE9432B4564F7002C94D2 /* UILable+Extension.swift in Sources */, A5ACE9432B4564F7002C94D2 /* UILable+Extension.swift in Sources */,
0414BDB22BCCC0A500225367 /* YHCollectionModel.swift in Sources */, 0414BDB22BCCC0A500225367 /* YHCollectionModel.swift in Sources */,
045EEE882B9F171A0022A143 /* YHPreviewAcademicAndProfessionalQualificationViewController.swift in Sources */, 045EEE882B9F171A0022A143 /* YHPreviewAcademicAndProfessionalQualificationViewController.swift in Sources */,
...@@ -4070,6 +4073,7 @@ ...@@ -4070,6 +4073,7 @@
048097712BA18D66000B9DCA /* YHCertificateSearchBar.swift in Sources */, 048097712BA18D66000B9DCA /* YHCertificateSearchBar.swift in Sources */,
045EEEAA2B9F171A0022A143 /* YHWorkExampleViewController.swift in Sources */, 045EEEAA2B9F171A0022A143 /* YHWorkExampleViewController.swift in Sources */,
A5FD63C12B62616D00D1D9DA /* YHInformationPerfectModel.swift in Sources */, A5FD63C12B62616D00D1D9DA /* YHInformationPerfectModel.swift in Sources */,
047AA40C2C65C1AC009C4554 /* YHOffivialApprovalSuccessCheckView.swift in Sources */,
A567E5A62BD7643D00D5D5A0 /* YHHomeSearchView.swift in Sources */, A567E5A62BD7643D00D5D5A0 /* YHHomeSearchView.swift in Sources */,
045EEE912B9F171A0022A143 /* YHPreviewInfoCertificatePictureItemView.swift in Sources */, 045EEE912B9F171A0022A143 /* YHPreviewInfoCertificatePictureItemView.swift in Sources */,
044867B62BA1A03800DFAD4A /* YHCertificateFilterItemCell.swift in Sources */, 044867B62BA1A03800DFAD4A /* YHCertificateFilterItemCell.swift in Sources */,
......
...@@ -115,7 +115,6 @@ extension AppDelegate: JPUSHRegisterDelegate { ...@@ -115,7 +115,6 @@ extension AppDelegate: JPUSHRegisterDelegate {
// 转换到消息tab // 转换到消息tab
YHLoginManager.shared.needJumpToMsgTabFlag = true YHLoginManager.shared.needJumpToMsgTabFlag = true
DispatchQueue.main.asyncAfter(deadline: .now() + 0.25, execute: { DispatchQueue.main.asyncAfter(deadline: .now() + 0.25, execute: {
// NotificationCenter.default.post(name: YhConstant.YhNotification.didRevMsgNotifiction, object: nil)
goToMessagePage() goToMessagePage()
}) })
} }
......
...@@ -451,10 +451,11 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell { ...@@ -451,10 +451,11 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell {
viewModel.state = two viewModel.state = two
self.page = 1 self.page = 1
//请求刷新数据 //请求刷新数据
self.tableView.es.resetNoMoreData()
self.viewModel.postRecord(page: 1) {[weak self] success, error in self.viewModel.postRecord(page: 1) {[weak self] success, error in
guard let self = self else { return } guard let self = self else { return }
self.tableView.es.stopLoadingMore() // self.tableView.es.stopLoadingMore()
if self.viewModel.recordModel.page_count == self.page { if self.viewModel.recordModel.page_count == 1 {
self.tableView.es.noticeNoMoreData() self.tableView.es.noticeNoMoreData()
self.tableView.footer?.alpha = 1 self.tableView.footer?.alpha = 1
} }
......
...@@ -46,10 +46,10 @@ class YHInvitationWithGiftsViewModel: YHBaseViewModel { ...@@ -46,10 +46,10 @@ class YHInvitationWithGiftsViewModel: YHBaseViewModel {
param.updateValue(self.startTime, forKey: "registered_date.begin_date") param.updateValue(self.startTime, forKey: "registered_date.begin_date")
} }
if self.endTime.count != 0 { if self.endTime.count != 0 {
param.updateValue(self.endTime, forKey: "egistered_date.end_date") param.updateValue(self.endTime, forKey: "registered_date.end_date")
} }
if self.state < 3 { if self.state < 3 {
param.updateValue(self.state + 1, forKey: "status") param.updateValue((2 - self.state) + 1, forKey: "status")
} }
let _ = YHNetRequest.getRequest(url: strUrl, params: param) { [weak self] json, code in let _ = YHNetRequest.getRequest(url: strUrl, params: param) { [weak self] json, code in
guard let self = self else { return } guard let self = self else { return }
...@@ -83,7 +83,7 @@ class YHInvitationWithGiftsViewModel: YHBaseViewModel { ...@@ -83,7 +83,7 @@ class YHInvitationWithGiftsViewModel: YHBaseViewModel {
var param: [String: Any] = ["page": page, var param: [String: Any] = ["page": page,
"pagesize": 20] "pagesize": 20]
if self.state < 3 { if self.state < 3 {
param.updateValue(self.state + 1, forKey: "status") param.updateValue((2 - self.state) + 1, forKey: "status")
} }
if !registered_date.isEmpty { if !registered_date.isEmpty {
param.updateValue(registered_date, forKey: "registered_date") param.updateValue(registered_date, forKey: "registered_date")
......
...@@ -12,8 +12,10 @@ import UIKit ...@@ -12,8 +12,10 @@ import UIKit
正式批 结果页 正式批 结果页
*/ */
class YHOfficialApprovalResultVC: YHBaseViewController { class YHOfficialApprovalResultVC2: YHBaseViewController {
var contentView: YHOffivialApprovalSuccessView!
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
setupUI() setupUI()
...@@ -48,7 +50,7 @@ class YHOfficialApprovalResultVC: YHBaseViewController { ...@@ -48,7 +50,7 @@ class YHOfficialApprovalResultVC: YHBaseViewController {
} }
private extension YHOfficialApprovalResultVC { private extension YHOfficialApprovalResultVC2 {
func setupUI() { func setupUI() {
gk_navBarAlpha = 0.0 gk_navBarAlpha = 0.0
...@@ -78,11 +80,25 @@ private extension YHOfficialApprovalResultVC { ...@@ -78,11 +80,25 @@ private extension YHOfficialApprovalResultVC {
make.width.equalTo(294) make.width.equalTo(294)
make.height.equalTo(530) make.height.equalTo(530)
} }
docImageV.layer.zPosition = 1
contentView = {
let view = YHOffivialApprovalSuccessView()
view.updataView(data: ["祝贺您和您的家人申请的","【优秀人才入境计划】","2023年10月1日正式获批","这意味着,您领取香港居民身份证","仅有一步之遥!!"])
return view
}()
view.addSubview(contentView)
contentView.snp.makeConstraints { make in
make.left.equalTo(144)
make.top.equalTo(213)
make.width.equalTo(334)
make.height.equalTo(239)
}
contentView.transform = rotatedTransform()
}
private func rotatedTransform() -> CGAffineTransform {
// 创建一个 CGAffineTransform 对象并设置旋转角度
return CGAffineTransform(rotationAngle: -CGFloat.pi / 64) // 旋转 45 度
} }
func addRightItem() { func addRightItem() {
......
//
// YHOffivialApprovalSuccessView.swift
// galaxy
//
// Created by EDY on 2024/8/9.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHOffivialApprovalSuccessView: UIView {
var titleLabel: UILabel!
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
override init(frame: CGRect) {
super.init(frame: frame)
setupUI()
}
func setupUI() {
titleLabel = {
let label = UILabel()
label.font = UIFont.PFSC_M(ofSize: 30)
label.textColor = UIColor(hex: 0x881000)
label.text = "恭喜 侯先生!"
return label
}()
addSubview(titleLabel)
titleLabel.snp.makeConstraints { make in
make.left.equalTo(5)
make.top.equalTo(0)
make.right.equalTo(-5)
make.height.equalTo(42)
}
}
func updataView(data: [String]) {
var h = 80
var index = 0
for item in data {
let label = UILabel()
label.text = item
label.font = UIFont.PFSC_M(ofSize: 15)
label.textColor = UIColor(hex: 0x881000)
if index == 2 {
label.textColor = UIColor(hex: 0xd12501)
}
addSubview(label)
label.snp.makeConstraints { make in
make.left.equalTo(5)
make.top.equalTo(h)
make.right.equalTo(-5)
make.height.equalTo(26)
}
let line = UIView()
line.backgroundColor = UIColor(hex: 0x881000).withAlphaComponent(0.15)
addSubview(line)
line.snp.makeConstraints { make in
make.left.equalTo(5)
make.top.equalTo(h + 26 + 5)
make.width.equalTo(234)
make.height.equalTo(1)
}
h = h + 26 + 5
index = index + 1
}
}
}
...@@ -102,7 +102,7 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget { ...@@ -102,7 +102,7 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
// let vc = YHOfficialApprovalResultVC() // let vc = YHOfficialApprovalResultVC()
// self.navigationController?.pushViewController(vc) //for test hjl // self?.navigationController?.pushViewController(vc) //for test hjl
} }
view.evaluateBlock = { view.evaluateBlock = {
[weak self] in [weak self] in
......
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