From 7475a578e8a95fc5fb5fae4253add6f4f8698b60 Mon Sep 17 00:00:00 2001 From: liyuhua <15626451870@163.com> Date: Sat, 28 Oct 2023 00:29:29 +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 --- .../AnimationView/XPRoomGiftBroadcastView.m | 7 +++- .../SendRedPacket/PIRoomSendRedPacketVC.m | 41 +++++++++++++------ .../SendRedPacket/XPReceiveRedPacketView.m | 35 ++++++++-------- 3 files changed, 52 insertions(+), 31 deletions(-) diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomGiftBroadcastView.m b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomGiftBroadcastView.m index 33d18f7b..a069fe50 100644 --- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomGiftBroadcastView.m +++ b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomGiftBroadcastView.m @@ -201,7 +201,9 @@ self.circuseeBtn.backgroundColor = bgBtnColor; } - +-(void)showRoomVC{ + [self didClickEnterRoom]; +} #pragma mark - Getters And Setters - (void)setBroadcastModel:(GiftReceiveInfoModel *)broadcastModel { _broadcastModel = broadcastModel; @@ -241,7 +243,8 @@ _senderAvatarView.layer.cornerRadius = kGetScaleWidth(44)/2; _senderAvatarView.layer.masksToBounds = YES; _senderAvatarView.userInteractionEnabled = YES; - + UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(showRoomVC)]; + [_senderAvatarView addGestureRecognizer:tap]; } return _senderAvatarView; } diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketVC.m b/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketVC.m index dd1d9335..2e2b3e5b 100644 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketVC.m +++ b/YuMi/Modules/YMRoom/View/SendRedPacket/PIRoomSendRedPacketVC.m @@ -30,6 +30,7 @@ @property(nonatomic,strong) UIButton *pi_backBtn; ///背景 @property(nonatomic,strong) UIView *bgView; +///隐藏键盘 @property(nonatomic,strong) UIButton *hiddenViewBnt; ///背景图片 @property(nonatomic,strong) UIImageView *topImageView; @@ -43,6 +44,10 @@ @property(nonatomic,strong) UIImageView *diamondIconView; //加号 @property(nonatomic,strong) UIImageView *addIconView; +///大厅红包 +@property(nonatomic,strong) PIRoomSendRedPacketItemVC *roomRedVC; +///全服红包 +@property(nonatomic,strong) PIRoomSendRedPacketItemVC *entireServerVC; @end @implementation PIRoomSendRedPacketVC @@ -65,12 +70,9 @@ ///获取用户钱包信息成功 - (void)getUserWalletInfo:(WalletInfoModel *)balanceInfo { self.diamondNumTextView.text = balanceInfo.diamonds; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - for (int i = 0; i < self.titles.count; i++) { - PIRoomSendRedPacketItemVC * list = (PIRoomSendRedPacketItemVC *)[self.contentView.validListDict objectForKey:[NSNumber numberWithInteger:i]]; - list.walletModel = balanceInfo; - } - }); + self.roomRedVC.walletModel = balanceInfo; + self.entireServerVC.walletModel = balanceInfo; + } @@ -179,13 +181,14 @@ - (id)pagerView:(JXPagerView *)pagerView initListAtIndex:(NSInteger)index { - PIRoomSendRedPacketItemVC * list = (PIRoomSendRedPacketItemVC *)[self.contentView.validListDict objectForKey:[NSNumber numberWithInteger:index]]; - if (list) { - return list; - } else { - PIRoomSendRedPacketItemVC *vc = [[PIRoomSendRedPacketItemVC alloc]initWithDelegate:self.hostDelegate type:index]; - - return vc; + RoomInfoModel *roomInfo = self.hostDelegate.getRoomInfo; + if(roomInfo.redEnvelopeType == 1){ + return self.roomRedVC; + }else if(roomInfo.redEnvelopeType == 2){ + return self.entireServerVC; + }else{ + return index == 0 ? self.roomRedVC : self.entireServerVC; + } } @@ -355,4 +358,16 @@ } return _hiddenViewBnt; } +- (PIRoomSendRedPacketItemVC *)roomRedVC{ + if(!_roomRedVC){ + _roomRedVC = [[PIRoomSendRedPacketItemVC alloc]initWithDelegate:self.hostDelegate type:0]; + } + return _roomRedVC; +} +- (PIRoomSendRedPacketItemVC *)entireServerVC{ + if(!_entireServerVC){ + _entireServerVC = [[PIRoomSendRedPacketItemVC alloc]initWithDelegate:self.hostDelegate type:1]; + } + return _entireServerVC; +} @end diff --git a/YuMi/Modules/YMRoom/View/SendRedPacket/XPReceiveRedPacketView.m b/YuMi/Modules/YMRoom/View/SendRedPacket/XPReceiveRedPacketView.m index 2ac7452e..f78d3c0e 100644 --- a/YuMi/Modules/YMRoom/View/SendRedPacket/XPReceiveRedPacketView.m +++ b/YuMi/Modules/YMRoom/View/SendRedPacket/XPReceiveRedPacketView.m @@ -211,11 +211,11 @@ } NSInteger time = [self getTimeDifferenceWithTimestamp:_receiveModel.timestamp / 1000 beginTime:_receiveModel.beginTime / 1000]; if(time > 0){ + self.isCountDownEnd = NO; + [self.countDownHelper openCountdownWithTime:(int)time]; if(_receiveModel.finish == 1){ self.countDownView.hidden = NO; self.countDownTitleView.hidden = NO; - self.isCountDownEnd = NO; - [self.countDownHelper openCountdownWithTime:(int)time]; }else{ self.robView.hidden = NO; @@ -244,11 +244,13 @@ NSInteger time = [self getTimeDifferenceWithTimestamp:_receiveModel.timestamp / 1000 beginTime:_receiveModel.beginTime / 1000]; if(time > 0){ + self.isCountDownEnd = NO; + [self.countDownHelper openCountdownWithTime:(int)time]; if(_receiveModel.finish == 1){ self.countDownView.hidden = NO; self.countDownTitleView.hidden = NO; - self.isCountDownEnd = NO; - [self.countDownHelper openCountdownWithTime:(int)time]; + + }else{ self.robView.hidden = NO; @@ -277,10 +279,11 @@ NSInteger time = [self getTimeDifferenceWithTimestamp:_receiveModel.timestamp / 1000 beginTime:_receiveModel.beginTime / 1000]; if(time > 0){ + [self.countDownHelper openCountdownWithTime:(int)time]; + self.isCountDownEnd = NO; if(_receiveModel.finish == 1){ self.countDownView.hidden = NO; self.countDownTitleView.hidden = NO; - [self.countDownHelper openCountdownWithTime:(int)time]; }else{ self.robView.hidden = NO; @@ -315,13 +318,13 @@ }else if(self.receiveModel.kind == RedPacketConditionsType_Followd){ if(self.isCountDownEnd == NO && self.receiveModel.finish == 0){ [self removeFromSuperview]; - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPReceiveRedPacketView18")]; + [[NSNotificationCenter defaultCenter]postNotificationName:@"kOpenRedPacketNotification" object:nil userInfo:@{@"type":@(RedPacketConditionsType_Followd),@"uid":self.receiveModel.userId ?: @"",@"roomUid":self.receiveModel.roomUId ?: @""}]; return; }else if(self.isCountDownEnd == YES && 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 == NO && self.receiveModel.finish == 1){ return; @@ -330,13 +333,13 @@ }else if(self.receiveModel.kind == RedPacketConditionsType_Share){ if(self.isCountDownEnd == NO && self.receiveModel.finish == 0){ [self removeFromSuperview]; - [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPReceiveRedPacketView18")]; - return; - }else if(self.isCountDownEnd == YES && self.receiveModel.finish == 0){ - - [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 == YES && self.receiveModel.finish == 0){ + [self removeFromSuperview]; + [XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPReceiveRedPacketView18")]; + return; }else if(self.isCountDownEnd == NO && self.receiveModel.finish == 1){ @@ -345,13 +348,13 @@ }else if(self.receiveModel.kind == RedPacketConditionsType_Scrolling){ if(self.isCountDownEnd == NO && 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 == YES && 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 == NO && self.receiveModel.finish == 1){ return;