From f10b286101d32a5511d4207a02e700456ad9ad2d Mon Sep 17 00:00:00 2001 From: eggmanQQQ <3671373519@qq.com> Date: Fri, 5 Jul 2024 17:15:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=B0=8F=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- YuMi.xcodeproj/project.pbxproj | 68 +------- YuMi/Global/YUMIConstant.h | 1 + YuMi/Global/YUMIConstant.m | 6 +- YuMi/Modules/YMMessage/View/NIMMessageMaker.m | 16 +- .../SesssionModel/MessageRiskAlertModel.m | 9 -- .../View/Session/MSSessionPublicChatHallVC.m | 150 ++++++++++-------- .../View/Session/SessionViewController.m | 46 ++++-- .../MenuContainerView/XPRoomSendTextView.m | 7 - .../XPRoomQuickMessageContainView.m | 8 +- .../View/SubView/MSRoomGameSendTextView.m | 9 +- .../View/RoomHeaderView/RoomHeaderView.m | 3 - .../YMTabbar/View/TabbarViewController.m | 3 +- YuMi/ar.lproj/Localizable.strings | 2 +- YuMi/en.lproj/Localizable.strings | 2 +- 14 files changed, 149 insertions(+), 181 deletions(-) diff --git a/YuMi.xcodeproj/project.pbxproj b/YuMi.xcodeproj/project.pbxproj index db8c7c0d..76cc456e 100644 --- a/YuMi.xcodeproj/project.pbxproj +++ b/YuMi.xcodeproj/project.pbxproj @@ -527,22 +527,11 @@ 545831A62C2C085C00364026 /* ArabMicroView.m in Sources */ = {isa = PBXBuildFile; fileRef = 545831A52C2C085C00364026 /* ArabMicroView.m */; }; 545888332C1AFFB500897585 /* XPRoomPKPanelView.m in Sources */ = {isa = PBXBuildFile; fileRef = 545888322C1AFFB500897585 /* XPRoomPKPanelView.m */; }; 545888362C1C306B00897585 /* XPRoomPKPaneAvatarView.m in Sources */ = {isa = PBXBuildFile; fileRef = 545888352C1C306B00897585 /* XPRoomPKPaneAvatarView.m */; }; - 5458EC1F2C341C3F009D9757 /* FeedBackViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5458EC1D2C341C3F009D9757 /* FeedBackViewController.m */; }; - 5458EC202C341C3F009D9757 /* FeedBackViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5458EC1E2C341C3F009D9757 /* FeedBackViewController.xib */; }; - 5458EC232C352D9C009D9757 /* FeedBackConfigModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 5458EC222C352D9C009D9757 /* FeedBackConfigModel.m */; }; 547853A12C258F2A00F45E60 /* XPMineUserViewHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = 547853A02C258F2A00F45E60 /* XPMineUserViewHeader.m */; }; 54C3895C2C215F5100FD47B1 /* XPHomeMineViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C3895B2C215F5100FD47B1 /* XPHomeMineViewController.m */; }; 54C3895F2C2189DD00FD47B1 /* XPHomeMinePresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C3895E2C2189DD00FD47B1 /* XPHomeMinePresenter.m */; }; 54C389622C23BD1600FD47B1 /* HomeRankAvatarModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C389612C23BD1600FD47B1 /* HomeRankAvatarModel.m */; }; 54C389672C24464600FD47B1 /* HomeMineRoomModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C389662C24464600FD47B1 /* HomeMineRoomModel.m */; }; - 54C9A10D2C3D2FD300C6D970 /* XPMineDataGameMateTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C9A10C2C3D2FD300C6D970 /* XPMineDataGameMateTableViewCell.m */; }; - 54C9A1102C3D3E1700C6D970 /* XPMineGameMateOrderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C9A10F2C3D3E1700C6D970 /* XPMineGameMateOrderView.m */; }; - 54C9A1132C3D5A2300C6D970 /* XPGameOrdersListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C9A1122C3D5A2300C6D970 /* XPGameOrdersListViewController.m */; }; - 54C9A1162C3D5C9000C6D970 /* XPGameOrdersListTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C9A1152C3D5C9000C6D970 /* XPGameOrdersListTableViewCell.m */; }; - 54C9A11C2C3D9EDD00C6D970 /* Api+GameOrder.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C9A11B2C3D9EDD00C6D970 /* Api+GameOrder.m */; }; - 54C9A11F2C3DA08000C6D970 /* XPMineGamePartnerInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C9A11E2C3DA08000C6D970 /* XPMineGamePartnerInfoModel.m */; }; - 54C9A1222C3E6C3200C6D970 /* MessageGameOrderModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C9A1212C3E6C3200C6D970 /* MessageGameOrderModel.m */; }; - 54C9A1252C3E74AE00C6D970 /* MessageGameOrderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 54C9A1242C3E74AE00C6D970 /* MessageGameOrderView.m */; }; 54F469352C29711400A83655 /* XPMomentUserDataViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 54F469342C29711400A83655 /* XPMomentUserDataViewController.m */; }; 54F469382C29C3B400A83655 /* XPMineAlbumTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 54F469372C29C3B400A83655 /* XPMineAlbumTableViewCell.m */; }; 54F4693B2C2A984D00A83655 /* MedalModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 54F4693A2C2A984D00A83655 /* MedalModel.m */; }; @@ -2599,11 +2588,6 @@ 545888322C1AFFB500897585 /* XPRoomPKPanelView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomPKPanelView.m; sourceTree = ""; }; 545888342C1C306B00897585 /* XPRoomPKPaneAvatarView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomPKPaneAvatarView.h; sourceTree = ""; }; 545888352C1C306B00897585 /* XPRoomPKPaneAvatarView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomPKPaneAvatarView.m; sourceTree = ""; }; - 5458EC1C2C341C3F009D9757 /* FeedBackViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FeedBackViewController.h; sourceTree = ""; }; - 5458EC1D2C341C3F009D9757 /* FeedBackViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FeedBackViewController.m; sourceTree = ""; }; - 5458EC1E2C341C3F009D9757 /* FeedBackViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FeedBackViewController.xib; sourceTree = ""; }; - 5458EC212C352D9C009D9757 /* FeedBackConfigModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FeedBackConfigModel.h; sourceTree = ""; }; - 5458EC222C352D9C009D9757 /* FeedBackConfigModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FeedBackConfigModel.m; sourceTree = ""; }; 5478539F2C258F2A00F45E60 /* XPMineUserViewHeader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineUserViewHeader.h; sourceTree = ""; }; 547853A02C258F2A00F45E60 /* XPMineUserViewHeader.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineUserViewHeader.m; sourceTree = ""; }; 54C3895A2C215F5100FD47B1 /* XPHomeMineViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPHomeMineViewController.h; sourceTree = ""; }; @@ -2615,22 +2599,6 @@ 54C389642C24448900FD47B1 /* XPHomeMineProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPHomeMineProtocol.h; sourceTree = ""; }; 54C389652C24464600FD47B1 /* HomeMineRoomModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HomeMineRoomModel.h; sourceTree = ""; }; 54C389662C24464600FD47B1 /* HomeMineRoomModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HomeMineRoomModel.m; sourceTree = ""; }; - 54C9A10B2C3D2FD300C6D970 /* XPMineDataGameMateTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineDataGameMateTableViewCell.h; sourceTree = ""; }; - 54C9A10C2C3D2FD300C6D970 /* XPMineDataGameMateTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineDataGameMateTableViewCell.m; sourceTree = ""; }; - 54C9A10E2C3D3E1700C6D970 /* XPMineGameMateOrderView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineGameMateOrderView.h; sourceTree = ""; }; - 54C9A10F2C3D3E1700C6D970 /* XPMineGameMateOrderView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineGameMateOrderView.m; sourceTree = ""; }; - 54C9A1112C3D5A2300C6D970 /* XPGameOrdersListViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPGameOrdersListViewController.h; sourceTree = ""; }; - 54C9A1122C3D5A2300C6D970 /* XPGameOrdersListViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPGameOrdersListViewController.m; sourceTree = ""; }; - 54C9A1142C3D5C9000C6D970 /* XPGameOrdersListTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPGameOrdersListTableViewCell.h; sourceTree = ""; }; - 54C9A1152C3D5C9000C6D970 /* XPGameOrdersListTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPGameOrdersListTableViewCell.m; sourceTree = ""; }; - 54C9A11A2C3D9EDD00C6D970 /* Api+GameOrder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Api+GameOrder.h"; sourceTree = ""; }; - 54C9A11B2C3D9EDD00C6D970 /* Api+GameOrder.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "Api+GameOrder.m"; sourceTree = ""; }; - 54C9A11D2C3DA08000C6D970 /* XPMineGamePartnerInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineGamePartnerInfoModel.h; sourceTree = ""; }; - 54C9A11E2C3DA08000C6D970 /* XPMineGamePartnerInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineGamePartnerInfoModel.m; sourceTree = ""; }; - 54C9A1202C3E6C3200C6D970 /* MessageGameOrderModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageGameOrderModel.h; sourceTree = ""; }; - 54C9A1212C3E6C3200C6D970 /* MessageGameOrderModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageGameOrderModel.m; sourceTree = ""; }; - 54C9A1232C3E74AE00C6D970 /* MessageGameOrderView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageGameOrderView.h; sourceTree = ""; }; - 54C9A1242C3E74AE00C6D970 /* MessageGameOrderView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageGameOrderView.m; sourceTree = ""; }; 54F469332C29711400A83655 /* XPMomentUserDataViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMomentUserDataViewController.h; sourceTree = ""; }; 54F469342C29711400A83655 /* XPMomentUserDataViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMomentUserDataViewController.m; sourceTree = ""; }; 54F469362C29C3B400A83655 /* XPMineAlbumTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineAlbumTableViewCell.h; sourceTree = ""; }; @@ -5093,9 +5061,6 @@ E824543426F57D6E00BE8163 /* XPLoginVerifBindPhoneViewController.m */, 23B2AEC32A6516C200543D17 /* LoginForgetPasswordViewController.h */, 23B2AEC22A6516C200543D17 /* LoginForgetPasswordViewController.m */, - 5458EC1C2C341C3F009D9757 /* FeedBackViewController.h */, - 5458EC1D2C341C3F009D9757 /* FeedBackViewController.m */, - 5458EC1E2C341C3F009D9757 /* FeedBackViewController.xib */, ); path = View; sourceTree = ""; @@ -5317,8 +5282,6 @@ 235714762BEC9E5E004C81D6 /* MSSessionContextHeadlinesView.m */, 234E50A32BF5E556005CB6D5 /* MessageContentChatHallHeadView.h */, 234E50A42BF5E556005CB6D5 /* MessageContentChatHallHeadView.m */, - 54C9A1232C3E74AE00C6D970 /* MessageGameOrderView.h */, - 54C9A1242C3E74AE00C6D970 /* MessageGameOrderView.m */, ); path = Content; sourceTree = ""; @@ -7593,8 +7556,6 @@ 235714882BECC38F004C81D6 /* MessageHeadlinesTextModel.m */, 235714902BEDC9B1004C81D6 /* MSSessionPublicChatHalImageModel.h */, 235714912BEDC9B1004C81D6 /* MSSessionPublicChatHalImageModel.m */, - 54C9A1202C3E6C3200C6D970 /* MessageGameOrderModel.h */, - 54C9A1212C3E6C3200C6D970 /* MessageGameOrderModel.m */, ); path = SesssionModel; sourceTree = ""; @@ -10440,8 +10401,6 @@ E81C27AA26EF2D920031E639 /* ThirdUserInfo.m */, E818DD1D2A48974300F163F7 /* LoginAreaModel.h */, E818DD1E2A48974300F163F7 /* LoginAreaModel.m */, - 5458EC212C352D9C009D9757 /* FeedBackConfigModel.h */, - 5458EC222C352D9C009D9757 /* FeedBackConfigModel.m */, ); path = Model; sourceTree = ""; @@ -10746,8 +10705,6 @@ children = ( E8E70D7C26F2F19D00F03460 /* Api+Mine.h */, E8E70D7D26F2F19D00F03460 /* Api+Mine.m */, - 54C9A11A2C3D9EDD00C6D970 /* Api+GameOrder.h */, - 54C9A11B2C3D9EDD00C6D970 /* Api+GameOrder.m */, ); path = Api; sourceTree = ""; @@ -10777,8 +10734,6 @@ E8EEB90B26FC5EBC007C6EBA /* XPMineUserInfoEditModel.m */, 9B734F74288A92FB00CBDAA9 /* XPMineFuntionItemModel.h */, 9B734F75288A92FB00CBDAA9 /* XPMineFuntionItemModel.m */, - 54C9A11D2C3DA08000C6D970 /* XPMineGamePartnerInfoModel.h */, - 54C9A11E2C3DA08000C6D970 /* XPMineGamePartnerInfoModel.m */, ); path = Model; sourceTree = ""; @@ -10798,8 +10753,6 @@ E8E70D7F26F2F39000F03460 /* SubViews */, E8E70D7526F2F15100F03460 /* XPMineViewController.h */, E8E70D7626F2F15100F03460 /* XPMineViewController.m */, - 54C9A1112C3D5A2300C6D970 /* XPGameOrdersListViewController.h */, - 54C9A1122C3D5A2300C6D970 /* XPGameOrdersListViewController.m */, 23CEFB6A2AFB803B00576D89 /* PISwitchingEnvironmentVC.h */, 23CEFB6B2AFB803B00576D89 /* PISwitchingEnvironmentVC.m */, 23E9EA932A84BE4800B792F2 /* XPGiftUserDataViewController.h */, @@ -10982,8 +10935,6 @@ 236B2E552AA18E12003967A8 /* XPMIneGameCollectionViewCell.m */, 236B2E562AA18E12003967A8 /* XPMineGameTableViewCell.h */, 236B2E572AA18E12003967A8 /* XPMineGameTableViewCell.m */, - 54C9A1142C3D5C9000C6D970 /* XPGameOrdersListTableViewCell.h */, - 54C9A1152C3D5C9000C6D970 /* XPGameOrdersListTableViewCell.m */, ); path = Cell; sourceTree = ""; @@ -11052,10 +11003,6 @@ E8D34D6628084E88009C4835 /* XPMineUserInfoGiftWallCollectionViewCell.m */, E873EB00280922720071030D /* XPMineUserInfoEmptyCollectionViewCell.h */, E873EB01280922720071030D /* XPMineUserInfoEmptyCollectionViewCell.m */, - 54C9A10B2C3D2FD300C6D970 /* XPMineDataGameMateTableViewCell.h */, - 54C9A10C2C3D2FD300C6D970 /* XPMineDataGameMateTableViewCell.m */, - 54C9A10E2C3D3E1700C6D970 /* XPMineGameMateOrderView.h */, - 54C9A10F2C3D3E1700C6D970 /* XPMineGameMateOrderView.m */, ); path = MineInfo; sourceTree = ""; @@ -11201,7 +11148,6 @@ E80EC83228ACD84000D133C5 /* emoji_00@2x.png in Resources */, E80EC89C28ACD84000D133C5 /* emoji_50@2x.png in Resources */, E80EC87A28ACD84000D133C5 /* emoji_113@2x.png in Resources */, - 5458EC202C341C3F009D9757 /* FeedBackViewController.xib in Resources */, 23FF25622ABAE6310064E904 /* pi_room_game_fine_love.svga in Resources */, 23FF42672AA5CFBB0055733C /* home_sound_wave.gif in Resources */, E80EC88A28ACD84000D133C5 /* emoji_25@2x.png in Resources */, @@ -11625,7 +11571,6 @@ E8AFF7E3298CA1E500FBDE32 /* SessionSayHelloCountModel.m in Sources */, E8998D7A2859784200C68558 /* XPSVGAPlayer.m in Sources */, 23FE47D82BB3CEAF00F09D23 /* PINobleCenterTitleView.m in Sources */, - 54C9A1252C3E74AE00C6D970 /* MessageGameOrderView.m in Sources */, 9BD9A18427A0F128004186FE /* XPMineVisitorItemModel.m in Sources */, E852D73E28631C18001465ED /* XPMonentsCommentTableViewCell.m in Sources */, 54F4693B2C2A984D00A83655 /* MedalModel.m in Sources */, @@ -11714,7 +11659,6 @@ 23CEFC502AFB8FC100576D89 /* UILabel+YBAttributeTextTapAction.m in Sources */, E87E545429AA05EA00EBE52B /* XPFootPrintNavView.m in Sources */, E8252FEE27687DF1002B3164 /* ActivityInfoModel.m in Sources */, - 54C9A1222C3E6C3200C6D970 /* MessageGameOrderModel.m in Sources */, E84BF7D1277BFCDD00EF8877 /* RoomTagModel.m in Sources */, E8AC723526F49939007D6E91 /* XPMineNotificaPresenter.m in Sources */, 1427218E29A75F6F00C7C423 /* HTTPMessage.m in Sources */, @@ -11754,7 +11698,6 @@ E8E20BEC2816A5B90033B688 /* XPMineBlackListViewController.m in Sources */, E8AC722F26F49610007D6E91 /* XPMineNotificationItemModel.m in Sources */, E85410352864155A005CFD9F /* XPMonentDetailPresenter.m in Sources */, - 54C9A11F2C3DA08000C6D970 /* XPMineGamePartnerInfoModel.m in Sources */, 2331C1B12A60F32D00E1D940 /* XPCandyTreeGiftView.m in Sources */, 9B1B72BC28003E06003FACE9 /* XPAnchorPKTableViewCell.m in Sources */, E8E70D7A26F2F16600F03460 /* XPMinePresent.m in Sources */, @@ -11851,7 +11794,6 @@ E852D7412863249F001465ED /* XPMonentsReplyTableViewCell.m in Sources */, 237B94BC2A984DA7007853E3 /* XPTrumpetPresenter.m in Sources */, 239D0FFA2C05BE9B002977CE /* MSRoomGameVictoryCell.m in Sources */, - 54C9A1162C3D5C9000C6D970 /* XPGameOrdersListTableViewCell.m in Sources */, 23E9EA942A84BE4800B792F2 /* XPGiftUserDataViewController.m in Sources */, 2331C16D2A5EB71000E1D940 /* XPNobleSettingNavView.m in Sources */, E8AEAED6271412EC0017FCE0 /* XPRoomViewController.m in Sources */, @@ -11977,7 +11919,6 @@ 236B2E492AA07D06003967A8 /* XPCreateLittleGameCollectionViewCell.m in Sources */, 2305EF042AD6B11700AD403C /* PIRoomPhotoAlbumChoosePhotoTypeView.m in Sources */, 2305EEF02AD677F200AD403C /* PIRoomPhotoAlbumVC.m in Sources */, - 54C9A1132C3D5A2300C6D970 /* XPGameOrdersListViewController.m in Sources */, 14B880E7299A4B62005FCA1B /* XPLoginPhoneViewController.m in Sources */, E824544626F5934700BE8163 /* XPMinePayPwdPresenter.m in Sources */, 189DD54B26DE338800AB55B1 /* BaseViewController.m in Sources */, @@ -12345,7 +12286,6 @@ E81A6546283519CA00F55894 /* MonentsTopicModel.m in Sources */, E86E79D028A4E0B2006DAF48 /* ContentRistAlertModel.m in Sources */, 9BFE0D922899042600F53C24 /* XPTaskCompleteTipView.m in Sources */, - 54C9A10D2C3D2FD300C6D970 /* XPMineDataGameMateTableViewCell.m in Sources */, 23B8D8DE2B860B8800CA472F /* PIHoemCategoryCollectionView.m in Sources */, 9BE01AE728938AB600B50299 /* XPDressUpShopCardTableViewCell.m in Sources */, E82E75062828E76400C25EF7 /* XPCoreDataManager.m in Sources */, @@ -12426,7 +12366,6 @@ E8998D852859B4FA00C68558 /* XPMineUserInfoGiftView.m in Sources */, 23FE47E72BB4378700F09D23 /* PINobleCenterListModel.m in Sources */, 186A536B26FC6F2E00D67B2C /* XPShareItemCell.m in Sources */, - 54C9A11C2C3D9EDD00C6D970 /* Api+GameOrder.m in Sources */, 237B94C02A984DA7007853E3 /* Api+RoomTrumpet.m in Sources */, 23E45C052AC2B0A200D88BCA /* SessionDiscoverNewTableViewCell.m in Sources */, 9B42869228C1AED4009034D2 /* XPReceiveRedPacketModel.m in Sources */, @@ -12473,7 +12412,6 @@ E81DCCD0282B63FD0039E5C5 /* XPMonentsRecommendViewController.m in Sources */, 9B7D804A2753783D003DAC0C /* SessionViewController.m in Sources */, E85E7BA92A4EC99300B6D00A /* XPMineConfirmGiveDiamondView.m in Sources */, - 54C9A1102C3D3E1700C6D970 /* XPMineGameMateOrderView.m in Sources */, E85E7BA72A4EC99300B6D00A /* XPMineGiveDiamondPasswordView.m in Sources */, 2331C1742A5EB71000E1D940 /* XPNobleCenterResidueView.m in Sources */, E80E2377299A47F60013FD40 /* AESUtils.m in Sources */, @@ -12506,7 +12444,6 @@ E852D74428633A08001465ED /* MonentsCommentModel.m in Sources */, 238B37C42AC55A2C00BFC9D5 /* XPTreasureFairyBallContentView.m in Sources */, E8C1CD6D27D8938C00376F83 /* XPRoomFaceTitleCollectionViewCell.m in Sources */, - 5458EC1F2C341C3F009D9757 /* FeedBackViewController.m in Sources */, E8C1CD7627D8AE3D00376F83 /* XPRoomFacePresenter.m in Sources */, E85E7B362A4EB0D300B6D00A /* XPClanRoomCollectionViewCell.m in Sources */, 18F4043A275E20D900A6C548 /* TRTCRtcImpl.m in Sources */, @@ -12636,7 +12573,6 @@ 23E9EB152A84D02400B792F2 /* XPMineUserInfoEditPickView.m in Sources */, 9BA812D628BF52E100783EA7 /* XPRoomSendRedPacketViewController.m in Sources */, E86E79D328A4E94E006DAF48 /* SessionRiskView.m in Sources */, - 5458EC232C352D9C009D9757 /* FeedBackConfigModel.m in Sources */, E85E7B1F2A4EB0D300B6D00A /* XPMineGuildIncomeStatisViewController.m in Sources */, E85E7B412A4EB0D300B6D00A /* XPMineGuildEmptyTableViewCell.m in Sources */, E8133916273E532D00708B66 /* XPGiftItemCollectionViewCell.m in Sources */, @@ -12920,7 +12856,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 20.20.28; + MARKETING_VERSION = 20.20.27; PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -12962,7 +12898,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 20.20.28; + MARKETING_VERSION = 20.20.27; PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/YuMi/Global/YUMIConstant.h b/YuMi/Global/YUMIConstant.h index a54893a9..575a2542 100644 --- a/YuMi/Global/YUMIConstant.h +++ b/YuMi/Global/YUMIConstant.h @@ -24,6 +24,7 @@ typedef NS_ENUM(NSUInteger, Pi_KeyType) { KeyType_TRTC,///TRTC key KeyType_NetEase,///云信的key keyType_YiDunBussinessId,///易盾的id + keyType_YiDunPhotoBussinessId,///易盾图片的id KeyType_FacePwdEncode, ///表情包解密key KeyType_SudGameAppID,///小游戏APPID KeyType_SudGameAppKey,///小游戏APPKey diff --git a/YuMi/Global/YUMIConstant.m b/YuMi/Global/YUMIConstant.m index 3b7b3382..7ec8f8db 100644 --- a/YuMi/Global/YUMIConstant.m +++ b/YuMi/Global/YUMIConstant.m @@ -67,7 +67,8 @@ NSString * const KeyWithType(Pi_KeyType type) { @(KeyType_Agora) : @"f8713b6ec98c4c01adaf34cb4fa091b1", @(KeyType_TRTC) : @"1400741885", @(KeyType_NetEase) : @"79bc37000f4018a2a24ea9dc6ca08d32", - @(keyType_YiDunBussinessId) : @"yinyouApnsDebug", +// @(keyType_YiDunBussinessId) : @"3611b99d0457202a7f69151288183236", +// @(keyType_YiDunPhotoBussinessId) : @"", @(KeyType_FacePwdEncode) : @"1ea53d260ecf11e7b56e00163e046a26", @(KeyType_SudGameAppID) : @"1578948593831571457", @(KeyType_SudGameAppKey) : @"J9lHOXvFWkAZiTfl4SK7IGt0wDnW3fWd", @@ -85,7 +86,8 @@ NSString * const KeyWithType(Pi_KeyType type) { @(KeyType_Agora) : @"3da88e33bc4f45019cc867ec51d7b465",///声网 @(KeyType_SudGameAppID) : @"1578948593831571457",///小游戏 @(KeyType_SudGameAppKey) : @"J9lHOXvFWkAZiTfl4SK7IGt0wDnW3fWd",///小游戏 - @(keyType_YiDunBussinessId) : @"f459972b432106844b89fd58c92b8061", +// @(keyType_YiDunBussinessId) : @"f459972b432106844b89fd58c92b8061", +// @(keyType_YiDunPhotoBussinessId) : @"", @(KeyType_TRTC) : @"1400823228",/// @(KeyType_NetEase) : @"7371d729710cd6ce3a50163b956b5eb6",/// @(KeyType_FacePwdEncode) : @"1ea53d260ecf11e7b56e00163e046a26",/// diff --git a/YuMi/Modules/YMMessage/View/NIMMessageMaker.m b/YuMi/Modules/YMMessage/View/NIMMessageMaker.m index b2497069..524aec37 100644 --- a/YuMi/Modules/YMMessage/View/NIMMessageMaker.m +++ b/YuMi/Modules/YMMessage/View/NIMMessageMaker.m @@ -48,6 +48,7 @@ NIMImageOption *option = [[NIMImageOption alloc] init]; option.compressQuality = 0.7; imageObject.option = option; + return [NIMMessageMaker generateImageMessage:imageObject]; } @@ -69,9 +70,16 @@ [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm"]; NSString *dateString = [dateFormatter stringFromDate:[NSDate date]]; imageObject.displayName = [NSString stringWithFormat:@"%@%@",YMLocalizedString(@"NIMMessageMaker3"), dateString]; + NIMMessage *message = [[NIMMessage alloc] init]; message.messageObject = imageObject; message.apnsContent = YMLocalizedString(@"NIMMessageMaker4"); + +// NIMAntiSpamOption *spamOption = [[NIMAntiSpamOption alloc] init]; +// spamOption.yidunEnabled = YES; +// spamOption.businessId = KeyWithType(keyType_YiDunBussinessId); +// message.antiSpamOption = spamOption; + [self setupMessage:message]; return message; } @@ -87,10 +95,10 @@ setting.apnsEnabled = YES; message.setting = setting; - NIMAntiSpamOption *option = [NIMAntiSpamOption new]; - option.yidunEnabled = YES; - option.businessId = KeyWithType(keyType_YiDunBussinessId); - message.antiSpamOption = option; +// NIMAntiSpamOption *option = [NIMAntiSpamOption new]; +// option.yidunEnabled = YES; +// option.businessId = KeyWithType(keyType_YiDunBussinessId); +// message.antiSpamOption = option; } diff --git a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageRiskAlertModel.m b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageRiskAlertModel.m index a50ad903..16395971 100644 --- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageRiskAlertModel.m +++ b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageRiskAlertModel.m @@ -27,15 +27,6 @@ } NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] initWithString:text attributes:[self messageTextAttibutes]]; - NSRange range = [text rangeOfString:YMLocalizedString(@"MessageRiskAlertModel0")]; - if ((range.location + range.length) <= text.length) { - [attribute addAttribute:NSForegroundColorAttributeName value:[DJDKMIMOMColor appEmphasizeColor] range:range]; - [attribute yy_setTextHighlightRange:range color:nil backgroundColor:nil tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { - XPWebViewController * webVC = [[XPWebViewController alloc] init]; - webVC.url = URLWithType(kNetworkRenovateURL); - [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:webVC animated:YES]; - }]; - } self.isHiddenAvatar = YES; self.attributedText = attribute; CGSize dstRect = CGSizeMake(CONTENT_WIDTH_MAX - MESSAGE_PADDING * 2, MAXFLOAT); diff --git a/YuMi/Modules/YMMessage/View/Session/MSSessionPublicChatHallVC.m b/YuMi/Modules/YMMessage/View/Session/MSSessionPublicChatHallVC.m index 2474d0ac..bc010b0a 100644 --- a/YuMi/Modules/YMMessage/View/Session/MSSessionPublicChatHallVC.m +++ b/YuMi/Modules/YMMessage/View/Session/MSSessionPublicChatHallVC.m @@ -111,25 +111,17 @@ [self initHeaderAndFooterRrfresh]; [IQKeyboardManager sharedManager].enable = NO; [IQKeyboardManager sharedManager].enableAutoToolbar = NO; - + [[NIMSDK sharedSDK].chatManager addDelegate:self]; - } - - - (void)initHeaderAndFooterRrfresh { [self initData]; } - - #pragma mark - 提前加载相册中的图片 - (void)loadAlbumPhotos { - [YYUtility checkAssetsLibrayAvailable:^{ - } denied:^{ - } restriction:^{ - }]; + [YYUtility checkAssetsLibrayAvailable:^{} denied:^{} restriction:^{}]; } #pragma mark - cell的样式 @@ -531,7 +523,7 @@ } - (nonnull UITableViewCell *)tableView:(nonnull UITableView *)tableView cellForRowAtIndexPath:(nonnull NSIndexPath *)indexPath { - + MessageBaseModel * message = [self.messages xpSafeObjectAtIndex:indexPath.row]; MessageHeadlinesTextModel * textModel = (MessageHeadlinesTextModel *)message; @@ -643,15 +635,34 @@ [self.messages addObject:model]; } } + if (message.yidunAntiSpamRes) { NSDictionary * spamRes = message.yidunAntiSpamRes.toJSONObject; - NSDictionary * spamResExt = ((NSString *)spamRes[@"ext"]).toJSONObject; - if ([spamResExt[@"antispam"][@"suggestion"] intValue] == 2) { - NSDictionary * dic = @{@"suggestion": @"2"}; - message.localExt = dic; - [[NIMSDK sharedSDK].conversationManager updateMessage:message forSession:self.session completion:nil]; + id spamResExt = ((NSString *)spamRes[@"ext"]).toJSONObject; + NSDictionary *antispamDic = nil; + if ([spamResExt isKindOfClass:[NSArray class]]) { + antispamDic = [spamResExt xpSafeObjectAtIndex:0]; + } else if ([spamResExt isKindOfClass:[NSDictionary class]]) { + antispamDic = spamResExt[@"antispam"]; + } + NSDictionary *realAntiDic = nil; + if ([[antispamDic allKeys] containsObject:@"antispam"]) { + realAntiDic = antispamDic[@"antispam"];; + } else { + realAntiDic = antispamDic; + } + if (realAntiDic) { + NSInteger suggestion = [realAntiDic[@"suggestion"] integerValue]; + if (suggestion == 2) { + NSDictionary * dic = @{@"suggestion": @"2"}; + message.localExt = dic; + [[NIMSDK sharedSDK].conversationManager updateMessage:message forSession:self.session completion:nil]; + + [self showErrorToast:YMLocalizedString(@"XPRoomViewController10")]; + } } } + [self.sessionTableView reloadData]; if(self.messages.count > 0){ NSIndexPath *ip = [NSIndexPath indexPathForRow:self.messages.count-1 inSection:0]; //取最后一行数据 @@ -695,14 +706,14 @@ #pragma mark - TZImagePickerControllerDelegate - (void)imagePickerController:(TZImagePickerController *)picker didFinishPickingPhotos:(NSArray *)photos sourceAssets:(NSArray *)assets isSelectOriginalPhoto:(BOOL)isSelectOriginalPhoto infos:(NSArray *)infos { + @kWeakify(self); [photos enumerateObjectsUsingBlock:^(UIImage * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { + @kStrongify(self); if (obj) { - NIMMessage * message = [NIMMessageMaker msgWithImage:obj]; - message.remoteExt = [self getRemoteExt]; - // 发送消息 - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:self.session error:nil]; - - + NIMMessage * message = [NIMMessageMaker msgWithImage:obj]; + message.remoteExt = [self getRemoteExt]; + // 发送消息 + [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:self.session error:nil]; } }]; } @@ -802,7 +813,7 @@ @kStrongify(self); [self showNotPhoto:YMLocalizedString(@"SessionViewController19") content:YMLocalizedString(@"SessionViewController12")]; }]; - + } - (void)inputBarView:(QInputBarView *)inputBarView onPhototButtonClick:(UIButton *)emotionSwitchButton { @@ -813,42 +824,42 @@ [TZImagePickerConfig sharedInstance].allowPickingImage = YES; dispatch_async(dispatch_get_global_queue(0, 0), ^{ [[TZImageManager manager] getCameraRollAlbumWithFetchAssets:NO completion:^(TZAlbumModel *model) { - [[TZImageManager manager] getAssetsFromFetchResult:model.result completion:^(NSArray *models) { - dispatch_async(dispatch_get_main_queue(), ^{ - NSMutableArray * array = [NSMutableArray array]; - if (models.count > 40) { - for (int i = 0; i < 40; i++) { - TZAssetModel * assets = [models objectAtIndex:i]; - QPhotoImageModel * infor = [[QPhotoImageModel alloc] init]; - infor.isOrigin = NO; - infor.assetInfo = assets; - [array addObject:infor]; - } - } else { - for (int i = 0; i < models.count; i++) { - TZAssetModel * assets = [models objectAtIndex:i]; - QPhotoImageModel * infor = [[QPhotoImageModel alloc] init]; - infor.isOrigin = NO; - infor.assetInfo = assets; - [array addObject:infor]; - } + [[TZImageManager manager] getAssetsFromFetchResult:model.result completion:^(NSArray *models) { + dispatch_async(dispatch_get_main_queue(), ^{ + NSMutableArray * array = [NSMutableArray array]; + if (models.count > 40) { + for (int i = 0; i < 40; i++) { + TZAssetModel * assets = [models objectAtIndex:i]; + QPhotoImageModel * infor = [[QPhotoImageModel alloc] init]; + infor.isOrigin = NO; + infor.assetInfo = assets; + [array addObject:infor]; } - self.phototArray = array; - if (self.phototArray.count > 0) { - self.photoView.photoList = self.phototArray; - [self.keyboardManager switchToPhotoBoardKeyboard]; - } else { - TZImagePickerController *imagePickerVc = [[TZImagePickerController alloc] initWithMaxImagesCount:1 delegate:self]; - imagePickerVc.modalPresentationStyle = UIModalPresentationOverFullScreen; - imagePickerVc.allowPickingVideo = NO; - imagePickerVc.allowTakeVideo = NO; - imagePickerVc.naviBgColor = [DJDKMIMOMColor appCellBackgroundColor]; - imagePickerVc.naviTitleColor = [DJDKMIMOMColor mainTextColor]; - imagePickerVc.barItemTextColor = [DJDKMIMOMColor mainTextColor]; - [self presentViewController:imagePickerVc animated:YES completion:nil]; + } else { + for (int i = 0; i < models.count; i++) { + TZAssetModel * assets = [models objectAtIndex:i]; + QPhotoImageModel * infor = [[QPhotoImageModel alloc] init]; + infor.isOrigin = NO; + infor.assetInfo = assets; + [array addObject:infor]; } - }); - }]; + } + self.phototArray = array; + if (self.phototArray.count > 0) { + self.photoView.photoList = self.phototArray; + [self.keyboardManager switchToPhotoBoardKeyboard]; + } else { + TZImagePickerController *imagePickerVc = [[TZImagePickerController alloc] initWithMaxImagesCount:1 delegate:self]; + imagePickerVc.modalPresentationStyle = UIModalPresentationOverFullScreen; + imagePickerVc.allowPickingVideo = NO; + imagePickerVc.allowTakeVideo = NO; + imagePickerVc.naviBgColor = [DJDKMIMOMColor appCellBackgroundColor]; + imagePickerVc.naviTitleColor = [DJDKMIMOMColor mainTextColor]; + imagePickerVc.barItemTextColor = [DJDKMIMOMColor mainTextColor]; + [self presentViewController:imagePickerVc animated:YES completion:nil]; + } + }); + }]; }]; }); } denied:^{ @@ -863,14 +874,14 @@ _inputBarView.inputTextView.text = @""; [_inputBarView textViewResignFirstResponder]; } - + } - (void)showNotPhoto:(NSString *)title content:(NSString *)content { TTAlertConfig *config = [[TTAlertConfig alloc] init]; config.title = title; config.message = content; - + [TTPopup alertWithConfig:config confirmHandler:^{ NSURL *url = [NSURL URLWithString:UIApplicationOpenSettingsURLString]; if ([[UIApplication sharedApplication] canOpenURL:url]) { @@ -912,7 +923,7 @@ emotionAtt.image = iconImage; emotionAtt.imageName = emotion.displayName; NSAttributedString *emotionAttribute = [NSMutableAttributedString attributedStringWithAttachment:(NSTextAttachment *)emotionAtt]; - + [_inputBarView insertEmotionAttributedString:emotionAttribute]; } @@ -929,7 +940,7 @@ [self sendTextMessage:[_inputBarView textViewInputNormalText]]; _inputBarView.inputTextView.text = @""; [_keyboardManager hideAllBoardView]; - + } /** @@ -961,9 +972,6 @@ [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:self.session error:nil]; [view resetChoosePhotos]; - - - } } @@ -987,12 +995,16 @@ if (picker.sourceType == UIImagePickerControllerSourceTypeCamera) { UIImageWriteToSavedPhotosAlbum(selectedPhoto, nil, nil, nil); } - NIMMessage * message = [NIMMessageMaker msgWithImage:selectedPhoto]; - message.remoteExt = [self getRemoteExt]; - // 发送消息 - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:self.session error:nil]; - +// NIMAntiSpamOption *option = [[NIMAntiSpamOption alloc]init]; +// option.yidunEnabled = YES; +// option.businessId = @"e9da8bd5c76da23d5e37f87e5ab1f5e9"; + + NIMMessage * message = [NIMMessageMaker msgWithImage:selectedPhoto]; + message.remoteExt = [self getRemoteExt]; +// message.antiSpamOption = option; + // 发送消息 + [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:self.session error:nil]; } [picker dismissViewControllerAnimated:YES completion:^{}]; } diff --git a/YuMi/Modules/YMMessage/View/Session/SessionViewController.m b/YuMi/Modules/YMMessage/View/Session/SessionViewController.m index 50979b16..9798fde5 100644 --- a/YuMi/Modules/YMMessage/View/Session/SessionViewController.m +++ b/YuMi/Modules/YMMessage/View/Session/SessionViewController.m @@ -700,15 +700,43 @@ [self.messages addObject:model]; } - if (message.yidunAntiSpamRes) { - NSDictionary * spamRes = message.yidunAntiSpamRes.toJSONObject; - NSDictionary * spamResExt = ((NSString *)spamRes[@"ext"]).toJSONObject; - if ([spamResExt[@"antispam"][@"suggestion"] intValue] == 2) { - NSDictionary * dic = @{@"suggestion": @"2"}; - message.localExt = dic; - [[NIMSDK sharedSDK].conversationManager updateMessage:message forSession:self.session completion:nil]; - } - } +// if (message.yidunAntiSpamRes) { +// NSDictionary * spamRes = message.yidunAntiSpamRes.toJSONObject; +// NSDictionary * spamResExt = ((NSString *)spamRes[@"ext"]).toJSONObject; +// if ([spamResExt[@"antispam"][@"suggestion"] intValue] == 2) { +// NSDictionary * dic = @{@"suggestion": @"2"}; +// message.localExt = dic; +// [[NIMSDK sharedSDK].conversationManager updateMessage:message forSession:self.session completion:nil]; +// } +// } + + if (message.yidunAntiSpamRes) { + NSDictionary * spamRes = message.yidunAntiSpamRes.toJSONObject; + id spamResExt = ((NSString *)spamRes[@"ext"]).toJSONObject; + NSDictionary *antispamDic = nil; + if ([spamResExt isKindOfClass:[NSArray class]]) { + antispamDic = [spamResExt xpSafeObjectAtIndex:0]; + } else if ([spamResExt isKindOfClass:[NSDictionary class]]) { + antispamDic = spamResExt[@"antispam"]; + } + NSDictionary *realAntiDic = nil; + if ([[antispamDic allKeys] containsObject:@"antispam"]) { + realAntiDic = antispamDic[@"antispam"];; + } else { + realAntiDic = antispamDic; + } + if (realAntiDic) { + NSInteger suggestion = [realAntiDic[@"suggestion"] integerValue]; + if (suggestion == 2) { + NSDictionary * dic = @{@"suggestion": @"2"}; + message.localExt = dic; + [[NIMSDK sharedSDK].conversationManager updateMessage:message forSession:self.session completion:nil]; + + [self showErrorToast:YMLocalizedString(@"XPRoomViewController10")]; + } + } + } + [self.sessionTableView reloadData]; [self.sessionTableView nim_scrollToBottom:YES]; } diff --git a/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomSendTextView.m b/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomSendTextView.m index 8a6bc8fb..66a8c6e8 100644 --- a/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomSendTextView.m +++ b/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomSendTextView.m @@ -117,13 +117,6 @@ [remoteExt setObject:nickStr forKey:@"atNames"]; } message.remoteExt = remoteExt; - - ///网易易盾 拦截高风险 - NIMAntiSpamOption *option = [[NIMAntiSpamOption alloc]init]; - option.yidunEnabled = YES; - option.businessId = KeyWithType(keyType_YiDunBussinessId); - option.content = [NSString stringWithFormat:@"{\"type\": 1, \"data\": \"天安门\"}"]; - message.antiSpamOption = option; NSString *publicChatRoomId = [NSString stringWithFormat:@"%@",[ClientConfig shareConfig].configInfo.publicChatRoomIdMap[userInfo.partitionId]]; NSString * sessionId = [self.delegate getPublicScreenType] == 0 ? [NSString stringWithFormat:@"%ld", [self.delegate getRoomInfo].roomId]:publicChatRoomId; //构造会话 diff --git a/YuMi/Modules/YMRoom/View/QuickMessageView/XPRoomQuickMessageContainView.m b/YuMi/Modules/YMRoom/View/QuickMessageView/XPRoomQuickMessageContainView.m index 38dc8ff3..374fcf18 100644 --- a/YuMi/Modules/YMRoom/View/QuickMessageView/XPRoomQuickMessageContainView.m +++ b/YuMi/Modules/YMRoom/View/QuickMessageView/XPRoomQuickMessageContainView.m @@ -131,10 +131,10 @@ message.remoteExt = remoteExt; ///网易易盾 拦截高风险 - NIMAntiSpamOption *option = [[NIMAntiSpamOption alloc]init]; - option.yidunEnabled = YES; - option.businessId = KeyWithType(keyType_YiDunBussinessId); - message.antiSpamOption = option; +// NIMAntiSpamOption *option = [[NIMAntiSpamOption alloc]init]; +// option.yidunEnabled = YES; +// option.businessId = KeyWithType(keyType_YiDunBussinessId); +// message.antiSpamOption = option; NSString * sessionId = [NSString stringWithFormat:@"%ld", [self.delegate getRoomInfo].roomId]; //构造会话 NIMSession *session = [NIMSession session:sessionId type:NIMSessionTypeChatroom]; diff --git a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameSendTextView.m b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameSendTextView.m index 9b90dc61..fed87244 100644 --- a/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameSendTextView.m +++ b/YuMi/Modules/YMRoom/View/RoomGame/View/SubView/MSRoomGameSendTextView.m @@ -73,17 +73,16 @@ extModel.fromSayHelloChannel = userInfo.fromSayHelloChannel; - NIMMessage * message = [[NIMMessage alloc] init]; message.text = self.inputMessage; NSMutableDictionary *remoteExt = [NSMutableDictionary dictionaryWithObject:extModel.model2dictionary forKey:[AccountInfoStorage instance].getUid]; message.remoteExt = remoteExt; ///网易易盾 拦截高风险 - NIMAntiSpamOption *option = [[NIMAntiSpamOption alloc]init]; - option.yidunEnabled = YES; - option.businessId = KeyWithType(keyType_YiDunBussinessId); - message.antiSpamOption = option; +// NIMAntiSpamOption *option = [[NIMAntiSpamOption alloc]init]; +// option.yidunEnabled = YES; +// option.businessId = KeyWithType(keyType_YiDunBussinessId); +// message.antiSpamOption = option; NSString * sessionId = self.roomId; //构造会话 self.sendButton.enabled = NO; diff --git a/YuMi/Modules/YMRoom/View/RoomHeaderView/RoomHeaderView.m b/YuMi/Modules/YMRoom/View/RoomHeaderView/RoomHeaderView.m index 3db851a7..feb37f30 100644 --- a/YuMi/Modules/YMRoom/View/RoomHeaderView/RoomHeaderView.m +++ b/YuMi/Modules/YMRoom/View/RoomHeaderView/RoomHeaderView.m @@ -252,7 +252,6 @@ } self.lockRoomImageView.hidden = roomInfo.roomPwd.length <= 0; } -// self.topicButton.hidden = roomInfo.type == RoomType_Anchor; } - (void)onRoomUpdate { @@ -267,8 +266,6 @@ self.collectButton.hidden = NO; // self.collectButton.selected = roomInfo.isRoomFans; 收藏后，房间数据没有及时更新 } - self.lockRoomImageView.hidden = roomInfo.roomPwd.length <= 0; - self.topicButton.hidden = roomInfo.type == RoomType_Anchor; } #pragma mark - Event Response - (void)showSharePanel { diff --git a/YuMi/Modules/YMTabbar/View/TabbarViewController.m b/YuMi/Modules/YMTabbar/View/TabbarViewController.m index 835d4831..3212b423 100644 --- a/YuMi/Modules/YMTabbar/View/TabbarViewController.m +++ b/YuMi/Modules/YMTabbar/View/TabbarViewController.m @@ -175,10 +175,12 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(showAnchorCardKey:) name:kTabShowAnchorCardKey object:nil]; [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(switchLanguage:) name:@"kSwitchLanguage" object:nil]; } + -(void)switchLanguage:(NSNotification *)not{ [self initTabs:YES]; self.selectedIndex = 4; } + - (void)viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; [self.navigationController setNavigationBarHidden:YES animated:YES]; @@ -186,7 +188,6 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey; if ([XPRoomMiniManager shareManager].getRoomInfo == nil) { [self.roomMineView hiddenRoomMiniView]; } - } - (void)viewWillDisappear:(BOOL)animated { diff --git a/YuMi/ar.lproj/Localizable.strings b/YuMi/ar.lproj/Localizable.strings index 4da44cfb..3d37b75b 100644 --- a/YuMi/ar.lproj/Localizable.strings +++ b/YuMi/ar.lproj/Localizable.strings @@ -2332,7 +2332,7 @@ ineHeadView12" = "الحمل"; "XPRoomViewController7" = "انتهى وقت البث لصاحب الغرفة"; "XPRoomViewController8" = "تم طردك من البث المباشر"; "XPRoomViewController9" = "تم حظرك من قبل المشرف"; -"XPRoomViewController10" = "قد تحتوي الرسالة على معلومات غير ملائمة، يرجى التوقف عن إرسال مثل هذه الرسائل!"; +"XPRoomViewController10" = "قد تحتوي الرسالة على معلومات غير قانونية، يرجى التوقف عن إرسال معلومات مماثلة مثل ذلك!"; "XPRoomViewController11" = "سوف تخرج من الغرفة وتفقد مكانك في قائمة الانتظار، هل أنت متأكد من الخروج؟"; "XPRoomViewController12" = "سوف تخرج من الغرفة وتفقد مكانك في قائمة الانتظار، هل أنت متأكد من الخروج؟"; "XPRoomViewController13" = "لقد وصلت إلى الأعلى~ سوف يتم إعادتك تلقائيًا إلى الغرفة الحالية"; diff --git a/YuMi/en.lproj/Localizable.strings b/YuMi/en.lproj/Localizable.strings index ca1e9635..5e43168c 100644 --- a/YuMi/en.lproj/Localizable.strings +++ b/YuMi/en.lproj/Localizable.strings @@ -2061,7 +2061,7 @@ "XPRoomViewController7" = "The host has gone offline"; "XPRoomViewController8" = "You have been kicked out of the live room by the administrator"; "XPRoomViewController9" = "You have been blacklisted by the administrator"; -"XPRoomViewController10" = "The message may contain inappropriate content. Please refrain from sending such messages!"; +"XPRoomViewController10" = "The message may contain illegal information, please stop sending similar information like that!"; "XPRoomViewController11" = "Exiting the room will also exit the current queue. You need to queue again when re-entering. Are you sure you want to exit the room?"; "XPRoomViewController12" = "Exiting the room will also exit the current queue. You need to queue again when re-entering. Are you sure you want to exit the room?"; "XPRoomViewController13" = "Reached the top~ Automatically return to the current room";