From c4d0b1c33c7694a2a1263afa3d810a85240f8cdb Mon Sep 17 00:00:00 2001 From: eggmanQQQ <3671373519@qq.com> Date: Tue, 18 Jun 2024 13:54:54 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=B5=8B=E8=AF=95=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AcrossRoomPK/View/XPAcrossRoomPKViewController.m | 4 ++-- .../View/AnchorPK/View/XPAnchorPKViewController.m | 4 ++-- .../XPRoomFunctionContainerView.m | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/XPAcrossRoomPKViewController.m b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/XPAcrossRoomPKViewController.m index df80e623..f952854c 100644 --- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/XPAcrossRoomPKViewController.m +++ b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/XPAcrossRoomPKViewController.m @@ -241,7 +241,7 @@ } - (void)updateDoneButtonState { - if (self.selectRoomInfo && self.pkDuration >= 0 && self.pkDuration <= 180) { + if (self.selectRoomInfo && self.pkDuration >= 5 && self.pkDuration <= 180) { self.doneButton.enabled = YES; } else { self.doneButton.enabled = NO; @@ -294,7 +294,7 @@ if (count > 180) { [self showErrorToast:YMLocalizedString(@"XPAcrossRoomPKViewController2")]; } - else if(count < -5) { + else if(count < 5) { [self showErrorToast:YMLocalizedString(@"XPAcrossRoomPKViewController3")]; } self.pkDuration = textField.text.integerValue; diff --git a/YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKViewController.m b/YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKViewController.m index 8322c71a..c46c1cb3 100644 --- a/YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKViewController.m +++ b/YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKViewController.m @@ -229,7 +229,7 @@ } - (void)updateDoneButtonState { - if (self.selectRoomInfo && self.pkDuration >= 0 && self.pkDuration <= 30) { + if (self.selectRoomInfo && self.pkDuration >= 5 && self.pkDuration <= 30) { self.doneButton.enabled = YES; } else { self.doneButton.enabled = NO; @@ -286,7 +286,7 @@ [self showErrorToast:YMLocalizedString(@"XPAnchorPKViewController2")]; textField.text = @"30"; } - else if(count < -5) { + else if(count < 5) { [self showErrorToast:YMLocalizedString(@"XPAnchorPKViewController3")]; } self.pkDuration = textField.text.integerValue; diff --git a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomFunctionContainerView.m b/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomFunctionContainerView.m index 31c35d3c..00153b82 100644 --- a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomFunctionContainerView.m +++ b/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomFunctionContainerView.m @@ -815,15 +815,15 @@ if (attachment.data[@"amicStatus"] != nil){ model.aMicStatus = [attachment.data[@"amicStatus"] intValue]; } -// if (model.isForce) { + if (model.isForce) { XPAcrossRoomPKForceEndResultView *view = [[XPAcrossRoomPKForceEndResultView alloc] initWithFrame:CGRectMake(0, 0, 290, 211)]; view.data = model; [TTPopup popupView:view style:TTPopupStyleAlert]; -// } else { -// XPAcrossRoomPKResultView *view = [[XPAcrossRoomPKResultView alloc] initWithFrame:CGRectMake(0, 0, 310, 363)]; -// view.data = model; -// [TTPopup popupView:view style:TTPopupStyleAlert]; -// } + } else { + XPAcrossRoomPKResultView *view = [[XPAcrossRoomPKResultView alloc] initWithFrame:CGRectMake(0, 0, 310, 363)]; + view.data = model; + [TTPopup popupView:view style:TTPopupStyleAlert]; + } } break; ///个播跨房PK