糖果树移出玩法

xplan-ios/Main/Room/View/ActivityContainerView/XPRoomActivityContainerView.m

@@ -55,7 +55,8 @@
 @property (nonatomic,strong) NSMutableArray<NSString *> *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 {
@@ -95,6 +98,10 @@
 		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,6 +361,8 @@
         [StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventroom_banner_click eventAttributes:@{@"bannerName": info.bannerName}];
 		 if([info.bannerName isEqualToString:@"首充有礼"]) {
 			[self firstRechargeTapRecognizer];
+        } else if([info.bannerName isEqualToString:@"糖果树"]) {
+			[self candyTreeTapRecognizer];
 		}   else {
 			if (info.skipType == ActivitySkipType_Room) {
 				[self.hostDelegate exitRoom];
@@ -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

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) {

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];
 }