moliparty/peko-ios
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
liyuhua
2024-01-03 18:18:42 +08:00
parent 10a1e6e09e
commit c670d7be6d
5 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageRemoteExtModel.h
View File

@@ -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;
///铭牌的字

1
YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftUsersView.m
View File

@@ -203,7 +203,6 @@
if(![userList containsObject:selectUid]){
[userList addObject:selectUid];
}
}
}
return userList;

15
YuMi/Modules/YMRoom/View/Setting/View/XPRoomOnLineViewController.m
View File

@@ -29,7 +29,7 @@
#import "XPUserCardViewController.h"
#import "XPRoomSettingPresenter.h"
#import "XPRoomSettingProtocol.h"
@interface XPRoomOnLineViewController ()<UITableViewDelegate, UITableViewDataSource, NIMChatManagerDelegate,XPRoomSettingProtocol>
@interface XPRoomOnLineViewController ()<XPUserCardViewControllerDelegate,UITableViewDelegate, UITableViewDataSource, NIMChatManagerDelegate,XPRoomSettingProtocol>
///导航栏
@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];

7
YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.h
View File

@@ -10,7 +10,14 @@
#import "XPUserCardInfoModel.h"
NS_ASSUME_NONNULL_BEGIN
@protocol XPUserCardViewControllerDelegate <NSObject>
-(void)clickChatAction;
@end
@interface XPUserCardViewController : MvpViewController
@property(nonatomic,weak) id<XPUserCardViewControllerDelegate>delegate;
- (instancetype)initWithUser:(XPUserCardInfoModel *)cardInfo;
@end

6
YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.m
View File

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