修复了一些UI踢出的问题

xplan-ios/Main/ModuleKit/SendGiftView/View/Cell/XPGiftItemCollectionViewCell.m

@@ -261,6 +261,8 @@
 	if (!_giftImageView) {
 		_giftImageView = [[NetImageView alloc] init];
 		_giftImageView.backgroundColor = [UIColor clearColor];
+		_giftImageView.layer.masksToBounds = YES;
+		_giftImageView.contentMode = UIViewContentModeScaleAspectFit;
 	}
 	return _giftImageView;
 }

xplan-ios/Main/ModuleKit/SendGiftView/View/Cell/XPGiftWeekStarCollectionViewCell.m

@@ -72,33 +72,40 @@
 - (void)setFirstCharmRankUser:(XPWeekStarRankUserModel *)firstCharmRankUser {
 	_firstCharmRankUser = firstCharmRankUser;
 	if (_firstCharmRankUser) {
-		self.avatarImageView.layer.borderColor = UIColorFromRGB(0xA563EB).CGColor;
-		[self.contentButton setBackgroundImage:[UIImage imageNamed:@"gift_info_week_star_charm_bg"] forState:UIControlStateNormal];
 		self.avatarImageView.imageUrl = _firstCharmRankUser.avatar;
 		NSString * nick = _firstCharmRankUser.nick;
 		if (nick.length > 8) {
 			nick = [nick substringFromIndex:8];
 		}
 		self.nickLabel.text = nick;
-		[self.contentButton setTitle:@"本周该礼物冠名者" forState:UIControlStateNormal];
+	} else {
-		[self.contentButton setTitleColor:UIColorFromRGB(0x35105C) forState:UIControlStateNormal];
+		self.avatarImageView.image = [UIImageConstant defaultEmptyAvatarPlaceholder];
+		self.nickLabel.text = @"虚位以待";
 	}
+	self.avatarImageView.layer.borderColor = UIColorFromRGB(0xA563EB).CGColor;
+	[self.contentButton setBackgroundImage:[UIImage imageNamed:@"gift_info_week_star_charm_bg"] forState:UIControlStateNormal];
+	[self.contentButton setTitle:@"本周该礼物冠名者" forState:UIControlStateNormal];
+	[self.contentButton setTitleColor:UIColorFromRGB(0x35105C) forState:UIControlStateNormal];
 }
 
 - (void)setFirstLevelRankUser:(XPWeekStarRankUserModel *)firstLevelRankUser {
 	_firstLevelRankUser = firstLevelRankUser;
 	if (_firstLevelRankUser) {
-		self.avatarImageView.layer.borderColor = UIColorFromRGB(0xFFBC51).CGColor;
-		[self.contentButton setBackgroundImage:[UIImage imageNamed:@"gift_info_week_star_level_bg"] forState:UIControlStateNormal];
 		self.avatarImageView.imageUrl = _firstLevelRankUser.avatar;
 		NSString * nick = _firstLevelRankUser.nick;
 		if (nick.length > 8) {
 			nick = [nick substringFromIndex:8];
 		}
 		self.nickLabel.text = nick;
-		[self.contentButton setTitle:@"本周该礼物星神豪" forState:UIControlStateNormal];
+	} else {
-		[self.contentButton setTitleColor:UIColorFromRGB(0x754304) forState:UIControlStateNormal];
+		self.avatarImageView.image = [UIImageConstant defaultEmptyAvatarPlaceholder];
+		self.nickLabel.text = @"虚位以待";
+		
 	}
+	self.avatarImageView.layer.borderColor = UIColorFromRGB(0xFFBC51).CGColor;
+	[self.contentButton setBackgroundImage:[UIImage imageNamed:@"gift_info_week_star_level_bg"] forState:UIControlStateNormal];
+	[self.contentButton setTitle:@"本周该礼物星神豪" forState:UIControlStateNormal];
+	[self.contentButton setTitleColor:UIColorFromRGB(0x754304) forState:UIControlStateNormal];
 }
 
 
@@ -255,19 +262,8 @@
 - (void)setSelectGiftInfo:(GiftInfoModel *)selectGiftInfo {
 	_selectGiftInfo = selectGiftInfo;
 	if (_selectGiftInfo) {
-		if (_selectGiftInfo.firstCharmRankUser) {
+		self.sendUserView.firstCharmRankUser = _selectGiftInfo.firstCharmRankUser;
-			self.sendUserView.hidden = NO;
+		self.receiveUserView.firstLevelRankUser = _selectGiftInfo.firstLevelRankUser;
-			self.sendUserView.firstCharmRankUser = _selectGiftInfo.firstCharmRankUser;
-		} else {
-			self.sendUserView.hidden = YES;
-		}
-		
-		if (_selectGiftInfo.firstLevelRankUser) {
-			self.receiveUserView.hidden = NO;
-			self.receiveUserView.firstLevelRankUser = _selectGiftInfo.firstLevelRankUser;
-		} else {
-			self.receiveUserView.hidden = YES;
-		}
 	} else {
 		self.receiveUserView.hidden = YES;
 		self.sendUserView.hidden = YES;

xplan-ios/Main/ModuleKit/SendGiftView/View/XPGiftInfoView.m

@@ -163,6 +163,7 @@
 		make.left.right.mas_equalTo(self);
 		make.height.mas_equalTo(108 * 2 + 20);
 	}];
+
 	
 	[self.pageController mas_makeConstraints:^(MASConstraintMaker *make) {
 		make.height.mas_equalTo(10);
@@ -361,7 +362,7 @@
     } else {
         page = self.datasource.count / 8 + 1;
     }
-	self.pageController.hidden = page <= 1;
+	self.pageController.hidden = page <= 1 || _segmentType == GiftSegmentType_WeekStar;
 	[self.pageController setNumberOfPages:page];
 	self.pageController.currentPage = 0;
 	[self.giftcollectionView reloadData];
@@ -418,7 +419,7 @@
 		_segmentStackView.axis = UILayoutConstraintAxisHorizontal;
 		_segmentStackView.distribution = UIStackViewDistributionFill;
 		_segmentStackView.alignment = UIStackViewAlignmentCenter;
-		_segmentStackView.spacing = 14;
+		_segmentStackView.spacing = 10;
 		_segmentStackView.backgroundColor = [UIColor clearColor];
 	}
 	return _segmentStackView;
@@ -576,7 +577,9 @@
 - (UIView *)segmentPlaceView {
 	if (!_segmentPlaceView) {
 		_segmentPlaceView = [[UIView alloc] init];
-		_segmentPlaceView.backgroundColor = [UIColor clearColor];
+		_segmentPlaceView.backgroundColor = [UIColor redColor];
+		[_segmentPlaceView setContentCompressionResistancePriority:UILayoutPriorityDefaultLow forAxis:UILayoutConstraintAxisHorizontal];
+		[_segmentPlaceView setContentHuggingPriority:UILayoutPriorityDefaultLow forAxis:UILayoutConstraintAxisHorizontal];
 	}
 	return _segmentPlaceView;
 }

xplan-ios/Main/Room/View/FirstRecharge/View/XPFirstRechargeViewController.m

@@ -76,7 +76,7 @@
 }
 #pragma mark - Private Method
 - (void)initSubViews {
-	self.view.backgroundColor = [UIColor clearColor];
+	self.view.backgroundColor = [UIColor colorWithWhite:0 alpha:0.5];
 	[self.view addSubview:self.topView];
 	[self.view addSubview:self.backImageView];
 	[self.view addSubview:self.bottomView];
@@ -189,7 +189,7 @@
 		[button setTitle:title forState:UIControlStateSelected];
 		button.tag = i;
 		[button addTarget:self action:@selector(buttonAction:) forControlEvents:UIControlEventTouchUpInside];
-		[button setBackgroundImage:[UIImage imageWithColor:[ThemeColor rewardSegmentNormalBgColor]] forState:UIControlStateNormal];
+		[button setBackgroundImage:[UIImage imageWithColor:[UIColor clearColor]] forState:UIControlStateNormal];
 		[button setBackgroundImage:[[UIImage imageNamed:@"room_first_recharge_segment_select"] resizableImageWithCapInsets:UIEdgeInsetsMake(0, 30, 0, 30) resizingMode:UIImageResizingModeStretch] forState:UIControlStateSelected];
 		if (i == 0) {
 			button.selected = YES;

xplan-ios/Main/Room/View/NewUserGreet/XPRoomNewUserGreetView.m

@@ -16,6 +16,8 @@
 @interface XPRoomNewUserGreetView ()
 ///背景
 @property (nonatomic,strong) UIImageView *backImageView;
+///内容
+@property (nonatomic,strong) UIView * contentView;
 ///第一个头像
 @property (nonatomic,strong) NetImageView *firstAvatarView;
 ///第二个头像
@@ -45,12 +47,14 @@
 #pragma mark - Private Method
 - (void)initSubViews {
 	[self addSubview:self.backImageView];
-	[self.backImageView addSubview:self.firstAvatarView];
+	[self.backImageView addSubview:self.contentView];
-	[self.backImageView addSubview:self.secondAvatarView];
-	[self.backImageView addSubview:self.thirdAvatarView];
-	[self.backImageView addSubview:self.titleLabel];
-	[self.backImageView addSubview:self.checkButton];
 	[self.backImageView addSubview:self.closeButton];
+	
+	[self.contentView addSubview:self.firstAvatarView];
+	[self.contentView addSubview:self.secondAvatarView];
+	[self.contentView addSubview:self.thirdAvatarView];
+	[self.contentView addSubview:self.titleLabel];
+	[self.contentView addSubview:self.checkButton];
 	self.avatarViewList = @[self.firstAvatarView, self.secondAvatarView, self.thirdAvatarView];
 }
 
@@ -61,24 +65,31 @@
 		make.top.mas_equalTo(self);
 	}];
 	
-	[self.firstAvatarView mas_makeConstraints:^(MASConstraintMaker *make) {
+	[self.contentView mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.size.mas_equalTo(CGSizeMake(44, 44));
+		make.centerX.centerY.mas_equalTo(self.backImageView);
-		make.left.mas_equalTo(self.backImageView).offset(13);
+		make.height.mas_equalTo(55);
-		make.centerY.mas_equalTo(self.backImageView);
+		make.left.mas_equalTo(self.thirdAvatarView.mas_left);
-	}];
-	
-	[self.secondAvatarView mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.size.centerY.mas_equalTo(self.firstAvatarView);
-		make.left.mas_equalTo(self.firstAvatarView.mas_right).offset(-6);
 	}];
 	
 	[self.thirdAvatarView mas_makeConstraints:^(MASConstraintMaker *make) {
 		make.size.centerY.mas_equalTo(self.firstAvatarView);
-		make.left.mas_equalTo(self.secondAvatarView.mas_right).offset(-6);
+		make.right.mas_equalTo(self.secondAvatarView.mas_left).offset(6);
+	}];
+	
+	[self.secondAvatarView mas_makeConstraints:^(MASConstraintMaker *make) {
+		make.size.centerY.mas_equalTo(self.firstAvatarView);
+		make.right.mas_equalTo(self.firstAvatarView.mas_left).offset(6);
+	}];
+	
+	
+	[self.firstAvatarView mas_makeConstraints:^(MASConstraintMaker *make) {
+		make.size.mas_equalTo(CGSizeMake(44, 44));
+		make.centerY.mas_equalTo(self.contentView);
+		make.right.mas_equalTo(self.titleLabel.mas_left).offset(-12);
 	}];
 	
 	[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.left.mas_equalTo(self.thirdAvatarView.mas_right).offset(12);
+		make.right.mas_equalTo(self.contentView);
 		make.top.mas_equalTo(self.firstAvatarView);
 	}];
 	
@@ -126,18 +137,27 @@
 		}else {
 			self.titleLabel.text = @"Ta们向你发送了多条消息~";
 		}
+		[self.titleLabel sizeToFit];
 	}
 	
 	for (int i = 0; i < sayHelloUserAvatarList.count; i++) {
 		NSString * avatar = [sayHelloUserAvatarList objectAtIndex:i];
 		if (i < self.avatarViewList.count) {
-			NetImageView * imageView = [self.avatarViewList objectAtIndex:i];
+			NetImageView * image = [self.avatarViewList objectAtIndex:i];
-			imageView.imageUrl = avatar;
+			image.imageUrl = avatar;
-			imageView.hidden = NO;
+			image.hidden = NO;
 		}
 	}
 }
 
+- (UIView *)contentView {
+	if (!_contentView) {
+		_contentView = [[UIView alloc] init];
+		_contentView.backgroundColor = [UIColor redColor];
+	}
+	return _contentView;
+}
+
 - (UIImageView *)backImageView {
 	if (!_backImageView) {
 		_backImageView = [[UIImageView alloc] init];
@@ -199,7 +219,7 @@
 		_titleLabel = [[UILabel alloc] init];
 		_titleLabel.font = [UIFont systemFontOfSize:13 weight:UIFontWeightMedium];
 		_titleLabel.textColor = [UIColor whiteColor];
-		_titleLabel.text = @"Ta们向你发送了多条消息~";
+		_titleLabel.text = @"Ta向你发送了多条消息~";
 	}
 	return _titleLabel;
 }

xplan-ios/Main/Room/View/UserCard/View/XPUserCardViewController.m

@@ -734,7 +734,7 @@
 				[self dismissViewControllerAnimated:YES completion:^{
 					XPRoomHalfMessageView *halfMessageView = [[XPRoomHalfMessageView alloc] initWithFrame:CGRectMake(0, KScreenHeight, KScreenWidth, KScreenHeight)];
 					halfMessageView.chatUserId = self.cardInfo.uid;
-					[[XCCurrentVCStackManager shareManager].getCurrentVC.view addSubview:halfMessageView];
+					[[XCCurrentVCStackManager shareManager].currentNavigationController.view addSubview:halfMessageView];
 					[UIView animateWithDuration:.35 animations:^{
 						CGRect rect = halfMessageView.frame;
 						rect.origin.y = 0;