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

* 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  //  消息

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -11,7 +11,13 @@
 		0414BDAB2BC7E9C200225367 /* YHMyPermissionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0414BDAA2BC7E9C200225367 /* YHMyPermissionCell.swift */; };
 		0414BDAD2BC7F02C00225367 /* YHMyNotifySettingVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0414BDAC2BC7F02C00225367 /* YHMyNotifySettingVC.swift */; };
 		0414BDB22BCCC0A500225367 /* YHCollectionModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0414BDB12BCCC0A500225367 /* YHCollectionModel.swift */; };
-		041B52872B5657B3007EBCEB /* IMAppKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041B52862B5657B3007EBCEB /* IMAppKey.swift */; };
+		04174D592BCD43F9000BA46D /* IMAppKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04174D512BCD43F9000BA46D /* IMAppKey.swift */; };
+		04174D5A2BCD43F9000BA46D /* YHInformationFillVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04174D542BCD43F9000BA46D /* YHInformationFillVC.swift */; };
+		04174D5B2BCD43F9000BA46D /* YHMessageSessionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04174D552BCD43F9000BA46D /* YHMessageSessionCell.swift */; };
+		04174D5C2BCD43F9000BA46D /* YHMsgViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04174D562BCD43F9000BA46D /* YHMsgViewController.swift */; };
+		04174D5D2BCD43F9000BA46D /* YHInformationFillCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04174D582BCD43F9000BA46D /* YHInformationFillCell.swift */; };
+		04174D5F2BCD44A5000BA46D /* YHMsgListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04174D5E2BCD44A5000BA46D /* YHMsgListModel.swift */; };
+		04174D622BCD45E5000BA46D /* YHMsgViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04174D612BCD45E5000BA46D /* YHMsgViewModel.swift */; };
 		0425E63D2BA9345200A5E763 /* YHSchemeTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0425E63C2BA9345200A5E763 /* YHSchemeTableViewCell.swift */; };
 		0425E6402BA9357D00A5E763 /* YHScemeItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0425E63F2BA9357D00A5E763 /* YHScemeItemModel.swift */; };
 		0425E6422BA95B1B00A5E763 /* YHSchemeTableFooterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0425E6412BA95B1B00A5E763 /* YHSchemeTableFooterView.swift */; };
@@ -21,9 +27,6 @@
 		0435FA7F2BA178C100024EAE /* YHCommonAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0435FA7E2BA178C100024EAE /* YHCommonAlertView.swift */; };
 		0435FA812BA186D600024EAE /* YHMyFileMethodTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0435FA802BA186D600024EAE /* YHMyFileMethodTableViewCell.swift */; };
 		0435FA832BA2DEB100024EAE /* YHCardButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0435FA822BA2DEB100024EAE /* YHCardButton.swift */; };
-		043F0AB22BC781F5006CB887 /* YHMessageSessionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 043F0AB12BC781F5006CB887 /* YHMessageSessionCell.swift */; };
-		043F0AB62BC7CE1B006CB887 /* YHInformationFillVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 043F0AB52BC7CE1B006CB887 /* YHInformationFillVC.swift */; };
-		043F0AB82BC7CE5C006CB887 /* YHInformationFillCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 043F0AB72BC7CE5C006CB887 /* YHInformationFillCell.swift */; };
 		044413F72BC2786200784A14 /* YHHomeWebViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044413F62BC2786200784A14 /* YHHomeWebViewController.swift */; };
 		044413F92BC279D200784A14 /* YHHomeWebBottomView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044413F82BC279D200784A14 /* YHHomeWebBottomView.swift */; };
 		044413FB2BC27E6F00784A14 /* YHHomeWebBottomButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044413FA2BC27E6F00784A14 /* YHHomeWebBottomButton.swift */; };
@@ -303,7 +306,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 */; };
-		A53D381E2BC23794006AE6F7 /* YHMsgViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A53D381D2BC23794006AE6F7 /* YHMsgViewController.swift */; };
 		A53D38202BC243F1006AE6F7 /* YHStartPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A53D381F2BC243F1006AE6F7 /* YHStartPageViewController.swift */; };
 		A53F42B92BC3DCA9009CAC70 /* YHHomeKingKongBlockModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A53F42B82BC3DCA9009CAC70 /* YHHomeKingKongBlockModel.swift */; };
 		A53F42BB2BC3DE6F009CAC70 /* YHHomeKingKongBlockItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = A53F42BA2BC3DE6F009CAC70 /* YHHomeKingKongBlockItem.swift */; };
@@ -451,7 +453,13 @@
 		0414BDAA2BC7E9C200225367 /* YHMyPermissionCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyPermissionCell.swift; sourceTree = "<group>"; };
 		0414BDAC2BC7F02C00225367 /* YHMyNotifySettingVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyNotifySettingVC.swift; sourceTree = "<group>"; };
 		0414BDB12BCCC0A500225367 /* YHCollectionModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCollectionModel.swift; sourceTree = "<group>"; };
-		041B52862B5657B3007EBCEB /* IMAppKey.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IMAppKey.swift; sourceTree = "<group>"; };
+		04174D512BCD43F9000BA46D /* IMAppKey.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IMAppKey.swift; sourceTree = "<group>"; };
+		04174D542BCD43F9000BA46D /* YHInformationFillVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHInformationFillVC.swift; sourceTree = "<group>"; };
+		04174D552BCD43F9000BA46D /* YHMessageSessionCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHMessageSessionCell.swift; sourceTree = "<group>"; };
+		04174D562BCD43F9000BA46D /* YHMsgViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHMsgViewController.swift; sourceTree = "<group>"; };
+		04174D582BCD43F9000BA46D /* YHInformationFillCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHInformationFillCell.swift; sourceTree = "<group>"; };
+		04174D5E2BCD44A5000BA46D /* YHMsgListModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = YHMsgListModel.swift; path = ../../../../../../../Desktop/YHMsgListModel.swift; sourceTree = "<group>"; };
+		04174D612BCD45E5000BA46D /* YHMsgViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = YHMsgViewModel.swift; path = ../../../../../../../Desktop/YHMsgViewModel.swift; sourceTree = "<group>"; };
 		0425E63C2BA9345200A5E763 /* YHSchemeTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSchemeTableViewCell.swift; sourceTree = "<group>"; };
 		0425E63F2BA9357D00A5E763 /* YHScemeItemModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHScemeItemModel.swift; sourceTree = "<group>"; };
 		0425E6412BA95B1B00A5E763 /* YHSchemeTableFooterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSchemeTableFooterView.swift; sourceTree = "<group>"; };
@@ -461,9 +469,6 @@
 		0435FA7E2BA178C100024EAE /* YHCommonAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCommonAlertView.swift; sourceTree = "<group>"; };
 		0435FA802BA186D600024EAE /* YHMyFileMethodTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyFileMethodTableViewCell.swift; sourceTree = "<group>"; };
 		0435FA822BA2DEB100024EAE /* YHCardButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCardButton.swift; sourceTree = "<group>"; };
-		043F0AB12BC781F5006CB887 /* YHMessageSessionCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = YHMessageSessionCell.swift; path = galaxy/Classes/Base/C/YHMessageSessionCell.swift; sourceTree = SOURCE_ROOT; };
-		043F0AB52BC7CE1B006CB887 /* YHInformationFillVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHInformationFillVC.swift; sourceTree = "<group>"; };
-		043F0AB72BC7CE5C006CB887 /* YHInformationFillCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = YHInformationFillCell.swift; path = "galaxy/Classes/Modules/Message(消息)/C/YHInformationFillCell.swift"; sourceTree = SOURCE_ROOT; };
 		044413F62BC2786200784A14 /* YHHomeWebViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomeWebViewController.swift; sourceTree = "<group>"; };
 		044413F82BC279D200784A14 /* YHHomeWebBottomView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomeWebBottomView.swift; sourceTree = "<group>"; };
 		044413FA2BC27E6F00784A14 /* YHHomeWebBottomButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomeWebBottomButton.swift; sourceTree = "<group>"; };
@@ -746,7 +751,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>"; };
-		A53D381D2BC23794006AE6F7 /* YHMsgViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMsgViewController.swift; sourceTree = "<group>"; };
 		A53D381F2BC243F1006AE6F7 /* YHStartPageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHStartPageViewController.swift; sourceTree = "<group>"; };
 		A53F42B82BC3DCA9009CAC70 /* YHHomeKingKongBlockModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomeKingKongBlockModel.swift; sourceTree = "<group>"; };
 		A53F42BA2BC3DE6F009CAC70 /* YHHomeKingKongBlockItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomeKingKongBlockItem.swift; sourceTree = "<group>"; };
@@ -901,14 +905,60 @@
 			path = Model;
 			sourceTree = "<group>";
 		};
-		041B52852B565798007EBCEB /* IM */ = {
+		04174D4F2BCD43F9000BA46D /* Message(消息) */ = {
 			isa = PBXGroup;
 			children = (
-				041B52862B5657B3007EBCEB /* IMAppKey.swift */,
+				04174D602BCD45CB000BA46D /* VM */,
+				04174D502BCD43F9000BA46D /* IM */,
+				04174D522BCD43F9000BA46D /* M */,
+				04174D532BCD43F9000BA46D /* C */,
+				04174D572BCD43F9000BA46D /* V */,
+			);
+			path = "Message(消息)";
+			sourceTree = "<group>";
+		};
+		04174D502BCD43F9000BA46D /* IM */ = {
+			isa = PBXGroup;
+			children = (
+				04174D512BCD43F9000BA46D /* IMAppKey.swift */,
 			);
 			path = IM;
 			sourceTree = "<group>";
 		};
+		04174D522BCD43F9000BA46D /* M */ = {
+			isa = PBXGroup;
+			children = (
+				04174D5E2BCD44A5000BA46D /* YHMsgListModel.swift */,
+			);
+			path = M;
+			sourceTree = "<group>";
+		};
+		04174D532BCD43F9000BA46D /* C */ = {
+			isa = PBXGroup;
+			children = (
+				04174D542BCD43F9000BA46D /* YHInformationFillVC.swift */,
+				04174D562BCD43F9000BA46D /* YHMsgViewController.swift */,
+			);
+			path = C;
+			sourceTree = "<group>";
+		};
+		04174D572BCD43F9000BA46D /* V */ = {
+			isa = PBXGroup;
+			children = (
+				04174D552BCD43F9000BA46D /* YHMessageSessionCell.swift */,
+				04174D582BCD43F9000BA46D /* YHInformationFillCell.swift */,
+			);
+			path = V;
+			sourceTree = "<group>";
+		};
+		04174D602BCD45CB000BA46D /* VM */ = {
+			isa = PBXGroup;
+			children = (
+				04174D612BCD45E5000BA46D /* YHMsgViewModel.swift */,
+			);
+			path = VM;
+			sourceTree = "<group>";
+		};
 		0425E63B2BA931B300A5E763 /* View */ = {
 			isa = PBXGroup;
 			children = (
@@ -1748,50 +1798,6 @@
 			path = V;
 			sourceTree = "<group>";
 		};
-		A53D38172BC23745006AE6F7 /* Message(消息) */ = {
-			isa = PBXGroup;
-			children = (
-				041B52852B565798007EBCEB /* IM */,
-				A53D381C2BC2376C006AE6F7 /* VM */,
-				A53D381A2BC2375B006AE6F7 /* C */,
-				A53D38192BC23757006AE6F7 /* V */,
-				A53D38182BC23752006AE6F7 /* M */,
-			);
-			path = "Message(消息)";
-			sourceTree = "<group>";
-		};
-		A53D38182BC23752006AE6F7 /* M */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = M;
-			sourceTree = "<group>";
-		};
-		A53D38192BC23757006AE6F7 /* V */ = {
-			isa = PBXGroup;
-			children = (
-				043F0AB12BC781F5006CB887 /* YHMessageSessionCell.swift */,
-				043F0AB72BC7CE5C006CB887 /* YHInformationFillCell.swift */,
-			);
-			path = V;
-			sourceTree = "<group>";
-		};
-		A53D381A2BC2375B006AE6F7 /* C */ = {
-			isa = PBXGroup;
-			children = (
-				A53D381D2BC23794006AE6F7 /* YHMsgViewController.swift */,
-				043F0AB52BC7CE1B006CB887 /* YHInformationFillVC.swift */,
-			);
-			path = C;
-			sourceTree = "<group>";
-		};
-		A53D381C2BC2376C006AE6F7 /* VM */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = VM;
-			sourceTree = "<group>";
-		};
 		A5573EC52B317BFF00D98EC0 = {
 			isa = PBXGroup;
 			children = (
@@ -2122,7 +2128,7 @@
 		A5ACE91B2B4564F7002C94D2 /* Modules */ = {
 			isa = PBXGroup;
 			children = (
-				A53D38172BC23745006AE6F7 /* Message(消息) */,
+				04174D4F2BCD43F9000BA46D /* Message(消息) */,
 				A5ACE9592B457113002C94D2 /* Home(首页) */,
 				A5ACE8D82B4564F7002C94D2 /* Login(登录) */,
 				A5ACE9162B4564F7002C94D2 /* IntelligentService(服务中心) */,
@@ -2465,7 +2471,6 @@
 				044867B82BA1C75700DFAD4A /* YHCertificateUploadFailTipsView.swift in Sources */,
 				045EEF002B9F171A0022A143 /* YHFormItemEnterDetailCell.swift in Sources */,
 				A5ACE9362B4564F7002C94D2 /* YHNetworkStatusManager.swift in Sources */,
-				043F0AB82BC7CE5C006CB887 /* YHInformationFillCell.swift in Sources */,
 				A5D0012A2BABC84A001F003C /* YHFileListHeaerView.swift in Sources */,
 				044414052BC3B9DE00784A14 /* YHServiceTableFootView.swift in Sources */,
 				045EEEEF2B9F171A0022A143 /* YHCertificateInfoController.swift in Sources */,
@@ -2488,6 +2493,7 @@
 				045EEF0E2B9F171A0022A143 /* YHBasicInfoFillView.swift in Sources */,
 				045EEEA12B9F171A0022A143 /* YHWorkExperienceDetailModel.swift in Sources */,
 				A5573ED22B317BFF00D98EC0 /* AppDelegate.swift in Sources */,
+				04174D5F2BCD44A5000BA46D /* YHMsgListModel.swift in Sources */,
 				A5ACE9542B4564F7002C94D2 /* YHNavigationController.swift in Sources */,
 				045EEF252B9F171A0022A143 /* YHMainInformationCardTableViewCell.swift in Sources */,
 				045EEE862B9F171A0022A143 /* YHPreviewWorkExpViewController.swift in Sources */,
@@ -2629,7 +2635,6 @@
 				045EEF152B9F171A0022A143 /* YHHKIDCardModel.swift in Sources */,
 				0477E17E2BA4362A00436346 /* YHCustomNavigationBar.swift in Sources */,
 				045EEEC42B9F171A0022A143 /* YHOtherInfoFillCell.swift in Sources */,
-				043F0AB62BC7CE1B006CB887 /* YHInformationFillVC.swift in Sources */,
 				045EEE9F2B9F171A0022A143 /* YHWorkExperienceModel.swift in Sources */,
 				045EEF232B9F171A0022A143 /* YHItemView.swift in Sources */,
 				04754A952B96FF3D00F8ADCA /* UITextField+Extension.swift in Sources */,
@@ -2715,10 +2720,12 @@
 				045EEEC92B9F171A0022A143 /* YHOtherInfoSessionView.swift in Sources */,
 				045EEEE22B9F171A0022A143 /* YHMySignatureDetailViewModel.swift in Sources */,
 				045EEE7D2B9F171A0022A143 /* YHWorkExpDataModel.swift in Sources */,
+				04174D5B2BCD43F9000BA46D /* YHMessageSessionCell.swift in Sources */,
 				045EEE832B9F171A0022A143 /* YHMainInfoPreviewModel.swift in Sources */,
 				045EEEAB2B9F171A0022A143 /* YHImageClipperViewController.swift in Sources */,
 				044414032BC39B8D00784A14 /* YHServerTableHeadView.swift in Sources */,
 				045EEECB2B9F171A0022A143 /* YHScoreResultBaseModel.swift in Sources */,
+				04174D5D2BCD43F9000BA46D /* YHInformationFillCell.swift in Sources */,
 				04A7BD192BA441D400BD35A2 /* YHMyDocumentsUrlModel.swift in Sources */,
 				045EEEA62B9F171A0022A143 /* YHCompanySelectViewController.swift in Sources */,
 				0425E6462BA9678E00A5E763 /* YHSchemeHeadTotalScoreView.swift in Sources */,
@@ -2731,7 +2738,6 @@
 				045EEE882B9F171A0022A143 /* YHPreviewAcademicAndProfessionalQualificationViewController.swift in Sources */,
 				0435FA7F2BA178C100024EAE /* YHCommonAlertView.swift in Sources */,
 				A5ACE9382B4564F7002C94D2 /* UIApplication+Extension.swift in Sources */,
-				041B52872B5657B3007EBCEB /* IMAppKey.swift in Sources */,
 				0468D42B2B55019900CFB916 /* YHAnalytics.swift in Sources */,
 				A5173D6A2BC3C187007D4E74 /* YHHkLifeAndIdView.swift in Sources */,
 				045EEEBE2B9F171A0022A143 /* YHResultBottomView.swift in Sources */,
@@ -2773,16 +2779,18 @@
 				047619E92BA9867100F45358 /* YHCountryHotView.swift in Sources */,
 				045EEEF82B9F171A0022A143 /* YHFormItemOnlyDoubleChoiceCell.swift in Sources */,
 				0480976D2BA158A1000B9DCA /* YHCertificateListVC.swift in Sources */,
-				043F0AB22BC781F5006CB887 /* YHMessageSessionCell.swift in Sources */,
 				045EEE8B2B9F171A0022A143 /* YHPreviewMainApplicantInfoViewController.swift in Sources */,
 				045EEE922B9F171A0022A143 /* YHPreviewInfoNameAndSubNameItemView.swift in Sources */,
 				045EEEF92B9F171A0022A143 /* YHFormItemTitleCell.swift in Sources */,
 				A580371E2BAD784B0031C312 /* YHMySchemeViewModel.swift in Sources */,
 				0425E6482BA96B4100A5E763 /* YHSchemeHeadScoreItemView.swift in Sources */,
 				A50A747C2BC8EC86003D28D9 /* YHHomeBannerCollectionViewCell.swift in Sources */,
+				04174D622BCD45E5000BA46D /* YHMsgViewModel.swift in Sources */,
+				04174D5A2BCD43F9000BA46D /* YHInformationFillVC.swift in Sources */,
 				A501BE662BC2B76200C4F1FB /* YHHomeHeadView.swift in Sources */,
 				04A271252BAC33BB00652B1B /* YHFilePreviewTool.swift in Sources */,
 				044413F92BC279D200784A14 /* YHHomeWebBottomView.swift in Sources */,
+				04174D592BCD43F9000BA46D /* IMAppKey.swift in Sources */,
 				045EEEC32B9F171A0022A143 /* YHOtherResidenceFillView.swift in Sources */,
 				045EEE792B9F171A0022A143 /* YHPreviewViewModel.swift in Sources */,
 				A517A4E12BB573EB000DEECD /* YHDocListCell.swift in Sources */,
@@ -2805,7 +2813,6 @@
 				A554A5122B99715000EA5973 /* YHConstantArrayData.swift in Sources */,
 				049AC4CE2BC674A700F857F4 /* YHHomeClassifyModel.swift in Sources */,
 				045EEE962B9F171A0022A143 /* YHPreviewInfoCertificatePictureItemsView.swift in Sources */,
-				A53D381E2BC23794006AE6F7 /* YHMsgViewController.swift in Sources */,
 				A592FE912BA6CC010062FACA /* YHCertificateEntryHeadView.swift in Sources */,
 				0425E63D2BA9345200A5E763 /* YHSchemeTableViewCell.swift in Sources */,
 				A5ACE9302B4564F7002C94D2 /* Algorithm.swift in Sources */,
@@ -2837,6 +2844,7 @@
 				045EEECC2B9F171A0022A143 /* YHScoreResultModel.swift in Sources */,
 				045EEEDC2B9F171A0022A143 /* YHQualificationDetailVC.swift in Sources */,
 				045EEEF52B9F171A0022A143 /* YHSpouseInfoContainerVC.swift in Sources */,
+				04174D5C2BCD43F9000BA46D /* YHMsgViewController.swift in Sources */,
 				047294E82B988A19008E0B84 /* YHNewWebViewController.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

galaxy/galaxy/Classes/Modules/Message(消息)/C/YHMsgViewController.swift

@@ -10,7 +10,12 @@ import UIKit
 
 class YHMsgViewController: YHBaseViewController {
     
-    var msgArr:[String] = ["","",""]
+    var msgArr:[YHMessageInfoModel] = []
+    lazy var viewModel = {
+        let model = YHMsgViewModel()
+        return model
+    }()
+    
     lazy var tableView: UITableView = {
         
         let tableView = UITableView(frame:.zero, style:.grouped)
@@ -79,6 +84,11 @@ class YHMsgViewController: YHBaseViewController {
         setupUI()
     }
     
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        getUnreadMsgList()
+    }
+    
     func setupUI() {
         
         gk_navigationBar.isHidden = true
@@ -96,6 +106,35 @@ class YHMsgViewController: YHBaseViewController {
             make.bottom.equalToSuperview().offset(-k_Height_TabBar)
         }
     }
+    
+    func getUnreadMsgList() {
+        YHHUD.show(.progress(message: "加载中..."))
+        self.viewModel.getUnreadMsgList {
+            [weak self] success, error in
+            guard let self = self else { return }
+            YHHUD.hide()
+            if success, let msgList = viewModel.msgList {
+                msgArr.removeAll()
+                // 资料填写
+                if let infoMsg = msgList.information {
+                    msgArr.append(infoMsg)
+                }
+                // 证件上传
+                if let cerMsg = msgList.certificate {
+                    msgArr.append(cerMsg)
+                }
+                // 文书定稿
+                if let dratMsg = msgList.draft {
+                    msgArr.append(dratMsg)
+                }
+                // 文件签字
+                if let signMsg = msgList.signature {
+                    msgArr.append(signMsg)
+                }
+                self.tableView.reloadData()
+            }
+        }
+    }
 }
 
 extension YHMsgViewController {
@@ -118,6 +157,10 @@ extension YHMsgViewController: UITableViewDelegate, UITableViewDataSource {
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         
         let cell = tableView.dequeueReusableCell(withIdentifier: YHMessageSessionCell.cellReuseIdentifier, for: indexPath) as! YHMessageSessionCell
+        if 0 <= indexPath.row && indexPath.row < msgArr.count {
+            let model = msgArr[indexPath.row]
+            cell.updateModel(model)
+        }
         return cell
     }
     

galaxy/galaxy/Classes/Base/C/YHMessageSessionCell.swift → galaxy/galaxy/Classes/Modules/Message(消息)/V/YHMessageSessionCell.swift

@@ -30,6 +30,37 @@ class YHMessageSessionCell: UITableViewCell {
         setupUI()
     }
     
+    func updateModel(_ model: YHMessageInfoModel) {
+        self.badgeLabel.text = (model.unreadCount < 100 ? String(model.unreadCount) : "99+")
+        self.detailLabel.text = model.lastMessage
+        self.timeLabel.text =  formatTimestamp(Double(model.lastMessageTime))
+    }
+    
+    func formatTimestamp(_ timestamp: TimeInterval) -> String {
+        let currentDate = Date()
+        let calendar = Calendar.current
+        let currentYear = calendar.component(.year, from: currentDate)
+        let currentDay = calendar.component(.day, from: currentDate)
+        
+        let date = Date(timeIntervalSince1970: timestamp)
+        let year = calendar.component(.year, from: date)
+        let day = calendar.component(.day, from: date)
+        
+        let dateFormatter = DateFormatter()
+        
+        if year == currentYear {
+            if day == currentDay {
+                dateFormatter.dateFormat = "HH:mm"
+            } else {
+                dateFormatter.dateFormat = "MM-dd"
+            }
+        } else {
+            dateFormatter.dateFormat = "yyyy-MM-dd"
+        }
+        
+        return dateFormatter.string(from: date)
+    }
+    
     func setupUI() {
         
         self.selectionStyle = .none

galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift

@@ -254,4 +254,10 @@ class YHAllApiName {
         //方案计划
         static let applyPlanApi = "infoflow/assessment/apply_plan"
     }
+    
+    // 消息
+    struct Message {
+        // 获取未读消息列表
+        static let unreadMsgList = "infoflow/unread-message"
+    }
 }

galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift

@@ -90,6 +90,7 @@ class YHNetRequest: NSObject {
         
         requestHeader.add(name:"sign",value:sign)
         requestHeader.add(name: "token", value: YHLoginManager.shared.userModel?.token ?? "-")
+        requestHeader.add(name: "device-id", value: YHLoginManager.shared.userModel?.registerId ?? "")
 //        requestHeader.add(name: "token", value: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MTI0NjA1NzQsImkiOjk4OTcwNDI5NjA3NzI0OSwidSI6IumTtuays-mbhuWboiIsInIiOiJzdXBlcl9hcHAifQ.jyBpXSii6nlRIITdOya3GQa5eb5G42Jh9nj39Cncwl8")