From 415b7e2bbb5d2814852a6ba50c044050819c5d38 Mon Sep 17 00:00:00 2001 From: liyuhua <15626451870@163.com> Date: Wed, 22 May 2024 12:06:48 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=88=BF=E9=97=B4=E8=83=8C=E6=99=AF=EF=BC=8C?= =?UTF-8?q?2.=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- YuMi.xcodeproj/project.pbxproj | 88 ++++++----- .../room_menu_arrange_mic_ar@2x.png | Bin 6740 -> 0 bytes .../room_menu_arrange_mic_ar@3x.png | Bin 1549 -> 0 bytes .../Contents.json | 22 --- .../room_menu_arrange_mic_new_ar@2x.png | Bin 7322 -> 0 bytes .../room_menu_arrange_mic_new_ar@3x.png | Bin 1790 -> 0 bytes .../Contents.json | 22 --- .../room_menu_arrange_mic_en@2x.png | Bin 7069 -> 0 bytes .../room_menu_arrange_mic_en@3x.png | Bin 5647 -> 0 bytes .../Contents.json | 22 --- .../room_menu_arrange_mic_new_en@2x.png | Bin 7565 -> 0 bytes .../room_menu_arrange_mic_new_en@3x.png | Bin 2001 -> 0 bytes .../ms_room_menu_game@2x.png | Bin 2613 -> 603 bytes .../ms_room_menu_game@3x.png | Bin 3960 -> 991 bytes .../Contents.json | 21 --- .../pi_room_menu_bottom_send_bg.png | Bin 3257 -> 0 bytes .../room_menu_arrange_mic@2x.png | Bin 1359 -> 831 bytes .../room_menu_arrange_mic@3x.png | Bin 2126 -> 1281 bytes .../room_menu_arrange_mic_new@2x.png | Bin 1628 -> 958 bytes .../room_menu_arrange_mic_new@3x.png | Bin 2627 -> 1535 bytes .../room_menu_face@2x.png | Bin 1388 -> 740 bytes .../room_menu_face@3x.png | Bin 2184 -> 1198 bytes .../room_menu_gift.imageset/Contents.json | 22 --- .../room_menu_gift@2x.png | Bin 3532 -> 0 bytes .../room_menu_gift@3x.png | Bin 5157 -> 0 bytes .../room_menu_gift1.imageset/Contents.json | 22 --- .../room_menu_gift1@2x.png | Bin 6537 -> 0 bytes .../room_menu_gift1@3x.png | Bin 12620 -> 0 bytes .../room_menu_message@2x.png | Bin 1296 -> 724 bytes .../room_menu_message@3x.png | Bin 2002 -> 1200 bytes .../room_menu_mic_close@2x.png | Bin 1337 -> 955 bytes .../room_menu_mic_close@3x.png | Bin 6815 -> 1516 bytes .../room_menu_mic_open@2x.png | Bin 1246 -> 834 bytes .../room_menu_mic_open@3x.png | Bin 1938 -> 1343 bytes .../room_menu_more@2x.png | Bin 1368 -> 583 bytes .../room_menu_more@3x.png | Bin 2045 -> 1076 bytes .../room_menu_new_message@2x.png | Bin 1263 -> 806 bytes .../room_menu_new_message@3x.png | Bin 2096 -> 1523 bytes .../room_menu_voice_close@2x.png | Bin 1117 -> 759 bytes .../room_menu_voice_close@3x.png | Bin 1815 -> 1162 bytes .../room_menu_voice_open@2x.png | Bin 1164 -> 681 bytes .../room_menu_voice_open@3x.png | Bin 1784 -> 1004 bytes .../room_position_boss.imageset/Contents.json | 22 --- .../room_position_boss@2x.png | Bin 4144 -> 0 bytes .../room_position_boss@3x.png | Bin 6792 -> 0 bytes .../room_position_lock@2x.png | Bin 1055 -> 1665 bytes .../room_position_lock@3x.png | Bin 1599 -> 2708 bytes .../Contents.json | 22 --- .../room_position_lock1@2x.png | Bin 4562 -> 0 bytes .../room_position_lock1@3x.png | Bin 5553 -> 0 bytes .../room_position_normal@2x.png | Bin 1228 -> 877 bytes .../room_position_normal@3x.png | Bin 1822 -> 1380 bytes .../Contents.json | 22 --- .../room_position_normal1@2x.png | Bin 2983 -> 0 bytes .../room_position_normal1@3x.png | Bin 4546 -> 0 bytes .../Contents.json | 4 +- .../ms_room_reting_backdrop_back@2x.png | Bin 0 -> 356 bytes .../ms_room_reting_backdrop_back@3x.png | Bin 0 -> 582 bytes .../Modules/YMMessage/Model/AttachmentModel.h | 16 ++ YuMi/Modules/YMMessage/View/NIMMessageUtils.m | 2 +- .../Session/Content/MessageContentGuildView.m | 91 +++++------ .../Content/SesssionModel/MessageGuildModel.m | 2 +- .../View/Session/SessionViewController.m | 5 +- .../XPRoomFunctionContainerView.m | 52 +++---- .../XPRoomMenuContainerView.m | 92 +++++++----- .../View/XPRoomMessageHeaderView.m | 2 +- .../View/XPRoomMessageTableViewCell.m | 2 +- .../XPRoomMessageContainerView.m | 4 +- .../Setting/Model/XPRoomSettingItemModel.h | 2 + .../Presenter/XPRoomSettingPresenter.h | 2 +- .../Presenter/XPRoomSettingPresenter.m | 17 ++- .../View/Cell/MSRoomSetingBackdropCell.h | 17 +++ .../View/Cell/MSRoomSetingBackdropCell.m | 79 ++++++++++ .../View/Cell/XPRoomSettingTableViewCell.m | 2 +- .../Setting/View/MSRoomSetingBackdropVC.h | 16 ++ .../Setting/View/MSRoomSetingBackdropVC.m | 142 ++++++++++++++++++ .../View/XPRoomSettingViewController.m | 23 ++- .../StageView/MicroView/MicroGiftValueView.m | 2 +- .../View/StageView/MicroView/MicroView.m | 12 +- .../StageView/MicroView/SocialMicroView.m | 12 +- .../YMRoom/View/XPRoomViewController.m | 6 +- .../YMTabbar/View/TabbarViewController.m | 2 + YuMi/Resources/ms_room_gift_svga_icon.svga | Bin 0 -> 5214 bytes YuMi/Structure/MVP/Api/Api.h | 2 +- YuMi/Structure/MVP/Api/Api.m | 5 +- YuMi/ar.lproj/Localizable.strings | 10 +- YuMi/en.lproj/Localizable.strings | 12 +- YuMi/zh-Hans.lproj/Localizable.strings | 4 + YuMi/zh-Hant.lproj/Localizable.strings | 4 + 89 files changed, 541 insertions(+), 387 deletions(-) delete mode 100644 YuMi/Assets.xcassets/Language/ar/room_menu_arrange_mic_ar.imageset/room_menu_arrange_mic_ar@2x.png delete mode 100644 YuMi/Assets.xcassets/Language/ar/room_menu_arrange_mic_ar.imageset/room_menu_arrange_mic_ar@3x.png delete mode 100644 YuMi/Assets.xcassets/Language/ar/room_menu_arrange_mic_new_ar.imageset/Contents.json delete mode 100644 YuMi/Assets.xcassets/Language/ar/room_menu_arrange_mic_new_ar.imageset/room_menu_arrange_mic_new_ar@2x.png delete mode 100644 YuMi/Assets.xcassets/Language/ar/room_menu_arrange_mic_new_ar.imageset/room_menu_arrange_mic_new_ar@3x.png delete mode 100644 YuMi/Assets.xcassets/Language/en/room_menu_arrange_mic_en.imageset/Contents.json delete mode 100644 YuMi/Assets.xcassets/Language/en/room_menu_arrange_mic_en.imageset/room_menu_arrange_mic_en@2x.png delete mode 100644 YuMi/Assets.xcassets/Language/en/room_menu_arrange_mic_en.imageset/room_menu_arrange_mic_en@3x.png delete mode 100644 YuMi/Assets.xcassets/Language/en/room_menu_arrange_mic_new_en.imageset/Contents.json delete mode 100644 YuMi/Assets.xcassets/Language/en/room_menu_arrange_mic_new_en.imageset/room_menu_arrange_mic_new_en@2x.png delete mode 100644 YuMi/Assets.xcassets/Language/en/room_menu_arrange_mic_new_en.imageset/room_menu_arrange_mic_new_en@3x.png delete mode 100644 YuMi/Assets.xcassets/yna/Menu/pi_room_menu_bottom_send_bg.imageset/Contents.json delete mode 100644 YuMi/Assets.xcassets/yna/Menu/pi_room_menu_bottom_send_bg.imageset/pi_room_menu_bottom_send_bg.png delete mode 100644 YuMi/Assets.xcassets/yna/Menu/room_menu_gift.imageset/Contents.json delete mode 100644 YuMi/Assets.xcassets/yna/Menu/room_menu_gift.imageset/room_menu_gift@2x.png delete mode 100644 YuMi/Assets.xcassets/yna/Menu/room_menu_gift.imageset/room_menu_gift@3x.png delete mode 100644 YuMi/Assets.xcassets/yna/Menu/room_menu_gift1.imageset/Contents.json delete mode 100644 YuMi/Assets.xcassets/yna/Menu/room_menu_gift1.imageset/room_menu_gift1@2x.png delete mode 100644 YuMi/Assets.xcassets/yna/Menu/room_menu_gift1.imageset/room_menu_gift1@3x.png delete mode 100644 YuMi/Assets.xcassets/yna/Position/room_position_boss.imageset/Contents.json delete mode 100644 YuMi/Assets.xcassets/yna/Position/room_position_boss.imageset/room_position_boss@2x.png delete mode 100644 YuMi/Assets.xcassets/yna/Position/room_position_boss.imageset/room_position_boss@3x.png delete mode 100644 YuMi/Assets.xcassets/yna/Position/room_position_lock1.imageset/Contents.json delete mode 100644 YuMi/Assets.xcassets/yna/Position/room_position_lock1.imageset/room_position_lock1@2x.png delete mode 100644 YuMi/Assets.xcassets/yna/Position/room_position_lock1.imageset/room_position_lock1@3x.png delete mode 100644 YuMi/Assets.xcassets/yna/Position/room_position_normal1.imageset/Contents.json delete mode 100644 YuMi/Assets.xcassets/yna/Position/room_position_normal1.imageset/room_position_normal1@2x.png delete mode 100644 YuMi/Assets.xcassets/yna/Position/room_position_normal1.imageset/room_position_normal1@3x.png rename YuMi/Assets.xcassets/{Language/ar/room_menu_arrange_mic_ar.imageset => yna/Setting/ms_room_reting_backdrop_back.imageset}/Contents.json (70%) create mode 100644 YuMi/Assets.xcassets/yna/Setting/ms_room_reting_backdrop_back.imageset/ms_room_reting_backdrop_back@2x.png create mode 100644 YuMi/Assets.xcassets/yna/Setting/ms_room_reting_backdrop_back.imageset/ms_room_reting_backdrop_back@3x.png create mode 100644 YuMi/Modules/YMRoom/View/Setting/View/Cell/MSRoomSetingBackdropCell.h create mode 100644 YuMi/Modules/YMRoom/View/Setting/View/Cell/MSRoomSetingBackdropCell.m create mode 100644 YuMi/Modules/YMRoom/View/Setting/View/MSRoomSetingBackdropVC.h create mode 100644 YuMi/Modules/YMRoom/View/Setting/View/MSRoomSetingBackdropVC.m create mode 100644 YuMi/Resources/ms_room_gift_svga_icon.svga 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 fc4fc5b9f3d4425aa6608f499c60cba71ec44a88..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6740 zcmY*;by!qy7wrt?&>;*BBhuYUhje!+-5^89NJ~niGz=gq4T5yHbSqs0NJ!^MUHpB& z`+fJm=hLP?N{SqQC+G0Jw?@GFp#W@^64J9`B|0t}BlT=&mI% z4X7NW+I`%FS{o?ZsHy^3A2A4k4kQAg{-r!#03Zbb{T~bfC;=(|i?x8v|8h_OfCzg4 z+P|FFkNNLXc#KE&zZvy2@PCe7beH>LBOO)%suT30_++_U;06>POC?ll<1J=F4Y$Tpd zzAr0n*gLp*GfzkWd_mmxk&NH0--Si~zpXPw|^IEgwx9)xvO(y6Eo?ay{LUB~vh zGlZ&S1{KUYLfLW>f&k|Ng^o~{>~LlWl=V*p z1d}mT2N7dq_XWBiUU&6Ep$bH)n*CnsNv8N%L0n?a@8T7oZIAZ+toTBRAHxXS{Y>YD zRkP3(RLjBoo_UcdIktOf7N>p?jG1XOc4O0cWaikL1~j;7B~dAyAUKv3_vt1 zeT(m9l4dm)IUjX%^|%8&w9-?e6r=pzf&)92DJwoTi7#iNr>-1fi$)-!4U2=cXA8vd zvJOv3O#tck-ABM&2Jl1NMxfYLM#m7TBqhuFBla7$Rj_mlSojHNNohXX6Y4MPYq8eK zAP`6XTxbTM-2Xck#!faRs!^=cI-4v3le2;((65iLLZAn4ao2DVx9YU3_1FSdPr=%Ag1rtql}W0|w&(S8 zVFosh3yWS-!OYLf1P|8;B7<~yVj1)6Rkl#))O&!RC*QyTUxP5~SP`r$ze{<65g)8* zV$aEMZzEmd(z@hCfjdsc^1E3Iay~8NF0XkK5cZI0j$}!NkeQOwlpHaF{8VujL^BptwNuc?L8P`= zua~9|{$ZV%BJkP1Jz2D$EpwRQV`tHY_h7vXZ$T`15Y`xPs(*k%#naFJK7uKVXAf;tw5Enia|m}FH^SzftFPZF1>b9CJm0(H_cRNke;saYyS5A-+w(cN~Y z(C}_UM_hw4UImon{W)GnFy$k+{JF7~@TU4M$)hOq+>o11HEKRWo_U0)I#@aTe8lP| z4Vulz;*?r5)FQs!Q{x=6xQ$2R%KJG{DKbPfT>4`SWP`he6zd0P($s7A=1J#?^$K96 zs_<@mruAxR;C2S-$suONaj&ukC^wPLog^n$N;fIe+?aYTJlRK`vEujme#~8%g$9xR z+FhCjrWY5t%M>}E+1ujjQ6^%6&$T2z8HCW1V_uagdAPCFZ4}*f#og)o;ArF@)J`Vb{aGQGUo`PsnIH zdZBr$OITu?ykh+JHb-7~K*(cd$w$uty*;s+YIUWSz5W>A82uGh31r%OtIsgmKwYB* zBNR9IEoAo8 zqPs}l>T@~970 zd@~_NQxBd4kO8kFyh}9sK%u*}u}S^22TzBJ2-G_6DbC?-7?IR13FgVkW9F2aQJiUE zd?J^Y&yEH(mvh$hE-eL!fV3&x$vj)tf+{&vQHz*A4r94CLQ}W{T#=*%ro7Z5HSa`6 z0<>+P5U(zV>wceR{*gvrMonO)Jd+pcW+MILFihQ!m{F(|t}|Rrq0yx|cDmw4b`~$) zGdQpzrP~Mh05_apT51PUEQhg=D3GlWB2GFSGsg~5qQL4FBvs1+wA(jr*HP7lYnWp% z$m)ChUHeHpF zYS2+TX-bhek6sIQF!}ZhC=Y*N%HW=Oa#mWQb4CfNs#!_}Q-Hf}^2g6WPQlIIq$3Anj?t(UDvs>w z125#!j%TyJn>>Kbkp~lW>??qy^rvg-#XXj%cI6(~;gV$HIeP+l29?-Qf=!IR@62T) z#MH$>qjI_%67i>VP4EoM9Dk{hEW6VQI4vN9hF-X`!Gcm;?=d9`y#z>mj9FOay1I3L-4}Aczf%; z)SR%~lf9mq4^8J75AJ7d+#SN#BkVJQbDxeoy%@WO&A-0~BC4*p%uMYv%{GQ^+j#r;%1{%DivT?-aLIu~HTO(0$7dh+e>QsVlP5W1_ z{Hme?=E0R~edbmI#h56e*x`$pU&J>znZ~8J=~aJkxhpytQD>|J5?WcX1v*#nG1B_2 z3~+%k`U+i&zGOF&1QcZMB`2d;z$s4N3$Zv_2h*Mi{%rJx!I#jU={f%?M>N3|My`;L z&zMalLh|*0_CO#vpt%?WVv~@^Z=r`F->*EpcTN~utHLzeTTEBkj;{$@ARXIM#OMh& zH19?~e%`Y#HXc$|Lrb=;(%dtZM^@fX`74KJf=;U<~!Nu9m__EEK=k^)R%1YR3;3lEXy<2qvFKM$~ z@AlpI04QO9U=vV##fMhJIRLXQCo^mfiT`}%2G@@j-0d?amA@Drt=8YbpKsf&vJZX<5tVlZO@Dx;d z)*8+?gCec&Wz~?~z_%KB@NzVB0qr_?DwmqK1A zepB%JoF(xq(+#?)Z2v)gd+>$wL+Ew8aD(DApI@_uT}|2FlOC~{&2O6ox_yct z;IP)e0GyuKFxzK0WMPa@l0y8BfJ>^m>V*;BTkXV7Ok|gfdSfn8>V2{_xb6g~mFd{d zZ^>S0e_uv5G?F99b~WH@Z@ZAj8Oi*B>6b0zxl-?uJ*D>Zm_&SlQ4VTq3Wt0}9qE`4 z*A%a)_Ajglqgi2pXI1vK|LD1wdt4hQy|dx&0xQEi$h{%Fn>+wf7v)DXjcpN1w9}c1 z{)qIrvE_Las!rMXRU(=MXJ|W1Xf|*qt7A{8{$1`Qa=2_4++2A%!T&Ahst;qSgEl?Y z$CZC_iB~98b>`!}u_Amd$Ob#rcD%>8+F{qD@UDyrK^(c-Bqk`2GPF?s{z%(WZE-#X zIo;1P&J*SP0dE3%5_2Jt6Yfs7aPQIOv4x9~Yv0b4kQ~vA)=Cz0<2`)Vdy>|CV4Su@ z(G#^vqn{l=6Dhxu7@^*q|0VmwyzK)ha-J`jRsgq(kKa^&#)f(}s^{SsV(9%z>^DL7 zd3KX%^dwLCgL`wh`dU#+lKND|X$~bjLPWAKxky5CAa?@%K{ldte1e6x{OB{EHmANPT^HI3cGAxYU^jOa}u}TmK z2cMX?xB2Vrq+J;H>aJdBJy}4q59C8p6{>i~L9WS$Z|bSh08`eDrC&}LYVW9jw;!Ax z+rHcLyJg)uLCbc6b|)uhx={YAO+9;~B0Pb&+=nz8<00kMXiC*J3GC)&k})g2v}HhN zWJP|ARU>HsLWjhM8nAYM!D{3b#P(hmqx>r3WpP_^7s=X3r+{0okD)bV(oSvRB;~saCbP;W@u`;=N+pN?%ojs7kW+0< zg+3M9uD|jx4gGyCAMtoLi_O z{IFB?OsyB{J=U4@(`VAX>u4u#yoWkah)A34dzrjMkT=asAmQY`cs~YPRbHe|N>K__ z!Vd)(%I`JG0~>=8_`4UqYWV{~b21E{DAGSMs->lUdn6UGV02BidpetnRM7bzo%*$J zxS2Luq8VV@mofq1lD_;Xktg&c$oV6rtqgTIdoI{`L#xU!>dkMp+sn8w6K*Hi3Y;|f z7qz0iy7_iL0g6!;6t8WHkJ$t9Z_XktQ3clEoY`{~Vlcb>$dna&mBHBtpEboyZs(m> zf4Xg8MSs?|lngS7zT>%g4KJ=86*`Y6fm#Wf5xX*5EZ?l)yS|hg#_qD^={W9v=iKX3 zl*8SqB4Z<}CGpQ@3$t^2ak&oVoce^)-p$dAcG(!~rJkrnjK>!)Jxptn8x16`r(AeH zV?L*7GsJ9KrIi#{AvOMO9NrXvC^x65dFeW|=O0=B!)~sFHw0!%mScZx!I27G47s~r zYGV1_6L39Ny|yf4`{AK{ao~BcQC=T$Dnne7?6{_*Lce;vO8YtSE_2dd_&b-Fyu@zX z5>lo<4vX~z$>LKo`j1($U<;y1jr|5l+qy7(g`himNsCEy3mHaJKh4y5wld(7bG!l8 zpx<}wC^t97?51zsw*L%kMQy5rQ>+uYwtNrN(xa{J?q!k-6uuJ5wdzNnt)92<*N2>`2L%xXlubuX;D1nB z%|i7{O_jUM24sjY1sOiG@v`4-`&N+NL43R^cDIwWDxa#Ym6K1x`>jrjKX0g4Zr@~{ zQ*!RLX4hMpn0e;OipdYxq@*k(s3L_pfOleXV^);X&jf}nKgx%m_5)%BZvC>J#H6ud zt9CL3?8qOtswI|)la;mLl$luP71aG=s}Tp@Vb>YzxZ+fQn~X*14#KRRhC- zgfaaIunNxE8QCD=rzSG~s%sEKwjo^4RL68D8t}m^pM(_jQ!qwOLaQYR5?-Gz{aRR7 zNlyMKs&=@8o*Dyy;NRLqGd+iqncxL$jFUA3G~xw8d?@D5kv@`?*2hYyLNR_CFus_j zK3k2eq|^A)zB+a;`kjFNu$S>H(|T3HOe{IwitL*D&(sxL29GqN3kH9yU&y>F8%;h? znE~HV$VHS(!^nMK0?LgV%%s|%x4+;#{7Nuu{4(uMT)#3uxoZ$CRV;{{ge84jL`r)D zjZ9h>+9UAq>e}gPH9IMN%EM#AK(VW7rkS%)N;G!089i&l?^%A4E|yIkG|8KmIY>=< zJ-EpYVwVt@@V@HTiw46)Q+;YQ(9|kM9!)Mr9piQ7xo~gy$#u8(=ovmsbcrCeE zz?Y6fqt%ExskbOheG=>?>TSy$&rpY5Svq6T;1kKj$~DuYMo7yt$~Gdcn|d_>+$l~~ zL7rgEmemrTHn9i+vF(azkrOu_8d$h+S{&=pV(k11>jiu|!G@49^{;2L*L65I6w2QGB(>2}U&ljICG$}aS%*<=wC zQWH;=TEF%iZl+~=^892JLEInmL>~_bu$9F8yot|5>4A1O|Lv#ct{S{Ea>1Hd(oxmL z-=|^R>}L%&5=Ne?;59ftzE@*XFjf1J9oKPaXW#Fo6=2DgKF8(Ug44kq@>G}Nq|MvL*huimr*!suT|8nQ|`TPI<|Ns5| z|8wg1^Y{Pd?En1z|MdL-==T5Hg=#o_<_{Qu(h|BlN3 zps@e&_W$wn|NQ^|zw!U}`Ty zqwwGsc1Y2MS2++5vpMjTDbYw47G`GADU@c>H_(Xy00j+6L_t(&-mRMHmZC5aM#0em z!Y+#_?)F~q|9(@I1fvt0K;-^Fotaa2zElO$r*%dW#cf&?p7-~!=Xpii29Yx#L0fno ze-&OE%uzi~{}7r%kiO^$sJav=#cYnakktn=5MJlJMMZTB`|&~;e}s^)46kxGG!=!y)&uKopJ z4e*%ZoaKOj_-+UxTih>LgMXi)V}+7$)rcm?>NP5w;SjM}A>9FY0fWMIp}+^o5*IlD7^X?hkgmAEMG8s`lU#U95`cY@L*{a- zK>;ZOu|hgx_cA$0yvfG|CyN2Stws57G#TzqEedXKFMM|3atgyRyMW>d*Z_tAy*V2; zT_Ic0Z^$0X?vLWNtQd6ErTN}OXVKr;h8aV`u;LpJNoZGpgoK}rxi>|$3v}kYH^t6w z>DnpA-J4n`T`p||#F!&TiUPtmgTX<9+gO3!xv6lLf^nVj!%|$wpPR-A5Q+IzcN13~ILKj!o0J2>rL&SyU}uCLUt|z7+HylHbL%E(eegyVi+Us}%{Z zUv!Z}dP*lf0@j@}zadXtpBhk|0Z?#5LA&C7t+ALI zCl1Tuf0)}NICh^uK*6VChk`%|ukLx`g zD>+5s)9r7^1+f%-;&qBbIedWQ$^X~`T#_e2>~Oe%c7~;ZmPWAVL6pOB)Ebo-;mbNh zNk>Z-KJGucLPXF-$jd%~{kbV}Bn96HjL+d|vtgTg9B=9e@fD~11i_Ccu*!ffRuKe; zpABNs?12C(g2Gau2hbuYUT-!9Pz3V}BIk*8rSpHcHn5Va|(7& z55;^L-kd(7)$0b;0F%Mqq3Y`dGYC|J`-tbr5IY0JmIA%LX_ahm9k@OQqSpjteic~Q zhj^pdBBIjc5AuOrPMko7hBSr%N0GP5e63~|{`ZrLKU+$%r4r?z7&Iu|F0aT8Y z9=vRVU|OUh|0p**`A-3)z#IN#q}MF zoufG`J0Bk(D;ozZ2glnN##<+MTW4dpx3*5y|1tT$J`yme4~~}h&X#tz;J?1cCU!2) zLR3_L8~u0v=bX-#X8-GC>-6tfF9WjveZtDl!p8bv?-!}y-zvY7qb2O6^Iv~qcENv` z|6lFjK7y=&oBuzD`Ol>PR9{9FMiXTH?`soABQn@P0RV{K%Swo;xxqE)0^LXllAhZ3 zvZpMZbs7Q73#7ql#gJn?K%;H zi!=cvBb!Ks5F?CexPjN}wX|~Y@(;4>JfAgZgsh^ZYMT#LDO9fye|Y+KcwCp37HrhX zH&*Ba?=DF;NHjzJ$o-zh$%Iph3~7q)BV}6787SPl6+_+!SKH{GdwKT|i&F9u72J#B zq?`F_m{{c?Z86&jOs)mX*m;0Kw&j=C_zEJ$AJ;-E5*tp!A@Bh`^50m~(&LN1`YYj8 z_tF|pF;S_d4Bfcw#z$jqUL6!FVfqb3*sPbKP?3J7N@pSR_ajhmM^Ia0!zlQ|pu?;# z3QnWh^Jh4a(;)&;h%pzGL$pR;FE%zF<0>#Gm5jPll^V~zA#3}Tq|Go0!VdHt!U)YqG}#@!qYaoOIq7@ z^0fm)y%x%52^(EJG`gBf80#+M80raX(Q1aG6< zMp?4xF{%LVZaER5Zw zD8J=FmKi?J1vl(Ndd2ViWi<+niPU#?axy1=c`w;o9ZFH{GpzN-@22L8aRFMrun-SPc#K1+5+;-gBWwH1Jfc^`^pNX3LYvY zG$`<=yO^?}MaEOPDCJ~3>w9?BZEw;G@r3e&cm#$l?Fk)eJq zPYuszchJaSp5PX3mUH`xi$qDeXqSk2%>jU9q5(Q;;#=Z z*x{iD#gj+1dtH3*(n_BjsupeU}-nKiWB!(6N8ml-B(bsvI#YYS$CEEeYm=e>`3t9SYfki%-85CFYIZy9EXq)>B z3de?U0aKK$6mLe&>2Q6q*1EQdv~waCfgwC!vWM?zf+(DDb!w1>chs{TkrsG<2qGd9 zq85D3+snYPH-N4yBsuc*x!(l!&Ry$%*IE|36>PswWi^1#)^iOzwZM}8AWAfa4^$j@ z-=ul2Jl;+WHm8ywE=?&9KpsiyGJ~2nFfB-NSAUf9>5w42( zy5sX?+7be24B3dVKTp(Q z^be+W{3b|u^mO`a*I9^Z%#P@%xIB03L0-|bdge<7SO{82IXMvCHrd+nETb5hxs_Cg zXTWLIAjS%SW+1amti4xfC*T31>SHPtNWL9rt0DzX5BoIQ=-%aEV$#-_YKz?UX`FX! zebg+%z@f*)*%y}bxF+w*d_q@q~l6%h*X#O=&mkr(rSyj;$p7uPAfn zb1<0OB{^i1A}^GZ2HHQ0}T8lJhpa0n_e2CM)^93o$qXWx(B0pX&wZ9;=gT#;F;$-j0!N! z&G4Wmd{Svd%#rm-W28db*IWskEs)N4g`&gP@dZ`7BYr!NUXR_CG=}TNA5bsP6k*WW zi2@g+LjCNS?kyO#1$Jv0&}Ui}uuf;92~;2!9kL7slrUSx6fVTv9B-!S0}K|7Q2X81 zsMN>(`~~+jPDG2-CBx*tKR<5SIyx{TN-EH>FD2gq^+U@DvO-ed%(J>@V_7pFORkG~ z=>vleJ3_qHU3lwQg6!DcGP)V_eY^W9Iy>NF$cTzyjzyNr+@0!buM;(r-ucFktM2O5 zn#L8@JA8;aW@kc|si#Vp6|2%#+0TM+h>(*KgYW(rSm>RuG}NOjEaB0cSlhCTUOmXw z!_$c*LK}5+>$1;Qcc(BJGb7v%Bty?((0yvmI147bbm-0S9;R3hvfl_zoyQ*Vz9Kp| z!C_wLzLNl5?mnVNKi@N@D!A|GIceKXK`X^zk`lD^h9jKc&%Tc61h`w}IP~_Q;WmD- zp5ncQ5=&(l1-IzM&(_ua8Sj>3X9OAJt77+E;9;MnVj&V`D(;%CmgO8x&e1BoF^>Y{ z6SIyxTK!kHyUvFD>IFtGj!FpG9HcOy(=}jQQ(3t^7Rw zaAy%M=X_&=&I<5i`pR1wPU8jjhF$K(Uk|4?=ad!eB4a#wFgb_AHcmp21*P-%eH)jv zW#8qDyp3306nx5J?~`5i=C$!kxZw>(tMl1h#bb|(>i;Nb^NFd8(jsEQ9^VD_#;(zR z-V&RrAoLH2*iP8jku`<{Rb$Y1=P=b!_s*Y8v1qclAh4j`NyCK2sYE%eKdwR{&wfB9 zwf)(^Ei#$SzitSf^Lei&Vtq858M%*_6V&ZutG`PN>}9(7kgD4(%`Va}=kC61$COwd z)I~kZNq)A)b^$`)U#mtp*MHz&%USd@>T#HkW@d72n(m7Uo*+vA_h*a6JiBJ+A+@mZmBzTO@+4lD48w}no-xkFbvx~P(<)5Xf zB{zHo{?OuO$(J8)15AR#X&O8=mlR4YP8gMot>HG(HB!gz7eAR&_@EcKXnrt^KG0Z& z_>H7YYhO8g`(-C6bz{{|Rd%Ad6v-P`IUzqS1`gY|FK3VkTz5lf$9NGd4grzQdJ8*6 z6p;$$s(*G2u_-iTx^4M2R5bWVaYhmnxpEU*2yL#W=%s6ATwW z;$Kc>v~;a(T9#H@Q5OLii=q$A3(+kQ=F?EQ#(Y(v-#zMwY!8f(x=(AIb?dXT4DJzrnq=BI0;#Ie%l zzWTts-Cd&9t-h}shidD6OvHI@RyKYw!9AF85zDQoB27YY8f$Nv#1C3}Jb|b5Jb>Y; zvW9=W%1~7W_GOGJt2-wCO7)wB!#l&cG`TwcGL2a7b|REHv|bP&v!y?@M!MyB=^EG9 zJG5_y>pL2)0J|T#?V+)$9o7F*a0FwDPRe~{Z*gJ<*08~JWT6DhWQ9jc$e*79RLCD# zS|PG%*_94_Bdes9CA7$z@y&Xq#NSk_#_hN&Q&T>RFVBYN#SQ5({n{(StnmVpKtawI z24{BrkY~z=yqs`60N)}^*@Swiv>_=aq!cQYb-DzP7D=VB65V}bC@OJ7WaXb*%2Y8b zpGe%EO%UG{-dS15Yw}pe84D!j0Ib~Ba{73~DGK*H5lHq*I_&Cu(rIIuE zGlsw=giJ#$h|X(8u2%9Je$LPrfhYW-RcCCv5uY{ujJTF73Kt?i_W zC=sdm7@1yOomhhgW4v#0`!UZMSUj%V*c>gjtOzsk2gF8jA6lD?zn@B-w(`W@Ulz(J za_aC2=ao}sspN`oG&+v_ex!M`iG7C_mH8>KV z2Pm+ri#llYT=05qQ3>b>Sh;dK6p}`9Kw5xJXg+xKthc!IP@5wW-hN&vpo2 z&6f=RunRGaB49JhmJ*2lIjrt9KqN(T1EiX@+1u9Z1QaIyz(U(tHbJt3|<@J_V7mY zRG#!`hsN|hc+;721=Se2;_h)hV@+uDY){}#|^Wm^7OoTisB88w()DM2nkbo&~Zk~ z_~1O$XRWO-(>b6m>d^|?h@O;0kK6SWxilsCe7mEJD_NG1^WlEghGFf7I?@@@P_UqSCN_nE^l>+USyfk3Z7jm&9^elb}D&6(1!tC@pT2kJii9Xwt| zUQYDijRuL~lKG%-)082`F45wVIUOtP!a+k}>Z{3uEL!b&dkI8a0;cOn((^MJ>}go1 zCO90pqN87t+@io0xh1~VC)}Qc>H5biBuCB3T_=C?&r!eidTakV2z`$DU1|G0S5hG* z+dVTn*;+IZ?Fu`te-po0XA1V z7a1gd_v@KBy|vMVpT}k#)}Z`r@y=r&>k~0v%JGBIQ?l3R@tWZSHwY>1^B?Ml&6Rrn z&zN9-Pjn7%vO9uT5>?~6cONW-I+ZkG6gd9Rk+@IvBQ<|^K9v)i#TT2}Q3ZLH|H@17 zUXq~=2$k=)-kHA0(txbLsvoGi5}6=oo}T+B=XyDM4PJ)-!UE zmq<-^G)fkb&x*;fzIxEp!O42;%dADeBe^Aue*UxJresyqw{I{ts;D)|S@4}cO_K1* z`WLoq@z=Ob^;!LBAsdRl69w8tTRXAx@t9HBY_Af+rp#|#y?lC%oxh}Q*RWPx&UxGM zZ@1juuVla7Ga5QSY>W#mTF8%HX#z?>0?l=i{0(Q1F&=Ue3OEv-STp_STyt0xwo@O&J*}ZdN z%$%$tI3mvu-(B6YVXT+lINA~rFM?{p6Q$Xw)gm}&JLl1QXc)$teQ&0M%zVAKuEpI> zO=9d%=Jl(J-Ki7XkyMdAjZg0|XWU8K6UK*gFV5O;i#^Z|+Hzm3PQ4dPzo!#+KMdyn z?WbBZXk#AS^iC;=PxVAc4{QVltee81?jd*#i_*1KDgMM!te7AQd7ArbsYS;&E z*fV2M6wH_BEHMA5I{J|iLSi}pE_Lx$+_G+q_y=W5*;yH~{IGuUub+I-qi8rPXhJnS z`gA4NI%G@Ll6z;R^14HFq;4t=e-4KP5qpH<2EqLfGS{r^n{Il2Cci`iNA%u6ILVdU zh&K23Ve&RVp&@cx6X4d<_~`lygERYQRfGXfuZlr2#KnF3eqW^B>tUBC9|5I|Cvqf2aG_#$5$&+(A#3%CFt zo0du8ISQ?5hlsz5v7ZakX*z}al&dE`x8@+A36uJ6gAxqP<%hfWPuO){p6ao9_>x6B;7| zkAjjW`?C%xjp*!WLS)8!DFY2`e(!YmZ`w<2Ru14ksGVT;CePDhuEb!AYz{cZ!#v-r z%~ELuU32;~AM6Z_mzTBaG28Kgs8n|e4(LJFyAaN zxlH|(XW>((lUINg>pRi0Z6CbyOsE1H{meNd?j}>P9;I|CwFG2qvSf|ie~vcE1V7>I zn>M5~d%KBIM&G$qqwY4ivk*zf|LgjN6A5xVGCOJ9IBA*tXlz_WM?L*&!3kPisP9`j zd)WecI7$uC>Xx;0m>ipws=;Bj6&$3yMCC~STt4OjAzwQnRw|_B^*1tF9AMQvMR2X& z_T)VLq&1T9AgUf0aZ1j2+CRe-Q08n;WYJ+^cvMJb$beSnSL}C;*jAS6EaW~_@Ft%x zR?ep!Kd2hKj==;-Bc21V_1cDaEe9mZ2AsYUy+hq3L7ht#vu~(C_P-a@n`(Z{Zk@tA zP>;}j^z5(ES77KGpa(VC{Td|+IWhNAju=E56iQP$3Q7-BEYu2@hvlWxxVQdd%0Hw_ z-kfZ9QTsfqoVtE@$`DclshBbqI zxGJ(~cO+6Axn=2PHTli&8i0LEadiupLpIKx=_>0p%|SAzXYC%9=LPz>y|N1#9>riN zQROBdMfjg)aS&nKoz?+0rvD+qZuDL{e@IrQsj8svPxHe`^cBRCLe;K;kCHu8@#wLW zacf)-P2mjVc7iTh;g`NC(8m~~d3qItyE%e6n{#Txoy(d0wwCvilq35QMbCw&F%rjC zq4#lx@8NM46o>{|n`xzY(D}&E6g>#FU4@=;B+6xfm%#npS-T$>5UY1WsQA*8^NSt6 zM@!8cV_;IpM%5w5_^yyXNnP66l*Sy?8?%m{{JNW<(P-Z&UMQ%u#nme~EoY5)6!PF7M;q7q^h@P7cGxo^k- 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 2335be3ac9ace8193268d0ea0609fb45aea6657f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1790 zcmV zt^b(5|B=%Fi01!>!vAs9_+;btRPgnG`2T;+{_XJp{r>;_{r_z8`1bez*y;cL{QrdB z`Skq%m%sh}{{NJ}{^|Gs@b>@n_5W1t^MK&``1}9(`~Sw-|H{$-fado4{QsA{{o?Nb zef;}-1(UWgP(I6xZ9RWob0!cya zzh12VkcXFYI7b@&#dkt7oJkQ3yIl(ZU7dtb)GXAhi+s;H5GWLT_VeN9?(XK{XO-f2 zb3}A)5>NL(K2m->{MCPaqFxeDzdk=ZJ5_uVNJ%I=Aq)N- z?{A9`j*8P%y+o~|K$<4SZmQJeVXH{VpxRB9#&p#xBQ-*iMDd{A?-dPJB%#_(hpXb( z)1{+mKv7WnT#IFQ|AbcqO@V}>#x%XX-rW7Ud40>aw=|&&L+#x}1j-2#)Z9&iaiPQQ zwo0&G*WFEoQ+NcZ3?qP%l!X2%F)k#4oOHMVZk^pEr!Z6q2-B>+n}~5S0a?*tHx&nI zr4wvTukLOtoCOhIC_IdrGxq_zTuNdctt(8EsE{Psfy?9D00RK>@g!yw3!Q^ldv9_? zi_4Ayn4dFbZBa56jW8{Yj#`Lx=X%U5BpcvU;8W}v{8UEsIs&lGZr8J6shy^@LWXff zK~>LK9teCCm;jR*MfL!+yUC#$Ix4Wi7U$T+61mh4faTnRN!IE$fOa=+s09Wh8C(EA zpQE(N)*L6x2l~=(6YD9Ow7ZF#K=Eb6jGAaqUDw^&Ah77WJ_3k6)9)t60wbqv*d2sj zTG{((>jTFgRoP7e>q`QT=k9#Ob+_rkL*{gz)pnDEJ?0#3_Gzl^rVUHf0u@zu z)1Cwkav+pXx-lEp5!AmojhRuVt&r5bHxaC(GYEm{j`*wo-XsKQP%38T%ro=7>SwQt zB%~aep%V<~X|R(7>S-!upvXZ8s7x_fl0f@69WzLvGI*x9rE`nb2jBwzH1RCh0tLz> z1SH^^BGjnkNi4WPlY>e?U>%Q7Q^Jx=@DfGQ`%%Z^6ac0gfd$s_6Oph@hX{eNr?&>j zi`JQ70@URgzuKM_c(iG`!3)EP=dfW;D!2ywdXPH8D5CiEvHeF>tm)?KXOA%evn>P? zqqt41EdZG0IrLeO3T|KMCC>xn$LYtOpdh5!F@Rn$$;)KJzz2x3It7e%IMEV_>ktJ4 z430X_Fmi##1yrbcA@F=#xaFH*dEF&lX$Z#n7njMDN2OQ?mdw<6B_eiG#-(xS|7`PUYgAAtp zMm{jjm?j|o6^x%S!s&H7SdflDz5fLK@@j4KDRN5>i9So|kigan+A^P&v8HCc#2E9^ zLxN=_z20wt2*cKPB!^&Ez*5}SGgVOX(>I8qW-B*Q+dPEtSq ziq#^h*$G{D^>va3+Uhh{Gz(7ziC&NdtP##ap)eBXJpVkiIA&O^8bz1?{U=#0u29jt gS}c-{Q?)Sv0kfzm=8i7tEC2ui07*qoM6N<$f~Q1q4FCWD 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 46700ecdc19c9cb4b9c3d2cad5b053564cb977fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7069 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 H#Q%Q)1u)uy 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 b49b6340a0c6bd443af6c9d16894970e8c8824a2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5647 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 L9rZF*tMLB;bc-X) 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 37aa835c8badfa38b0a7ca81efeeec20356f4377..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7565 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 VQ 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 2beaa7f84b0d9ff6bbe13078419203d25560d068..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2001 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 literal 2613 zcmV-53d;3~P)f!qQx9|AM^!%gf^sMdqZ_($S=J3Ss_^svf*7g3OhQDZ@}27RdD7>z?)bFo_n_(Y#q#xK&g9nh{;KQssOR%)&f}fh?r6Q+gplOI z!s^jIp-M~B>W15#;PAYE*4jLk$JXzt=<~O-4cK!an$N_)8=8z+FKokDBRP zVc6(kzQt?1?S0ehZOzBh?zh3~>Tb)$(CzP=--?IZ>T%6@hV8`9?b6@z!_e>OW4`8M zywcn5dx`Jvr{~Ap@#k^HTwvRYmEVn+;>6nW-)*tL*zwKg_l}w0^Rel!?DoCc_ULiP z#?I^Cm*DJU!M~2py;;iaXvU#AcfZW*)n~bqli1hc@Oz8yd5G(`ujnt=MUD=;mX;dXnnM)a&SF!RTef%+~98knGFY?8(*a$I|S@&FXrR?90>a zZGGtHV!+1G>&ejT=V85mmFvOE>UoRlNKDku+3mf?>UoIj$kgq_&+O@H$ajtG#>(q@ zjqAwG>vW6jb%pDNm+Fn4>9@P+0oT*pQ764T({p! zvf@;$skrQytm}J`>yo1AqnF>7m)PlW%hEWA&n;BnBrY9upiO z6A>aC79S`GB^WFzD;*IR6dV{W76%kCDkCH=87~+nDj5t18UFswHWCs3O)UQW`JRD* zMbK&9Za^5{I5i-jRYi$`LDzrQG=EFuI4OC%K) zc`6SV6e?7RCKUGb7a>B$0>PDnYf8#VZjf&c+sAVTSiz8*e4JYPO%LL?>t0(Zd>%Eh>?_w}U-xC@pCXF};vcK{%W z9Ud@&nIv@IT8Lq(?s^5w$>^mlA^q$NFj_AVswm#*-`>85s#JfY^DUHjFGlCSW`) zZ;$J73y9FF0bfw4#`L;%>vrteaq{H4v;0|kzz4xo1jvL8p{Fw-BO{|t*WQ8}?b1^d zFHzdmjhzRyC!e$q8V3U@~35uK)i0c@?9P0wj~| z=Cks^BgEd`B}*X!_RtvtOphL!5a7}4S8-LVK3r3~_B*376$6Z9>l&;)@QEk@fQJCe z!?bu%+?zMA;26(8di`tPnfmol)UJJv>A^sbTFAIX z!4T05l9H3uErAJgd=|n6?H@dN5cj6#29qA@9}a8~eGt`S18|527y)}f zh=^jv5P|7JwxIsDe*Ffl8~*82RnVT;*sWB3G8&=QOpXm=?FRt(_y7VCC=aq_NBZ=s zRjbzXpC3Q|SlyLZdHbEmH?67G$B%E`xcSy{0LAC2vi>G*+>IPnn5IK)DFqAST5^s*q&)r zs_g9SJEIqI_Jbb)@-toFJWR0}3*7Pm-`}sXc`CrAox&uSU3s*S~cj|`{uganU^&n0H^?vmUhzRzJULQ zK$<}1VSZ~ht(-5nGf}-tqe;Q_x6)e7b-6FZ1g}hBL8mUdsTtkK&Us=104}Ei^IYB! zun!uR0S`c+@-Qo%0VIR6Gd0jY4Y-@Oc`^6>5CQ#SVggGVCM^S# zr1Q{eeA~8d>wxrf4= zLx%%%q6s!3oS-E|1iB0Eevnme+_*AQEPC=Y1e^yif>E;yK#GPz&cIVeZlVH@9M=Nu;QR?s*6& zJgS-0a~>eSxk)K?p9g+8kry>>`1d@>#6(^dt!&82!+(5%k7}xH(x?#tLgg`0?mzoC XDTo}h^W41g00000NkvXXu0mjfUxAB> 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 bd3411818fe2d032c76afc1b9401e607abb2be70..ef0244c3816bba878a2d2e63efdea8526abe5ebb 100644 GIT binary patch literal 991 zcmV<510ei~P)gxXf z{`~y>`T6X9wySuxtuCAM#oBsa(>FMdWx3@z>L;U>w z{QUgu>+9?5>(bKF&d$!o#l@hYprfOssi~=$n3(_n|1FGfb^rhXE_6~(QyBn_4H5(i z?)fE%+IT1)_Gy*#=hMHgsiA&+S4>4X@sCF$9oW13yZXNE5Yp2@sTPHs5yBBc^U zs38(cO8=ic-bx9ZN*>`=gwG-MHLn!#A!L}>SpDWOFQF?G;8h4gb@WO?7$m!R6~a+| zufSIj9ckcH>YOg}?IY4QzK=1DjLVF2_?q_zuu;L9G7rS~~SV-gbjpNKe zj@w@I+T!buK|#R5OI0Ty1`Q9T{{Kr;Cx>;N-2bVQ!x>x%5G*`({m`!K2RI?)jh}}M zPOE?3q-NeE{B-`3!*)G*XT9}!I={D@xZ>&?Z>*VTfBC8MNpj_Fb`m8p4bMcBwhuX#4D3| zPbh(xs`)s9S7@(F;8ofy6L_UrpY`b_v!0Cc7Vh=rNx=G{+c-As^Ge` zou?XNw5iXl)1R-$-v=bRzesc6^55@=LhiG^$^BcG`@(N`zZr2K`y1`?f9RaOV(tI{ N002ovPDHLkV1miQ2|NG* literal 3960 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 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 529b5b403a322c8415465c5a6fd841599bd6d72f..6b929bb118b9faa655034ed609906e31a483658e 100644 GIT binary patch literal 831 zcmV-F1Hk-=P)`uh6t@bK#D z>ged`*4Ea_%F4dJzL%GmK|w+7?d{~`+9>_;Na2G(ZRvN|Ns9! z?M@2-001;}QchDE01_4p2@bcd2E)6)e){9xrj(6pT2411orFLr^6A#kv!IxUaaT%4 zF7(NEVc@BndSp_B-F5K*00J9HL_t(Y$F-N)a@#NrMQap}>Km#SF)VcFyp5A!{2}g|?8Z=^RpVg&LJCiQcqQ!5K|c zB1*NCq4n*r1)B|{8G!l1)6Ypj4PX zJM_nzT=MgLutp^Yl}`G}?g!*H?PphQ`+)DL#9-t{o&PGc=!s2NcsPvC{ZtsoeToes(3+3o29BHjTlBiGm))1z@PT_B7Wn`4+u&p(!5NQR+b>cK#4W!_e*k=CZ@N4=QRDys002ov JPDHLkV1nudxFP@m literal 1359 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 literal 2126 zcmYk7c|6qX7stOQ=9-af8GEva#Ed1S(ikGk9U4oaQOT0=bIUF%HKuVH6pdT9`eBmg zx+o~8ix-8fNn*z|*D+&Q$0G4@Rei=~4`Pp^bxWNZoTR~g_WhBBhiTwOw``1sp}=hiv*g0qTj5CGlP zQfsW3f%f!zjqT8xNI{4Vq!8W&_*wPU^voVia;(C90-Dyehe#2fbWD7ZMDV0*Rx z?CGjad6#^)^4z?9BU1X77%nm!7PNV4&XkV>P=U zacB%;vBjdJU&Ba^wJ}WmRmf6>5K0s(Nl#}Ec^I0rU>o)MEu;xC(++ls3-9-tL0-KuX>Hi8)m^;tz}r`h z{I%e!l}x9G>PWw0Wl3?34!0xM8c6UEvDCzA%8jd-_&f%l&OS(E49xGo6WK=0*_~C2 z+<$l8(arVh^i0cTBMU;DC&qHP_B`tSID|Oi$|yaVqh%W~rGTS|-^1A$v^6LaI;HYV z92swdWNt7GSvwnN(SvV&jBC@KWQf0y?t`2R zas6_U*usIJQ>wMd_?ai@+mf>*3JnSAsiQEWo1A;Xq-C;vizY#A;)}nZz$ZMqamQdi+M~F zwcN#dG~Vt(vv$6;e%hd^aOBH7m6V0^9heinN%z)NX9yA*V}2`xpjilrAYc z#m~nq)+jZWv#HZ3$6KW;x>gcRM>+47i76^E#&r445*1((_Cq6h)p)llZHHcy!WALa z4~nq+yPUbQ(E8SlqwAYJIVX z^;BeP_E}I3qtsy#)&1GOBRVn`m!M#TaV9nFBCW_x^%T4NDqFJjXit={{0WwNO6sHW zz}!x4eJmv8WO;{+I}9W%YalW=wB(4p&68W6xON&Xo=G`PLE>Z~>c2`iM;l%Yw@p_q zy5>N75R-)*mxEY3$z!qEF&_3=_j`uV3jc!iWbQ;HBn+JqvxX1GH=6Tsp^k=r^<~j| zY?|T|=n$N#d1yp0L0LJ}d>H5ivPP4(Ov%rdL$Xat!<#w%cj9YDmwrAlVP2oUV1E6d z&M*xBd`=m2!rdUx0Smd1Mp>bgD{eL}5VKrWeO5AcaM_@GLViheL2s#DJT=p|G=VC9 z(-k5kVq52OGhg8afwCR%jqd37!SqLVcIUygSS673M=w`I>Uu8Zx=LE4Wcqe7Gay@5 zmT#s_t-@N&%m{Y%kFtl&$c~*Z6r?^vb_Q1bAm|^&wZE2CG7ct5#6ni?M!7?eFYPBc zBVS-&2ItC?5-*Bzi;ihQ{T-Dh$BOhL5;-t^QsU@(E*|>{1;lL z4$#T|jC@x;-iE>9Ppw62G{b(~{y8nV(bxfjgzqii&RuT3fuaEjIXk%7SKIkh{s;3Y BJOls$ 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 1769e3ef8a6b7c6f378c827cfcd62de5095797d3..c00a16a424fd49566cfef3d52a758b014ae9571a 100644 GIT binary patch literal 958 zcmV;v13~gvxhGs?=!zrVlq^z`B3;n&yKy1Kfuva*?(nR0S+{r&y@{r&m*`S|$w z^78WQ>+9$@H|Xf-;Nalf+uPC6(Z|QfrlzJ@Sy}%6{`dFy@bK{P@bK*H?C0m_mDJG)n30Zmabj0LCiKasrJIa^UNIp1 z;I^k8wb^W30007QNkl;N*42HF~Ljob(Pzt4#Ep36q_HOrb+yDQoDw}wm z_(+<``#}sddd7;SNDBOLin2x!5dabe4MyEQE;I}XV7N z2o#7gFG>R_Q9#{jNT5_CbfFBsC1#^YR%Ahwl~|32P(fi9rBM}>&qUnwP-orlPSA7_9pUdB|6IRIT_5ZDh*F!A(Cmnw z0>qqeU*1zqK!_shKJ=WU4)7q+1=?RNg|^hOh!O|77w8_^5>3z!nhI@#5JA*k4a*+7 zpTHXJ8b)Z_8dY@xo}Bj4{pJY40BvFf3<09<%*5#4fezYxxIjCf=xa(N2I}C_wEUFl z;~SU3|JBKnqTs2d4Z5#ji1z7Lpv(XK$Lg+}U6* zU1-}JJgTjgKkw9tS2fe}nEU2V;%(vUl0$*|2gkUulAuvEuBL+w`D{(t;vqRxH{F?9 zL$Y)<-zHc8y2;c(nvIalMQDvRq{i}7f90ykvij>~^`*A{DqVkpum9Pg#q5t2=5QkGKD4-1ULP`BmxlbX-=_|KjZbfBE}{!u(0@^LP37g!KRZ z{{Q{{|M~m>^ZEbt^#9@L|J>sL)93%#-v7+p|G&`xo3Z~(@${Xz|8m~{{yRMT`~Ug- z|MvL*^!NYr^#AMe|IFe4vAO?5_w|{s@ksdi|NsB~{{Q^_|NH#^`TGCw^Z(;lUFPln z-{t?lfsV-G|ErIj|2jJVJ3IaU|NH#^{QUp=KtcQa|M)^f_C!Yb`v3U(|M&R+>-GPR zw8L=Q|NmxY|NsC0_4WVi>ia%E`anSUw72m`N$^Qc>rPYVQB&mh|I=%8|NsC0Iyyhq zJlp^P0C;p#PE!CH8X6iJ8X6iJ8X6iJxA4V&aBmF>C=IInCl+BG4GGX(4vNOMLan*FC`Zj5)tILvWbFuTrwXS5)t^}%C)9zU{60YEG+x> z*TlfSuB@V*l#gX18Ts6H@W;u6heHCM0RT}*;mb31VbuN@bN0cJ@saRuknIB}KazB%Ey+wE6q3<4ue zrcuG`je?F?y6EdgQRD@yMFd3>yLk~)Cb1)`F&7?y3Arb-Ol!kT*ntpgf>{wpAqb%b z!8ixMBvHXa8~VMFNURlcUpGJq#|87aH-3$PM|3|~4;6tIdbubix_y}M>54cm*&jVo z*T0~9s`elVyx>IvS_Sezms{6{`=;Ig@G)J#ObTEG0DeK>2^E0IBM|@-$3B*L4gdS` zX*hiH`b;~PemVk8FaoeX&!Q;w_7F)f6bg|Ur12*t3B?^05KrgV$1Z3Bgl!z~-g}5Pygj^z4pH6E z2-+)&C#m$7u!`IrO<;h{#tQ905jaCl(B;dq

j#vnxP;cyt;~{FqLOp{!ZEOjm21Ii& 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 M07*qoM6N<$g2|d-6#xJL literal 2184 zcmY*bdpOhW8((VryaIqJ z`XvSDv$m9bXX_Tvcn`Mp@vc#>E^Z*y|B2cU?Z!@VAP#Aw&Vi=xn=<0f-s?<#HukV);$WxkGP=s{Y1&L`W_2oOm2E0KV6 z4;mA4r^#X~Sju*DKXnbcWGnj-h^^I8uk#cynP(|K5;-qI*?I%-iLiOIJw>TPMLuGuY}kT0Upd#m zim@M=;r{ekxR3Dl(nGs}mj0>&u^todh4{C1MvjIX6{Y;)W&k0 zg&AvIjvy1|K_U$~P~c>tgTFWEz1-|^j3;qE(2lXH_L$eB(JW#$jqcwX>j<2n;%T$C zYVGST$B|X=+*7pBv%)sYS#EjgQ(MQ3#gJb>$xOdi8rs>4j(te(^{HP6Jnib{VALmW zh~u?9887xa18R`cVB%qVju)G#!?^0;G~&7cx(L_QoV_M6d07TY)#)n|LLK{hLqnRg z*CF*8^ZK(tRd?p@i)fX=RpH{6B9<6M^f9Y7 zXS&M3TKTG*ibwhb3`^G2t7BkqZyrRS^Hdft#CeXhucjJyN-Ez97pA~z7Bk6iV7;}` zuw%>x#-`C*O+=TOIn*FR9uzPN%ON21DXLHKVBvS)YxjK+FcVi%w>I{W&cgj;(cM(a z2lUPNwT*d%9YS-}!YDWqPm?{}bbY&mM&o5&l};oS6Sv2K?CyPc^FSjmf*tJos#|-o z79SUP?j-KT4G`AvLHKR9fk#UdVI7%V*hdK4UE&TWM4uko#@R+nAP{E;Q@c>8s^?GO zqDf8x9*ZPlhX0K6T&IF}46l-`kERt-=hbCFR5gfNQBOSGwa1cdtXd<;)gO9?i1JS! zCu?7&F(|ar=zRCEu!bA`hwbAat`G9ZWp62YT5A#myFrWHPOtV9y;7{Y0IGrTM)aQS zhks{T;fho?-K>{rrVx#jf-V6ReoA0~ zG|{~mi+`hkc*R5)>zVGiS+OV!VjmPyf=zU<#V%+3r9N15#U(Om{M+e?le(biS4|n8 zm2Tn6AcD?w%VL_~JeOZ?_Y+BR=|7=v9h|vxzoEdk!UI?07N``Ni^A=uuz|9HQaTf# zb!pb(efhkPPxO_{Q+vrJ(>twp=TRmt$y%9sjaiF&@XWI zS1G0%YiSdw2i({s>o4`P=-xS2<&nhxX=oRjw#8P-S)+x*{+~q+4l}Qg=fYH!ZY3gf_hm z%Swe6UPtfoU8$_gL&au_wJCUysP&xJolyCYF!^w!FgTyxF1J)|*s@|$yA5I>8g%aB z=AD55ZE$l$yNOIDIU;%Zs!JCI96AXFPrhR6Wy1I@c^9i!)*6Y$gihK8?DhBBB`jvP z9u5v0xqZT~ddbFy)-O}a>({c5N~hA71Q!!YCW9eUA2E-ndaS*!u{U(moRd}>O_@1_ zh6%3{QjjIayl;RROvMyKMKZ>iT$@_6B{J1T5o%B0w`AuOVHY>YtN;Wbc1F+s-ccXm z>S7P#vout_S#X72AEMO|%7{B&Er;d(2@eKo(+M#ODGv1yd*#Xx<=b;0uM534Enh?G z0`^&8(8irf=&0oEBNz--W&1b{O!!!LR6WxdYVj5atjrigBx`6;Qep?JeX-A>mkQBD zO~Jqcj`Xh|@o1bn1@8_=rEV=8i>@k$&bvs zw}c{Ib+xlPUeC5wHkW)eug*DFaWQ%)q1~#+ZWR4dN}oh5;hlxDcwWeUtwSxpN(N 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 fdb635381b7aa4eaf7d70a02e7b19941c0ce8e60..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3532 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 TiDnVC00000NkvXXu0mjf$NCd4 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 167849f28ccb9ffb05e3acb560d8903b408eac1c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6537 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 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 88ffaab91716ddd5246cf4b5c13743f09907a70d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12620 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

q+y&(JnX5ifc=iIzo&wzSzNtFXjXI9fJj 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 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 2271b879c4a9e51c142f50c5416cdce22357babe..91b08da85f678f37c8b7ea98b315a458ec9b54ea 100644 GIT binary patch literal 955 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 Sv0(TB0000F!SH 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 nbf&fa6SLYp@<34Y+9&~=+My6 zP*70%`uglql($eJQ;^Bd8w$00JIKL_t(Y$EBC+a;h*Cg;x^_ z!Vf52u0ErJ=MvRbs6@Gvs_`qdrCMgS3(>50jq2h7+#6Nl0hCe2s8q)Yr33YY@q&wS zuqhiZ%DTJm^GY-==`u>zZ9tCBaW6h6^iJ}6M)BCZdi=nZ6}=%W3Qhj$mM{3?z>)Y{ zh$Ee{@0Uae804g5i+AS?FAC!Dh!#7|z_oqLr%(Hf?rb=<<&gAGoNe=Ay2v zYB+UO2i7c|W}=#<_wxjWTZSBq>id0gm8Evr2F9Giu;va(INjW-_sqBjCJbOmIRGNg zP@!%-&qvA~3}c?)=bx)Oj5eo;Jumw<`f!de6I7~yxd#qh#<&vqxdQe)TB;SCIP_-N zjM(p@;4@;ohneTaR&X3UZHl(@Hn|+U43^~k9KALN_L9(+I**EWy)AE44SF=wg47)bk)t%b;F6^ya+%4gF7MyR z1;1Dveb{KTty%JVvJJ_%$yySj%w{SQ&}5LfnLgD~&A}n_ub*5X;+W&=K~&ixS&eRR zG&e5@9`3SkQv5V8xgK{rA*^OziZE&Ht9U z|M%2{_SA*;)P?TRj>EgmecAec^!en^n~A~xo3#0Q^Z)hJhVj#k>eH3k&Z*SNvB$^3 zxya1Cy4-Z?{D9*Bg~I<%|NrvRiS5yl-OZ)1%iU4#_xIF;_SA&)(}(lZiSE*ko5b~p z`~UUShVs;j?a-3z(2~#4v-Q-5^3;m!(~zyWW6l7k-r00VAGL_t(o!8hm#K|m0Ys|u(HsCeCL-v5pEPijc%Np1ax8DNI`CX$GpGhKlPFLwYZ1A3|3F18oFN z!ZHgt;!9=h?T*jn^MNXZUP)o!|Lu@D6a2P z%FvVGAfZ4!zZ5&3={yy>1Ar!Rg}~#7+3e*QAFk|;@S_oMVgQ4(5Vvy&%x{G#53JKr zgXnmkV=>h6|072+M-FxSG&-_{o-`1}nGlb98jnJp+2`rY3OuW!D#SV0;}oK5-3V0! z!i~Ww(76+RHir0;vQ#)mr4m(W0j8k^j@=NlNy%o=0w}b=el~p8E*V2yp#?B#fh~yz zJ1uF0PNH7Ej0;f4i4v@q?Ls{!~^GYk@Ql@MRMffxFPop1jK;QH_p{6M~0DHW$rvnP0|1XF?5Bf zajp*2h;ziN!{l;g)}=QUnwV6eS)$LmKF$y7IJ@pYytT+(*MJ~tc>ReRg!A}?a*0Cl zwfgF4j9^?KhCAG1NFjEmA$}%M0ljd?Y+?j@o&$_OiYcIWsgn`AmfFPH_C_=V} z4@0)X%o7txFh&)44TdBEt}}beb8BfZ~*W$~vPA zZ_2XpKQmNV9@b6!G#YD`myS=4S7Xv)UnBI#k)_!jPtqIzAG46B+|8*V_5c6?07*qo IM6N<$f`YMadjJ3c 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 f2d74a426d9b6e2fe1b445af80ce82b88bd41dbb..dd8a9bbd90faf4f266f4fbb5b6967d91aed3774c 100644 GIT binary patch literal 1343 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 V9A{K}xpDvi002ovPDHLkV1ml48leCH literal 1368 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 bp-uS@*qNoC|F@IR00000NkvXXu0mjf(*)l$ 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 75d8249b7d883f3c477a6ac3095d42957121d37a..9140a4f2190f27c38a2431035a5a8c1bf433847b 100644 GIT binary patch literal 806 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 aoANJ@_o%i-5bd7;0000DJ4lP6DZ-@bkB z+`0Yx_wU}l+rYp8sOJ0k?|1IpnKy49Q1PcvpI(8%!-o$KA3nTs7mn%h4XA5|88|Eoy7e!by-D+psrEbxw z*t>M;jJ!!VAH@62Zm+zimu9lB#UM-K=s8F6 zl&x6`O^;Yh{{Hs({M`9tC9i<9`D<;|Zf!n$g2O4a86myvMP%|7{1kheUTdyh$N#RrblShiv3K`4%>Odo zepjfVYv7+N>AFvEOJqG^`n*deDm*cy@>JB`%*;*g5s{O-U!HE+R4S^yOiCp*d(qEr zpQe3Cczoko<1xX^@T2YfW0#tre7M#!QNcsrnQgOH;u9~KFPDy={<3gdsGHl%D~xu3 kZ%wF+oVea&%>~hy+`E2j^XJL-oB}0ZPgg&ebxsLQ00wP-g#Z8m literal 1117 zcmV-j1fu(iP) ztpAq0|BloDantsI@cxIr|5fSriQ@la;PrpR^-1>i_`?0-yZ?ag|7H09d;j%I`uvi< z|Ng}OvcLa=@Bfp!|Nq4P@524)!~NpH{?feuo3!~_^ZEb8{b$$oNAL4`^Z$wK|AyfF z|HS?9#QogD|A)i<|HS?N#Qpum{`|xK`@{Y4!~N^S{+zV`{lxwH!~XQb{qe#6e)0c( z`Sbh3{`kcG_rw17#r^2Q|JA_$_{075#QyNZ{@=d;!o~ml#Qy)p{g#?v6951JLUdA2 zQvezo8X6iJ8X6iJ8kZtH|G}xo) z0yhecHx6l73OV9PH;y@wf1sKInyd%$~1K*LXui1W}PhzBuZ z%r10p5c@A-c#HVzy5&fGh?$jW&k+|Ly2LT!rS)mZ9j44GY?_Fxgi$g;zop!PF-=JB zR?8*T$0yIr0N0xeAohKgc&(#Ib0fG6;4y_5B3~00i1p=id3z#vQ2=9&Ds+8SXw&MR z5&}-xdhx-9_RYImq6br76*h=x7T^u>ist)RSJxQ8*!LCU%no$wB+z`brK~}KpXCc+ z2H*){M)Uf&1XMKPf&+}{fDpvI6ik4U1DFnY)L+~|AvD0x03H?K`_H+M5fT_zRDysD zwo4v3;rHWPe5k^J099xq9y6I7@J92VM?zisx+Ea2s6s+LZ=au^FA@^IfcC?S_=rE8 zF-1rrs%XNxi6Zq+Mv;K?TR(#MyrL18tCFF(n`k0(*&8AMvKc7wgZB{V=L$Wlt6 z0y5F>gc@YIR|Jh<4x$UWoCf7fsQ+(*!UEG4kV*5xd4UoQ(9%0CCC~v(q4*kd-V_YN zw-a5kCOs`!q5+P?#e^ETbFT{~F@cxASaO*W+fZq`-gKl%g5}_jCKm0@k&yul>i73O3O4k<3%h|fqX$R zaE6;IfXW4^G?FVphXonVO*T}PoP=>TsG6VyxG9Awt;kIjg-InNBtg6BoPs^_#_h|D|_7x-q6E*chh0sivfrmYtEsPBPF|qQ-NT<(3B- zXfUz9%E#^*yUfYRQ%Z6V zx5aQVxERm%=3s7*S3ZIC9 zIPhX=tu^(Ie-$B;OL%c9Il3}deV>AOE~(3HuGjmD-f$_F>%fJvqfQwG@m$L89XDTz z5^6jbF2I~dPvR|C#B#AdchH6d&$WLQsaS4SVEf(Nh1&{V{6^=SYHuPz72vC-mv7PM zgT8m^;QqiRNN?>CqR%rt<)**!Uw33?{&^OE{sL-y2}I_5DPi6hLL7**{YijB@3*ej z!}&l^A!-bKjIux&Ea}^*VG>175#USiR2o7xJ=rH%^xdLf-KG zMdf}7+0^Gf=6|#Ztk8{31K2|?}r1`_K<|Rj( z?;L3!b)@;(N#}j ztpAe9|Ay!Pd&>8jxc`dS|5NYvZP@l<;`M;{{E52%Mfmlc!~g!o{`Aw7O^!#T3 z`~SrK!o2^;w*UXc{+zJ>p27dtzyE0S`+WNNn703l&isSw|9s&0SN{Ksy#N2i{nx(# zN%{3w?)HM}|KY*@(!&0#xc{NS{!sMw@WlSO#s8YR|C6=<`osR_!2R6A|Ng}O`NaL{ z!~V9t|5xz&eDD7M#Qy!n{`bWF{>1+L#Qpii{_Vp3$-@1qumAqU{r%jc~#QiY7I=cV>08w;OPE!CH8X6iJ z8X6iJ8X6iJ=z0*2p0zy6A=mp_&OLB3Q9I09ujmX6A!mpK(^A~qBvpO9J~1e%`^;@0{os2suLNWl7v_K}|uQZWUB0um^Q ziF{)7`Vh~@gaUtku^=9aJiA+)3I+uT3bLChFy|MS=WPNb5_CobDa!5yMk{4v3PbQb zbXW$?0e!#Lwf{N@R~2kRdL-6+HKs@k^4(O}SYZ^r58c-~$21<`8i~fNDkubF3vo@8 z6C(BDYLz`Z?@4tNZlS4ZQbhYKyP~p%9O*zfS_sv$FU zx_v?_3LIiyUaTOUsa5N9czFhZNN_qeW2how{(4J~e{!!`u>tYWIc1IqRFN?4tRRaM zvt=P69bYB}R=i71M6d6g5^v}LU<(ca;Q=6&uU1xW z&Q)H+0>CE94nV^LU=NmXSyI`bY7l^M0SFIJX#d!~#1n|mhXfCRumP)o>|SEdwY38u z5^f-f0t2x7=gjIQ-pxS_pCcfFKv_k>4djMa|Jc1$uQCOLm_D{ZC%Kbzze^x+JfZ8q z&K0YdqFv_4OOvF1Y+(jJe)Oce1O#X!M@#g!q7#>`GoQH9ME9|U>WFT9RBA(Vksu0q zL>Hl93I1ydok>nZ0STQHeH`KW2H$QDUU3%)%-gfMWA>im`eq3Ul7Y3EMD;$pLgJ~4 zf(^($4rK^Q@&vWLh-N>8>?ranxB&j6uR#cHBh0$c=svx@yu6G$RJhA&P7n}2tTX|D zD)R~Fu*UR07?xas@QJHM2v!*d7xDaXWZjunCcqa0aR9IO&%lvQMM9Xxn2I5_yqzJ z114%FIb8}M1YrD{CAt83@2OKr@M7}4=*2?78|Jg<<;Yx^ZSckO}_40 z-Rz^GetKy`35^v_I~Gf_6y+ej`VHE}`Gmab5Nv_IA|QkoJ$f$Am z8Cu}M`GP^#k_Ls-|LYm|0Dzh`0C)!$Nwp=k;$&izIsI67Rq*8fST-i@2|C}a; z9~t(`exA4LjPQS`wtVwTkMqYZMdxo=xXSfxYv0R7hb6$IRHocg*Wun}Q+utL;T&!6j@LxRlp!I?s+)~vwYW+_ ztpAeA|B2oIkGKC{;PrLR^?=0qox1;k>;G)n_EhZkfA{-I_VxF|{eAKO;=BKT*ZNTD z^lkb7m%RV~#r=}K|4aJ(@5249yZ@W8`FivJk-z?b^7?S-|Ng}O`NRG8!~NaD|A)~3 zclq{C@%#V8{{F=N{KWqG#QpQb{qMy6E% z#{Z$G|NF!K?Zp1p#{Sa3{{6)L`NI79!~OQe{qMv5@x%Y@!u{pM{N2C*`N918!~OTb z|KGd+|HSkCaU-*x1Bqf-p##bb<|xO~4cr?S8#30F&6x(jwnx zRL9r^MTFmdJY%e`h)qQ_OC6%aM5q+1PhyYB6bob5^D@+|Q7r7$YBePk9l{hk_FB@e%AS190e?WmhzyR$+AvaB{^YAivp$AUaU03GwpR&CP|VAJ@JBM(>_ymKua4 zl;(;131pe3+$X>$5WSl<65`Xmz|V1XlgZ>_CcAtBVx)7UhEGOR34*x9>TzzG2>e7~ zjzc{)wlOAw0@6b)0bXl1fFTWYeH$SOyu7druxkex4)#Uc1_GX!6Q}^V0i^4g;$n=S zI0AX%OaPqgfDqnr2>K6H0-gbI9YEm~;K{fyCE)1*CJ&&n4{%`IR5(N#1)RyRga%wK z0A@@R0tqPL7C(kcArCwP47qmeBQWyv!ulAZo#}MCic>)W2LNzuT$dx_dz!F>Ea&$e zqkthU(Y$bdk~BPxct6jC#bqW);7{~uxp3QrGz@{p>-GEwAj;N}0V=t-I3Z*p1#KH# zbbeNVod^){8yJf~-y(pEHRrzpK57o3gFvt05)N^050|S2M6v6|(IaUG7crOPJaD}? z`b4C)h|{b?d|R1;o;!m;Hs*sr>Cd?|NlY4FIxZr05Nn@ zPE#5H7#9-^1dR`j2{s@V{P!x#O6aSaI_%lGvXEI(G9=`NdulG=#ie7a zyND4000PuWL_t(o!_}GVZsITyg=bI3#<&Ry*TQlurKOj>`u$&SO$4mejboeC+V)6@ zACOPZWMZG0p)Y<(EtoTafQ(sa8E_5xkcvTX1y)*i;A#e_Spe(nxKe=H1tFukQi1$} zl5t!Hg$W$N)f6Kg$dycSVj02}pjbipxr(ll@^P826Ss0@M%OBnPOcjp4<1+h1-N6`S3i87$U0 zxpfAHM*;YGYidn$ZzL$k_61XXZOl?WVN(jYbUs~*Rds$)DH>Q`hry4n*8fZ4P`C1;1F(`j1qF^qhk z<7P>?86gQ5$+(n+OP?+diSpsoy%&l0hoJo|o~u3kuaE0G@TLE}C^9E^yC~2+dnKX{$a8yqPWlje#d^yc+F8<+3L?w`!m!w zeVHSiTZH&Y6#GYWe1-}aKk4D>F#n6%`j<;WnE$0vzYgw~mOTF*=-0#R3pE;A@Zhy# z1k@K1^$_w`Q`bZA*F$mj8?VPEtbU8EH;c{0gw&hS^)d1rTOXI6`Z!fRpQ!(ks$Y_* zzmupRm8gG~sNa{WKbfeXnyCMqtY4kJzn*>`kbZs literal 1784 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 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 5eab5bf488dcbfbec38db4651f8fdc19fecadc64..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6792 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 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 5ef03dcec31fb39276820ab4872aaa683071ae99..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4562 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 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 4f6a0a6b76005c6b565c9abb8088eb5bd2094d8f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5553 zcmV;i6;A4jP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91mY@Rw1ONa40RR91mH+?%02fP0AOHXr8%ab#RCwC$U3+j8Rk|Ng1eCI< zXjm#m5b^+&!bK@q!54Mi710$zOrfx=Sy8;pV-?&*smmXu+=7cPpd_FH)`*DWC`OH7 zvJxTz11es8z`~V4&}1Pb&N<)r>vO*T z&gqH8Vzxxo!%Eb1BGKh@hYYKD!~ARBG8w$+q~w$TUlMOY+`6VDu1OtRY(9%!jezMmR~PNjy_ z>10ojK8ZR9w2eNXFX$8chCT{Q>3n%(BVC3iXj)_AHB+7SL#9b=&^Umw5OC)q97}KFsPJX96qs}>4kf)ObV_iXKR`C|8IZO3@NkVI3A!~Usiv0K_n&^YAw>`&Hh^xSWApe@#dP@}t7yQCfN5MHc7U#- zb7PaLyu8n>%GyCQDtXYAl0cWBaoDWNmO+`Udt>@jN2>eH{JA0JQ68*7*W+>4J#1j8 zEty%hwO9Y4LQ2Ea(>73%@A`a3g*^?ni2p4i?DJLF6CV3TN)@w)J^)+5Ch+suMgFpO6%Yyk7E|C+z94QT%KL@l()B zDtmhSfCTi2Hgf5I=2Diw)|pBeE#&sfdt3W=?<`Vb4|zN}3YQrnDso zTsORb(sTQvD%Z?9r<~*T`bxbro$&dn89*M_aPLr+cP7fBj@k4CZiF>!VI7^n$2rt2 zih6pVG`zUNbI-XJIm<26Q6h3t$H|4VsDrwYVHSOX8)5lc3k&QCi&(%SMUc_+KR3!t zygoX`Wbshw$%DET&9vAIx@yaVBca8utkiSCPTsoN#X<~@jX$`@oO8H0`T3B_}--@JEBP(O^ZfSTW`&2=>;Ul}t z<2!K1K`)e?^4|B_ckY`29?#}CUTgHHthn5B zkK(ASzv{_!=wzKde|4#Al$H$KLm8CSl7lvO|Kgcs_*siN1MUPp9lE%f1{qli))LnZ zbsQehdi#?+RJ8q==hn{5G$@0zPOhW%wun#!+BEbEz?=zs%5=d_>iv9yl(uLGS1>3( zI^wxqiBny&{9*Rle%Nzss4`JUnYk`m7SR^kG_p>?8E{9FSW9*_USnhh06(1e&Qx>Q z;V+#$C(mE}8P8N9%0wO1ReY{XR#voWbiIN*n#6kkGv|;cC}d#NIpiEwzlxpl)q7l{ z!j+4iriosNRQ{PJ`2}^-QmGkq3l3en zg=4cP82zaNu!*c@{4Y;+@fauO{MOe zB9#ppszEWLW;5s(9J=r%L(aioOFwZAHN)UJ^66AF{@UHmzZS%b4B!yB)b3y9)0Io} zq*OBuo|nRMHRJCu^G=Rbw&qgE%daVj#T){c+KH7{-+$=`Qo5CI8XfFN?^iSaSvy%H zm3_vp?Yx^ow|)-go!^wE9!qSLXx+v)O@IamX@(oJcDP1`D;IS&!wpV)-7NYAm;Bp1 z_`22lt|Q4T13z*~J3xBs9L-y1lZJ;X6Ln5i(|q=&R0E`kfAKzS7XA9UgwqcA0FmPl zgUvGVf^R*yd$hK6JalO1H=bKVm6?Cga~scA->Yrupe?j%8e)M<_^34}hk9AJODSd< z_}@R`O=yRl#czjR)lFzO6@grxnYmD=@P9pbINjQt&~;667TPoov6xHXlw~b%9$Gi^ z1rwq4nCBij$gvqW&s@J$)4Uw`TpBWPuY#99Wu{V1vP`E+k9sDVO~2q2wsQKJZQ#qc zNW=eqPJXVVgMLh~{by?B7ry+L_rA@ayKe%J$2Htjd@9X@erN-2nN7dol*PKqo?yCx zE8t}+J61=NA=|8a1*a@8ztuEgIsa$5a?wort-JYSiWYfWv_Gb3ZlQNX0FHDGdXsEGu%ILxeJi|%*hD!lH(m0hAh_1(px6IZ?tK_#QAg;m9V_0T z6w9(#?dd`p0@1{>*X`*Rp$LIkKoCnHM#ReIjLETby)=AVzWe6grJg&F9P?(>)W|O) z7UgpL4)ELFX+{ms>-o>@aUR!j4`ommbx;>FAWP`f3zQaeAn>j$V=^`b=@s zy+I*)Rdtv@wx%7^VwsSQ zHqe%tbPM2x(6VAZrI_U@%C)&iAN|Suh}%tjm8C7#$&0qoCfYWOp4Tv^ENfn)A*)s~ z;|z?f9M=f;gC24?d^W_QsEZTYWPj|v!$-Z-(HEoZdj)gKvT7YA8-1W>&d_skxN$^^ zx-ZGxhsx8Z>8#;-W~uXf>69e-3hL@; z#mSR2``|&(-JgF>x8(3l!zUw0AdhP&PkLvg49cPo>UNg6&CT@YPVU=E?xP`B24J95n3><4{QUoU5sm3cEi`NTao)V5Fub?q#}?ecvCnH?;R z9w+y$q=fD?qVB;d%j(tk1fvaXPm$*ikB1I-ZyvQD3- zr)4jdb>!HikLat>^bby1)~%y{tCsTx0|3ik$!@w+A(iHYApmpq5oeOq+8GS{c(RZWR0i3d|T}!=xq0i{MQS1Ot`9J?!zd}mM<_qx-IO@TCDu;vK|Kc;x`1L$HbXA|w z7TQGH!F(1d0l4J<{ENR@z5Lbxp~2Y-+u91mQ$FYKt`XH7QV8atH#gE-d0XA1 zyQ`lzZo9G3|AwmR*q^PWMHow5+k&|SPWk^}K-Nk}QanE;$G-PIq{OLICxjLzRZ+fs zTzB`g@FVwc6mn^OhggZR#Ir5HCFKtaP>;3CDKUFF1r&&%ye-!~+R@~*X~mFQ9Av{x zrI$YEZKcscmPOgoL^g~m9&Let!KL%R`M$L~ z8s8Z?`CHsK*VoFg@T_r`Lj`B;^|ZPmk7qfJ^0;TOrS|f*v>Gxx)7BUHp7Dx9?^E0U z!IpAkhPkmYOoh$!8dTjkNcGNo|%g&^t z0LLFkVVn-yQL>Y6y|^r{IUT+o7aXzSx*%6)+Crbo`E5}NMO^y(5fbgg*y7C|YnMu? z;8HuW=1{MV%V_8ZzPZ6l3iO|^ER&zo3N18o4C$?vbbV)K`grD1nLT`x)3*;qYAcUC zuHl}Fk94-P{ol5Ru16oWLJ$~RJlO)+xQu@)a?VA69CO`&wIpZz3$;S;`8QX)M)LN_ ze)Y2|zA{@5jS5AktU|0da$)A$^QmV7fV>*1l(JQ!j0JtviqK&UGl5R zo2>SP4FQGpj^l^C89d8WtJ&oA&+=bFm1nP!*O12PQ6`McLChTh@>;VDFNLc@ZMW)Y zdRi?6fw5tX@nnZ4H+w#!38Bg?ve7sx z$ZVuI+FCP}4|O3U)OOKV^jU4Ur=gZ!!dTb~))Y zHJ{yHM_IYcX+$`3_kRrkiS`8{mpZAq4(f)}Ci>b`Pg!c=5{waJjR%{&_PoZQJVDA{ z(s)fgJQ-i_q&wL+Iia$A)ctalG9!`gCzm7Wl6T<}$z@wf6@HtQ{D!EU=eqDI;W1*Y z@n92hN0V4<7f|m_&r_P-2T}eb%~1QAh7ECQ*V{BUQu(F4Ji(s|b}9k)P^L7DW%pvB z&*;0_*FPt|qX+eF4{!$D(Il2FgD%^+m0YFl|5|m`n}4I!&0I;Z;I}B%AL_3-MzbT4 z>nD{)@Uuhbo$E%@cI8odj>h@11A4XvxB|{}_*d+)Greh^^SaH<#C8Gt%KJ1IIxXw30J259K8}OK+U?W6Bn5q-Vd0UWVftvxNFq)iJcVe>pm z5h4W$?Ebvkz8({!D(W(sKyLP*zIl)RC#C#;&bu{&s4?k7gfe57=fBUmP-P3JqvSvF zFyA>;k55Wt4XqA5;^IHDa+X#_S*90$Q#+~Jfor%&7ayC6ejg&187qJrITxQ~=u9Gh zeSBj9CF*fdMcH&SjNm_H$3Py}q9qfvL?autWHUSC8s%}%UQKJ-%7XyW>_fE16)S)n z)KQ2bNWir3)<09q<|hM$ioEIb-~_l~2|rPf+_}vI{Xzu<6y#<$5440kTLt=BTV_jX zLZJe{mf4gRmT#rHB+lkHM4?mx2Do5}Rw|xIm)qvh;B72;+oK9Z-gJ3z09>#{Gv#L1 z_urZ+rJrw1z*N{eQ%VO1EYVJg#=rZgmSmx1a{{*S^qyeovljK)_86rKMVkz4bJ*Sz z%aq5{p-{HDkQa+3Q0&6QZ0U~l;U8(hwi(j-&IlL<(lFT8(p|~Q!LseMS_XZnFkHYG*#2P4 zAZxS(p&>7c6U+N-pDv{cgBXNVY|Gq;@0CEZF8?eVlbTa#JE^t{ut~A)rsdMzEFcNfme!!Zw*&$#rkQU_@Rw z`TXCvk}75=7Gk|DVgUXD3Fro}$;a`q{B`8e@0?7j!l3#<9@_#oiCaTL$g8OA^NJGDyRq zbKPvy#46z{kHWiYz%CxNK~Pey;yMrS&=Eb#<4=jDT+07ek`RFkEMaojbKP*3uF(x;gsA?iG|~6=y@fZ z429#IL!kqk|837eTQYjsb3DjTX~9U|)E>ickR~A%#)>gx>?8;kBS!P4MCsL_twCsSnl*4(H}`y6pXYd6pp3jJvY+OFL`;{ zGn&%({+bQi4M5xeK5$-c2qT|AQdmGTVo<&87|MEII#x&6FEfgEbH zoc|i%Lm8As9n^&k$b!s+tueUE$?q$fZ+ZKFY3NA+zKhz400000NkvXXu0mjfj?34D 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 42f18d2866f455338abf77c4082730cb946d8a51..f93d931c6695915193af32919745b0c3e4c418ee 100644 GIT binary patch delta 758 zcmV6947F=;m)*^}e0oc2?ZNQ^sUij$D!f*FZ-c_fHqRxTljw4#`qN_!h= zNijR6PYN=|T;&o88KXc6Um=|+7D}c2e*)0~i#6zVBnlQx;x%MXSTx#SA{{Xnjj6jp z)Uj}`pOJ>Jc+`AEk}wvJC4E4mp+XklBY{vQ3hxj&s^mB$flw(5Z%A}h%Hu1N2-TwW zg7k)JS^t6aq}AmQTq?s4JhdObUKwN!)`=MzqJ{W?}h(D=}3Nzf5^AO zsbJL@O4^hn){F?WE}|F_;kpRR3W-n`0VN!yHX;Y~RvWP%(Q6|f!CD(phI4I%9a4y_ zN91Q2A`oPIUY~n>8j**`^|>Q*2?)84r`!EPCc+lEo-)V-GHoXyf0{M790Xw~h~6|e zKmw-nCBdls-=(R3)W2q0IdnEqe-iqbJ9A!zMdtD%!OE-Lr>tB0_UT8Pl@!cP-(44z zJI5)TqVClT2q;WH7V^M$|>zhxYeV3LNYn~36! zr~uC|Gl^O@>DpW{_fnNNmi~R=3)LV-k4Q-c9Mdo6leDZu8CV+Dr4_x3CG;x(5hC*p ok=X|#a{(fga5(?saIWESZzp3mqIDy3U;qFB07*qoM6N<$f*1r!kN^Mx delta 1064 zcmV+@1lRlR2FwYNBnzBSOjJex|Nj600Fg0akw7(n*u?o+0000pbW%=JDF7!1UTPy5 z6(tS?E+7#JHXQrmI`#4A+J-;F_sfnlD_H7pWJyDqcT`FXw63S3e^J#G@E&de00XQ^ zL_t(&-p!iZLfSwOhQ~y*Igo^ea4?)HpsiKg{_p>8U1}7;WM_aR_4CdPK4xcU*~8F{ zl-PHFRp@vYk>xp|a{c&5ibxXp%Apb*`*%wLz zMQ5PwOC&`UVl4M;iSNYbUbQNL1OKgv>#Irex zZPC?Ou~`ypNBtJ!;R7gUqk+59iQmv>miBC1-f0hIm)r=K< zk|b0+$*IJr2JlZL9yNe>EODt3+(N=+{p!L$NE9_ha*zbn73 zDkNHecfg=*N~b_3m|rAXQf3ts_6e8^>X9TV>6Hhf830{2DOy529bjG=;+7b+A|{>* zQYvQ!+!4nkN%9U%se&nHeCEj|mIW|>qzcv;@R`?tEIor{1hDm(P$-g&se-;>dWGaP zFLB6gUgD9}yhJOSmyl4>r*dwGj6@hqx1R!dpfa}5jC!1cO?*DZo?*2_OSKk%t_Q6)E;^$Y zu580LE}!lHaE;zXv8XnlHrjopY5%!N6F2a1*8US9Z;?B`!n14}56stBrTR*b{+G8e zgm&YN7*_NZTS_$cS!0%%n_~8s4&(|iiBL{Q4GJ0x0000DNk~Le0001%0001%2m=5B01MxN&;S4cX;4g5 zMgRZ*0001yF=KyIg-`SV001I%QchDT06#N5C^tGKEkf*jF9Zo1BM=}R6%E|)wl zTi^Wl9%Iv0N_i+1kUvf>csxr8M~#0fe^2%33qjZ)bd9!tR-V{| z$T)gj$VWCJF`n|Kp)OX+RRf7JoO5`kYe(X7!@SV0oi&kpha2X+(bUS?lH%qm zZQEEQ8SaqL*uolv;x1{p>_Y#7^Y3_>HMOYvUDJR6v38=kV=BAi-G{$NeZU)C{C(;qBZ{5L$M@;hsyh*cEB^czbB zD@pVhYmiwE-nki$UWT8nO6afhr%=%y)gP?HI>UQ@et3L*H=;AAoSs=ZM0CdwPlw*t z{-e*&tdY>2`}B0|4Z5T8nWc*Ewr@`?a_E0d^~B17=VM7Xi$ng-n#iw-oru24S>j4^K^ftZ0j`Vbym}Z9RT=jVuARv%a>nKD4svTRCTx z+aL@C(FFs>ZitIqsUm5c``@xfPJXOPmEA>of<1u+2=DI9yozJ>*TQ4H8!0|kjX7&6 zJJnb5x7Af0%lXSGtII9Dua8q+pF@8y<)6GAq@u>W=JaM?rZKNxifgc92Hxc}7@3H7 z;zYfwp^Xi+4TLt$&=CVVkU_^+=&(;+jX)Pk(6t+MNeNx)HnDXixxlqiQ7*WTuU11Y z&=Xh0r@lRkg1Dk5MTuM1hvi2-DJtl=$*#Ah>qSAh)08U@prK3Q827vXzkXB-*25)f_Pk19yb60002ov JPDHLkV1n(BZ#)11 delta 1690 zcmV;L24(r=3Z4!xiBL{Q4GJ0x0000DNk~Le0001$0001$2m=5B0A_qheEq4Mw~6Uyr=Xn}9kS8@00s6*L_t(|+RW2iYQ-=NgyG3Z zLI`Yw_rKZFhe9bQaT4G9ui!(2aCD^_xmpq-zN1L8nnU&I>VLgTOZ6ngrzpv5Y0$>2 z!iB_jq<9>ShN-j|aW`7~Wc@15E_jxBZooQK>Owq^;tf}aDvWp=EskS?su`x2_V-X*C7xbd*MIB|Wf>Jb#ST^E!Szb2vMRm1 z`y9Lvt3pKmNcp>!huhAT z0%5m#@k8*GvsNVop2@%V!y!X3-A5oXrHs|z98RM|oIcZdS`Bgyc;wuG`%dL>f`_L` zo^6O+hkw20_V}H4U3VLg$KzhB*-nCk@)(Ew@eg?l7`c^HVB|-clE!Z86*NP-gve9C z=Tyq=<1@~>n^ti}mr$*0pcuIF>Pn||>ZjM4YR#GPRZ}Z^ScN0~Qr#X-GT&(tV{&Av zl>vjV>6x8vwfG}E03$6W~Z~jSym0H?|&wmz7y=hIA53e&#;q@_Xw9#N13&n z!cL?sypKyMqgp_#D((tsbyrX;Q$Q;N6wnI4R&Uf=?Q)_(5F|gc-epsF1c4Q9K`Lws zir`n~{a@`EsyxucKvQMP^q)iv%XW5WwtuI0?hCu9h^QQ{j!Dx+2i8|0t0KwTcR3g- zMU3@a-+#Y*&e^BZBi6Y=sX=?hp4k8@G<9ciQs@ z$`E7qipf2Wlw&L_cZPx`I8>+l$t|He`4!U)VlEp}HFmr(#efEj_yN0eiPAriW`B5t z+rX3Hf3+f#pQNFVh~&H76bROSOGIB`TC~^`MY`=2(%W_($I=bjWK@V2#dP~havRuD zzc)MMEbfTtgf}D5t^UM%9FEVtYc;sW>c^22FgriWtOB6N!TP~nhn1D5H|;!eq>EjL zu;P9Y>z%!eMt;?liDhxUx%9!O8h?v_YnJhI3DP@1%|O#5(rxG*s-gV3@mg$7+f;HU zaBzAOV;D2glW7i-Ri}KpbOSQYT8&X+jr|+wUx}k6ibea{i~D&wRnm!YMC2Bje+4Ds zp(Y_;y3yOMdpP-r+-kuG!WOX^P+wH2|Bt_7>93ViyvO$S-?-X@mm+aNB!3NXHsc<$ zVHub82~^IzUP~*Gn3S2}e!Cs9p9ZmN_PUMu?fBiq2OA#(V8zAC_29dSr)Suw4FOjC zGol=jF;nim@{(oAcvfKy%9vl1?gty;XOCvZ$C9J*`#~@Z6D|Q}EGuyY4cpnod*_Ok zlRc7^-V-?o{N5Q}!a@>7fq%GyW>!XA!?1V=kp-MO&%m|1{BezledWG)<%a+kaPsVj zk%YhvCe41JB`Z;cV1e{p(`Sl=Q7(;zvq&b*6yd=VS@1FzL5PIvTg<9G=3L){&OkoE zWZ(0*nXUcX%pH&b00008`v1BWfj>&KLq?lzvu{UV0Q8$M9~1P)L0{h`^z$;GIP@Px zUrY2$MIT=DcQ)T}^rJ`30o7+fEeq8BK#dgClTqy*)G0zuC)K|~tuWP9Qw=)R>r-t* k)qzyaOx725E!Nqs4b4jJXNT$GRsaA107*qoM6N<$f(QILu>b%7 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 e73b7e59927b4a230ce5ab41da50c723b0aaabfa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2983 zcmV;Y3t04tP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91WS|281ONa40RR91WB>pF057}VK>z>?5lKWrRCwC$oqtReXBx*>t(8QP zM2#iFv9Kpfn8=_m`T1_*qwdf=lOo- zd1v0)*;$<~)EA;L=|tlf5QQxxn*1u!v_<5IN}&7t#nfzAL@n_N)M`qgMic(Vb9fEw zU|qZi??oGEOQ$UZ1~3)|T8JVN$R24SDP}Rrh9ovUky_1eHJb6iFJT?e`uHDhpe=Ws z6oEd_mu7e`3mY`<4@47_sBL;ON&3ZdOMIftW_F7K$ZYfwgf_g}L?7r2eZI_nBZkpl z31d=tD@|%^oBpcQ9GBSo$gCt;HVqX(|B_AKfDi*>NpV-s=o#9qJWQk#g(o{4(cYC1 zd;tAbkXPk!Y>6D>h#t}a!qU_fkt|7ir5adCt!zdJ$`c=AMa4`mB)(uCI^JeYyxECPY}u{^OOmxVWPP7tyxEZ?j7vzQOldHDLV-u{D)?t;uksH3I(K-DJJ-~w;1RqE>e1KoYcy4ZF)%3bEGRHiuT%I+ z?nKkT1@8hq*LZT(4cVZXJ2=5Rco?w##)>PB=+rB+dF4O215E=Kyn}}U*`K8St!0V^ zBQQ|XuJT#pp)9MbXhO!{Wn(5csA=eem#eD=`*{kN*ISoq#;UJmbLJP^pr#=UUcyry z=>|S@Wn866nu)8 zZ{e|@)j?x3FG%`T8jzq#@s>Td`g5);x1Pea>KL9Xf!F;WS>@U&I_sQlUUOD9g}O3M z$;Ra4k{){PuTt#Wr{#DN;)dXHuC1TRVv3Ez*4K)WR2swBd#U}GO%5uOoK*YYHrG3U zs((03Bq;D2p7#ml&6>99xq?)O}DtPT`YE;YzV3@bD$lu$66-V&Q!cAnR&q;zq1^GW3;EDI4GY+&;VA z)p_kPAnl!>Cmd!VC&kDEg6HtQ2av2v`%}5qTpeNqsZACP2t0@PJ?0*HCrOVNH-cJ- zD~EyX?gPkD1|mWZ9>H^X|Ja-)rSx{#`eSnZ#uL1f0LrOgAZHnfvlk!-7>FQwcm(gk zpc}}RGZc|u$rGF zl2*j$hy=;QBgOj)icx0m>3eCs^|)-vFV}#mCB=JYV72ijsMb;nE8v}qNC}KIAWD@S zqj<2;Sr5_V0uUf&1L8FzEpjQ=AZwk z^Q8_K-Sh_Xu)Xu*C-v>W?(h9>(eqVb(LD4IFlqw<1F+C-Dsx0_<|our0mIl_My7ks zu6JE7y2ZNV>ZBih%B4Ks>Fgw@H;_&uxx>}Zd%M)(?x#U|NLAHeIG@|_foxRM2M8>5 zn|NlcW)RuCq}UtZ((gNo?Nw=Mw!02wZdca_1qidy74n$9c^^Nak}@|*`fvZ|T0<%> zayy+t9BTRifrYN%BOWqT3}XE@dFDCZZ}1TEjY>S64R>5Q*@aT9+CacUx4B5&AfOGr zL;v!M^OgH;uA(-(>rkuRRo;&d@_I*jAJF9OEbm(yTI}=}Ki(8KYD$Q<0o5-Wpgiwy|%d)d!)bZK-pF)R)G;BKIpdX37ug4m360V z+<)X@&xxVjSqqaz%f}L6gN0g{QoFfbfSa5~Vw5?lZvyedAM-C7$01MrF@6qJl0J521 z5JZJm2C}~wAQA(~WFP|N;t?2t1uk$1+p~@0H6ZE=48TISH=V{8^BiDzfov|~7evrb z26ChiAbAW#lsr6w_q&(@SSTOi?%hH$#i9Wz?gL1gctGGi7<6BF{ejgUSzJKoA}g6h z(9R9rK(7A?NL^kU=|#!IBX|!6-B+D3od~5u1W8~|KE;=Cyv}yI>G8Wy>$8Q%8*QemNS zrP&l)oW;YIX4bF>Uc+;E-|M%iK3vx}y(E{+WxTSc;0s=V_+}qpX~R;=Q}@GfQ@m!@ z@CaU)rug{MCr{hQ99m7$zDL01XyKj5`rx7Ik! zC+NyoX;6Yz9qjGlO!Dv68p^4Z^rndNR0gt=8_*PR!CQDdfZH?C*ot(D(Vzqe2D}~6 z?U|H$Nd`^Q3=EFo?V#@R_i-xCsCa|SN0*aH)6fMk;pw1ng8AM;n!t@1H8TSS#0XD^ zbZ63vG@7DSNnol2UJm^}$~C^(z__cmOYky)t^+r*J@#qZvw9?vcZ`&+zBy>+Fj( z_2i2j+zT8WKaK`@az*YzKbjis6d6m-F!}F9)saW5rx>1 z19B0jDts;VJkFk(PccYLBru+M5qo{8?<)p#czk9~Q^aS#A-$65uNcfToOlQdu^~pp zikPjs5ILL;3K&ifTbu1!iaz};#Vg5&031&ohzYSF#t{vox64**9wuseE3IdfJc40$Y~WCI&Z|8LeV{M& ziM~}oTQT({R%e5fRZFJkmA4!OXuxMRBv56}Ot) z0C9l1z7A3CDDURYM)!ra!Am0}BFP(0MMNCuPDJ+CPO;L=^O7->~U# zV-50rsJ8pwmdk5;aoL!#oXj6iGurhv$P6``~yyLIoz&|#Yaj?0-N4t5D&!|#czVVOnbB)jMUsX^?bPiea33_YFbL_KM2;X460(e7kC zE|2y?gN8jl4Q&Q&R-a-YLvv*SPCp~g-)>Bp@6zvRU5t-XwspF-xYXaeBRTOq6w&MV z@{!}fVV;`~01RCiBWS_K#Rn$<5-1hfp{QR;rK&QaKgpU>!`v4{M3DFLKfcYtzqQpfV+8D zUxs&H7XVubxOK`&czCUz5pw52+?`n;lM(OfVU=vz7aQ|)^ZfG)$uBqTR|UH=QQ&RH zNU09twmg5fQ$JccjRU3WjC`Q+{pQQA2&a{T7rIK+GNfNz>fb@nwx+4^GBRB1+E@k5 zu6wU0Eni0<39NqkE#kK5hEVcQ+iI&Pvzjqm?g5uHaNWM`73ZZm8$O$|dZs>g!ELpe zV+6iDJYSi^H{*3EF?K5P+HX-RHi`w5M!L zO{it}Y_1B*hP6ZuK@u6;CT?xz3l?{r$*ayJ(;STAl5W}n|^x930P z9RnOaB^%6|Z}DbT6S1TH8oT@hhSt8`U}_^Z^lDy<67$Y=N&Y>=LuuFG^Tphfn=lEp z|JNb*-&;HkW9~Mouk4uwI$t0shQ^x93P}w$Hbw)#auom9SMNzw%$Y=R+bt$5nX5G^ z&?a?;1V@ZA=F+m<+AHKpATR_+Cz_}SjnipY&*C)DR}UV%zrSxnF5wV~+1L5TgnBQ$ zC9h#GbM_%sR>ZWObv5=3!)7`b`tT?1RgV@Sljjb$j7bwMfB(r~UM@?4a<9~{TPGsQ z?d+>@$`1+f6pylc6NI~o-5`B%B99ohg{fbBthr*O@!{soU1>zkAjUoTYuByr>r{%IR9B4Q&M-pIb1q?|ej^dMh1Bid3_(qYTi z31xN-5?QwzyGjHrkz`4($*Jt{JGMCF=p!P7hB#oiqWiV#G zk9oCoHFd{bkyji6JDHfKM)2jcahYj0I_5LYf5nRj9u8)}1xN4IK0yS!L`27Hf4qk@WjQk;lU}B)-N+tbhUZ#R zIFk;l_QqBTH&?TKkAK7_;YX}N5r%DT)y}iUcJn-C$MfqC$|f?0U_x^7ku8gp*!%Mq zs6)_2ero4OBbmga*IBv~vOaD(s>qBHOmdBZC^667Vxp-b*sGBaw?7izL9aVzz8Ui{ zAObX7tBnC%OG*yT^5TNabhfXW)OYa0wpnSBRaXP|7I(LS;|8T^b*-wuGnQdcbxy9K z-&)W!XJegquFtJ$EQU~_=Bn?lroXItAr2lmWbtjxZYe~HJ0Ehrq3xZURzxDOLe@do zw4hRj{F3E$B>j0E8PGmygkq$ybaizdLZI3DnpP-XNO1kPE+t@9M!mVvuN&OwC zTavY|flhdGpYty6rzUoZTB4@(Pgcavyb}8{oXVLs>!62EXXNwsgyW5)+kI!gs6u{PP+AqPo9sh}1B79lZjrD9#jyur-tE+Rl`0Vn4|Q?w8P(_Z&e2xO-1W$}n->&`w2 z`Ysf7BWHk?+M{?7T)i_}#_|d>Rf-JuGn8UFpr_r)eSd@?F?3>-J5nfmaOfgkaLl zx{{s7D`&tS<>x#2UYQH^)h-a%CmKDINDdc1bxPk`BM3A^LQ>L%-_1Dc} zi}Mk1;6diH3NC^6Z!A7WfneM~z=xXLtMByd(L!6eDWk^JwQaBn_cMw<>6e zFGCyZGrJFge2SHOk&<&R;M<@Tfj2b8jl6>$vhzQB>-$b=z$Al)gTb9*l@(hSDFe76n{m2l& zQ-Wnp*-`djQ?+DxuhgJomBW`$9n2(PWU*Hd)IS(%-g-G}k%EAt^j%{c9Y6l$; z-nlV~S?K*cQeT?=zJL?Q8_e9knDlldoN4?0lcY#wV^zOQ#*FWpDmtE z?i0QNUR2+pX>U9d_#D4iX+rA9T?6h`}^z0oKBnWTV76C ztW+mk`dsZwjd}L>a>*^rJnjz=s#dTeUt8yBhT}OL)M?0Lv@Ux1Fy7ze= z_vQ+M4&@5HVUgIDnsvC?fm?ul&NN2xg#)pX8K+t~SfeBdE!Roz(`_=2Vu3=Tc8M*; zp%=PEi3(qgmamJ;9C=%6(E82^>zQ-U7@ec@!mn|4TQ-ii))@WB2t$!A{hQu$bOD2% z#eJ<30@XtKP2F>Z%wQzqD`m?tv11phF8=az_^{d&cN?{wzI@T|Y)a|P*KKoz#fkXj zWs3i_rb}O3Xcm5&1ws zYOe#yWV_>7jJ2Dq95;uvd@Ba(wld+~)Z&Ig`7W}BZ+E>!S)h$< z2s?EQ4?CCb3K5X5b&dp-l=v}k>Qm5~AdD6?kh zcX>mfN|l1>KjTH5F_BFD5Dtsnpwe}-FotM6y!G@c z!s(ZSHMEOj9WT=Cvu&GFAfCc&BFX_;f{mXotLsd*b4z0LZ(g5f31tWCB<5oLyg zKEASUZAJ;5IwdE+#?iLdcO|efOm$%@_oe+(%%9aWMPrgX_~@6$=s7UWOycOI*x-q! zPjdGp6wkY(;X>L;VS>i-*~M`^YpLr~x#kzoN39wCDRt#V(d7GrokZ-d%C;9_{50g% z?@4L=6BbrqimY4HL*X5`Ww%^1#dFmGe=Xp%a0Yf7Yuv%B-jFtztZMeoZL;g<^ZKV+ z$JWqm;;<4Qjhrp=YG(FJdQ|T<2*@$S3tAISXQTys#Fi88@&xog7LTQ>%+lnCIEq_l!~87b<>zHsc(KMy8enV zZgd%d`q9`i$rD{Lj%Rnp3Nt`HyZcFu|B62cXyYlX=2kmq_UzR60@3TcCvbV|*t6(a z<#wLlPX3o4aj0yp}ZU@rMO|rb<^gwNS*5+lxMwr ztox6?1Z_LHryn~i%wE&F*7!D-&AesoD)MU5jxaC0C)3VFKQvaQSf 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 0000000000000000000000000000000000000000..9bbd222fb13f92adb24d205ad1f632990da72b07 GIT binary patch literal 356 zcmeAS@N?(olHy`uVBq!ia0vp^Iv~u!3?wz9Rv81S*Z`jpS0MeLW*|`O_fwz+awS22 z!3@8@eGIYfGgz6Q80qcaX!h>)t1a!-r5Uk-PP}T$m+xEak-ar)^MbEXyp z9+$w)+-fuCEPh|_GePRs`&ldFA1d_zEIM^i?#iwc)!ey%BIdK+&~PjZmfpO3W$B5q ztnjq@B<_^*jq`50ygl?LKBq57I3ake@#eKRI&b>r^uD>-Ez9erc5N1ejZ@9nKPUb) z{dsxM^3RTsluxzKUoRRT!CvZ_-8|i=qBc`T*X``DFg@MR{!iJYxddafFBF~t Px{<-t)z4*}Q$iB}urkJ} literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..36b0866f72f2e69a2e8dd47f39fa04b802435542 GIT binary patch literal 582 zcmeAS@N?(olHy`uVBq!ia0vp^P9V&|3?#2~eYgdrCI|S0xB}__gA81>R*eHX%b+C4 zFPMSl;S27kR+HG?m}%ag;jZ_gy{6p3c*CmRK%eWUmNcm-$ngI9Byf4}j(Jn^MS|z1 z25qR>%)r2C#{=~z_`f9E3 z8Cm!brQ4{r{`8$O>CpMm8JsPuMJF;8n+#5K1x2{di}=wxL5%mhd{{KcYm@aStarwK zVp7Tq6o0wS@WhP;N2mNxPBv(=_n7ur;n8``e=9Az-()HBe`FP(CKR_< p;Tk!soYQ*m+AAXVK309iu`1Dd-2%z|qQH=6@O1TaS?83{1OO#PMZ^FA literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..513380f4662dd09b7c0fbef57868763ffd4add57 GIT binary patch literal 5214 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 YFDVv+6E6Tv*rNTHr1*aOFJ$S<02{4NfdBvi literal 0 HcmV?d00001 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"="確認選擇這張圖片作為房間主題嗎？";