房间PK重新开始PK显示异常的问题

xplan-ios/Main/Room/View/MessageContainerView/Tool/XPRoomMessageParser.m

@@ -365,7 +365,7 @@
 			}else if (model.voteMode == RoomPKVoteModeType_NumberPerson){
 				pkType = @"送礼人数多的团队获胜";
 			}
-			NSString * title = [NSString stringWithFormat:@"管理员创建房间PK，本次PK时间为%.0f秒，%@", model.duration, pkType];
+			NSString * title = [NSString stringWithFormat:@"管理发起房间PK，本次PK时间为%.0f秒，%@", model.duration, pkType];
 			[attribute appendAttributedString:[self createTextAttribute:title color:[ThemeColor messageTextColor] font:kRoomMessageDefalutFont]];
 		}else if (attachment.second == Custom_Message_Sub_Room_PK_Start){
 			NSString * title = [NSString stringWithFormat:@"PK开始了，本次PK时间为%.0f秒，快给喜欢的选手投票吧", model.duration];

xplan-ios/Main/Room/View/RoomPK/Model/RoomPKDetailInfoModel.m

@@ -9,7 +9,4 @@
 
 @implementation RoomPKDetailInfoModel
 
-+ (NSDictionary *)objectClassInArray {
-	return @{@"teams":RoomPKTeamModel.class};
-}
 @end

xplan-ios/Main/Room/View/RoomPK/Model/RoomPKInfoModel.m

@@ -11,4 +11,6 @@
 + (NSDictionary *)objectClassInArray {
 	return @{@"teams":RoomPKTeamModel.class};
 }
+
+
 @end

xplan-ios/Main/Room/View/RoomPK/View/Cell/XPRoomPKRecordTableViewCell.m

@@ -35,8 +35,6 @@
 @property (nonatomic,strong) UILabel *pkTypeLabel;
 ///时间
 @property (nonatomic,strong) UILabel *dateLabel;
-///分割线
-@property (nonatomic,strong) UIView * lineView;
 @end
 
 @implementation XPRoomPKRecordTableViewCell
@@ -63,7 +61,6 @@
 	[self.contentView addSubview:self.winerButton];
 	[self.contentView addSubview:self.dateLabel];
 	[self.contentView addSubview:self.loseButton];
-	[self.contentView addSubview:self.lineView];
 }
 
 - (void)initSubViewConstraints {
@@ -119,11 +116,6 @@
 		make.width.height.centerY.mas_equalTo(self.winerButton);
 		make.centerX.mas_equalTo(self.loseUserView);
 	}];
-	
-	[self.lineView mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.left.right.bottom.mas_equalTo(self.contentView);
-		make.height.mas_equalTo(10);
-	}];
 }
 
 #pragma mark - Getters And Setters
@@ -168,8 +160,8 @@
 		}else if (_pkDetailInfo.result == RoomPKResultType_Blue){
 			winnerMemberViewColor = UIColorFromRGB(0xcccccc);
 			loseMemberViewColor = UIColorFromRGB(0x3B74FE);
-			winnerImage = [UIImage imageNamed:@"room_pk_record_winner"];
-			loseImage = [UIImage imageNamed:@"room_pk_record_lose"];
+			winnerImage = [UIImage imageNamed:@"room_pk_record_lose"];
+			loseImage = [UIImage imageNamed:@"room_pk_result_blue_victory_bg"];
 			winnerTitle = @"失败";
 			loseString = @"胜利";
 		}
@@ -185,9 +177,9 @@
 		self.loseUserView.backgroundColor = loseMemberViewColor;
 		
 		if (_pkDetailInfo.voteMode == RoomPKVoteModeType_GiftValue) {
-			self.pkTypeLabel.text =  @"按礼物价值PK";
+			self.pkTypeLabel.text =  @"按礼物价值";
 		}else{
-			self.pkTypeLabel.text = @"按送礼人数PK";
+			self.pkTypeLabel.text = @"按送礼人数";
 		}
 		
 		self.winerUserView.userList = redTeam.teamMembers;
@@ -273,17 +265,9 @@
 - (UIImageView *)vsImageView{
 	if (!_vsImageView) {
 		_vsImageView = [[UIImageView alloc] init];
-		_vsImageView.image = [UIImage imageNamed:@"roompk_vs"];
+		_vsImageView.image = [UIImage imageNamed:@"room_pk_vs_logo"];
 	}
 	return _vsImageView;
 }
 
-- (UIView *)lineView {
-	if (!_lineView) {
-		_lineView = [[UIView alloc] init];
-		_lineView.backgroundColor = [ThemeColor dividerColor];
-	}
-	return _lineView;
-}
-
 @end

xplan-ios/Main/Room/View/RoomPK/View/SubViews/XPRoomPKRecordNickView.m

@@ -100,17 +100,38 @@
 - (void)setUserList:(NSArray<RoomPKTeamUserModel *> *)userList {
 	_userList = userList;
 	if (_userList.count > 0) {
+		self.firstNickLabel.hidden = YES;
+		self.secondNickLabel.hidden = YES;
+		self.thirdNickLabel.hidden = YES;
+		self.fourthNickLabel.hidden = YES;
+		self.lineImageView.hidden = YES;
+		self.leftStackView.hidden = YES;
+		self.rightStackView.hidden = YES;
 		if (_userList.count == 1) {
-			self.lineImageView.hidden = YES;
-			self.rightStackView.hidden = YES;
-			self.thirdNickLabel.hidden = YES;
-			self.secondNickLabel.hidden = YES;
-			self.fourthNickLabel.hidden = YES;
+			self.firstNickLabel.hidden = NO;
+			self.leftStackView.hidden = NO;
 		} else if(_userList.count ==2) {
-			self.thirdNickLabel.hidden = YES;
-			self.fourthNickLabel.hidden = YES;
+			self.firstNickLabel.hidden = NO;
+			self.leftStackView.hidden = NO;
+			self.rightStackView.hidden = NO;
+			self.secondNickLabel.hidden = NO;
+			self.lineImageView.hidden = NO;
 		} else if(_userList.count == 3) {
-			self.fourthNickLabel.hidden = YES;
+			self.firstNickLabel.hidden = NO;
+			self.leftStackView.hidden = NO;
+			self.rightStackView.hidden = NO;
+			self.secondNickLabel.hidden = NO;
+			self.thirdNickLabel.hidden = NO;
+			self.lineImageView.hidden = NO;
+		} else {
+			self.firstNickLabel.hidden = NO;
+			self.secondNickLabel.hidden = NO;
+			self.thirdNickLabel.hidden = NO;
+			self.fourthNickLabel.hidden = NO;
+			self.lineImageView.hidden = NO;
+			self.leftStackView.hidden = NO;
+			self.rightStackView.hidden = NO;
+			self.lineImageView.hidden = NO;
 		}
 		for (int i = 0; i < _userList.count; i++) {
 			RoomPKTeamUserModel * userInfo = [_userList objectAtIndex:i];

xplan-ios/Main/Room/View/RoomPK/View/XPRoomPKPlayingView.h

@@ -8,7 +8,7 @@
 #import <UIKit/UIKit.h>
 
 NS_ASSUME_NONNULL_BEGIN
-@class RoomPKDetailInfoModel, RoomPKChooseUserModel, XPRoomPKPlayingView;
+@class RoomPKInfoModel, RoomPKChooseUserModel, XPRoomPKPlayingView;
 @protocol XPRoomPKPlayingViewDelegate <NSObject>
 
 ///点击了重新开始PK
@@ -22,7 +22,7 @@ NS_ASSUME_NONNULL_BEGIN
 ///是否是管理员
 @property (nonatomic,assign) BOOL isManager;
 ///PK详情
-@property (nonatomic,strong) RoomPKDetailInfoModel *pkDetailInfo;
+@property (nonatomic,strong) RoomPKInfoModel *pkDetailInfo;
 ///红色的
 @property (nonatomic,strong) NSArray<RoomPKChooseUserModel *> *redChooseArray;
 ///蓝色的

xplan-ios/Main/Room/View/RoomPK/View/XPRoomPKPlayingView.m

@@ -204,10 +204,10 @@
 	self.beginButton.hidden = !_isManager;
 }
 
-- (void)setPkDetailInfo:(RoomPKDetailInfoModel *)pkDetailInfo {
+- (void)setPkDetailInfo:(RoomPKInfoModel *)pkDetailInfo {
 	_pkDetailInfo = pkDetailInfo;
 	if (_pkDetailInfo) {
-		self.voteModeLabel.text = _pkDetailInfo.roomPK.voteMode == RoomPKVoteModeType_GiftValue ? @"按礼物价值" : @"按送礼人数";
+		self.voteModeLabel.text = _pkDetailInfo.voteMode == RoomPKVoteModeType_GiftValue ? @"按礼物价值" : @"按送礼人数";
 	}
 }
 

xplan-ios/Main/Room/View/RoomPK/View/XPRoomPKProgressView.h

@@ -8,10 +8,9 @@
 #import <UIKit/UIKit.h>
 
 NS_ASSUME_NONNULL_BEGIN
-@class RoomPKDetailInfoModel, MicroQueueModel, AttachmentModel, RoomInfoModel, RoomPKChooseUserModel;
+@class MicroQueueModel, AttachmentModel, RoomInfoModel, RoomPKChooseUserModel;
 @interface XPRoomPKProgressView : UIView
 @property (nonatomic, strong) NSMutableDictionary<NSString *, MicroQueueModel *> *micQueue;
-@property (nonatomic,strong) RoomPKDetailInfoModel *pkDetailInfo;
 ///房间信息
 @property (nonatomic,strong) RoomInfoModel *roomInfo;
 ///是否是管理员

xplan-ios/Main/Room/View/RoomPK/View/XPRoomPKProgressView.m

@@ -82,6 +82,8 @@
 @property (nonatomic,strong) NSArray<RoomPKChooseUserModel *> *blueChooseArray;
 ///是否收到了Pk的结果
 @property (nonatomic,assign) BOOL isReceivePKResult;
+///pk详情
+@property (nonatomic,strong) RoomPKInfoModel *roomPKInfo;
 @end
 
 
@@ -105,17 +107,17 @@
 	if (attachment.second == Custom_Message_Sub_Room_PK_Start) {
 		[XCHUDTool showSuccessWithMessage:@"开始PK成功"];
 		RoomPKInfoModel * pkInfo = [RoomPKInfoModel modelWithDictionary:attachment.data];
-		self.pkDetailInfo.roomPK = pkInfo;
+		self.roomPKInfo = pkInfo;
 		self.beginButton.hidden = YES;
 		[self startRoomPKCountDown:pkInfo.duration];
 		[self handleRoomPKInfoChangeState];
 	}else if (attachment.second == Custom_Message_Sub_Room_PK_Mode_Open){
 		RoomPKInfoModel * pkInfo = [RoomPKInfoModel modelWithDictionary:attachment.data];
-		self.pkDetailInfo.roomPK = pkInfo;
+		self.roomPKInfo = pkInfo;
 		[self handleRoomPKInfoChangeState];
 	} else if(attachment.second == Custom_Message_Sub_Room_PK_Re_Start) {
 		RoomPKInfoModel * pkInfo = [RoomPKInfoModel modelWithDictionary:attachment.data];
-		self.pkDetailInfo.roomPK = pkInfo;
+		self.roomPKInfo = pkInfo;
 		[self handleRoomPKInfoChangeState];
 	} else if(attachment.second == Custom_Message_Sub_Room_PK_Result) {
 		[TTPopup dismiss];
@@ -125,11 +127,11 @@
 		[self clearRoomPKTeamData];
 		self.checkResultNum = 1;
 		if (pkInfo.pkStatus == RoomPKStatusType_ReStart) {///重新开始了 需要重新赋值
-			self.pkDetailInfo.roomPK = pkInfo;
+			self.roomPKInfo = pkInfo;
 		} else {
-			if ([pkInfo.pkId isEqualToString:self.pkDetailInfo.roomPK.pkId]) {
+			if ([pkInfo.pkId isEqualToString:self.roomPKInfo.pkId]) {
 				[self clearRoomPKTeamData];
-				self.pkDetailInfo.roomPK = pkInfo;
+				self.roomPKInfo = pkInfo;
 				[self resetRoomPKGroupType];
 				
 			}
@@ -149,7 +151,7 @@
 }
 
 - (void)roomPKReceiveGift:(AttachmentModel *)attachment {
-	if (self.pkDetailInfo.roomPK.pkStatus == RoomPKStatusType_Playing) {
+	if (self.roomPKInfo.pkStatus == RoomPKStatusType_Playing) {
 		GiftReceiveInfoModel *giftReceiveInfo = [GiftReceiveInfoModel modelWithJSON:attachment.data];
 		GiftInfoModel *giftInfo = giftReceiveInfo.gift == nil ? giftReceiveInfo.giftInfo : giftReceiveInfo.gift;
 		if (giftInfo == nil) {
@@ -157,7 +159,7 @@
 		}
 		if (attachment.first == CustomMessageType_AllMicroSend) {
 			if (attachment.second == Custom_Message_Sub_AllBatchSend || attachment.second == Custom_Message_Sub_AllMicroSend) {///普通礼物
-				if (self.pkDetailInfo.roomPK.voteMode == RoomPKVoteModeType_NumberPerson) { // 按送礼人数计算
+				if (self.roomPKInfo.voteMode == RoomPKVoteModeType_NumberPerson) { // 按送礼人数计算
 					NSArray *targetUids = [giftReceiveInfo.targetUsers valueForKeyPath:@"uid"];
 					[self canculeRoomPKSendGiftNumPerson:targetUids];
 				} else {
@@ -170,7 +172,7 @@
 						GiftInfoModel *giftInfo = [[XPGiftStorage shareStorage] findGiftInfo:[NSString stringWithFormat:@"%ld", giftListInfo.giftId]];
 						goldPrice += giftInfo.goldPrice * giftListInfo.giftNum;
 					}];
-					if (self.pkDetailInfo.roomPK.voteMode == RoomPKVoteModeType_NumberPerson) { // 按送礼人数计算
+					if (self.roomPKInfo.voteMode == RoomPKVoteModeType_NumberPerson) { // 按送礼人数计算
 						NSArray *targetUids = @[giftReceiveInfo.targetUid];
 						[self canculeRoomPKSendGiftNumPerson:targetUids];
 					} else {
@@ -185,14 +187,14 @@
 					GiftInfoModel *giftInfo = [[XPGiftStorage shareStorage] findGiftInfo:[NSString stringWithFormat:@"%ld", giftListInfo.giftId]];
 					goldPrice += giftInfo.goldPrice * giftListInfo.giftNum;
 				}];
-				if (self.pkDetailInfo.roomPK.voteMode == RoomPKVoteModeType_NumberPerson) { // 按送礼人数计算
+				if (self.roomPKInfo.voteMode == RoomPKVoteModeType_NumberPerson) { // 按送礼人数计算
 					NSArray *targetUids = @[[NSString stringWithFormat:@"%ld", giftReceiveInfo.luckyGiftList.user.uid]];
 					[self canculeRoomPKSendGiftNumPerson:targetUids];
 				} else {
 					[self canculeRoomGiftValueReceiveInfo:giftReceiveInfo giftPrice:goldPrice giftNumber:giftReceiveInfo.giftNum];
 				}
 			} else {
-				if (self.pkDetailInfo.roomPK.voteMode == RoomPKVoteModeType_NumberPerson) { // 按送礼人数计算
+				if (self.roomPKInfo.voteMode == RoomPKVoteModeType_NumberPerson) { // 按送礼人数计算
 					NSArray *targetUids = @[giftReceiveInfo.targetUid];
 					[self canculeRoomPKSendGiftNumPerson:targetUids];
 				} else {
@@ -209,18 +211,18 @@
 	[Api getRoomPKDetail:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
 		if (code == 200) {
 			RoomPKDetailInfoModel * pkDetailInfo = [RoomPKDetailInfoModel modelWithDictionary:data.data];
-			self.pkDetailInfo = pkDetailInfo;
+			self.roomPKInfo = pkDetailInfo.roomPK;
 			[self handleRoomPKInfoChangeState];
-			if (pkDetailInfo.roomPK.pkStatus == RoomPKStatusType_Playing) {
-				[self startRoomPKCountDown:(pkDetailInfo.roomPK.endTime - pkDetailInfo.now) / 1000];
+			if (self.roomPKInfo.pkStatus == RoomPKStatusType_Playing) {
+				[self startRoomPKCountDown:(self.roomPKInfo.endTime - pkDetailInfo.now) / 1000];
 			}
 			NSMutableDictionary * queue = self.micQueue;
 			///配置一下麦序的信息
 			NSMutableArray * redArray = [NSMutableArray array];
 			NSMutableArray * blueArray = [NSMutableArray array];
-			if (pkDetailInfo.roomPK.pkStatus == RoomPKStatusType_Playing) {
-				for (int i = 0; i < pkDetailInfo.roomPK.teams.count; i++) {
-					RoomPKTeamModel * teamInfo = [pkDetailInfo.roomPK.teams objectAtIndex:i];
+			if (self.roomPKInfo.pkStatus == RoomPKStatusType_Playing) {
+				for (int i = 0; i < self.roomPKInfo.teams.count; i++) {
+					RoomPKTeamModel * teamInfo = [self.roomPKInfo.teams objectAtIndex:i];
 					if (teamInfo.team == GroupType_Red) {
 						self.redTeamScore = teamInfo.score;
 						for (int i = 0; i < teamInfo.teamMembers.count; i++) {
@@ -369,8 +371,8 @@
 		if (!self.isReceivePKResult) {
 			NSString * uid = [AccountInfoStorage instance].getUid;
 			NSString * roomUid = [NSString stringWithFormat:@"%ld", self.roomInfo.uid];
-			if (self.pkDetailInfo.roomPK.pkId.length > 0) {
-				NSString * pkId = self.pkDetailInfo.roomPK.pkId;
+			if (self.roomPKInfo.pkId.length > 0) {
+				NSString * pkId = self.roomPKInfo.pkId;
 				[Api checkRoomPKResult:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
 					if (code == 200) {
 						self.checkResultNum = 1;
@@ -574,8 +576,8 @@
 }
 
 - (void)handleRoomPKInfoChangeState {
-	if (self.pkDetailInfo) {
-		switch (_pkDetailInfo.roomPK.pkStatus) {
+	if (self.roomPKInfo) {
+		switch (_roomPKInfo.pkStatus) {
 			case RoomPKStatusType_End:
 				self.beginButton.hidden = self.isManager ? NO : YES;
 				break;
@@ -583,7 +585,7 @@
 			{
 				[TTPopup dismiss];
 				self.beginButton.hidden = YES;
-				self.roomPKPlayingView.pkDetailInfo = self.pkDetailInfo;
+				self.roomPKPlayingView.pkDetailInfo = self.roomPKInfo;
 				self.roomPKPlayingView.redChooseArray = self.redChooseArray;
 				self.roomPKPlayingView.blueChooseArray = self.blueChooseArray;
 				[self.roomPKPlayingView configRedTeamScore:self.redTeamScore blueTeamScore:self.blueTeamScore];
@@ -663,8 +665,8 @@
 #pragma mark - XPRoomPKPanelUserViewDelegate
 - (void)xPRoomPKPanelUserView:(XPRoomPKPanelUserView *)view didClickAddButton:(GroupType)type {
 	[TTPopup dismiss];
-	if (self.pkDetailInfo.roomPK.pkStatus == RoomPKStatusType_Playing) {
-		self.roomPKPlayingView.pkDetailInfo = self.pkDetailInfo;
+	if (self.roomPKInfo.pkStatus == RoomPKStatusType_Playing) {
+		self.roomPKPlayingView.pkDetailInfo = self.roomPKInfo;
 		self.roomPKPlayingView.redChooseArray = self.redChooseArray;
 		self.roomPKPlayingView.blueChooseArray = self.blueChooseArray;
 		[self.roomPKPlayingView configRedTeamScore:self.redTeamScore blueTeamScore:self.blueTeamScore];
@@ -755,20 +757,20 @@
 - (void)xPRoomPKPlayingView:(XPRoomPKPlayingView *)view didClickResetBegin:(UIButton *)sender {
 	[TTPopup dismiss];
 	[TTPopup alertWithMessage:@"重新开始将会提前结束本次PK\n确认重新开始吗?" confirmHandler:^{
-		RoomPKInfoModel * roompkInfo = self.pkDetailInfo.roomPK;
+		RoomPKInfoModel * roompkInfo = self.roomPKInfo;
 		NSString * roomUid = [NSString stringWithFormat:@"%ld", self.roomInfo.uid];
 		[Api createRoomPK:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
 			if (code == 200) {
 				RoomPKInfoModel * newRoomPKInfo = [RoomPKInfoModel modelWithDictionary:data.data];
-				self.pkDetailInfo.roomPK = newRoomPKInfo;
+				self.roomPKInfo = newRoomPKInfo;
 			} else {
 				[XCHUDTool showErrorWithMessage:msg];
 			}
 		} pkMode:[NSString stringWithFormat:@"%ld", roompkInfo.pkMode] voteMode:[NSString stringWithFormat:@"%ld", roompkInfo.voteMode] duration:[NSString stringWithFormat:@"%0.f", roompkInfo.duration] roomUid:roomUid operUid:[AccountInfoStorage instance].getUid];
 	} cancelHandler:^{
 		dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-			if (self.pkDetailInfo.roomPK.pkStatus == RoomPKStatusType_Playing) {
-				self.roomPKPlayingView.pkDetailInfo = self.pkDetailInfo;
+			if (self.roomPKInfo.pkStatus == RoomPKStatusType_Playing) {
+				self.roomPKPlayingView.pkDetailInfo = self.roomPKInfo;
 				self.roomPKPlayingView.redChooseArray = self.redChooseArray;
 				self.roomPKPlayingView.blueChooseArray = self.blueChooseArray;
 				[self.roomPKPlayingView configRedTeamScore:self.redTeamScore blueTeamScore:self.blueTeamScore];
@@ -780,11 +782,11 @@
 
 #pragma mark - Event Response
 - (void)beginButtonAction:(UIButton *)sender {
-	if (self.pkDetailInfo) {
-		RoomPKInfoModel * roompkInfo = self.pkDetailInfo.roomPK;
+	if (self.roomPKInfo != nil) {
+		RoomPKInfoModel * roompkInfo = self.roomPKInfo;
 		NSString * roomUid = [NSString stringWithFormat:@"%ld", self.roomInfo.uid];
 		if (self.redChooseArray.count > 0 && self.blueChooseArray.count > 0) {
-			if (self.pkDetailInfo.roomPK.pkStatus == RoomPKStatusType_End || self.pkDetailInfo.roomPK.pkStatus == RoomPKStatusType_ReStart) {
+			if (self.roomPKInfo.pkStatus == RoomPKStatusType_End || self.roomPKInfo.pkStatus == RoomPKStatusType_ReStart) {
 				[TTPopup alertWithMessage:@"是否再次开始PK?" confirmHandler:^{
 					[Api createRoomPK:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
 						if (code == 200) {
@@ -794,7 +796,7 @@
 							[Api begainRoomPK:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
 								if (code == 200) {
 									RoomPKDetailInfoModel * detailPKInfo = [RoomPKDetailInfoModel modelWithDictionary:data.data];
-									self.pkDetailInfo = detailPKInfo;
+									self.roomPKInfo = detailPKInfo.roomPK;
 								} else {
 									[XCHUDTool showErrorWithMessage:msg];
 								}
@@ -806,20 +808,20 @@
 				} cancelHandler:^{
 					
 				}];
-			} else if(self.pkDetailInfo.roomPK.pkStatus == RoomPKStatusType_Playing) {
+			} else if(self.roomPKInfo.pkStatus == RoomPKStatusType_Playing) {
 				[self didTapBackImageRecognizer];
-			} else if(self.pkDetailInfo.roomPK.pkStatus == RoomPKStatusType_NonStart) {
+			} else if(self.roomPKInfo.pkStatus == RoomPKStatusType_NonStart) {
 				[TTPopup alertWithMessage:@"当前正在准备阶段，是否确认准备开始PK?" confirmHandler:^{
 					NSString * teamJsonStr = [self roomPKTeamJsonString];
 					///开始PK
 					[Api begainRoomPK:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
 						if (code == 200) {
-							RoomPKDetailInfoModel * detailPKInfo = [RoomPKDetailInfoModel modelWithDictionary:data.data];
-							self.pkDetailInfo = detailPKInfo;
+							RoomPKInfoModel * roomPKInfo = [RoomPKInfoModel modelWithDictionary:data.data];
+							self.roomPKInfo = roomPKInfo;
 						} else {
 							[XCHUDTool showErrorWithMessage:msg];
 						}
-					} roomUid:roomUid pkId:self.pkDetailInfo.roomPK.pkId joinUsers:teamJsonStr];
+					} roomUid:roomUid pkId:self.roomPKInfo.pkId joinUsers:teamJsonStr];
 				} cancelHandler:^{
 					
 				}];
@@ -834,9 +836,9 @@
 }
 
 - (void)didTapBackImageRecognizer {
-	if (self.pkDetailInfo.roomPK.pkStatus == RoomPKStatusType_Playing) {
+	if (self.roomPKInfo.pkStatus == RoomPKStatusType_Playing) {
 		[TTPopup dismiss];
-		self.roomPKPlayingView.pkDetailInfo = self.pkDetailInfo;
+		self.roomPKPlayingView.pkDetailInfo = self.roomPKInfo;
 		self.roomPKPlayingView.redChooseArray = self.redChooseArray;
 		self.roomPKPlayingView.blueChooseArray = self.blueChooseArray;
 		[self.roomPKPlayingView configRedTeamScore:self.redTeamScore blueTeamScore:self.blueTeamScore];
@@ -847,7 +849,7 @@
 #pragma mark - Getters And Setters
 - (void)setMicQueue:(NSMutableDictionary<NSString *,MicroQueueModel *> *)micQueue {
 	_micQueue = micQueue;
-	if (self.pkDetailInfo.roomPK.pkStatus != RoomPKStatusType_Playing) {
+	if (self.roomPKInfo.pkStatus != RoomPKStatusType_Playing) {
 		NSMutableArray * redArray = [NSMutableArray array];
 		NSMutableArray * blueArray = [NSMutableArray array];
 		for (int i = 0 ; i < _micQueue.allValues.count; i++) {
@@ -1023,5 +1025,19 @@
 	return _roomPKPlayingView;
 }
 
+- (NSMutableSet *)redTeamGiftPersonDic {
+	if (!_redTeamGiftPersonDic) {
+		_redTeamGiftPersonDic = [NSMutableSet set];
+	}
+	return _redTeamGiftPersonDic;
+}
+
+- (NSMutableSet *)blueTeamGiftPersonDic {
+	if (!_blueTeamGiftPersonDic) {
+		_blueTeamGiftPersonDic = [NSMutableSet set];
+	}
+	return _blueTeamGiftPersonDic;
+}
+
 
 @end

xplan-ios/Main/Room/View/RoomPK/View/XPRoomPKRecordViewController.m

@@ -95,7 +95,7 @@
 
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
 	if (self.datasource.count > 0) {
-		return 180;
+		return 170;
 	}
 	return (KScreenHeight - kNavigationHeight);
 }