temp save

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

YuMi.xcodeproj/project.pbxproj

@@ -365,6 +365,15 @@
 		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 */; };
@@ -1384,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 */; };
@@ -2242,6 +2245,23 @@
 		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>"; };
@@ -2483,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>"; };
@@ -2609,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>"; };
@@ -3250,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>"; };
@@ -3738,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>"; };
@@ -4148,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>"; };
@@ -7990,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 */,
@@ -8045,6 +8055,8 @@
 				E84BF7DC277C765400EF8877 /* XPRoomRoleEmptyTableViewCell.m */,
 				E89BD7D2277D471100E31B19 /* XPRoomOnlineTableViewCell.h */,
 				E89BD7D3277D471100E31B19 /* XPRoomOnlineTableViewCell.m */,
+				239D0FB12BFD8C67002977CE /* MSRoomSetingBackdropCell.h */,
+				239D0FB22BFD8C67002977CE /* MSRoomSetingBackdropCell.m */,
 			);
 			path = Cell;
 			sourceTree = "<group>";
@@ -9698,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 */,
@@ -10013,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>";
@@ -11022,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 */,
@@ -11153,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 */,
@@ -11278,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 */,
@@ -11328,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 */,
@@ -11367,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 */,
@@ -11547,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 */,
@@ -11584,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 */,
@@ -11733,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 */,
@@ -11876,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 */,
@@ -12026,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 */,
@@ -12151,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 */,
@@ -12215,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 */,
@@ -12231,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 */,
@@ -12240,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 */,
@@ -12304,7 +12321,6 @@
 				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 */,
@@ -12562,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 = "";
@@ -12600,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/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/main/tab_gameHome_game_normal.imageset/Contents.json

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

YuMi/Assets.xcassets/main/tab_gameHome_game_selected.imageset/Contents.json

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

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

@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "pi_room_menu_bottom_send_bg.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "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/Menu/room_menu_gift1.imageset/Contents.json

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

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

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

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/Setting/ms_room_reting_backdrop_back.imageset/Contents.json

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

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

@@ -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];

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

@@ -66,9 +66,9 @@
     [self.presenter getPublicChatHallList];
 }
 -(void)getPublicChatHallListSuccess:(NSArray<MSSessionScrollingModel *> *)list{
+    QEmotionHelper *faceManager = [QEmotionHelper sharedEmotionHelper];
     for (MSSessionScrollingModel *model in list) {
         CGSize dstRect = CGSizeMake(model.width, MAXFLOAT);
-        QEmotionHelper *faceManager = [QEmotionHelper sharedEmotionHelper];
         NSMutableAttributedString * attribute = [faceManager attributedStringByText:model.content font:kFontMedium(12)];
         [attribute addAttributes:@{NSForegroundColorAttributeName: UIColorFromRGB(0xFFFCED)} range:[attribute.string rangeOfString:attribute.string]];
         YYTextContainer *container = [YYTextContainer containerWithSize:dstRect];

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/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/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/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,15 +257,8 @@
     [self.presenter getNobleChargeProductListWithChannelType:@"9"];
     [self getWalletInfo];
     
-    @kWeakify(self);
-    [Api requestMineChannel:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
-        @kStrongify(self);
-        if(code == 200){
-            if(data.data[@"isNative"] != nil){
-                self.pi_IsNative = [data.data[@"isNative"] boolValue];
-            }
-        }
-    }];
+   
+    
 }
 -(void)getWalletInfo{
     NSString * uid = [AccountInfoStorage instance].getUid;

YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeViewController.m

@@ -90,45 +90,8 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-#ifdef DEBUG
-    [self showLoading];
-    [Api requestMineChannel:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
-        [self hideHUD];
-        if(code == 200){
-            if(data.data[@"isNative"] != nil){
-                BOOL is = [data.data[@"isNative"] boolValue];
-                [self initWebView:is];
-            }
-        } else {
-            [self initWebView:YES];
-        }
-    }];
-#else
-        if(isEnterprise == YES){
-            [self showLoading];
-            [Api requestMineChannel:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
-                [self hideHUD];
-                if(code == 200){
-                    if(data.data[@"isNative"] != nil){
-                        BOOL is = [data.data[@"isNative"] boolValue];
-                        [self initWebView:is];
-                    }
-                    return;
-                }
-                [self initWebView:YES];
-            }];
-            return;
-        }else{
-            [self initWebView:NO];
-        }
-#endif
-}
--(void)initWebView:(BOOL)is{
-    if(is == YES){
-        [self createUI];
-        [self initHttpData];
-        return;
-    }
+    [self createUI];
+    [self initHttpData];
 }
 - (void)createUI {
     self.view.backgroundColor = [UIColor whiteColor];

YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoDateView.m

@@ -322,6 +322,7 @@
 	if (!_dateFormatter) {
 		_dateFormatter = [[NSDateFormatter alloc] init];
 		_dateFormatter.dateFormat = @"yyyy-MM-dd";
+        [_dateFormatter setTimeZone:[NSTimeZone timeZoneWithName:@"Asia/Shanghai"]];
 	}
 	return _dateFormatter;
 }

YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m

@@ -610,14 +610,14 @@
         }
         self.charmImageView.hidden = userInfo.userLevelVo.charmUrl.length <= 0;
         if(userInfo.isCustomWord == YES){
-            if (userInfo.nameplateWord.length>0) {
+            if (userInfo.nameplatePic.length > 0) {
                 self.nameplateImageView.imageUrl = userInfo.nameplatePic;
                 self.namePlateView.hidden = NO;
             } else {
                 self.namePlateView.hidden = YES;
             }
         }else{
-            if (userInfo.nameplateWord.length>0 && userInfo.nameplatePic.length>0) {
+            if (userInfo.nameplateWord.length > 0 && userInfo.nameplatePic.length > 0) {
                 self.nameplateImageView.imageUrl = userInfo.nameplatePic;
                 self.nameplateLabel.text = userInfo.nameplateWord;
                 self.namePlateView.hidden = NO;

YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m

@@ -1067,7 +1067,7 @@
                         make.height.mas_equalTo(KScreenHeight);
                     }];
                 }
-                [self.carVapEffectView setMute:YES];
+                [self.carVapEffectView setMute:NO];
                 [self.carVapEffectView playHWDMP4:videoUrl repeatCount:1 delegate:self];
             }
         } failureBlock:^(NSError * _Nullable error) {
@@ -2160,7 +2160,7 @@
                 make.height.mas_equalTo(KScreenHeight);
             }];
         }
-        [self.vapGiftEffectView setMute:YES];
+        [self.vapGiftEffectView setMute:NO];
         [self.vapGiftEffectView playHWDMP4:vapUrl repeatCount:1 delegate:self];
         return;
     }
@@ -2176,7 +2176,7 @@
                     make.height.mas_equalTo(KScreenHeight);
                 }];
             }
-            [self.vapGiftEffectView setMute:YES];
+            [self.vapGiftEffectView setMute:NO];
             [self.vapGiftEffectView playHWDMP4:videoUrl repeatCount:1 delegate:self];
         }
     } failureBlock:^(NSError * _Nullable error) {
@@ -2282,7 +2282,7 @@
                 make.height.mas_equalTo(KScreenHeight);
             }];
         }
-        [self.luckyVapGiftEffectView setMute:YES];
+        [self.luckyVapGiftEffectView setMute:NO];
         [self.luckyVapGiftEffectView playHWDMP4:vapUrl repeatCount:1 delegate:self];
         return;
     }
@@ -2297,7 +2297,7 @@
                     make.height.mas_equalTo(KScreenHeight);
                 }];
             }
-            [self.luckyVapGiftEffectView setMute:YES];
+            [self.luckyVapGiftEffectView setMute:NO];
             [self.luckyVapGiftEffectView playHWDMP4:videoUrl repeatCount:1 delegate:self];
         }
     } failureBlock:^(NSError * _Nullable error) {

YuMi/Modules/YMRoom/View/BackMusic/View/Cell/XPRoomMusicLibraryTableViewCell.m

@@ -70,7 +70,8 @@
 	_musicInfo = musicInfo;
 	if (_musicInfo) {
 		self.musicAlbumImageView.image = [UIImage imageWithData:_musicInfo.songAlbum];
-		self.songNameLabel.text = _musicInfo.songName;
+        NSString *name = _musicInfo.musicName.length == 0 ? _musicInfo.songName : _musicInfo.musicName;
+		self.songNameLabel.text = name;
 		self.authorLabel.text = _musicInfo.author;
 	}
 }

YuMi/Modules/YMRoom/View/BackMusic/View/SubViews/XPRoomBackMusicPlayerView.m

@@ -315,7 +315,8 @@ UIKIT_EXTERN NSString * kRoomBackMusicPlayMusicOrderKey;
 - (void)setCurrentMusic:(Music *)currentMusic {
 	_currentMusic = currentMusic;
 	if (_currentMusic) {
-		self.titleLabel.text = _currentMusic.songName;
+        NSString *name = _currentMusic.musicName.length == 0 ? _currentMusic.songName : _currentMusic.musicName;
+		self.titleLabel.text = name;
 	} else {
 		self.titleLabel.text = YMLocalizedString(@"XPRoomBackMusicPlayerView3");
 	}

YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomFunctionContainerView.m

@@ -286,7 +286,7 @@
         make.width.mas_equalTo(22);
         make.height.mas_equalTo(22);
     }];
-    CGFloat width = isMSEN() ? 65 : 55;
+    CGFloat width = 60;
     [self.contributeEnterView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.height.mas_equalTo(22);
         make.width.mas_equalTo(width);
@@ -304,26 +304,6 @@
         make.centerY.equalTo(self.rankStackView);
     }];
 }
-- (void)showLittleGameMiniView:(RoomType)type micCount:(NSInteger)micCount {
-    if (type == RoomType_MiniGame) {
-        if (!self.littleGameMiniView.superview) {
-            [self addSubview:self.littleGameMiniView];
-            [self.littleGameMiniView mas_makeConstraints:^(MASConstraintMaker *make) {
-                make.trailing.mas_equalTo(0);
-                make.top.mas_equalTo(kNavigationHeight);
-                make.height.mas_equalTo(23);
-            }];
-        }
-        self.littleGameMiniView.micCount = micCount;
-        if (micCount > 6) {
-            [self.littleGameMiniView removeFromSuperview];
-        }
-    } else {
-        if (self.littleGameMiniView.superview) {
-            [self.littleGameMiniView removeFromSuperview];
-        }
-    }
-}
 
 - (void)configLittleGameState {
     RoomInfoModel * roomInfo = self.delegate.getRoomInfo;
@@ -573,7 +553,7 @@
 	}
 	[self updateHourRankEntrance];
 	if (roomInfo.type == RoomType_Anchor) {
-        self.contributeEnterView.title = YMLocalizedString(@"XPRoomFunctionContainerView4");
+        self.contributeEnterView.title = YMLocalizedString(@"XPRoomFunctionContainerView7");
         if (roomInfo.hadChangeRoomType) {
             ///切换房间类型初始化当前用户与房间粉丝团关系
             [Api requestInRoomFansTeam:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
@@ -591,7 +571,6 @@
 	}
     
 	[self updateRoomTopic];
-    [self showLittleGameMiniView:roomInfo.type micCount:roomInfo.mgMicNum];
     [self configLittleGameState];
 	[self configPlayMusicRoomTypeChange];
 	[self configRoomPKPanelView:NO];
@@ -604,7 +583,7 @@
 	NSString * roomUid = [NSString stringWithFormat:@"%ld", roomInfo.uid];
 	[self updateHourRankEntrance];
 	if (roomInfo.type == RoomType_Anchor) {//个播房
-        self.contributeEnterView.title = YMLocalizedString(@"XPRoomFunctionContainerView6");
+        self.contributeEnterView.title = YMLocalizedString(@"XPRoomFunctionContainerView7");
         ///进房初始化当前用户与房间粉丝团关系
         [Api requestInRoomFansTeam:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
             XPAnchorFansRelationModel *model = [XPAnchorFansRelationModel modelWithJSON:data.data];
@@ -669,7 +648,6 @@
         [self handleAcrollPKCountView:roomInfo.pkBeginTime];
     }
 	[self updateRoomTopic];
-    [self showLittleGameMiniView:roomInfo.type micCount:roomInfo.mgMicNum];
     [self configLittleGameState];
 	[self configRoomPKPanelView:YES];
 	[self handleNewUserGreet];

YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomRankEntranceView.m

@@ -49,14 +49,14 @@
         
         [self.titleLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
             make.centerY.mas_equalTo(self.bgView);
-            make.leading.mas_equalTo(19);
+            make.leading.mas_equalTo(26);
             make.trailing.mas_equalTo(-4);
         }];
         [self.iconImageView mas_remakeConstraints:^(MASConstraintMaker *make) {
-            make.width.mas_equalTo(14);
-            make.height.mas_equalTo(9);
+            make.width.mas_equalTo(18);
+            make.height.mas_equalTo(15);
             make.centerY.mas_equalTo(self.bgView);
-            make.leading.mas_equalTo(3);
+            make.leading.mas_equalTo(5);
         }];
 }
 

YuMi/Modules/YMRoom/View/FirstRecharge/View/XPFirstRechargeView.m

@@ -72,7 +72,7 @@
 @property (nonatomic,strong) XPFirstRechargeCollectionView *rechargeView;
 @property (nonatomic,strong) FirstRechargeModel *currentInfo;
 @property (nonatomic,copy) NSString *orderId;
-@property(nonatomic,assign) BOOL pi_IsNative;
+
 @end
 @implementation XPFirstRechargeView
 
@@ -115,14 +115,7 @@
     }  channelType:@"3"];
     [self checkTranscationIds];
     
-    [Api requestMineChannel:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
-        @kStrongify(self);
-        if(code == 200){
-            if(data.data[@"isNative"] != nil){
-                self.pi_IsNative = [data.data[@"isNative"] boolValue];
-            }
-        }
-    }];
+  
 }
 #pragma mark - Private Method
 - (void)initSubViews {
@@ -494,13 +487,7 @@
 
 - (void)rechargeButtonAction {
     
-    if(self.pi_IsNative == NO){
-        if(self.delegate && [self.delegate respondsToSelector:@selector(rechargeHandle)]){
-            [self.delegate rechargeHandle];
-        }
-        [self backAction];
-        return;
-    }
+  
     
     if (self.currentInfo == nil|| self.currentInfo.chargeProdId == nil) {
         return;

YuMi/Modules/YMRoom/View/MSRoomOnLineView/MSRoomOnLineAvatarView.h

@@ -11,6 +11,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface MSRoomOnLineAvatarView : UIView
 @property(nonatomic,strong) XPMessageRemoteExtModel *model;
+@property(nonatomic,assign) BOOL isHiddenSubView;
 @end
 
 NS_ASSUME_NONNULL_END

YuMi/Modules/YMRoom/View/MSRoomOnLineView/MSRoomOnLineAvatarView.m

@@ -24,6 +24,11 @@
     [self addSubview:self.avatarView];
     [self addSubview:self.borderView];
 }
+- (void)setIsHiddenSubView:(BOOL)isHiddenSubView{
+    _isHiddenSubView = isHiddenSubView;
+    _borderView.hidden = _isHiddenSubView;
+    _avatarView.hidden = _isHiddenSubView;
+}
 -(void)installConstraints{
     [self.avatarView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.edges.equalTo(self);

YuMi/Modules/YMRoom/View/MSRoomOnLineView/MSRoomOnLineView.m

@@ -17,6 +17,7 @@
 @property(nonatomic,strong) UILabel *countView;
 ///头像背景
 @property(nonatomic,strong) UIScrollView *onlineStackView;
+@property(nonatomic,strong) UIStackView *stackView;
 @end
 @implementation MSRoomOnLineView
 
@@ -36,7 +37,7 @@
     [self.countBgView addSubview:self.countIconView];
     [self.countBgView addSubview:self.countView];
     
-    
+    [self.onlineStackView addSubview:self.stackView];
 }
 -(void)installConstraints{
     
@@ -61,20 +62,23 @@
         make.top.leading.equalTo(self);
         
     }];
+    [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.edges.equalTo(self.onlineStackView);
+    }];
     for (int i = 0; i < 3; i++) {
         MSRoomOnLineAvatarView *avatarView = [[MSRoomOnLineAvatarView alloc]initWithFrame:CGRectZero];
         avatarView.tag = 100 + i;
-        [self.onlineStackView addSubview:avatarView];
-        avatarView.hidden = YES;
-        CGFloat x = i * (24 + 5);
+        [self.stackView addArrangedSubview:avatarView];
+        avatarView.isHiddenSubView = YES;
         [avatarView mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.leading.mas_equalTo(x);
-            make.top.mas_equalTo(kGetScaleWidth(0));
             make.width.height.mas_equalTo(24);
         }];
-        
+       
+    }
+    if (isMSRTL()) {
+        self.onlineStackView.transform = CGAffineTransformMakeRotation(M_PI);
+        self.stackView.transform = CGAffineTransformMakeRotation(M_PI);
     }
-    
 }
 - (void)setCount:(NSString *)count{
     _count = count;
@@ -83,14 +87,39 @@
 - (void)setAvatarList:(NSArray *)avatarList{
     _avatarList = avatarList;
     if(_avatarList.count == 0)return;
-    for (int i = 0; i < 3; i++) {
-        MSRoomOnLineAvatarView *imageView = [self.onlineStackView viewWithTag:100 + 2-i];
-        if(i < _avatarList.count){
-            XPMessageRemoteExtModel *model = _avatarList[i];
-            imageView.model = model;
-        }
-        imageView.hidden = !(i < _avatarList.count);
+    MSRoomOnLineAvatarView *imageView1 = [self.stackView viewWithTag:100];
+    MSRoomOnLineAvatarView *imageView2 = [self.stackView viewWithTag:101];
+    MSRoomOnLineAvatarView *imageView3 = [self.stackView viewWithTag:102];
+    imageView1.isHiddenSubView = YES;
+    imageView2.isHiddenSubView = YES;
+    imageView3.isHiddenSubView = YES;
+    if(_avatarList.count == 1){
+        imageView3.isHiddenSubView = NO;
+        XPMessageRemoteExtModel *model3 = _avatarList[0];
+        imageView3.model = model3;
+    }else if(_avatarList.count == 2){
+        imageView2.isHiddenSubView = NO;
+        XPMessageRemoteExtModel *model2 = _avatarList[0];
+        imageView2.model = model2;
+        
+        imageView3.isHiddenSubView = NO;
+        XPMessageRemoteExtModel *model3 = _avatarList[1];
+        imageView3.model = model3;
+    }else{
+        imageView1.isHiddenSubView = NO;
+        XPMessageRemoteExtModel *model1 = _avatarList[0];
+        imageView1.model = model1;
+        
+        imageView2.isHiddenSubView = NO;
+        XPMessageRemoteExtModel *model2 = _avatarList[1];
+        imageView2.model = model2;
+        
+        imageView3.isHiddenSubView = NO;
+        XPMessageRemoteExtModel *model3 = _avatarList[2];
+        imageView3.model = model3;
+        
     }
+    
 }
 #pragma mark - 懒加载
 - (UIView *)countBgView{
@@ -124,4 +153,14 @@
     }
     return _onlineStackView;
 }
+    - (UIStackView *)stackView {
+        if (!_stackView) {
+            _stackView = [[UIStackView alloc] init];
+            _stackView.axis = UILayoutConstraintAxisHorizontal;
+            _stackView.distribution = UIStackViewDistributionFill;
+            _stackView.alignment = UIStackViewAlignmentCenter;
+            _stackView.spacing = 5;
+        }
+        return _stackView;
+    }
 @end

YuMi/Modules/YMRoom/View/MenuContainerView/MSRoomMenuGameView.m

@@ -49,9 +49,8 @@
 }
 -(void)setPlayList:(NSMutableArray<ActivityInfoModel *> *)playList{
     _playList = playList;
-    if(_playList.count < 6 || _playList.count == 0){
+    if(_playList.count < 6 && _playList.count > 0){
         [self.ms_bgView mas_updateConstraints:^(MASConstraintMaker *make) {
-           
             make.height.mas_equalTo(kGetScaleWidth(130));
             
         }];

YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomMenuContainerView.m

@@ -33,7 +33,7 @@
 #import "XPRoomHalfMessageView.h"
 #import "XPRoomMessageBubbleView.h"
 #import "MSRoomMenuGameVC.h"
-
+#import "SVGA.h"
 @interface XPRoomMenuContainerView ()<XPRoomMessageBubbleViewDelegate>
 ///滚动的容器
 @property (nonatomic,strong) UIScrollView *scrollView;
@@ -53,10 +53,11 @@
 @property (nonatomic,strong) UIButton *moreButton;
 ///礼物
 @property (nonatomic,strong) UIButton *giftButton;
+@property (nonatomic, strong) SVGAImageView *svgDisplayView;
+@property (strong, nonatomic) SVGAParser *parser;
 ///排麦
 @property (nonatomic,strong) UIButton *arrangeMicButton;
-///VIP
-@property (nonatomic,strong) UIButton *nobleButton;
+
 ///游戏、活动
 @property(nonatomic,strong) UIButton *gameButton;
 
@@ -93,7 +94,7 @@
     switch (type) {
         case XPRoomMenuItemType_Input:
         {
-            if (self.delegate.getRoomInfo.isCloseScreen) {
+            if (self.delegate.getRoomInfo.isCloseScreen && self.delegate.getPublicScreenType == 0) {
                 [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPRoomMenuContainerView0")];
                 return;
             }
@@ -115,8 +116,6 @@
                     }
                 }
             }
-            
-            
             self.micButton.selected = [RtcManager instance].isLocalMuted;
         }
             break;
@@ -228,8 +227,10 @@
 #pragma mark - Private Method
 - (void)initSubViews {
     [self addSubview:self.scrollView];
-    [self addSubview:self.giftButton];
     [self addSubview:self.gameButton];
+    [self addSubview:self.svgDisplayView];
+    [self addSubview:self.giftButton];
+    
     
     [self.scrollView addSubview:self.stackView];
     
@@ -240,13 +241,13 @@
     [self.stackView addArrangedSubview:self.arrangeMicButton];
     [self.stackView addArrangedSubview:self.messageButton];
     [self.stackView addArrangedSubview:self.moreButton];
-//    [self.stackView addArrangedSubview:self.nobleButton];
 
-    self.backgroundColor = UIColorRGBAlpha(0xFFFFFF, 0.15);
+
+    self.backgroundColor = UIColorRGBAlpha(0xFFFFFF, 0.2);
     CAShapeLayer * layer = [CAShapeLayer layer];
-    layer.path = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, KScreenWidth, 52 +kSafeAreaBottomHeight) byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(25, 25)].CGPath;
-    self.layer.shadowColor = UIColorRGBAlpha(0xFFFFFF, 0.1).CGColor;
-    self.layer.shadowOffset = CGSizeMake(0, 5);
+    layer.path = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, KScreenWidth, 52 +kSafeAreaBottomHeight) byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(23, 23)].CGPath;
+//    self.layer.shadowColor = UIColorRGBAlpha(0xFFFFFF, 0.1).CGColor;
+//    self.layer.shadowOffset = CGSizeMake(0, 5);
     self.layer.mask = layer;
     
     if (isMSRTL()) {
@@ -256,14 +257,24 @@
         self.scrollView.transform = CGAffineTransformIdentity;
         self.stackView.transform = CGAffineTransformIdentity;
     }
+    
+    @kWeakify(self);
+    [self.parser parseWithNamed:@"ms_room_gift_svga_icon" inBundle:nil completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) {
+        @kStrongify(self);
+        self.svgDisplayView.loops = INT_MAX;
+        self.svgDisplayView.clearsAfterStop = NO;
+        self.svgDisplayView.videoItem = videoItem;
+        [self.svgDisplayView startAnimation];
+    } failureBlock:^(NSError * _Nullable error) {
+    }];
 }
 
 - (void)initSubViewConstraints {
     [self.scrollView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.leading.mas_equalTo(self).offset(15);
-        make.trailing.mas_equalTo(self.gameButton.mas_leading).offset(-10);
-        make.top.mas_equalTo(self).offset(8);
-        make.bottom.mas_equalTo(self).offset(-12 - kSafeAreaBottomHeight);
+        make.leading.mas_equalTo(self).offset(40);
+        make.trailing.mas_equalTo(self.gameButton.mas_leading).offset(-11);
+        make.top.mas_equalTo(self).offset(16);
+        make.height.mas_equalTo(29);
     }];
     
     [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -271,18 +282,20 @@
     }];
   
     [self.inputButton  mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.size.mas_equalTo(CGSizeMake(100, 32));
+        make.size.mas_equalTo(CGSizeMake(90, 28));
     }];
-    
-    [self.giftButton mas_makeConstraints:^(MASConstraintMaker *make) {
+    [self.svgDisplayView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerY.mas_equalTo(self.scrollView);
-        make.trailing.mas_equalTo(self).offset(-20);
-        make.size.mas_equalTo(CGSizeMake(35, 35));
+        make.trailing.mas_equalTo(self).offset(-40);
+        make.size.mas_equalTo(CGSizeMake(32, 32));
+    }];
+    [self.giftButton mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.edges.equalTo(self.svgDisplayView);
     }];
     [self.gameButton mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerY.mas_equalTo(self.scrollView);
-        make.trailing.mas_equalTo(self).offset(-64);
-        make.size.mas_equalTo(CGSizeMake(32, 32));
+        make.trailing.mas_equalTo(self).offset(-83);
+        make.size.mas_equalTo(CGSizeMake(29, 29));
     }];
 }
 
@@ -486,11 +499,11 @@
         _inputButton = [UIButton buttonWithType:UIButtonTypeCustom];
         [_inputButton setTitle:YMLocalizedString(@"XPRoomMenuContainerView2") forState:UIControlStateNormal];
         [_inputButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
-        _inputButton.titleLabel.font = [UIFont systemFontOfSize:11];
+        _inputButton.titleLabel.font = [UIFont systemFontOfSize:10 weight:UIFontWeightMedium];
         _inputButton.titleLabel.numberOfLines = 2;
         _inputButton.layer.masksToBounds = YES;
-        _inputButton.layer.cornerRadius = 15;
-        [_inputButton setBackgroundImage:[UIImage imageNamed:@"pi_room_menu_bottom_send_bg"] forState:UIControlStateNormal];
+        _inputButton.layer.cornerRadius = 14;
+        _inputButton.backgroundColor = UIColorRGBAlpha(0x184450, 0.15);
         _inputButton.tag = XPRoomMenuItemType_Input;
         [_inputButton addTarget:self action:@selector(menuButtonAction:) forControlEvents:UIControlEventTouchUpInside];
     }
@@ -555,34 +568,37 @@
     return _moreButton;
 }
 
-- (UIButton *)nobleButton {
-    if (!_nobleButton) {
-        _nobleButton = [UIButton buttonWithType:UIButtonTypeCustom];
-        [_nobleButton setImage:[UIImage imageNamed:@"room_menu_noble"] forState:UIControlStateNormal];
-        _nobleButton.tag = XPRoomMenuItemType_Noble;
-        [_nobleButton addTarget:self action:@selector(menuButtonAction:) forControlEvents:UIControlEventTouchUpInside];
-    }
-    return _nobleButton;
-}
 
 - (UIButton *)giftButton {
     if (!_giftButton) {
         _giftButton = [UIButton buttonWithType:UIButtonTypeCustom];
-        [_giftButton setImage:[UIImage imageNamed:@"room_menu_gift"] forState:UIControlStateNormal];
-        [_giftButton setImage:[UIImage imageNamed:@"room_menu_gift"] forState:UIControlStateSelected];
         _giftButton.tag = XPRoomMenuItemType_Gift;
         [_giftButton addTarget:self action:@selector(menuButtonAction:) forControlEvents:UIControlEventTouchUpInside];
     }
     return _giftButton;
 }
+- (SVGAImageView *)svgDisplayView {
+    if (!_svgDisplayView) {
+        _svgDisplayView = [[SVGAImageView alloc] init];
+        _svgDisplayView.contentMode = UIViewContentModeScaleAspectFit;
+        _svgDisplayView.userInteractionEnabled = YES;
+    }
+    return _svgDisplayView;
+}
 
+- (SVGAParser *)parser {
+    if (!_parser) {
+        _parser = [[SVGAParser alloc]init];
+    }
+    return _parser;
+}
 - (UIStackView *)stackView {
     if (!_stackView) {
         _stackView = [[UIStackView alloc] init];
         _stackView.axis = UILayoutConstraintAxisHorizontal;
         _stackView.distribution = UIStackViewDistributionFill;
         _stackView.alignment = UIStackViewAlignmentCenter;
-        _stackView.spacing = 12;
+        _stackView.spacing = 11;
     }
     return _stackView;
 }
@@ -590,8 +606,8 @@
 - (UIButton *)arrangeMicButton {
     if (!_arrangeMicButton) {
         _arrangeMicButton = [UIButton buttonWithType:UIButtonTypeCustom];
-        [_arrangeMicButton setImage:[UIImage getLanguageImage:@"room_menu_arrange_mic"] forState:UIControlStateNormal];
-        [_arrangeMicButton setImage:[UIImage getLanguageImage:@"room_menu_arrange_mic_new"] forState:UIControlStateSelected];
+        [_arrangeMicButton setImage:kImage(@"room_menu_arrange_mic") forState:UIControlStateNormal];
+        [_arrangeMicButton setImage:kImage(@"room_menu_arrange_mic_new") forState:UIControlStateSelected];
         _arrangeMicButton.tag = XPRoomMenuItemType_ArrangeMic;
         [_arrangeMicButton addTarget:self action:@selector(menuButtonAction:) forControlEvents:UIControlEventTouchUpInside];
         _arrangeMicButton.hidden = YES;

YuMi/Modules/YMRoom/View/MessageContainerView/MsRoomMessagChatHallView.m

@@ -84,9 +84,46 @@
         self.hostDelegate = delegate;
         [self initSubViews];
         [self initSubViewConstraints];
+
+        [self add__test__button];
     }
     return self;
 }
+
+- (void)add__test__button {
+    UIButton *b = [UIButton buttonWithType:UIButtonTypeCustom];
+    b.titleLabel.text= @"测试按钮";
+    b.backgroundColor = [UIColor blackColor];
+    [b addTarget:self
+          action:@selector(__test__)
+forControlEvents:UIControlEventTouchUpInside];
+    [self addSubview:b];
+    [b mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.size.mas_equalTo(CGSizeMake(100, 40));
+        make.center.mas_equalTo(CGPointMake(100, 50));
+    }];
+}
+- (void)__test__ {
+    NSInteger randomNum = arc4random()%1000;
+    [self updateTitleView:(randomNum > 500) ?
+     [NSString stringWithFormat:@"测试头头头头拓土偷偷头条 %ld", (long)randomNum] :
+     @""];
+}
+
+- (void)updateTitleView:(NSString *)content {
+    self.titleView.text = content;
+
+    [self.headerView mas_remakeConstraints:^(MASConstraintMaker *make) {
+        make.leading.mas_equalTo(self).offset(15);
+        make.top.trailing.mas_equalTo(self);
+        if (content.length > 0) {
+            make.height.mas_greaterThanOrEqualTo(0);
+        }else {
+            make.height.mas_equalTo(0);
+        }
+    }];
+}
+
 #pragma mark - JXCategoryListContentViewDelegate
 - (UIView *)listView {
     return self;
@@ -96,16 +133,14 @@
 }
 #pragma mark - Response
 
-
-
-
-
-
 #pragma mark - Private Method
 - (void)initSubViews {
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(addCustomMessage:) name:@"message" object:nil];
     [self addSubview:self.headerView];
     [self.headerView addSubview:self.titleView];
+
+    self.headerView.backgroundColor = [UIColor colorWithWhite:0 alpha:0.8];
+
     [self addSubview:self.messageTableView];
     
     [Api getPublicChatHallTopText:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
@@ -113,21 +148,9 @@
             MSSessionPublicChatHallTopModel *model = [MSSessionPublicChatHallTopModel modelWithDictionary:data.data];
             if(model != nil){
                 self.titleView.text = model.content;
-                [self.headerView mas_remakeConstraints:^(MASConstraintMaker *make) {
-                    make.leading.mas_equalTo(self).offset(15);
-                    make.top.trailing.mas_equalTo(self);
-                    make.height.mas_greaterThanOrEqualTo(0);
-                    
-                }];
-            }else{
-                [self.headerView mas_remakeConstraints:^(MASConstraintMaker *make) {
-                    make.leading.mas_equalTo(self).offset(15);
-                    make.top.trailing.mas_equalTo(self);
-                    make.height.mas_equalTo(0);
-                    
-                }];
+            } else {
+                self.titleView.text = @"";
             }
-            
         }
     }];
 }
@@ -137,7 +160,6 @@
         make.leading.mas_equalTo(self).offset(15);
         make.top.trailing.mas_equalTo(self);
         make.height.mas_greaterThanOrEqualTo(0);
-        
     }];
     [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.leading.trailing.top.bottom.equalTo(self.headerView).inset(10);
@@ -147,14 +169,8 @@
         make.bottom.trailing.mas_equalTo(self);
         make.top.equalTo(self.headerView.mas_bottom).mas_offset(10);
     }];
-    
-
 }
 
-
-
-
-
 #pragma mark - 添加数据并且做自动滚动
 
 
@@ -165,10 +181,7 @@
             NSIndexPath *ip = [NSIndexPath indexPathForRow:self.datasource.count-1 inSection:0];  //取最后一行数据
             [self.messageTableView scrollToRowAtIndexPath:ip atScrollPosition:UITableViewScrollPositionBottom animated:animated]; //滚动到最后一行
            });
-        
-       
     }
-    
 }
 
 ///自定义消息 是否可以加到 公屏 需要自己维护
@@ -179,24 +192,10 @@
         if(attachment.first == CustomMessageType_Chat_Hall_Headlinesn && attachment.second == Custom_Message_Sub_Chat_Hall_Headlinesn){
             MSSessionPublicChatHallTopModel *topModel = [MSSessionPublicChatHallTopModel modelWithDictionary:attachment.data];
             if(topModel.recordStatus == 1){
-                self.titleView.text = topModel.content;
-                [self.headerView mas_remakeConstraints:^(MASConstraintMaker *make) {
-                    make.leading.mas_equalTo(self).offset(15);
-                    make.top.trailing.mas_equalTo(self);
-                    make.height.mas_equalTo(0);
-                    
-                }];
-            }else{
-                self.titleView.text = topModel.content;
-                [self.headerView mas_remakeConstraints:^(MASConstraintMaker *make) {
-                    make.leading.mas_equalTo(self).offset(15);
-                    make.top.trailing.mas_equalTo(self);
-                    make.height.mas_greaterThanOrEqualTo(0);
-                    
-                }];
-            }
-            if(topModel.recordStatus == 1){
+                self.titleView.text = @"";
                 return NO;
+            } else {
+                self.titleView.text = topModel.content;
             }
         }
         return  [[[self supportMessageDic] objectForKey:@(attachment.first)] containsObject:@(attachment.second)];
@@ -213,14 +212,14 @@
     };
 }
 -(void)addRoomMessage:(NIMMessage *)msg{
-    if (self.hostDelegate.getRoomInfo.isCloseScreen) {return;}
+   
     [self.datasource addObject:[self.messageParser parseMessageAttributeForChatHall:msg]];
     [self.messageTableView reloadData];
     [self scrollToBottom:YES];
 }
 - (void)addCustomMessage:(NSNotification *)notification {
     self.isMiniEnter = NO;
-    if (self.hostDelegate.getRoomInfo.isCloseScreen) {return;}
+   
     NIMMessage * message = notification.object;
     [self addRoomMessage:message];
 }
@@ -234,13 +233,13 @@
 - (void)handleNIMCustomMessage:(NIMMessage *)message {
     self.isMiniEnter = NO;
     if ([self isCanDisplayMessage:message]) {
-        NIMCustomObject *obj = (NIMCustomObject *)message.messageObject;
+//        NIMCustomObject *obj = (NIMCustomObject *)message.messageObject;
         [self addRoomMessage:message];
     }
 }
 - (void)handleNIMImageMessage:(NIMMessage *)message {
     self.isMiniEnter = NO;
-    if (self.hostDelegate.getRoomInfo.isCloseScreen) {return;}
+   
     PIRoomPhotoAlbumItemModel*model = [PIRoomPhotoAlbumItemModel new];
     model.type = @"1";
     model.status = 1;
@@ -262,22 +261,9 @@
     self.isMiniEnter = NO;
     NIMNotificationObject *notiMsg = (NIMNotificationObject *)message.messageObject;
     NIMChatroomNotificationContent *content = (NIMChatroomNotificationContent *)notiMsg.content;
-    RoomInfoModel * roomInfo = self.hostDelegate.getRoomInfo;
+//    RoomInfoModel * roomInfo = self.hostDelegate.getRoomInfo;
     if (content.eventType == NIMChatroomEventTypeEnter) {
-       
-        if (roomInfo.isCloseScreen) {
-            self.isLoadHistoryMessage = NO;
-            AttachmentModel *attachement = [[AttachmentModel alloc]init];
-            attachement.first = CustomMessageType_Update_RoomInfo;
-            attachement.second = Custom_Message_Sub_Update_RoomInfo_MessageState;
-            attachement.data = @{@"roomInfo":self.hostDelegate.getRoomInfo.model2dictionary};
-            NIMMessage *message = [[NIMMessage alloc]init];
-            NIMCustomObject *object = [[NIMCustomObject alloc] init];
-            object.attachment = attachement;
-            message.messageObject = object;
-            [self addRoomMessage:message];
-            return;
-        } else {
+
             NIMChatroomNotificationMember *member = content.targets[0];
             if (member.userId.integerValue == [AccountInfoStorage instance].getUid.integerValue) {
                 ///自己进房成功后拉取历史消息
@@ -290,7 +276,7 @@
             } else {
                 self.isLoadHistoryMessage = NO;
             }
-        }
+        
     } 
 }
 
@@ -400,7 +386,7 @@
 }
 - (void)handleNIMTextMessage:(NIMMessage *)message {
     self.isMiniEnter = NO;
-    if (self.hostDelegate.getRoomInfo.isCloseScreen) {return;}
+  
     [self addRoomMessage:message];
 }
 
@@ -448,18 +434,18 @@
         }
     }];
    
-    self.headerView.backgroundColor = UIColorRGBAlpha(0xADF4FF, 0.2);
+//    self.headerView.backgroundColor = UIColorRGBAlpha(0xADF4FF, 0.2);
    
 }
 
 - (void)onRoomEntered {
-    self.headerView.backgroundColor = UIColorRGBAlpha(0xADF4FF, 0.2);
+//    self.headerView.backgroundColor = UIColorRGBAlpha(0xADF4FF, 0.2);
 }
 
 - (void)onRoomUpdate {
     ///改变公屏的背景样式
     if (self.hostDelegate.getRoomInfo.hadChangeRoomType) {
-        self.headerView.backgroundColor = UIColorRGBAlpha(0xADF4FF, 0.2);
+//        self.headerView.backgroundColor = UIColorRGBAlpha(0xADF4FF, 0.2);
         [self.messageTableView reloadData];
     }
 }

YuMi/Modules/YMRoom/View/MessageContainerView/MsRoomMessageMainView.m

@@ -45,7 +45,7 @@
 -(void)installConstraints{
     [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.leading.mas_equalTo(kGetScaleWidth(0));
-        make.width.mas_equalTo(isMSZH() ? 150 : 200);
+        make.width.mas_equalTo(150);
         make.height.mas_equalTo(kGetScaleWidth(30));
         
     }];
@@ -147,7 +147,7 @@
         _titleView.defaultSelectedIndex = 0;
         _titleView.cellSpacing = 20;
         _titleView.cellWidthIncrement = 5;
-        _titleView.cellWidth = 40;
+        _titleView.cellWidth = 30;
         _titleView.listContainer = self.pi_containerView;
         
         JXCategoryIndicatorImageView *lineView = [[JXCategoryIndicatorImageView alloc] init];
@@ -163,7 +163,7 @@
 
 - (NSArray<NSString *> *)titles{
     if(!_titles){
-        _titles = @[YMLocalizedString(@"XPMineMainGuildListVC1"),YMLocalizedString(@"MSSessionPublicChatHallVC0")];
+        _titles = @[YMLocalizedString(@"XPMineMainGuildListVC1"),YMLocalizedString(@"MSSessionPublicChatHallVC2")];
     }
     return _titles;
 }
@@ -183,7 +183,7 @@
 }
 - (MsRoomMessagChatHallView *)chatHallView{
     if(!_chatHallView){
-        _chatHallView = [[MsRoomMessagChatHallView alloc]initWithDelegate:self.hostDelegate];
+        _chatHallView = [[MsRoomMessagChatHallView alloc] initWithDelegate:self.hostDelegate];
     }
     return _chatHallView;
 }

YuMi/Modules/YMRoom/View/MessageContainerView/View/XPRoomMessageHeaderView.m

@@ -107,7 +107,7 @@
 	if (!_titleLabel) {
 		_titleLabel = [[UILabel alloc] init];
 		_titleLabel.font = [UIFont systemFontOfSize:kRoomMessageDefalutFont];
-		_titleLabel.textColor = [DJDKMIMOMColor appMainColor];
+		_titleLabel.textColor = [UIColor whiteColor];
 		_titleLabel.numberOfLines = 0;
 	}
 	return _titleLabel;

YuMi/Modules/YMRoom/View/MessageContainerView/View/XPRoomMessageTableViewCell.m

@@ -141,7 +141,7 @@
 	if (_roomType == RoomType_MiniGame) {
 		_bubbleImageView.image = [UIImage imageWithColor:[UIColor colorWithWhite:1 alpha:0.2]];
 	} else {
-		_bubbleImageView.image = [UIImage imageWithColor:[DJDKMIMOMColor messageBubbleColor]];
+        _bubbleImageView.image = [UIImage imageWithColor:[DJDKMIMOMColor messageBubbleColor]];
 	}
 }
 
@@ -152,7 +152,6 @@
 		_bubbleImageView.userInteractionEnabled = YES;
 		_bubbleImageView.layer.masksToBounds = YES;
 		_bubbleImageView.layer.cornerRadius = 7;
-		_bubbleImageView.userInteractionEnabled = YES;
 	}
 	return _bubbleImageView;
 }

YuMi/Modules/YMRoom/View/MessageContainerView/XPRoomMessageContainerView.m

@@ -904,13 +904,13 @@ NSString * const kRoomShowTopicKey = @"kRoomShowTopicKey";
 
 - (void)onRoomEntered {
 	[[XPRoomMiniManager shareManager]  resetLocalMessage];
-	self.headerView.bubbleColor = self.hostDelegate.getRoomInfo.type == RoomType_MiniGame ? [UIColor colorWithWhite:1 alpha:0.2] : [DJDKMIMOMColor messageBubbleColor];
+	self.headerView.bubbleColor = self.hostDelegate.getRoomInfo.type == RoomType_MiniGame ? [UIColor colorWithWhite:1 alpha:0.2] : [UIColor colorWithWhite:1 alpha:0.3];
 }
 
 - (void)onRoomUpdate {
 	///改变公屏的背景样式
 	if (self.hostDelegate.getRoomInfo.hadChangeRoomType) {
-		self.headerView.bubbleColor = self.hostDelegate.getRoomInfo.type == RoomType_MiniGame ? [UIColor colorWithWhite:1 alpha:0.2] : [DJDKMIMOMColor messageBubbleColor];
+		self.headerView.bubbleColor = self.hostDelegate.getRoomInfo.type == RoomType_MiniGame ? [UIColor colorWithWhite:1 alpha:0.2] : [UIColor colorWithWhite:1 alpha:0.3];
 		[self.messageTableView reloadData];
 	}
 }

YuMi/Modules/YMRoom/View/Setting/Model/XPRoomSettingItemModel.h

@@ -34,6 +34,8 @@ typedef NS_ENUM(NSInteger, RoomSettingItemType) {
 	RoomSettingItemType_Leave_Model,
     ///关闭礼物值
     RoomSettingItemType_Gift_Value_Model,
+    ///主题
+    RoomSettingItemType_Theme ,
 };
 
 @interface XPRoomSettingItemModel : PIBaseModel

YuMi/Modules/YMRoom/View/Setting/Presenter/XPRoomSettingPresenter.h

@@ -57,7 +57,7 @@ NS_ASSUME_NONNULL_BEGIN
 				roomId:(NSString *)roomId
 				  type:(RoomType)type
 			  itemType:(RoomSettingItemType)itemType
-				  mgId:(NSString *)mgId;
+				  mgId:(NSString *)mgId backPic:(NSString *)backPic;
 /// 获取房间在线用户
 /// @param roomUid roomUid
 -(void)getRoomOnlineUserListWithRoomUid:(NSString *)roomUid;

YuMi/Modules/YMRoom/View/Setting/Presenter/XPRoomSettingPresenter.m

@@ -25,6 +25,10 @@
 	titleItem.title = YMLocalizedString(@"XPRoomSettingPresenter0");
 	titleItem.subTitle = roomInfo.title;
 	titleItem.type = RoomSettingItemType_Title;
+    
+    XPRoomSettingItemModel * themeItem = [[XPRoomSettingItemModel alloc] init];
+    themeItem.title = YMLocalizedString(@"XPRoomSettingPresenter12");
+    themeItem.type = RoomSettingItemType_Theme;
 	
 	XPRoomSettingItemModel * lockItem = [[XPRoomSettingItemModel alloc] init];
 	lockItem.title = YMLocalizedString(@"XPRoomSettingPresenter1");
@@ -224,6 +228,13 @@
                     [subList addObject:giftValueItem];
                 }
                 list[2] = subList;
+                
+                NSMutableArray *themeList = [[NSMutableArray alloc]initWithArray:[list safeObjectAtIndex1:1]?:@[]];
+                if(themeList){
+                    [themeList addObject:themeItem];
+                }
+                list[1] = themeList;
+                
             }
            
 			[[self getView] getRoomSettingListSuccess:list];
@@ -300,7 +311,7 @@
 /// @param roomUid 房间uid
 /// @param roomId 群聊的id
 /// @param mgId 小游戏的id
-- (void)updateRoomInfo:(NSString *)title roomPwd:(NSString *)roomPwd tagId:(NSString *)tagId classifyId:(NSString *)classifyId hasAnimationEffect:(BOOL)hasAnimationEffect roomUid:(NSString *)roomUid roomId:(NSString *)roomId type:(RoomType)type itemType:(RoomSettingItemType)itemType mgId:(NSString *)mgId{
+- (void)updateRoomInfo:(NSString *)title roomPwd:(NSString *)roomPwd tagId:(NSString *)tagId classifyId:(NSString *)classifyId hasAnimationEffect:(BOOL)hasAnimationEffect roomUid:(NSString *)roomUid roomId:(NSString *)roomId type:(RoomType)type itemType:(RoomSettingItemType)itemType mgId:(NSString *)mgId backPic:(NSString *)backPic{
 	NSString * uid = [AccountInfoStorage instance].getUid;
 	NSString * ticket = [AccountInfoStorage instance].getTicket;
 	NSMutableDictionary * params = [NSMutableDictionary dictionary];
@@ -310,7 +321,9 @@
 	if (title.length > 0) {
 		[params setObject:title forKey:@"title"];
 	}
-	
+    if(backPic.length > 0){
+        [params setObject:backPic forKey:@"backPic"];
+    }
 	if (roomPwd.length > 0) {
 		[params setObject:roomPwd forKey:@"roomPwd"];
 	} else{

YuMi/Modules/YMRoom/View/Setting/View/Cell/MSRoomSetingBackdropCell.h

@@ -0,0 +1,17 @@
+//
+//  MSRoomSetingBackdropCell.h
+//  YuMi
+//
+//  Created by duoban on 2024/5/22.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface MSRoomSetingBackdropCell : UICollectionViewCell
+@property(nonatomic,assign) BOOL isUse;
+@property(nonatomic,copy) NSString *imageUrl;
+@end
+
+NS_ASSUME_NONNULL_END

YuMi/Modules/YMRoom/View/Setting/View/Cell/MSRoomSetingBackdropCell.m

@@ -0,0 +1,81 @@
+//
+//  MSRoomSetingBackdropCell.m
+//  YuMi
+//
+//  Created by duoban on 2024/5/22.
+//
+
+#import "MSRoomSetingBackdropCell.h"
+@interface MSRoomSetingBackdropCell()
+@property(nonatomic,strong) NetImageView *backdropView;
+@property(nonatomic,strong) UILabel *useView;
+@property(nonatomic,strong) UIView *bgView;
+@end
+@implementation MSRoomSetingBackdropCell
+-(instancetype)initWithFrame:(CGRect)frame{
+    self = [super initWithFrame:frame];
+    if(self){
+        [self installUI];
+        [self installConstraints];
+    }
+    return self;
+}
+-(void)installUI{
+    
+    [self.contentView addSubview:self.backdropView];
+    [self.contentView addSubview:self.bgView];
+    [self.bgView addSubview:self.useView];
+    self.bgView.hidden = YES;
+}
+- (void)setIsUse:(BOOL)isUse{
+    _isUse = isUse;
+    _bgView.hidden = !_isUse;
+}
+-(void)setImageUrl:(NSString *)imageUrl{
+    _imageUrl = imageUrl;
+    _backdropView.image = nil;
+    [_backdropView loadImageWithUrl:_imageUrl completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) {
+        self.backdropView.image = image;
+    }];
+}
+-(void)installConstraints{
+    [self.backdropView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.edges.equalTo(self.contentView);
+    }];
+    [self.bgView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.leading.equalTo(self.contentView);
+        make.height.mas_equalTo(kGetScaleWidth(20));
+        make.width.mas_greaterThanOrEqualTo(kGetScaleWidth(50));
+    }];
+    [self.useView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.leading.trailing.equalTo(self.bgView).inset(kGetScaleWidth(6));
+        make.centerY.equalTo(self.bgView);
+    }];
+}
+#pragma mark - 懒加载
+- (NetImageView *)backdropView{
+    if(!_backdropView){
+        NetImageConfig *config = [[NetImageConfig alloc]init];
+        config.placeHolder = [UIImageConstant defaultEmptyAvatarPlaceholder];
+        _backdropView = [[NetImageView alloc]initWithConfig:config];
+        _backdropView.layer.cornerRadius = kGetScaleWidth(5);
+        _backdropView.layer.masksToBounds = YES;
+    }
+    return _backdropView;
+}
+- (UIView *)bgView{
+    if(!_bgView){
+        _bgView = [UIView new];
+        _bgView.backgroundColor = UIColorFromRGB(0xB2AFFF);
+        _bgView.layer.cornerRadius = kGetScaleWidth(5);
+        _bgView.layer.masksToBounds = YES;
+    }
+    return _bgView;
+}
+- (UILabel *)useView{
+    if(!_useView){
+        _useView = [UILabel labelInitWithText:YMLocalizedString(@"MSRoomSetingBackdropCell0") font:kFontMedium(13) textColor:[UIColor whiteColor]];
+    }
+    return _useView;
+}
+@end

YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomSettingTableViewCell.m

@@ -84,7 +84,7 @@
 - (void)setItemModel:(XPRoomSettingItemModel *)itemModel {
 	_itemModel = itemModel;
 	self.titleLabel.text = _itemModel.title;
-	if (_itemModel.type == RoomSettingItemType_Title || _itemModel.type == RoomSettingItemType_Class || _itemModel.type == RoomSettingItemType_Tag || _itemModel.type == RoomSettingItemType_Black_List || _itemModel.type == RoomSettingItemType_Manager_List || _itemModel.type == RoomSettingItemType_Pwd) {
+	if (_itemModel.type == RoomSettingItemType_Title || _itemModel.type == RoomSettingItemType_Class || _itemModel.type == RoomSettingItemType_Tag || _itemModel.type == RoomSettingItemType_Black_List || _itemModel.type == RoomSettingItemType_Manager_List || _itemModel.type == RoomSettingItemType_Pwd || _itemModel.type == RoomSettingItemType_Theme) {
 		self.switchView.hidden = YES;
 		self.arrowImageView.hidden = NO;
 		self.subTitleLabel.hidden = NO;