diff --git a/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomFunctionContainerView.m b/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomFunctionContainerView.m index caa6e084..c5e0a8b8 100644 --- a/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomFunctionContainerView.m +++ b/xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomFunctionContainerView.m @@ -585,7 +585,7 @@ } roomUid:roomUid]; } if (roomInfo.showPkBeginTime && roomInfo.roomModeType != RoomModeType_Open_AcrossRoomPK_mode) {//显示PK倒计时 - [self handleAcrollPKCountView]; + [self handleAcrollPKCountView:roomInfo.pkBeginTime]; } [self updateRoomTopic]; [self showLittleGameMiniView:roomInfo.type micCount:roomInfo.mgMicNum]; @@ -1644,35 +1644,21 @@ if ([self.delegate getRoomInfo].roomModeType == RoomModeType_Open_AcrossRoomPK_mode) { return; } - [self handleAcrollPKCountView]; + [self handleAcrollPKCountView:time]; } -- (void)handleAcrollPKCountView { +- (void)handleAcrollPKCountView:(long long)time { RoomInfoModel * roomInfo = self.delegate.getRoomInfo; - if (roomInfo.hasOpenWishGift) { - if (!self.acrossPKCountView.superview) { - [self addSubview:self.acrossPKCountView]; - [self bringSubviewToFront:self.acrossPKCountView]; - self.acrossPKCountView.startTime = roomInfo.pkBeginTime; - self.acrossPKCountView.backImageView.image = [UIImage imageNamed:@"acrossPK_countDown_left_bg"]; - [self.acrossPKCountView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kNavigationHeight+4+24+4); - make.left.mas_equalTo(0); - make.width.height.mas_equalTo(52); - }]; - } - } else { - if (!self.acrossPKCountView.superview) { - [self addSubview:self.acrossPKCountView]; - [self bringSubviewToFront:self.acrossPKCountView]; - self.acrossPKCountView.startTime = roomInfo.pkBeginTime; - self.acrossPKCountView.backImageView.image = [UIImage imageNamed:@"acrossPK_countDown_bg"]; - [self.acrossPKCountView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kNavigationHeight+4+24+4); - make.left.mas_equalTo(KScreenWidth-52); - make.width.height.mas_equalTo(52); - }]; - } + if (!self.acrossPKCountView.superview) { + [self addSubview:self.acrossPKCountView]; + [self bringSubviewToFront:self.acrossPKCountView]; + self.acrossPKCountView.startTime = time ? time : roomInfo.pkBeginTime; + self.acrossPKCountView.backImageView.image = [UIImage imageNamed:@"acrossPK_countDown_left_bg"]; + [self.acrossPKCountView mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.mas_equalTo(kNavigationHeight+4+24+4); + make.left.mas_equalTo(0); + make.width.height.mas_equalTo(52); + }]; } }