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

上麦的扩展字段改为number类型

Browse Source
This commit is contained in:
chenguilong
2022-05-12 21:13:51 +08:00
parent 653e86d271
commit a38ca04da9
4 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
xplan-ios/Main/Room/View/AnchorView/XPAnchorAudienceUpMicView.m
View File

@@ -111,8 +111,8 @@
[self dismiss];
if (!member) return;
NSMutableDictionary * dic = [NSMutableDictionary dictionary];
[dic setValue:position forKey:@"micPosition"];
[dic setValue:member.userId forKey:@"uid"];
[dic setValue:@(position.integerValue) forKey:@"micPosition"];
[dic setValue:@(member.userId.integerValue) forKey:@"uid"];
AttachmentModel *attachement = [[AttachmentModel alloc]init];
attachement.first = CustomMessageType_Queue;
attachement.second = Custom_Message_Sub_Queue_Invite;

4
xplan-ios/Main/Room/View/ArrangeMic/View/XPArrangeMicViewController.m
View File

@@ -479,8 +479,8 @@
NSString * uid = userInfo.uid;
if (position.length > 0 && uid.length > 0) {
NSMutableDictionary * dic = [NSMutableDictionary dictionary];
[dic setValue:position forKey:@"micPosition"];
[dic setValue:uid forKey:@"uid"];
[dic setValue:@(position.integerValue) forKey:@"micPosition"];
[dic setValue:@(uid.integerValue) forKey:@"uid"];
AttachmentModel *attachement = [[AttachmentModel alloc]init];
attachement.first = CustomMessageType_Queue;
attachement.second = Custom_Message_Sub_Queue_Invite;

4
xplan-ios/Main/Room/View/Setting/View/XPRoomInviteUserViewController.m
View File

@@ -320,8 +320,8 @@
} uid:member.userId];
} else {
NSMutableDictionary * dic = [NSMutableDictionary dictionary];
[dic setValue:self.position forKey:@"micPosition"];
[dic setValue:member.userId forKey:@"uid"];
[dic setValue:@(self.position.integerValue) forKey:@"micPosition"];
[dic setValue:@(member.userId.integerValue) forKey:@"uid"];
AttachmentModel *attachement = [[AttachmentModel alloc]init];
attachement.first = CustomMessageType_Queue;
attachement.second = Custom_Message_Sub_Queue_Invite;

9
xplan-ios/Main/Room/View/XPMiniRoomView.m
View File

@@ -29,6 +29,7 @@
#import "AttachmentModel.h"
#import "ArrangeMicModel.h"
#import "RoomFaceSendInfoModel.h"
#import "MicroInviteExtModel.h"
///View
#import "XPRoomViewController.h"
#import "XPNoteView.h"
@@ -427,11 +428,9 @@
- (void)handleNIMCustomMessage:(AttachmentModel *)attachment {
if(attachment.first == CustomMessageType_Queue && attachment.second == Custom_Message_Sub_Queue_Invite) {
NSDictionary *dic = attachment.data;
NSString *uid = dic[@"uid"];
if (uid.integerValue == self.userInfo.uid) {
NSNumber *micPosition = dic[@"micPosition"];
NSString *position = micPosition.stringValue;
MicroInviteExtModel *inviteModel = [MicroInviteExtModel modelWithDictionary:dic];
if (inviteModel.uid.integerValue == self.userInfo.uid) {
NSString *position = inviteModel.micPosition;
MicroQueueModel *micro = [self.micQueue objectForKey:position];
if (!micro || micro.userInfo) return; // 当前麦位有人，什么都不做。