From c670d7be6d6667e10ee5957da36bf0cef5e1e3cd Mon Sep 17 00:00:00 2001 From: liyuhua <15626451870@163.com> Date: Wed, 3 Jan 2024 18:18:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Model/XPMessageRemoteExtModel.h | 1 + .../View/SendGiftView/View/XPGiftUsersView.m | 1 - .../Setting/View/XPRoomOnLineViewController.m | 15 ++++++++------- .../View/UserCard/View/XPUserCardViewController.h | 7 +++++++ .../View/UserCard/View/XPUserCardViewController.m | 6 ++++++ 5 files changed, 22 insertions(+), 8 deletions(-) diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageRemoteExtModel.h b/YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageRemoteExtModel.h index 0b84ce33..8da637a3 100644 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageRemoteExtModel.h +++ b/YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageRemoteExtModel.h @@ -36,6 +36,7 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic,copy) NSString *fromNick; @property (nonatomic,assign) UserEnterRoomFromType fromType; @property (nonatomic,copy) NSString *fromUid; +@property(nonatomic,copy) NSString *uid; ///名牌的 @property (nonatomic,copy) NSString *inRoomNameplatePic; ///铭牌的字 diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftUsersView.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftUsersView.m index 5126252c..9dfa1620 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftUsersView.m +++ b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftUsersView.m @@ -203,7 +203,6 @@ if(![userList containsObject:selectUid]){ [userList addObject:selectUid]; } - } } return userList; diff --git a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomOnLineViewController.m b/YuMi/Modules/YMRoom/View/Setting/View/XPRoomOnLineViewController.m index e4f2ff75..32af0981 100644 --- a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomOnLineViewController.m +++ b/YuMi/Modules/YMRoom/View/Setting/View/XPRoomOnLineViewController.m @@ -29,7 +29,7 @@ #import "XPUserCardViewController.h" #import "XPRoomSettingPresenter.h" #import "XPRoomSettingProtocol.h" -@interface XPRoomOnLineViewController () +@interface XPRoomOnLineViewController () ///导航栏 @property (nonatomic,strong) UIView * navView; ///返回按钮 @@ -202,16 +202,13 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { [tableView deselectRowAtIndexPath:indexPath animated:YES]; - [self.navigationController popViewControllerAnimated:YES]; if (self.datasource.count > 0) { - NIMChatroomMember * member = [self.datasource safeObjectAtIndex1:indexPath.row]; - NSDictionary * extDic = [member.roomExt toJSONObject]; - XPMessageRemoteExtModel * userInfo = [XPMessageRemoteExtModel modelWithDictionary:[extDic objectForKey:member.userId]]; + XPMessageRemoteExtModel * userInfo = [self.datasource safeObjectAtIndex1:indexPath.row]; if (userInfo.enterHide) { return; } RoomInfoModel * roomInfo = self.hostDelegate.getRoomInfo; - NSString * targetUid = member.userId; + NSString * targetUid = userInfo.uid; XPUserCardInfoModel * model = [[XPUserCardInfoModel alloc] init]; [[self.hostDelegate.getMicroQueue allValues] enumerateObjectsUsingBlock:^(MicroQueueModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { if (targetUid.integerValue == obj.userInfo.uid) { @@ -229,11 +226,15 @@ model.micQueue = self.hostDelegate.getMicroQueue; model.hideSendGiftItem = YES; XPUserCardViewController * userCardVC = [[XPUserCardViewController alloc] initWithUser:model]; + userCardVC.delegate = self; [self.navigationController presentViewController:userCardVC animated:YES completion:nil]; } } - +#pragma mark- XPUserCardViewControllerDelegate +-(void)clickChatAction{ + [self.navigationController popViewControllerAnimated:YES]; +} #pragma mark - Event Response - (void)backButtonAction:(UIButton *)sender { [self.navigationController popViewControllerAnimated:YES]; diff --git a/YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.h b/YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.h index 400b9045..c37aede0 100644 --- a/YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.h +++ b/YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.h @@ -10,7 +10,14 @@ #import "XPUserCardInfoModel.h" NS_ASSUME_NONNULL_BEGIN +@protocol XPUserCardViewControllerDelegate + +-(void)clickChatAction; + +@end + @interface XPUserCardViewController : MvpViewController +@property(nonatomic,weak) iddelegate; - (instancetype)initWithUser:(XPUserCardInfoModel *)cardInfo; @end diff --git a/YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.m b/YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.m index ebcbf909..4c328193 100644 --- a/YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.m +++ b/YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.m @@ -781,6 +781,9 @@ case UserCardItemType_Chat: { [StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventroom_mike_click eventAttributes:@{@"actionType" : @"chat"}]; + if(self.delegate && [self.delegate respondsToSelector:@selector(clickChatAction)]){ + [self.delegate clickChatAction]; + } [self dismissViewControllerAnimated:YES completion:^{ UIViewController * controller = (UIViewController *)self.cardInfo.delegate; XPRoomHalfMessageView *halfMessageView = [[XPRoomHalfMessageView alloc] initWithFrame:CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight) controller:controller]; @@ -970,6 +973,9 @@ break; case UserCardItemType_AtUser: { + if(self.delegate && [self.delegate respondsToSelector:@selector(clickChatAction)]){ + [self.delegate clickChatAction]; + } [StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventroom_mike_click eventAttributes:@{@"actionType" : @"atUser"}]; if (self.cardInfo.roomInfo.isCloseScreen) { [self showErrorToast:YMLocalizedString(@"XPUserCardViewController16")];