yinmeng/yinmeng-ios
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复了平台超管进房没有公屏

Browse Source
This commit is contained in:
fengshuo
2022-09-26 18:58:18 +08:00
parent b18505756d
commit 49e849802c
5 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
xplan-ios/Main/Room/Presenter/XPRoomPresenter.m
View File

@@ -83,6 +83,7 @@
extModel.enterRoomEffects = userInfo.userVipInfoVO.enterRoomEffects; extModel.enterRoomEffects = userInfo.userVipInfoVO.enterRoomEffects;
extModel.gender = userInfo.gender; extModel.gender = userInfo.gender;
extModel.fromSayHelloChannel = userInfo.fromSayHelloChannel; extModel.fromSayHelloChannel = userInfo.fromSayHelloChannel;
extModel.platformRole = userInfo.platformRole;
NSMutableDictionary *ext = [NSMutableDictionary dictionaryWithObject:extModel.model2dictionary forKey:[NSString stringWithFormat:@"%ld", userInfo.uid]]; NSMutableDictionary *ext = [NSMutableDictionary dictionaryWithObject:extModel.model2dictionary forKey:[NSString stringWithFormat:@"%ld", userInfo.uid]];
request.roomExt = [ext toJSONString]; request.roomExt = [ext toJSONString];

2
xplan-ios/Main/Room/View/MessageContainerView/Model/XPMessageRemoteExtModel.h
View File

@@ -52,6 +52,8 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, assign) GenderType gender; @property (nonatomic, assign) GenderType gender;
///是否符合渠道打招呼 ///是否符合渠道打招呼
@property (nonatomic,assign) BOOL fromSayHelloChannel; @property (nonatomic,assign) BOOL fromSayHelloChannel;
/// 0 普通 1超管
@property (nonatomic,assign) NSInteger platformRole;
@end @end
NS_ASSUME_NONNULL_END NS_ASSUME_NONNULL_END

2
xplan-ios/Main/Room/View/MessageContainerView/XPRoomMessageContainerView.m
View File

@@ -273,7 +273,7 @@ NSString * const kRoomShowTopicKey = @"kRoomShowTopicKey";
NIMMessageChatroomExtension * messageExt = (NIMMessageChatroomExtension *)message.messageExt; NIMMessageChatroomExtension * messageExt = (NIMMessageChatroomExtension *)message.messageExt;
NSDictionary * dic = [(NSDictionary *)messageExt.roomExt.toJSONObject objectForKey:message.from]; NSDictionary * dic = [(NSDictionary *)messageExt.roomExt.toJSONObject objectForKey:message.from];
XPMessageRemoteExtModel * extModel = [XPMessageRemoteExtModel modelWithJSON:dic]; XPMessageRemoteExtModel * extModel = [XPMessageRemoteExtModel modelWithJSON:dic];
return extModel.enterHide; return (extModel.enterHide || extModel.platformRole == 1);
} }
#pragma mark - 添加数据并且做自动滚动 #pragma mark - 添加数据并且做自动滚动

12
xplan-ios/Main/Room/View/Setting/View/XPRoomOnLineViewController.m
View File

@@ -159,6 +159,7 @@
[[self loadChatRoomTmpMemberList] subscribeNext:^(id _Nullable x) { [[self loadChatRoomTmpMemberList] subscribeNext:^(id _Nullable x) {
NSArray * tmpList = x; NSArray * tmpList = x;
[self.datasource addObjectsFromArray:tmpList]; [self.datasource addObjectsFromArray:tmpList];
[self.tableView reloadData]; [self.tableView reloadData];
self.refreshing = NO; self.refreshing = NO;
@@ -242,7 +243,16 @@
} }
NSMutableArray * array = [NSMutableArray array]; NSMutableArray * array = [NSMutableArray array];
[members enumerateObjectsUsingBlock:^(NIMChatroomMember * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { [members enumerateObjectsUsingBlock:^(NIMChatroomMember * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
if (obj.isOnline && !obj.isInBlackList) { BOOL isSuperAmind = NO;
if (obj.roomExt.length > 0) {
NSData *jsonData = [obj.roomExt dataUsingEncoding:NSUTF8StringEncoding];
NSError *error;
NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:jsonData options:NSJSONReadingMutableContainers error:&error];
XPMessageRemoteExtModel * model = [XPMessageRemoteExtModel modelWithDictionary:[dic objectForKey:obj.userId]];
isSuperAmind = model.platformRole == 1;
}
if (obj.isOnline && !obj.isInBlackList && !isSuperAmind) {
[array addObject:obj]; [array addObject:obj];
} }
}]; }];

2
xplan-ios/Main/Room/View/XPRoomViewController.m
View File

@@ -1095,7 +1095,7 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出
} }
break; break;
case NIMChatroomEventTypeEnter: case NIMChatroomEventTypeEnter:
if (content.source.userId.integerValue != [AccountInfoStorage instance].getUid.integerValue) { if (content.source.userId.integerValue != [AccountInfoStorage instance].getUid.integerValue && self.userInfo.platformRole != 1) {
onLineNumber += 1; onLineNumber += 1;
}else {///如果是自己的话 如果有坐骑的话 }else {///如果是自己的话 如果有坐骑的话
[self userEnterRoomSuccess]; [self userEnterRoomSuccess];