From 8829705044fed5da610323d39f75ad13aa49f2e1 Mon Sep 17 00:00:00 2001 From: fengshuo <963787902@qq.com> Date: Mon, 31 Oct 2022 16:17:28 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B3=96=E6=9E=9C=E6=A0=91=E7=A7=BB=E5=87=BA?= =?UTF-8?q?=E7=8E=A9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../XPRoomActivityContainerView.m | 50 ++++++++++++++++++- .../XPRoomMenuContainerView.m | 2 +- .../Presenter/XPRoomMorePlayPresenter.m | 15 ------ 3 files changed, 49 insertions(+), 18 deletions(-) diff --git a/xplan-ios/Main/Room/View/ActivityContainerView/XPRoomActivityContainerView.m b/xplan-ios/Main/Room/View/ActivityContainerView/XPRoomActivityContainerView.m index be16261f..1810d026 100644 --- a/xplan-ios/Main/Room/View/ActivityContainerView/XPRoomActivityContainerView.m +++ b/xplan-ios/Main/Room/View/ActivityContainerView/XPRoomActivityContainerView.m @@ -55,7 +55,8 @@ @property (nonatomic,strong) NSMutableArray *imageUrlList; ///是否加载了活动 @property (nonatomic,assign) BOOL isLoadActivity; - +///糖果树 +@property (nonatomic,strong) NetImageView *candyTreeImageView; @end @@ -68,6 +69,7 @@ [self initSubViews]; [self initSubViewConstraints]; [self requestActivityList]; + [self configCandyTree]; } return self; } @@ -79,6 +81,7 @@ [self.stackView addArrangedSubview:self.placeHolderView]; [self.stackView addArrangedSubview:self.firstRechargeImageView]; [self.stackView addArrangedSubview:self.joinDatingView]; + [self.stackView addArrangedSubview:self.candyTreeImageView]; } - (void)initSubViewConstraints { @@ -94,6 +97,10 @@ [self.firstRechargeImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(itemWidth, itemWidth)); }]; + + [self.candyTreeImageView mas_makeConstraints:^(MASConstraintMaker *make) { + make.size.mas_equalTo(CGSizeMake(itemWidth, itemWidth)); + }]; [self.joinDatingView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(35* kScreenHeightScale); @@ -143,6 +150,21 @@ } roomId:roomId type:@"2"]; } +- (void)configCandyTree { + UserInfoModel * userInfo = self.hostDelegate.getUserInfo; + RoomInfoModel * roomInfo = self.hostDelegate.getRoomInfo; + if (userInfo.userLevelVo.experLevelSeq >= [ClientConfig shareConfig].openCandyTreeLimitLevel && [ClientConfig shareConfig].openCandyTree && roomInfo.boxSwitchVo.openBoxSwitch) { + self.candyTreeImageView.hidden = NO; + if (roomInfo.boxSwitchVo.openBoxIcon.length > 0) { + self.candyTreeImageView.imageUrl = roomInfo.boxSwitchVo.openBoxIcon; + } else { + self.candyTreeImageView.image = [UIImage imageNamed:@"openBoxIcon"]; + } + } else { + self.candyTreeImageView.hidden = YES; + } +} + - (void)configLittleGameActivity { RoomInfoModel * roomInfo = self.hostDelegate.getRoomInfo; UserInfoModel * userInfo = self.hostDelegate.getUserInfo; @@ -255,6 +277,7 @@ } } else { [self dealRoomInfoChangeActivity]; + [self configCandyTree]; self.firstRechargeImageView.hidden = !userInfo.isFirstCharge; if (roomInfo.roomModeType == RoomModeType_Open_Blind || roomInfo.roomModeType == RoomModeType_Open_PK_Mode) { if (roomInfo.roomModeType == RoomModeType_Open_PK_Mode) { @@ -338,7 +361,9 @@ [StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventroom_banner_click eventAttributes:@{@"bannerName": info.bannerName}]; if([info.bannerName isEqualToString:@"首充有礼"]) { [self firstRechargeTapRecognizer]; - } else { + } else if([info.bannerName isEqualToString:@"糖果树"]) { + [self candyTreeTapRecognizer]; + } else { if (info.skipType == ActivitySkipType_Room) { [self.hostDelegate exitRoom]; [XPRoomViewController openRoom:info.skipUri viewController:self.hostDelegate.getCurrentNav]; @@ -401,6 +426,12 @@ [self.hostDelegate.getCurrentNav presentViewController:arrangeMicVC animated:YES completion:nil]; }]; } + +- (void)candyTreeTapRecognizer { + XPCandyTreeViewController * candyTreeVC = [[XPCandyTreeViewController alloc] initWithDelegate:self.hostDelegate]; + candyTreeVC.modalPresentationStyle = UIModalPresentationOverFullScreen; + [self.hostDelegate.getCurrentNav presentViewController:candyTreeVC animated:YES completion:nil]; +} #pragma mark - Getters And Setters - (SDCycleScrollView *)cycleScrollView { if (!_cycleScrollView) { @@ -470,4 +501,19 @@ return _activityList; } +- (UIImageView *)candyTreeImageView { + if (!_candyTreeImageView) { + NetImageConfig * config = [[NetImageConfig alloc] init]; + config.placeHolder = [UIImage imageNamed:@"room_candy_tree_enter"]; + config.imageType = ImageTypeUserIcon; + _candyTreeImageView = [[NetImageView alloc] initWithConfig:config]; + _candyTreeImageView.userInteractionEnabled = YES; + _candyTreeImageView.hidden = YES; + _candyTreeImageView.image = [UIImage imageNamed:@"room_candy_tree_enter"]; + UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(candyTreeTapRecognizer)]; + [_candyTreeImageView addGestureRecognizer:tap]; + } + return _candyTreeImageView; +} + @end diff --git a/xplan-ios/Main/Room/View/MenuContainerView/XPRoomMenuContainerView.m b/xplan-ios/Main/Room/View/MenuContainerView/XPRoomMenuContainerView.m index 57fd41fb..b2e2aba3 100644 --- a/xplan-ios/Main/Room/View/MenuContainerView/XPRoomMenuContainerView.m +++ b/xplan-ios/Main/Room/View/MenuContainerView/XPRoomMenuContainerView.m @@ -309,7 +309,7 @@ NSString * const kRoomPlayEnterKey = @"kRoomPlayEnterKey"; - (void)configRoomPlayEnter { UserInfoModel * userInfo = self.delegate.getUserInfo; RoomInfoModel * roomInfo = self.delegate.getRoomInfo; - if (([ClientConfig shareConfig].configInfo.linearlyPoolOpenLevel <= userInfo.userLevelVo.experLevelSeq) || (userInfo.userLevelVo.experLevelSeq >= [ClientConfig shareConfig].openCandyTreeLimitLevel && [ClientConfig shareConfig].openCandyTree && roomInfo.boxSwitchVo.openBoxSwitch)) { + if ([ClientConfig shareConfig].configInfo.linearlyPoolOpenLevel <= userInfo.userLevelVo.experLevelSeq) { NSString * hasDispaly = [[NSUserDefaults standardUserDefaults] objectForKey:kRoomPlayEnterKey]; if (hasDispaly.length > 0) { diff --git a/xplan-ios/Main/Room/View/MorePlay/Presenter/XPRoomMorePlayPresenter.m b/xplan-ios/Main/Room/View/MorePlay/Presenter/XPRoomMorePlayPresenter.m index 1ff4b54c..bc843278 100644 --- a/xplan-ios/Main/Room/View/MorePlay/Presenter/XPRoomMorePlayPresenter.m +++ b/xplan-ios/Main/Room/View/MorePlay/Presenter/XPRoomMorePlayPresenter.m @@ -21,25 +21,10 @@ sailingModel.name = @"航海"; sailingModel.imageName = @"room_sailiing_enter"; sailingModel.playType = RoomActivityPlayTypeSailing; - ///糖果树玩法 - XPRoomActivityPlayModel * candyTreeModel = [[XPRoomActivityPlayModel alloc] init]; - candyTreeModel.name = @"糖果树"; - candyTreeModel.imageName = @"room_candy_tree_enter"; - candyTreeModel.playType = RoomActivityPlayTypeCandyTree; if ([ClientConfig shareConfig].configInfo.linearlyPoolOpenLevel <= userInfo.userLevelVo.experLevelSeq) { [data addObject:sailingModel]; } - - if (userInfo.userLevelVo.experLevelSeq >= [ClientConfig shareConfig].openCandyTreeLimitLevel && [ClientConfig shareConfig].openCandyTree && roomInfo.boxSwitchVo.openBoxSwitch) { - [data addObject:candyTreeModel]; - if (roomInfo.boxSwitchVo.openBoxIcon.length > 0) { - candyTreeModel.imageName = roomInfo.boxSwitchVo.openBoxIcon; - } else { - candyTreeModel.imageName = @"room_candy_tree_enter"; - } - } - [[self getView] getMorePlaysSuccess:data]; }