molistar商店包版本修改 此commit置顶 1.0.3

# Conflicts:
#	YuMi/Modules/YMTabbar/View/TabbarViewController.m
#	YuMi/Tools/File/UploadFile.m

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 */; };
@@ -214,6 +211,7 @@
 		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 */; };
@@ -365,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 */; };
@@ -494,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 */; };
@@ -557,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 */; };
@@ -956,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 */; };
@@ -1186,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 */; };
@@ -1219,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 */; };
@@ -1385,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 */; };
@@ -1585,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>"; };
@@ -1595,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>"; };
@@ -1951,6 +1947,8 @@
 		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>"; };
@@ -2243,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>"; };
@@ -2484,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>"; };
@@ -2610,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>"; };
@@ -3251,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>"; };
@@ -3739,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>"; };
@@ -3807,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>"; };
@@ -4151,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>"; };
@@ -4995,6 +5000,7 @@
 				23E9E9AB2A81E8E900B792F2 /* Event */,
 				E83645A42A40AEF600E0DBE4 /* Bundle */,
 				E83645652A40A2CA00E0DBE4 /* CardManager */,
+				234E50AC2BF734FC005CB6D5 /* NSTextAttachment */,
 				1427213629A75F6F00C7C423 /* CocoaHttpServer */,
 				E8F61356291E269700E12650 /* Safe */,
 				9B09979F27F19D1C00EB8F14 /* QGVAPlayer */,
@@ -5590,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 = (
@@ -5966,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 = (
@@ -7538,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 */,
@@ -7974,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 */,
@@ -8029,6 +8055,8 @@
 				E84BF7DC277C765400EF8877 /* XPRoomRoleEmptyTableViewCell.m */,
 				E89BD7D2277D471100E31B19 /* XPRoomOnlineTableViewCell.h */,
 				E89BD7D3277D471100E31B19 /* XPRoomOnlineTableViewCell.m */,
+				239D0FB12BFD8C67002977CE /* MSRoomSetingBackdropCell.h */,
+				239D0FB22BFD8C67002977CE /* MSRoomSetingBackdropCell.m */,
 			);
 			path = Cell;
 			sourceTree = "<group>";
@@ -9235,8 +9263,6 @@
 		E87E62522A3F55B2002F68C9 /* View */ = {
 			isa = PBXGroup;
 			children = (
-				E87DF4DF2A42CA92009C1185 /* XPHomeSloganViewController.h */,
-				E87DF4DE2A42CA92009C1185 /* XPHomeSloganViewController.m */,
 				E87DF4B82A42C7BB009C1185 /* Search */,
 				E87E625F2A3F5669002F68C9 /* Cell */,
 				E87E625E2A3F565D002F68C9 /* CustomView */,
@@ -9492,8 +9518,6 @@
 				E8D34D6328084E40009C4835 /* XPMineUserInfoGiftWallViewController.m */,
 				E8998D892859CB6A00C68558 /* XPMineUserInfoGiftWallSubViewController.h */,
 				E8998D8A2859CB6A00C68558 /* XPMineUserInfoGiftWallSubViewController.m */,
-				1464C5EB29A4784F00AF7C94 /* XPMineSimpleUserInfoViewController.h */,
-				1464C5EC29A4784F00AF7C94 /* XPMineSimpleUserInfoViewController.m */,
 				1464C5EE29A49DDD00AF7C94 /* XPMineSimpleUserInfoHeaderView.h */,
 				1464C5EF29A49DDD00AF7C94 /* XPMineSimpleUserInfoHeaderView.m */,
 			);
@@ -9686,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 */,
@@ -9911,6 +9936,7 @@
 		E8AEAED8271413530017FCE0 /* View */ = {
 			isa = PBXGroup;
 			children = (
+				239D0F932BFB3284002977CE /* MSRoomOnLineView */,
 				E880B396278BD3D800A83B0D /* AcrossRoomPK */,
 				E8AEAEE527141ACC0017FCE0 /* ActivityContainerView */,
 				9B7D904A287BC4FC0033A45E /* AnchorCycleView */,
@@ -10000,18 +10026,18 @@
 		E8AEAEE727141ACC0017FCE0 /* BaseUIContainerView */ = {
 			isa = PBXGroup;
 			children = (
-				E8AEAEEB27141AE20017FCE0 /* XPRoomBackContainerView.h */,
-				E8AEAEEC27141AE20017FCE0 /* XPRoomBackContainerView.m */,
-				E83953202769F33B00CF2F24 /* XPRoomFunctionContainerView.h */,
-				E83953212769F33B00CF2F24 /* XPRoomFunctionContainerView.m */,
-				E877A7EF27842B2F00EFACED /* XPRoomDatingWebAlertView.h */,
-				E877A7F027842B2F00EFACED /* XPRoomDatingWebAlertView.m */,
-				E877A7F227842EF800EFACED /* XPRoomDatingVipUpMicView.h */,
-				E877A7F327842EF800EFACED /* XPRoomDatingVipUpMicView.m */,
-				9B86D88128192DC000494FCD /* XPRoomRankEntranceView.h */,
-				9B86D88228192DC000494FCD /* XPRoomRankEntranceView.m */,
-				9B044D9B282D2A6400DE4859 /* XPRoomAnchorRankEnterView.h */,
-				9B044D9C282D2A6400DE4859 /* XPRoomAnchorRankEnterView.m */,
+				239D0F9F2BFCB88C002977CE /* XPRoomAnchorRankEnterView.h */,
+				239D0FA52BFCB88D002977CE /* XPRoomAnchorRankEnterView.m */,
+				239D0FA72BFCB88D002977CE /* XPRoomBackContainerView.h */,
+				239D0F9C2BFCB88C002977CE /* XPRoomBackContainerView.m */,
+				239D0FA02BFCB88D002977CE /* XPRoomDatingVipUpMicView.h */,
+				239D0FA12BFCB88D002977CE /* XPRoomDatingVipUpMicView.m */,
+				239D0F9D2BFCB88C002977CE /* XPRoomDatingWebAlertView.h */,
+				239D0FA22BFCB88D002977CE /* XPRoomDatingWebAlertView.m */,
+				239D0F9E2BFCB88C002977CE /* XPRoomFunctionContainerView.h */,
+				239D0FA32BFCB88D002977CE /* XPRoomFunctionContainerView.m */,
+				239D0FA62BFCB88D002977CE /* XPRoomRankEntranceView.h */,
+				239D0FA42BFCB88D002977CE /* XPRoomRankEntranceView.m */,
 			);
 			path = BaseUIContainerView;
 			sourceTree = "<group>";
@@ -10508,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 */,
@@ -11011,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 */,
@@ -11142,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 */,
@@ -11267,6 +11291,7 @@
 				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 */,
@@ -11317,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 */,
@@ -11356,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 */,
@@ -11372,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 */,
@@ -11537,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 */,
@@ -11574,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 */,
@@ -11632,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 */,
@@ -11643,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 */,
@@ -11723,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 */,
@@ -11866,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 */,
@@ -11939,7 +11963,6 @@
 				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 */,
@@ -12017,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 */,
@@ -12142,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 */,
@@ -12206,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 */,
@@ -12222,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 */,
@@ -12231,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 */,
@@ -12283,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 */,
@@ -12294,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 */,
@@ -12321,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 */,
@@ -12552,7 +12578,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 20.20.20;
+				MARKETING_VERSION = 20.20.21;
 				PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -12590,7 +12616,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 20.20.20;
+				MARKETING_VERSION = 20.20.21;
 				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/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/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 {
-	
-    self.canOpen = YES;
+    @kWeakify(self);
 	[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];
-        }else{
-            self.items = itemList;
-        }
-       
+        self.items = [NSMutableArray arrayWithArray:items];
         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.6"
+#define PI_App_Version @"1.0.7"
 ///渠道
 #define PI_App_Source @"appstore"
 #define PI_Test_Flight @"TestFlight"

YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m

@@ -30,6 +30,7 @@
 #import "XPLoginInputView.h"
 #import "XPLoginAraeViewController.h"
 #import "XPForgetPwdViewController.h"
+#import "PISwitchingEnvironmentVC.h"
 
 UIKIT_EXTERN NSString * const kYouMiNumberCountKey;
 NSString * const HadAgreePrivacy = @"HadAgreePrivacy";
@@ -111,6 +112,11 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy";
     [super viewDidLoad];
     [self createUI];
     [self racBind];
+#ifdef DEBUG
+    [self setSwitchingEnvironmentVC];
+#else
+#endif
+   
     self.selectType = 0;
     NSString *code = [NSString getCountryCode];
     self.pi_phoneAreaCode = [code stringByReplacingOccurrencesOfString:@"+" withString:@""];
@@ -347,7 +353,25 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy";
     }
     
 }
+-(void)setSwitchingEnvironmentVC{
+    UIButton *but = [UIButton new];
+    [but setTitle:@"切换环境" forState:UIControlStateNormal];
+    [but setTitleColor:[UIColor blueColor] forState:UIControlStateNormal];
+    [self.view addSubview:but];
+    [but addTarget:self action:@selector(switchingEnvironmentVCAction) forControlEvents:UIControlEventTouchUpInside];
+    [but mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.trailing.mas_equalTo(-kGetScaleWidth(30));
+        make.top.mas_equalTo(kStatusBarHeight+20);
+    }];
 
+}
+-(void)switchingEnvironmentVCAction{
+#ifdef DEBUG
+    PISwitchingEnvironmentVC *vc = [PISwitchingEnvironmentVC new];
+    [self.navigationController pushViewController:vc animated:YES];
+#else
+#endif
+}
 - (void)setConfigPrivacyAlertView {
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     NSString *isShow = [defaults objectForKey:kYouMiNumberCountKey];

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];
-            userInfoVC.uid = userInfo.uid.integerValue;
-            [[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];
-        }
+        XPMineUserInfoViewController * userInfoVC = [[XPMineUserInfoViewController 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/MessageCell.m

@@ -238,6 +238,10 @@
 	if (classStr) {
 		if (![self.messageContent isKindOfClass:NSClassFromString(classStr)]) {
 			self.messageContent = [[NSClassFromString(classStr) alloc] init];
+            if([self.messageContent isKindOfClass:[MessageContentCustomView class]]){
+                MessageContentCustomView *messageContent = (MessageContentCustomView *)self.messageContent;
+                messageContent.delegate = self;
+            }
 		}
 	} else {
 		NSAssert(classStr != nil, @"message should not be nil");

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

@@ -111,48 +111,53 @@
 }
 
 - (void)render:(MessageGuildModel *)model {
-	self.message = model.message;
-	NIMCustomObject *obj = (NIMCustomObject *)model.message.messageObject;
-	AttachmentModel * attach = obj.attachment;
-	self.attachment = attach;
-	GuildMessageModel * info;
-	if (model.message.localExt) {
-		info = [GuildMessageModel modelWithDictionary:model.message.localExt];
-	} else {
-		info = [GuildMessageModel modelWithDictionary:attach.data];
-	}
-	self.messageInfo = info;
-	self.titleLabel.text = info.layout.title.content;
-	self.titleLabel.font = [UIFont systemFontOfSize:info.layout.title.fontSize weight:info.layout.title.fontBold?UIFontWeightBold:UIFontWeightRegular];
-	NSMutableAttributedString *attr = [[NSMutableAttributedString alloc]init];
-	GuildMessageLayoutModel *layout = info.layout;
-	for (GuildMessageLayoutInfoModel *params in layout.contents) {
-		if (params.content.length > 0) {
-			if ([params.content containsString:@"/r/n"]) {
-				params.content = @"\r\n";
-			}
-			NSMutableAttributedString *subAttr = [[NSMutableAttributedString alloc]initWithString:params.content];
-			if (params.fontSize > 0) {
-				[subAttr addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:params.fontSize weight:params.fontBold?UIFontWeightBold:UIFontWeightRegular] range:NSMakeRange(0, subAttr.length)];
-			}
-
-			if (params.fontColor.length > 0) {
-				[subAttr addAttribute:NSForegroundColorAttributeName value:[DJDKMIMOMColor colorWithHexString:params.fontColor] range:NSMakeRange(0, subAttr.length)];
-			}
-			[attr appendAttributedString:subAttr];
-		}
-	}
-	attr.yy_lineSpacing = 5;
-	self.contentLabel.attributedText = attr;
-	self.contentLabel.textAlignment = NSTextAlignmentCenter;
-	CGSize maxSize = CGSizeMake(MESSAGE_MAX_WIDTH - MESSAGE_TEXT_PADDING * 2, CGFLOAT_MAX);
-	YYTextLayout * contentLayout = [YYTextLayout layoutWithContainerSize:maxSize text:attr];
-	CGFloat contentHeight = contentLayout.textBoundingSize.height + 5;
-	///顶部的距离 20  title的高度15 title到content的高度15
-	[self.contentView mas_updateConstraints:^(MASConstraintMaker *make) {
-		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);
+    self.message = model.message;
+    NIMCustomObject *obj = (NIMCustomObject *)model.message.messageObject;
+    AttachmentModel * attach = (AttachmentModel *)obj.attachment;
+    self.attachment = attach;
+    GuildMessageModel * info;
+    if (model.message.localExt) {
+        info = [GuildMessageModel modelWithDictionary:model.message.localExt];
+    } else {
+        info = [GuildMessageModel modelWithDictionary:attach.data];
+    }
+    self.messageInfo = info;
+    self.titleLabel.text = info.layout.title.content;
+    self.titleLabel.font = [UIFont systemFontOfSize:info.layout.title.fontSize weight:info.layout.title.fontBold?UIFontWeightBold:UIFontWeightRegular];
+    NSMutableAttributedString *attr = [[NSMutableAttributedString alloc]init];
+    GuildMessageLayoutModel *layout = info.layout;
+    for (GuildMessageLayoutInfoModel *params in layout.contents) {
+        if (params.content.length > 0) {
+            if ([params.content containsString:@"/r/n"]) {
+                params.content = @"\r\n";
+            }
+            NSMutableAttributedString *subAttr = [[NSMutableAttributedString alloc]initWithString:params.content];
+            if (params.fontSize > 0) {
+                [subAttr addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:params.fontSize weight:params.fontBold?UIFontWeightBold:UIFontWeightRegular] range:NSMakeRange(0, subAttr.length)];
+            }
+            
+            if (params.fontColor.length > 0) {
+                [subAttr addAttribute:NSForegroundColorAttributeName value:[DJDKMIMOMColor colorWithHexString:params.fontColor] range:NSMakeRange(0, subAttr.length)];
+            }
+            [attr appendAttributedString:subAttr];
+        }
+    }
+    attr.yy_lineSpacing = 5;
+    self.contentLabel.attributedText = attr;
+    self.contentLabel.textAlignment = NSTextAlignmentCenter;
+    CGSize maxSize = CGSizeMake(MESSAGE_MAX_WIDTH - MESSAGE_TEXT_PADDING * 2, CGFLOAT_MAX);
+    YYTextLayout * contentLayout = [YYTextLayout layoutWithContainerSize:maxSize text:attr];
+    CGFloat contentHeight = contentLayout.textBoundingSize.height + 5;
+    ///顶部的距离 20  title的高度15 title到content的高度15
+    [self.contentView mas_updateConstraints:^(MASConstraintMaker *make) {
+        make.height.mas_equalTo(contentHeight + 20+ 15 + 15);
+    }];
+    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,31 +240,36 @@
 		[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"];
 			}
 			[XNDJTDDLoadingTool showLoading];
 			[HttpRequestHelper POST:self.messageInfo.url params:params success:^(BaseModel * _Nonnull data) {
-				[XNDJTDDLoadingTool hideHUD];
-				NSString *code = [NSString stringWithFormat:@"%@", data.data[@"code"]];
-				BOOL isExpired = [code isEqualToString:@"90121"];
-				BOOL isHandled = [code isEqualToString:@"90122"];
-				MessageGuildState state = MessageGuildState_Untreated;
-				if (isExpired) {
-					state = MessageGuildState_OutData;
-				} else if(isHandled) {
-					state = MessageGuildState_Processed;
-				} else {
-					state = sender.tag == 1000 ? MessageGuildState_Reject : MessageGuildState_Agree;
-				}
-				self.messageInfo.msgStatus = state;
-				self.message.localExt = [self.messageInfo model2dictionary];
-				[[NIMSDK sharedSDK].conversationManager updateMessage:self.message forSession:self.message.session completion:^(NSError * _Nullable error) {
-					if (self.delegate && [self.delegate respondsToSelector:@selector(updateMessageSuccess:)]) {
-						[self.delegate updateMessageSuccess:self.message];
-					}
-				}];
+                [XNDJTDDLoadingTool hideHUD];
+                if(data.code == 200){
+                    NSString *code = [NSString stringWithFormat:@"%@", data.data[@"code"]];
+                    BOOL isExpired = [code isEqualToString:@"90121"];
+                    BOOL isHandled = [code isEqualToString:@"90122"];
+                    MessageGuildState state = MessageGuildState_Untreated;
+                    if (isExpired) {
+                        state = MessageGuildState_OutData;
+                    } else if(isHandled) {
+                        state = MessageGuildState_Processed;
+                    } else {
+                        state = sender.tag == 1000 ? MessageGuildState_Reject : MessageGuildState_Agree;
+                    }
+                    self.messageInfo.msgStatus = state;
+                    self.message.localExt = [self.messageInfo model2dictionary];
+                    [[NIMSDK sharedSDK].conversationManager updateMessage:self.message forSession:self.message.session completion:^(NSError * _Nullable error) {
+                        if (self.delegate && [self.delegate respondsToSelector:@selector(updateMessageSuccess:)]) {
+                            [self.delegate updateMessageSuccess:self.message];
+                        }
+                    }];
+                    return;
+                }
+				
+                [XNDJTDDLoadingTool showErrorWithMessage:data.message];
 			} failure:^(NSInteger resCode, NSString * _Nonnull message) {
 				[XNDJTDDLoadingTool hideHUD];
 				[XNDJTDDLoadingTool showErrorWithMessage:message];

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) {
-				
-                if ([ClientConfig shareConfig].canOpen) {
-                    XPMineUserInfoViewController * userInfoVC = [[XPMineUserInfoViewController alloc] init];
-                    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];
-                }
+                XPMineUserInfoViewController * userInfoVC = [[XPMineUserInfoViewController alloc] init];
+                userInfoVC.uid = value.integerValue;
+                [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:userInfoVC animated:YES];
 			}
 		}
 			break;

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/MSSessionPublicChatHallVC.m

@@ -897,7 +897,15 @@
  */
 - (void)emotionView:(QEmotionBoardView *)emotionView didSelectEmotion:(QEmotion *)emotion atIndex:(NSInteger)index {
     //把😊插入到输入栏
-    [_inputBarView insertEmotion:emotion.displayName];
+    UIFont *font = [UIFont systemFontOfSize:17.5];
+    NSTextAttachment * emotionAtt = [[NSTextAttachment alloc] init];
+    UIImage *iconImage = emotion.image;
+    emotionAtt.bounds = CGRectMake(0, roundf(font.capHeight - emotion.image.size.width)/2.f, emotion.image.size.width, emotion.image.size.height);
+    emotionAtt.image = iconImage;
+    emotionAtt.imageName = emotion.displayName;
+    NSAttributedString *emotionAttribute = [NSMutableAttributedString attributedStringWithAttachment:(NSTextAttachment *)emotionAtt];
+  
+    [_inputBarView insertEmotionAttributedString:emotionAttribute];
 }
 
 // 删除按钮的点击事件回调

YuMi/Modules/YMMessage/View/Session/SessionInfoViewController.m

@@ -28,7 +28,7 @@
 #import "SessionSettingUserView.h"
 #import "XPWebViewController.h"
 #import "XPMineUserInfoViewController.h"
-#import "XPMineSimpleUserInfoViewController.h"
+
 
 @interface SessionInfoViewController ()<UITableViewDelegate, UITableViewDataSource, SessionSettingTableViewCellDelegate>
 ///头部试图
@@ -88,16 +88,12 @@
 	if (self.datasource.count > 0) {
 		SessionSettingModel * model = [self.datasource safeObjectAtIndex1:indexPath.row];
 		if (model.settingType == SessionSettingType_report) {
-			if ([ClientConfig shareConfig].canOpen) {
-				[StatisticsServiceHelper trackEventWithKey:StatisticsServiceEvent_chat_set_report_click];
-				XPWebViewController *webVC = [[XPWebViewController alloc] init];
-				NSString *urlstr = [NSString stringWithFormat:@"%@?reportUid=%ld&source=CHAT",URLWithType(kReportRoomURL),self.userInfo.uid];
-				webVC.url = urlstr;
-				[self.navigationController pushViewController:webVC animated:YES];
-			} else {
-				[XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"SessionInfoViewController1")];
-			}
-
+            [StatisticsServiceHelper trackEventWithKey:StatisticsServiceEvent_chat_set_report_click];
+            XPWebViewController *webVC = [[XPWebViewController alloc] init];
+            webVC.url = [NSString stringWithFormat:@"%@?reportUid=%ld&source=CHAT",
+                         URLWithType(kReportRoomURL),
+                         self.userInfo.uid];
+            [self.navigationController pushViewController:webVC animated:YES];
 		}
 	}
 }
@@ -182,16 +178,9 @@
 #pragma mark - Event Response
 - (void)didTapUserRecognizer {
 	[StatisticsServiceHelper trackEventWithKey:StatisticsServiceEvent_chat_set_data_click];
-	
-    if ([ClientConfig shareConfig].canOpen) {
-        XPMineUserInfoViewController * mineVC = [[XPMineUserInfoViewController alloc] init];
-        mineVC.uid = self.userInfo.uid;
-        [self.navigationController pushViewController:mineVC animated:YES];
-    }else{
-        XPMineSimpleUserInfoViewController * mineVC = [[XPMineSimpleUserInfoViewController alloc] init];
-        mineVC.uid = self.userInfo.uid;
-        [self.navigationController pushViewController:mineVC animated:YES];
-    }
+    XPMineUserInfoViewController * mineVC = [[XPMineUserInfoViewController alloc] init];
+    mineVC.uid = self.userInfo.uid;
+    [self.navigationController pushViewController:mineVC animated:YES];
 }
 
 #pragma mark - Getters And Setters

YuMi/Modules/YMMessage/View/Session/SessionViewController.m

@@ -60,7 +60,7 @@
 #import "MessageTreasureFairyModel.h"
 ///View
 #import "XPMineUserInfoViewController.h"
-#import "XPMineSimpleUserInfoViewController.h"
+
 #import "XPRoomViewController.h"
 #import "RoomHostDelegate.h"
 #import "MessageCell.h"
@@ -249,7 +249,10 @@
 		model = [[MessageTextClickModel alloc] initWithMessage:message];
 	} else if(attachment.first == CustomMessageType_Hall) {
 		model = [[MessageGuildModel alloc] initWithMessage:message];
-	} else if(attachment.first == CustomMessageType_Member_Online && attachment.second == Custom_Message_Type_Attention_Member_Online) {
+	}else if(attachment.first == CustomMessageType_New_Hall) {
+        model = [[MessageGuildModel alloc] initWithMessage:message];
+        
+    } else if(attachment.first == CustomMessageType_Member_Online && attachment.second == Custom_Message_Type_Attention_Member_Online) {
 		model = [[MessageOpenLiveModel alloc] initWithMessage:message];
 	} else if(attachment.first == CustomMessageType_Application_Share && attachment.second == Custom_Message_Sub_Application_Share_Room) {
 		model = [[MessageOpenLiveModel alloc] initWithMessage:message];
@@ -510,16 +513,9 @@
 
 - (void)didTapAvatar:(NSString *)uid {
 	if (uid.length > 0 && ![NIMMessageUtils isOfficalAccount:uid]) {
-		
-        if ([ClientConfig shareConfig].canOpen) {
-            XPMineUserInfoViewController * infoVC = [[XPMineUserInfoViewController alloc] init];
-            infoVC.uid = uid.integerValue;
-            [[self getKeyWindowNav] pushViewController:infoVC animated:YES];
-        }else{
-            XPMineSimpleUserInfoViewController * infoVC = [[XPMineSimpleUserInfoViewController alloc] init];
-            infoVC.uid = uid.integerValue;
-            [[self getKeyWindowNav] pushViewController:infoVC animated:YES];
-        }
+        XPMineUserInfoViewController * infoVC = [[XPMineUserInfoViewController alloc] init];
+        infoVC.uid = uid.integerValue;
+        [[self getKeyWindowNav] pushViewController:infoVC animated:YES];
 	}
 }
 
@@ -1022,7 +1018,15 @@
  */
 - (void)emotionView:(QEmotionBoardView *)emotionView didSelectEmotion:(QEmotion *)emotion atIndex:(NSInteger)index {
 	//把😊插入到输入栏
-	[_inputBarView insertEmotion:emotion.displayName];
+    UIFont *font = [UIFont systemFontOfSize:17.5];
+    NSTextAttachment * emotionAtt = [[NSTextAttachment alloc] init];
+    UIImage *iconImage = emotion.image;
+    emotionAtt.bounds = CGRectMake(0, roundf(font.capHeight - emotion.image.size.width)/2.f, emotion.image.size.width, emotion.image.size.height);
+    emotionAtt.image = iconImage;
+    emotionAtt.imageName = emotion.displayName;
+    NSAttributedString *emotionAttribute = [NSMutableAttributedString attributedStringWithAttachment:(NSTextAttachment *)emotionAtt];
+  
+    [_inputBarView insertEmotionAttributedString:emotionAttribute];
 }
 
 // 删除按钮的点击事件回调

YuMi/Modules/YMMessage/View/SessionList/SessionListCell.m

@@ -47,6 +47,8 @@
 
 - (void)renderWithSession:(NIMRecentSession *)recent {
     NIMUser *user = [[NIMSDK sharedSDK].userManager userInfo:recent.session.sessionId];
+    self.avatarImageView.image = nil;
+    self.nameLabel.text = @"";
 	if (user.userInfo == nil) {
 		NSString * uid = recent.session.sessionId;
 		if (uid > 0) {
@@ -56,7 +58,9 @@
 					NIMUser * userInfo = users.firstObject;
 					self.nameLabel.text = userInfo.userInfo.nickName;
 					NSString *avatarUrl = userInfo.userInfo.avatarUrl;
-					self.avatarImageView.imageUrl = avatarUrl;
+                    [self.avatarImageView loadImageWithUrl:avatarUrl completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) {
+                        self.avatarImageView.image = image;
+                    }];
 					[self.nameLabel sizeToFit];
 				}
 			}];
@@ -64,7 +68,9 @@
 	} else {
 		NSString *avatarUrl = user.userInfo.avatarUrl;
 		self.nameLabel.text = user.userInfo.nickName;
-		self.avatarImageView.imageUrl = avatarUrl;
+        [self.avatarImageView loadImageWithUrl:avatarUrl completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) {
+            self.avatarImageView.image = image;
+        }];
 		[self.nameLabel sizeToFit];
 	}
     NSString *messageTitle = [NIMMessageUtils messageContent:recent.lastMessage];

YuMi/Modules/YMMine/Presenter/XPMinePresent.m

@@ -67,8 +67,8 @@
 		[[self getView]onGetClanDetailInfofail];
 		return;
 	}
-	[Api getClanDetailInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) {
-		ClanDetailInfoModel * clanDetailInfo = [ClanDetailInfoModel modelWithDictionary:data.data];
+	[Api getNewClanDetailInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) {
+        ClanDetailMainInfoModel * clanDetailInfo = [ ClanDetailMainInfoModel modelWithDictionary:data.data];
 		[[self getView] onGetClanDetailInfoSuccess:clanDetailInfo];
 	}fail:^(NSInteger code, NSString * _Nullable msg) {
 		[[self getView]onGetClanDetailInfofail];

YuMi/Modules/YMMine/Presenter/XPMineSettingPresent.m

@@ -52,115 +52,80 @@
         self.phoneItem.subTitle = userinfo.isBindPhone ? userinfo.phone : YMLocalizedString(@"XPMineSettingPresent0");
         self.payItem.subTitle = userinfo.isBindPaymentPwd ? YMLocalizedString(@"XPMineSettingPresent26") : YMLocalizedString(@"XPMineSettingPresent2");
     } else {
-        if ([ClientConfig shareConfig].canOpen) {
-            XPMineSettingItemModel * phoneItem = [[XPMineSettingItemModel alloc] init];
-            phoneItem.title = YMLocalizedString(@"XPMineSettingPresent3");
-            phoneItem.subTitle = userinfo.isBindPhone ? userinfo.phone : YMLocalizedString(@"XPMineSettingPresent4");
-            phoneItem.type = XPMineSettingItemType_Phone;
-            self.phoneItem = phoneItem;
-            
-            XPMineSettingItemModel * loginItem = [[XPMineSettingItemModel alloc] init];
-            loginItem.title = userinfo.isBindPasswd ? YMLocalizedString(@"XPMineLoginPasswordViewController6") : YMLocalizedString(@"XPMineSettingPresent6");
-            loginItem.subTitle = YMLocalizedString(@"XPMineSettingPresent7");
-            loginItem.type = XPMineSettingItemType_Login_Password;
-            self.loginItem = loginItem;
-            
-            XPMineSettingItemModel * shieldItem = [[XPMineSettingItemModel alloc] init];
-            shieldItem.title = YMLocalizedString(@"XPMineSettingPresent27");
+        XPMineSettingItemModel * phoneItem = [[XPMineSettingItemModel alloc] init];
+        phoneItem.title = YMLocalizedString(@"XPMineSettingPresent3");
+        phoneItem.subTitle = userinfo.isBindPhone ? userinfo.phone : YMLocalizedString(@"XPMineSettingPresent4");
+        phoneItem.type = XPMineSettingItemType_Phone;
+        self.phoneItem = phoneItem;
         
-            shieldItem.type = XPMineSettingItemType_Shield_management;
-            
-            XPMineSettingItemModel * blackListItem = [[XPMineSettingItemModel alloc] init];
-            blackListItem.title = YMLocalizedString(@"XPMineSettingPresent8");
-            blackListItem.subTitle = @"";
-            blackListItem.type = XPMineSettingItemType_Black_Manager;
-            
-            XPMineSettingItemModel * languageItem = [[XPMineSettingItemModel alloc] init];
-            languageItem.title = YMLocalizedString(@"XPMineSettingPresent28");
-            languageItem.subTitle = @"";
-            languageItem.type = XPMineSettingItemType_Language;
+        XPMineSettingItemModel * loginItem = [[XPMineSettingItemModel alloc] init];
+        loginItem.title = userinfo.isBindPasswd ? YMLocalizedString(@"XPMineLoginPasswordViewController6") : YMLocalizedString(@"XPMineSettingPresent6");
+        loginItem.subTitle = YMLocalizedString(@"XPMineSettingPresent7");
+        loginItem.type = XPMineSettingItemType_Login_Password;
+        self.loginItem = loginItem;
+        
+        XPMineSettingItemModel * shieldItem = [[XPMineSettingItemModel alloc] init];
+        shieldItem.title = YMLocalizedString(@"XPMineSettingPresent27");
+    
+        shieldItem.type = XPMineSettingItemType_Shield_management;
+        
+        XPMineSettingItemModel * blackListItem = [[XPMineSettingItemModel alloc] init];
+        blackListItem.title = YMLocalizedString(@"XPMineSettingPresent8");
+        blackListItem.subTitle = @"";
+        blackListItem.type = XPMineSettingItemType_Black_Manager;
+        
+        XPMineSettingItemModel * languageItem = [[XPMineSettingItemModel alloc] init];
+        languageItem.title = YMLocalizedString(@"XPMineSettingPresent28");
+        languageItem.subTitle = @"";
+        languageItem.type = XPMineSettingItemType_Language;
 
-            XPMineSettingItemModel * payItem = [[XPMineSettingItemModel alloc] init];
-            payItem.title = YMLocalizedString(@"XPMineSettingPresent9");
-            payItem.subTitle = userinfo.isBindPaymentPwd ? YMLocalizedString(@"XPMineSettingPresent26") : YMLocalizedString(@"XPMineSettingPresent11");
-            payItem.type = XPMineSettingItemType_Pay_Password;
-            self.payItem = payItem;
-            
-            XPMineSettingItemModel * notificaItem = [[XPMineSettingItemModel alloc] init];
-            notificaItem.title = YMLocalizedString(@"XPMineSettingPresent12");
-            notificaItem.subTitle = YMLocalizedString(@"XPMineSettingPresent13");
-            notificaItem.type = XPMineSettingItemType_Notification_Remind;
-            
-            XPMineSettingItemModel * privacyItem = [[XPMineSettingItemModel alloc] init];
-            privacyItem.title = YMLocalizedString(@"XPMineSettingPresent14");
-            privacyItem.subTitle = @"";
-            privacyItem.type = XPMineSettingItemType_Permission;
-            
-            XPMineSettingItemModel * helperItem = [[XPMineSettingItemModel alloc] init];
-            helperItem.title = YMLocalizedString(@"XPMineSettingPresent15");
-            helperItem.subTitle = @"";
-            helperItem.type = XPMineSettingItemType_Helper;
-            
-            XPMineSettingItemModel * feedbackItem = [[XPMineSettingItemModel alloc] init];
-            feedbackItem.title = YMLocalizedString(@"XPMineSettingPresent16");
-            feedbackItem.subTitle = @"";
-            feedbackItem.type = XPMineSettingItemType_Feedback;
-            
-            XPMineSettingItemModel * clearMemoryItem = [[XPMineSettingItemModel alloc] init];
-            clearMemoryItem.title = YMLocalizedString(@"XPMineSettingPresent17");
-            clearMemoryItem.subTitle = @"";
-            clearMemoryItem.type = XPMineSettingItemType_Clear_Memory;
-            
-            XPMineSettingItemModel *updateItem = [[XPMineSettingItemModel alloc] init];
-            updateItem.title = YMLocalizedString(@"XPMineSettingPresent18");
-            updateItem.subTitle = @"";
-            updateItem.type = XPMineSettingItemType_CheckUpdate;
-            
-            XPMineSettingItemModel * aboutusItem = [[XPMineSettingItemModel alloc] init];
-            aboutusItem.title = [NSString stringWithFormat:YMLocalizedString(@"XPMineAboutUsViewController0"), AppName];
-            aboutusItem.subTitle = @"";
-            aboutusItem.type = XPMineSettingItemType_About_Us;
-            
-            NSArray * oneSection = @[phoneItem];
-            NSArray * twoSection = @[loginItem,payItem, notificaItem,shieldItem, blackListItem,languageItem];
-            NSArray * threeSection = @[privacyItem];
-            NSArray * fourthSection = @[helperItem, clearMemoryItem, updateItem, aboutusItem];
-            
-            self.datasouce = @[oneSection, twoSection, threeSection, fourthSection];
-        }else{
-            XPMineSettingItemModel * blackListItem = [[XPMineSettingItemModel alloc] init];
-            blackListItem.title = YMLocalizedString(@"XPMineSettingPresent20");
-            blackListItem.subTitle = @"";
-            blackListItem.type = XPMineSettingItemType_Black_Manager;
-            
-            XPMineSettingItemModel * phoneItem = [[XPMineSettingItemModel alloc] init];
-            phoneItem.title = YMLocalizedString(@"XPMineSettingPresent21");
-            phoneItem.subTitle = userinfo.isBindPhone ? userinfo.phone : @"";
-            phoneItem.type = XPMineSettingItemType_Phone;
-            self.phoneItem = phoneItem;
-
-            XPMineSettingItemModel * loginItem = [[XPMineSettingItemModel alloc] init];
-            loginItem.title = userinfo.isBindPasswd ? YMLocalizedString(@"XPMineLoginPasswordViewController6") : YMLocalizedString(@"XPMineSettingPresent23");
-            loginItem.subTitle = @"";
-            loginItem.type = XPMineSettingItemType_Login_Password;
-            self.loginItem = loginItem;
-
-            XPMineSettingItemModel * clearMemoryItem = [[XPMineSettingItemModel alloc] init];
-            clearMemoryItem.title = YMLocalizedString(@"XPMineSettingPresent24");
-            clearMemoryItem.subTitle = @"";
-            clearMemoryItem.type = XPMineSettingItemType_Clear_Memory;
-            
-            XPMineSettingItemModel * deleteItem = [[XPMineSettingItemModel alloc] init];
-            deleteItem.title = YMLocalizedString(@"XPMineSettingPresent25");
-            deleteItem.subTitle = @"";
-            deleteItem.type = XPMineSettingItemType_Delete_Account;
-            
-            NSArray * oneSection = @[blackListItem];
-            NSArray * twoSection = @[phoneItem, loginItem];
-            NSArray * threeSection = @[clearMemoryItem, deleteItem];
-            
-            self.datasouce = @[oneSection, twoSection, threeSection];
-        }
+        XPMineSettingItemModel * payItem = [[XPMineSettingItemModel alloc] init];
+        payItem.title = YMLocalizedString(@"XPMineSettingPresent9");
+        payItem.subTitle = userinfo.isBindPaymentPwd ? YMLocalizedString(@"XPMineSettingPresent26") : YMLocalizedString(@"XPMineSettingPresent11");
+        payItem.type = XPMineSettingItemType_Pay_Password;
+        self.payItem = payItem;
+        
+        XPMineSettingItemModel * notificaItem = [[XPMineSettingItemModel alloc] init];
+        notificaItem.title = YMLocalizedString(@"XPMineSettingPresent12");
+        notificaItem.subTitle = YMLocalizedString(@"XPMineSettingPresent13");
+        notificaItem.type = XPMineSettingItemType_Notification_Remind;
+        
+        XPMineSettingItemModel * privacyItem = [[XPMineSettingItemModel alloc] init];
+        privacyItem.title = YMLocalizedString(@"XPMineSettingPresent14");
+        privacyItem.subTitle = @"";
+        privacyItem.type = XPMineSettingItemType_Permission;
+        
+        XPMineSettingItemModel * helperItem = [[XPMineSettingItemModel alloc] init];
+        helperItem.title = YMLocalizedString(@"XPMineSettingPresent15");
+        helperItem.subTitle = @"";
+        helperItem.type = XPMineSettingItemType_Helper;
+        
+        XPMineSettingItemModel * feedbackItem = [[XPMineSettingItemModel alloc] init];
+        feedbackItem.title = YMLocalizedString(@"XPMineSettingPresent16");
+        feedbackItem.subTitle = @"";
+        feedbackItem.type = XPMineSettingItemType_Feedback;
+        
+        XPMineSettingItemModel * clearMemoryItem = [[XPMineSettingItemModel alloc] init];
+        clearMemoryItem.title = YMLocalizedString(@"XPMineSettingPresent17");
+        clearMemoryItem.subTitle = @"";
+        clearMemoryItem.type = XPMineSettingItemType_Clear_Memory;
+        
+        XPMineSettingItemModel *updateItem = [[XPMineSettingItemModel alloc] init];
+        updateItem.title = YMLocalizedString(@"XPMineSettingPresent18");
+        updateItem.subTitle = @"";
+        updateItem.type = XPMineSettingItemType_CheckUpdate;
+        
+        XPMineSettingItemModel * aboutusItem = [[XPMineSettingItemModel alloc] init];
+        aboutusItem.title = [NSString stringWithFormat:YMLocalizedString(@"XPMineAboutUsViewController0"), AppName];
+        aboutusItem.subTitle = @"";
+        aboutusItem.type = XPMineSettingItemType_About_Us;
+        
+        NSArray * oneSection = @[phoneItem];
+        NSArray * twoSection = @[loginItem,payItem, notificaItem,shieldItem, blackListItem,languageItem];
+        NSArray * threeSection = @[privacyItem];
+        NSArray * fourthSection = @[helperItem, clearMemoryItem, updateItem, aboutusItem];
+        
+        self.datasouce = @[oneSection, twoSection, threeSection, fourthSection];
     }
     
     [[self getView] getMineSettingDatasourceSuccess:self.datasouce];

YuMi/Modules/YMMine/Presenter/XPMineUserInfoEditPresenter.m

@@ -72,7 +72,8 @@
     self.avatarItem.avatarUrl = userInfo.isReview ? userInfo.reviewingAvatar : userInfo.avatar;
     
     self.nickItem.subTitle = userInfo.nick;
-    NSString *dateStr = [self.dateFormatter stringFromDate:[NSDate dateWithTimeIntervalSince1970:userInfo.birth/1000]];
+    NSDate *date = [NSDate dateWithTimeIntervalSince1970:userInfo.birth/1000];
+    NSString *dateStr = [self.dateFormatter stringFromDate:date];
     self.birthItem.subTitle = dateStr;
     
     self.photoItem.photoArray = userInfo.privatePhoto;
@@ -226,7 +227,7 @@
     if (!_dateFormatter) {
         _dateFormatter = [[NSDateFormatter alloc] init];
         _dateFormatter.dateFormat = @"yyyy-MM-dd";
-    
+        [_dateFormatter setTimeZone:[NSTimeZone timeZoneWithName:@"Asia/Shanghai"]];
     }
     return _dateFormatter;
 }

YuMi/Modules/YMMine/Protocol/XPMineProtocol.h

@@ -22,7 +22,7 @@ NS_ASSUME_NONNULL_BEGIN
 ///获取VIP信息失败
 - (void)getNobleCenterInfoFail;
 ///获取家族信息成功
-- (void)onGetClanDetailInfoSuccess:(ClanDetailInfoModel *)clanInfo ;
+- (void)onGetClanDetailInfoSuccess:(ClanDetailMainInfoModel *)clanInfo ;
 ///获取家族信息失败
 - (void)onGetClanDetailInfofail;
 ///获取个人中心功能

YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataClanTableViewCell.m

@@ -242,10 +242,23 @@
 //       if(dateStr.length > 0){
 //        _starIconView.image = kImage(dateStr);
 //       }
-        _birthdayView.text = [NSDate timestampSwitchTime:_userInfo.birth / 1000 andFormatter:@"yyyy-MM-dd"];
+        _birthdayView.text = [self timestampSwitchTime:_userInfo.birth / 1000 andFormatter:@"yyyy-MM-dd"];
     _areaView.text = _userInfo.region;
 }
+-(NSString *)timestampSwitchTime:(NSInteger)timestamp andFormatter:(NSString *)format{
 
+
+
+ NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
+ [formatter setDateStyle:NSDateFormatterMediumStyle];
+ [formatter setTimeZone:[NSTimeZone timeZoneWithName:@"Asia/Shanghai"]];
+ [formatter setTimeStyle:NSDateFormatterShortStyle];
+
+ [formatter setDateFormat:format]; // （@"YYYY-MM-dd hh:mm:ss"）----------设置你想要的格式,hh与HH的区别:分别表示12小时制,24小时制
+ NSDate *confromTimesp = [NSDate dateWithTimeIntervalSince1970:timestamp];
+ NSString *confromTimespStr = [formatter stringFromDate:confromTimesp];
+ return confromTimespStr;
+}
 - (NSString *)calculateConstellationWithMonth:(long)time
 {
     NSString *astroString = YMLocalizedString(@"XPMineHeadView0");

YuMi/Modules/YMMine/View/Cell/XPMineTheGuildCell.h

@@ -10,7 +10,8 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface XPMineTheGuildCell : UITableViewCell
-@property (nonatomic,strong) ClanDetailInfoModel *clanInfo;
+@property (nonatomic,strong) ClanDetailMainInfoModel *clanInfo;
+
 @end
 
 NS_ASSUME_NONNULL_END

YuMi/Modules/YMMine/View/Cell/XPMineTheGuildCell.m

@@ -74,23 +74,35 @@
 	}];
 }
 
--(void)setClanInfo:(ClanDetailInfoModel *)clanInfo{
+-(void)setClanInfo:(ClanDetailMainInfoModel *)clanInfo{
 	_clanInfo = clanInfo;
-	if(_clanInfo.hall.ownerUid > 0 || _clanInfo.clan.elderUid > 0){
-		_titleView.text = YMLocalizedString(@"XPMineTheGuildCell0");
-		_leftIconView.hidden = YES;
-		_rightIconBtn.selected = YES;
-		_headIconView.hidden = NO;
-		NSString *imageUrl = @"";
-		if (_clanInfo.clan.elderUid > 0){
-			imageUrl = _clanInfo.clan.avatar;
-		}else{
-			if(_clanInfo.hall.ownerUid > 0){
-				imageUrl = _clanInfo.hall.ownerAvatar;
-			}
-		}
-		_headIconView.imageUrl = imageUrl;
-	}
+    if([_clanInfo.clanMode isEqualToString: @"clan_hall"]){
+        if(_clanInfo.clan.hall.ownerUid > 0 || _clanInfo.clan.clan.elderUid > 0){
+            _titleView.text = YMLocalizedString(@"XPMineTheGuildCell0");
+            _leftIconView.hidden = YES;
+            _rightIconBtn.selected = YES;
+            _headIconView.hidden = NO;
+            NSString *imageUrl = @"";
+            if (_clanInfo.clan.clan.elderUid > 0){
+                imageUrl = _clanInfo.clan.clan.avatar;
+            }else{
+                if(_clanInfo.clan.hall.ownerUid > 0){
+                    imageUrl = _clanInfo.clan.hall.ownerAvatar;
+                }
+            }
+            _headIconView.imageUrl = imageUrl;
+        }
+        return;
+    }
+    
+    if(_clanInfo.family.familyId){
+        _titleView.text = YMLocalizedString(@"XPMineTheGuildCell0");
+        _leftIconView.hidden = YES;
+        _rightIconBtn.selected = YES;
+        _headIconView.hidden = NO;
+        _headIconView.imageUrl = _clanInfo.family.ownerAvatar;
+    }
+
 }
 
 #pragma mark -懒加载

YuMi/Modules/YMMine/View/Guild/Api/Api+Guild.h

@@ -14,7 +14,10 @@ NS_ASSUME_NONNULL_BEGIN
 
 
 @interface Api (Guild)
-
+/// 获取家族详情
+/// @param completion 完成
+/// @param uid 族长的uid
++ (void)getNewClanDetailInfo:(HttpRequestHelperCompletion)completion uid:(NSString *)uid;
 /// 获取家族详情
 /// @param completion 完成
 /// @param uid 族长的uid

YuMi/Modules/YMMine/View/Guild/Api/Api+Guild.m

@@ -15,7 +15,12 @@
 + (void)getClanDetailInfo:(HttpRequestHelperCompletion)completion uid:(NSString *)uid {
 	[self makeRequest:@"clan/getUserHallAndClan" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, uid, nil];
 }
-
+/// 获取家族详情
+/// @param completion 完成
+/// @param uid 族长的uid
++ (void)getNewClanDetailInfo:(HttpRequestHelperCompletion)completion uid:(NSString *)uid {
+    [self makeRequest:@"user/getUserClanInfo" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, uid, nil];
+}
 /// 获取公会中房间列表
 /// @param completion 完成
 /// @param clanId 公会的id

YuMi/Modules/YMMine/View/Guild/Model/ClanDetailInfoModel.h

@@ -18,5 +18,14 @@ NS_ASSUME_NONNULL_BEGIN
 ///当前用户是否是公会超管
 @property (nonatomic, assign) BOOL manageHall;
 @end
+@interface ClanDetailMainInfoModel : PIBaseModel
+///家族信息
+@property (nonatomic,strong) ClanDetailInfoModel *clan;
+@property(nonatomic,copy) NSString *clanMode;
+@property(nonatomic,strong) ClanInfoModel *family;
+@end
+
+
+
 
 NS_ASSUME_NONNULL_END

YuMi/Modules/YMMine/View/Guild/Model/ClanDetailInfoModel.m

@@ -10,3 +10,7 @@
 @implementation ClanDetailInfoModel
 
 @end
+
+@implementation ClanDetailMainInfoModel
+
+@end

YuMi/Modules/YMMine/View/Guild/Model/ClanInfoModel.h

@@ -28,7 +28,10 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) NSString *levelIcon;
 ///是否有开通会员兑换权限的功能
 @property (nonatomic,assign) BOOL elderHasExchangeManagerAuth;
-
+@property(nonatomic,copy) NSString *myFamilyUrl;
+@property(nonatomic,copy) NSString *familyListUrl;
+@property(nonatomic,copy) NSString *familyId;
+@property(nonatomic,copy) NSString *ownerAvatar;
 @end
 
 NS_ASSUME_NONNULL_END

YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordVC.h

@@ -6,15 +6,12 @@
 //
 
 #import "MvpViewController.h"
-#import "ClanDetailInfoModel.h"
 #import "UserInfoModel.h"
 NS_ASSUME_NONNULL_BEGIN
 
 @interface XPIncomeRecordVC : MvpViewController
-///家族信息
-@property (nonatomic,strong) ClanDetailInfoModel *clanInfo;
-///个人信息
-@property (nonatomic,strong) UserInfoModel *userInfo;
+
+
 @end
 
 NS_ASSUME_NONNULL_END

YuMi/Modules/YMMine/View/MineInfo/XPMineSimpleUserInfoViewController.h

@@ -1,19 +0,0 @@
-//
-//  YMMineSimpleUserInfoViewController.h
-//  YUMI
-//
-//  Created by XY on 2023/2/21.
-//
-
-#import "MvpViewController.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface XPMineSimpleUserInfoViewController : MvpViewController
-
-///用户的id
-@property (nonatomic,assign) NSInteger uid;
-
-@end
-
-NS_ASSUME_NONNULL_END

YuMi/Modules/YMMine/View/MineInfo/XPMineSimpleUserInfoViewController.m

@@ -1,406 +0,0 @@
-//
-//  YMMineSimpleUserInfoViewController.m
-//  YUMI
-//
-//  Created by XY on 2023/2/21.
-//
-
-#import "XPMineSimpleUserInfoViewController.h"
-#import "YUMIMacroUitls.h"
-#import <Masonry.h>
-#import <MJRefresh.h>
-#import "DJDKMIMOMColor.h"
-#import "UIImage+Utils.h"
-#import "AccountInfoStorage.h"
-#import "TTPopup.h"
-#import "YUMIHtmlUrl.h"
-#import "XPSkillCardPlayerManager.h"
-#import "UIImage+Utils.h"
-#import "YUMIConstant.h"
-#import "NIMMessageUtils.h"
-#import "NSArray+Safe.h"
-#import "ClientConfig.h"
-#import "XNDJTDDLoadingTool.h"
-
-#import "MonentsListInfoModel.h"
-#import "MineSkillCardListInfoModel.h"
-#import "UserInfoModel.h"
-
-///P
-#import "XPMineUserInfoPresenter.h"
-#import "XPMineUserInfoProtocol.h"
-#import "RoomHostDelegate.h"
-///View
-#import "XPMomentListCollectionViewCell.h"
-#import "XPMineUserInfoCustomNavView.h"
-#import "XPMineSimpleUserInfoHeaderView.h"
-///VC
-#import "XPMineUserInfoEditViewController.h"
-#import "XPWebViewController.h"
-#import "SessionViewController.h"
-#import "XPRoomViewController.h"
-#import "XPMineUserDataViewController.h"
-#import "XPMonentsMineViewController.h"
-#import "XPMonentsDetailViewController.h"
-#import "XPMomentsSimpleDetailViewController.h"
-#import "XPMineUserInfoGiftWallViewController.h"
-
-#define kHeaderViewHeight 615
-
-@interface XPMineSimpleUserInfoViewController ()<UICollectionViewDelegate, UICollectionViewDataSource, XPMineCustomNavViewDelegate, XPMineUserInfoProtocol, XPMineSimpleUserInfoHeaderViewDelegate>
-
-@property (nonatomic, strong) UICollectionView *collectionView;
-///头部视图
-@property (nonatomic, strong) XPMineSimpleUserInfoHeaderView *headerView;
-///自定义的导航栏
-@property (nonatomic,strong) XPMineUserInfoCustomNavView *navView;
-///用户信息
-@property (nonatomic,strong) UserInfoModel *userInfo;
-///底部的容器
-@property (nonatomic,strong) UIStackView *bottomStackView;
-///私聊
-@property (nonatomic,strong) UIButton *chatButton;
-///关注
-@property (nonatomic,strong) UIButton *attentionButton;
-
-@end
-
-@implementation XPMineSimpleUserInfoViewController
-
-- (XPMineUserInfoPresenter *)createPresenter {
-    return [[XPMineUserInfoPresenter alloc] init];
-}
-
-- (BOOL)isHiddenNavBar {
-    return YES;
-}
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    [self createUI];
-}
-
-- (void)viewWillAppear:(BOOL)animated {
-    [super viewWillAppear:animated];
-    if (self.uid > 0) {
-        [self initHttpRequest];
-    }
-}
-
-- (void)viewWillDisappear:(BOOL)animated {
-    [super viewWillDisappear:animated];
-    
-}
-
-- (void)createUI {
-    [self.view addSubview:self.collectionView];
-    [self.collectionView addSubview:self.headerView];
-    [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.mas_equalTo(0);
-        make.leading.trailing.mas_equalTo(0);
-        make.bottom.mas_equalTo(0);
-    }];
-    
-    [self.view addSubview:self.navView];
-    [self.navView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.leading.trailing.top.mas_equalTo(self.view);
-        make.height.mas_equalTo(kNavigationHeight);
-    }];
-    
-    if (self.uid != [AccountInfoStorage instance].getUid.integerValue) {
-        [self.view addSubview:self.chatButton];
-        [self.chatButton mas_makeConstraints:^(MASConstraintMaker *make) {
-			make.centerX.mas_equalTo(self.view);
-            make.height.mas_equalTo(36);
-			make.width.mas_equalTo(100);
-            make.bottom.mas_equalTo(self.view).offset(-kSafeAreaBottomHeight - 15);
-        }];
-    }
-}
-
-- (void)initHttpRequest {
-    NSString *uid = [NSString stringWithFormat:@"%ld", self.uid];
-    ///请求目标用户的个人信息
-//    [self.presenter getUserInfoWithUid:uid];
-    [self.presenter getUserAttentionState:uid];
-
-    //获取用户详细信息 跟随进房目前使用的这个接口
-    [self.presenter getUserDetailInfoWithUid:uid];
-
-    NSString * myUid = [AccountInfoStorage instance].getUid;
-    ///上传访问记录
-    if (![uid isEqualToString:myUid]) {
-        ///请求我自己的个人信息
-//        [self.presenter getUserInfoWithUid:myUid];
-    }
-}
-
-#pragma mark - 拉黑 移除黑名单
-- (void)showRightNavHandle {
-    NSMutableArray<TTActionSheetConfig *> *array = [NSMutableArray array];
-    NSString *uid = [NSString stringWithFormat:@"%ld",self.uid];
-    TTActionSheetConfig *report = [TTActionSheetConfig normalTitle:YMLocalizedString(@"XPMineSimpleUserInfoViewController0") clickAction:^{
-		if ([ClientConfig shareConfig].canOpen) {
-			XPWebViewController *vc = [[XPWebViewController alloc]init];
-			NSString *urlstr = [NSString stringWithFormat:@"%@?reportUid=%@&source=PERSONAL",URLWithType(kReportRoomURL),uid];
-			vc.url = urlstr;
-			[self.navigationController pushViewController:vc animated:YES];
-		} else {
-			[XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPMineSimpleUserInfoViewController1")];
-		}
-    }];
-
-    TTActionSheetConfig *black = [TTActionSheetConfig normalTitle:YMLocalizedString(@"XPMineSimpleUserInfoViewController2") clickAction:^{
-        [self addOrRemoveBlack:NO uid:uid];
-    }];
-
-    [array addObjectsFromArray:@[report, black]];
-
-    BOOL isInBlackList = [[NIMSDK sharedSDK].userManager isUserInBlackList:uid] || [NIMMessageUtils isOfficalAccount:[NSString stringWithFormat:@"%ld", self.uid]];
-    if (isInBlackList) {
-        [array removeObject:black];
-    }
-    [TTPopup actionSheetWithItems:array];
-}
-
-
-//加入黑名单
-- (void)addOrRemoveBlack:(BOOL)isRemove uid:(NSString *)uid {
-    NSString *title;
-    NSString *message;
-    if (isRemove) {
-        title = YMLocalizedString(@"XPMineSimpleUserInfoViewController3");
-        message = YMLocalizedString(@"XPMineSimpleUserInfoViewController4");
-    }else{
-        title = YMLocalizedString(@"XPMineSimpleUserInfoViewController5");
-        message = YMLocalizedString(@"XPMineSimpleUserInfoViewController6");
-    }
-
-    TTAlertConfig *config = [[TTAlertConfig alloc] init];
-    config.title = title;
-    config.message = message;
-
-    [TTPopup alertWithConfig:config confirmHandler:^{
-        if (isRemove) {
-            [[NIMSDK sharedSDK].userManager removeFromBlackBlackList:uid completion:^(NSError * _Nullable error) {
-                if (error == nil) {
-                    [self  showSuccessToast:YMLocalizedString(@"XPMineSimpleUserInfoViewController7")];
-                }
-            }];
-        } else {
-            [[NIMSDK sharedSDK].userManager addToBlackList:uid completion:^(NSError * _Nullable error) {
-                if (error == nil) {
-                    [self  showSuccessToast:YMLocalizedString(@"XPMineSimpleUserInfoViewController8")];
-                }
-            }];
-        }
-    } cancelHandler:^{
-    }];
-}
-
-#pragma mark - XPMineCustomNavViewDelegate
-- (void)xPMineCustomNavView:(XPMineUserInfoCustomNavView *)view didClickEditButton:(UIButton *)sender {
-    if (sender.isSelected) {///自己看自己的  去修改资料
-        XPMineUserInfoEditViewController * editVC = [[XPMineUserInfoEditViewController alloc] init];
-        [self.navigationController pushViewController:editVC animated:YES];
-    } else {
-        [self showRightNavHandle];
-    }
-}
-
-- (void)xPMineCustomNavView:(XPMineUserInfoCustomNavView *)view didClickBackButton:(UIButton *)sender {
-    [self.navigationController popViewControllerAnimated:YES];
-}
-
-#pragma mark - XPMineSimpleUserInfoHeaderViewDelegate
-/// 更多了礼物
-- (void)headerViewMoreGiftAction {
-    if (self.uid > 0) {
-        XPMineUserInfoGiftWallViewController * giftWallVC = [[XPMineUserInfoGiftWallViewController alloc] init];
-        giftWallVC.userUid = [NSString stringWithFormat:@"%ld", self.uid];
-        [self.navigationController pushViewController:giftWallVC animated:YES];
-    }
-}
-
-/// 点击了直播中
-- (void)headerViewOnlineAction:(NSString *)roomUid {
-    if (roomUid.length > 0 ) {
-        //退出原来的房间 如果有的话 TODO 总感觉这种处理不太优雅 进房入口多了 怎么办 进房需要整合
-        [self.navigationController.viewControllers enumerateObjectsUsingBlock:^(__kindof UIViewController * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
-            if ([obj isKindOfClass:[XPRoomViewController class]]) {
-                [self.navigationController popToRootViewControllerAnimated:NO];
-                XPRoomViewController<RoomHostDelegate> * rooomVC = obj;
-                [rooomVC exitRoom];
-                *stop = YES;
-            }
-        }];
-        [XPRoomViewController openRoom:roomUid viewController:self];
-    }
-}
-
-#pragma mark - XPMineUserInfoProtocol
-- (void)onGetUserInfoSuccess:(UserInfoModel *)userInfo {
-    if (userInfo.uid == self.uid) {
-        self.userInfo = userInfo;
-//        self.headView.userInfo = userInfo;
-    } else {
-        if (!userInfo.userVipInfoVO.lookHomepageHide) {
-            NSString * uid = [NSString stringWithFormat:@"%ld", self.uid];
-            [self.presenter visitUser:uid];
-        }
-    }
-}
-
-- (void)ongetDetailInfoSuccess:(UserInfoModel *)userInfo {
-    self.userInfo = userInfo;
-    self.headerView.userInfo = userInfo;
-    self.headerView.roomUid = userInfo.roomUid;
-    [self.collectionView reloadData];
-//    self.userDataVC.userInfo = userInfo;
-//    self.monentsVC.dynamicInfo = userInfo.dynamicInfo;
-    
-}
-
-- (void)getAttentionStateSuccess:(BOOL)status {
-    self.attentionButton.selected = status;
-}
-
-- (void)attentionUserSuccess:(BOOL)status {
-    self.attentionButton.selected = status;
-}
-
-
-#pragma mark - Event Response
-- (void)chatButtonAction:(UIButton *)sender {
-    NSString * sessionId = [NSString stringWithFormat:@"%ld",self.uid];
-    NIMSession * session = [NIMSession session:sessionId type:NIMSessionTypeP2P];
-    SessionViewController * sessionVC = [[SessionViewController alloc] initWithSession:session];
-    [self.navigationController pushViewController:sessionVC animated:YES];
-}
-
-- (void)attentionButtonAction:(UIButton *)sender {
-    NSString *uid = [NSString stringWithFormat:@"%ld", self.uid];
-    [self.presenter attentionUser:uid state:!sender.selected];
-}
-
-
-#pragma mark - UICollectionView
-
-- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
-    return self.userInfo.dynamicInfo.count;
-}
-
-- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
-    XPMomentListCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass(XPMomentListCollectionViewCell.self) forIndexPath:indexPath];
-    MonentsInfoModel * monentsInfo = [self.userInfo.dynamicInfo safeObjectAtIndex1:indexPath.row];
-    cell.monentsInfo = monentsInfo;
-    return cell;
-}
-
-- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
-    if (self.userInfo.dynamicInfo.count > 0) {
-        
-        if ([ClientConfig shareConfig].canOpen) {
-            XPMonentsDetailViewController * detailVC = [[XPMonentsDetailViewController alloc] init];
-            MonentsInfoModel * monentsInfo = [self.userInfo.dynamicInfo safeObjectAtIndex1:indexPath.row];
-            detailVC.monentsInfo = monentsInfo;
-            [self.navigationController pushViewController:detailVC animated:YES];
-        }else{
-            XPMomentsSimpleDetailViewController * detailVC = [[XPMomentsSimpleDetailViewController alloc] init];
-            MonentsInfoModel * monentsInfo = [self.userInfo.dynamicInfo safeObjectAtIndex1:indexPath.row];
-            detailVC.monentsInfo = monentsInfo;
-            [self.navigationController pushViewController:detailVC animated:YES];
-        }
-    }
-}
-
-#pragma mark - 懒加载
-
-- (UICollectionView *)collectionView {
-    if (!_collectionView) {
-        MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init];
-        layout.scrollDirection = UICollectionViewScrollDirectionVertical;
-        CGFloat width = (KScreenWidth - 16 -13 -16)/2.0;
-        CGFloat height = 220.0/165.0*width;
-        layout.itemSize = CGSizeMake(width, height);
-        layout.minimumLineSpacing = 12.0;
-        layout.minimumInteritemSpacing = 13.0;
-        layout.sectionInset = UIEdgeInsetsMake(12, 16, 12, 16);
-        
-        _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout];
-        _collectionView.backgroundColor = UIColor.whiteColor;
-        _collectionView.alwaysBounceVertical = YES;
-        [_collectionView registerClass:[XPMomentListCollectionViewCell class] forCellWithReuseIdentifier:NSStringFromClass(XPMomentListCollectionViewCell.self)];
-        _collectionView.delegate = self;
-        _collectionView.dataSource = self;
-        _collectionView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
-        
-        _collectionView.contentInset = UIEdgeInsetsMake(kHeaderViewHeight, 0, 0, 0);
-        
-    }
-    return _collectionView;
-}
-
-- (XPMineSimpleUserInfoHeaderView *)headerView {
-    if (!_headerView) {
-        _headerView = [[XPMineSimpleUserInfoHeaderView alloc] init];
-        _headerView.frame = CGRectMake(0, -kHeaderViewHeight, KScreenWidth, kHeaderViewHeight);
-        _headerView.delegate = self;
-    }
-    return _headerView;
-}
-
-- (XPMineUserInfoCustomNavView *)navView {
-    if (!_navView) {
-        _navView = [[XPMineUserInfoCustomNavView alloc] init];
-        _navView.delegate = self;
-    }
-    return _navView;
-}
-
-- (UIStackView *)bottomStackView {
-    if (!_bottomStackView) {
-        _bottomStackView = [[UIStackView alloc] init];
-        _bottomStackView.axis = UILayoutConstraintAxisHorizontal;
-        _bottomStackView.distribution = UIStackViewDistributionFillEqually;
-        _bottomStackView.alignment = UIStackViewAlignmentFill;
-        _bottomStackView.spacing = 25;
-    }
-    return _bottomStackView;
-}
-
-- (UIButton *)chatButton {
-    if (!_chatButton) {
-        _chatButton = [UIButton buttonWithType:UIButtonTypeCustom];
-        [_chatButton setTitle:YMLocalizedString(@"XPMineSimpleUserInfoViewController9") forState:UIControlStateNormal];
-        [_chatButton setTitleColor:[DJDKMIMOMColor confirmButtonTextColor] forState:UIControlStateNormal];
-        _chatButton.titleLabel.font = [UIFont systemFontOfSize:15];
-		[_chatButton setBackgroundColor:[DJDKMIMOMColor appMainColor]];
-        _chatButton.layer.masksToBounds = YES;
-        _chatButton.layer.cornerRadius =  36/2;
-        [_chatButton addTarget:self action:@selector(chatButtonAction:) forControlEvents:UIControlEventTouchUpInside];
-    }
-    return _chatButton;
-}
-
-- (UIButton *)attentionButton {
-    if (!_attentionButton) {
-        _attentionButton = [UIButton buttonWithType:UIButtonTypeCustom];
-        [_attentionButton setTitle:YMLocalizedString(@"XPMineSimpleUserInfoViewController10") forState:UIControlStateNormal];
-        [_attentionButton setTitle:YMLocalizedString(@"XPMineSimpleUserInfoViewController11") forState:UIControlStateSelected];
-        [_attentionButton setTitleColor:[DJDKMIMOMColor confirmButtonTextColor] forState:UIControlStateNormal];
-        [_attentionButton setTitleColor:[DJDKMIMOMColor cancelButtonTextColor] forState:UIControlStateSelected];
-        [_attentionButton setImage:[UIImage imageNamed:@"mine_user_info_bottom_attention_normal"] forState:UIControlStateNormal];
-        [_attentionButton setImage:[UIImage imageNamed:@"mine_user_info_bottom_attention_select"] forState:UIControlStateSelected];
-        _attentionButton.titleLabel.font = [UIFont systemFontOfSize:15];
-        [_attentionButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal];
-        [_attentionButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor cancelButtonGradientStartColor], [DJDKMIMOMColor cancelButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateSelected];
-        _attentionButton.layer.masksToBounds = YES;
-        _attentionButton.layer.cornerRadius =  36/2;
-		_attentionButton.hidden = YES;
-        [_attentionButton addTarget:self action:@selector(attentionButtonAction:) forControlEvents:UIControlEventTouchUpInside];
-    }
-    return _attentionButton;
-}
-
-@end

YuMi/Modules/YMMine/View/Noble/View/XPNobleCenterViewController.m

@@ -86,7 +86,7 @@
 @property (nonatomic, assign) NSInteger roomUid;
 @property (nonatomic,strong)  WalletInfoModel * infoModel;
 @property(nonatomic,strong) UIButton *rankBtn;
-@property(nonatomic,assign) BOOL pi_IsNative;
+
 @end
 
 @implementation XPNobleCenterViewController
@@ -105,7 +105,7 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    self.pi_IsNative = YES;
+  
     [[NIMSDK sharedSDK].systemNotificationManager addDelegate:self];
     [self requestHttp];
     [self initSubViews];
@@ -209,16 +209,7 @@
         return;
     }
     
-    if(self.pi_IsNative == NO){
-        XPWebViewController *vc = [[XPWebViewController alloc]init];
-        NSString *channel = @"p";
-        channel = [NSString stringWithFormat:@"%@a",channel];
-        channel = [NSString stringWithFormat:@"%@y",channel];
-        NSString *url =  [NSString stringWithFormat:URLWithType(kChannelUrl),channel,@"5",[YYUtility deviceID]];
-        vc.url = url;
-        [self.navigationController pushViewController:vc animated:YES];
-        return;
-    }
+  
     
     
     [XNDJTDDLoadingTool showOnlyView:kWindow];
@@ -266,26 +257,15 @@
     [self.presenter getNobleChargeProductListWithChannelType:@"9"];
     [self getWalletInfo];
     
-    
-    if([ClientConfig shareConfig].canOpen){
-        [Api requestMineChannel:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
-            if(code == 200){
-                if(data.data[@"isNative"] != nil){
-                    self.pi_IsNative = [data.data[@"isNative"] boolValue];
-                    
-                }
-                
-            }
-            
-        }];
-        
-    }
+   
     
 }
 -(void)getWalletInfo{
     NSString * uid = [AccountInfoStorage instance].getUid;
     NSString * ticket = [AccountInfoStorage instance].getTicket;
+    @kWeakify(self);
     [Api getUserWalletInfo:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
+        @kStrongify(self);
         if(code == 200){
             WalletInfoModel * model = [WalletInfoModel modelWithDictionary:data.data];
             self.infoModel = model;