Skip to content

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

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

* '630-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  //  人脉
  //  人脉
  //  model 找不到
  // 人脉
parents 21333ce7 cdffd9d4
Hide whitespace changes
Inline Side-by-side
Showing with 283 additions and 159 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ b0d19ba9
......@@ -53,7 +53,6 @@
044CF8D42BB6BCF700008CE8 /* YHSignatureUploadTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044CF8D32BB6BCF700008CE8 /* YHSignatureUploadTableViewCell.swift */; };
044CF8D62BBA57DC00008CE8 /* YHFailPromptView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044CF8D52BBA57DC00008CE8 /* YHFailPromptView.swift */; };
044D0BEE2C2019C100C5CF5E /* YHCommunityViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044D0BED2C2019C100C5CF5E /* YHCommunityViewController.swift */; };
044D0BF02C2025FF00C5CF5E /* YHActivityListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044D0BEF2C2025FF00C5CF5E /* YHActivityListViewController.swift */; };
044D0BF22C20262100C5CF5E /* YHPeopleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044D0BF12C20262100C5CF5E /* YHPeopleViewController.swift */; };
044D0BF42C21247100C5CF5E /* YHUserInfoSettingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044D0BF32C21247100C5CF5E /* YHUserInfoSettingViewController.swift */; };
044D0BF62C2154CA00C5CF5E /* YHAllowUseMyInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044D0BF52C2154CA00C5CF5E /* YHAllowUseMyInfoViewController.swift */; };
......@@ -313,6 +312,27 @@
04C693642B723B56004C1758 /* YHMySettingCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C693632B723B56004C1758 /* YHMySettingCell.swift */; };
04C8F4832B7216D800ADF59B /* YHUserInfoHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C8F4822B7216D800ADF59B /* YHUserInfoHeaderView.swift */; };
04CC2EF02BC3DDB2000305DD /* YHServiceBannerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04CC2EEF2BC3DDB2000305DD /* YHServiceBannerView.swift */; };
04CE1ACF2C2AD91F001CB80A /* YHActivityViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04CE1AB72C2AD91F001CB80A /* YHActivityViewModel.swift */; };
04CE1AD02C2AD91F001CB80A /* YHActivityListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04CE1AB92C2AD91F001CB80A /* YHActivityListModel.swift */; };
04CE1AD12C2AD91F001CB80A /* YHActivityTravelModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04CE1ABA2C2AD91F001CB80A /* YHActivityTravelModel.swift */; };
04CE1AD22C2AD91F001CB80A /* YHActivityModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04CE1ABB2C2AD91F001CB80A /* YHActivityModel.swift */; };
04CE1AD32C2AD91F001CB80A /* YHTravelModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04CE1ABC2C2AD91F001CB80A /* YHTravelModel.swift */; };
04CE1AD42C2AD91F001CB80A /* YHActivityDetailModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04CE1ABD2C2AD91F001CB80A /* YHActivityDetailModel.swift */; };
04CE1AD52C2AD91F001CB80A /* YHActivityTravelViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04CE1ABF2C2AD91F001CB80A /* YHActivityTravelViewController.swift */; };
04CE1AD62C2AD91F001CB80A /* YHApplyActivityResultViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04CE1AC02C2AD91F001CB80A /* YHApplyActivityResultViewController.swift */; };
04CE1AD72C2AD91F001CB80A /* YHActivityDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04CE1AC12C2AD91F001CB80A /* YHActivityDetailViewController.swift */; };
04CE1AD82C2AD91F001CB80A /* YHActivityListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04CE1AC22C2AD91F001CB80A /* YHActivityListViewController.swift */; };
04CE1AD92C2AD91F001CB80A /* YHActivityDetailBottomView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04CE1AC42C2AD91F001CB80A /* YHActivityDetailBottomView.swift */; };
04CE1ADA2C2AD91F001CB80A /* YHActivityTravelitemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04CE1AC52C2AD91F001CB80A /* YHActivityTravelitemView.swift */; };
04CE1ADB2C2AD91F001CB80A /* YHActivityTitleItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04CE1AC62C2AD91F001CB80A /* YHActivityTitleItemView.swift */; };
04CE1ADC2C2AD91F001CB80A /* YHActivityTipsItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04CE1AC72C2AD91F001CB80A /* YHActivityTipsItemView.swift */; };
04CE1ADD2C2AD91F001CB80A /* YHActivityDetailCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04CE1AC82C2AD91F001CB80A /* YHActivityDetailCell.swift */; };
04CE1ADE2C2AD91F001CB80A /* YHActivityTravelCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04CE1AC92C2AD91F001CB80A /* YHActivityTravelCell.swift */; };
04CE1ADF2C2AD91F001CB80A /* YHActivityListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04CE1ACA2C2AD91F001CB80A /* YHActivityListCell.swift */; };
04CE1AE02C2AD91F001CB80A /* YHActivityTwoItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04CE1ACB2C2AD91F001CB80A /* YHActivityTwoItemView.swift */; };
04CE1AE12C2AD91F001CB80A /* YHActivityDetailItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04CE1ACC2C2AD91F001CB80A /* YHActivityDetailItemView.swift */; };
04CE1AE22C2AD91F001CB80A /* YHActivityApplyInfoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04CE1ACD2C2AD91F001CB80A /* YHActivityApplyInfoView.swift */; };
04CE1AE32C2AD91F001CB80A /* YHApplyActivityAlert.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04CE1ACE2C2AD91F001CB80A /* YHApplyActivityAlert.swift */; };
04D1446D2C04359500EE3758 /* ATAuthSDK_D.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 04D1446B2C04355B00EE3758 /* ATAuthSDK_D.framework */; settings = {ATTRIBUTES = (Required, ); }; };
04D1446E2C04359500EE3758 /* ATAuthSDK_D.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 04D1446B2C04355B00EE3758 /* ATAuthSDK_D.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
04D144762C0452E200EE3758 /* YHOneKeyLoginManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D144752C0452E200EE3758 /* YHOneKeyLoginManager.swift */; };
......@@ -372,11 +392,6 @@
A520124F2BABCE05008655EA /* YHFileListContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A520124E2BABCE05008655EA /* YHFileListContentView.swift */; };
A53B61122BB128AF0010B573 /* YHFileListItemsView2.swift in Sources */ = {isa = PBXBuildFile; fileRef = A53B61112BB128AF0010B573 /* YHFileListItemsView2.swift */; };
A53B61192BB3C9960010B573 /* YHMyDocListHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A53B61182BB3C9960010B573 /* YHMyDocListHeaderView.swift */; };
A540342F2C2A606900E63A20 /* YHActivityListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A540342E2C2A606900E63A20 /* YHActivityListModel.swift */; };
A54034312C2A612100E63A20 /* YHActivityModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A54034302C2A612100E63A20 /* YHActivityModel.swift */; };
A54034342C2A621000E63A20 /* YHActivityViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A54034332C2A621000E63A20 /* YHActivityViewModel.swift */; };
A54034362C2A8DE200E63A20 /* YHActivityDetailModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A54034352C2A8DE200E63A20 /* YHActivityDetailModel.swift */; };
A54034382C2AADE900E63A20 /* YHTravelModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A54034372C2AADE900E63A20 /* YHTravelModel.swift */; };
A554A5122B99715000EA5973 /* YHConstantArrayData.swift in Sources */ = {isa = PBXBuildFile; fileRef = A554A5112B99715000EA5973 /* YHConstantArrayData.swift */; };
A5551FFE2B4C26CE00510980 /* YHBaseViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5551FFD2B4C26CE00510980 /* YHBaseViewModel.swift */; };
A5573ED22B317BFF00D98EC0 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5573ED12B317BFF00D98EC0 /* AppDelegate.swift */; };
......@@ -425,15 +440,7 @@
A567E5B62BD7643D00D5D5A0 /* YHHomeBannerIndicatorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A567E58F2BD7643D00D5D5A0 /* YHHomeBannerIndicatorView.swift */; };
A567E5B72BD7643D00D5D5A0 /* YHHkLifeAndIdItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A567E5902BD7643D00D5D5A0 /* YHHkLifeAndIdItemView.swift */; };
A567E5B82BD7643D00D5D5A0 /* YHSearchItemLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = A567E5912BD7643D00D5D5A0 /* YHSearchItemLayout.swift */; };
A569DFDD2C2AC7A200FAA6CF /* YHActivityTravelModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A569DFDC2C2AC7A200FAA6CF /* YHActivityTravelModel.swift */; };
A56D2D612B62020C009C83A8 /* YHContractMainItemStatusCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A56D2D602B62020C009C83A8 /* YHContractMainItemStatusCell.swift */; };
A5787E342C22B45700B021D7 /* YHActivityListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5787E332C22B45700B021D7 /* YHActivityListCell.swift */; };
A5787E362C23CFDA00B021D7 /* YHActivityDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5787E352C23CFDA00B021D7 /* YHActivityDetailViewController.swift */; };
A5787E382C23D1DC00B021D7 /* YHActivityDetailCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5787E372C23D1DC00B021D7 /* YHActivityDetailCell.swift */; };
A5787E3A2C23DA8A00B021D7 /* YHActivityDetailBottomView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5787E392C23DA8A00B021D7 /* YHActivityDetailBottomView.swift */; };
A5787E3C2C23DEE500B021D7 /* YHActivityTitleItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5787E3B2C23DEE500B021D7 /* YHActivityTitleItemView.swift */; };
A5787E3E2C23DF8C00B021D7 /* YHActivityDetailItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5787E3D2C23DF8C00B021D7 /* YHActivityDetailItemView.swift */; };
A5787E402C23DFD000B021D7 /* YHActivityTipsItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5787E3F2C23DFD000B021D7 /* YHActivityTipsItemView.swift */; };
A580371E2BAD784B0031C312 /* YHMySchemeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A580371D2BAD784B0031C312 /* YHMySchemeViewModel.swift */; };
A58037212BAD7B2A0031C312 /* YHMySchemeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A58037202BAD7B2A0031C312 /* YHMySchemeModel.swift */; };
A582B23D2BB944ED009D098C /* YHHKPlanDoctumentVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A582B23C2BB944ED009D098C /* YHHKPlanDoctumentVC.swift */; };
......@@ -453,13 +460,6 @@
A592FE932BA6CFFC0062FACA /* YHCertificateEntryBottomView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A592FE922BA6CFFC0062FACA /* YHCertificateEntryBottomView.swift */; };
A592FE952BA6D23C0062FACA /* YHCertificateEntryCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A592FE942BA6D23C0062FACA /* YHCertificateEntryCell.swift */; };
A592FE972BA6DB340062FACA /* YHCertificateViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A592FE962BA6DB340062FACA /* YHCertificateViewModel.swift */; };
A59CCBCE2C241FCB001910FE /* YHApplyActivityAlert.swift in Sources */ = {isa = PBXBuildFile; fileRef = A59CCBCD2C241FCB001910FE /* YHApplyActivityAlert.swift */; };
A59CCBD02C244B13001910FE /* YHApplyActivityResultViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A59CCBCF2C244B13001910FE /* YHApplyActivityResultViewController.swift */; };
A59CCBD22C245B17001910FE /* YHActivityTravelViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A59CCBD12C245B17001910FE /* YHActivityTravelViewController.swift */; };
A59CCBD42C252063001910FE /* YHActivityTravelCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A59CCBD32C252063001910FE /* YHActivityTravelCell.swift */; };
A5A89FD12C254B5C005A71DD /* YHActivityTravelitemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5A89FD02C254B5C005A71DD /* YHActivityTravelitemView.swift */; };
A5A89FD32C25518B005A71DD /* YHActivityApplyInfoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5A89FD22C25518B005A71DD /* YHActivityApplyInfoView.swift */; };
A5A89FD52C255250005A71DD /* YHActivityTwoItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5A89FD42C255250005A71DD /* YHActivityTwoItemView.swift */; };
A5A89FD72C256B94005A71DD /* YHHomeLastMessageModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5A89FD62C256B94005A71DD /* YHHomeLastMessageModel.swift */; };
A5ACE9282B4564F7002C94D2 /* YHSmsCodeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE8DE2B4564F7002C94D2 /* YHSmsCodeView.swift */; };
A5ACE9292B4564F7002C94D2 /* YHSmsCodeInputView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE8E02B4564F7002C94D2 /* YHSmsCodeInputView.swift */; };
......@@ -618,7 +618,6 @@
044CF8D32BB6BCF700008CE8 /* YHSignatureUploadTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSignatureUploadTableViewCell.swift; sourceTree = "<group>"; };
044CF8D52BBA57DC00008CE8 /* YHFailPromptView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFailPromptView.swift; sourceTree = "<group>"; };
044D0BED2C2019C100C5CF5E /* YHCommunityViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCommunityViewController.swift; sourceTree = "<group>"; };
044D0BEF2C2025FF00C5CF5E /* YHActivityListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHActivityListViewController.swift; sourceTree = "<group>"; };
044D0BF12C20262100C5CF5E /* YHPeopleViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPeopleViewController.swift; sourceTree = "<group>"; };
044D0BF32C21247100C5CF5E /* YHUserInfoSettingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHUserInfoSettingViewController.swift; sourceTree = "<group>"; };
044D0BF52C2154CA00C5CF5E /* YHAllowUseMyInfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHAllowUseMyInfoViewController.swift; sourceTree = "<group>"; };
......@@ -881,6 +880,27 @@
04C693632B723B56004C1758 /* YHMySettingCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMySettingCell.swift; sourceTree = "<group>"; };
04C8F4822B7216D800ADF59B /* YHUserInfoHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHUserInfoHeaderView.swift; sourceTree = "<group>"; };
04CC2EEF2BC3DDB2000305DD /* YHServiceBannerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServiceBannerView.swift; sourceTree = "<group>"; };
04CE1AB72C2AD91F001CB80A /* YHActivityViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHActivityViewModel.swift; sourceTree = "<group>"; };
04CE1AB92C2AD91F001CB80A /* YHActivityListModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHActivityListModel.swift; sourceTree = "<group>"; };
04CE1ABA2C2AD91F001CB80A /* YHActivityTravelModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHActivityTravelModel.swift; sourceTree = "<group>"; };
04CE1ABB2C2AD91F001CB80A /* YHActivityModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHActivityModel.swift; sourceTree = "<group>"; };
04CE1ABC2C2AD91F001CB80A /* YHTravelModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHTravelModel.swift; sourceTree = "<group>"; };
04CE1ABD2C2AD91F001CB80A /* YHActivityDetailModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHActivityDetailModel.swift; sourceTree = "<group>"; };
04CE1ABF2C2AD91F001CB80A /* YHActivityTravelViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHActivityTravelViewController.swift; sourceTree = "<group>"; };
04CE1AC02C2AD91F001CB80A /* YHApplyActivityResultViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHApplyActivityResultViewController.swift; sourceTree = "<group>"; };
04CE1AC12C2AD91F001CB80A /* YHActivityDetailViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHActivityDetailViewController.swift; sourceTree = "<group>"; };
04CE1AC22C2AD91F001CB80A /* YHActivityListViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHActivityListViewController.swift; sourceTree = "<group>"; };
04CE1AC42C2AD91F001CB80A /* YHActivityDetailBottomView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHActivityDetailBottomView.swift; sourceTree = "<group>"; };
04CE1AC52C2AD91F001CB80A /* YHActivityTravelitemView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHActivityTravelitemView.swift; sourceTree = "<group>"; };
04CE1AC62C2AD91F001CB80A /* YHActivityTitleItemView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHActivityTitleItemView.swift; sourceTree = "<group>"; };
04CE1AC72C2AD91F001CB80A /* YHActivityTipsItemView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHActivityTipsItemView.swift; sourceTree = "<group>"; };
04CE1AC82C2AD91F001CB80A /* YHActivityDetailCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHActivityDetailCell.swift; sourceTree = "<group>"; };
04CE1AC92C2AD91F001CB80A /* YHActivityTravelCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHActivityTravelCell.swift; sourceTree = "<group>"; };
04CE1ACA2C2AD91F001CB80A /* YHActivityListCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHActivityListCell.swift; sourceTree = "<group>"; };
04CE1ACB2C2AD91F001CB80A /* YHActivityTwoItemView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHActivityTwoItemView.swift; sourceTree = "<group>"; };
04CE1ACC2C2AD91F001CB80A /* YHActivityDetailItemView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHActivityDetailItemView.swift; sourceTree = "<group>"; };
04CE1ACD2C2AD91F001CB80A /* YHActivityApplyInfoView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHActivityApplyInfoView.swift; sourceTree = "<group>"; };
04CE1ACE2C2AD91F001CB80A /* YHApplyActivityAlert.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHApplyActivityAlert.swift; sourceTree = "<group>"; };
04D1446B2C04355B00EE3758 /* ATAuthSDK_D.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = ATAuthSDK_D.framework; sourceTree = "<group>"; };
04D144752C0452E200EE3758 /* YHOneKeyLoginManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHOneKeyLoginManager.swift; sourceTree = "<group>"; };
04D5C5652B8ED92600190021 /* YHBaseModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHBaseModel.swift; sourceTree = "<group>"; };
......@@ -941,11 +961,6 @@
A520124E2BABCE05008655EA /* YHFileListContentView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHFileListContentView.swift; sourceTree = "<group>"; };
A53B61112BB128AF0010B573 /* YHFileListItemsView2.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFileListItemsView2.swift; sourceTree = "<group>"; };
A53B61182BB3C9960010B573 /* YHMyDocListHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyDocListHeaderView.swift; sourceTree = "<group>"; };
A540342E2C2A606900E63A20 /* YHActivityListModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHActivityListModel.swift; sourceTree = "<group>"; };
A54034302C2A612100E63A20 /* YHActivityModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHActivityModel.swift; sourceTree = "<group>"; };
A54034332C2A621000E63A20 /* YHActivityViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHActivityViewModel.swift; sourceTree = "<group>"; };
A54034352C2A8DE200E63A20 /* YHActivityDetailModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHActivityDetailModel.swift; sourceTree = "<group>"; };
A54034372C2AADE900E63A20 /* YHTravelModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHTravelModel.swift; sourceTree = "<group>"; };
A554A5112B99715000EA5973 /* YHConstantArrayData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHConstantArrayData.swift; sourceTree = "<group>"; };
A5551FFD2B4C26CE00510980 /* YHBaseViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHBaseViewModel.swift; sourceTree = "<group>"; };
A5573ECE2B317BFF00D98EC0 /* galaxy.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = galaxy.app; sourceTree = BUILT_PRODUCTS_DIR; };
......@@ -998,15 +1013,7 @@
A567E58F2BD7643D00D5D5A0 /* YHHomeBannerIndicatorView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHHomeBannerIndicatorView.swift; sourceTree = "<group>"; };
A567E5902BD7643D00D5D5A0 /* YHHkLifeAndIdItemView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHHkLifeAndIdItemView.swift; sourceTree = "<group>"; };
A567E5912BD7643D00D5D5A0 /* YHSearchItemLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHSearchItemLayout.swift; sourceTree = "<group>"; };
A569DFDC2C2AC7A200FAA6CF /* YHActivityTravelModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHActivityTravelModel.swift; sourceTree = "<group>"; };
A56D2D602B62020C009C83A8 /* YHContractMainItemStatusCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHContractMainItemStatusCell.swift; sourceTree = "<group>"; };
A5787E332C22B45700B021D7 /* YHActivityListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHActivityListCell.swift; sourceTree = "<group>"; };
A5787E352C23CFDA00B021D7 /* YHActivityDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHActivityDetailViewController.swift; sourceTree = "<group>"; };
A5787E372C23D1DC00B021D7 /* YHActivityDetailCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHActivityDetailCell.swift; sourceTree = "<group>"; };
A5787E392C23DA8A00B021D7 /* YHActivityDetailBottomView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHActivityDetailBottomView.swift; sourceTree = "<group>"; };
A5787E3B2C23DEE500B021D7 /* YHActivityTitleItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHActivityTitleItemView.swift; sourceTree = "<group>"; };
A5787E3D2C23DF8C00B021D7 /* YHActivityDetailItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHActivityDetailItemView.swift; sourceTree = "<group>"; };
A5787E3F2C23DFD000B021D7 /* YHActivityTipsItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHActivityTipsItemView.swift; sourceTree = "<group>"; };
A580371D2BAD784B0031C312 /* YHMySchemeViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMySchemeViewModel.swift; sourceTree = "<group>"; };
A58037202BAD7B2A0031C312 /* YHMySchemeModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMySchemeModel.swift; sourceTree = "<group>"; };
A582B23C2BB944ED009D098C /* YHHKPlanDoctumentVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHKPlanDoctumentVC.swift; sourceTree = "<group>"; };
......@@ -1026,13 +1033,6 @@
A592FE922BA6CFFC0062FACA /* YHCertificateEntryBottomView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateEntryBottomView.swift; sourceTree = "<group>"; };
A592FE942BA6D23C0062FACA /* YHCertificateEntryCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateEntryCell.swift; sourceTree = "<group>"; };
A592FE962BA6DB340062FACA /* YHCertificateViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHCertificateViewModel.swift; sourceTree = "<group>"; };
A59CCBCD2C241FCB001910FE /* YHApplyActivityAlert.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHApplyActivityAlert.swift; sourceTree = "<group>"; };
A59CCBCF2C244B13001910FE /* YHApplyActivityResultViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHApplyActivityResultViewController.swift; sourceTree = "<group>"; };
A59CCBD12C245B17001910FE /* YHActivityTravelViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHActivityTravelViewController.swift; sourceTree = "<group>"; };
A59CCBD32C252063001910FE /* YHActivityTravelCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHActivityTravelCell.swift; sourceTree = "<group>"; };
A5A89FD02C254B5C005A71DD /* YHActivityTravelitemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHActivityTravelitemView.swift; sourceTree = "<group>"; };
A5A89FD22C25518B005A71DD /* YHActivityApplyInfoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHActivityApplyInfoView.swift; sourceTree = "<group>"; };
A5A89FD42C255250005A71DD /* YHActivityTwoItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHActivityTwoItemView.swift; sourceTree = "<group>"; };
A5A89FD62C256B94005A71DD /* YHHomeLastMessageModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomeLastMessageModel.swift; sourceTree = "<group>"; };
A5ACE8DE2B4564F7002C94D2 /* YHSmsCodeView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHSmsCodeView.swift; sourceTree = "<group>"; };
A5ACE8E02B4564F7002C94D2 /* YHSmsCodeInputView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHSmsCodeInputView.swift; sourceTree = "<group>"; };
......@@ -1283,8 +1283,8 @@
044D0BE82C2019AC00C5CF5E /* Community(社区) */ = {
isa = PBXGroup;
children = (
04CE1AB52C2AD91F001CB80A /* Activity(活动) */,
A566A79E2C228CE800980D06 /* Connection(人脉) */,
A566A79D2C228C8C00980D06 /* Activity(活动) */,
04F957492C2032A0003C631C /* V */,
044D0BE92C2019AC00C5CF5E /* VM */,
044D0BEA2C2019AC00C5CF5E /* M */,
......@@ -2151,6 +2151,66 @@
path = Localized;
sourceTree = "<group>";
};
04CE1AB52C2AD91F001CB80A /* Activity(活动) */ = {
isa = PBXGroup;
children = (
04CE1AB62C2AD91F001CB80A /* VM */,
04CE1AB82C2AD91F001CB80A /* M */,
04CE1ABE2C2AD91F001CB80A /* C */,
04CE1AC32C2AD91F001CB80A /* V */,
);
path = "Activity(活动)";
sourceTree = "<group>";
};
04CE1AB62C2AD91F001CB80A /* VM */ = {
isa = PBXGroup;
children = (
04CE1AB72C2AD91F001CB80A /* YHActivityViewModel.swift */,
);
path = VM;
sourceTree = "<group>";
};
04CE1AB82C2AD91F001CB80A /* M */ = {
isa = PBXGroup;
children = (
04CE1AB92C2AD91F001CB80A /* YHActivityListModel.swift */,
04CE1ABA2C2AD91F001CB80A /* YHActivityTravelModel.swift */,
04CE1ABB2C2AD91F001CB80A /* YHActivityModel.swift */,
04CE1ABC2C2AD91F001CB80A /* YHTravelModel.swift */,
04CE1ABD2C2AD91F001CB80A /* YHActivityDetailModel.swift */,
);
path = M;
sourceTree = "<group>";
};
04CE1ABE2C2AD91F001CB80A /* C */ = {
isa = PBXGroup;
children = (
04CE1ABF2C2AD91F001CB80A /* YHActivityTravelViewController.swift */,
04CE1AC02C2AD91F001CB80A /* YHApplyActivityResultViewController.swift */,
04CE1AC12C2AD91F001CB80A /* YHActivityDetailViewController.swift */,
04CE1AC22C2AD91F001CB80A /* YHActivityListViewController.swift */,
);
path = C;
sourceTree = "<group>";
};
04CE1AC32C2AD91F001CB80A /* V */ = {
isa = PBXGroup;
children = (
04CE1AC42C2AD91F001CB80A /* YHActivityDetailBottomView.swift */,
04CE1AC52C2AD91F001CB80A /* YHActivityTravelitemView.swift */,
04CE1AC62C2AD91F001CB80A /* YHActivityTitleItemView.swift */,
04CE1AC72C2AD91F001CB80A /* YHActivityTipsItemView.swift */,
04CE1AC82C2AD91F001CB80A /* YHActivityDetailCell.swift */,
04CE1AC92C2AD91F001CB80A /* YHActivityTravelCell.swift */,
04CE1ACA2C2AD91F001CB80A /* YHActivityListCell.swift */,
04CE1ACB2C2AD91F001CB80A /* YHActivityTwoItemView.swift */,
04CE1ACC2C2AD91F001CB80A /* YHActivityDetailItemView.swift */,
04CE1ACD2C2AD91F001CB80A /* YHActivityApplyInfoView.swift */,
04CE1ACE2C2AD91F001CB80A /* YHApplyActivityAlert.swift */,
);
path = V;
sourceTree = "<group>";
};
04D144692C0431F900EE3758 /* AutoLogin(一键登录) */ = {
isa = PBXGroup;
children = (
......@@ -2315,26 +2375,6 @@
path = V;
sourceTree = "<group>";
};
A540342D2C2A602500E63A20 /* M */ = {
isa = PBXGroup;
children = (
A540342E2C2A606900E63A20 /* YHActivityListModel.swift */,
A54034302C2A612100E63A20 /* YHActivityModel.swift */,
A54034352C2A8DE200E63A20 /* YHActivityDetailModel.swift */,
A54034372C2AADE900E63A20 /* YHTravelModel.swift */,
A569DFDC2C2AC7A200FAA6CF /* YHActivityTravelModel.swift */,
);
path = M;
sourceTree = "<group>";
};
A54034322C2A61E500E63A20 /* VM */ = {
isa = PBXGroup;
children = (
A54034332C2A621000E63A20 /* YHActivityViewModel.swift */,
);
path = VM;
sourceTree = "<group>";
};
A5573EC52B317BFF00D98EC0 = {
isa = PBXGroup;
children = (
......@@ -2391,17 +2431,6 @@
path = galaxyUITests;
sourceTree = "<group>";
};
A566A79D2C228C8C00980D06 /* Activity(活动) */ = {
isa = PBXGroup;
children = (
A54034322C2A61E500E63A20 /* VM */,
A540342D2C2A602500E63A20 /* M */,
A566A7A02C228DDE00980D06 /* V */,
A566A79F2C228DB500980D06 /* C */,
);
path = "Activity(活动)";
sourceTree = "<group>";
};
A566A79E2C228CE800980D06 /* Connection(人脉) */ = {
isa = PBXGroup;
children = (
......@@ -2409,35 +2438,6 @@
path = "Connection(人脉)";
sourceTree = "<group>";
};
A566A79F2C228DB500980D06 /* C */ = {
isa = PBXGroup;
children = (
044D0BEF2C2025FF00C5CF5E /* YHActivityListViewController.swift */,
A5787E352C23CFDA00B021D7 /* YHActivityDetailViewController.swift */,
A59CCBCF2C244B13001910FE /* YHApplyActivityResultViewController.swift */,
A59CCBD12C245B17001910FE /* YHActivityTravelViewController.swift */,
);
path = C;
sourceTree = "<group>";
};
A566A7A02C228DDE00980D06 /* V */ = {
isa = PBXGroup;
children = (
A5787E332C22B45700B021D7 /* YHActivityListCell.swift */,
A5787E372C23D1DC00B021D7 /* YHActivityDetailCell.swift */,
A59CCBD32C252063001910FE /* YHActivityTravelCell.swift */,
A5787E392C23DA8A00B021D7 /* YHActivityDetailBottomView.swift */,
A5787E3B2C23DEE500B021D7 /* YHActivityTitleItemView.swift */,
A5787E3D2C23DF8C00B021D7 /* YHActivityDetailItemView.swift */,
A5787E3F2C23DFD000B021D7 /* YHActivityTipsItemView.swift */,
A59CCBCD2C241FCB001910FE /* YHApplyActivityAlert.swift */,
A5A89FD02C254B5C005A71DD /* YHActivityTravelitemView.swift */,
A5A89FD22C25518B005A71DD /* YHActivityApplyInfoView.swift */,
A5A89FD42C255250005A71DD /* YHActivityTwoItemView.swift */,
);
path = V;
sourceTree = "<group>";
};
A567E5662BD7643D00D5D5A0 /* Home(首页) */ = {
isa = PBXGroup;
children = (
......@@ -3143,16 +3143,15 @@
A567E5962BD7643D00D5D5A0 /* YHConfigModel.swift in Sources */,
04FD85722C21786900BEF9C5 /* YHNameCardInfoView.swift in Sources */,
044D0C182C22AB7300C5CF5E /* YHEditBaseInfoFootView.swift in Sources */,
04CE1AD52C2AD91F001CB80A /* YHActivityTravelViewController.swift in Sources */,
A514E5DC2B60A2B700C93951 /* YHServiceCenterSecondViewController.swift in Sources */,
A5EF21372BA6E2D1005027E6 /* YHQuestionAndAnswerModel.swift in Sources */,
A567E5A52BD7643D00D5D5A0 /* YHHomeCollectionLayout.swift in Sources */,
04A6715C2B9FE9EA00C1FB91 /* YHCertificateUploadContentListVC.swift in Sources */,
A5A89FD32C25518B005A71DD /* YHActivityApplyInfoView.swift in Sources */,
A592FE972BA6DB340062FACA /* YHCertificateViewModel.swift in Sources */,
045EEEF02B9F171A0022A143 /* YHChildPrimaryInfoVC.swift in Sources */,
04F5F8602C1944D5004A463C /* YHHKCenterViewController.swift in Sources */,
A5D001212BAA9D99001F003C /* YHChoiceButtonHoldView.swift in Sources */,
A569DFDD2C2AC7A200FAA6CF /* YHActivityTravelModel.swift in Sources */,
045EEEF62B9F171A0022A143 /* YHSpousePrimaryInfoVC.swift in Sources */,
044867B82BA1C75700DFAD4A /* YHCertificateUploadFailTipsView.swift in Sources */,
044D0C062C22736F00C5CF5E /* YHSetExplainView.swift in Sources */,
......@@ -3170,20 +3169,20 @@
045EEEE52B9F171A0022A143 /* YHMySignatureDetailViewController.swift in Sources */,
A5ACE92F2B4564F7002C94D2 /* YHMyViewController.swift in Sources */,
A5ACE9332B4564F7002C94D2 /* NetBaseModel.swift in Sources */,
044D0BF02C2025FF00C5CF5E /* YHActivityListViewController.swift in Sources */,
045EEE9B2B9F171A0022A143 /* YHWorkExperienceViewModel.swift in Sources */,
04AD31772C22DE6600DF5655 /* YHEditInterestViewController.swift in Sources */,
045EEEC22B9F171A0022A143 /* YHOtherInfoFillViewController.swift in Sources */,
045EEE7C2B9F171A0022A143 /* YHPreviewInfoSessionModel.swift in Sources */,
049A48AA2B49536000D0C641 /* YHAboutUsAdvantageCell.swift in Sources */,
04CE1AD42C2AD91F001CB80A /* YHActivityDetailModel.swift in Sources */,
045EEF112B9F171A0022A143 /* YHMainInformationModel.swift in Sources */,
A58AC09D2BABD59600A30FA9 /* YHFileListModel.swift in Sources */,
045EEEFF2B9F171A0022A143 /* YHSaveAndSubmitView.swift in Sources */,
045EEF0E2B9F171A0022A143 /* YHBasicInfoFillView.swift in Sources */,
04AF514E2BEB585C00009E3A /* YHVideoPlayerVC.swift in Sources */,
04CE1ADA2C2AD91F001CB80A /* YHActivityTravelitemView.swift in Sources */,
045EEEA12B9F171A0022A143 /* YHWorkExperienceDetailModel.swift in Sources */,
A5573ED22B317BFF00D98EC0 /* AppDelegate.swift in Sources */,
A5787E3E2C23DF8C00B021D7 /* YHActivityDetailItemView.swift in Sources */,
A567E5A12BD7643D00D5D5A0 /* YHHKEventViewController.swift in Sources */,
A5ACE9542B4564F7002C94D2 /* YHNavigationController.swift in Sources */,
044D0C002C21663300C5CF5E /* YHMyInformationItemCell.swift in Sources */,
......@@ -3205,7 +3204,6 @@
A5ACE9292B4564F7002C94D2 /* YHSmsCodeInputView.swift in Sources */,
A5ACE9452B4564F7002C94D2 /* YHHUDContainerView.swift in Sources */,
045EEEFD2B9F171A0022A143 /* YHSheetPickerViewType.swift in Sources */,
A54034342C2A621000E63A20 /* YHActivityViewModel.swift in Sources */,
045EEEC72B9F171A0022A143 /* YHOtherYesOrNoItemView.swift in Sources */,
04FD85702C21646200BEF9C5 /* YHMyInterestTopicCell.swift in Sources */,
04A7BD172BA43A0F00BD35A2 /* YHMyDocumentsDetailViewModel.swift in Sources */,
......@@ -3227,6 +3225,7 @@
045EEEBF2B9F171A0022A143 /* YHWorkFileItemView.swift in Sources */,
04AF58C42B4FC51C0066011A /* YHLocalizable.swift in Sources */,
A520124F2BABCE05008655EA /* YHFileListContentView.swift in Sources */,
04CE1AE12C2AD91F001CB80A /* YHActivityDetailItemView.swift in Sources */,
A517A4E42BB6C4BB000DEECD /* YHDocumentUploadView.swift in Sources */,
045EEF042B9F171A0022A143 /* YHIdentityCardCell.swift in Sources */,
045EEEB42B9F171A0022A143 /* YHWorkExampleMessageTableViewCell.swift in Sources */,
......@@ -3245,12 +3244,12 @@
048787D12BCE61B20036E221 /* YHServiceNoOrderView.swift in Sources */,
A567E59D2BD7643D00D5D5A0 /* YHFourKingViewController.swift in Sources */,
A567E5AC2BD7643D00D5D5A0 /* YHAgreementAlertView.swift in Sources */,
04CE1ADD2C2AD91F001CB80A /* YHActivityDetailCell.swift in Sources */,
04AA19FD2BB40D5C00C1CBBD /* Applegate(JPush).swift in Sources */,
A567E5972BD7643D00D5D5A0 /* YHHomeModel.swift in Sources */,
04AF82D82C291E960028CE2A /* YHMatchUserViewModel.swift in Sources */,
0468D4362B57752F00CFB916 /* YHUserModel.swift in Sources */,
A567E5982BD7643D00D5D5A0 /* YHHKEventModel.swift in Sources */,
A5787E3A2C23DA8A00B021D7 /* YHActivityDetailBottomView.swift in Sources */,
045EEE992B9F171A0022A143 /* YHPreviewInfoHoldView.swift in Sources */,
045EEE7E2B9F171A0022A143 /* YHPersonInfoCellModel1.swift in Sources */,
04FD856C2C2153F000BEF9C5 /* YHMyEducationCell.swift in Sources */,
......@@ -3259,13 +3258,11 @@
04FD85662C2124AF00BEF9C5 /* YHMyNameCardViewController.swift in Sources */,
045EEF192B9F171A0022A143 /* YHAddressModel.swift in Sources */,
045EEEDB2B9F171A0022A143 /* YHCollegeSearchViewController.swift in Sources */,
A5A89FD52C255250005A71DD /* YHActivityTwoItemView.swift in Sources */,
045EEE982B9F171A0022A143 /* YHPreviewInfoQuestionAndAnswerItemsView.swift in Sources */,
045EEE7A2B9F171A0022A143 /* YHPreviewForOtherInfoModel.swift in Sources */,
0414BDA92BC7E81500225367 /* YHMyPermissionSettingVC.swift in Sources */,
A567E5AA2BD7643D00D5D5A0 /* YHGestureTableView.swift in Sources */,
A54034382C2AADE900E63A20 /* YHTravelModel.swift in Sources */,
A59CCBD02C244B13001910FE /* YHApplyActivityResultViewController.swift in Sources */,
04CE1ADF2C2AD91F001CB80A /* YHActivityListCell.swift in Sources */,
04F5F8642C19460D004A463C /* YHHKLifeViewController.swift in Sources */,
A5ACE94A2B4564F7002C94D2 /* YHHUDProgressView.swift in Sources */,
04A271232BABFF3200652B1B /* YHCertificateUploadTypeCell.swift in Sources */,
......@@ -3279,10 +3276,11 @@
0468D4282B50D4AF00CFB916 /* YHPrivacyAlertView.swift in Sources */,
045EEEB22B9F171A0022A143 /* YHWorkActionView.swift in Sources */,
A58AC09F2BAC05BA00A30FA9 /* YHFileListItemsView.swift in Sources */,
04CE1ACF2C2AD91F001CB80A /* YHActivityViewModel.swift in Sources */,
045EEE8C2B9F171A0022A143 /* YHPreviewMainViewController.swift in Sources */,
049663BA2BF6105C003C8295 /* YHRefreshHeaderAnimator.swift in Sources */,
A59CCBD42C252063001910FE /* YHActivityTravelCell.swift in Sources */,
A5C382D12B5FAAB300C5E65C /* YHContactItemModel.swift in Sources */,
04CE1ADE2C2AD91F001CB80A /* YHActivityTravelCell.swift in Sources */,
A5ACE9522B4564F7002C94D2 /* YHServiceCenterMainViewController.swift in Sources */,
045EEF072B9F171A0022A143 /* YHBasicInfoFillViewModel.swift in Sources */,
045EEF212B9F171A0022A143 /* YHMainInformationTableViewCell.swift in Sources */,
......@@ -3314,6 +3312,7 @@
A567E5A02BD7643D00D5D5A0 /* YHHomeWebViewController.swift in Sources */,
044D0BF42C21247100C5CF5E /* YHUserInfoSettingViewController.swift in Sources */,
A567E5942BD7643D00D5D5A0 /* YHHomeListModel.swift in Sources */,
04CE1AD82C2AD91F001CB80A /* YHActivityListViewController.swift in Sources */,
A5ACE94E2B4564F7002C94D2 /* AlignedCollectionViewFlowLayout.swift in Sources */,
A567E5B32BD7643D00D5D5A0 /* YHServiceOrderAlertView.swift in Sources */,
A592FE932BA6CFFC0062FACA /* YHCertificateEntryBottomView.swift in Sources */,
......@@ -3329,9 +3328,9 @@
0408C3632BEC7C6900DB1E25 /* YHVideoPlayerControlView.swift in Sources */,
A567E5B12BD7643D00D5D5A0 /* YHHomeCollectionViewCell.swift in Sources */,
A582B2432BB95E20009D098C /* YHHKPlanCell.swift in Sources */,
04CE1AE22C2AD91F001CB80A /* YHActivityApplyInfoView.swift in Sources */,
045EEEC52B9F171A0022A143 /* YHOtherPickerView.swift in Sources */,
045EEE842B9F171A0022A143 /* YHPreviewBasiceInformationViewController.swift in Sources */,
A5A89FD12C254B5C005A71DD /* YHActivityTravelitemView.swift in Sources */,
A5ACE9282B4564F7002C94D2 /* YHSmsCodeView.swift in Sources */,
0499E3002C056EE30037E646 /* YHOneKeyLoginView.swift in Sources */,
043D2C8C2C0F037B00172438 /* YHServiceOrderSearchViewModel.swift in Sources */,
......@@ -3342,7 +3341,6 @@
A5ACE9342B4564F7002C94D2 /* YHAllApiName.swift in Sources */,
04AF82D62C25542D0028CE2A /* YHInterestTopicLayout.swift in Sources */,
045EEE902B9F171A0022A143 /* YHPreviewInfoNameAndSubNameItemsView.swift in Sources */,
A5787E342C22B45700B021D7 /* YHActivityListCell.swift in Sources */,
A567E5B72BD7643D00D5D5A0 /* YHHkLifeAndIdItemView.swift in Sources */,
A5ACE9502B4564F7002C94D2 /* YhCacheTool.swift in Sources */,
04F957452C1FEC4A003C631C /* YHMessageBellView.swift in Sources */,
......@@ -3381,6 +3379,7 @@
A5ACE9532B4564F7002C94D2 /* YHBaseViewController.swift in Sources */,
045EEE9D2B9F171A0022A143 /* YHWorkItemListViewModel.swift in Sources */,
A5ACE9392B4564F7002C94D2 /* UIDevice+Extension.swift in Sources */,
04CE1AD02C2AD91F001CB80A /* YHActivityListModel.swift in Sources */,
045EEEE82B9F171A0022A143 /* YHFamilyMemberViewModel.swift in Sources */,
045EEED02B9F171A0022A143 /* YHScoreResultView.swift in Sources */,
044D0BFA2C215C6F00C5CF5E /* YHSettingItem.swift in Sources */,
......@@ -3389,10 +3388,12 @@
045EEF102B9F171A0022A143 /* YHMainApplicantInformationViewModel.swift in Sources */,
044413FF2BC391F000784A14 /* YHServiceListViewController.swift in Sources */,
0493B3DC2BA7EFE600AF9393 /* YHCertificateSearchViewController.swift in Sources */,
04CE1ADB2C2AD91F001CB80A /* YHActivityTitleItemView.swift in Sources */,
A5FD63BF2B6250BC00D1D9DA /* YHInformationPerfectCell.swift in Sources */,
045EEE942B9F171A0022A143 /* YHPreviewInfoQuestionAndAnswerItemView.swift in Sources */,
04F5F86A2C1A95BB004A463C /* YHOtherServiceViewController.swift in Sources */,
A5B6ED782C27FC0B001B6732 /* Int+Extension.swift in Sources */,
04CE1AE02C2AD91F001CB80A /* YHActivityTwoItemView.swift in Sources */,
045EEED32B9F171A0022A143 /* YHScoreItemCell.swift in Sources */,
045EEEEE2B9F171A0022A143 /* YHCertificateUploadVC.swift in Sources */,
04EA37742BEA0A3400DBAF64 /* YHShareManager.swift in Sources */,
......@@ -3401,6 +3402,7 @@
A587F7C02BBADBE1002D9781 /* YHHKPlanItemView.swift in Sources */,
A5ACE94C2B4564F7002C94D2 /* YHHUDErrorView.swift in Sources */,
A567E5AD2BD7643D00D5D5A0 /* YHSearchInfoHistoryCell.swift in Sources */,
04CE1ADC2C2AD91F001CB80A /* YHActivityTipsItemView.swift in Sources */,
A5EF21332BA6E030005027E6 /* YHFileListViewController.swift in Sources */,
045EEF1E2B9F171A0022A143 /* YHBottomNextView.swift in Sources */,
A567E59E2BD7643D00D5D5A0 /* YHHomePageViewController.swift in Sources */,
......@@ -3414,11 +3416,14 @@
0480976B2BA15269000B9DCA /* YHCertificateInfoCell.swift in Sources */,
A56D2D612B62020C009C83A8 /* YHContractMainItemStatusCell.swift in Sources */,
045EEECF2B9F171A0022A143 /* YHScoreOptionsView.swift in Sources */,
04CE1AD22C2AD91F001CB80A /* YHActivityModel.swift in Sources */,
0445E6AF2BE9CFF6003C52F9 /* YHAppVersionForceUpdateView.swift in Sources */,
04CE1AD32C2AD91F001CB80A /* YHTravelModel.swift in Sources */,
04B9EE5A2C06CC3100A4018D /* YHCodeSueecssViewController.swift in Sources */,
045EEEC12B9F171A0022A143 /* YHOtherInfoFillModel.swift in Sources */,
047A3DF52C295AFF0048937B /* YHFriendListModel.swift in Sources */,
0468D43A2B579EAC00CFB916 /* YHLoginViewModel.swift in Sources */,
04CE1AD72C2AD91F001CB80A /* YHActivityDetailViewController.swift in Sources */,
045EEE9E2B9F171A0022A143 /* YHWorkExampleModel.swift in Sources */,
045EEE8A2B9F171A0022A143 /* YHPreviewOtherInformationViewController.swift in Sources */,
A5FD63C72B638CA000D1D9DA /* YHSubmintAllInfoSuccessTipView.swift in Sources */,
......@@ -3439,9 +3444,9 @@
044D0C1A2C22B40B00C5CF5E /* YHEditPersonalProfileViewController.swift in Sources */,
048787D92BCF68530036E221 /* YHProgressView.swift in Sources */,
045EEEEC2B9F171A0022A143 /* YHBrotherInfoVC.swift in Sources */,
A54034362C2A8DE200E63A20 /* YHActivityDetailModel.swift in Sources */,
0477E17A2BA41C7E00436346 /* YHCertificateModel.swift in Sources */,
045EEF242B9F171A0022A143 /* YHStepView.swift in Sources */,
04CE1AD62C2AD91F001CB80A /* YHApplyActivityResultViewController.swift in Sources */,
044D0BF82C21572B00C5CF5E /* YHAllowSettingTableViewCell.swift in Sources */,
A5ACE9482B4564F7002C94D2 /* YHHUDWariningView.swift in Sources */,
045EEF0F2B9F171A0022A143 /* YHSelectCountryViewModel.swift in Sources */,
......@@ -3449,9 +3454,7 @@
A567E59F2BD7643D00D5D5A0 /* YHStartPageViewController.swift in Sources */,
045EEF202B9F171A0022A143 /* YHCardExampleView.swift in Sources */,
A567E5A72BD7643D00D5D5A0 /* YHHomeKingKongBlockView.swift in Sources */,
A5787E382C23D1DC00B021D7 /* YHActivityDetailCell.swift in Sources */,
04A6715E2B9FFCA700C1FB91 /* YHCertificateNameCell.swift in Sources */,
A5787E3C2C23DEE500B021D7 /* YHActivityTitleItemView.swift in Sources */,
A567E5AF2BD7643D00D5D5A0 /* YHHomeWebViewBottomForSavePicView.swift in Sources */,
045A7E672C2ACB1A008F995B /* YHLoginOneLeadView.swift in Sources */,
048787D72BCE96F50036E221 /* YHServiceOrderProgressTableViewCell.swift in Sources */,
......@@ -3471,10 +3474,8 @@
0414BDAB2BC7E9C200225367 /* YHMyPermissionCell.swift in Sources */,
04C8F4832B7216D800ADF59B /* YHUserInfoHeaderView.swift in Sources */,
045EEEAF2B9F171A0022A143 /* YHWorkExperienceTextItemView.swift in Sources */,
A5787E362C23CFDA00B021D7 /* YHActivityDetailViewController.swift in Sources */,
A5ACE9492B4564F7002C94D2 /* YHHUDSuccessView.swift in Sources */,
045EEE9C2B9F171A0022A143 /* YHCompanyViewModel.swift in Sources */,
A59CCBD22C245B17001910FE /* YHActivityTravelViewController.swift in Sources */,
A58556BA2B6BCF1A003746B2 /* YHPersonInfoFillStepModel.swift in Sources */,
045EEEC92B9F171A0022A143 /* YHOtherInfoSessionView.swift in Sources */,
A567E59B2BD7643D00D5D5A0 /* YHWebModel.swift in Sources */,
......@@ -3492,6 +3493,7 @@
0425E6462BA9678E00A5E763 /* YHSchemeHeadTotalScoreView.swift in Sources */,
044D0C0F2C2287C500C5CF5E /* YHEditViewModel.swift in Sources */,
045EEEA92B9F171A0022A143 /* YHWorkExperienceListViewController.swift in Sources */,
04CE1AE32C2AD91F001CB80A /* YHApplyActivityAlert.swift in Sources */,
04A7BD132BA42F4200BD35A2 /* YHMyDocumentsDetailViewController.swift in Sources */,
04A671622BA058DE00C1FB91 /* YHCertificateEditSheetView.swift in Sources */,
04AD317D2C295AE800DF5655 /* YHUserInfoSettingViewModel.swift in Sources */,
......@@ -3506,6 +3508,7 @@
0445E6B12BE9E15C003C52F9 /* YHFindAppNewVersionView.swift in Sources */,
045EEEBE2B9F171A0022A143 /* YHResultBottomView.swift in Sources */,
045EEEEB2B9F171A0022A143 /* YHTest.swift in Sources */,
04CE1AD12C2AD91F001CB80A /* YHActivityTravelModel.swift in Sources */,
044D0C202C22D37500C5CF5E /* YHEditHonorViewController.swift in Sources */,
045EEEAC2B9F171A0022A143 /* YHWorkExperienceTableViewCell.swift in Sources */,
A5ACE93C2B4564F7002C94D2 /* UIColor+Extension.swift in Sources */,
......@@ -3524,13 +3527,13 @@
045EEEA52B9F171A0022A143 /* YHImageViewController.swift in Sources */,
045EEEF32B9F171A0022A143 /* YHFamilyMemberInfoListVC.swift in Sources */,
0445E6B42BEA15C4003C52F9 /* YHAppVersionManager.swift in Sources */,
04CE1AD92C2AD91F001CB80A /* YHActivityDetailBottomView.swift in Sources */,
04EA230C2BB5199D009DA928 /* YHDocumentToActionTableViewCell.swift in Sources */,
044D0C022C216AAF00C5CF5E /* YHInformationAuthorizeViewModel.swift in Sources */,
A5ACE9572B4564F7002C94D2 /* YHBasicContentView.swift in Sources */,
A5DF3D462BF72BA1003D5F03 /* YHTestViewController.swift in Sources */,
A566A79C2C227C9B00980D06 /* YHOrderTipsItemView.swift in Sources */,
A517A4E52BB6C4BB000DEECD /* YHDocumentFileItemView.swift in Sources */,
A540342F2C2A606900E63A20 /* YHActivityListModel.swift in Sources */,
045EEEFE2B9F171A0022A143 /* YHFormItemInputTextCell.swift in Sources */,
045EEEDD2B9F171A0022A143 /* YHCollegeNameCell.swift in Sources */,
045EEF162B9F171A0022A143 /* YHMainApplicantInformationViewController.swift in Sources */,
......@@ -3541,7 +3544,6 @@
045EEE912B9F171A0022A143 /* YHPreviewInfoCertificatePictureItemView.swift in Sources */,
044867B62BA1A03800DFAD4A /* YHCertificateFilterItemCell.swift in Sources */,
04FD856A2C21362300BEF9C5 /* YHMyIntroductionCell.swift in Sources */,
A59CCBCE2C241FCB001910FE /* YHApplyActivityAlert.swift in Sources */,
045EEEE62B9F171A0022A143 /* YHMySignatureListViewController.swift in Sources */,
049537852BA9B28500AF7E59 /* YHCertificateTemplateCell.swift in Sources */,
A582B23D2BB944ED009D098C /* YHHKPlanDoctumentVC.swift in Sources */,
......@@ -3606,7 +3608,6 @@
043B0A352C1190C6008A9BBA /* YHSelectFileSheetView.swift in Sources */,
04F5F8662C197FFF004A463C /* YHHKControllerHoldViewController.swift in Sources */,
A5ACE92D2B4564F7002C94D2 /* YHLoginPrivacyView.swift in Sources */,
A5787E402C23DFD000B021D7 /* YHActivityTipsItemView.swift in Sources */,
04FD85742C219CFD00BEF9C5 /* YHMatchPeopleViewController.swift in Sources */,
045EEEB72B9F171A0022A143 /* YHWorkItemAddView.swift in Sources */,
A5ACE9372B4564F7002C94D2 /* YHBaseUrlManager.swift in Sources */,
......@@ -3625,7 +3626,6 @@
A5F8AC082B9F414000A21EFA /* YHCustomTextView.swift in Sources */,
0414BDAD2BC7F02C00225367 /* YHMyNotifySettingVC.swift in Sources */,
0425E6402BA9357D00A5E763 /* YHScemeItemModel.swift in Sources */,
A54034312C2A612100E63A20 /* YHActivityModel.swift in Sources */,
A5D335F92BCE51E700236F21 /* YHServiceCenterProgressModel.swift in Sources */,
045EEECC2B9F171A0022A143 /* YHScoreResultModel.swift in Sources */,
045EEEDC2B9F171A0022A143 /* YHQualificationDetailVC.swift in Sources */,
......
galaxy/galaxy/Classes/Modules/Community(社区)/C/YHMatchPeopleViewController.swift
View file @ b0d19ba9
......@@ -16,6 +16,7 @@ protocol YHMatchProtocol: NSObjectProtocol {
class YHMatchPeopleViewController: YHBaseViewController {
let viewModel = YHMatchUserViewModel()
let loginViewModel = YHLoginViewModel()
var matchUsersArr:[YHMatchUserInfo?] = []
weak var delegate: YHMatchProtocol?
lazy var bgImgV:UIImageView = {
......@@ -151,12 +152,30 @@ class YHMatchPeopleViewController: YHBaseViewController {
}
@objc func didMyCardBtnClicked() {
let vc = YHMyNameCardViewController()
if !YHLoginManager.shared.isLogin() {
YHOneKeyLoginManager.shared.oneKeyLogin()
return
}
if let userId = YHLoginManager.shared.userModel?.id, !userId.isEmpty {
let vc = YHMyNameCardViewController()
vc.userId = userId
self.navigationController?.pushViewController(vc)
} else {
YHHUD.show(.progress(message: "加载中..."))
self.loginViewModel.getUserId {
[weak self] uid in
YHHUD.hide()
guard let self = self else { return }
if !uid.isEmpty {
YHLoginManager.shared.userModel?.id = uid
let vc = YHMyNameCardViewController()
vc.userId = uid
self.navigationController?.pushViewController(vc)
}
}
}
self.navigationController?.pushViewController(vc)
}
@objc func didRematchBtnClicked() {
......
galaxy/galaxy/Classes/Modules/Community(社区)/C/YHMyGoodFriendsVC.swift
View file @ b0d19ba9
......@@ -115,8 +115,7 @@ extension YHMyGoodFriendsVC: UITableViewDelegate, UITableViewDataSource {
YHHUD.hide()
guard let self = self else { return }
if success {
self.friendRequestArr.removeFirst()
self.tableView.reloadData()
self.requestFriendList()
} else {
var msg = "处理失败"
if let errMsg = error?.errorMsg, !errMsg.isEmpty {
......
galaxy/galaxy/Classes/Modules/Community(社区)/C/YHMyNameCardViewController.swift
View file @ b0d19ba9
......@@ -69,6 +69,7 @@ class YHMyNameCardViewController: YHBaseViewController {
vc.stepFlag = false
self.navigationController?.pushViewController(vc)
}
bar.rightButton.isHidden = !self.isCurrentUser
return bar
}()
......
galaxy/galaxy/Classes/Modules/Community(社区)/C/YHPeopleViewController.swift
View file @ b0d19ba9
......@@ -219,10 +219,21 @@ extension YHPeopleViewController {
success, error in
self.rotateLottieView.stop()
let vc = YHMatchPeopleViewController()
vc.delegate = self
vc.matchUsersArr = self.viewModel.matchUserArr
self.navigationController?.pushViewController(vc)
if success, self.viewModel.matchUserArr.count > 0 {
let vc = YHMatchPeopleViewController()
vc.delegate = self
vc.matchUsersArr = self.viewModel.matchUserArr
self.navigationController?.pushViewController(vc)
} else {
var msg = "匹配失败"
if let errorMsg = error?.errorMsg, !errorMsg.isEmpty {
msg = errorMsg
}
YHHUD.flash(message: msg)
self.resetAnimation()
}
}
}
......
galaxy/galaxy/Classes/Modules/Community(社区)/V/YHFriendRequestView.swift
View file @ b0d19ba9
......@@ -45,6 +45,7 @@ class YHFriendRequestView: UIView {
lazy var headImgV:UIImageView = {
let view = UIImageView()
view.layer.cornerRadius = 23.0
view.clipsToBounds = true
return view
}()
......@@ -266,7 +267,7 @@ class YHFriendRequestView: UIView {
guard let keyboardFrame = (notification.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as AnyObject).cgRectValue else {return }
let isKeyboardShow = notification.name == UIResponder.keyboardWillShowNotification
let bottomMargin = (isKeyboardShow ? keyboardFrame.height : (KScreenHeight-YHFriendRequestView.cardHeight)/2.0)
let bottomMargin = (isKeyboardShow ? keyboardFrame.height+10 : (KScreenHeight-YHFriendRequestView.cardHeight)/2.0)
self.cardView.snp.updateConstraints { make in
make.bottom.equalToSuperview().offset(-bottomMargin)
}
......
galaxy/galaxy/Classes/Modules/Community(社区)/V/YHMyInterestTopicCell.swift
View file @ b0d19ba9
......@@ -12,7 +12,6 @@ import UIKit
class YHTopicItemCell: UICollectionViewCell {
static let cellReuseIdentifier = "YHTopicItemCell"
lazy var titleLabel: UILabel = {
var label = UILabel()
label.font = .PFSC_R(ofSize: 12)
......@@ -50,7 +49,7 @@ class YHMyInterestTopicCell: UITableViewCell {
typealias EditBlock = () -> ()
var editBlock: EditBlock?
static let cellReuseIdentifier = "YHMyInterestTopicCell"
weak var tableView: UITableView?
var topicArr:[String] = []
var userModel:YHUserNameCardInfo = YHUserNameCardInfo() {
didSet {
......@@ -72,24 +71,23 @@ class YHMyInterestTopicCell: UITableViewCell {
if self.userModel.topics.count > 0 {
self.topicArr.append(contentsOf: self.userModel.topics)
}
self.collectionView.snp.remakeConstraints { make in
make.left.equalTo(16)
make.right.equalTo(-16)
make.bottom.equalTo(-16)
make.height.equalTo(24)
make.top.equalTo(titleLabel.snp.bottom).offset(12)
}
self.detailLabel.snp.remakeConstraints { make in
make.edges.equalTo(self.collectionView)
}
self.collectionView.reloadData {
let height = self.collectionView.contentSize.height
self.collectionView.snp.updateConstraints { make in
make.height.equalTo(height)
}
DispatchQueue.main.asyncAfter(deadline: .now() + 0.5, execute: {
let height = self.collectionView.contentSize.height
self.collectionView.snp.remakeConstraints { make in
make.height.equalTo(height)
make.left.equalTo(16)
make.right.equalTo(-16)
make.bottom.equalTo(-16)
make.top.equalTo(self.titleLabel.snp.bottom).offset(12)
}
self.detailLabel.snp.removeConstraints()
self.superview?.setNeedsLayout()
self.superview?.layoutIfNeeded()
})
}
} else {
self.detailLabel.snp.remakeConstraints { make in
......@@ -98,10 +96,10 @@ class YHMyInterestTopicCell: UITableViewCell {
make.bottom.equalTo(-16)
make.top.equalTo(titleLabel.snp.bottom).offset(12)
}
self.collectionView.snp.remakeConstraints { make in
make.edges.equalTo(self.detailLabel)
}
self.collectionView.snp.removeConstraints()
}
self.setNeedsLayout()
self.layoutIfNeeded()
}
}
......
galaxy/galaxy/Classes/Modules/Community(社区)/V/YHMyNameCardAvatarInfoCell.swift
View file @ b0d19ba9
......@@ -71,7 +71,7 @@ class YHMyNameCardAvatarInfoCell: UITableViewCell {
lazy var headImgV:UIImageView = {
let view = UIImageView()
view.image = UIImage(named: "people_head_default")
view.layer.cornerRadius = 74.0/2.0
view.layer.cornerRadius = headWidth/2.0
view.clipsToBounds = true
return view
}()
......
galaxy/galaxy/Classes/Modules/Community(社区)/V/YHNameCardInfoView.swift
View file @ b0d19ba9
......@@ -21,7 +21,32 @@ class YHNameCardInfoView: DragCardView {
self.headImgV.kf.setImage(with: url, placeholder: UIImage(named: "people_head_default"))
}
self.nameLabel.text = self.userModel.username
self.professionalLabel.text = self.userModel.position
var result = ""
var isFirst = true
if !self.userModel.address.city.isEmpty {
if isFirst {
result += self.userModel.address.city
isFirst = false
}
}
if !self.userModel.position.isEmpty {
if isFirst {
result += self.userModel.position
isFirst = false
} else {
result += " | " + self.userModel.position
}
}
if !self.userModel.industry.isEmpty {
if isFirst {
result += self.userModel.industry
isFirst = false
} else {
result += " | " + self.userModel.industry
}
}
self.professionalLabel.text = result
self.detailLabel.text = self.userModel.signature
self.signImgV.isHidden = (self.userModel.isSign != 1)
......@@ -51,6 +76,15 @@ class YHNameCardInfoView: DragCardView {
return view
}()
lazy var headBgImgV:UIImageView = {
let view = UIImageView()
view.image = UIImage(named: "people_user_head_bg")
view.layer.cornerRadius = (98.0+10)/2.0
return view
}()
lazy var signImgV:UIImageView = {
let view = UIImageView()
view.image = UIImage(named: "people_sign")
......@@ -142,6 +176,7 @@ class YHNameCardInfoView: DragCardView {
private func setupUI() {
self.contentView.addSubview(self.bgImgV)
self.contentView.addSubview(self.headBgImgV)
self.contentView.addSubview(self.headImgV)
self.contentView.addSubview(self.signImgV)
self.contentView.addSubview(self.nameLabel)
......@@ -160,6 +195,10 @@ class YHNameCardInfoView: DragCardView {
make.centerX.equalToSuperview()
make.bottom.equalTo(self.bgImgV).offset(20)
}
self.headBgImgV.snp.makeConstraints { make in
make.width.height.equalTo(98+6)
make.center.equalTo(self.headImgV)
}
self.signImgV.snp.makeConstraints { make in
make.centerX.equalTo(self.headImgV)
......
galaxy/galaxy/Classes/Modules/Login(登录)/VM/YHLoginViewModel.swift
View file @ b0d19ba9
......@@ -185,4 +185,23 @@ extension YHLoginViewModel {
callBackBlock(false,err)
}
}
func getUserId(callBack: ((String)->())?) {
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Auth.getUidApi
let _ = YHNetRequest.getRequest(url: strUrl) {
[weak self] json, code in
//1. json字符串 转 对象
guard let self = self else { return }
printLog(json)
if let dic = json.data as? [AnyHashable : Any] {
if let uid = dic["id"] as? String {
callBack?(uid)
return
}
}
callBack?("")
} failBlock: { err in
callBack?("")
}
}
}
galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift
View file @ b0d19ba9
......@@ -53,7 +53,8 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
let likeViewModel: YHMyLikeViewModel = YHMyLikeViewModel()
let msgViewModel: YHMsgViewModel = YHMsgViewModel()
let loginViewModel = YHLoginViewModel()
lazy var tableView: UITableView = {
let tableView = UITableView(frame: CGRect.zero, style:.grouped)
tableView.contentInsetAdjustmentBehavior = .never
......@@ -287,11 +288,24 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
let item: PersonalModuleItem = items[indexPath.row]
switch item.type {
case .myCard://我的名片
let vc = YHMyNameCardViewController()
if let userId = YHLoginManager.shared.userModel?.id, !userId.isEmpty {
let vc = YHMyNameCardViewController()
vc.userId = userId
self.navigationController?.pushViewController(vc)
} else {
YHHUD.show(.progress(message: "加载中..."))
self.loginViewModel.getUserId {
[weak self] uid in
YHHUD.hide()
guard let self = self else { return }
if !uid.isEmpty {
YHLoginManager.shared.userModel?.id = uid
let vc = YHMyNameCardViewController()
vc.userId = uid
self.navigationController?.pushViewController(vc)
}
}
}
self.navigationController?.pushViewController(vc)
case .myMessage://我的消息
printLog("我的消息")
let vc = YHMessageListVC()
......
galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift
View file @ b0d19ba9
......@@ -204,6 +204,7 @@ class YHAllApiName {
static let appleLogin = "infoflow/auth/apple-login"
static let oneKeySecretKeyInfo = "infoflow/auth/sdk-info"
static let logout = "infoflow/auth/logout"
static let getUidApi = "super-app/get-uid"
//注销app
static let unregisterApi = "infoflow/auth/cancellation"
}
......
galaxy/galaxy/Res/Assets.xcassets/People/people_user_head_bg.imageset/Contents.json 0 → 100644
View file @ b0d19ba9
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "image 1760@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "image 1760@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
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