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

房间内PK选择Pk的人

Browse Source
This commit is contained in:
fengshuo
2022-03-29 21:45:17 +08:00
parent 2f00ee7f78
commit 94ce5d4db1
19 changed files with 678 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomFunctionContainerView.m
View File

@@ -41,6 +41,7 @@
#import "XPAnchorFansTaskModel.h"
#import "AcrossRoomPKPanelModel.h"
#import "RoomPKDetailInfoModel.h"
#import "RoomPKChooseUserModel.h"
///View
#import "XPRoomHalfWebView.h"
#import "XPAnchorAudienceUpMicView.h"
@@ -339,14 +340,24 @@
if (micModel.userInfo && micModel.userInfo.uid > 0) {
UserInfoModel * userInfo = micModel.userInfo;
if (userInfo.groupType == GroupTyp_Red) {
[redArray addObject:userInfo];
RoomPKChooseUserModel * redInfo = [[RoomPKChooseUserModel alloc] init];
redInfo.userUrl = userInfo.avatar;
redInfo.uid = [NSString stringWithFormat:@"%ld", userInfo.uid];
redInfo.groupType = userInfo.groupType;
redInfo.position = micModel.microState.position;
[redArray addObject:redInfo];
} else if(userInfo.groupType == GroupType_Blue) {
[blueArray addObject:userInfo];
RoomPKChooseUserModel * blueInfo = [[RoomPKChooseUserModel alloc] init];
blueInfo.userUrl = userInfo.avatar;
blueInfo.uid = [NSString stringWithFormat:@"%ld", userInfo.uid];
blueInfo.groupType = userInfo.groupType;
blueInfo.position = micModel.microState.position;
[blueArray addObject:blueInfo];
}
}
}
self.roompkPanelView.redUserArray = redArray;
self.roompkPanelView.blueUserArray = blueArray;
self.roompkPanelView.redChooseArray = redArray.copy;
self.roompkPanelView.blueChooseArray = blueArray.copy;
}
} else {
[XCHUDTool showErrorWithMessage:msg];
@@ -503,6 +514,38 @@
AttachmentModel *attachment = (AttachmentModel *)obj.attachment;
if (attachment.first == CustomMessageType_AnchorRoom_AudienceUpMic) {
[self showAskForUpMic:attachment.data];
} else if(attachment.first == CustomMessageType_Room_PK) {
if (attachment.second == Custom_Message_Sub_Room_PK_Start) {
RoomPKInfoModel * pkInfo = [RoomPKInfoModel modelWithDictionary:attachment.data];
self.pkDetailInfo.roomPK = pkInfo;
[self.roompkPanelView startRoomPKCountDown:pkInfo.duration];
if (pkInfo.pkStatus == RoomPKStatusType_Playing) {
//TODO: 弹框显示Pk
}
}else if (attachment.second == Custom_Message_Sub_Room_PK_Mode_Open){
RoomPKInfoModel * pkInfo = [RoomPKInfoModel modelWithDictionary:attachment.data];
self.pkDetailInfo.roomPK = pkInfo;
} else if(attachment.second == Custom_Message_Sub_Room_PK_Re_Start) {
RoomPKInfoModel * pkInfo = [RoomPKInfoModel modelWithDictionary:attachment.data];
self.pkDetailInfo.roomPK = pkInfo;
} else if(attachment.second == Custom_Message_Sub_Room_PK_Result) {
RoomPKInfoModel * pkInfo = [RoomPKInfoModel modelWithDictionary:attachment.data];
self.roompkPanelView.isReceivePKResult = YES;
[self.roompkPanelView stopRoomPKCountDown];
if (pkInfo.pkStatus == RoomPKStatusType_ReStart) {///重新开始了 需要重新赋值
self.pkDetailInfo.roomPK = pkInfo;
} else {
if (pkInfo.pkId == self.pkDetailInfo.roomPK.pkId) {
self.pkDetailInfo.roomPK = pkInfo;
//TODO: 更新自己的麦序结果
}
}
} else if(attachment.second == Custom_Message_Sub_Room_PK_Mode_Close) {
[self.roompkPanelView stopRoomPKCountDown];
[self.roompkPanelView clearRoomPKTeamData];
[self.roompkPanelView removeFromSuperview];
//TODO: 更新自己的麦序
}
} else if (attachment.first == CustomMessageType_Across_Room_PK) {
///自己是公会超管
BOOL meIsSuperAdmin = NO;
@@ -789,14 +832,24 @@
if (micModel.userInfo && micModel.userInfo.uid > 0) {
UserInfoModel * userInfo = micModel.userInfo;
if (userInfo.groupType == GroupTyp_Red) {
[redArray addObject:userInfo];
RoomPKChooseUserModel * redInfo = [[RoomPKChooseUserModel alloc] init];
redInfo.userUrl = userInfo.avatar;
redInfo.uid = [NSString stringWithFormat:@"%ld", userInfo.uid];
redInfo.groupType = userInfo.groupType;
redInfo.position = micModel.microState.position;
[redArray addObject:redInfo];
} else if(userInfo.groupType == GroupType_Blue) {
[blueArray addObject:userInfo];
RoomPKChooseUserModel * blueInfo = [[RoomPKChooseUserModel alloc] init];
blueInfo.userUrl = userInfo.avatar;
blueInfo.uid = [NSString stringWithFormat:@"%ld", userInfo.uid];
blueInfo.groupType = userInfo.groupType;
blueInfo.position = micModel.microState.position;
[blueArray addObject:blueInfo];
}
}
}
self.roompkPanelView.redUserArray = redArray;
self.roompkPanelView.blueUserArray = blueArray;
self.roompkPanelView.redChooseArray = redArray.copy;
self.roompkPanelView.blueChooseArray = blueArray.copy;
}
} else {
[self getRoomPKDetailInfo];