diff --git a/YuMi.xcodeproj/project.pbxproj b/YuMi.xcodeproj/project.pbxproj index 8565926d..87f79d00 100644 --- a/YuMi.xcodeproj/project.pbxproj +++ b/YuMi.xcodeproj/project.pbxproj @@ -368,6 +368,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 */; }; @@ -497,7 +506,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 */; }; @@ -560,7 +568,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 */; }; @@ -959,7 +966,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 */; }; @@ -1189,8 +1195,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 */; }; @@ -1388,7 +1392,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 */; }; @@ -2252,6 +2255,23 @@ 239D0F952BFB3296002977CE /* MSRoomOnLineView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSRoomOnLineView.m; sourceTree = ""; }; 239D0F972BFB43BC002977CE /* MSRoomOnLineAvatarView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSRoomOnLineAvatarView.h; sourceTree = ""; }; 239D0F982BFB43BC002977CE /* MSRoomOnLineAvatarView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSRoomOnLineAvatarView.m; sourceTree = ""; }; + 239D0F9A2BFC9E6C002977CE /* ms_room_gift_svga_icon.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = ms_room_gift_svga_icon.svga; sourceTree = ""; }; + 239D0F9C2BFCB88C002977CE /* XPRoomBackContainerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPRoomBackContainerView.m; sourceTree = ""; }; + 239D0F9D2BFCB88C002977CE /* XPRoomDatingWebAlertView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPRoomDatingWebAlertView.h; sourceTree = ""; }; + 239D0F9E2BFCB88C002977CE /* XPRoomFunctionContainerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPRoomFunctionContainerView.h; sourceTree = ""; }; + 239D0F9F2BFCB88C002977CE /* XPRoomAnchorRankEnterView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPRoomAnchorRankEnterView.h; sourceTree = ""; }; + 239D0FA02BFCB88D002977CE /* XPRoomDatingVipUpMicView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPRoomDatingVipUpMicView.h; sourceTree = ""; }; + 239D0FA12BFCB88D002977CE /* XPRoomDatingVipUpMicView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPRoomDatingVipUpMicView.m; sourceTree = ""; }; + 239D0FA22BFCB88D002977CE /* XPRoomDatingWebAlertView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPRoomDatingWebAlertView.m; sourceTree = ""; }; + 239D0FA32BFCB88D002977CE /* XPRoomFunctionContainerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPRoomFunctionContainerView.m; sourceTree = ""; }; + 239D0FA42BFCB88D002977CE /* XPRoomRankEntranceView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPRoomRankEntranceView.m; sourceTree = ""; }; + 239D0FA52BFCB88D002977CE /* XPRoomAnchorRankEnterView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPRoomAnchorRankEnterView.m; sourceTree = ""; }; + 239D0FA62BFCB88D002977CE /* XPRoomRankEntranceView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPRoomRankEntranceView.h; sourceTree = ""; }; + 239D0FA72BFCB88D002977CE /* XPRoomBackContainerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPRoomBackContainerView.h; sourceTree = ""; }; + 239D0FAE2BFD8C4D002977CE /* MSRoomSetingBackdropVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSRoomSetingBackdropVC.h; sourceTree = ""; }; + 239D0FAF2BFD8C4D002977CE /* MSRoomSetingBackdropVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSRoomSetingBackdropVC.m; sourceTree = ""; }; + 239D0FB12BFD8C67002977CE /* MSRoomSetingBackdropCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSRoomSetingBackdropCell.h; sourceTree = ""; }; + 239D0FB22BFD8C67002977CE /* MSRoomSetingBackdropCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSRoomSetingBackdropCell.m; sourceTree = ""; }; 23A03F2C2B4408CD0094227A /* pi_room_lucky_gift.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = pi_room_lucky_gift.svga; sourceTree = ""; }; 23A439722AA1CF7C002E6039 /* XPNewHomeHeadView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPNewHomeHeadView.h; sourceTree = ""; }; 23A439732AA1CF7C002E6039 /* XPNewHomeHeadView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPNewHomeHeadView.m; sourceTree = ""; }; @@ -2493,8 +2513,6 @@ 9B0086C527BA392B0032BD2B /* AnchorStageView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AnchorStageView.m; sourceTree = ""; }; 9B0086C827BA4F570032BD2B /* AnchorMicroView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AnchorMicroView.h; sourceTree = ""; }; 9B0086C927BA4F570032BD2B /* AnchorMicroView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AnchorMicroView.m; sourceTree = ""; }; - 9B044D9B282D2A6400DE4859 /* XPRoomAnchorRankEnterView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomAnchorRankEnterView.h; sourceTree = ""; }; - 9B044D9C282D2A6400DE4859 /* XPRoomAnchorRankEnterView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomAnchorRankEnterView.m; sourceTree = ""; }; 9B044D9E282D32F700DE4859 /* MicroInviteExtModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MicroInviteExtModel.h; sourceTree = ""; }; 9B044D9F282D32F700DE4859 /* MicroInviteExtModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MicroInviteExtModel.m; sourceTree = ""; }; 9B0997A027F19D8900EB8F14 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; @@ -2619,8 +2637,6 @@ 9B85F3552806DD8A006EDF51 /* XPAnchorPKFinishView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPAnchorPKFinishView.m; sourceTree = ""; }; 9B86D8782817DD8400494FCD /* XPRoomEnterHideTipView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomEnterHideTipView.h; sourceTree = ""; }; 9B86D8792817DD8400494FCD /* XPRoomEnterHideTipView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomEnterHideTipView.m; sourceTree = ""; }; - 9B86D88128192DC000494FCD /* XPRoomRankEntranceView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomRankEntranceView.h; sourceTree = ""; }; - 9B86D88228192DC000494FCD /* XPRoomRankEntranceView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomRankEntranceView.m; sourceTree = ""; }; 9B86D884281942D200494FCD /* SocialMicroView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SocialMicroView.h; sourceTree = ""; }; 9B86D885281942D200494FCD /* SocialMicroView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SocialMicroView.m; sourceTree = ""; }; 9B87B3CB2926473D00085110 /* XPSessionListHeadFriendCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSessionListHeadFriendCell.h; sourceTree = ""; }; @@ -3260,8 +3276,6 @@ E8383699298A59C100112E1C /* MessageTipsView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageTipsView.m; sourceTree = ""; }; E838D99E275E1BF60079E0B5 /* XPRoomAnimationView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomAnimationView.h; sourceTree = ""; }; E838D99F275E1BF60079E0B5 /* XPRoomAnimationView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomAnimationView.m; sourceTree = ""; }; - E83953202769F33B00CF2F24 /* XPRoomFunctionContainerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomFunctionContainerView.h; sourceTree = ""; }; - E83953212769F33B00CF2F24 /* XPRoomFunctionContainerView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomFunctionContainerView.m; sourceTree = ""; }; E8395328276A002800CF2F24 /* XPMineDressUpViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineDressUpViewController.h; sourceTree = ""; }; E8395329276A002800CF2F24 /* XPMineDressUpViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineDressUpViewController.m; sourceTree = ""; }; E839532B276A030F00CF2F24 /* XPMineDressUpListViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineDressUpListViewController.h; sourceTree = ""; }; @@ -3748,10 +3762,6 @@ E877A7EA2783E24700EFACED /* DatingStageView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DatingStageView.m; sourceTree = ""; }; E877A7EC278428FB00EFACED /* MicroDatingProgressView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MicroDatingProgressView.h; sourceTree = ""; }; E877A7ED278428FB00EFACED /* MicroDatingProgressView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MicroDatingProgressView.m; sourceTree = ""; }; - E877A7EF27842B2F00EFACED /* XPRoomDatingWebAlertView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomDatingWebAlertView.h; sourceTree = ""; }; - E877A7F027842B2F00EFACED /* XPRoomDatingWebAlertView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomDatingWebAlertView.m; sourceTree = ""; }; - E877A7F227842EF800EFACED /* XPRoomDatingVipUpMicView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomDatingVipUpMicView.h; sourceTree = ""; }; - E877A7F327842EF800EFACED /* XPRoomDatingVipUpMicView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomDatingVipUpMicView.m; sourceTree = ""; }; 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 = ""; }; E8788933273A53D700BF1D57 /* XPSendGiftView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPSendGiftView.m; sourceTree = ""; }; @@ -4160,8 +4170,6 @@ E8AE427227153A3500BEEBB2 /* XPRoomActivityContainerView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomActivityContainerView.m; sourceTree = ""; }; E8AEAED4271412EC0017FCE0 /* XPRoomViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomViewController.h; sourceTree = ""; }; E8AEAED5271412EC0017FCE0 /* XPRoomViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomViewController.m; sourceTree = ""; }; - E8AEAEEB27141AE20017FCE0 /* XPRoomBackContainerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomBackContainerView.h; sourceTree = ""; }; - E8AEAEEC27141AE20017FCE0 /* XPRoomBackContainerView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomBackContainerView.m; sourceTree = ""; }; E8AEAEEE27141C430017FCE0 /* XPRoomMenuContainerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomMenuContainerView.h; sourceTree = ""; }; E8AEAEEF27141C430017FCE0 /* XPRoomMenuContainerView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomMenuContainerView.m; sourceTree = ""; }; E8AEAEF127141C7C0017FCE0 /* XPRoomMessageContainerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomMessageContainerView.h; sourceTree = ""; }; @@ -8004,6 +8012,8 @@ E8412FA32779BE9B006E1101 /* Cell */, E8412FA02779BE8F006E1101 /* XPRoomSettingViewController.h */, E8412FA12779BE8F006E1101 /* XPRoomSettingViewController.m */, + 239D0FAE2BFD8C4D002977CE /* MSRoomSetingBackdropVC.h */, + 239D0FAF2BFD8C4D002977CE /* MSRoomSetingBackdropVC.m */, E87AE7F7277AABE50037823A /* XPRoomTagListViewController.h */, E87AE7F8277AABE50037823A /* XPRoomTagListViewController.m */, E84BF7D2277C383700EF8877 /* XPRoomSettingInputView.h */, @@ -8059,6 +8069,8 @@ E84BF7DC277C765400EF8877 /* XPRoomRoleEmptyTableViewCell.m */, E89BD7D2277D471100E31B19 /* XPRoomOnlineTableViewCell.h */, E89BD7D3277D471100E31B19 /* XPRoomOnlineTableViewCell.m */, + 239D0FB12BFD8C67002977CE /* MSRoomSetingBackdropCell.h */, + 239D0FB22BFD8C67002977CE /* MSRoomSetingBackdropCell.m */, ); path = Cell; sourceTree = ""; @@ -9716,6 +9728,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 */, @@ -10031,18 +10044,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 = ""; @@ -11042,6 +11055,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 */, @@ -11173,7 +11187,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 */, @@ -11298,6 +11311,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 */, @@ -11348,7 +11362,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 */, @@ -11387,6 +11400,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 */, @@ -11568,7 +11582,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 */, @@ -11605,7 +11618,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 */, @@ -11755,6 +11767,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 */, @@ -11898,6 +11911,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 */, @@ -12049,6 +12063,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 */, @@ -12174,7 +12189,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 */, @@ -12238,6 +12252,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 */, @@ -12254,6 +12269,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 */, @@ -12263,6 +12279,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 */, @@ -12327,7 +12344,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 */, diff --git a/YuMi/Assets.xcassets/Language/ar/room_menu_arrange_mic_ar.imageset/room_menu_arrange_mic_ar@2x.png b/YuMi/Assets.xcassets/Language/ar/room_menu_arrange_mic_ar.imageset/room_menu_arrange_mic_ar@2x.png deleted file mode 100644 index fc4fc5b9..00000000 Binary files a/YuMi/Assets.xcassets/Language/ar/room_menu_arrange_mic_ar.imageset/room_menu_arrange_mic_ar@2x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/Language/ar/room_menu_arrange_mic_ar.imageset/room_menu_arrange_mic_ar@3x.png b/YuMi/Assets.xcassets/Language/ar/room_menu_arrange_mic_ar.imageset/room_menu_arrange_mic_ar@3x.png deleted file mode 100644 index 00de4ee4..00000000 Binary files a/YuMi/Assets.xcassets/Language/ar/room_menu_arrange_mic_ar.imageset/room_menu_arrange_mic_ar@3x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/Language/ar/room_menu_arrange_mic_new_ar.imageset/Contents.json b/YuMi/Assets.xcassets/Language/ar/room_menu_arrange_mic_new_ar.imageset/Contents.json deleted file mode 100644 index 39755296..00000000 --- a/YuMi/Assets.xcassets/Language/ar/room_menu_arrange_mic_new_ar.imageset/Contents.json +++ /dev/null @@ -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 - } -} diff --git a/YuMi/Assets.xcassets/Language/ar/room_menu_arrange_mic_new_ar.imageset/room_menu_arrange_mic_new_ar@2x.png b/YuMi/Assets.xcassets/Language/ar/room_menu_arrange_mic_new_ar.imageset/room_menu_arrange_mic_new_ar@2x.png deleted file mode 100644 index bcd91be4..00000000 Binary files a/YuMi/Assets.xcassets/Language/ar/room_menu_arrange_mic_new_ar.imageset/room_menu_arrange_mic_new_ar@2x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/Language/ar/room_menu_arrange_mic_new_ar.imageset/room_menu_arrange_mic_new_ar@3x.png b/YuMi/Assets.xcassets/Language/ar/room_menu_arrange_mic_new_ar.imageset/room_menu_arrange_mic_new_ar@3x.png deleted file mode 100644 index 2335be3a..00000000 Binary files a/YuMi/Assets.xcassets/Language/ar/room_menu_arrange_mic_new_ar.imageset/room_menu_arrange_mic_new_ar@3x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/Language/en/room_menu_arrange_mic_en.imageset/Contents.json b/YuMi/Assets.xcassets/Language/en/room_menu_arrange_mic_en.imageset/Contents.json deleted file mode 100644 index 7c78f86d..00000000 --- a/YuMi/Assets.xcassets/Language/en/room_menu_arrange_mic_en.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "room_menu_arrange_mic_en@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "room_menu_arrange_mic_en@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/YuMi/Assets.xcassets/Language/en/room_menu_arrange_mic_en.imageset/room_menu_arrange_mic_en@2x.png b/YuMi/Assets.xcassets/Language/en/room_menu_arrange_mic_en.imageset/room_menu_arrange_mic_en@2x.png deleted file mode 100644 index 46700ecd..00000000 Binary files a/YuMi/Assets.xcassets/Language/en/room_menu_arrange_mic_en.imageset/room_menu_arrange_mic_en@2x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/Language/en/room_menu_arrange_mic_en.imageset/room_menu_arrange_mic_en@3x.png b/YuMi/Assets.xcassets/Language/en/room_menu_arrange_mic_en.imageset/room_menu_arrange_mic_en@3x.png deleted file mode 100644 index b49b6340..00000000 Binary files a/YuMi/Assets.xcassets/Language/en/room_menu_arrange_mic_en.imageset/room_menu_arrange_mic_en@3x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/Language/en/room_menu_arrange_mic_new_en.imageset/Contents.json b/YuMi/Assets.xcassets/Language/en/room_menu_arrange_mic_new_en.imageset/Contents.json deleted file mode 100644 index d75369b0..00000000 --- a/YuMi/Assets.xcassets/Language/en/room_menu_arrange_mic_new_en.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "room_menu_arrange_mic_new_en@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "room_menu_arrange_mic_new_en@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/YuMi/Assets.xcassets/Language/en/room_menu_arrange_mic_new_en.imageset/room_menu_arrange_mic_new_en@2x.png b/YuMi/Assets.xcassets/Language/en/room_menu_arrange_mic_new_en.imageset/room_menu_arrange_mic_new_en@2x.png deleted file mode 100644 index 37aa835c..00000000 Binary files a/YuMi/Assets.xcassets/Language/en/room_menu_arrange_mic_new_en.imageset/room_menu_arrange_mic_new_en@2x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/Language/en/room_menu_arrange_mic_new_en.imageset/room_menu_arrange_mic_new_en@3x.png b/YuMi/Assets.xcassets/Language/en/room_menu_arrange_mic_new_en.imageset/room_menu_arrange_mic_new_en@3x.png deleted file mode 100644 index 2beaa7f8..00000000 Binary files a/YuMi/Assets.xcassets/Language/en/room_menu_arrange_mic_new_en.imageset/room_menu_arrange_mic_new_en@3x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/yna/Menu/ms_room_menu_game.imageset/ms_room_menu_game@2x.png b/YuMi/Assets.xcassets/yna/Menu/ms_room_menu_game.imageset/ms_room_menu_game@2x.png index e99299d0..18f8cdf8 100644 Binary files a/YuMi/Assets.xcassets/yna/Menu/ms_room_menu_game.imageset/ms_room_menu_game@2x.png and b/YuMi/Assets.xcassets/yna/Menu/ms_room_menu_game.imageset/ms_room_menu_game@2x.png differ diff --git a/YuMi/Assets.xcassets/yna/Menu/ms_room_menu_game.imageset/ms_room_menu_game@3x.png b/YuMi/Assets.xcassets/yna/Menu/ms_room_menu_game.imageset/ms_room_menu_game@3x.png index bd341181..ef0244c3 100644 Binary files a/YuMi/Assets.xcassets/yna/Menu/ms_room_menu_game.imageset/ms_room_menu_game@3x.png and b/YuMi/Assets.xcassets/yna/Menu/ms_room_menu_game.imageset/ms_room_menu_game@3x.png differ diff --git a/YuMi/Assets.xcassets/yna/Menu/pi_room_menu_bottom_send_bg.imageset/Contents.json b/YuMi/Assets.xcassets/yna/Menu/pi_room_menu_bottom_send_bg.imageset/Contents.json deleted file mode 100644 index 72f73640..00000000 --- a/YuMi/Assets.xcassets/yna/Menu/pi_room_menu_bottom_send_bg.imageset/Contents.json +++ /dev/null @@ -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 - } -} diff --git a/YuMi/Assets.xcassets/yna/Menu/pi_room_menu_bottom_send_bg.imageset/pi_room_menu_bottom_send_bg.png b/YuMi/Assets.xcassets/yna/Menu/pi_room_menu_bottom_send_bg.imageset/pi_room_menu_bottom_send_bg.png deleted file mode 100644 index e0a2831b..00000000 Binary files a/YuMi/Assets.xcassets/yna/Menu/pi_room_menu_bottom_send_bg.imageset/pi_room_menu_bottom_send_bg.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/yna/Menu/room_menu_arrange_mic.imageset/room_menu_arrange_mic@2x.png b/YuMi/Assets.xcassets/yna/Menu/room_menu_arrange_mic.imageset/room_menu_arrange_mic@2x.png index 529b5b40..6b929bb1 100644 Binary files a/YuMi/Assets.xcassets/yna/Menu/room_menu_arrange_mic.imageset/room_menu_arrange_mic@2x.png and b/YuMi/Assets.xcassets/yna/Menu/room_menu_arrange_mic.imageset/room_menu_arrange_mic@2x.png differ diff --git a/YuMi/Assets.xcassets/yna/Menu/room_menu_arrange_mic.imageset/room_menu_arrange_mic@3x.png b/YuMi/Assets.xcassets/yna/Menu/room_menu_arrange_mic.imageset/room_menu_arrange_mic@3x.png index 5b02b78c..87877fa0 100644 Binary files a/YuMi/Assets.xcassets/yna/Menu/room_menu_arrange_mic.imageset/room_menu_arrange_mic@3x.png and b/YuMi/Assets.xcassets/yna/Menu/room_menu_arrange_mic.imageset/room_menu_arrange_mic@3x.png differ diff --git a/YuMi/Assets.xcassets/yna/Menu/room_menu_arrange_mic_new.imageset/room_menu_arrange_mic_new@2x.png b/YuMi/Assets.xcassets/yna/Menu/room_menu_arrange_mic_new.imageset/room_menu_arrange_mic_new@2x.png index 1769e3ef..c00a16a4 100644 Binary files a/YuMi/Assets.xcassets/yna/Menu/room_menu_arrange_mic_new.imageset/room_menu_arrange_mic_new@2x.png and b/YuMi/Assets.xcassets/yna/Menu/room_menu_arrange_mic_new.imageset/room_menu_arrange_mic_new@2x.png differ diff --git a/YuMi/Assets.xcassets/yna/Menu/room_menu_arrange_mic_new.imageset/room_menu_arrange_mic_new@3x.png b/YuMi/Assets.xcassets/yna/Menu/room_menu_arrange_mic_new.imageset/room_menu_arrange_mic_new@3x.png index 3b13bbb3..a53f943d 100644 Binary files a/YuMi/Assets.xcassets/yna/Menu/room_menu_arrange_mic_new.imageset/room_menu_arrange_mic_new@3x.png and b/YuMi/Assets.xcassets/yna/Menu/room_menu_arrange_mic_new.imageset/room_menu_arrange_mic_new@3x.png differ diff --git a/YuMi/Assets.xcassets/yna/Menu/room_menu_face.imageset/room_menu_face@2x.png b/YuMi/Assets.xcassets/yna/Menu/room_menu_face.imageset/room_menu_face@2x.png index c4789913..8cd4e2f6 100644 Binary files a/YuMi/Assets.xcassets/yna/Menu/room_menu_face.imageset/room_menu_face@2x.png and b/YuMi/Assets.xcassets/yna/Menu/room_menu_face.imageset/room_menu_face@2x.png differ diff --git a/YuMi/Assets.xcassets/yna/Menu/room_menu_face.imageset/room_menu_face@3x.png b/YuMi/Assets.xcassets/yna/Menu/room_menu_face.imageset/room_menu_face@3x.png index 362eab82..8651918f 100644 Binary files a/YuMi/Assets.xcassets/yna/Menu/room_menu_face.imageset/room_menu_face@3x.png and b/YuMi/Assets.xcassets/yna/Menu/room_menu_face.imageset/room_menu_face@3x.png differ diff --git a/YuMi/Assets.xcassets/yna/Menu/room_menu_gift.imageset/Contents.json b/YuMi/Assets.xcassets/yna/Menu/room_menu_gift.imageset/Contents.json deleted file mode 100644 index 8402423e..00000000 --- a/YuMi/Assets.xcassets/yna/Menu/room_menu_gift.imageset/Contents.json +++ /dev/null @@ -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 - } -} diff --git a/YuMi/Assets.xcassets/yna/Menu/room_menu_gift.imageset/room_menu_gift@2x.png b/YuMi/Assets.xcassets/yna/Menu/room_menu_gift.imageset/room_menu_gift@2x.png deleted file mode 100644 index fdb63538..00000000 Binary files a/YuMi/Assets.xcassets/yna/Menu/room_menu_gift.imageset/room_menu_gift@2x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/yna/Menu/room_menu_gift.imageset/room_menu_gift@3x.png b/YuMi/Assets.xcassets/yna/Menu/room_menu_gift.imageset/room_menu_gift@3x.png deleted file mode 100644 index 1846567f..00000000 Binary files a/YuMi/Assets.xcassets/yna/Menu/room_menu_gift.imageset/room_menu_gift@3x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/yna/Menu/room_menu_gift1.imageset/Contents.json b/YuMi/Assets.xcassets/yna/Menu/room_menu_gift1.imageset/Contents.json deleted file mode 100644 index 2eabb31b..00000000 --- a/YuMi/Assets.xcassets/yna/Menu/room_menu_gift1.imageset/Contents.json +++ /dev/null @@ -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 - } -} diff --git a/YuMi/Assets.xcassets/yna/Menu/room_menu_gift1.imageset/room_menu_gift1@2x.png b/YuMi/Assets.xcassets/yna/Menu/room_menu_gift1.imageset/room_menu_gift1@2x.png deleted file mode 100644 index 167849f2..00000000 Binary files a/YuMi/Assets.xcassets/yna/Menu/room_menu_gift1.imageset/room_menu_gift1@2x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/yna/Menu/room_menu_gift1.imageset/room_menu_gift1@3x.png b/YuMi/Assets.xcassets/yna/Menu/room_menu_gift1.imageset/room_menu_gift1@3x.png deleted file mode 100644 index 88ffaab9..00000000 Binary files a/YuMi/Assets.xcassets/yna/Menu/room_menu_gift1.imageset/room_menu_gift1@3x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/yna/Menu/room_menu_message.imageset/room_menu_message@2x.png b/YuMi/Assets.xcassets/yna/Menu/room_menu_message.imageset/room_menu_message@2x.png index a0d8fefa..ae3510ed 100644 Binary files a/YuMi/Assets.xcassets/yna/Menu/room_menu_message.imageset/room_menu_message@2x.png and b/YuMi/Assets.xcassets/yna/Menu/room_menu_message.imageset/room_menu_message@2x.png differ diff --git a/YuMi/Assets.xcassets/yna/Menu/room_menu_message.imageset/room_menu_message@3x.png b/YuMi/Assets.xcassets/yna/Menu/room_menu_message.imageset/room_menu_message@3x.png index d8eb0178..6e49d024 100644 Binary files a/YuMi/Assets.xcassets/yna/Menu/room_menu_message.imageset/room_menu_message@3x.png and b/YuMi/Assets.xcassets/yna/Menu/room_menu_message.imageset/room_menu_message@3x.png differ diff --git a/YuMi/Assets.xcassets/yna/Menu/room_menu_mic_close.imageset/room_menu_mic_close@2x.png b/YuMi/Assets.xcassets/yna/Menu/room_menu_mic_close.imageset/room_menu_mic_close@2x.png index 2271b879..91b08da8 100644 Binary files a/YuMi/Assets.xcassets/yna/Menu/room_menu_mic_close.imageset/room_menu_mic_close@2x.png and b/YuMi/Assets.xcassets/yna/Menu/room_menu_mic_close.imageset/room_menu_mic_close@2x.png differ diff --git a/YuMi/Assets.xcassets/yna/Menu/room_menu_mic_close.imageset/room_menu_mic_close@3x.png b/YuMi/Assets.xcassets/yna/Menu/room_menu_mic_close.imageset/room_menu_mic_close@3x.png index 06694fe9..3707db6a 100644 Binary files a/YuMi/Assets.xcassets/yna/Menu/room_menu_mic_close.imageset/room_menu_mic_close@3x.png and b/YuMi/Assets.xcassets/yna/Menu/room_menu_mic_close.imageset/room_menu_mic_close@3x.png differ diff --git a/YuMi/Assets.xcassets/yna/Menu/room_menu_mic_open.imageset/room_menu_mic_open@2x.png b/YuMi/Assets.xcassets/yna/Menu/room_menu_mic_open.imageset/room_menu_mic_open@2x.png index 49273c53..e5f2662b 100644 Binary files a/YuMi/Assets.xcassets/yna/Menu/room_menu_mic_open.imageset/room_menu_mic_open@2x.png and b/YuMi/Assets.xcassets/yna/Menu/room_menu_mic_open.imageset/room_menu_mic_open@2x.png differ diff --git a/YuMi/Assets.xcassets/yna/Menu/room_menu_mic_open.imageset/room_menu_mic_open@3x.png b/YuMi/Assets.xcassets/yna/Menu/room_menu_mic_open.imageset/room_menu_mic_open@3x.png index f2d74a42..dd8a9bbd 100644 Binary files a/YuMi/Assets.xcassets/yna/Menu/room_menu_mic_open.imageset/room_menu_mic_open@3x.png and b/YuMi/Assets.xcassets/yna/Menu/room_menu_mic_open.imageset/room_menu_mic_open@3x.png differ diff --git a/YuMi/Assets.xcassets/yna/Menu/room_menu_more.imageset/room_menu_more@2x.png b/YuMi/Assets.xcassets/yna/Menu/room_menu_more.imageset/room_menu_more@2x.png index 3eda3561..5c3261d0 100644 Binary files a/YuMi/Assets.xcassets/yna/Menu/room_menu_more.imageset/room_menu_more@2x.png and b/YuMi/Assets.xcassets/yna/Menu/room_menu_more.imageset/room_menu_more@2x.png differ diff --git a/YuMi/Assets.xcassets/yna/Menu/room_menu_more.imageset/room_menu_more@3x.png b/YuMi/Assets.xcassets/yna/Menu/room_menu_more.imageset/room_menu_more@3x.png index 476cbb48..88851356 100644 Binary files a/YuMi/Assets.xcassets/yna/Menu/room_menu_more.imageset/room_menu_more@3x.png and b/YuMi/Assets.xcassets/yna/Menu/room_menu_more.imageset/room_menu_more@3x.png differ diff --git a/YuMi/Assets.xcassets/yna/Menu/room_menu_new_message.imageset/room_menu_new_message@2x.png b/YuMi/Assets.xcassets/yna/Menu/room_menu_new_message.imageset/room_menu_new_message@2x.png index 75d8249b..9140a4f2 100644 Binary files a/YuMi/Assets.xcassets/yna/Menu/room_menu_new_message.imageset/room_menu_new_message@2x.png and b/YuMi/Assets.xcassets/yna/Menu/room_menu_new_message.imageset/room_menu_new_message@2x.png differ diff --git a/YuMi/Assets.xcassets/yna/Menu/room_menu_new_message.imageset/room_menu_new_message@3x.png b/YuMi/Assets.xcassets/yna/Menu/room_menu_new_message.imageset/room_menu_new_message@3x.png index ea047026..e264d954 100644 Binary files a/YuMi/Assets.xcassets/yna/Menu/room_menu_new_message.imageset/room_menu_new_message@3x.png and b/YuMi/Assets.xcassets/yna/Menu/room_menu_new_message.imageset/room_menu_new_message@3x.png differ diff --git a/YuMi/Assets.xcassets/yna/Menu/room_menu_voice_close.imageset/room_menu_voice_close@2x.png b/YuMi/Assets.xcassets/yna/Menu/room_menu_voice_close.imageset/room_menu_voice_close@2x.png index c30c11c2..f6404735 100644 Binary files a/YuMi/Assets.xcassets/yna/Menu/room_menu_voice_close.imageset/room_menu_voice_close@2x.png and b/YuMi/Assets.xcassets/yna/Menu/room_menu_voice_close.imageset/room_menu_voice_close@2x.png differ diff --git a/YuMi/Assets.xcassets/yna/Menu/room_menu_voice_close.imageset/room_menu_voice_close@3x.png b/YuMi/Assets.xcassets/yna/Menu/room_menu_voice_close.imageset/room_menu_voice_close@3x.png index 4f5bdacb..a90a2038 100644 Binary files a/YuMi/Assets.xcassets/yna/Menu/room_menu_voice_close.imageset/room_menu_voice_close@3x.png and b/YuMi/Assets.xcassets/yna/Menu/room_menu_voice_close.imageset/room_menu_voice_close@3x.png differ diff --git a/YuMi/Assets.xcassets/yna/Menu/room_menu_voice_open.imageset/room_menu_voice_open@2x.png b/YuMi/Assets.xcassets/yna/Menu/room_menu_voice_open.imageset/room_menu_voice_open@2x.png index 4001add2..9e49dab9 100644 Binary files a/YuMi/Assets.xcassets/yna/Menu/room_menu_voice_open.imageset/room_menu_voice_open@2x.png and b/YuMi/Assets.xcassets/yna/Menu/room_menu_voice_open.imageset/room_menu_voice_open@2x.png differ diff --git a/YuMi/Assets.xcassets/yna/Menu/room_menu_voice_open.imageset/room_menu_voice_open@3x.png b/YuMi/Assets.xcassets/yna/Menu/room_menu_voice_open.imageset/room_menu_voice_open@3x.png index 3e746d07..31c6a6a8 100644 Binary files a/YuMi/Assets.xcassets/yna/Menu/room_menu_voice_open.imageset/room_menu_voice_open@3x.png and b/YuMi/Assets.xcassets/yna/Menu/room_menu_voice_open.imageset/room_menu_voice_open@3x.png differ diff --git a/YuMi/Assets.xcassets/yna/Position/room_position_boss.imageset/Contents.json b/YuMi/Assets.xcassets/yna/Position/room_position_boss.imageset/Contents.json deleted file mode 100644 index 9d99f0b3..00000000 --- a/YuMi/Assets.xcassets/yna/Position/room_position_boss.imageset/Contents.json +++ /dev/null @@ -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 - } -} diff --git a/YuMi/Assets.xcassets/yna/Position/room_position_boss.imageset/room_position_boss@2x.png b/YuMi/Assets.xcassets/yna/Position/room_position_boss.imageset/room_position_boss@2x.png deleted file mode 100644 index e0972cae..00000000 Binary files a/YuMi/Assets.xcassets/yna/Position/room_position_boss.imageset/room_position_boss@2x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/yna/Position/room_position_boss.imageset/room_position_boss@3x.png b/YuMi/Assets.xcassets/yna/Position/room_position_boss.imageset/room_position_boss@3x.png deleted file mode 100644 index 5eab5bf4..00000000 Binary files a/YuMi/Assets.xcassets/yna/Position/room_position_boss.imageset/room_position_boss@3x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/yna/Position/room_position_lock.imageset/room_position_lock@2x.png b/YuMi/Assets.xcassets/yna/Position/room_position_lock.imageset/room_position_lock@2x.png index 320b5d69..0fe6c7c8 100644 Binary files a/YuMi/Assets.xcassets/yna/Position/room_position_lock.imageset/room_position_lock@2x.png and b/YuMi/Assets.xcassets/yna/Position/room_position_lock.imageset/room_position_lock@2x.png differ diff --git a/YuMi/Assets.xcassets/yna/Position/room_position_lock.imageset/room_position_lock@3x.png b/YuMi/Assets.xcassets/yna/Position/room_position_lock.imageset/room_position_lock@3x.png index f44cd404..a225ba73 100644 Binary files a/YuMi/Assets.xcassets/yna/Position/room_position_lock.imageset/room_position_lock@3x.png and b/YuMi/Assets.xcassets/yna/Position/room_position_lock.imageset/room_position_lock@3x.png differ diff --git a/YuMi/Assets.xcassets/yna/Position/room_position_lock1.imageset/Contents.json b/YuMi/Assets.xcassets/yna/Position/room_position_lock1.imageset/Contents.json deleted file mode 100644 index feaacb6e..00000000 --- a/YuMi/Assets.xcassets/yna/Position/room_position_lock1.imageset/Contents.json +++ /dev/null @@ -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 - } -} diff --git a/YuMi/Assets.xcassets/yna/Position/room_position_lock1.imageset/room_position_lock1@2x.png b/YuMi/Assets.xcassets/yna/Position/room_position_lock1.imageset/room_position_lock1@2x.png deleted file mode 100644 index 5ef03dce..00000000 Binary files a/YuMi/Assets.xcassets/yna/Position/room_position_lock1.imageset/room_position_lock1@2x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/yna/Position/room_position_lock1.imageset/room_position_lock1@3x.png b/YuMi/Assets.xcassets/yna/Position/room_position_lock1.imageset/room_position_lock1@3x.png deleted file mode 100644 index 4f6a0a6b..00000000 Binary files a/YuMi/Assets.xcassets/yna/Position/room_position_lock1.imageset/room_position_lock1@3x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/yna/Position/room_position_normal.imageset/room_position_normal@2x.png b/YuMi/Assets.xcassets/yna/Position/room_position_normal.imageset/room_position_normal@2x.png index 42f18d28..f93d931c 100644 Binary files a/YuMi/Assets.xcassets/yna/Position/room_position_normal.imageset/room_position_normal@2x.png and b/YuMi/Assets.xcassets/yna/Position/room_position_normal.imageset/room_position_normal@2x.png differ diff --git a/YuMi/Assets.xcassets/yna/Position/room_position_normal.imageset/room_position_normal@3x.png b/YuMi/Assets.xcassets/yna/Position/room_position_normal.imageset/room_position_normal@3x.png index 9a29053b..ac8e2b7c 100644 Binary files a/YuMi/Assets.xcassets/yna/Position/room_position_normal.imageset/room_position_normal@3x.png and b/YuMi/Assets.xcassets/yna/Position/room_position_normal.imageset/room_position_normal@3x.png differ diff --git a/YuMi/Assets.xcassets/yna/Position/room_position_normal1.imageset/Contents.json b/YuMi/Assets.xcassets/yna/Position/room_position_normal1.imageset/Contents.json deleted file mode 100644 index 9d32c21a..00000000 --- a/YuMi/Assets.xcassets/yna/Position/room_position_normal1.imageset/Contents.json +++ /dev/null @@ -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 - } -} diff --git a/YuMi/Assets.xcassets/yna/Position/room_position_normal1.imageset/room_position_normal1@2x.png b/YuMi/Assets.xcassets/yna/Position/room_position_normal1.imageset/room_position_normal1@2x.png deleted file mode 100644 index e73b7e59..00000000 Binary files a/YuMi/Assets.xcassets/yna/Position/room_position_normal1.imageset/room_position_normal1@2x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/yna/Position/room_position_normal1.imageset/room_position_normal1@3x.png b/YuMi/Assets.xcassets/yna/Position/room_position_normal1.imageset/room_position_normal1@3x.png deleted file mode 100644 index a95ab4e2..00000000 Binary files a/YuMi/Assets.xcassets/yna/Position/room_position_normal1.imageset/room_position_normal1@3x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/Language/ar/room_menu_arrange_mic_ar.imageset/Contents.json b/YuMi/Assets.xcassets/yna/Setting/ms_room_reting_backdrop_back.imageset/Contents.json similarity index 70% rename from YuMi/Assets.xcassets/Language/ar/room_menu_arrange_mic_ar.imageset/Contents.json rename to YuMi/Assets.xcassets/yna/Setting/ms_room_reting_backdrop_back.imageset/Contents.json index 8062ff81..ffbdbea1 100644 --- a/YuMi/Assets.xcassets/Language/ar/room_menu_arrange_mic_ar.imageset/Contents.json +++ b/YuMi/Assets.xcassets/yna/Setting/ms_room_reting_backdrop_back.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "room_menu_arrange_mic_ar@2x.png", + "filename" : "ms_room_reting_backdrop_back@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "room_menu_arrange_mic_ar@3x.png", + "filename" : "ms_room_reting_backdrop_back@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/YuMi/Assets.xcassets/yna/Setting/ms_room_reting_backdrop_back.imageset/ms_room_reting_backdrop_back@2x.png b/YuMi/Assets.xcassets/yna/Setting/ms_room_reting_backdrop_back.imageset/ms_room_reting_backdrop_back@2x.png new file mode 100644 index 00000000..9bbd222f Binary files /dev/null and b/YuMi/Assets.xcassets/yna/Setting/ms_room_reting_backdrop_back.imageset/ms_room_reting_backdrop_back@2x.png differ diff --git a/YuMi/Assets.xcassets/yna/Setting/ms_room_reting_backdrop_back.imageset/ms_room_reting_backdrop_back@3x.png b/YuMi/Assets.xcassets/yna/Setting/ms_room_reting_backdrop_back.imageset/ms_room_reting_backdrop_back@3x.png new file mode 100644 index 00000000..36b0866f Binary files /dev/null and b/YuMi/Assets.xcassets/yna/Setting/ms_room_reting_backdrop_back.imageset/ms_room_reting_backdrop_back@3x.png differ diff --git a/YuMi/Modules/YMMessage/Model/AttachmentModel.h b/YuMi/Modules/YMMessage/Model/AttachmentModel.h index 14c9d313..d2b27956 100644 --- a/YuMi/Modules/YMMessage/Model/AttachmentModel.h +++ b/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 @property (nonatomic,assign) int first; diff --git a/YuMi/Modules/YMMessage/View/NIMMessageUtils.m b/YuMi/Modules/YMMessage/View/NIMMessageUtils.m index 96fe8df5..adc570c0 100644 --- a/YuMi/Modules/YMMessage/View/NIMMessageUtils.m +++ b/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"); diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentGuildView.m b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentGuildView.m index d345ed02..a9a9f95c 100644 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentGuildView.m +++ b/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,7 +240,7 @@ [params safeSetObject:[AccountInfoStorage instance].getUid forKey:@"uid"]; ///0拒绝 1同意 NSString * type = sender.tag == 1000? @"0" : @"1"; - if (self.attachment.second == Custom_Message_Sub_Hall_Apply_Join || self.attachment.second == Custom_Message_Sub_Hall_Manager_Invite || self.attachment.second == Custom_Message_Sub_Hall_Apply_Exit) { + if (self.attachment.second == Custom_Message_Sub_Hall_Apply_Join || self.attachment.second == Custom_Message_Sub_Hall_Manager_Invite || self.attachment.second == Custom_Message_Sub_Hall_Apply_Exit || self.attachment.second == Custom_Message_Sub_New_Hall_Invite || self.attachment.second == Custom_Message_Sub_New_Hall_Apply) { if (self.attachment.second != Custom_Message_Sub_Hall_Apply_Exit) { [params setObject:type forKey:@"type"]; } diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageGuildModel.m b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageGuildModel.m index 6588ddf3..81b8afe5 100644 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageGuildModel.m +++ b/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; diff --git a/YuMi/Modules/YMMessage/View/Session/SessionViewController.m b/YuMi/Modules/YMMessage/View/Session/SessionViewController.m index b5f5645e..60e1212a 100644 --- a/YuMi/Modules/YMMessage/View/Session/SessionViewController.m +++ b/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]; diff --git a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomFunctionContainerView.m b/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomFunctionContainerView.m index 0bd839c3..c175eebc 100644 --- a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomFunctionContainerView.m +++ b/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomFunctionContainerView.m @@ -305,30 +305,30 @@ }]; } - (void)showLittleGameMiniView:(RoomType)type micCount:(NSInteger)micCount { - if([ClientConfig shareConfig].canOpen){ - 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]; - } - } - }else{ - if (self.littleGameMiniView.superview) { - [self.littleGameMiniView removeFromSuperview]; - } - } +// if([ClientConfig shareConfig].canOpen){ +// 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]; +// } +// } +// }else{ +// if (self.littleGameMiniView.superview) { +// [self.littleGameMiniView removeFromSuperview]; +// } +// } } @@ -580,7 +580,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) { @@ -611,7 +611,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]; diff --git a/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomMenuContainerView.m b/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomMenuContainerView.m index a957cdad..dc6720d5 100644 --- a/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomMenuContainerView.m +++ b/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 () ///滚动的容器 @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; @@ -228,8 +229,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 +243,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 +259,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 +284,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 +501,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 +570,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 +608,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; diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/View/XPRoomMessageHeaderView.m b/YuMi/Modules/YMRoom/View/MessageContainerView/View/XPRoomMessageHeaderView.m index b08087a4..4a4d7fe9 100644 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/View/XPRoomMessageHeaderView.m +++ b/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; diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/View/XPRoomMessageTableViewCell.m b/YuMi/Modules/YMRoom/View/MessageContainerView/View/XPRoomMessageTableViewCell.m index 2ffcc4d8..375d419f 100644 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/View/XPRoomMessageTableViewCell.m +++ b/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:[UIColor colorWithWhite:1 alpha:0.3]]; } } diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/XPRoomMessageContainerView.m b/YuMi/Modules/YMRoom/View/MessageContainerView/XPRoomMessageContainerView.m index aacb0969..8f5aea0d 100644 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/XPRoomMessageContainerView.m +++ b/YuMi/Modules/YMRoom/View/MessageContainerView/XPRoomMessageContainerView.m @@ -909,13 +909,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]; } } diff --git a/YuMi/Modules/YMRoom/View/Setting/Model/XPRoomSettingItemModel.h b/YuMi/Modules/YMRoom/View/Setting/Model/XPRoomSettingItemModel.h index 7913f99f..a5d43a56 100644 --- a/YuMi/Modules/YMRoom/View/Setting/Model/XPRoomSettingItemModel.h +++ b/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 diff --git a/YuMi/Modules/YMRoom/View/Setting/Presenter/XPRoomSettingPresenter.h b/YuMi/Modules/YMRoom/View/Setting/Presenter/XPRoomSettingPresenter.h index 938d17e2..9b356228 100644 --- a/YuMi/Modules/YMRoom/View/Setting/Presenter/XPRoomSettingPresenter.h +++ b/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; diff --git a/YuMi/Modules/YMRoom/View/Setting/Presenter/XPRoomSettingPresenter.m b/YuMi/Modules/YMRoom/View/Setting/Presenter/XPRoomSettingPresenter.m index e5115971..295454b4 100644 --- a/YuMi/Modules/YMRoom/View/Setting/Presenter/XPRoomSettingPresenter.m +++ b/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{ diff --git a/YuMi/Modules/YMRoom/View/Setting/View/Cell/MSRoomSetingBackdropCell.h b/YuMi/Modules/YMRoom/View/Setting/View/Cell/MSRoomSetingBackdropCell.h new file mode 100644 index 00000000..d0568d93 --- /dev/null +++ b/YuMi/Modules/YMRoom/View/Setting/View/Cell/MSRoomSetingBackdropCell.h @@ -0,0 +1,17 @@ +// +// MSRoomSetingBackdropCell.h +// YuMi +// +// Created by duoban on 2024/5/22. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface MSRoomSetingBackdropCell : UICollectionViewCell +@property(nonatomic,assign) BOOL isUse; +@property(nonatomic,copy) NSString *imageUrl; +@end + +NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Setting/View/Cell/MSRoomSetingBackdropCell.m b/YuMi/Modules/YMRoom/View/Setting/View/Cell/MSRoomSetingBackdropCell.m new file mode 100644 index 00000000..ce1d9d28 --- /dev/null +++ b/YuMi/Modules/YMRoom/View/Setting/View/Cell/MSRoomSetingBackdropCell.m @@ -0,0 +1,79 @@ +// +// 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]; + } + 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 diff --git a/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomSettingTableViewCell.m b/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomSettingTableViewCell.m index 27acf152..af25478d 100644 --- a/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomSettingTableViewCell.m +++ b/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; diff --git a/YuMi/Modules/YMRoom/View/Setting/View/MSRoomSetingBackdropVC.h b/YuMi/Modules/YMRoom/View/Setting/View/MSRoomSetingBackdropVC.h new file mode 100644 index 00000000..24fb51b8 --- /dev/null +++ b/YuMi/Modules/YMRoom/View/Setting/View/MSRoomSetingBackdropVC.h @@ -0,0 +1,16 @@ +// +// MSRoomSetingBackdropVC.h +// YuMi +// +// Created by duoban on 2024/5/22. +// + +#import "MvpViewController.h" +#import "RoomHostDelegate.h" +NS_ASSUME_NONNULL_BEGIN + +@interface MSRoomSetingBackdropVC : MvpViewController +- (instancetype)initWithDelegate:(id)delegate; +@end + +NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/Setting/View/MSRoomSetingBackdropVC.m b/YuMi/Modules/YMRoom/View/Setting/View/MSRoomSetingBackdropVC.m new file mode 100644 index 00000000..2ff3210c --- /dev/null +++ b/YuMi/Modules/YMRoom/View/Setting/View/MSRoomSetingBackdropVC.m @@ -0,0 +1,142 @@ +// +// MSRoomSetingBackdropVC.m +// YuMi +// +// Created by duoban on 2024/5/22. +// + +#import "MSRoomSetingBackdropVC.h" +#import "MSRoomSetingBackdropCell.h" +#import "RoomInfoModel.h" +#import "XPRoomSettingPresenter.h" +@interface MSRoomSetingBackdropVC () +@property(nonatomic,strong) UICollectionView *collectionView; +@property(nonatomic,strong) UILabel *titleView; +@property(nonatomic,strong) UIButton *backView; +@property(nonatomic,copy) NSArray *imageList; +@property (nonatomic,weak) id hostDelegate; +@property(nonatomic,strong) RoomInfoModel *roomInfo; +@end + +@implementation MSRoomSetingBackdropVC +- (XPRoomSettingPresenter *)createPresenter { + return [[XPRoomSettingPresenter alloc] init]; +} +- (BOOL)isHiddenNavBar{ + return YES; +} +- (instancetype)initWithDelegate:(id)delegate { + if (self = [super init]) { + self.hostDelegate = delegate; + self.roomInfo = [self.hostDelegate getRoomInfo]; + + } + return self; +} +- (void)viewDidLoad { + [super viewDidLoad]; + [self installUI]; + [self installConstraints]; +} +-(void)installUI{ + + self.view.backgroundColor = UIColorFromRGB(0x181526); + [self.view addSubview:self.backView]; + [self.view addSubview:self.titleView]; + [self.view addSubview:self.collectionView]; +} +-(void)installConstraints{ + CGFloat top = (44 - kGetScaleWidth(22))/2 + kStatusBarHeight; + [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { + make.width.height.mas_equalTo(kGetScaleWidth(22)); + make.top.equalTo(self.view).mas_offset(top); + make.leading.mas_equalTo(kGetScaleWidth(9)); + }]; + [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { + make.centerY.equalTo(self.backView); + make.centerX.equalTo(self.view); + }]; + [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { + make.leading.trailing.bottom.equalTo(self.view); + make.top.equalTo(self.backView.mas_bottom).mas_offset(kGetScaleWidth(30)); + }]; +} +-(void)bakcBtnAction{ + [self.navigationController popViewControllerAnimated:YES]; +} +#pragma mark - UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDelegateFlowLayout +- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section{ + return self.imageList.count; +} +- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath{ + MSRoomSetingBackdropCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([MSRoomSetingBackdropCell class]) forIndexPath:indexPath]; + NSString *imageUrl = self.imageList[indexPath.row]; + cell.isUse = [imageUrl isEqualToString:self.roomInfo.backPic]; + cell.imageUrl = imageUrl; + return cell; +} +- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{ + TTAlertConfig *config = [[TTAlertConfig alloc]init]; + config.title = YMLocalizedString(@"XPIAPRechargeViewController7"); + config.message = YMLocalizedString(@"MSRoomSetingBackdropCell1"); + [TTPopup alertWithConfig:config confirmHandler:^{ + NSString * roomUid = [NSString stringWithFormat:@"%ld", self.roomInfo.uid]; + NSString * roomId = [NSString stringWithFormat:@"%ld", self.roomInfo.roomId]; + NSString * roomTag = [NSString stringWithFormat:@"%ld", self.roomInfo.tagId]; + NSString * mgId = [NSString stringWithFormat:@"%lld", self.roomInfo.mgId]; + NSString * roomClassifyId = self.roomInfo.singleRoomSortId; + NSString *backPic = self.imageList[indexPath.row]; + [self.presenter updateRoomInfo:self.roomInfo.title roomPwd:self.roomInfo.roomPwd tagId:roomTag classifyId:roomClassifyId hasAnimationEffect:self.roomInfo.hasAnimationEffect roomUid:roomUid roomId:roomId type:self.roomInfo.type itemType:RoomSettingItemType_Title mgId:mgId backPic:backPic]; + + } cancelHandler:^{ + [self.navigationController popViewControllerAnimated:YES]; + }]; +} +///更新房间信息成功 +- (void)updateRoomInfoSuccess:(RoomInfoModel *)roomInfo itemType:(RoomSettingItemType)itemType{ + self.roomInfo = roomInfo; + [self.collectionView reloadData]; +} +///更新房间信息失败 +- (void)updateRoomInfoFail:(NSString *)message{ + [self showErrorToast:message]; +} +#pragma mark - 懒加载 +- (NSArray *)imageList{ + if(!_imageList){ + _imageList = @[@"https://image.molistar.xyz/BG.webp",@"https://image.molistar.xyz/BG2.webp",@"https://image.molistar.xyz/BG3.webp",@"https://image.molistar.xyz/BG4.webp",@"https://image.molistar.xyz/BG5.webp",@"https://image.molistar.xyz/BG6.webp"]; + } + return _imageList; +} +- (UICollectionView *)collectionView{ + if (!_collectionView) { + MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; + layout.itemSize = CGSizeMake(kGetScaleWidth(166), kGetScaleWidth(206)); + layout.minimumLineSpacing = kGetScaleWidth(16); + layout.minimumInteritemSpacing = kGetScaleWidth(16); + layout.scrollDirection = UICollectionViewScrollDirectionVertical; + layout.sectionInset = UIEdgeInsetsMake(0, kGetScaleWidth(13), 0, kGetScaleWidth(13)); + _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; + _collectionView.dataSource = self; + _collectionView.delegate = self; + _collectionView.backgroundColor = [UIColor clearColor]; + [_collectionView registerClass:[MSRoomSetingBackdropCell class] forCellWithReuseIdentifier:NSStringFromClass([MSRoomSetingBackdropCell class])]; + } + return _collectionView; +} +- (UILabel *)titleView{ + if(!_titleView){ + _titleView = [UILabel labelInitWithText:YMLocalizedString(@"XPRoomSettingPresenter12") font:kFontBold(16) textColor:[UIColor whiteColor]]; + } + return _titleView; +} +- (UIButton *)backView{ + if(!_backView){ + _backView = [UIButton new]; + [_backView setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; + [_backView setImage:[kImage(@"ms_room_reting_backdrop_back")ms_SetImageForRTL] forState:UIControlStateNormal]; + [_backView addTarget:self action:@selector(bakcBtnAction) forControlEvents:UIControlEventTouchUpInside]; + } + return _backView; +} +@end diff --git a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomSettingViewController.m b/YuMi/Modules/YMRoom/View/Setting/View/XPRoomSettingViewController.m index 52cd969f..741f4df7 100644 --- a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomSettingViewController.m +++ b/YuMi/Modules/YMRoom/View/Setting/View/XPRoomSettingViewController.m @@ -34,6 +34,7 @@ ///VC #import "XPRoomTagListViewController.h" #import "XPRoomRoleViewController.h" +#import "MSRoomSetingBackdropVC.h" @interface XPRoomSettingViewController () ///房间信息 @@ -213,7 +214,7 @@ XPRoomSettingItemModel * itemModel = [[self.datasource safeObjectAtIndex1:indexP view.tagId = self.roomInfo.singleRoomSortId; view.completion = ^(NSString * _Nonnull tag) { NSString * mgId = [NSString stringWithFormat:@"%lld", self.roomInfo.mgId]; - [self.presenter updateRoomInfo:self.roomInfo.title roomPwd:self.roomInfo.roomPwd tagId:roomTag classifyId:tag hasAnimationEffect:self.roomInfo.hasAnimationEffect roomUid:roomUid roomId:roomId type:self.roomInfo.type itemType:itemModel.type mgId:mgId]; + [self.presenter updateRoomInfo:self.roomInfo.title roomPwd:self.roomInfo.roomPwd tagId:roomTag classifyId:tag hasAnimationEffect:self.roomInfo.hasAnimationEffect roomUid:roomUid roomId:roomId type:self.roomInfo.type itemType:itemModel.type mgId:mgId backPic:self.roomInfo.backPic]; }; [TTPopup popupView:view style:TTPopupStyleAlert]; } @@ -225,7 +226,7 @@ XPRoomSettingItemModel * itemModel = [[self.datasource safeObjectAtIndex1:indexP view.tagId = [NSString stringWithFormat:@"%ld", self.roomInfo.tagId]; view.completion = ^(NSString * _Nonnull tag) { NSString * mgId = [NSString stringWithFormat:@"%lld", self.roomInfo.mgId]; - [self.presenter updateRoomInfo:self.roomInfo.title roomPwd:self.roomInfo.roomPwd tagId:tag classifyId:roomClassifyId hasAnimationEffect:self.roomInfo.hasAnimationEffect roomUid:roomUid roomId:roomId type:self.roomInfo.type itemType:itemModel.type mgId:mgId]; + [self.presenter updateRoomInfo:self.roomInfo.title roomPwd:self.roomInfo.roomPwd tagId:tag classifyId:roomClassifyId hasAnimationEffect:self.roomInfo.hasAnimationEffect roomUid:roomUid roomId:roomId type:self.roomInfo.type itemType:itemModel.type mgId:mgId backPic:self.roomInfo.backPic]; }; [TTPopup popupView:view style:TTPopupStyleAlert]; } @@ -269,7 +270,13 @@ XPRoomSettingItemModel * itemModel = [[self.datasource safeObjectAtIndex1:indexP [self.navigationController pushViewController:managerVC animated:YES]; } break; - + case RoomSettingItemType_Theme: + { + MSRoomSetingBackdropVC * backdropVC = [[ MSRoomSetingBackdropVC alloc]initWithDelegate:self.hostDelegate]; + [self.navigationController pushViewController:backdropVC animated:YES]; + break; + } + default: break; } @@ -284,9 +291,9 @@ XPRoomSettingItemModel * itemModel = [[self.datasource safeObjectAtIndex1:indexP NSString * roomClassifyId = self.roomInfo.singleRoomSortId; if (type == RoomSettingInputType_Pwd) { NSString *pwdDes = [DESEncrypt encryptUseDES:text key:KeyWithType(KeyType_PasswordEncode)]; - [self.presenter updateRoomInfo:self.roomInfo.title roomPwd:pwdDes tagId:roomTag classifyId:roomClassifyId hasAnimationEffect:self.roomInfo.hasAnimationEffect roomUid:roomUid roomId:roomId type:self.roomInfo.type itemType:RoomSettingItemType_Pwd mgId:mgId]; + [self.presenter updateRoomInfo:self.roomInfo.title roomPwd:pwdDes tagId:roomTag classifyId:roomClassifyId hasAnimationEffect:self.roomInfo.hasAnimationEffect roomUid:roomUid roomId:roomId type:self.roomInfo.type itemType:RoomSettingItemType_Pwd mgId:mgId backPic:self.roomInfo.backPic]; } else if(type == RoomSettingInputType_Title) { - [self.presenter updateRoomInfo:text roomPwd:self.roomInfo.roomPwd tagId:roomTag classifyId:roomClassifyId hasAnimationEffect:self.roomInfo.hasAnimationEffect roomUid:roomUid roomId:roomId type:self.roomInfo.type itemType:RoomSettingItemType_Title mgId:mgId]; + [self.presenter updateRoomInfo:text roomPwd:self.roomInfo.roomPwd tagId:roomTag classifyId:roomClassifyId hasAnimationEffect:self.roomInfo.hasAnimationEffect roomUid:roomUid roomId:roomId type:self.roomInfo.type itemType:RoomSettingItemType_Title mgId:mgId backPic:self.roomInfo.backPic]; } } @@ -351,7 +358,7 @@ XPRoomSettingItemModel * itemModel = [[self.datasource safeObjectAtIndex1:indexP [TTPopup popupView:titleView style:TTPopupStyleAlert]; } else { NSString * mgId = [NSString stringWithFormat:@"%lld", self.roomInfo.mgId]; - [self.presenter updateRoomInfo:self.roomInfo.title roomPwd:@"" tagId:roomTag classifyId:roomClassifyId hasAnimationEffect:self.roomInfo.hasAnimationEffect roomUid:roomUid roomId:roomId type:self.roomInfo.type itemType:itemModel.type mgId:mgId]; + [self.presenter updateRoomInfo:self.roomInfo.title roomPwd:@"" tagId:roomTag classifyId:roomClassifyId hasAnimationEffect:self.roomInfo.hasAnimationEffect roomUid:roomUid roomId:roomId type:self.roomInfo.type itemType:itemModel.type mgId:mgId backPic:self.roomInfo.backPic]; } } break; @@ -359,7 +366,7 @@ XPRoomSettingItemModel * itemModel = [[self.datasource safeObjectAtIndex1:indexP { if (isOn) { NSString * mgId = [NSString stringWithFormat:@"%lld", self.roomInfo.mgId]; - [self.presenter updateRoomInfo:self.roomInfo.title roomPwd:self.roomInfo.roomPwd tagId:roomTag classifyId:roomClassifyId hasAnimationEffect:YES roomUid:roomUid roomId:roomId type:self.roomInfo.type itemType:itemModel.type mgId:mgId]; + [self.presenter updateRoomInfo:self.roomInfo.title roomPwd:self.roomInfo.roomPwd tagId:roomTag classifyId:roomClassifyId hasAnimationEffect:YES roomUid:roomUid roomId:roomId type:self.roomInfo.type itemType:itemModel.type mgId:mgId backPic:self.roomInfo.backPic]; return; } TTAlertConfig *config = [[TTAlertConfig alloc] init]; @@ -369,7 +376,7 @@ XPRoomSettingItemModel * itemModel = [[self.datasource safeObjectAtIndex1:indexP [TTPopup alertWithConfig:config confirmHandler:^{ NSString * mgId = [NSString stringWithFormat:@"%lld", self.roomInfo.mgId]; - [self.presenter updateRoomInfo:self.roomInfo.title roomPwd:self.roomInfo.roomPwd tagId:roomTag classifyId:roomClassifyId hasAnimationEffect:NO roomUid:roomUid roomId:roomId type:self.roomInfo.type itemType:itemModel.type mgId:mgId]; + [self.presenter updateRoomInfo:self.roomInfo.title roomPwd:self.roomInfo.roomPwd tagId:roomTag classifyId:roomClassifyId hasAnimationEffect:NO roomUid:roomUid roomId:roomId type:self.roomInfo.type itemType:itemModel.type mgId:mgId backPic:self.roomInfo.backPic]; } cancelHandler:^{ [switchView setOn:!switchView.isOn]; }]; diff --git a/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroGiftValueView.m b/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroGiftValueView.m index c5954ac6..e36de2da 100644 --- a/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroGiftValueView.m +++ b/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroGiftValueView.m @@ -75,7 +75,7 @@ - (UIView *)bgView { if (!_bgView) { _bgView = [[UIView alloc] init]; - _bgView.backgroundColor = [UIColor colorWithWhite:1.0 alpha:0.3]; + _bgView.backgroundColor = UIColorRGBAlpha(0x131119, 0.2); _bgView.layer.cornerRadius = 8; _bgView.layer.masksToBounds = YES; } diff --git a/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroView.m b/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroView.m index 4d2a433f..ad66f97d 100644 --- a/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroView.m +++ b/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroView.m @@ -392,17 +392,13 @@ self.micStateImageView.hidden = micState.micState == MicroMicStateType_Open; UIImage *image; if (micState.posState == MicroPosStateType_Free) { - if ([ClientConfig shareConfig].canOpen) { + image = [UIImage imageNamed:@"room_position_normal"]; - }else{ - image = [UIImage imageNamed:@"room_position_normal1"]; - } + } else { - if ([ClientConfig shareConfig].canOpen) { + image = [UIImage imageNamed:@"room_position_lock"]; - }else{ - image = [UIImage imageNamed:@"room_position_lock1"]; - } + } CGSize scaledToSize = CGSizeMake(self.frame.size.width, self.frame.size.width); UIGraphicsBeginImageContextWithOptions(scaledToSize, false, 0.0); diff --git a/YuMi/Modules/YMRoom/View/StageView/MicroView/SocialMicroView.m b/YuMi/Modules/YMRoom/View/StageView/MicroView/SocialMicroView.m index 1add0611..55fb1cb0 100644 --- a/YuMi/Modules/YMRoom/View/StageView/MicroView/SocialMicroView.m +++ b/YuMi/Modules/YMRoom/View/StageView/MicroView/SocialMicroView.m @@ -26,17 +26,13 @@ UIImage *image; if (micState.posState == MicroPosStateType_Free) { - if ([ClientConfig shareConfig].canOpen) { + image = [UIImage imageNamed:@"room_position_normal"]; - }else{ - image = [UIImage imageNamed:@"room_position_normal1"]; - } + } else { - if ([ClientConfig shareConfig].canOpen) { + image = [UIImage imageNamed:@"room_position_lock"]; - }else{ - image = [UIImage imageNamed:@"room_position_lock1"]; - } + } CGSize scaledToSize = CGSizeMake(self.frame.size.width, self.frame.size.width); diff --git a/YuMi/Modules/YMRoom/View/XPRoomViewController.m b/YuMi/Modules/YMRoom/View/XPRoomViewController.m index 1eca4849..2be4e361 100644 --- a/YuMi/Modules/YMRoom/View/XPRoomViewController.m +++ b/YuMi/Modules/YMRoom/View/XPRoomViewController.m @@ -1839,7 +1839,11 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出 [self.animationView handleNIMCustomMessage:message]; [self.functionView handleNIMCustomMessage:message]; if (attachment.first == CustomMessageType_Update_RoomInfo && attachment.second == Custom_Message_Sub_Update_RoomInfo_MessageState) { - RoomInfoModel * roomInfo = [RoomInfoModel modelWithDictionary:attachment.data[@"roomInfo"]]; + NSDictionary * dic= attachment.data[@"roomInfo"]; + if (dic.allKeys.count <=0) { + dic = attachment.data; + } + RoomInfoModel * roomInfo = [RoomInfoModel modelWithDictionary:dic]; self.roomInfo.isCloseScreen = roomInfo.isCloseScreen; [self.menuContainerView onRoomUpdate]; }else if(attachment.first == CustomMessageType_Update_RoomInfo && attachment.second == Custom_Message_Sub_Update_RoomInfo_AnimateEffect){ diff --git a/YuMi/Modules/YMTabbar/View/TabbarViewController.m b/YuMi/Modules/YMTabbar/View/TabbarViewController.m index 42c38d94..033bb55f 100644 --- a/YuMi/Modules/YMTabbar/View/TabbarViewController.m +++ b/YuMi/Modules/YMTabbar/View/TabbarViewController.m @@ -190,6 +190,7 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey; if ([XPRoomMiniManager shareManager].getRoomInfo == nil) { [self.roomMineView hiddenRoomMiniView]; } + } - (void)viewWillDisappear:(BOOL)animated { @@ -219,6 +220,7 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey; [self.presenter loginNIM]; [self.presenter getUserInfo]; [[UploadFile share]initQCloud]; + ///登录成功之后 在验证是否有漏单的行为 [self.presenter checkTranscation]; ///检查更新 diff --git a/YuMi/Resources/ms_room_gift_svga_icon.svga b/YuMi/Resources/ms_room_gift_svga_icon.svga new file mode 100644 index 00000000..513380f4 Binary files /dev/null and b/YuMi/Resources/ms_room_gift_svga_icon.svga differ diff --git a/YuMi/Structure/MVP/Api/Api.h b/YuMi/Structure/MVP/Api/Api.h index 172bb344..6677257e 100644 --- a/YuMi/Structure/MVP/Api/Api.h +++ b/YuMi/Structure/MVP/Api/Api.h @@ -23,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN + (void)getUserInfo:(HttpRequestHelperCompletion)completion uid:(NSString *)uid; ///获取多个用户的信息 + (void)getUserInfos:(HttpRequestHelperCompletion)completion uids:(NSString *)uids; - + +(void)testMsg:(HttpRequestHelperCompletion)completion uid:(NSString *)uid ticket:(NSString *)ticket; /// 获取手机号的验证码 /// @param completion 请求完成 /// @param mobile 手机号 diff --git a/YuMi/Structure/MVP/Api/Api.m b/YuMi/Structure/MVP/Api/Api.m index 902f6a8b..0c3142bd 100644 --- a/YuMi/Structure/MVP/Api/Api.m +++ b/YuMi/Structure/MVP/Api/Api.m @@ -52,7 +52,10 @@ NSString * fang = [NSString stringFromBase64String:@"dXNlci9saXN0"];///user/list [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, uids, nil]; } - ++(void)testMsg:(HttpRequestHelperCompletion)completion uid:(NSString *)uid ticket:(NSString *)ticket{ + + [self makeRequest:@"user/testMsg" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__,uid,ticket, nil]; +} /// 获取手机号的验证码 /// @param completion 请求完成 /// @param mobile 手机号 diff --git a/YuMi/ar.lproj/Localizable.strings b/YuMi/ar.lproj/Localizable.strings index 1ec0d0c6..d762d60b 100644 --- a/YuMi/ar.lproj/Localizable.strings +++ b/YuMi/ar.lproj/Localizable.strings @@ -1713,9 +1713,9 @@ ineHeadView12" = "الحمل"; "XPRoomFunctionContainerView2" = "انهاء هذه الدورة>"; "XPRoomFunctionContainerView3" = "تفاعل الضيوف>"; "XPRoomFunctionContainerView4" = "قائمة الشخصيات"; -"XPRoomFunctionContainerView5" = "قائمة الغرف"; +"XPRoomFunctionContainerView5" = "الغرف"; "XPRoomFunctionContainerView6" = "قائمة الشخصيات"; -"XPRoomFunctionContainerView7" = "قائمة الغرف"; +"XPRoomFunctionContainerView7" = "الغرف"; "XPRoomFunctionContainerView8" = "الانتقال إلى جولة الاختيار؟"; "XPRoomFunctionContainerView9" = "الانتقال إلى جولة الإعلان؟"; "XPRoomFunctionContainerView10" = "هل ترغب في إنهاء هذه الدورة ومسح قيمة الجاذبية؟"; @@ -1727,7 +1727,7 @@ ineHeadView12" = "الحمل"; "XPRoomBackContainerView0" = "فشل تحميل صورة الخلفية الخاصة بالVIP"; "XPRoomBackContainerView1" = "فشل تحميل صورة الخلفية الخاصة بالمشغل"; -"XPRoomRankEntranceView0" = "قائمة الغرف"; +"XPRoomRankEntranceView0" = "الغرف"; "XPRoomDatingVipUpMicView0" = "1) في كل جولة للمواعدة، يصعد المستخدم الذي يرسل هدايا بقيمة تصل إلى 999 نقدية وقيمة هداياه الأعلى تلقائيًا إلى مقعد VIP خلال مرحلة التفاعل مع الضيوف؛ \n 2) إذا ظهر أكثر من مستخدم يستوفي متطلبات المقعد VIP، فسيكون المقعد النهائي للمستخدم الذي قدم أعلى قيمة هدايا، وإذا كانت قيمة الهدايا متساوية، فسيتم منح المقعد لأول مستخدم يصل إلى تلك القيمة؛ \n 3) يمكن لمستخدمي المقعد VIP اختيار النزول من المنصة، ولا يمكن للمستخدمين الآخرين الجلوس على المقاعد المحتلة؛ \n 4) يمكن للمستخدمين فقط المشاركة في منافسة المقاعد VIP خلال مرحلة التفاعل مع الضيوف، وبعد نهاية هذه المرحلة وحتى نهاية الجولة، لا يمكن استبدال الشخص المحتل للمقعد حتى لو قدم هدايا تجاوزت قيمتها إجمالي قيم الهدايا للمقعد السابق. \n 5) بعد انتهاء كل جولة للمواعدة، يتم تفريغ مقاعد VIP، وتبدأ عملية استحواذ المقاعد من جديد في الجولة التالية."; @@ -2343,6 +2343,7 @@ ineHeadView12" = "الحمل"; "XPRoomSettingPresenter8" = "وضع الانتظار"; "XPRoomSettingPresenter9" = "وضع المغادرة"; "XPRoomSettingPresenter10" = "فشل تحديث معلومات الغرفة"; +"XPRoomSettingPresenter12" = "خلفية الغرفة"; ///todo 18.32 "XPRoomTopicPresenter0" = "فشل تحديث معلومات الغرفة"; // @@ -3798,3 +3799,6 @@ ineHeadView12" = "الحمل"; "MSSessionReleaseHeadlinesView0"="（الرجاء إدخال المحتوي الذي تريد أن تتصدر عناوينهّ~ )يقتصر على 100 كلمة"; "MSSessionReleaseHeadlinesView1"=" تصدر العناوين%@"; "MSSessionContextHeadlinesView0"="~عزيزي%@، هيا تصدر العناوين "; +///MSRoomSetingBackdropCell +"MSRoomSetingBackdropCell0"="قيد الاستخدام"; +"MSRoomSetingBackdropCell1"="هل أنت متأكد أنك تريد اختيار هذه الصورة لتكون خلفية لغرفتك؟"; diff --git a/YuMi/en.lproj/Localizable.strings b/YuMi/en.lproj/Localizable.strings index c42e43f3..ec74892e 100644 --- a/YuMi/en.lproj/Localizable.strings +++ b/YuMi/en.lproj/Localizable.strings @@ -1448,16 +1448,16 @@ "XPRoomAnchorInfoCardView1" = "Click to follow, don't get lost next time you go live~"; "XPRoomAnchorInfoCardView2" = "Follow"; -"XPRoomAnchorRankEnterView0" = "Hourly Ranking"; +"XPRoomAnchorRankEnterView0" = "Hourly"; "XPRoomFunctionContainerView0" = "Start Selection>"; "XPRoomFunctionContainerView1" = "Announce Crush>"; "XPRoomFunctionContainerView2" = "End This Round>"; "XPRoomFunctionContainerView3" = "Guest Interaction>"; "XPRoomFunctionContainerView4" = "Host Ranking"; -"XPRoomFunctionContainerView5" = "Room Ranking"; +"XPRoomFunctionContainerView5" = "Room"; "XPRoomFunctionContainerView6" = "Host Ranking"; -"XPRoomFunctionContainerView7" = "Room Ranking"; +"XPRoomFunctionContainerView7" = "Room"; "XPRoomFunctionContainerView8" = "Enter heartthrob selection?"; "XPRoomFunctionContainerView9" = "Enter heartthrob announcement?"; "XPRoomFunctionContainerView10" = "End this round and clear charm value?"; @@ -1469,7 +1469,7 @@ "XPRoomBackContainerView0" = "Exclusive background image for VIP failed to load"; "XPRoomBackContainerView1" = "Personal broadcast background image failed to load"; -"XPRoomRankEntranceView0" = "Room Ranking"; +"XPRoomRankEntranceView0" = "Room"; "XPRoomDatingVipUpMicView0" = "1. Each round of dating, the user with the highest gift value accumulatively sent in the “Guest Interaction” stage to a minimum of 999 Coins will automatically occupy the VIP seat;\n\n2. If there are multiple users who meet the requirements for occupying the VIP seat, the VIP seat will be finally obtained by the user with the highest cumulative gift value. If the gift values are the same, the user who reaches the value first will be the winner;\n\n3. Users occupying the VIP seat can choose whether to go off the mic. Other users cannot take their seats by proxy;\n\n4. Users can only snatch the VIP seat during the “Guest Interaction” stage. After the “Guest Interaction” stage, even if they send gifts exceeding the total VIP gift value, they cannot change the occupant;\n\n5. After each round of dating ends, the VIP seat will be cleared, and a new round will start to grab the seat again."; @@ -2075,6 +2075,7 @@ "XPRoomSettingPresenter9" = "Please enter room introduction"; "XPRoomSettingPresenter10" = "Please enter room password"; "XPRoomSettingPresenter11" = "Room locked, please enter room password"; +"XPRoomSettingPresenter12" = "Room Background"; "XPFollowAnchorDialogView0" = "Follow"; "XPFollowAnchorDialogView1" = "Unfollow"; @@ -3603,3 +3604,6 @@ ///MSSessionContextHeadlinesView "MSSessionContextHeadlinesView0"="Honorable %@, you've made the headlines~"; +///MSRoomSetingBackdropCell +"MSRoomSetingBackdropCell0"="In use"; +"MSRoomSetingBackdropCell1"="Are you sure you want to select this image as the room background?"; diff --git a/YuMi/zh-Hans.lproj/Localizable.strings b/YuMi/zh-Hans.lproj/Localizable.strings index d4c87782..93af0d10 100644 --- a/YuMi/zh-Hans.lproj/Localizable.strings +++ b/YuMi/zh-Hans.lproj/Localizable.strings @@ -1708,6 +1708,7 @@ "XPRoomSettingPresenter8" = "排麦模式"; "XPRoomSettingPresenter9" = "离开模式"; "XPRoomSettingPresenter10" = "更新房间信息失败"; +"XPRoomSettingPresenter12" = "房间主題"; "XPRoomTopicPresenter0" = "更新房间信息失败"; @@ -3259,3 +3260,6 @@ ///MSSessionContextHeadlinesView "MSSessionContextHeadlinesView0"="尊貴的%@，上頭條啦~"; +///MSRoomSetingBackdropCell +"MSRoomSetingBackdropCell0"="使用中"; +"MSRoomSetingBackdropCell1"="确认选择这张图片作为房间主题吗？"; diff --git a/YuMi/zh-Hant.lproj/Localizable.strings b/YuMi/zh-Hant.lproj/Localizable.strings index e88ac9a1..dbf06b92 100644 --- a/YuMi/zh-Hant.lproj/Localizable.strings +++ b/YuMi/zh-Hant.lproj/Localizable.strings @@ -1703,6 +1703,7 @@ "XPRoomSettingPresenter8" = "排麥模式"; "XPRoomSettingPresenter9" = "離開模式"; "XPRoomSettingPresenter10" = "更新房間信息失敗"; +"XPRoomSettingPresenter12" = "房間主題"; "XPRoomTopicPresenter0" = "更新房間信息失敗"; @@ -3252,3 +3253,6 @@ "MSSessionReleaseHeadlinesView1"=" %@上頭條"; ///MSSessionContextHeadlinesView "MSSessionContextHeadlinesView0"="尊貴的%@，上頭條啦~"; +///MSRoomSetingBackdropCell +"MSRoomSetingBackdropCell0"="使用中"; +"MSRoomSetingBackdropCell1"="確認選擇這張圖片作為房間主題嗎？";