补充调整后的缓存方案

移除 XPSimpleMineViewController

YuMi.xcodeproj/project.pbxproj

@@ -35,14 +35,11 @@
 		142721AF29A75F6F00C7C423 /* SJXCSMIPHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 1427218629A75F6F00C7C423 /* SJXCSMIPHelper.m */; };
 		142721B229A7647F00C7C423 /* XPBlankViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 142721B129A7647F00C7C423 /* XPBlankViewController.m */; };
 		1464C5EA29A45FC300AF7C94 /* XPButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 1464C5E929A45FC300AF7C94 /* XPButton.m */; };
-		1464C5ED29A4784F00AF7C94 /* XPMineSimpleUserInfoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1464C5EC29A4784F00AF7C94 /* XPMineSimpleUserInfoViewController.m */; };
 		1464C5F029A49DDD00AF7C94 /* XPMineSimpleUserInfoHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1464C5EF29A49DDD00AF7C94 /* XPMineSimpleUserInfoHeaderView.m */; };
 		1464C5F329A4C18000AF7C94 /* XPIAPRechargeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1464C5F229A4C18000AF7C94 /* XPIAPRechargeViewController.m */; };
 		1464C5F629A4CA8C00AF7C94 /* XPIAPRechargeCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 1464C5F529A4CA8C00AF7C94 /* XPIAPRechargeCollectionViewCell.m */; };
 		1464C5F929A4D00000AF7C94 /* XPIAPRechargeHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1464C5F829A4D00000AF7C94 /* XPIAPRechargeHeaderView.m */; };
-		149839C4299E088000F82CBF /* XPMomentListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 149839C3299E088000F82CBF /* XPMomentListViewController.m */; };
 		149839C7299E0B9F00F82CBF /* XPMomentListCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 149839C6299E0B9F00F82CBF /* XPMomentListCollectionViewCell.m */; };
-		14A6034929A3567200D2A6A5 /* XPSimpleMineViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 14A6034829A3567200D2A6A5 /* XPSimpleMineViewController.m */; };
 		14A6034C29A35EE600D2A6A5 /* XPMineItemTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 14A6034B29A35EE600D2A6A5 /* XPMineItemTableViewCell.m */; };
 		14A6034F29A36D8300D2A6A5 /* XPSimpleMineHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 14A6034E29A36D8300D2A6A5 /* XPSimpleMineHeaderView.m */; };
 		14B880E1299A1799005FCA1B /* XPLoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 14B880E0299A1799005FCA1B /* XPLoginViewController.m */; };
@@ -211,6 +208,10 @@
 		234489082AC3C5DA0070E5D5 /* SudMGP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 234489072AC3C5DA0070E5D5 /* SudMGP.framework */; };
 		234489092AC3C5FF0070E5D5 /* SudMGP.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 234489072AC3C5DA0070E5D5 /* SudMGP.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		234D821E2AEC57CF0022EFEB /* YYTextAsyncLayer+PITextAsyncLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 234D821D2AEC57CF0022EFEB /* YYTextAsyncLayer+PITextAsyncLayer.m */; };
+		234E50A52BF5E556005CB6D5 /* MessageContentChatHallHeadView.m in Sources */ = {isa = PBXBuildFile; fileRef = 234E50A42BF5E556005CB6D5 /* MessageContentChatHallHeadView.m */; };
+		234E50A82BF5EBDD005CB6D5 /* MSSessionPublicChatHalRightTextCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 234E50A72BF5EBDD005CB6D5 /* MSSessionPublicChatHalRightTextCell.m */; };
+		234E50AB2BF5F95A005CB6D5 /* MSSessionPublicChatHalIRightmageCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 234E50AA2BF5F95A005CB6D5 /* MSSessionPublicChatHalIRightmageCell.m */; };
+		234E50AF2BF7352C005CB6D5 /* NSTextAttachment+MSImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 234E50AE2BF7352C005CB6D5 /* NSTextAttachment+MSImage.m */; };
 		234F44E32B3EA4F900E2B532 /* PILineManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 234F44E22B3EA4F900E2B532 /* PILineManager.swift */; };
 		2357145A2BE8BC6C004C81D6 /* MSSessionPublicChatHallVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 235714592BE8BC6C004C81D6 /* MSSessionPublicChatHallVC.m */; };
 		235714602BE8BD5C004C81D6 /* MSSessionScrollingModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 2357145F2BE8BD5C004C81D6 /* MSSessionScrollingModel.m */; };
@@ -222,7 +223,6 @@
 		235714772BEC9E5E004C81D6 /* MSSessionContextHeadlinesView.m in Sources */ = {isa = PBXBuildFile; fileRef = 235714762BEC9E5E004C81D6 /* MSSessionContextHeadlinesView.m */; };
 		2357147A2BECA102004C81D6 /* MessageHeadlinesModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 235714792BECA102004C81D6 /* MessageHeadlinesModel.m */; };
 		235714802BECB217004C81D6 /* MSSessionReleaseHeadlinesPayView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2357147F2BECB217004C81D6 /* MSSessionReleaseHeadlinesPayView.m */; };
-		235714862BECC24F004C81D6 /* MessageContentHeadLinesText.m in Sources */ = {isa = PBXBuildFile; fileRef = 235714852BECC24F004C81D6 /* MessageContentHeadLinesText.m */; };
 		235714892BECC38F004C81D6 /* MessageHeadlinesTextModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 235714882BECC38F004C81D6 /* MessageHeadlinesTextModel.m */; };
 		2357148C2BECEE33004C81D6 /* MSSessionPublicChatHalTextCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2357148B2BECEE33004C81D6 /* MSSessionPublicChatHalTextCell.m */; };
 		2357148F2BEDC94D004C81D6 /* MSSessionPublicChatHalImageCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2357148E2BEDC94D004C81D6 /* MSSessionPublicChatHalImageCell.m */; };
@@ -363,6 +363,17 @@
 		23959FE72BB15C930085A282 /* UploadFileModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 23959FE62BB15C930085A282 /* UploadFileModel.m */; };
 		2396FCE42B22BE5D0014021D /* pi_area_info.json in Resources */ = {isa = PBXBuildFile; fileRef = 2396FCE32B22BE5D0014021D /* pi_area_info.json */; };
 		239BEEDB2AA1E058005CDA94 /* PIHoemCategoryTitleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 239BEEDA2AA1E058005CDA94 /* PIHoemCategoryTitleView.m */; };
+		239D0F962BFB3296002977CE /* MSRoomOnLineView.m in Sources */ = {isa = PBXBuildFile; fileRef = 239D0F952BFB3296002977CE /* MSRoomOnLineView.m */; };
+		239D0F992BFB43BC002977CE /* MSRoomOnLineAvatarView.m in Sources */ = {isa = PBXBuildFile; fileRef = 239D0F982BFB43BC002977CE /* MSRoomOnLineAvatarView.m */; };
+		239D0F9B2BFC9E6C002977CE /* ms_room_gift_svga_icon.svga in Resources */ = {isa = PBXBuildFile; fileRef = 239D0F9A2BFC9E6C002977CE /* ms_room_gift_svga_icon.svga */; };
+		239D0FA82BFCB88D002977CE /* XPRoomBackContainerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 239D0F9C2BFCB88C002977CE /* XPRoomBackContainerView.m */; };
+		239D0FA92BFCB88D002977CE /* XPRoomDatingVipUpMicView.m in Sources */ = {isa = PBXBuildFile; fileRef = 239D0FA12BFCB88D002977CE /* XPRoomDatingVipUpMicView.m */; };
+		239D0FAA2BFCB88D002977CE /* XPRoomDatingWebAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = 239D0FA22BFCB88D002977CE /* XPRoomDatingWebAlertView.m */; };
+		239D0FAB2BFCB88D002977CE /* XPRoomFunctionContainerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 239D0FA32BFCB88D002977CE /* XPRoomFunctionContainerView.m */; };
+		239D0FAC2BFCB88D002977CE /* XPRoomRankEntranceView.m in Sources */ = {isa = PBXBuildFile; fileRef = 239D0FA42BFCB88D002977CE /* XPRoomRankEntranceView.m */; };
+		239D0FAD2BFCB88D002977CE /* XPRoomAnchorRankEnterView.m in Sources */ = {isa = PBXBuildFile; fileRef = 239D0FA52BFCB88D002977CE /* XPRoomAnchorRankEnterView.m */; };
+		239D0FB02BFD8C4D002977CE /* MSRoomSetingBackdropVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 239D0FAF2BFD8C4D002977CE /* MSRoomSetingBackdropVC.m */; };
+		239D0FB32BFD8C67002977CE /* MSRoomSetingBackdropCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 239D0FB22BFD8C67002977CE /* MSRoomSetingBackdropCell.m */; };
 		23A03F2D2B4408CD0094227A /* pi_room_lucky_gift.svga in Resources */ = {isa = PBXBuildFile; fileRef = 23A03F2C2B4408CD0094227A /* pi_room_lucky_gift.svga */; };
 		23A439742AA1CF7C002E6039 /* XPNewHomeHeadView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23A439732AA1CF7C002E6039 /* XPNewHomeHeadView.m */; };
 		23A7FB692BDDEDFA00411860 /* MSRoomGameWebVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 23A7FB682BDDEDFA00411860 /* MSRoomGameWebVC.m */; };
@@ -492,7 +503,6 @@
 		73FFADDC93E195344047A2EC /* Pods_YuMi.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CACF623970097D653132D69A /* Pods_YuMi.framework */; };
 		9B0086C627BA392B0032BD2B /* AnchorStageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B0086C527BA392B0032BD2B /* AnchorStageView.m */; };
 		9B0086CA27BA4F570032BD2B /* AnchorMicroView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B0086C927BA4F570032BD2B /* AnchorMicroView.m */; };
-		9B044D9D282D2A6400DE4859 /* XPRoomAnchorRankEnterView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B044D9C282D2A6400DE4859 /* XPRoomAnchorRankEnterView.m */; };
 		9B044DA0282D32F700DE4859 /* MicroInviteExtModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B044D9F282D32F700DE4859 /* MicroInviteExtModel.m */; };
 		9B0997A127F19D8A00EB8F14 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 9B0997A027F19D8900EB8F14 /* README.md */; };
 		9B0997A327F19DE500EB8F14 /* QGHWDShaders.metal in Sources */ = {isa = PBXBuildFile; fileRef = 9B0997A227F19DE500EB8F14 /* QGHWDShaders.metal */; };
@@ -555,7 +565,6 @@
 		9B85F3532806AB9A006EDF51 /* XPAnchorPKResultView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B85F3522806AB9A006EDF51 /* XPAnchorPKResultView.m */; };
 		9B85F3562806DD8A006EDF51 /* XPAnchorPKFinishView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B85F3552806DD8A006EDF51 /* XPAnchorPKFinishView.m */; };
 		9B86D87A2817DD8400494FCD /* XPRoomEnterHideTipView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B86D8792817DD8400494FCD /* XPRoomEnterHideTipView.m */; };
-		9B86D88328192DC000494FCD /* XPRoomRankEntranceView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B86D88228192DC000494FCD /* XPRoomRankEntranceView.m */; };
 		9B86D886281942D200494FCD /* SocialMicroView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B86D885281942D200494FCD /* SocialMicroView.m */; };
 		9B87B3CD2926473D00085110 /* XPSessionListHeadFriendCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B87B3CC2926473D00085110 /* XPSessionListHeadFriendCell.m */; };
 		9B88E20C28C5EB8300D26FBA /* MessageContentRedPacketView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B88E20B28C5EB8300D26FBA /* MessageContentRedPacketView.m */; };
@@ -954,7 +963,6 @@
 		E8383697298A598D00112E1C /* MessageTipsModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E8383696298A598D00112E1C /* MessageTipsModel.m */; };
 		E838369A298A59C100112E1C /* MessageTipsView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8383699298A59C100112E1C /* MessageTipsView.m */; };
 		E838D9A0275E1BF60079E0B5 /* XPRoomAnimationView.m in Sources */ = {isa = PBXBuildFile; fileRef = E838D99F275E1BF60079E0B5 /* XPRoomAnimationView.m */; };
-		E83953222769F33B00CF2F24 /* XPRoomFunctionContainerView.m in Sources */ = {isa = PBXBuildFile; fileRef = E83953212769F33B00CF2F24 /* XPRoomFunctionContainerView.m */; };
 		E839532A276A002800CF2F24 /* XPMineDressUpViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8395329276A002800CF2F24 /* XPMineDressUpViewController.m */; };
 		E839532D276A030F00CF2F24 /* XPMineDressUpListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E839532C276A030F00CF2F24 /* XPMineDressUpListViewController.m */; };
 		E8395331276A03AE00CF2F24 /* Api+DressUp.m in Sources */ = {isa = PBXBuildFile; fileRef = E8395330276A03AE00CF2F24 /* Api+DressUp.m */; };
@@ -1184,8 +1192,6 @@
 		E8778AFB2989034200CF139B /* XPSessionSayHelloEmptyTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E8778AFA2989034200CF139B /* XPSessionSayHelloEmptyTableViewCell.m */; };
 		E877A7EB2783E24700EFACED /* DatingStageView.m in Sources */ = {isa = PBXBuildFile; fileRef = E877A7EA2783E24700EFACED /* DatingStageView.m */; };
 		E877A7EE278428FB00EFACED /* MicroDatingProgressView.m in Sources */ = {isa = PBXBuildFile; fileRef = E877A7ED278428FB00EFACED /* MicroDatingProgressView.m */; };
-		E877A7F127842B2F00EFACED /* XPRoomDatingWebAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = E877A7F027842B2F00EFACED /* XPRoomDatingWebAlertView.m */; };
-		E877A7F427842EF800EFACED /* XPRoomDatingVipUpMicView.m in Sources */ = {isa = PBXBuildFile; fileRef = E877A7F327842EF800EFACED /* XPRoomDatingVipUpMicView.m */; };
 		E87888F42738C30E00BF1D57 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E87888F32738C30E00BF1D57 /* StoreKit.framework */; };
 		E8788934273A53D700BF1D57 /* XPSendGiftView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8788933273A53D700BF1D57 /* XPSendGiftView.m */; };
 		E878893C273A54C300BF1D57 /* Api+Gift.m in Sources */ = {isa = PBXBuildFile; fileRef = E878893B273A54C300BF1D57 /* Api+Gift.m */; };
@@ -1217,7 +1223,6 @@
 		E87DF4D72A42C9C3009C1185 /* HomePlayRoomModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E87DF4D52A42C9C3009C1185 /* HomePlayRoomModel.m */; };
 		E87DF4DA2A42C9D9009C1185 /* HomeCollectRoomModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E87DF4D82A42C9D8009C1185 /* HomeCollectRoomModel.m */; };
 		E87DF4DD2A42CA12009C1185 /* HomeSearchResultModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E87DF4DB2A42CA12009C1185 /* HomeSearchResultModel.m */; };
-		E87DF4E02A42CA92009C1185 /* XPHomeSloganViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E87DF4DE2A42CA92009C1185 /* XPHomeSloganViewController.m */; };
 		E87DF4E42A42CAD2009C1185 /* XPHomeSearchNavView.m in Sources */ = {isa = PBXBuildFile; fileRef = E87DF4E22A42CAD2009C1185 /* XPHomeSearchNavView.m */; };
 		E87DF4E72A42CB00009C1185 /* XPHomePresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E87DF4E52A42CAFF009C1185 /* XPHomePresenter.m */; };
 		E87DF4EC2A42CB60009C1185 /* XPSearchListTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E87DF4EA2A42CB60009C1185 /* XPSearchListTableViewCell.m */; };
@@ -1383,7 +1388,6 @@
 		E8AC723D26F4B6AA007D6E91 /* XPLoginBindPhoneResultViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AC723C26F4B6AA007D6E91 /* XPLoginBindPhoneResultViewController.m */; };
 		E8AE427327153A3500BEEBB2 /* XPRoomActivityContainerView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AE427227153A3500BEEBB2 /* XPRoomActivityContainerView.m */; };
 		E8AEAED6271412EC0017FCE0 /* XPRoomViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AEAED5271412EC0017FCE0 /* XPRoomViewController.m */; };
-		E8AEAEED27141AE20017FCE0 /* XPRoomBackContainerView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AEAEEC27141AE20017FCE0 /* XPRoomBackContainerView.m */; };
 		E8AEAEF027141C430017FCE0 /* XPRoomMenuContainerView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AEAEEF27141C430017FCE0 /* XPRoomMenuContainerView.m */; };
 		E8AEAEF327141C7C0017FCE0 /* XPRoomMessageContainerView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AEAEF227141C7C0017FCE0 /* XPRoomMessageContainerView.m */; };
 		E8AEAEF927141CA30017FCE0 /* RoomHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = E8AEAEF827141CA30017FCE0 /* RoomHeaderView.m */; };
@@ -1583,8 +1587,6 @@
 		142721B129A7647F00C7C423 /* XPBlankViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPBlankViewController.m; sourceTree = "<group>"; };
 		1464C5E829A45FC300AF7C94 /* XPButton.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPButton.h; sourceTree = "<group>"; };
 		1464C5E929A45FC300AF7C94 /* XPButton.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPButton.m; sourceTree = "<group>"; };
-		1464C5EB29A4784F00AF7C94 /* XPMineSimpleUserInfoViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineSimpleUserInfoViewController.h; sourceTree = "<group>"; };
-		1464C5EC29A4784F00AF7C94 /* XPMineSimpleUserInfoViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineSimpleUserInfoViewController.m; sourceTree = "<group>"; };
 		1464C5EE29A49DDD00AF7C94 /* XPMineSimpleUserInfoHeaderView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineSimpleUserInfoHeaderView.h; sourceTree = "<group>"; };
 		1464C5EF29A49DDD00AF7C94 /* XPMineSimpleUserInfoHeaderView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineSimpleUserInfoHeaderView.m; sourceTree = "<group>"; };
 		1464C5F129A4C18000AF7C94 /* XPIAPRechargeViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPIAPRechargeViewController.h; sourceTree = "<group>"; };
@@ -1593,12 +1595,8 @@
 		1464C5F529A4CA8C00AF7C94 /* XPIAPRechargeCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPIAPRechargeCollectionViewCell.m; sourceTree = "<group>"; };
 		1464C5F729A4D00000AF7C94 /* XPIAPRechargeHeaderView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPIAPRechargeHeaderView.h; sourceTree = "<group>"; };
 		1464C5F829A4D00000AF7C94 /* XPIAPRechargeHeaderView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPIAPRechargeHeaderView.m; sourceTree = "<group>"; };
-		149839C2299E088000F82CBF /* XPMomentListViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentListViewController.h; sourceTree = "<group>"; };
-		149839C3299E088000F82CBF /* XPMomentListViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentListViewController.m; sourceTree = "<group>"; };
 		149839C5299E0B9F00F82CBF /* XPMomentListCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentListCollectionViewCell.h; sourceTree = "<group>"; };
 		149839C6299E0B9F00F82CBF /* XPMomentListCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentListCollectionViewCell.m; sourceTree = "<group>"; };
-		14A6034729A3567200D2A6A5 /* XPSimpleMineViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSimpleMineViewController.h; sourceTree = "<group>"; };
-		14A6034829A3567200D2A6A5 /* XPSimpleMineViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPSimpleMineViewController.m; sourceTree = "<group>"; };
 		14A6034A29A35EE600D2A6A5 /* XPMineItemTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineItemTableViewCell.h; sourceTree = "<group>"; };
 		14A6034B29A35EE600D2A6A5 /* XPMineItemTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineItemTableViewCell.m; sourceTree = "<group>"; };
 		14A6034D29A36D8300D2A6A5 /* XPSimpleMineHeaderView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSimpleMineHeaderView.h; sourceTree = "<group>"; };
@@ -1943,6 +1941,14 @@
 		234489072AC3C5DA0070E5D5 /* SudMGP.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SudMGP.framework; sourceTree = "<group>"; };
 		234D821C2AEC57CF0022EFEB /* YYTextAsyncLayer+PITextAsyncLayer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "YYTextAsyncLayer+PITextAsyncLayer.h"; path = "YuMi/Appdelegate/YYTextAsyncLayer+PITextAsyncLayer.h"; sourceTree = SOURCE_ROOT; };
 		234D821D2AEC57CF0022EFEB /* YYTextAsyncLayer+PITextAsyncLayer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = "YYTextAsyncLayer+PITextAsyncLayer.m"; path = "YuMi/Appdelegate/YYTextAsyncLayer+PITextAsyncLayer.m"; sourceTree = SOURCE_ROOT; };
+		234E50A32BF5E556005CB6D5 /* MessageContentChatHallHeadView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageContentChatHallHeadView.h; sourceTree = "<group>"; };
+		234E50A42BF5E556005CB6D5 /* MessageContentChatHallHeadView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageContentChatHallHeadView.m; sourceTree = "<group>"; };
+		234E50A62BF5EBDD005CB6D5 /* MSSessionPublicChatHalRightTextCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSSessionPublicChatHalRightTextCell.h; sourceTree = "<group>"; };
+		234E50A72BF5EBDD005CB6D5 /* MSSessionPublicChatHalRightTextCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSSessionPublicChatHalRightTextCell.m; sourceTree = "<group>"; };
+		234E50A92BF5F95A005CB6D5 /* MSSessionPublicChatHalIRightmageCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSSessionPublicChatHalIRightmageCell.h; sourceTree = "<group>"; };
+		234E50AA2BF5F95A005CB6D5 /* MSSessionPublicChatHalIRightmageCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSSessionPublicChatHalIRightmageCell.m; sourceTree = "<group>"; };
+		234E50AD2BF7352C005CB6D5 /* NSTextAttachment+MSImage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSTextAttachment+MSImage.h"; sourceTree = "<group>"; };
+		234E50AE2BF7352C005CB6D5 /* NSTextAttachment+MSImage.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSTextAttachment+MSImage.m"; sourceTree = "<group>"; };
 		234F44E22B3EA4F900E2B532 /* PILineManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PILineManager.swift; sourceTree = "<group>"; };
 		235714582BE8BC6C004C81D6 /* MSSessionPublicChatHallVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSSessionPublicChatHallVC.h; sourceTree = "<group>"; };
 		235714592BE8BC6C004C81D6 /* MSSessionPublicChatHallVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSSessionPublicChatHallVC.m; sourceTree = "<group>"; };
@@ -1964,8 +1970,6 @@
 		235714792BECA102004C81D6 /* MessageHeadlinesModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageHeadlinesModel.m; sourceTree = "<group>"; };
 		2357147E2BECB217004C81D6 /* MSSessionReleaseHeadlinesPayView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSSessionReleaseHeadlinesPayView.h; sourceTree = "<group>"; };
 		2357147F2BECB217004C81D6 /* MSSessionReleaseHeadlinesPayView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSSessionReleaseHeadlinesPayView.m; sourceTree = "<group>"; };
-		235714842BECC24F004C81D6 /* MessageContentHeadLinesText.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageContentHeadLinesText.h; sourceTree = "<group>"; };
-		235714852BECC24F004C81D6 /* MessageContentHeadLinesText.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageContentHeadLinesText.m; sourceTree = "<group>"; };
 		235714872BECC38F004C81D6 /* MessageHeadlinesTextModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageHeadlinesTextModel.h; sourceTree = "<group>"; };
 		235714882BECC38F004C81D6 /* MessageHeadlinesTextModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageHeadlinesTextModel.m; sourceTree = "<group>"; };
 		2357148A2BECEE33004C81D6 /* MSSessionPublicChatHalTextCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSSessionPublicChatHalTextCell.h; sourceTree = "<group>"; };
@@ -2237,6 +2241,27 @@
 		2396FCE32B22BE5D0014021D /* pi_area_info.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = pi_area_info.json; sourceTree = "<group>"; };
 		239BEED92AA1E058005CDA94 /* PIHoemCategoryTitleView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIHoemCategoryTitleView.h; sourceTree = "<group>"; };
 		239BEEDA2AA1E058005CDA94 /* PIHoemCategoryTitleView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIHoemCategoryTitleView.m; sourceTree = "<group>"; };
+		239D0F942BFB3296002977CE /* MSRoomOnLineView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSRoomOnLineView.h; sourceTree = "<group>"; };
+		239D0F952BFB3296002977CE /* MSRoomOnLineView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSRoomOnLineView.m; sourceTree = "<group>"; };
+		239D0F972BFB43BC002977CE /* MSRoomOnLineAvatarView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSRoomOnLineAvatarView.h; sourceTree = "<group>"; };
+		239D0F982BFB43BC002977CE /* MSRoomOnLineAvatarView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSRoomOnLineAvatarView.m; sourceTree = "<group>"; };
+		239D0F9A2BFC9E6C002977CE /* ms_room_gift_svga_icon.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = ms_room_gift_svga_icon.svga; sourceTree = "<group>"; };
+		239D0F9C2BFCB88C002977CE /* XPRoomBackContainerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPRoomBackContainerView.m; sourceTree = "<group>"; };
+		239D0F9D2BFCB88C002977CE /* XPRoomDatingWebAlertView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPRoomDatingWebAlertView.h; sourceTree = "<group>"; };
+		239D0F9E2BFCB88C002977CE /* XPRoomFunctionContainerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPRoomFunctionContainerView.h; sourceTree = "<group>"; };
+		239D0F9F2BFCB88C002977CE /* XPRoomAnchorRankEnterView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPRoomAnchorRankEnterView.h; sourceTree = "<group>"; };
+		239D0FA02BFCB88D002977CE /* XPRoomDatingVipUpMicView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPRoomDatingVipUpMicView.h; sourceTree = "<group>"; };
+		239D0FA12BFCB88D002977CE /* XPRoomDatingVipUpMicView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPRoomDatingVipUpMicView.m; sourceTree = "<group>"; };
+		239D0FA22BFCB88D002977CE /* XPRoomDatingWebAlertView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPRoomDatingWebAlertView.m; sourceTree = "<group>"; };
+		239D0FA32BFCB88D002977CE /* XPRoomFunctionContainerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPRoomFunctionContainerView.m; sourceTree = "<group>"; };
+		239D0FA42BFCB88D002977CE /* XPRoomRankEntranceView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPRoomRankEntranceView.m; sourceTree = "<group>"; };
+		239D0FA52BFCB88D002977CE /* XPRoomAnchorRankEnterView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPRoomAnchorRankEnterView.m; sourceTree = "<group>"; };
+		239D0FA62BFCB88D002977CE /* XPRoomRankEntranceView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPRoomRankEntranceView.h; sourceTree = "<group>"; };
+		239D0FA72BFCB88D002977CE /* XPRoomBackContainerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPRoomBackContainerView.h; sourceTree = "<group>"; };
+		239D0FAE2BFD8C4D002977CE /* MSRoomSetingBackdropVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSRoomSetingBackdropVC.h; sourceTree = "<group>"; };
+		239D0FAF2BFD8C4D002977CE /* MSRoomSetingBackdropVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSRoomSetingBackdropVC.m; sourceTree = "<group>"; };
+		239D0FB12BFD8C67002977CE /* MSRoomSetingBackdropCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSRoomSetingBackdropCell.h; sourceTree = "<group>"; };
+		239D0FB22BFD8C67002977CE /* MSRoomSetingBackdropCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSRoomSetingBackdropCell.m; sourceTree = "<group>"; };
 		23A03F2C2B4408CD0094227A /* pi_room_lucky_gift.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = pi_room_lucky_gift.svga; sourceTree = "<group>"; };
 		23A439722AA1CF7C002E6039 /* XPNewHomeHeadView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPNewHomeHeadView.h; sourceTree = "<group>"; };
 		23A439732AA1CF7C002E6039 /* XPNewHomeHeadView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPNewHomeHeadView.m; sourceTree = "<group>"; };
@@ -2478,8 +2503,6 @@
 		9B0086C527BA392B0032BD2B /* AnchorStageView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AnchorStageView.m; sourceTree = "<group>"; };
 		9B0086C827BA4F570032BD2B /* AnchorMicroView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AnchorMicroView.h; sourceTree = "<group>"; };
 		9B0086C927BA4F570032BD2B /* AnchorMicroView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AnchorMicroView.m; sourceTree = "<group>"; };
-		9B044D9B282D2A6400DE4859 /* XPRoomAnchorRankEnterView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomAnchorRankEnterView.h; sourceTree = "<group>"; };
-		9B044D9C282D2A6400DE4859 /* XPRoomAnchorRankEnterView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomAnchorRankEnterView.m; sourceTree = "<group>"; };
 		9B044D9E282D32F700DE4859 /* MicroInviteExtModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MicroInviteExtModel.h; sourceTree = "<group>"; };
 		9B044D9F282D32F700DE4859 /* MicroInviteExtModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MicroInviteExtModel.m; sourceTree = "<group>"; };
 		9B0997A027F19D8900EB8F14 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
@@ -2604,8 +2627,6 @@
 		9B85F3552806DD8A006EDF51 /* XPAnchorPKFinishView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAnchorPKFinishView.m; sourceTree = "<group>"; };
 		9B86D8782817DD8400494FCD /* XPRoomEnterHideTipView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomEnterHideTipView.h; sourceTree = "<group>"; };
 		9B86D8792817DD8400494FCD /* XPRoomEnterHideTipView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomEnterHideTipView.m; sourceTree = "<group>"; };
-		9B86D88128192DC000494FCD /* XPRoomRankEntranceView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomRankEntranceView.h; sourceTree = "<group>"; };
-		9B86D88228192DC000494FCD /* XPRoomRankEntranceView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomRankEntranceView.m; sourceTree = "<group>"; };
 		9B86D884281942D200494FCD /* SocialMicroView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SocialMicroView.h; sourceTree = "<group>"; };
 		9B86D885281942D200494FCD /* SocialMicroView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SocialMicroView.m; sourceTree = "<group>"; };
 		9B87B3CB2926473D00085110 /* XPSessionListHeadFriendCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSessionListHeadFriendCell.h; sourceTree = "<group>"; };
@@ -3245,8 +3266,6 @@
 		E8383699298A59C100112E1C /* MessageTipsView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageTipsView.m; sourceTree = "<group>"; };
 		E838D99E275E1BF60079E0B5 /* XPRoomAnimationView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomAnimationView.h; sourceTree = "<group>"; };
 		E838D99F275E1BF60079E0B5 /* XPRoomAnimationView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomAnimationView.m; sourceTree = "<group>"; };
-		E83953202769F33B00CF2F24 /* XPRoomFunctionContainerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomFunctionContainerView.h; sourceTree = "<group>"; };
-		E83953212769F33B00CF2F24 /* XPRoomFunctionContainerView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomFunctionContainerView.m; sourceTree = "<group>"; };
 		E8395328276A002800CF2F24 /* XPMineDressUpViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineDressUpViewController.h; sourceTree = "<group>"; };
 		E8395329276A002800CF2F24 /* XPMineDressUpViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineDressUpViewController.m; sourceTree = "<group>"; };
 		E839532B276A030F00CF2F24 /* XPMineDressUpListViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineDressUpListViewController.h; sourceTree = "<group>"; };
@@ -3733,10 +3752,6 @@
 		E877A7EA2783E24700EFACED /* DatingStageView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DatingStageView.m; sourceTree = "<group>"; };
 		E877A7EC278428FB00EFACED /* MicroDatingProgressView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MicroDatingProgressView.h; sourceTree = "<group>"; };
 		E877A7ED278428FB00EFACED /* MicroDatingProgressView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MicroDatingProgressView.m; sourceTree = "<group>"; };
-		E877A7EF27842B2F00EFACED /* XPRoomDatingWebAlertView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomDatingWebAlertView.h; sourceTree = "<group>"; };
-		E877A7F027842B2F00EFACED /* XPRoomDatingWebAlertView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomDatingWebAlertView.m; sourceTree = "<group>"; };
-		E877A7F227842EF800EFACED /* XPRoomDatingVipUpMicView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomDatingVipUpMicView.h; sourceTree = "<group>"; };
-		E877A7F327842EF800EFACED /* XPRoomDatingVipUpMicView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomDatingVipUpMicView.m; sourceTree = "<group>"; };
 		E87888F32738C30E00BF1D57 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; };
 		E8788932273A53D700BF1D57 /* XPSendGiftView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSendGiftView.h; sourceTree = "<group>"; };
 		E8788933273A53D700BF1D57 /* XPSendGiftView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPSendGiftView.m; sourceTree = "<group>"; };
@@ -3801,8 +3816,6 @@
 		E87DF4D92A42C9D9009C1185 /* HomeCollectRoomModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HomeCollectRoomModel.h; sourceTree = "<group>"; };
 		E87DF4DB2A42CA12009C1185 /* HomeSearchResultModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HomeSearchResultModel.m; sourceTree = "<group>"; };
 		E87DF4DC2A42CA12009C1185 /* HomeSearchResultModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HomeSearchResultModel.h; sourceTree = "<group>"; };
-		E87DF4DE2A42CA92009C1185 /* XPHomeSloganViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPHomeSloganViewController.m; sourceTree = "<group>"; };
-		E87DF4DF2A42CA92009C1185 /* XPHomeSloganViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPHomeSloganViewController.h; sourceTree = "<group>"; };
 		E87DF4E22A42CAD2009C1185 /* XPHomeSearchNavView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPHomeSearchNavView.m; sourceTree = "<group>"; };
 		E87DF4E32A42CAD2009C1185 /* XPHomeSearchNavView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPHomeSearchNavView.h; sourceTree = "<group>"; };
 		E87DF4E52A42CAFF009C1185 /* XPHomePresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPHomePresenter.m; sourceTree = "<group>"; };
@@ -4145,8 +4158,6 @@
 		E8AE427227153A3500BEEBB2 /* XPRoomActivityContainerView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomActivityContainerView.m; sourceTree = "<group>"; };
 		E8AEAED4271412EC0017FCE0 /* XPRoomViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomViewController.h; sourceTree = "<group>"; };
 		E8AEAED5271412EC0017FCE0 /* XPRoomViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomViewController.m; sourceTree = "<group>"; };
-		E8AEAEEB27141AE20017FCE0 /* XPRoomBackContainerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomBackContainerView.h; sourceTree = "<group>"; };
-		E8AEAEEC27141AE20017FCE0 /* XPRoomBackContainerView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomBackContainerView.m; sourceTree = "<group>"; };
 		E8AEAEEE27141C430017FCE0 /* XPRoomMenuContainerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomMenuContainerView.h; sourceTree = "<group>"; };
 		E8AEAEEF27141C430017FCE0 /* XPRoomMenuContainerView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomMenuContainerView.m; sourceTree = "<group>"; };
 		E8AEAEF127141C7C0017FCE0 /* XPRoomMessageContainerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomMessageContainerView.h; sourceTree = "<group>"; };
@@ -4989,6 +5000,7 @@
 				23E9E9AB2A81E8E900B792F2 /* Event */,
 				E83645A42A40AEF600E0DBE4 /* Bundle */,
 				E83645652A40A2CA00E0DBE4 /* CardManager */,
+				234E50AC2BF734FC005CB6D5 /* NSTextAttachment */,
 				1427213629A75F6F00C7C423 /* CocoaHttpServer */,
 				E8F61356291E269700E12650 /* Safe */,
 				9B09979F27F19D1C00EB8F14 /* QGVAPlayer */,
@@ -5159,8 +5171,8 @@
 				E8778AE32988B57B00CF139B /* MessageContentRevokeView.m */,
 				235714752BEC9E5E004C81D6 /* MSSessionContextHeadlinesView.h */,
 				235714762BEC9E5E004C81D6 /* MSSessionContextHeadlinesView.m */,
-				235714842BECC24F004C81D6 /* MessageContentHeadLinesText.h */,
+				234E50A32BF5E556005CB6D5 /* MessageContentChatHallHeadView.h */,
-				235714852BECC24F004C81D6 /* MessageContentHeadLinesText.m */,
+				234E50A42BF5E556005CB6D5 /* MessageContentChatHallHeadView.m */,
 			);
 			path = Content;
 			sourceTree = "<group>";
@@ -5584,6 +5596,15 @@
 			path = UILabel;
 			sourceTree = "<group>";
 		};
+		234E50AC2BF734FC005CB6D5 /* NSTextAttachment */ = {
+			isa = PBXGroup;
+			children = (
+				234E50AD2BF7352C005CB6D5 /* NSTextAttachment+MSImage.h */,
+				234E50AE2BF7352C005CB6D5 /* NSTextAttachment+MSImage.m */,
+			);
+			path = NSTextAttachment;
+			sourceTree = "<group>";
+		};
 		234F44E12B3EA4DC00E2B532 /* YMLine */ = {
 			isa = PBXGroup;
 			children = (
@@ -5960,6 +5981,17 @@
 			path = Api;
 			sourceTree = "<group>";
 		};
+		239D0F932BFB3284002977CE /* MSRoomOnLineView */ = {
+			isa = PBXGroup;
+			children = (
+				239D0F942BFB3296002977CE /* MSRoomOnLineView.h */,
+				239D0F952BFB3296002977CE /* MSRoomOnLineView.m */,
+				239D0F972BFB43BC002977CE /* MSRoomOnLineAvatarView.h */,
+				239D0F982BFB43BC002977CE /* MSRoomOnLineAvatarView.m */,
+			);
+			path = MSRoomOnLineView;
+			sourceTree = "<group>";
+		};
 		23CEFC082AFB8FC100576D89 /* sdkContent */ = {
 			isa = PBXGroup;
 			children = (
@@ -7532,8 +7564,6 @@
 				E8AB632328AE10310023B0D2 /* XPMoentsTopicListViewController.m */,
 				E8AB632A28AE19600023B0D2 /* XPMonentsMineViewController.h */,
 				E8AB632B28AE19600023B0D2 /* XPMonentsMineViewController.m */,
-				149839C2299E088000F82CBF /* XPMomentListViewController.h */,
-				149839C3299E088000F82CBF /* XPMomentListViewController.m */,
 				14EB640729A5BDDD00A4A00B /* XPMomentsSimpleDetailViewController.h */,
 				14EB640829A5BDDD00A4A00B /* XPMomentsSimpleDetailViewController.m */,
 				14EB640B29A5C16000A4A00B /* XPMomentsSimpleDetailNav.h */,
@@ -7968,6 +7998,8 @@
 				E8412FA32779BE9B006E1101 /* Cell */,
 				E8412FA02779BE8F006E1101 /* XPRoomSettingViewController.h */,
 				E8412FA12779BE8F006E1101 /* XPRoomSettingViewController.m */,
+				239D0FAE2BFD8C4D002977CE /* MSRoomSetingBackdropVC.h */,
+				239D0FAF2BFD8C4D002977CE /* MSRoomSetingBackdropVC.m */,
 				E87AE7F7277AABE50037823A /* XPRoomTagListViewController.h */,
 				E87AE7F8277AABE50037823A /* XPRoomTagListViewController.m */,
 				E84BF7D2277C383700EF8877 /* XPRoomSettingInputView.h */,
@@ -8023,6 +8055,8 @@
 				E84BF7DC277C765400EF8877 /* XPRoomRoleEmptyTableViewCell.m */,
 				E89BD7D2277D471100E31B19 /* XPRoomOnlineTableViewCell.h */,
 				E89BD7D3277D471100E31B19 /* XPRoomOnlineTableViewCell.m */,
+				239D0FB12BFD8C67002977CE /* MSRoomSetingBackdropCell.h */,
+				239D0FB22BFD8C67002977CE /* MSRoomSetingBackdropCell.m */,
 			);
 			path = Cell;
 			sourceTree = "<group>";
@@ -8750,8 +8784,12 @@
 				9B7D804C27537950003DAC0C /* MessageCell.m */,
 				2357148A2BECEE33004C81D6 /* MSSessionPublicChatHalTextCell.h */,
 				2357148B2BECEE33004C81D6 /* MSSessionPublicChatHalTextCell.m */,
+				234E50A62BF5EBDD005CB6D5 /* MSSessionPublicChatHalRightTextCell.h */,
+				234E50A72BF5EBDD005CB6D5 /* MSSessionPublicChatHalRightTextCell.m */,
 				2357148D2BEDC94D004C81D6 /* MSSessionPublicChatHalImageCell.h */,
 				2357148E2BEDC94D004C81D6 /* MSSessionPublicChatHalImageCell.m */,
+				234E50A92BF5F95A005CB6D5 /* MSSessionPublicChatHalIRightmageCell.h */,
+				234E50AA2BF5F95A005CB6D5 /* MSSessionPublicChatHalIRightmageCell.m */,
 				E875A1B629755EE200AB1BBD /* SessionUserInfoTableViewCell.h */,
 				E875A1B729755EE200AB1BBD /* SessionUserInfoTableViewCell.m */,
 				E885D531297798E1004DC088 /* SessionSettingTableViewCell.h */,
@@ -9225,8 +9263,6 @@
 		E87E62522A3F55B2002F68C9 /* View */ = {
 			isa = PBXGroup;
 			children = (
-				E87DF4DF2A42CA92009C1185 /* XPHomeSloganViewController.h */,
-				E87DF4DE2A42CA92009C1185 /* XPHomeSloganViewController.m */,
 				E87DF4B82A42C7BB009C1185 /* Search */,
 				E87E625F2A3F5669002F68C9 /* Cell */,
 				E87E625E2A3F565D002F68C9 /* CustomView */,
@@ -9482,8 +9518,6 @@
 				E8D34D6328084E40009C4835 /* XPMineUserInfoGiftWallViewController.m */,
 				E8998D892859CB6A00C68558 /* XPMineUserInfoGiftWallSubViewController.h */,
 				E8998D8A2859CB6A00C68558 /* XPMineUserInfoGiftWallSubViewController.m */,
-				1464C5EB29A4784F00AF7C94 /* XPMineSimpleUserInfoViewController.h */,
-				1464C5EC29A4784F00AF7C94 /* XPMineSimpleUserInfoViewController.m */,
 				1464C5EE29A49DDD00AF7C94 /* XPMineSimpleUserInfoHeaderView.h */,
 				1464C5EF29A49DDD00AF7C94 /* XPMineSimpleUserInfoHeaderView.m */,
 			);
@@ -9676,6 +9710,7 @@
 				23FF256F2ABD456C0064E904 /* pi_home_new_play.svga */,
 				23FF25612ABAE6310064E904 /* pi_room_game_fine_love.svga */,
 				232C444A2AB4363200D4B2ED /* pi_room_tarrow_h5_banner.svga */,
+				239D0F9A2BFC9E6C002977CE /* ms_room_gift_svga_icon.svga */,
 				23FF42662AA5CFBB0055733C /* home_sound_wave.gif */,
 				23E9EB232A84E98300B792F2 /* pi_new_mine_info_online.svga */,
 				23FF255A2AB956D50064E904 /* pi_home_new_pk.svga */,
@@ -9901,6 +9936,7 @@
 		E8AEAED8271413530017FCE0 /* View */ = {
 			isa = PBXGroup;
 			children = (
+				239D0F932BFB3284002977CE /* MSRoomOnLineView */,
 				E880B396278BD3D800A83B0D /* AcrossRoomPK */,
 				E8AEAEE527141ACC0017FCE0 /* ActivityContainerView */,
 				9B7D904A287BC4FC0033A45E /* AnchorCycleView */,
@@ -9990,18 +10026,18 @@
 		E8AEAEE727141ACC0017FCE0 /* BaseUIContainerView */ = {
 			isa = PBXGroup;
 			children = (
-				E8AEAEEB27141AE20017FCE0 /* XPRoomBackContainerView.h */,
+				239D0F9F2BFCB88C002977CE /* XPRoomAnchorRankEnterView.h */,
-				E8AEAEEC27141AE20017FCE0 /* XPRoomBackContainerView.m */,
+				239D0FA52BFCB88D002977CE /* XPRoomAnchorRankEnterView.m */,
-				E83953202769F33B00CF2F24 /* XPRoomFunctionContainerView.h */,
+				239D0FA72BFCB88D002977CE /* XPRoomBackContainerView.h */,
-				E83953212769F33B00CF2F24 /* XPRoomFunctionContainerView.m */,
+				239D0F9C2BFCB88C002977CE /* XPRoomBackContainerView.m */,
-				E877A7EF27842B2F00EFACED /* XPRoomDatingWebAlertView.h */,
+				239D0FA02BFCB88D002977CE /* XPRoomDatingVipUpMicView.h */,
-				E877A7F027842B2F00EFACED /* XPRoomDatingWebAlertView.m */,
+				239D0FA12BFCB88D002977CE /* XPRoomDatingVipUpMicView.m */,
-				E877A7F227842EF800EFACED /* XPRoomDatingVipUpMicView.h */,
+				239D0F9D2BFCB88C002977CE /* XPRoomDatingWebAlertView.h */,
-				E877A7F327842EF800EFACED /* XPRoomDatingVipUpMicView.m */,
+				239D0FA22BFCB88D002977CE /* XPRoomDatingWebAlertView.m */,
-				9B86D88128192DC000494FCD /* XPRoomRankEntranceView.h */,
+				239D0F9E2BFCB88C002977CE /* XPRoomFunctionContainerView.h */,
-				9B86D88228192DC000494FCD /* XPRoomRankEntranceView.m */,
+				239D0FA32BFCB88D002977CE /* XPRoomFunctionContainerView.m */,
-				9B044D9B282D2A6400DE4859 /* XPRoomAnchorRankEnterView.h */,
+				239D0FA62BFCB88D002977CE /* XPRoomRankEntranceView.h */,
-				9B044D9C282D2A6400DE4859 /* XPRoomAnchorRankEnterView.m */,
+				239D0FA42BFCB88D002977CE /* XPRoomRankEntranceView.m */,
 			);
 			path = BaseUIContainerView;
 			sourceTree = "<group>";
@@ -10498,8 +10534,6 @@
 				9BD2ECCD288F829600F5CD9A /* XPMineFootPrintViewController.m */,
 				9B1B729328002099003FACE9 /* XPMineFansTeamViewController.h */,
 				9B1B729428002099003FACE9 /* XPMineFansTeamViewController.m */,
-				14A6034729A3567200D2A6A5 /* XPSimpleMineViewController.h */,
-				14A6034829A3567200D2A6A5 /* XPSimpleMineViewController.m */,
 				14A6034A29A35EE600D2A6A5 /* XPMineItemTableViewCell.h */,
 				14A6034B29A35EE600D2A6A5 /* XPMineItemTableViewCell.m */,
 				14A6034D29A36D8300D2A6A5 /* XPSimpleMineHeaderView.h */,
@@ -11001,6 +11035,7 @@
 				E80EC87928ACD84000D133C5 /* emoji_91@2x.png in Resources */,
 				E80EC84C28ACD84000D133C5 /* emoji_120@2x.png in Resources */,
 				23E9EAA32A84C80300B792F2 /* pi_new_loading.svga in Resources */,
+				239D0F9B2BFC9E6C002977CE /* ms_room_gift_svga_icon.svga in Resources */,
 				E80EC83628ACD84000D133C5 /* emoji_147@2x.png in Resources */,
 				2368ECEC2BC5280300EDF4C9 /* local in Resources */,
 				23E9EB242A84E98300B792F2 /* pi_new_mine_info_sound_play.svga in Resources */,
@@ -11132,7 +11167,6 @@
 				E8D34D5028080362009C4835 /* XPMineDataGiftTableViewCell.m in Sources */,
 				E87C54BE2823CC5B0051AA11 /* XPMineResetLoginPwdPresenter.m in Sources */,
 				E85E7B322A4EB0D300B6D00A /* XPGuildAnchorIncomeSectionView.m in Sources */,
-				E83953222769F33B00CF2F24 /* XPRoomFunctionContainerView.m in Sources */,
 				E87C0AA027D9DE6400CB2241 /* RoomFaceSendInfoModel.m in Sources */,
 				1464C5F629A4CA8C00AF7C94 /* XPIAPRechargeCollectionViewCell.m in Sources */,
 				E8751E6328A646400056EF44 /* XPSailingRankView.m in Sources */,
@@ -11179,7 +11213,6 @@
 				9B9BBF83288FBFB3004E2E74 /* XPNewUserRoomGiftView.m in Sources */,
 				E838369A298A59C100112E1C /* MessageTipsView.m in Sources */,
 				E8899C852785CC69007944BE /* XPRoomDatingAnimationView.m in Sources */,
-				235714862BECC24F004C81D6 /* MessageContentHeadLinesText.m in Sources */,
 				2331C16F2A5EB71000E1D940 /* XPNobleCenterNavView.m in Sources */,
 				E85E7B1B2A4EB0D200B6D00A /* XPMineMainIncomeStatisViewController.m in Sources */,
 				E84BF7D4277C383700EF8877 /* XPRoomSettingInputView.m in Sources */,
@@ -11258,9 +11291,11 @@
 				9BD9A17C27A0EE24004186FE /* XPMineVisitorViewController.m in Sources */,
 				2369F9912A89CE0E00563B48 /* PIUserSexView.m in Sources */,
 				238B37D92AC55A2C00BFC9D5 /* XPTreasureFairyTrialsRecordView.m in Sources */,
+				239D0FAB2BFCB88D002977CE /* XPRoomFunctionContainerView.m in Sources */,
 				E82109B026F1D83500FC3319 /* LoginBindPhonePresent.m in Sources */,
 				E81C1B1F27705F7A0020D1E4 /* XPArrangeMicViewController.m in Sources */,
 				E8B825C726EA0D9A009E8E9F /* LoginVerifCodeProtocol.h in Sources */,
+				234E50A52BF5E556005CB6D5 /* MessageContentChatHallHeadView.m in Sources */,
 				23E9EAAE2A84C9B800B792F2 /* XPMineUserInfoTagView.m in Sources */,
 				236B2E4E2AA07D06003967A8 /* Api+LittleGame.m in Sources */,
 				237700E02BC7D78600D661F1 /* MSBaseRTLFlowLayout.m in Sources */,
@@ -11307,7 +11342,6 @@
 				9B87B3CD2926473D00085110 /* XPSessionListHeadFriendCell.m in Sources */,
 				23194DCD2AD14BF000649F51 /* DDASLLogger.m in Sources */,
 				E85E7B492A4EB0D300B6D00A /* XPMineGuildSearchViewController.m in Sources */,
-				9B86D88328192DC000494FCD /* XPRoomRankEntranceView.m in Sources */,
 				238A900A2BA9756600828123 /* PIUniversalBannerModel.m in Sources */,
 				E85E7B012A4EB0D200B6D00A /* XPSuperAdminSetPresenter.m in Sources */,
 				18F404B7276095D700A6C548 /* SessionChatLimitView.m in Sources */,
@@ -11346,6 +11380,7 @@
 				2331C1AA2A60F32D00E1D940 /* XPCandyTreePresenter.m in Sources */,
 				E8AC723D26F4B6AA007D6E91 /* XPLoginBindPhoneResultViewController.m in Sources */,
 				E8AB632728AE13210023B0D2 /* XPMonentsTopicListPresenter.m in Sources */,
+				239D0FB32BFD8C67002977CE /* MSRoomSetingBackdropCell.m in Sources */,
 				1427218729A75F6F00C7C423 /* MyHTTPConnection.m in Sources */,
 				23CEFB6C2AFB803B00576D89 /* PISwitchingEnvironmentVC.m in Sources */,
 				E8D55C9D28113218006935A5 /* MessageMenuModel.m in Sources */,
@@ -11362,7 +11397,6 @@
 				F1D8556F2931FC86008C418F /* XPRoomYearActivityView.m in Sources */,
 				238B37C72AC55A2C00BFC9D5 /* XPTreasureFairyPrizeRecordView.m in Sources */,
 				E8B9843628ABA8B40022D026 /* XPMonentPublishSuccessView.m in Sources */,
-				E87DF4E02A42CA92009C1185 /* XPHomeSloganViewController.m in Sources */,
 				238ED83A2AE2891D0014EF9D /* PIRoomEnterRedPacketView.m in Sources */,
 				23E9E9972A80C3A100B792F2 /* XPMineGuildPersonalBillRecordVC.m in Sources */,
 				E81C279626EB39CC0031E639 /* LoginForgetPasswordPresent.m in Sources */,
@@ -11527,7 +11561,6 @@
 				9BCB99A028F571B500466D64 /* XPMineCollectPartyRoomViewController.m in Sources */,
 				E81C27AE26EF39AB0031E639 /* AppDelegate+ThirdConfig.m in Sources */,
 				E8AB631028ADD92D0023B0D2 /* XPMonentsTopicRecommondViewController.m in Sources */,
-				E877A7F127842B2F00EFACED /* XPRoomDatingWebAlertView.m in Sources */,
 				E8E70D8326F2F51A00F03460 /* XPMineHeadView.m in Sources */,
 				E80EC81128ACD84000D133C5 /* QEmotionHelper.m in Sources */,
 				E8EEB90C26FC5EBC007C6EBA /* XPMineUserInfoEditModel.m in Sources */,
@@ -11564,7 +11597,6 @@
 				232EBBFF2BD7A25500E8CEAD /* MSParamsDecode.m in Sources */,
 				9B7D804D27537950003DAC0C /* MessageCell.m in Sources */,
 				23E9EAA62A84C97C00B792F2 /* XPMineUserInfoTagVC.m in Sources */,
-				9B044D9D282D2A6400DE4859 /* XPRoomAnchorRankEnterView.m in Sources */,
 				E8950180282CAC49007E459A /* XPMonentsUserInfoView.m in Sources */,
 				18F404C927609A4300A6C548 /* MessagePresenter.m in Sources */,
 				9BC9DAEF27E33B3F009EE409 /* XPRoomGiftAnimationParser.m in Sources */,
@@ -11622,6 +11654,7 @@
 				237700FA2BCCD25500D661F1 /* YYLabel+MSRTL.m in Sources */,
 				E84BF7DD277C765400EF8877 /* XPRoomRoleEmptyTableViewCell.m in Sources */,
 				E8F6135C291E26BD00E12650 /* NSMutableDictionary+Saft.m in Sources */,
+				239D0F992BFB43BC002977CE /* MSRoomOnLineAvatarView.m in Sources */,
 				1427213429A75A2600C7C423 /* XPMonentsLatestPresenter.m in Sources */,
 				E83ABEFD280EB5E200322EE4 /* ContentOpenLiveInfoModel.m in Sources */,
 				E85E7BAF2A4EC99300B6D00A /* XPMineChooseGiveDiamondVC.m in Sources */,
@@ -11633,7 +11666,6 @@
 				14B880E7299A4B62005FCA1B /* XPLoginPhoneViewController.m in Sources */,
 				E824544626F5934700BE8163 /* XPMinePayPwdPresenter.m in Sources */,
 				189DD54B26DE338800AB55B1 /* BaseViewController.m in Sources */,
-				149839C4299E088000F82CBF /* XPMomentListViewController.m in Sources */,
 				E8B846C226FD82DC00A777FE /* XPMineUserInfoAlbumCollectionViewCell.m in Sources */,
 				233423CD2AAEE98200B1253F /* XPCandyTreeConfirmBuyNumView.m in Sources */,
 				2331C1AD2A60F32D00E1D940 /* XPCandyTreeAnimationModel.m in Sources */,
@@ -11713,6 +11745,7 @@
 				E85E7B6E2A4EC4AE00B6D00A /* XPMineGuildPresenter.m in Sources */,
 				23CEFC5B2AFB8FC100576D89 /* BSSelectView.m in Sources */,
 				E81125CA296E606F000D9804 /* QPhotoImageModel.m in Sources */,
+				239D0FAA2BFCB88D002977CE /* XPRoomDatingWebAlertView.m in Sources */,
 				9B42869528C1E00A009034D2 /* XPRedPacketResultModel.m in Sources */,
 				2331C16E2A5EB71000E1D940 /* XPNobleAuthorityDescView.m in Sources */,
 				9BE01AE428937EDE00B50299 /* XPDressUpShopCollectionViewCell.m in Sources */,
@@ -11856,6 +11889,7 @@
 				E8778AF82988F4E200CF139B /* XPSessionSayHelloHeaderView.m in Sources */,
 				E84150C527747E0900A7F548 /* FirstRechargeRewardModel.m in Sources */,
 				E8B9843328ABA2FF0022D026 /* MonentsPicResInfo.m in Sources */,
+				239D0FB02BFD8C4D002977CE /* MSRoomSetingBackdropVC.m in Sources */,
 				235714982BEDF54E004C81D6 /* MsRoomMessageMainView.m in Sources */,
 				9BE9F10227FEE5C200667200 /* XPAnchorFansTaskDetailModel.m in Sources */,
 				E8E0DAE6285C280E00566A2F /* XPSessionFindNewAlertView.m in Sources */,
@@ -11929,9 +11963,9 @@
 				2357146E2BEB816B004C81D6 /* MSSessionPublicChatHallHeadView.m in Sources */,
 				238B37CD2AC55A2C00BFC9D5 /* XPTreasureFailyResultView.m in Sources */,
 				E824545126F5CE6E00BE8163 /* XPMineModifPayPwdPresenter.m in Sources */,
-				1464C5ED29A4784F00AF7C94 /* XPMineSimpleUserInfoViewController.m in Sources */,
 				E8098CB1282E86EF0090B9F0 /* XPMonentsContentView.m in Sources */,
 				E85E3FA728B7A6F000268DC8 /* MessageContentMonentsView.m in Sources */,
+				234E50A82BF5EBDD005CB6D5 /* MSSessionPublicChatHalRightTextCell.m in Sources */,
 				E880B3AF278BE1D800A83B0D /* Api+AcrossRoomPK.m in Sources */,
 				238B37DC2AC55A2C00BFC9D5 /* XPTreasureFairyBallView.m in Sources */,
 				23CEFC4B2AFB8FC100576D89 /* BSUIDemoUtil.m in Sources */,
@@ -11994,6 +12028,7 @@
 				1808072D2731598F001FD836 /* XPNetImageYYLabel.m in Sources */,
 				E818E348286ECA4B005EDF68 /* XPMonentsPublishViewController.m in Sources */,
 				9B88E20C28C5EB8300D26FBA /* MessageContentRedPacketView.m in Sources */,
+				234E50AB2BF5F95A005CB6D5 /* MSSessionPublicChatHalIRightmageCell.m in Sources */,
 				E896EFAF2771AF0F00AD2CC1 /* XPMineFriendEmptyTableViewCell.m in Sources */,
 				E8E859E928264F4500EE4857 /* XPRoomTransferMusicViewController.m in Sources */,
 				18486213271EA9DA005FC5DC /* RtcManager.m in Sources */,
@@ -12005,6 +12040,7 @@
 				23CEFC5F2AFB8FC100576D89 /* BSLogTableViewController.m in Sources */,
 				236B2E4D2AA07D06003967A8 /* XPRoomLittleGameContainerView.m in Sources */,
 				E87AE8C1284E184300CAFBB3 /* RoomNewUserGreetModel.m in Sources */,
+				239D0FAC2BFCB88D002977CE /* XPRoomRankEntranceView.m in Sources */,
 				235714602BE8BD5C004C81D6 /* MSSessionScrollingModel.m in Sources */,
 				9BC5C91C277C8A7B007C8719 /* XPReleaseRadioViewController.m in Sources */,
 				23B2AEC42A6516C200543D17 /* LoginForgetPasswordViewController.m in Sources */,
@@ -12130,7 +12166,6 @@
 				23E9EA7F2A839B2F00B792F2 /* MessageTreasureFairyModel.m in Sources */,
 				E8778AFB2989034200CF139B /* XPSessionSayHelloEmptyTableViewCell.m in Sources */,
 				238B37B02AC55A2C00BFC9D5 /* XPTreasureFairyStoreResultCell.m in Sources */,
-				E8AEAEED27141AE20017FCE0 /* XPRoomBackContainerView.m in Sources */,
 				E88B5CC126FB407B00DA9178 /* XPMineUserInfoViewController.m in Sources */,
 				235714672BE8C009004C81D6 /* MSSessionScrollingView.m in Sources */,
 				2331C1AC2A60F32D00E1D940 /* CandyTreeRecordModel.m in Sources */,
@@ -12194,6 +12229,7 @@
 				E87DF4E72A42CB00009C1185 /* XPHomePresenter.m in Sources */,
 				2331C0DC2A5E9E9000E1D940 /* PIFullScreenBannerAnimation.m in Sources */,
 				E8232600274E48EA003A3332 /* XPUserCardItemCollectionViewCell.m in Sources */,
+				239D0FA92BFCB88D002977CE /* XPRoomDatingVipUpMicView.m in Sources */,
 				E88B5CC526FB42B000DA9178 /* XPMineUserInfoHeaderView.m in Sources */,
 				E8AC721626F46B06007D6E91 /* XPMineSettingTableViewCell.m in Sources */,
 				18EE3FDF2750C1F700A452BF /* SessionListCell.m in Sources */,
@@ -12210,6 +12246,7 @@
 				142721AF29A75F6F00C7C423 /* SJXCSMIPHelper.m in Sources */,
 				E87E62742A3F5907002F68C9 /* XPHomeBannerTableViewCell.m in Sources */,
 				E88C72A3282917590047FB2B /* XPRoomMusicVoiceSettingView.m in Sources */,
+				239D0FA82BFCB88D002977CE /* XPRoomBackContainerView.m in Sources */,
 				23D321DF2ADFCEB2006B259C /* PIRedPacketChooseTypeView.m in Sources */,
 				E81AF32827F1EE69003B9E43 /* XPRoomPKPanelUserView.m in Sources */,
 				E84150BF27747BD300A7F548 /* Api+FirstRecharge.m in Sources */,
@@ -12219,6 +12256,7 @@
 				E852D73B286317F0001465ED /* XPMonentsDetailViewController.m in Sources */,
 				2331C1692A5EB71000E1D940 /* XPNobleSettingViewController.m in Sources */,
 				E85E7B392A4EB0D300B6D00A /* XPGuildChooseManagerRoomTableViewCell.m in Sources */,
+				239D0FAD2BFCB88D002977CE /* XPRoomAnchorRankEnterView.m in Sources */,
 				E81060D9298761A300B772F0 /* MessageBaseModel.m in Sources */,
 				E890BC10273D23F00007C46B /* GiftInfoModel.m in Sources */,
 				E8A30BEB28534A96003B4873 /* XPSessionFindNewFiltrateView.m in Sources */,
@@ -12271,6 +12309,7 @@
 				E833ED0D274FAD1C00A2463B /* XPKickUserModel.m in Sources */,
 				9B42868E28C1AE2D009034D2 /* XPReceiveRedPacketView.m in Sources */,
 				E8788934273A53D700BF1D57 /* XPSendGiftView.m in Sources */,
+				234E50AF2BF7352C005CB6D5 /* NSTextAttachment+MSImage.m in Sources */,
 				E896EF9C2771AE6B00AD2CC1 /* XPMineFansViewController.m in Sources */,
 				238B37A72AC55A2C00BFC9D5 /* TreasureFairyRewardModel.m in Sources */,
 				E84B0E462727EF9D008818C6 /* XPRoomMessageParser.m in Sources */,
@@ -12282,13 +12321,13 @@
 				E874B88827215D39003954B9 /* MicroStateModel.m in Sources */,
 				23E9EABB2A84CCBE00B792F2 /* XPMineDataSkillDataCollectionViewCell.m in Sources */,
 				23FE47D52BB3C64600F09D23 /* PINobleCenterTitleCell.m in Sources */,
-				E877A7F427842EF800EFACED /* XPRoomDatingVipUpMicView.m in Sources */,
 				E896EF9F2771AE7B00AD2CC1 /* XPMineAttentionViewController.m in Sources */,
 				E89D60C1271D64B9001F8895 /* RoomInfoModel.m in Sources */,
 				E89DA66727006443008483C1 /* RechargeStorage.m in Sources */,
 				189DD53F26DE255600AB55B1 /* main.m in Sources */,
 				236B2E4A2AA07D06003967A8 /* XPLittleGameTableViewCell.m in Sources */,
 				E85E7BBC2A4EE70B00B6D00A /* XPMineTheGuildCell.m in Sources */,
+				239D0F962BFB3296002977CE /* MSRoomOnLineView.m in Sources */,
 				E885D5392977D10E004DC088 /* SessionSettingUserView.m in Sources */,
 				2305EF072AD6B51200AD403C /* PIRoomPhotoAlbumChoosePhotoGiftView.m in Sources */,
 				2331C16C2A5EB71000E1D940 /* XPNobleCenterEmptyView.m in Sources */,
@@ -12309,7 +12348,6 @@
 				E87E91522796A15500A7B3F2 /* MicroExtModel.m in Sources */,
 				E8788948273A55D000BF1D57 /* XPGiftBarView.m in Sources */,
 				E89DCF5728FFF076001647EC /* XPWishGiftEmptyTableViewCell.m in Sources */,
-				14A6034929A3567200D2A6A5 /* XPSimpleMineViewController.m in Sources */,
 				237700D32BC7CC7C00D661F1 /* NSObject+MJExtension.m in Sources */,
 				E8D4DE442940462C00EC788D /* XPGiftTwelveStarBroadcastView.m in Sources */,
 				E81060DF29876D3A00B772F0 /* MessageTimeModel.m in Sources */,
@@ -12540,7 +12578,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 20.20.19;
+				MARKETING_VERSION = 20.20.20;
 				PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -12578,7 +12616,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 20.20.19;
+				MARKETING_VERSION = 20.20.20;
 				PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

YuMi/Appdelegate/AppDelegate+ThirdConfig.m

@@ -234,9 +234,6 @@ UIKIT_EXTERN NSString * adImageName;
 
 /// 闪屏广告跳转处理
 - (void)advertiseJumpHandleWithInfo:(AdvertiseModel *)info {
-	if (![ClientConfig shareConfig].canOpen) {
-		return;
-	}
 	if (UIApplication.sharedApplication.keyWindow != self.window) {
 		//当前窗口不是主控制器所在窗口时，拦截跳转（目前可能情况时，闪屏后出现新人引导
 		return;

YuMi/Assets.xcassets/Language/ar/room_menu_arrange_mic_new_ar.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "room_menu_arrange_mic_new_ar@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "room_menu_arrange_mic_new_ar@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/Language/en/mine_noble_center_tag_title_bg_en.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "mine_noble_center_tag_title_bg_en@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "mine_noble_center_tag_title_bg_en@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/Language/en/room_menu_arrange_mic_en.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "room_menu_arrange_mic_en@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "room_menu_arrange_mic_en@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/Language/en/room_menu_arrange_mic_new_en.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "room_menu_arrange_mic_new_en@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "room_menu_arrange_mic_new_en@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/jm/Noble/mine_noble_center_tag_title_bg.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "mine_noble_center_tag_title_bg@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "mine_noble_center_tag_title_bg@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/yna/Menu/room_menu_gift.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "room_menu_gift@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "room_menu_gift@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/yna/Position/ms_room_onLine_icon.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "room_menu_gift1@2x.png",
+      "filename" : "ms_room_onLine_icon@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "room_menu_gift1@3x.png",
+      "filename" : "ms_room_onLine_icon@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

YuMi/Assets.xcassets/yna/Position/ms_room_online_border.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "room_position_boss@2x.png",
+      "filename" : "ms_room_online_border@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "room_position_boss@3x.png",
+      "filename" : "ms_room_online_border@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

YuMi/Assets.xcassets/yna/Position/room_position_lock1.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "room_position_lock1@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "room_position_lock1@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/yna/Position/room_position_normal1.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "room_position_normal1@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "room_position_normal1@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

YuMi/Assets.xcassets/yna/Position/room_rank_iocn.imageset/Contents.json

@@ -1,15 +1,16 @@
 {
   "images" : [
     {
-      "filename" : "pi_room_menu_bottom_send_bg.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "room_rank_iocn@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "room_rank_iocn@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

YuMi/Assets.xcassets/yna/Setting/ms_room_reting_backdrop_back.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "room_menu_arrange_mic_ar@2x.png",
+      "filename" : "ms_room_reting_backdrop_back@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "room_menu_arrange_mic_ar@3x.png",
+      "filename" : "ms_room_reting_backdrop_back@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

YuMi/Config/ClientConfig.h

@@ -22,7 +22,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic,strong) ClientDataModel *configInfo;
 ///开箱子 大于等级  展示
 @property (nonatomic, assign) NSInteger openCandyTreeLimitLevel;
-@property (nonatomic,assign) BOOL canOpen;
+
 @property(nonatomic,assign) BOOL isTF;
 ///是否刷新了
 @property (nonatomic,assign) BOOL isLoad;

YuMi/Config/ClientConfig.m

@@ -44,9 +44,9 @@
     return isTestFlight;
 }
 - (void)clientInit {
-	
+    @kWeakify(self);
-    self.canOpen = YES;
 	[Api clientInitConfig:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
+        @kStrongify(self);
 		if (code == 200) {
 			self.retryCount = 0;
 			NSDictionary * initData = data.data;

YuMi/CustomUI/InputView/InputView/UITextView+QEmotion.m

@@ -82,7 +82,7 @@
 }
 
 - (NSString *)normalText {
-    NSMutableString *normalMutableString = self.attributedText.string.mutableCopy;
+    NSMutableString *normalMutableString = [[NSMutableString alloc]initWithString:[self getResutlText]];
 	CGSize maxSize = CGSizeMake(50, MAXFLOAT);
 	YYTextLayout * layout = [YYTextLayout layoutWithContainerSize:maxSize text:self.attributedText];
 	for (int i = 0; i< layout.attachments.count; i++) {
@@ -96,5 +96,24 @@
 	}
     return normalMutableString;
 }
-
+-(NSString *)getResutlText{
+    if (self.attributedText.length <= 0) {
+        return @"";
+    }
+    NSMutableAttributedString *resutlAtt = [[NSMutableAttributedString alloc] initWithAttributedString:self.attributedText ];
+    //枚举出所有的附件字符串
+    __block NSUInteger base = 0;
+    [self.attributedText enumerateAttributesInRange:NSMakeRange(0, self.attributedText.length) options:NSAttributedStringEnumerationLongestEffectiveRangeNotRequired usingBlock:^(NSDictionary<NSAttributedStringKey,id> * _Nonnull attrs, NSRange range, BOOL * _Nonnull stop) {
+        NSTextAttachment *textAtt = attrs[@"NSAttachment"];
+        //获取当前替换字符串的长度
+        NSInteger length = range.location + base + range.length;
+        if (textAtt && length <= resutlAtt.length) {
+            [resutlAtt replaceCharactersInRange:NSMakeRange(range.location + base, range.length)
+                                             withString:textAtt.imageName];
+                    base += textAtt.imageName.length - 1;
+            
+        }
+    }];
+    return  resutlAtt.string;
+}
 @end

YuMi/CustomUI/ShareView/XPShareView.h

@@ -12,6 +12,7 @@
 
 @class XPShareView;
 @protocol XCShareViewDelegate <NSObject>
+@optional
 ///点击保存图片到相册
 - (void)shareView:(XPShareView *)shareView savePhoto:(XPShareInfoModel *)shareInfo;
 ///点了取消分享

YuMi/CustomUI/ShareView/XPShareView.m

@@ -40,24 +40,14 @@
 #pragma mark - Life Style
 - (instancetype)initWithItems:(NSArray<XPShareItem *> *)items itemSize:(CGSize)itemSize shareInfo:(XPShareInfoModel *)shareInfo {
     if (self = [super init]) {
-       
-        NSMutableArray *itemList = [NSMutableArray array];
         for (XPShareItem * item in items) {
             if (item.type == XPShareItemTagAppFriends || item.type == XPShareItemTagCopyLink) {
                 item.disable = YES;
             } else {
                 item.disable = [self isInstallClient:[self getSharePlatformType:item.type]];
             }
-            if(item.disable == YES){
-                [itemList addObject:item];
-            }
         }
-        if([ClientConfig shareConfig].canOpen){
+        self.items = [NSMutableArray arrayWithArray:items];
-            self.items = [NSMutableArray arrayWithArray:items];
-        }else{
-            self.items = itemList;
-        }
-       
         self.itemSize =itemSize;
         self.shareInfo = shareInfo;
         [self initSubViews];

YuMi/Global/YUMIMacroUitls.h

@@ -49,7 +49,7 @@ isPhoneXSeries = [[UIApplication sharedApplication] delegate].window.safeAreaIns
 
 
 ///内置版本号
-#define PI_App_Version @"1.0.5"
+#define PI_App_Version @"1.0.6"
 ///渠道
 #define PI_App_Source @"appstore"
 #define PI_Test_Flight @"TestFlight"

YuMi/Modules/YMMessage/Model/AttachmentModel.h

@@ -122,6 +122,8 @@ typedef NS_ENUM(NSUInteger, CustomMessageType) {
     CustomMessageType_General_Floating_Screen = 107,
     ///聊天大厅上头条
     CustomMessageType_Chat_Hall_Headlinesn = 108,
+    ///家族新协议
+    CustomMessageType_New_Hall = 110,
 };
 
 
@@ -661,6 +663,20 @@ typedef NS_ENUM(NSUInteger, CustomMessageTypeChatHallHeadlinesn) {
     ///所有房间
     Custom_Message_Sub_Chat_Hall_Headlinesn = 1081,//单房间
   
+};
+///家族新协议
+//CustomMessageType_New_Hall = 110,
+typedef NS_ENUM(NSUInteger, CustomMessageTypeNewHall) {
+    ///所有房间
+    Custom_Message_Sub_New_Hall_Invite = 1101,//邀请加入
+    Custom_Message_Sub_New_Hall_Deal_Invite = 1102,//邀请加入
+    Custom_Message_Sub_New_Hall_Apply = 1103,//申请加入
+    Custom_Message_Sub_New_Hall_Deal_Apply = 1104,//申请加入
+    Custom_Message_Sub_New_Hall_Set_Manager = 1105,//设置管理员
+    Custom_Message_Sub_New_Hall_Remove_Manager = 1106,//移除管理员
+    Custom_Message_Sub_New_Hall_Create = 1107,//加入成员
+    Custom_Message_Sub_New_Hall_Dismiss = 1108,//移除成员
+  
 };
 @interface AttachmentModel : PIBaseModel<NIMCustomAttachment>
 @property (nonatomic,assign) int first;

YuMi/Modules/YMMessage/View/FindNew/View/XPSessionFindNewViewController.m

@@ -22,7 +22,7 @@
 #import "XPSessionFindNewFiltrateView.h"
 #import "XPSessionFindNewGreetListView.h"
 #import "XPMineUserInfoViewController.h"
-#import "XPMineSimpleUserInfoViewController.h"
+
 ///P
 #import "XPSessionFindNewProtocol.h"
 #import "XPSessionFindNewPresenter.h"
@@ -170,15 +170,9 @@
 
 - (void)xPSessionFindNewTableViewCell:(XPSessionFindNewTableViewCell *)cell didClickAvatar:(FindNewUserInfoModel *)userInfo {
 	if (userInfo.uid > 0) {
-        if ([ClientConfig shareConfig].canOpen) {
+        XPMineUserInfoViewController * userInfoVC = [[XPMineUserInfoViewController alloc] init];
-            XPMineUserInfoViewController * userInfoVC = [[XPMineUserInfoViewController alloc] init];
+        userInfoVC.uid = userInfo.uid.integerValue;
-            userInfoVC.uid = userInfo.uid.integerValue;
+        [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:userInfoVC animated:YES];
-            [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:userInfoVC animated:YES];
-        }else{
-            XPMineSimpleUserInfoViewController * userInfoVC = [[XPMineSimpleUserInfoViewController alloc] init];
-            userInfoVC.uid = userInfo.uid.integerValue;
-            [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:userInfoVC animated:YES];
-        }
 	}
 }
 

YuMi/Modules/YMMessage/View/NIMMessageUtils.m

@@ -45,7 +45,7 @@
 				if (attachment.second == Custom_Message_Sub_Gift_Send) {
 					text = YMLocalizedString(@"NIMMessageUtils5");
 				}
-			} else if(attachment.first == CustomMessageType_Hall) {
+			} else if(attachment.first == CustomMessageType_Hall || attachment.first == CustomMessageType_New_Hall) {
 				text = YMLocalizedString(@"NIMMessageUtils6");
 			} else if(attachment.first == CustomMessageType_Member_Online && attachment.second == Custom_Message_Type_Attention_Member_Online) {
 				return YMLocalizedString(@"NIMMessageUtils7");

YuMi/Modules/YMMessage/View/Session/Cell/MSSessionPublicChatHalIRightmageCell.h

@@ -0,0 +1,16 @@
+//
+//  MSSessionPublicChatHalIRightmageCell.h
+//  YuMi
+//
+//  Created by duoban on 2024/5/16.
+//
+
+#import <UIKit/UIKit.h>
+#import "MessageBaseModel.h"
+NS_ASSUME_NONNULL_BEGIN
+
+@interface MSSessionPublicChatHalIRightmageCell : UITableViewCell
+- (void)render:(nonnull MessageBaseModel *)model ;
+@end
+
+NS_ASSUME_NONNULL_END

YuMi/Modules/YMMessage/View/Session/Cell/MSSessionPublicChatHalIRightmageCell.m

@@ -0,0 +1,185 @@
+//
+//  MSSessionPublicChatHalIRightmageCell.m
+//  YuMi
+//
+//  Created by duoban on 2024/5/16.
+//
+
+#import "MSSessionPublicChatHalIRightmageCell.h"
+#import "DJDKMIMOMColor.h"
+#import "NSObject+MJExtension.h"
+#import "QEmotionHelper.h"
+#import <NIMSDK/NIMSDK.h>
+#import <Masonry/Masonry.h>
+#import "SpriteSheetImageManager.h"
+#import "MessageHeadlinesTextModel.h"
+#import "XPMessageRemoteExtModel.h"
+#import "MSSessionPublicChatHalImageCell.h"
+#import "MSSessionPublicChatHalImageModel.h"
+#import "SDPhotoBrowser.h"
+#import "MessageContentChatHallHeadView.h"
+@interface MSSessionPublicChatHalIRightmageCell()
+@property(nonatomic,strong) MSSessionPublicChatHalImageModel * imageModel;
+@property(nonatomic,strong) MessageContentChatHallHeadView *avatarView;
+@property(nonatomic,strong) UIImageView *bgImageView;
+///气泡
+@property (nonatomic,strong) NetImageView *bubbleImageView;
+@property(nonatomic,strong) NetImageView *picImageView;
+@end
+@implementation MSSessionPublicChatHalIRightmageCell
+
+-(instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier{
+    self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
+    if(self){
+        [self installUI];
+        [self installConstraints];
+    }
+    return self;
+}
+
+-(void)installUI{
+    self.contentView.backgroundColor = [UIColor clearColor];
+    self.backgroundColor = [UIColor clearColor];
+    self.selectionStyle = 0;
+    [self.contentView addSubview:self.avatarView];
+    [self.contentView addSubview:self.bgImageView];
+    [self.contentView addSubview:self.bubbleImageView];
+    [self.contentView addSubview:self.picImageView];
+ 
+}
+-(void)installConstraints{
+    [self.avatarView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.trailing.trailing.top.equalTo(self.contentView);
+        make.height.mas_equalTo(kGetScaleWidth(48));
+    }];
+    [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.trailing.mas_equalTo(-kGetScaleWidth(72));
+        make.width.mas_equalTo(kGetScaleWidth(52));
+        make.height.mas_equalTo(kGetScaleWidth(36));
+        make.top.mas_equalTo(kGetScaleWidth(55));
+    }];
+    [self.bubbleImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.edges.equalTo(self.bgImageView);
+    }];
+   
+    [self.picImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.edges.equalTo(self.bgImageView).with.insets(UIEdgeInsetsMake(kGetScaleWidth(10),kGetScaleWidth(10),kGetScaleWidth(10),kGetScaleWidth(10)));
+    }];
+    
+ 
+   
+    
+}
+#pragma mark - 懒加载
+
+
+- (void)render:(nonnull MessageBaseModel *)model {
+
+    
+   
+    MSSessionPublicChatHalImageModel * imageModel = (MSSessionPublicChatHalImageModel *)model;
+    self.imageModel = imageModel;
+    XPMessageRemoteExtModel *extModel = imageModel.extModel;
+    if(extModel == nil)return;
+    [self.avatarView render:model];
+    [self.picImageView mas_updateConstraints:^(MASConstraintMaker *make) {
+        make.height.mas_equalTo(model.contentSize.height);
+        make.width.mas_equalTo(model.contentSize.width);
+    }];
+    if (imageModel.image) {
+        self.picImageView.image = imageModel.image;
+    }else {
+        [self.picImageView loadImageWithUrl:imageModel.imageUrl completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) {
+            self.picImageView.image = image;
+        }];
+    }
+    [self.bgImageView mas_remakeConstraints:^(MASConstraintMaker *make) {
+        make.top.mas_equalTo(kGetScaleWidth(55));
+        make.trailing.mas_equalTo(-kGetScaleWidth(72));
+        make.width.mas_equalTo(model.contentSize.width+kGetScaleWidth(10));
+        make.height.mas_equalTo(model.contentSize.height+kGetScaleWidth(10));
+        make.bottom.mas_equalTo(-kGetScaleWidth(10));
+    }];
+   
+
+}
+#pragma mark - SDPhotoBrowserDelegate
+- (NSURL *)photoBrowser:(SDPhotoBrowser *)browser highQualityImageURLForIndex:(NSInteger)index {
+    return [NSURL URLWithString:self.imageModel.url];
+}
+
+- (UIImage *)photoBrowser:(SDPhotoBrowser *)browser placeholderImageForIndex:(NSInteger)index {
+    return [UIImageConstant defalutBannerPlaceholder];
+}
+- (UIImage *)photoBrowser:(SDPhotoBrowser *)browser highQualityImageForIndex:(NSInteger)index{
+    if(self.imageModel.url == nil && self.imageModel.image != nil){
+        return self.imageModel.image;
+    }
+    return nil;
+}
+-(void)didLeftTapImage{
+    SDPhotoBrowser *browser = [[SDPhotoBrowser alloc]init];
+    browser.sourceImagesContainerView = self;
+    browser.delegate = self;
+    browser.imageCount = 1;
+    browser.currentImageIndex = 0;
+    browser.isMe = NO;
+    [browser show];
+}
+-(void)didRigthTapImage{
+    SDPhotoBrowser *browser = [[SDPhotoBrowser alloc]init];
+    browser.sourceImagesContainerView = self;
+    browser.delegate = self;
+    browser.imageCount = 1;
+    browser.currentImageIndex = 0;
+    browser.isMe = NO;
+    [browser show];
+}
+- (UIImage*)resizableImage:(UIImage *)image {
+    //图片拉伸区域
+    CGFloat top = (image.size.height - 1) / 2;
+    CGFloat left = (image.size.width - 1) / 2;
+    CGFloat right = (image.size.width - 1) / 2;
+    CGFloat bottom = (image.size.height - 1) / 2;
+    return [image resizableImageWithCapInsets:UIEdgeInsetsMake(top, left, bottom, right) resizingMode:UIImageResizingModeStretch];
+}
+- (MessageContentChatHallHeadView *)avatarView{
+    if(!_avatarView){
+        _avatarView = [[MessageContentChatHallHeadView alloc]initWithFrame:CGRectZero isSelf:NO];
+    }
+    return _avatarView;
+}
+
+- (UIImageView *)bgImageView{
+    if(!_bgImageView){
+        _bgImageView = [UIImageView new];
+        _bgImageView.userInteractionEnabled = YES;
+        _bgImageView.image = [self resizableImage:kImage(@"ms_message_headlines_text_left")];
+    }
+    return _bgImageView;
+}
+
+- (NetImageView *)bubbleImageView{
+    if(!_bubbleImageView){
+        _bubbleImageView = [[NetImageView alloc] init];
+       
+    }
+    return _bubbleImageView;
+}
+
+
+
+
+- (NetImageView *)picImageView{
+    if(!_picImageView){
+        _picImageView = [NetImageView new];
+        _picImageView.userInteractionEnabled = YES;
+        _picImageView.layer.masksToBounds = YES;
+        _picImageView.contentMode = UIViewContentModeScaleAspectFill;
+        UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didLeftTapImage)];
+        [_picImageView addGestureRecognizer:tap];
+    }
+    return _picImageView;
+}
+
+@end

YuMi/Modules/YMMessage/View/Session/Cell/MSSessionPublicChatHalImageCell.h

@@ -6,7 +6,7 @@
 //
 
 #import <UIKit/UIKit.h>
-
+#import "MessageBaseModel.h"
 NS_ASSUME_NONNULL_BEGIN
 
 @interface MSSessionPublicChatHalImageCell : UITableViewCell

YuMi/Modules/YMMessage/View/Session/Cell/MSSessionPublicChatHalImageCell.m

@@ -15,39 +15,14 @@
 #import "MSSessionPublicChatHalImageCell.h"
 #import "MSSessionPublicChatHalImageModel.h"
 #import "SDPhotoBrowser.h"
-
+#import "MessageContentChatHallHeadView.h"
 @interface MSSessionPublicChatHalImageCell()<SDPhotoBrowserDelegate>
 @property(nonatomic,strong) MSSessionPublicChatHalImageModel * imageModel;
-
+@property(nonatomic,strong) MessageContentChatHallHeadView *avatarView;
-///当前的消息
+@property(nonatomic,strong) UIImageView *bgImageView;
-@property (nonatomic,strong) NIMMessage *message;
-
-///头饰
-@property (nonatomic,strong) YYAnimatedImageView *headWearImageView;
-///头饰
-@property (nonatomic,strong) YYAnimatedImageView *rightHeadWearImageView;
-///头饰播放
-@property (nonatomic, strong) SpriteSheetImageManager *manager;
-
-/**
- 左侧头像（私聊对象）
- */
-@property (nonatomic, strong) NetImageView * leftAvatar;
-/**
- 右侧头像（自己）
- */
-@property (nonatomic, strong) NetImageView * rightAvatar;
-@property(nonatomic,strong) YYLabel *leftNameView;
-
-@property(nonatomic,strong) UIImageView *leftBgImage;
-@property(nonatomic,strong) UIImageView *rightBgImage;
 ///气泡
-@property (nonatomic,strong) NetImageView *leftBubbleImageView;
+@property (nonatomic,strong) NetImageView *bubbleImageView;
-///气泡
+@property(nonatomic,strong) NetImageView *picImageView;
-@property (nonatomic,strong) NetImageView *rightBubbleImageView;
-
-@property(nonatomic,strong) NetImageView *leftPicImageView;
-@property(nonatomic,strong) NetImageView *rightPicImageView;
 @end
 @implementation MSSessionPublicChatHalImageCell
 
@@ -64,217 +39,67 @@
     self.contentView.backgroundColor = [UIColor clearColor];
     self.backgroundColor = [UIColor clearColor];
     self.selectionStyle = 0;
-    [self addSubview:self.leftAvatar];
+    [self.contentView addSubview:self.avatarView];
-    [self addSubview:self.headWearImageView];
+    [self.contentView addSubview:self.bgImageView];
-    [self addSubview:self.rightAvatar];
+    [self.contentView addSubview:self.bubbleImageView];
-    [self addSubview:self.rightHeadWearImageView];
+    [self.contentView addSubview:self.picImageView];
-    [self addSubview:self.leftNameView];
+ 
-    [self addSubview:self.leftBgImage];
-    [self addSubview:self.rightBgImage];
-    [self addSubview:self.leftBubbleImageView];
-    [self addSubview:self.rightBubbleImageView];
-    [self.leftBgImage addSubview:self.leftPicImageView];
-    [self.rightBgImage addSubview:self.rightPicImageView];
-    
-    
 }
 -(void)installConstraints{
-    [self.leftAvatar mas_makeConstraints:^(MASConstraintMaker *make) {
+    [self.avatarView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.leading.mas_equalTo(kGetScaleWidth(15));
+        make.leading.trailing.top.equalTo(self.contentView);
-        make.width.height.mas_equalTo(kGetScaleWidth(48));
+        make.height.mas_equalTo(kGetScaleWidth(48));
-        make.top.mas_equalTo(kGetScaleWidth(10));
     }];
-    [self.headWearImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+    [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.edges.equalTo(self.leftAvatar).with.insets(UIEdgeInsetsMake(kGetScaleWidth(10),kGetScaleWidth(10),kGetScaleWidth(10),kGetScaleWidth(10)));
-    }];
-    [self.leftNameView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.mas_equalTo(kGetScaleWidth(21));
-        make.height.mas_equalTo(kGetScaleWidth(14));
-        make.leading.mas_equalTo(kGetScaleWidth(72));
-        make.width.mas_lessThanOrEqualTo(kGetScaleWidth(240));
-        
-    }];
-    [self.rightAvatar mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.width.height.equalTo(self.leftAvatar);
-        make.trailing.mas_equalTo(-kGetScaleWidth(15));
-    }];
-    [self.rightHeadWearImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.edges.equalTo(self.rightAvatar).with.insets(UIEdgeInsetsMake(-kGetScaleWidth(10),-kGetScaleWidth(10),-kGetScaleWidth(10),-kGetScaleWidth(10)));
-    }];
-    [self.leftBgImage mas_makeConstraints:^(MASConstraintMaker *make) {
         make.leading.mas_equalTo(kGetScaleWidth(72));
         make.width.mas_equalTo(kGetScaleWidth(52));
         make.height.mas_equalTo(kGetScaleWidth(36));
-        make.top.mas_equalTo(kGetScaleWidth(45));
+        make.top.mas_equalTo(kGetScaleWidth(55));
     }];
-    [self.rightBgImage mas_makeConstraints:^(MASConstraintMaker *make) {
+    [self.bubbleImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.trailing.mas_equalTo(-kGetScaleWidth(72));
+        make.edges.equalTo(self.bgImageView);
-        make.centerY.equalTo(self.rightAvatar);
-        make.width.mas_equalTo(kGetScaleWidth(52));
-        make.height.mas_greaterThanOrEqualTo(kGetScaleWidth(36));
-    }];
-    
-    
-    [self.leftBubbleImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.edges.equalTo(self.leftBgImage);
     }];
    
-    [self.rightBubbleImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+    [self.picImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.edges.equalTo(self.rightBgImage);
+        make.edges.equalTo(self.bgImageView).with.insets(UIEdgeInsetsMake(kGetScaleWidth(10),kGetScaleWidth(10),kGetScaleWidth(10),kGetScaleWidth(10)));
-
-    }];
- 
-    [self.leftPicImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.edges.equalTo(self.leftBgImage).with.insets(UIEdgeInsetsMake(kGetScaleWidth(10),kGetScaleWidth(10),kGetScaleWidth(10),kGetScaleWidth(10)));
     }];
     
  
-    [self.rightPicImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.edges.equalTo(self.rightBgImage).with.insets(UIEdgeInsetsMake(kGetScaleWidth(10),kGetScaleWidth(10),kGetScaleWidth(10),kGetScaleWidth(10)));
-       
-    }];
    
-    self.leftAvatar.hidden = YES;
-    self.leftNameView.hidden = YES;
-    self.leftBgImage.hidden = YES;
-    self.headWearImageView.hidden = YES;
-   
-    self.leftBubbleImageView.hidden = YES;
-    self.rightAvatar.hidden = YES;
-    self.rightBgImage.hidden = YES;
-    self.rightHeadWearImageView.hidden = YES;
-    self.rightBubbleImageView.hidden = YES;
     
 }
 #pragma mark - 懒加载
 
 
 - (void)render:(nonnull MessageBaseModel *)model {
-    self.message = model.message;
+
     
    
     MSSessionPublicChatHalImageModel * imageModel = (MSSessionPublicChatHalImageModel *)model;
     self.imageModel = imageModel;
     XPMessageRemoteExtModel *extModel = imageModel.extModel;
     if(extModel == nil)return;
-    self.leftAvatar.hidden = YES;
+    [self.avatarView render:model];
-    self.leftNameView.hidden = YES;
+    [self.picImageView mas_updateConstraints:^(MASConstraintMaker *make) {
-    self.leftBgImage.hidden = YES;
-    self.headWearImageView.hidden = YES;
-    self.leftPicImageView.hidden = YES;
-    self.rightPicImageView.hidden = YES;
-    self.leftBubbleImageView.hidden = YES;
-    self.rightAvatar.hidden = YES;
-    self.rightBgImage.hidden = YES;
-    self.rightHeadWearImageView.hidden = YES;
-    self.rightBubbleImageView.hidden = YES;
-
-    if(imageModel.isSelf){
-        
-        [self.rightPicImageView mas_updateConstraints:^(MASConstraintMaker *make) {
-            make.height.mas_equalTo(model.contentSize.height);
-            make.width.mas_equalTo(model.contentSize.width);
-        }];
-        if (imageModel.image) {
-            self.rightPicImageView.image = imageModel.image;
-        }else {
-            [self.rightPicImageView loadImageWithUrl:imageModel.imageUrl completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) {
-                self.rightPicImageView.image = image;
-                        }];
-        }
-        [self.rightBgImage mas_remakeConstraints:^(MASConstraintMaker *make) {
-            make.trailing.mas_equalTo(-kGetScaleWidth(72));
-            make.top.mas_equalTo(kGetScaleWidth(21));
-            make.width.mas_equalTo(model.contentSize.width+kGetScaleWidth(10));
-            make.height.mas_equalTo(model.contentSize.height+kGetScaleWidth(10));
-        }];
-        
-        
-        
-        self.rightAvatar.hidden = NO;
-        self.rightBgImage.hidden = NO;
-        self.rightHeadWearImageView.hidden = NO;
-        self.rightBubbleImageView.hidden = NO;
-        self.leftPicImageView.hidden = YES;
-        self.rightPicImageView.hidden = NO;
-        self.rightAvatar.image = nil;
-        [self.rightAvatar loadImageWithUrl:extModel.avatar completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) {
-            self.rightAvatar.image = image;
-        }];
-      
-        self.rightBubbleImageView.image = nil;
-        
-        self.rightBgImage.image = [self resizableImage:kImage(@"ms_message_headlines_text_right")];
-        [self.rightBubbleImageView loadImageWithUrl:extModel.iosBubbleUrl completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) {
-            self.rightBgImage.image = nil;
-            UIImage *image1 = [UIImage imageWithCGImage:image.CGImage scale:2.0 orientation:UIImageOrientationUp];
-            self.rightBubbleImageView.image = [self resizableImage:image1];
-        }];
-        NSString *headwearUrl = extModel.headwearUrl;
-        if (headwearUrl.length > 0) {
-            NSURL *url = [NSURL URLWithString:headwearUrl];
-            @kWeakify(self);
-            [self.manager loadSpriteSheetImageWithURL:url completionBlock:^(YYSpriteSheetImage * _Nullable sprit) {
-                @kStrongify(self);
-                self.rightHeadWearImageView.image = sprit;
-            } failureBlock:^(NSError * _Nullable error) {
-            }];
-        }
-        return;
-        
-    }
-    [self.leftPicImageView mas_updateConstraints:^(MASConstraintMaker *make) {
         make.height.mas_equalTo(model.contentSize.height);
         make.width.mas_equalTo(model.contentSize.width);
     }];
     if (imageModel.image) {
-        self.leftPicImageView.image = imageModel.image;
+        self.picImageView.image = imageModel.image;
     }else {
-        [self.leftPicImageView loadImageWithUrl:imageModel.imageUrl completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) {
+        [self.picImageView loadImageWithUrl:imageModel.imageUrl completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) {
-            self.leftPicImageView.image = image;
+            self.picImageView.image = image;
-                    }];
+        }];
     }
-    [self.leftBgImage mas_remakeConstraints:^(MASConstraintMaker *make) {
+    [self.bgImageView mas_remakeConstraints:^(MASConstraintMaker *make) {
-        make.top.mas_equalTo(kGetScaleWidth(45));
+        make.top.mas_equalTo(kGetScaleWidth(55));
         make.leading.mas_equalTo(kGetScaleWidth(72));
         make.width.mas_equalTo(model.contentSize.width+kGetScaleWidth(10));
         make.height.mas_equalTo(model.contentSize.height+kGetScaleWidth(10));
+        make.bottom.mas_equalTo(-kGetScaleWidth(10));
     }];
-    NSString *headwearUrl = extModel.headwearUrl;
-    if (headwearUrl.length > 0) {
-        NSURL *url = [NSURL URLWithString:headwearUrl];
-        @kWeakify(self);
-        [self.manager loadSpriteSheetImageWithURL:url completionBlock:^(YYSpriteSheetImage * _Nullable sprit) {
-            @kStrongify(self);
-            self.headWearImageView.image = sprit;
-        } failureBlock:^(NSError * _Nullable error) {
-        }];
-    }
-    self.leftAvatar.hidden = NO;
-    self.leftNameView.hidden = NO;
-    self.leftBgImage.hidden = NO;
-    self.headWearImageView.hidden = NO;
-    self.leftPicImageView.hidden = NO;
-    self.rightPicImageView.hidden = YES;
-    self.leftBubbleImageView.hidden = NO;
-    self.leftAvatar.image = nil;
-    [self.leftAvatar loadImageWithUrl:extModel.avatar completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) {
-        self.leftAvatar.image = image;
-    }];
-    self.leftBgImage.image = [self resizableImage:kImage(@"ms_message_headlines_text_left")];
- 
-    [self.leftBubbleImageView loadImageWithUrl:extModel.iosBubbleUrl completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) {
-        self.leftBgImage.image = nil;
-      
-        UIImage *image1 = [UIImage imageWithCGImage:image.CGImage scale:2.0 orientation:UIImageOrientationUp];
-        self.leftBubbleImageView.image = [self resizableImage:image1];
-    }];
-    self.leftNameView.attributedText = imageModel.nameAtt;
-    
-    
-   
-   
    
+
 }
 #pragma mark - SDPhotoBrowserDelegate
 - (NSURL *)photoBrowser:(SDPhotoBrowser *)browser highQualityImageURLForIndex:(NSInteger)index {
@@ -316,110 +141,42 @@
     CGFloat bottom = (image.size.height - 1) / 2;
     return [image resizableImageWithCapInsets:UIEdgeInsetsMake(top, left, bottom, right) resizingMode:UIImageResizingModeStretch];
 }
-- (NetImageView *)leftAvatar{
+- (MessageContentChatHallHeadView *)avatarView{
-    if(!_leftAvatar){
+    if(!_avatarView){
-        NetImageConfig *config = [NetImageConfig new];
+        _avatarView = [[MessageContentChatHallHeadView alloc]initWithFrame:CGRectZero isSelf:NO];
-        config.placeHolder = [UIImageConstant defaultAvatarPlaceholder];
-        _leftAvatar = [[NetImageView alloc]initWithConfig:config];
-        _leftAvatar.layer.cornerRadius = kGetScaleWidth(48)/2;
-        _leftAvatar.layer.masksToBounds = YES;
     }
-    return _leftAvatar;
+    return _avatarView;
-}
-- (NetImageView *)rightAvatar{
-    if(!_rightAvatar){
-        NetImageConfig *config = [NetImageConfig new];
-        config.placeHolder = [UIImageConstant defaultAvatarPlaceholder];
-        _rightAvatar = [[NetImageView alloc]initWithConfig:config];
-        _rightAvatar.layer.cornerRadius = kGetScaleWidth(48)/2;
-        _rightAvatar.layer.masksToBounds = YES;
-    }
-    return _rightAvatar;
-}
-- (YYLabel *)leftNameView{
-    if(!_leftNameView){
-        _leftNameView = [YYLabel new];
-    }
-    return _leftNameView;
 }
 
-- (UIImageView *)leftBgImage{
+- (UIImageView *)bgImageView{
-    if(!_leftBgImage){
+    if(!_bgImageView){
-        _leftBgImage = [UIImageView new];
+        _bgImageView = [UIImageView new];
-        _leftBgImage.userInteractionEnabled = YES;
+        _bgImageView.userInteractionEnabled = YES;
-        _leftBgImage.image = [self resizableImage:kImage(@"ms_message_headlines_text_left")];
+        _bgImageView.image = [self resizableImage:kImage(@"ms_message_headlines_text_left")];
     }
-    return _leftBgImage;
+    return _bgImageView;
 }
-- (UIImageView *)rightBgImage{
+
-    if(!_rightBgImage){
+- (NetImageView *)bubbleImageView{
-        _rightBgImage = [UIImageView new];
+    if(!_bubbleImageView){
-        _rightBgImage.userInteractionEnabled = YES;
+        _bubbleImageView = [[NetImageView alloc] init];
-        _rightBgImage.image = [self resizableImage:kImage(@"ms_message_headlines_text_right")];
-    }
-    return _rightBgImage;
-}
-- (NetImageView *)leftBubbleImageView{
-    if(!_leftBubbleImageView){
-        _leftBubbleImageView = [[NetImageView alloc] init];
        
     }
-    return _leftBubbleImageView;
+    return _bubbleImageView;
 }
-- (NetImageView *)rightBubbleImageView{
+- (NetImageView *)picImageView{
-    if(!_rightBubbleImageView){
+    if(!_picImageView){
-        _rightBubbleImageView = [[NetImageView alloc] init];
+        NetImageConfig *config = [NetImageConfig new];
-
+        config.placeHolder = [UIImageConstant defaultAvatarPlaceholder];
-   
+        _picImageView = [[NetImageView alloc]initWithConfig:config];
-      
+        _picImageView.userInteractionEnabled = YES;
-    }
+        _picImageView.layer.cornerRadius = kGetScaleWidth(8);
-    return _rightBubbleImageView;
+        _picImageView.layer.masksToBounds = YES;
-}
+        _picImageView.contentMode = UIViewContentModeScaleAspectFill;
-
-
-- (YYAnimatedImageView *)headWearImageView {
-    if (!_headWearImageView) {
-        _headWearImageView = [[YYAnimatedImageView alloc] init];
-        _headWearImageView.backgroundColor = [UIColor clearColor];
-        _headWearImageView.contentMode = UIViewContentModeScaleAspectFit;
-    }
-    return _headWearImageView;
-}
-- (YYAnimatedImageView *)rightHeadWearImageView {
-    if (!_rightHeadWearImageView) {
-        _rightHeadWearImageView = [[YYAnimatedImageView alloc] init];
-        _rightHeadWearImageView.backgroundColor = [UIColor clearColor];
-        _rightHeadWearImageView.contentMode = UIViewContentModeScaleAspectFit;
-        
-    }
-    return _rightHeadWearImageView;
-}
-- (SpriteSheetImageManager *)manager {
-    if (!_manager) {
-        _manager = [[SpriteSheetImageManager alloc] init];
-    }
-    return _manager;
-}
-- (NetImageView *)leftPicImageView{
-    if(!_leftPicImageView){
-        _leftPicImageView = [NetImageView new];
-        _leftPicImageView.userInteractionEnabled = YES;
-        _leftPicImageView.layer.masksToBounds = YES;
-        _leftPicImageView.contentMode = UIViewContentModeScaleAspectFill;
         UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didLeftTapImage)];
-        [_leftPicImageView addGestureRecognizer:tap];
+        [_picImageView addGestureRecognizer:tap];
     }
-    return _leftPicImageView;
+    return _picImageView;
-}
-- (NetImageView *)rightPicImageView{
-    if(!_rightPicImageView){
-        _rightPicImageView = [NetImageView new];
-        _rightPicImageView.userInteractionEnabled = YES;
-        _rightPicImageView.layer.masksToBounds = YES;
-        _rightPicImageView.contentMode = UIViewContentModeScaleAspectFill;
-        UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(didRigthTapImage)];
-        [_rightPicImageView addGestureRecognizer:tap];
-    }
-    return _rightPicImageView;
 }
+
 @end

YuMi/Modules/YMMessage/View/Session/Cell/MSSessionPublicChatHalRightTextCell.h

@@ -0,0 +1,16 @@
+//
+//  MSSessionPublicChatHalRightTextCell.h
+//  YuMi
+//
+//  Created by duoban on 2024/5/16.
+//
+
+#import <UIKit/UIKit.h>
+#import "MessageBaseModel.h"
+NS_ASSUME_NONNULL_BEGIN
+
+@interface MSSessionPublicChatHalRightTextCell : UITableViewCell
+- (void)render:(nonnull MessageBaseModel *)model ;
+@end
+
+NS_ASSUME_NONNULL_END

YuMi/Modules/YMMessage/View/Session/Cell/MSSessionPublicChatHalRightTextCell.m

@@ -0,0 +1,167 @@
+//
+//  MSSessionPublicChatHalRightTextCell.m
+//  YuMi
+//
+//  Created by duoban on 2024/5/16.
+//
+
+#import "DJDKMIMOMColor.h"
+#import "NSObject+MJExtension.h"
+#import "QEmotionHelper.h"
+#import <NIMSDK/NIMSDK.h>
+#import <Masonry/Masonry.h>
+#import "SpriteSheetImageManager.h"
+#import "MessageHeadlinesTextModel.h"
+#import "XPMessageRemoteExtModel.h"
+#import "MessageContentChatHallHeadView.h"
+#import "MSSessionPublicChatHalRightTextCell.h"
+
+@interface MSSessionPublicChatHalRightTextCell()
+/**
+ 消息文本
+ */
+
+@property (nonatomic, strong) YYLabel * messageText;
+
+
+
+
+@property(nonatomic,strong) UIImageView *bgImage;
+
+///气泡
+@property (nonatomic,strong) NetImageView *bubbleImageView;
+@property(nonatomic,strong) MessageContentChatHallHeadView *avatarView;
+@end
+@implementation MSSessionPublicChatHalRightTextCell
+-(instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier{
+    self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
+    if(self){
+        [self installUI];
+        [self installConstraints];
+    }
+    return self;
+}
+- (void)render:(nonnull MessageBaseModel *)model {
+    MessageHeadlinesTextModel * textModel = (MessageHeadlinesTextModel *)model;
+    XPMessageRemoteExtModel *extModel = textModel.extModel;
+    if(extModel == nil)return;
+    [self.avatarView render:model];
+    self.messageText.attributedText = textModel.textAttribute;
+    self.bubbleImageView.image = nil;
+    self.bgImage.image = [self resizableImage:kImage(@"ms_message_headlines_text_right")];
+    NSString *iosBubbleUrl = extModel.iosBubbleUrl;
+    if(iosBubbleUrl.length > 0){
+        [self.bubbleImageView loadImageWithUrl:extModel.iosBubbleUrl completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) {
+            self.bgImage.image = nil;
+            UIImage *image1 = [UIImage imageWithCGImage:image.CGImage scale:2.0 orientation:UIImageOrientationUp];
+            self.bubbleImageView.image = [self resizableImage:image1];
+        }];
+    }
+}
+-(void)installUI{
+    self.contentView.backgroundColor = [UIColor clearColor];
+    self.backgroundColor = [UIColor clearColor];
+    self.selectionStyle = UITableViewCellSelectionStyleNone;
+    
+    
+    [self.contentView addSubview:self.avatarView];
+    [self.contentView addSubview:self.bgImage];
+    [self.contentView addSubview:self.bubbleImageView];
+    [self.contentView addSubview:self.messageText];
+    
+    
+    
+    
+}
+-(void)installConstraints{
+    
+    [self.avatarView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.leading.trailing.top.equalTo(self.contentView);
+        make.height.mas_equalTo(kGetScaleWidth(48));
+    }];
+    
+    
+    [self.bgImage mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.equalTo(self.messageText).offset(-kGetScaleWidth(10));
+        make.top.equalTo(self.messageText).offset(-kGetScaleWidth(10));
+        make.bottom.mas_equalTo(self.messageText).offset(kGetScaleWidth(10));
+        make.right.mas_equalTo(self.messageText).offset(kGetScaleWidth(10));
+    }];
+    [self.messageText mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.mas_equalTo(kGetScaleWidth(55));
+        make.trailing.mas_equalTo(-kGetScaleWidth(82));
+        make.bottom.mas_equalTo(-kGetScaleWidth(10));
+        
+    }];
+    
+    
+    [self.bubbleImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.edges.equalTo(self.bgImage);
+        
+    }];
+    
+    
+}
+#pragma mark - 懒加载
+- (UIImage*)resizableImage:(UIImage *)image {
+    //图片拉伸区域
+    CGFloat top = (image.size.height - 1) / 2;
+    CGFloat left = (image.size.width - 1) / 2;
+    CGFloat right = (image.size.width - 1) / 2;
+    CGFloat bottom = (image.size.height - 1) / 2;
+    return [image resizableImageWithCapInsets:UIEdgeInsetsMake(top, left, bottom, right) resizingMode:UIImageResizingModeStretch];
+}
+
+- (UIImageView *)bgImage{
+    if(!_bgImage){
+        _bgImage = [UIImageView new];
+        _bgImage.image = [self resizableImage:kImage(@"ms_message_headlines_text_right")];
+    }
+    return _bgImage;
+}
+
+- (NetImageView *)bubbleImageView{
+    if(!_bubbleImageView){
+        _bubbleImageView = [[NetImageView alloc] init];
+        
+        
+        
+    }
+    return _bubbleImageView;
+}
+- (YYLabel *)messageText {
+    if (!_messageText) {
+        _messageText = [[YYLabel alloc]initWithFrame:CGRectZero];
+        
+        _messageText.textColor = DJDKMIMOMColor.mainTextColor;
+        _messageText.numberOfLines = 0;
+        _messageText.font = kFontMedium(14);
+        _messageText.textColor = [UIColor whiteColor];
+        _messageText.textAlignment = NSTextAlignmentLeft;
+        _messageText.userInteractionEnabled = YES;
+        _messageText.preferredMaxLayoutWidth = kGetScaleWidth(220);
+    }
+    return  _messageText;
+}
+
+
+- (MessageContentChatHallHeadView *)avatarView{
+    if(!_avatarView){
+        _avatarView = [[MessageContentChatHallHeadView alloc]initWithFrame:CGRectZero isSelf:YES];
+    }
+    return _avatarView;
+}
+
+
+- (void)awakeFromNib {
+    [super awakeFromNib];
+    // Initialization code
+}
+
+- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
+    [super setSelected:selected animated:animated];
+    
+    // Configure the view for the selected state
+}
+
+@end

YuMi/Modules/YMMessage/View/Session/Cell/MSSessionPublicChatHalTextCell.m

@@ -6,9 +6,25 @@
 //
 
 #import "MSSessionPublicChatHalTextCell.h"
-#import "MessageContentHeadLinesText.h"
+
+#import "DJDKMIMOMColor.h"
+#import "NSObject+MJExtension.h"
+#import "QEmotionHelper.h"
+#import <NIMSDK/NIMSDK.h>
+#import <Masonry/Masonry.h>
+#import "SpriteSheetImageManager.h"
+#import "MessageHeadlinesTextModel.h"
+#import "XPMessageRemoteExtModel.h"
+#import "MessageContentChatHallHeadView.h"
 @interface MSSessionPublicChatHalTextCell ()
-@property(nonatomic,strong) MessageContentHeadLinesText *textView;
+/**
+ 消息文本
+ */
+@property (nonatomic, strong) YYLabel * messageText;
+@property(nonatomic,strong) UIImageView *bgImage;
+///气泡
+@property (nonatomic,strong) NetImageView *bubbleImageView;
+@property(nonatomic,strong) MessageContentChatHallHeadView *avatarView;
 
 @end
 @implementation MSSessionPublicChatHalTextCell
@@ -21,26 +37,113 @@
     return self;
 }
 - (void)render:(nonnull MessageBaseModel *)model {
-    [self.textView render:model];
+    
+    MessageHeadlinesTextModel * textModel = (MessageHeadlinesTextModel *)model;
+    XPMessageRemoteExtModel *extModel = textModel.extModel;
+    if(extModel == nil)return;
+    [self.avatarView render:model];
+    self.messageText.textColor = [UIColor whiteColor];
+    self.bubbleImageView.image = nil;
+    NSString *iosBubbleUrl = extModel.iosBubbleUrl;
+    _bgImage.image = [self resizableImage:kImage(@"ms_message_headlines_text_left")];
+    if(iosBubbleUrl.length > 0){
+        [self.bubbleImageView loadImageWithUrl:extModel.iosBubbleUrl completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) {
+            self.bgImage.image = nil;
+            self.messageText.textColor = UIColorFromRGB(0x333333);
+            UIImage *image1 = [UIImage imageWithCGImage:image.CGImage scale:2.0 orientation:UIImageOrientationUp];
+            self.bubbleImageView.image = [self resizableImage:image1];
+        }];
+    }
+    self.messageText.attributedText = textModel.textAttribute;
 }
 -(void)installUI{
     self.contentView.backgroundColor = [UIColor clearColor];
     self.backgroundColor = [UIColor clearColor];
-    self.selectionStyle = 0;
+    self.selectionStyle = UITableViewCellSelectionStyleNone;
-    [self.contentView addSubview:self.textView];
+    [self.contentView addSubview:self.avatarView];
+    [self.contentView addSubview:self.bgImage];
+    [self.contentView addSubview:self.bubbleImageView];
+    [self.contentView addSubview:self.messageText];
 }
 -(void)installConstraints{
-    [self.textView mas_makeConstraints:^(MASConstraintMaker *make) {
+    
-        make.edges.equalTo(self.contentView);
+    [self.avatarView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.leading.trailing.top.equalTo(self.contentView);
+        make.height.mas_equalTo(kGetScaleWidth(48));
     }];
+    [self.messageText mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.mas_equalTo(kGetScaleWidth(55));
+        make.leading.mas_equalTo(kGetScaleWidth(82));
+        make.bottom.mas_equalTo(-kGetScaleWidth(10));
+    }];
+    [self.bgImage mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.equalTo(self.messageText).offset(-kGetScaleWidth(10));
+        make.top.equalTo(self.messageText).offset(-kGetScaleWidth(10));
+        make.bottom.mas_equalTo(self.messageText).offset(kGetScaleWidth(10));
+        make.right.mas_equalTo(self.messageText).offset(kGetScaleWidth(10));
+    }];
+    
+    
+    [self.bubbleImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.edges.equalTo(self.bgImage);
+    }];
+    
+    
+    
+    
+    
 }
 #pragma mark - 懒加载
-- (MessageContentHeadLinesText *)textView{
+- (UIImage*)resizableImage:(UIImage *)image {
-    if(!_textView){
+    //图片拉伸区域
-        _textView = [[MessageContentHeadLinesText alloc]initWithFrame:CGRectZero];
+    CGFloat top = (image.size.height - 1) / 2;
-    }
+    CGFloat left = (image.size.width - 1) / 2;
-    return _textView;
+    CGFloat right = (image.size.width - 1) / 2;
+    CGFloat bottom = (image.size.height - 1) / 2;
+    return [image resizableImageWithCapInsets:UIEdgeInsetsMake(top, left, bottom, right) resizingMode:UIImageResizingModeStretch];
 }
+
+
+- (UIImageView *)bgImage{
+    if(!_bgImage){
+        _bgImage = [UIImageView new];
+        _bgImage.image = [self resizableImage:kImage(@"ms_message_headlines_text_left")];
+    }
+    return _bgImage;
+}
+
+- (NetImageView *)bubbleImageView{
+    if(!_bubbleImageView){
+        _bubbleImageView = [[NetImageView alloc] init];
+        
+    }
+    return _bubbleImageView;
+}
+
+- (YYLabel *)messageText {
+    if (!_messageText) {
+        _messageText = [[YYLabel alloc]initWithFrame:CGRectZero];
+        
+        _messageText.textColor = DJDKMIMOMColor.mainTextColor;
+        _messageText.numberOfLines = 0;
+        _messageText.font = kFontMedium(14);
+        _messageText.textColor = [UIColor whiteColor];
+        _messageText.textAlignment = NSTextAlignmentLeft;
+        _messageText.userInteractionEnabled = YES;
+        _messageText.preferredMaxLayoutWidth = kGetScaleWidth(220);
+    }
+    return  _messageText;
+}
+
+
+- (MessageContentChatHallHeadView *)avatarView{
+    if(!_avatarView){
+        _avatarView = [[MessageContentChatHallHeadView alloc]initWithFrame:CGRectZero isSelf:NO];
+    }
+    return _avatarView;
+}
+
+
 - (void)awakeFromNib {
     [super awakeFromNib];
     // Initialization code
@@ -48,7 +151,7 @@
 
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {
     [super setSelected:selected animated:animated];
-
+    
     // Configure the view for the selected state
 }
 

YuMi/Modules/YMMessage/View/Session/Content/MessageContentChatHallHeadView.h

@@ -0,0 +1,17 @@
+//
+//  MessageContentChatHallHeadView.h
+//  YuMi
+//
+//  Created by duoban on 2024/5/16.
+//
+
+#import <UIKit/UIKit.h>
+#import "MessageBaseModel.h"
+NS_ASSUME_NONNULL_BEGIN
+
+@interface MessageContentChatHallHeadView : UIView
+-(instancetype)initWithFrame:(CGRect)frame isSelf:(BOOL)isSelf;
+- (void)render:(nonnull MessageBaseModel *)model;
+@end
+
+NS_ASSUME_NONNULL_END

YuMi/Modules/YMMessage/View/Session/Content/MessageContentChatHallHeadView.m

@@ -0,0 +1,196 @@
+//
+//  MessageContentChatHallHeadView.m
+//  YuMi
+//
+//  Created by duoban on 2024/5/16.
+//
+
+#import "MessageContentChatHallHeadView.h"
+#import "DJDKMIMOMColor.h"
+#import "NSObject+MJExtension.h"
+#import "QEmotionHelper.h"
+#import <NIMSDK/NIMSDK.h>
+#import <Masonry/Masonry.h>
+#import "SpriteSheetImageManager.h"
+#import "MessageHeadlinesTextModel.h"
+#import "XPMessageRemoteExtModel.h"
+#import "MSSessionPublicChatHalImageModel.h"
+@interface MessageContentChatHallHeadView()
+@property(nonatomic,assign) BOOL isSelf;
+///头饰
+@property (nonatomic,strong) YYAnimatedImageView *headWearImageView;
+///头饰播放
+@property (nonatomic, strong) SpriteSheetImageManager *manager;
+/**
+ 左侧头像（私聊对象）
+ */
+@property (nonatomic, strong) NetImageView * avatarView;
+
+@property(nonatomic,strong) UILabel *nameView;
+
+@property(nonatomic,strong) NetImageView *experImage;
+@property(nonatomic,strong) NetImageView *charmImage;
+
+@end
+@implementation MessageContentChatHallHeadView
+
+-(instancetype)initWithFrame:(CGRect)frame isSelf:(BOOL)isSelf{
+    self = [super initWithFrame:frame];
+    if(self){
+        self.isSelf = isSelf;
+        [self installUI];
+        [self installConstraints];
+    }
+    return self;
+}
+-(void)installUI{
+    [self addSubview:self.avatarView];
+    [self addSubview:self.headWearImageView];
+    [self addSubview:self.nameView];
+    [self addSubview:self.experImage];
+    [self addSubview:self.charmImage];
+}
+-(void)installConstraints{
+    if(self.isSelf){
+        [self.avatarView mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.trailing.mas_equalTo(-kGetScaleWidth(15));
+            make.width.height.mas_equalTo(kGetScaleWidth(48));
+            make.top.mas_equalTo(kGetScaleWidth(10));
+        }];
+        [self.headWearImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.edges.equalTo(self.avatarView).with.insets(UIEdgeInsetsMake(-kGetScaleWidth(10),-kGetScaleWidth(10),-kGetScaleWidth(10),-kGetScaleWidth(10)));
+        }];
+        [self.nameView mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.top.mas_equalTo(kGetScaleWidth(21));
+            make.height.mas_equalTo(kGetScaleWidth(18));
+            make.trailing.mas_equalTo(-kGetScaleWidth(72));
+            make.leading.equalTo(self.experImage.mas_trailing).mas_offset(kGetScaleWidth(4));
+            
+        }];
+        [self.experImage mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.width.mas_equalTo(kGetScaleWidth(36));
+            make.height.mas_equalTo(kGetScaleWidth(18));
+            make.leading.equalTo(self.charmImage.mas_trailing).mas_offset(kGetScaleWidth(4));
+            make.centerY.equalTo(self.nameView);
+        }];
+        [self.charmImage mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.width.mas_equalTo(kGetScaleWidth(36));
+            make.height.mas_equalTo(kGetScaleWidth(18));
+            make.leading.mas_greaterThanOrEqualTo(kGetScaleWidth(kGetScaleWidth(64)));
+            make.centerY.equalTo(self.nameView);
+        }];
+        return;
+    }
+    [self.avatarView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.leading.mas_equalTo(kGetScaleWidth(15));
+        make.width.height.mas_equalTo(kGetScaleWidth(48));
+        make.top.mas_equalTo(kGetScaleWidth(10));
+    }];
+    [self.headWearImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.edges.equalTo(self.avatarView).with.insets(UIEdgeInsetsMake(-kGetScaleWidth(10),-kGetScaleWidth(10),-kGetScaleWidth(10),-kGetScaleWidth(10)));
+    }];
+    [self.nameView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.mas_equalTo(kGetScaleWidth(21));
+        make.height.mas_equalTo(kGetScaleWidth(18));
+        make.leading.mas_equalTo(kGetScaleWidth(72));
+        make.trailing.equalTo(self.experImage.mas_leading).mas_offset(-kGetScaleWidth(4));
+        
+    }];
+    [self.experImage mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.width.mas_equalTo(kGetScaleWidth(36));
+        make.height.mas_equalTo(kGetScaleWidth(18));
+        make.trailing.equalTo(self.charmImage.mas_leading).mas_offset(-kGetScaleWidth(4));
+        make.centerY.equalTo(self.nameView);
+    }];
+    [self.charmImage mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.width.mas_equalTo(kGetScaleWidth(36));
+        make.height.mas_equalTo(kGetScaleWidth(18));
+        make.trailing.mas_lessThanOrEqualTo(-kGetScaleWidth(64));
+        make.centerY.equalTo(self.nameView);
+    }];
+}
+
+- (void)render:(nonnull MessageBaseModel *)model {
+    XPMessageRemoteExtModel *extModel ;
+    if([model isKindOfClass:[MSSessionPublicChatHalImageModel class]]){
+        MSSessionPublicChatHalImageModel *imageModel = (MSSessionPublicChatHalImageModel *)model;
+        extModel = imageModel.extModel;
+    }else{
+        MessageHeadlinesTextModel * textModel = (MessageHeadlinesTextModel *)model;
+        extModel = textModel.extModel;
+    }
+   
+    if(extModel == nil)return;
+    self.avatarView.image = nil;
+    [self.avatarView loadImageWithUrl:extModel.avatar completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) {
+        self.avatarView.image = image;
+    }];
+    self.experImage.image = nil;
+    [self.experImage loadImageWithUrl:extModel.experUrl completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) {
+        self.experImage.image = image;
+    }];
+    self.charmImage.image = nil;
+    [self.charmImage loadImageWithUrl:extModel.charmUrl completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) {
+        self.charmImage.image = image;
+    }];
+    self.nameView.text = extModel.nick;
+    self.headWearImageView.image = nil;
+    NSString *headwearUrl = extModel.headwearUrl;
+    if (headwearUrl.length > 0) {
+        NSURL *url = [NSURL URLWithString:headwearUrl];
+        @kWeakify(self);
+        [self.manager loadSpriteSheetImageWithURL:url completionBlock:^(YYSpriteSheetImage * _Nullable sprit) {
+            @kStrongify(self);
+            self.headWearImageView.image = sprit;
+        } failureBlock:^(NSError * _Nullable error) {
+        }];
+    }
+    
+}
+
+#pragma mark - 懒加载
+- (NetImageView *)avatarView{
+    if(!_avatarView){
+        NetImageConfig *config = [NetImageConfig new];
+        config.placeHolder = [UIImageConstant defaultAvatarPlaceholder];
+        _avatarView = [[NetImageView alloc]initWithConfig:config];
+        _avatarView.layer.cornerRadius = kGetScaleWidth(48)/2;
+        _avatarView.layer.masksToBounds = YES;
+    }
+    return _avatarView;
+}
+
+- (UILabel *)nameView{
+    if(!_nameView){
+        _nameView = [UILabel labelInitWithText:@"" font:kFontBold(14) textColor:UIColorFromRGB(0x333333)];
+        _nameView.lineBreakMode = self.isSelf ? NSLineBreakByTruncatingHead : NSLineBreakByTruncatingTail;
+    }
+    return _nameView;
+}
+- (YYAnimatedImageView *)headWearImageView {
+    if (!_headWearImageView) {
+        _headWearImageView = [[YYAnimatedImageView alloc] init];
+        _headWearImageView.backgroundColor = [UIColor clearColor];
+        _headWearImageView.contentMode = UIViewContentModeScaleAspectFit;
+    }
+    return _headWearImageView;
+}
+- (SpriteSheetImageManager *)manager {
+    if (!_manager) {
+        _manager = [[SpriteSheetImageManager alloc] init];
+    }
+    return _manager;
+}
+- (NetImageView *)experImage{
+    if(!_experImage){
+        _experImage = [NetImageView new];
+    }
+    return _experImage;
+}
+- (NetImageView *)charmImage{
+    if(!_charmImage){
+        _charmImage = [NetImageView new];
+    }
+    return _charmImage;
+}
+@end

YuMi/Modules/YMMessage/View/Session/Content/MessageContentGuildView.m

@@ -111,48 +111,53 @@
 }
 
 - (void)render:(MessageGuildModel *)model {
-	self.message = model.message;
+    self.message = model.message;
-	NIMCustomObject *obj = (NIMCustomObject *)model.message.messageObject;
+    NIMCustomObject *obj = (NIMCustomObject *)model.message.messageObject;
-	AttachmentModel * attach = obj.attachment;
+    AttachmentModel * attach = (AttachmentModel *)obj.attachment;
-	self.attachment = attach;
+    self.attachment = attach;
-	GuildMessageModel * info;
+    GuildMessageModel * info;
-	if (model.message.localExt) {
+    if (model.message.localExt) {
-		info = [GuildMessageModel modelWithDictionary:model.message.localExt];
+        info = [GuildMessageModel modelWithDictionary:model.message.localExt];
-	} else {
+    } else {
-		info = [GuildMessageModel modelWithDictionary:attach.data];
+        info = [GuildMessageModel modelWithDictionary:attach.data];
-	}
+    }
-	self.messageInfo = info;
+    self.messageInfo = info;
-	self.titleLabel.text = info.layout.title.content;
+    self.titleLabel.text = info.layout.title.content;
-	self.titleLabel.font = [UIFont systemFontOfSize:info.layout.title.fontSize weight:info.layout.title.fontBold?UIFontWeightBold:UIFontWeightRegular];
+    self.titleLabel.font = [UIFont systemFontOfSize:info.layout.title.fontSize weight:info.layout.title.fontBold?UIFontWeightBold:UIFontWeightRegular];
-	NSMutableAttributedString *attr = [[NSMutableAttributedString alloc]init];
+    NSMutableAttributedString *attr = [[NSMutableAttributedString alloc]init];
-	GuildMessageLayoutModel *layout = info.layout;
+    GuildMessageLayoutModel *layout = info.layout;
-	for (GuildMessageLayoutInfoModel *params in layout.contents) {
+    for (GuildMessageLayoutInfoModel *params in layout.contents) {
-		if (params.content.length > 0) {
+        if (params.content.length > 0) {
-			if ([params.content containsString:@"/r/n"]) {
+            if ([params.content containsString:@"/r/n"]) {
-				params.content = @"\r\n";
+                params.content = @"\r\n";
-			}
+            }
-			NSMutableAttributedString *subAttr = [[NSMutableAttributedString alloc]initWithString:params.content];
+            NSMutableAttributedString *subAttr = [[NSMutableAttributedString alloc]initWithString:params.content];
-			if (params.fontSize > 0) {
+            if (params.fontSize > 0) {
-				[subAttr addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:params.fontSize weight:params.fontBold?UIFontWeightBold:UIFontWeightRegular] range:NSMakeRange(0, subAttr.length)];
+                [subAttr addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:params.fontSize weight:params.fontBold?UIFontWeightBold:UIFontWeightRegular] range:NSMakeRange(0, subAttr.length)];
-			}
+            }
-
+            
-			if (params.fontColor.length > 0) {
+            if (params.fontColor.length > 0) {
-				[subAttr addAttribute:NSForegroundColorAttributeName value:[DJDKMIMOMColor colorWithHexString:params.fontColor] range:NSMakeRange(0, subAttr.length)];
+                [subAttr addAttribute:NSForegroundColorAttributeName value:[DJDKMIMOMColor colorWithHexString:params.fontColor] range:NSMakeRange(0, subAttr.length)];
-			}
+            }
-			[attr appendAttributedString:subAttr];
+            [attr appendAttributedString:subAttr];
-		}
+        }
-	}
+    }
-	attr.yy_lineSpacing = 5;
+    attr.yy_lineSpacing = 5;
-	self.contentLabel.attributedText = attr;
+    self.contentLabel.attributedText = attr;
-	self.contentLabel.textAlignment = NSTextAlignmentCenter;
+    self.contentLabel.textAlignment = NSTextAlignmentCenter;
-	CGSize maxSize = CGSizeMake(MESSAGE_MAX_WIDTH - MESSAGE_TEXT_PADDING * 2, CGFLOAT_MAX);
+    CGSize maxSize = CGSizeMake(MESSAGE_MAX_WIDTH - MESSAGE_TEXT_PADDING * 2, CGFLOAT_MAX);
-	YYTextLayout * contentLayout = [YYTextLayout layoutWithContainerSize:maxSize text:attr];
+    YYTextLayout * contentLayout = [YYTextLayout layoutWithContainerSize:maxSize text:attr];
-	CGFloat contentHeight = contentLayout.textBoundingSize.height + 5;
+    CGFloat contentHeight = contentLayout.textBoundingSize.height + 5;
-	///顶部的距离 20  title的高度15 title到content的高度15
+    ///顶部的距离 20  title的高度15 title到content的高度15
-	[self.contentView mas_updateConstraints:^(MASConstraintMaker *make) {
+    [self.contentView mas_updateConstraints:^(MASConstraintMaker *make) {
-		make.height.mas_equalTo(contentHeight + 20+ 15 + 15);
+        make.height.mas_equalTo(contentHeight + 20+ 15 + 15);
-	}];
+    }];
-	BOOL isCommonNotice = (attach.second == Custom_Message_Sub_Hall_Notice || attach.second == Custom_Message_Sub_Hall_Become_Hall);
+    BOOL isCommonNotice ;
+    if(attach.first == CustomMessageType_Hall){
+        isCommonNotice = (attach.second == Custom_Message_Sub_Hall_Notice || attach.second == Custom_Message_Sub_Hall_Become_Hall);
+    }else{
+        isCommonNotice = !(attach.second == Custom_Message_Sub_New_Hall_Invite || attach.second == Custom_Message_Sub_New_Hall_Apply);
+    }
 	if (!isCommonNotice) {
 		self.controlStackView.hidden = NO;
 		if (info.msgStatus == 0) {
@@ -235,7 +240,7 @@
 		[params safeSetObject:[AccountInfoStorage instance].getUid forKey:@"uid"];
 		///0拒绝 1同意
 		NSString * type = sender.tag == 1000? @"0" : @"1";
-		if (self.attachment.second == Custom_Message_Sub_Hall_Apply_Join || self.attachment.second == Custom_Message_Sub_Hall_Manager_Invite || self.attachment.second == Custom_Message_Sub_Hall_Apply_Exit) {
+		if (self.attachment.second == Custom_Message_Sub_Hall_Apply_Join || self.attachment.second == Custom_Message_Sub_Hall_Manager_Invite || self.attachment.second == Custom_Message_Sub_Hall_Apply_Exit || self.attachment.second == Custom_Message_Sub_New_Hall_Invite || self.attachment.second == Custom_Message_Sub_New_Hall_Apply) {
 			if (self.attachment.second != Custom_Message_Sub_Hall_Apply_Exit) {
 				[params setObject:type forKey:@"type"];
 			}

YuMi/Modules/YMMessage/View/Session/Content/MessageContentHeadLinesText.h

@@ -1,16 +0,0 @@
-//
-//  MessageContentHeadLinesText.h
-//  YuMi
-//
-//  Created by duoban on 2024/5/9.
-//
-
-#import <UIKit/UIKit.h>
-#import "MessageBaseModel.h"
-NS_ASSUME_NONNULL_BEGIN
-
-@interface MessageContentHeadLinesText : UIView
-- (void)render:(nonnull MessageBaseModel *)model;
-@end
-
-NS_ASSUME_NONNULL_END

YuMi/Modules/YMMessage/View/Session/Content/MessageContentHeadLinesText.m

@@ -1,342 +0,0 @@
-//
-//  MessageContentHeadLinesText.m
-//  YuMi
-//
-//  Created by duoban on 2024/5/9.
-//
-
-#import "MessageContentHeadLinesText.h"
-#import "DJDKMIMOMColor.h"
-#import "NSObject+MJExtension.h"
-#import "QEmotionHelper.h"
-#import <NIMSDK/NIMSDK.h>
-#import <Masonry/Masonry.h>
-#import "SpriteSheetImageManager.h"
-#import "MessageHeadlinesTextModel.h"
-#import "XPMessageRemoteExtModel.h"
-
-#define MESSAGE_TEXT_PADDING 10
-@interface MessageContentHeadLinesText()
-/**
- 消息文本
- */
-@property (nonatomic, strong) YYLabel * messageText;
-@property (nonatomic, strong) YYLabel * rightMessageText;
-///当前的消息
-@property (nonatomic,strong) NIMMessage *message;
-
-///头饰
-@property (nonatomic,strong) YYAnimatedImageView *headWearImageView;
-///头饰
-@property (nonatomic,strong) YYAnimatedImageView *rightHeadWearImageView;
-///头饰播放
-@property (nonatomic, strong) SpriteSheetImageManager *manager;
-
-/**
- 左侧头像（私聊对象）
- */
-@property (nonatomic, strong) NetImageView * leftAvatar;
-/**
- 右侧头像（自己）
- */
-@property (nonatomic, strong) NetImageView * rightAvatar;
-@property(nonatomic,strong) YYLabel *leftNameView;
-
-@property(nonatomic,strong) UIImageView *leftBgImage;
-@property(nonatomic,strong) UIImageView *rightBgImage;
-///气泡
-@property (nonatomic,strong) NetImageView *leftBubbleImageView;
-///气泡
-@property (nonatomic,strong) NetImageView *rightBubbleImageView;
-@end
-@implementation MessageContentHeadLinesText
-
-- (instancetype)initWithFrame:(CGRect)frame {
-    self = [super initWithFrame:frame];
-    if (self) {
-        [self addSubview:self.leftAvatar];
-        [self addSubview:self.headWearImageView];
-        [self addSubview:self.rightAvatar];
-        [self addSubview:self.rightHeadWearImageView];
-        [self addSubview:self.leftNameView];
-        [self addSubview:self.leftBgImage];
-        [self addSubview:self.rightBgImage];
-        [self addSubview:self.leftBubbleImageView];
-        [self addSubview:self.rightBubbleImageView];
-        [self.leftBgImage addSubview:self.messageText];
-        [self.rightBgImage addSubview:self.rightMessageText];
-        
-        [self.leftAvatar mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.leading.mas_equalTo(kGetScaleWidth(15));
-            make.width.height.mas_equalTo(kGetScaleWidth(48));
-            make.top.mas_equalTo(kGetScaleWidth(10));
-        }];
-        [self.headWearImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.edges.equalTo(self.leftAvatar).with.insets(UIEdgeInsetsMake(-kGetScaleWidth(10),-kGetScaleWidth(10),-kGetScaleWidth(10),-kGetScaleWidth(10)));
-        }];
-        [self.leftNameView mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.top.mas_equalTo(kGetScaleWidth(21));
-            make.height.mas_equalTo(kGetScaleWidth(14));
-            make.leading.mas_equalTo(kGetScaleWidth(71.5));
-            make.width.mas_lessThanOrEqualTo(kGetScaleWidth(240));
-            
-        }];
-        [self.rightAvatar mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.top.width.height.equalTo(self.leftAvatar);
-            make.trailing.mas_equalTo(-kGetScaleWidth(15));
-        }];
-        [self.rightHeadWearImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.edges.equalTo(self.rightAvatar).with.insets(UIEdgeInsetsMake(-kGetScaleWidth(10),-kGetScaleWidth(10),-kGetScaleWidth(10),-kGetScaleWidth(10)));
-        }];
-        [self.leftBgImage mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.leading.mas_equalTo(kGetScaleWidth(72));
-            make.width.mas_equalTo(kGetScaleWidth(52));
-            make.height.mas_equalTo(kGetScaleWidth(36));
-            make.top.mas_equalTo(kGetScaleWidth(45));
-        }];
-        [self.rightBgImage mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.trailing.mas_equalTo(-kGetScaleWidth(72));
-            make.top.mas_equalTo(kGetScaleWidth(21));
-            make.width.mas_equalTo(kGetScaleWidth(52));
-            make.height.mas_greaterThanOrEqualTo(kGetScaleWidth(36));
-        }];
-        
-        
-        [self.leftBubbleImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.edges.equalTo(self.leftBgImage);
-        }];
-        [self.messageText mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.edges.equalTo(self.leftBgImage).with.insets(UIEdgeInsetsMake(kGetScaleWidth(10),kGetScaleWidth(10),kGetScaleWidth(10),kGetScaleWidth(10)));
-        }];
-        [self.rightBubbleImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.edges.equalTo(self.rightBgImage);
-
-        }];
-     
-        [self.rightMessageText mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.edges.equalTo(self.rightBgImage).with.insets(UIEdgeInsetsMake(kGetScaleWidth(10),kGetScaleWidth(10),kGetScaleWidth(10),kGetScaleWidth(10)));
-           
-        }];
-        self.leftAvatar.hidden = YES;
-        self.leftNameView.hidden = YES;
-        self.leftBgImage.hidden = YES;
-        self.headWearImageView.hidden = YES;
-        self.messageText.hidden = YES;
-        self.leftBubbleImageView.hidden = YES;
-        self.rightAvatar.hidden = YES;
-        self.rightBgImage.hidden = YES;
-        self.rightHeadWearImageView.hidden = YES;
-        self.rightBubbleImageView.hidden = YES;
-        self.rightMessageText.hidden = YES;
-    }
-    return self;
-}
-
-- (void)render:(nonnull MessageBaseModel *)model {
-    self.message = model.message;
-    
-   
-    MessageHeadlinesTextModel * textModel = (MessageHeadlinesTextModel *)model;
-    XPMessageRemoteExtModel *extModel = textModel.extModel;
-    if(extModel == nil)return;
-    self.leftAvatar.hidden = YES;
-    self.leftNameView.hidden = YES;
-    self.leftBgImage.hidden = YES;
-    self.headWearImageView.hidden = YES;
-    self.messageText.hidden = YES;
-    self.leftBubbleImageView.hidden = YES;
-    self.rightAvatar.hidden = YES;
-    self.rightBgImage.hidden = YES;
-    self.rightHeadWearImageView.hidden = YES;
-    self.rightBubbleImageView.hidden = YES;
-    self.rightMessageText.hidden = YES;
-    if(textModel.isSelf){
-        [self.rightBgImage mas_remakeConstraints:^(MASConstraintMaker *make) {
-            make.trailing.mas_equalTo(-kGetScaleWidth(72));
-            make.top.mas_equalTo(kGetScaleWidth(21));
-            make.width.mas_equalTo(textModel.width);
-            make.height.mas_equalTo(textModel.imageHeight);
-        }];
-        self.rightAvatar.hidden = NO;
-        self.rightBgImage.hidden = NO;
-        self.rightHeadWearImageView.hidden = NO;
-        self.rightBubbleImageView.hidden = NO;
-        self.rightMessageText.hidden = NO;
-        self.rightAvatar.image = nil;
-        [self.rightAvatar loadImageWithUrl:extModel.avatar completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) {
-            self.rightAvatar.image = image;
-        }];
-        self.rightMessageText.attributedText = textModel.textAttribute;
-        self.rightBubbleImageView.image = nil;
-        
-        self.rightBgImage.image = [self resizableImage:kImage(@"ms_message_headlines_text_right")];
-        [self.rightBubbleImageView loadImageWithUrl:extModel.iosBubbleUrl completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) {
-            self.rightBgImage.image = nil;
-            UIImage *image1 = [UIImage imageWithCGImage:image.CGImage scale:2.0 orientation:UIImageOrientationUp];
-            self.rightBubbleImageView.image = [self resizableImage:image1];
-        }];
-        NSString *headwearUrl = extModel.headwearUrl;
-        if (headwearUrl.length > 0) {
-            NSURL *url = [NSURL URLWithString:headwearUrl];
-            @kWeakify(self);
-            [self.manager loadSpriteSheetImageWithURL:url completionBlock:^(YYSpriteSheetImage * _Nullable sprit) {
-                @kStrongify(self);
-                self.rightHeadWearImageView.image = sprit;
-            } failureBlock:^(NSError * _Nullable error) {
-            }];
-        }
-        return;
-        
-    }
-    [self.leftBgImage mas_remakeConstraints:^(MASConstraintMaker *make) {
-        make.leading.mas_equalTo(kGetScaleWidth(72));
-        make.width.mas_equalTo(textModel.width);
-        make.height.mas_equalTo(textModel.imageHeight);
-        make.top.mas_equalTo(kGetScaleWidth(45));
-    }];
-    NSString *headwearUrl = extModel.headwearUrl;
-    if (headwearUrl.length > 0) {
-        NSURL *url = [NSURL URLWithString:headwearUrl];
-        @kWeakify(self);
-        [self.manager loadSpriteSheetImageWithURL:url completionBlock:^(YYSpriteSheetImage * _Nullable sprit) {
-            @kStrongify(self);
-            self.headWearImageView.image = sprit;
-        } failureBlock:^(NSError * _Nullable error) {
-        }];
-    }
-    self.leftAvatar.hidden = NO;
-    self.leftNameView.hidden = NO;
-    self.leftBgImage.hidden = NO;
-    self.headWearImageView.hidden = NO;
-    self.messageText.hidden = NO;
-    self.leftBubbleImageView.hidden = NO;
-    self.leftAvatar.image = nil;
-    [self.leftAvatar loadImageWithUrl:extModel.avatar completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) {
-        self.leftAvatar.image = image;
-    }];
-    self.leftBgImage.image = [self resizableImage:kImage(@"ms_message_headlines_text_left")];
-    self.messageText.textColor = [UIColor whiteColor];
-    [self.leftBubbleImageView loadImageWithUrl:extModel.iosBubbleUrl completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) {
-        self.leftBgImage.image = nil;
-        self.messageText.textColor = UIColorFromRGB(0x333333);
-        UIImage *image1 = [UIImage imageWithCGImage:image.CGImage scale:2.0 orientation:UIImageOrientationUp];
-        self.leftBubbleImageView.image = [self resizableImage:image1];
-    }];
-    self.leftNameView.attributedText = textModel.nameAtt;
-    self.messageText.attributedText = textModel.textAttribute;
-}
-- (UIImage*)resizableImage:(UIImage *)image {
-    //图片拉伸区域
-    CGFloat top = (image.size.height - 1) / 2;
-    CGFloat left = (image.size.width - 1) / 2;
-    CGFloat right = (image.size.width - 1) / 2;
-    CGFloat bottom = (image.size.height - 1) / 2;
-    return [image resizableImageWithCapInsets:UIEdgeInsetsMake(top, left, bottom, right) resizingMode:UIImageResizingModeStretch];
-}
-- (NetImageView *)leftAvatar{
-    if(!_leftAvatar){
-        NetImageConfig *config = [NetImageConfig new];
-        config.placeHolder = [UIImageConstant defaultAvatarPlaceholder];
-        _leftAvatar = [[NetImageView alloc]initWithConfig:config];
-        _leftAvatar.layer.cornerRadius = kGetScaleWidth(48)/2;
-        _leftAvatar.layer.masksToBounds = YES;
-    }
-    return _leftAvatar;
-}
-- (NetImageView *)rightAvatar{
-    if(!_rightAvatar){
-        NetImageConfig *config = [NetImageConfig new];
-        config.placeHolder = [UIImageConstant defaultAvatarPlaceholder];
-        _rightAvatar = [[NetImageView alloc]initWithConfig:config];
-        _rightAvatar.layer.cornerRadius = kGetScaleWidth(48)/2;
-        _rightAvatar.layer.masksToBounds = YES;
-    }
-    return _rightAvatar;
-}
-- (YYLabel *)leftNameView{
-    if(!_leftNameView){
-        _leftNameView = [YYLabel new];
-    }
-    return _leftNameView;
-}
-
-- (UIImageView *)leftBgImage{
-    if(!_leftBgImage){
-        _leftBgImage = [UIImageView new];
-        _leftBgImage.image = [self resizableImage:kImage(@"ms_message_headlines_text_left")];
-    }
-    return _leftBgImage;
-}
-- (UIImageView *)rightBgImage{
-    if(!_rightBgImage){
-        _rightBgImage = [UIImageView new];
-        _rightBgImage.image = [self resizableImage:kImage(@"ms_message_headlines_text_right")];
-    }
-    return _rightBgImage;
-}
-- (NetImageView *)leftBubbleImageView{
-    if(!_leftBubbleImageView){
-        _leftBubbleImageView = [[NetImageView alloc] init];
-       
-    }
-    return _leftBubbleImageView;
-}
-- (NetImageView *)rightBubbleImageView{
-    if(!_rightBubbleImageView){
-        _rightBubbleImageView = [[NetImageView alloc] init];
-
-   
-      
-    }
-    return _rightBubbleImageView;
-}
-- (YYLabel *)messageText {
-    if (!_messageText) {
-        _messageText = [[YYLabel alloc]initWithFrame:CGRectZero];
-        _messageText.preferredMaxLayoutWidth = kGetScaleWidth(240);
-        _messageText.textColor = DJDKMIMOMColor.mainTextColor;
-        _messageText.numberOfLines = 0;
-        _messageText.font = kFontMedium(14);
-        _messageText.textColor = [UIColor whiteColor];
-        _messageText.textAlignment = NSTextAlignmentLeft;
-        _messageText.userInteractionEnabled = YES;
-    }
-    return  _messageText;
-}
-- (YYLabel *)rightMessageText{
-    if(!_rightMessageText){
-        _rightMessageText = [[YYLabel alloc]initWithFrame:CGRectZero];
-        _rightMessageText.preferredMaxLayoutWidth = kGetScaleWidth(240);
-        _rightMessageText.textColor = DJDKMIMOMColor.mainTextColor;
-        _rightMessageText.numberOfLines = 0;
-        _rightMessageText.font = kFontMedium(14);
-        _rightMessageText.textColor =  UIColorFromRGB(0x333333);
-        _rightMessageText.textAlignment = NSTextAlignmentLeft;
-        _rightMessageText.userInteractionEnabled = YES;
-    }
-    return _rightMessageText;
-}
-- (YYAnimatedImageView *)headWearImageView {
-    if (!_headWearImageView) {
-        _headWearImageView = [[YYAnimatedImageView alloc] init];
-        _headWearImageView.backgroundColor = [UIColor clearColor];
-        _headWearImageView.contentMode = UIViewContentModeScaleAspectFit;
-    }
-    return _headWearImageView;
-}
-- (YYAnimatedImageView *)rightHeadWearImageView {
-    if (!_rightHeadWearImageView) {
-        _rightHeadWearImageView = [[YYAnimatedImageView alloc] init];
-        _rightHeadWearImageView.backgroundColor = [UIColor clearColor];
-        _rightHeadWearImageView.contentMode = UIViewContentModeScaleAspectFit;
-    }
-    return _rightHeadWearImageView;
-}
-- (SpriteSheetImageManager *)manager {
-    if (!_manager) {
-        _manager = [[SpriteSheetImageManager alloc] init];
-    }
-    return _manager;
-}
-
-@end

YuMi/Modules/YMMessage/View/Session/Content/MessageContentMonentsView.m

@@ -76,15 +76,6 @@
 	XPMonentsDetailViewController * detailView = [[XPMonentsDetailViewController alloc] init];
 	detailView.monentsInfo = self.monents;
 	[[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:detailView animated:YES];
-    if ([ClientConfig shareConfig].canOpen) {
-        XPMonentsDetailViewController * detailView = [[XPMonentsDetailViewController alloc] init];
-        detailView.monentsInfo = self.monents;
-        [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:detailView animated:YES];
-    }else{
-        XPMomentsSimpleDetailViewController * detailView = [[XPMomentsSimpleDetailViewController alloc] init];
-        detailView.monentsInfo = self.monents;
-        [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:detailView animated:YES];
-    }
 }
 
 - (void)render:(MessageBaseModel *)message {

YuMi/Modules/YMMessage/View/Session/Content/MessageContentTextClickable.m

@@ -28,7 +28,7 @@
 
 #import "XPIAPRechargeViewController.h"
 #import "XPMineUserInfoViewController.h"
-#import "XPMineSimpleUserInfoViewController.h"
+
 #import "XPMineDressUpViewController.h"
 #import "XPDressUpShopViewController.h"
 #import "XPMineLoginPasswordViewController.h"
@@ -152,16 +152,9 @@
 		case SecretaryRouterType_UserInfo:
 		{
 			if (value.length > 0) {
-				
+                XPMineUserInfoViewController * userInfoVC = [[XPMineUserInfoViewController alloc] init];
-                if ([ClientConfig shareConfig].canOpen) {
+                userInfoVC.uid = value.integerValue;
-                    XPMineUserInfoViewController * userInfoVC = [[XPMineUserInfoViewController alloc] init];
+                [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:userInfoVC animated:YES];
-                    userInfoVC.uid = value.integerValue;
-                    [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:userInfoVC animated:YES];
-                }else{
-                    XPMineSimpleUserInfoViewController * userInfoVC = [[XPMineSimpleUserInfoViewController alloc] init];
-                    userInfoVC.uid = value.integerValue;
-                    [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:userInfoVC animated:YES];
-                }
 			}
 		}
 			break;

YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MSSessionPublicChatHalImageModel.h

@@ -10,7 +10,6 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface MSSessionPublicChatHalImageModel : MessageBaseModel
-@property(nonatomic,strong) NSMutableAttributedString *nameAtt;
 @property(nonatomic,assign) BOOL isSelf ;
 @property(nonatomic,strong) XPMessageRemoteExtModel *extModel;
 @property (nonatomic,strong) UIImage *image;

YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MSSessionPublicChatHalImageModel.m

@@ -15,17 +15,6 @@
         XPMessageRemoteExtModel *extModel = [XPMessageRemoteExtModel modelWithJSON:message.remoteExt[message.from]];
         self.extModel = extModel;
         self.isSelf = [[NIMSDK sharedSDK].loginManager.currentAccount isEqualToString:message.from];
-        NSString *name = extModel.nick.length > 6 ? [NSString stringWithFormat:@"%@...",[extModel.nick substringToIndex:6]] : extModel.nick;
-        self.nameAtt = [self createTextAttribute:name color:UIColorFromRGB(0x333333) font:kFontBold(14)];
-        [self.nameAtt appendAttributedString:[self createSapceAttribute:2]];
-        if (extModel.experUrl) {
-            [self.nameAtt appendAttributedString:[self createUrlImageAttribute:extModel.experUrl size:CGSizeMake(kGetScaleWidth(36), kGetScaleWidth(18))]];
-            [self.nameAtt appendAttributedString:[self createSapceAttribute:2]];
-        }
-        if (extModel.charmUrl) {
-            [self.nameAtt appendAttributedString:[self createUrlImageAttribute:extModel.charmUrl size:CGSizeMake(kGetScaleWidth(36), kGetScaleWidth(18))]];
-            [self.nameAtt appendAttributedString:[self createSapceAttribute:2]];
-        }
         NIMImageObject * imageObject = (NIMImageObject*)message.messageObject;
         CGFloat attachmentImageMinWidth  = (MESSAGE_IMAGE_Min_SIZE);
         CGFloat attachmentImageMinHeight = (MESSAGE_IMAGE_Min_SIZE);

YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageGuildModel.m

@@ -17,7 +17,7 @@
 	if (self = [super initWithMessage:message]) {
 		self.messageType = SessionMessageType_Custom;
 		NIMCustomObject *obj = (NIMCustomObject *)message.messageObject;
-		AttachmentModel * attach = obj.attachment;
+		AttachmentModel * attach = (AttachmentModel *)obj.attachment;
 		GuildMessageModel * info = [GuildMessageModel modelWithDictionary:attach.data];
 		NSMutableAttributedString *attr = [[NSMutableAttributedString alloc]init];
 		GuildMessageLayoutModel *layout = info.layout;

YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageHeadlinesTextModel.h

@@ -12,7 +12,6 @@ NS_ASSUME_NONNULL_BEGIN
 @interface MessageHeadlinesTextModel : MessageBaseModel
 ///富文本
 @property (nonatomic,strong) NSAttributedString *textAttribute;
-@property(nonatomic,strong) NSMutableAttributedString *nameAtt;
 @property(nonatomic,assign) BOOL isSelf ;
 @property(nonatomic,strong) XPMessageRemoteExtModel *extModel;
 @property(nonatomic,assign) CGFloat width;