From a2083617d92961a816f673a12e30aab6f26faa2b Mon Sep 17 00:00:00 2001 From: liyuhua <15626451870@163.com> Date: Fri, 27 Oct 2023 18:28:50 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../XPRoomActivityContainerView.m | 65 ++++++++----------- .../PIReceiveRedPacketSuccessView.m | 4 +- .../SendRedPacket/PIRoomEnterRedPacketView.m | 42 ++---------- .../SendRedPacket/PIRoomSendRedPacketVC.m | 7 ++ .../SendRedPacket/XPReceiveRedPacketView.m | 22 +++---- .../YMRoom/View/XPRoomViewController.m | 5 +- 6 files changed, 56 insertions(+), 89 deletions(-) diff --git a/YuMi/Modules/YMRoom/View/ActivityContainerView/XPRoomActivityContainerView.m b/YuMi/Modules/YMRoom/View/ActivityContainerView/XPRoomActivityContainerView.m index acbbb4e3..f8ca915f 100644 --- a/YuMi/Modules/YMRoom/View/ActivityContainerView/XPRoomActivityContainerView.m +++ b/YuMi/Modules/YMRoom/View/ActivityContainerView/XPRoomActivityContainerView.m @@ -100,35 +100,18 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView; -(void)openRedPacketResult:(NSNotification *)not{ XPRedPacketResultModel *resultModel = not.object; self.redPacketView.redPacketModel.result = [resultModel mj_JSONObject]; -// [Api getRedPacket:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { -// self.redPacketView.userInteractionEnabled = YES; -// if(code == 200){ -// XPRedPacketModel *redModel = [XPRedPacketModel modelWithJSON:data.data]; -// redModel.timestamp = data.timestamp; -// redModel.sendUserNick = data.data[@"nick"]; -// redModel.sendUserAvatar = data.data[@"avatar"]; -// redModel.redEnvelopePosition = data.data[@"position"]; -// [self.redPacketList replaceObjectAtIndex:[self.redPacketList indexOfObject:self.redPacketView.redPacketModel] withObject:redModel]; -// self.redPacketView.redPacketModel = redModel; -// if(redModel.state == 2 || redModel.state == 6){ -// [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPRoomActivityContainerView3")]; -// self.redPacketView.hidden = YES; -// return; -// } -// if(self.openRedPacketHandle){ -// self.openRedPacketHandle(self.redPacketView.redPacketModel); -// } -// } -// } redEnvelopeId:self.redPacketView.redPacketModel.redEnvelopeId]; -// -// [self.redPacketList removeObject:self.self.redPacketView.redPacketModel]; -// if(self.redPacketList.count == 0){ -// self.redPacketView.hidden = YES; -// return; -// } -// self.redPacketView.redPacketModel = self.redPacketList.firstObject; -// self.redPacketView.hidden = NO; -// self.redPacketView.pi_redNum = @(self.redPacketList.count).stringValue; + if(resultModel.redEnvelopeVO.pickNum.integerValue == resultModel.redEnvelopeVO.totalNum.integerValue){ + [self.redPacketList removeObject:self.self.redPacketView.redPacketModel]; + if(self.redPacketList.count == 0){ + self.redPacketView.hidden = YES; + return; + } + self.redPacketView.redPacketModel = self.redPacketList.firstObject; + self.redPacketView.hidden = NO; + self.redPacketView.pi_redNum = @(self.redPacketList.count).stringValue; + } + + } - (void)initSubViewConstraints { [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) { @@ -523,17 +506,23 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView; } return; } - - [self.redPacketList replaceObjectAtIndex:[self.redPacketList indexOfObject:self.redPacketView.redPacketModel] withObject:redModel]; - NSInteger count = 0; - for (XPRedPacketModel *obj in self.redPacketList) { - if(obj.state != 3 || obj.state != 4){ - count = count + 1; + XPRedPacketResultModel *resultModel = [XPRedPacketResultModel modelWithDictionary:redModel.result]; + if(redModel.state == 3 || redModel.state == 4){ + if(resultModel.redEnvelopeVO.pickNum.integerValue == resultModel.redEnvelopeVO.totalNum.integerValue){ + [self.redPacketList removeObject:self.self.redPacketView.redPacketModel]; + if(self.redPacketList.count == 0){ + self.redPacketView.hidden = YES; + [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPRoomActivityContainerView3")]; + return; + } + self.redPacketView.redPacketModel = self.redPacketList.firstObject; + self.redPacketView.hidden = NO; + self.redPacketView.pi_redNum = @(self.redPacketList.count).stringValue; } - } - self.redPacketView.pi_redNum = @(count).stringValue; + return; + } + [self.redPacketList replaceObjectAtIndex:[self.redPacketList indexOfObject:self.redPacketView.redPacketModel] withObject:redModel]; self.redPacketView.redPacketModel = redModel; - if(self.openRedPacketHandle){ self.openRedPacketHandle(self.redPacketView.redPacketModel); } diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/PIReceiveRedPacketSuccessView.m b/YuMi/Modules/YMRoom/View/SendRedPacket/PIReceiveRedPacketSuccessView.m index 1b79a051..5f61aa38 100644 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/PIReceiveRedPacketSuccessView.m +++ b/YuMi/Modules/YMRoom/View/SendRedPacket/PIReceiveRedPacketSuccessView.m @@ -98,12 +98,12 @@ [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(self.sendWishLabel.mas_bottom).mas_offset(kGetScaleWidth(8)); make.width.mas_equalTo(kGetScaleWidth(223)); - make.height.mas_equalTo(kGetScaleWidth(180)); + make.height.mas_equalTo(kGetScaleWidth(160)); make.centerX.equalTo(self.bgImageView); }]; [self.openSituationLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.trailing.mas_equalTo(-kGetScaleWidth(60)); - make.bottom.mas_equalTo(-kGetScaleWidth(32)); + make.bottom.mas_equalTo(-kGetScaleWidth(54)); make.height.mas_equalTo(kGetScaleWidth(14)); }]; } diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomEnterRedPacketView.m b/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomEnterRedPacketView.m index 5d952d4a..64475a33 100644 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomEnterRedPacketView.m +++ b/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomEnterRedPacketView.m @@ -70,15 +70,12 @@ self.countDownView.hidden = YES; self.robBtn.hidden = YES; if(_redPacketModel.kind == RedPacketConditionsType_NO){ - if(_redPacketModel.validityType == 1){ NSInteger time = [self getTimeDifferenceWithTimestamp:_redPacketModel.timestamp / 1000 beginTime:_redPacketModel.beginTime / 1000]; if(time > 0){ self.countDownView.hidden = NO; [self.countDownHelper openCountdownWithTime:(int)time]; - }else{ - self.robBtn.hidden = NO; } }else{ @@ -87,57 +84,30 @@ } }else if(_redPacketModel.kind == RedPacketConditionsType_Followd){ - NSInteger time = [self getTimeDifferenceWithTimestamp:_redPacketModel.timestamp / 1000 beginTime:_redPacketModel.beginTime / 1000]; if(time > 0){ - if(_redPacketModel.finish == 1){ - self.countDownView.hidden = NO; - - [self.countDownHelper openCountdownWithTime:(int)time]; - }else{ - - self.robBtn.hidden = NO; - } + self.countDownView.hidden = NO; + [self.countDownHelper openCountdownWithTime:(int)time]; }else{ - self.robBtn.hidden = NO; - } }else if(_redPacketModel.kind == RedPacketConditionsType_Share){ - - NSInteger time = [self getTimeDifferenceWithTimestamp:_redPacketModel.timestamp / 1000 beginTime:_redPacketModel.beginTime / 1000]; if(time > 0){ - if(_redPacketModel.finish == 1){ - self.countDownView.hidden = NO; - - [self.countDownHelper openCountdownWithTime:(int)time]; - }else{ - - self.robBtn.hidden = NO; - } + self.countDownView.hidden = NO; + [self.countDownHelper openCountdownWithTime:(int)time]; }else{ - self.robBtn.hidden = NO; - } }else if(_redPacketModel.kind == RedPacketConditionsType_Scrolling){ NSInteger time = [self getTimeDifferenceWithTimestamp:_redPacketModel.timestamp / 1000 beginTime:_redPacketModel.beginTime / 1000]; if(time > 0){ - if(_redPacketModel.finish == 1){ - self.countDownView.hidden = NO; - - [self.countDownHelper openCountdownWithTime:(int)time]; - }else{ - - self.robBtn.hidden = NO; - } + self.countDownView.hidden = NO; + [self.countDownHelper openCountdownWithTime:(int)time]; }else{ - self.robBtn.hidden = NO; - } } } diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketVC.m b/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketVC.m index c7358311..dd1d9335 100644 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketVC.m +++ b/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketVC.m @@ -16,6 +16,7 @@ #import "RoomInfoModel.h" #import "XPIAPRechargeViewController.h" #import "XCCurrentVCStackManager.h" +#import "XPRoomHalfWebView.h" @interface PIRoomSendRedPacketVC () ///host代理 @property (nonatomic,weak) idhostDelegate; @@ -203,6 +204,12 @@ return [gestureRecognizer isKindOfClass:[UIPanGestureRecognizer class]] && [otherGestureRecognizer isKindOfClass:[UIPanGestureRecognizer class]]; } -(void)tipsAction{ + + XPRoomHalfWebView * webView = [[XPRoomHalfWebView alloc] init]; + webView.url = URLWithType(kRedPacketRuleURL); + TTPopupService * config = [[TTPopupService alloc] init]; + config.contentView = webView; + [TTPopup popupWithConfig:config]; } -(void)hiddenViewAction{ diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/XPReceiveRedPacketView.m b/YuMi/Modules/YMRoom/View/SendRedPacket/XPReceiveRedPacketView.m index 2c4830ab..2ac7452e 100644 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/XPReceiveRedPacketView.m +++ b/YuMi/Modules/YMRoom/View/SendRedPacket/XPReceiveRedPacketView.m @@ -315,13 +315,13 @@ }else if(self.receiveModel.kind == RedPacketConditionsType_Followd){ if(self.isCountDownEnd == NO && self.receiveModel.finish == 0){ [self removeFromSuperview]; - [[NSNotificationCenter defaultCenter]postNotificationName:@"kOpenRedPacketNotification" object:nil userInfo:@{@"type":@(RedPacketConditionsType_Followd),@"uid":self.receiveModel.userId ?: @"",@"roomUid":self.receiveModel.roomUId ?: @""}]; + [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPReceiveRedPacketView18")]; return; }else if(self.isCountDownEnd == YES && self.receiveModel.finish == 0){ - [self removeFromSuperview]; - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPReceiveRedPacketView18")]; + [self removeFromSuperview]; + [[NSNotificationCenter defaultCenter]postNotificationName:@"kOpenRedPacketNotification" object:nil userInfo:@{@"type":@(RedPacketConditionsType_Followd),@"uid":self.receiveModel.userId ?: @"",@"roomUid":self.receiveModel.roomUId ?: @""}]; return; }else if(self.isCountDownEnd == NO && self.receiveModel.finish == 1){ return; @@ -330,13 +330,13 @@ }else if(self.receiveModel.kind == RedPacketConditionsType_Share){ if(self.isCountDownEnd == NO && self.receiveModel.finish == 0){ [self removeFromSuperview]; - - [[NSNotificationCenter defaultCenter]postNotificationName:@"kOpenRedPacketNotification" object:nil userInfo:@{@"type":@(RedPacketConditionsType_Share),@"uid":self.receiveModel.userId ?: @"",@"roomUid":self.receiveModel.roomUId ?: @""}]; + [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPReceiveRedPacketView18")]; return; }else if(self.isCountDownEnd == YES && self.receiveModel.finish == 0){ - [self removeFromSuperview]; - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPReceiveRedPacketView18")]; + [self removeFromSuperview]; + + [[NSNotificationCenter defaultCenter]postNotificationName:@"kOpenRedPacketNotification" object:nil userInfo:@{@"type":@(RedPacketConditionsType_Share),@"uid":self.receiveModel.userId ?: @"",@"roomUid":self.receiveModel.roomUId ?: @""}]; return; }else if(self.isCountDownEnd == NO && self.receiveModel.finish == 1){ @@ -345,13 +345,13 @@ }else if(self.receiveModel.kind == RedPacketConditionsType_Scrolling){ if(self.isCountDownEnd == NO && self.receiveModel.finish == 0){ [self removeFromSuperview]; - [[NSNotificationCenter defaultCenter]postNotificationName:@"kOpenRedPacketNotification" object:nil userInfo:@{@"type":@(RedPacketConditionsType_Scrolling),@"uid":self.receiveModel.userId ?: @"",@"roomUid":self.receiveModel.roomUId ?: @"",@"scrolling":self.receiveModel.message ?: @""}]; + [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPReceiveRedPacketView18")]; return; }else if(self.isCountDownEnd == YES && self.receiveModel.finish == 0){ + + [self removeFromSuperview]; - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPReceiveRedPacketView18")]; - - + [[NSNotificationCenter defaultCenter]postNotificationName:@"kOpenRedPacketNotification" object:nil userInfo:@{@"type":@(RedPacketConditionsType_Scrolling),@"uid":self.receiveModel.userId ?: @"",@"roomUid":self.receiveModel.roomUId ?: @"",@"scrolling":self.receiveModel.message ?: @""}]; return; }else if(self.isCountDownEnd == NO && self.receiveModel.finish == 1){ return; diff --git a/YuMi/Modules/YMRoom/View/XPRoomViewController.m b/YuMi/Modules/YMRoom/View/XPRoomViewController.m index e9713ceb..d54669ae 100644 --- a/YuMi/Modules/YMRoom/View/XPRoomViewController.m +++ b/YuMi/Modules/YMRoom/View/XPRoomViewController.m @@ -961,6 +961,8 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出 self.hasAnimationEffect = roomInfo.hasAnimationEffect; self.roomInfo = roomInfo; self.userInfo = userInfo; + //获取一下红包信息 + [self.presenter getRedPacket:[NSString stringWithFormat:@"%ld", self.roomInfo.uid]]; //判断5分钟内是否被踢出过房间 if ([self isKictOutLatest:roomInfo]) { return; @@ -1065,8 +1067,7 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出 [[NSNotificationCenter defaultCenter] postNotificationName:@"kShowGiftView" object:@{@"giftId": self.giftId}]; }); } - //获取一下红包信息 - [self.presenter getRedPacket:[NSString stringWithFormat:@"%ld", self.roomInfo.uid]]; + } - (void)enterRoomFail:(NSInteger)code {