修复了房间内私聊背景以及样式的问题

xplan-ios/Main/Message/View/Session/SessionViewController.m

@@ -159,9 +159,11 @@
 - (void)initViews {
 	self.sessionNavView.isInRoom = self.openType == SessionListOpenTypeRoom;
 	[self.view addSubview:self.sessionNavView];
-    [self.view addSubview:self.followInRoomView];
     [self.view addSubview:self.sessionTableView];
     [self.view addSubview:self.toolbarView];
+	if (self.openType == SessionListOpenTypeDefault) {
+		[self.view addSubview:self.followInRoomView];
+	}
 }
 
 - (void)initLayout {
@@ -170,11 +172,6 @@
 		make.left.top.right.mas_equalTo(self.view);
 	}];
 	
-    [self.followInRoomView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.right.mas_equalTo(self.view);
-		make.top.mas_equalTo(self.sessionNavView.mas_bottom);
-        make.height.mas_equalTo(80);
-    }];
     [self.sessionTableView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.right.mas_equalTo(self.view);
 		make.top.mas_equalTo(self.sessionNavView.mas_bottom);
@@ -185,6 +182,14 @@
 		make.left.right.mas_equalTo(self.view);
 		make.bottom.mas_equalTo(self.view);
 	}];
+	
+	if (self.openType == SessionListOpenTypeDefault) {
+		[self.followInRoomView mas_makeConstraints:^(MASConstraintMaker *make) {
+			make.left.right.mas_equalTo(self.view);
+			make.top.mas_equalTo(self.sessionNavView.mas_bottom);
+			make.height.mas_equalTo(80);
+		}];
+	}
 }
 
 - (void)initData {
@@ -234,7 +239,7 @@
 	if (userInfo.nick.length > 0) {
 		self.sessionNavView.title = userInfo.nick;
 	}
-    if (userInfo.roomUid) {
+    if (userInfo.roomUid && self.openType == SessionListOpenTypeDefault) {
         self.followInRoomView.hidden = NO;
         self.followInRoomView.userInfo = userInfo;
         [self.sessionTableView mas_updateConstraints:^(MASConstraintMaker *make) {
@@ -366,36 +371,40 @@
 
 #pragma mark - XPSessionMessageHeadViewDelegate
 - (void)onAvatarClick:(NSInteger)uid {
-    XPMineUserInfoViewController * infoVC = [[XPMineUserInfoViewController alloc] init];
+	if (self.openType == SessionListOpenTypeDefault) {
-    infoVC.uid = uid;
+		XPMineUserInfoViewController * infoVC = [[XPMineUserInfoViewController alloc] init];
-    [self.getKeyWindowNav pushViewController:infoVC animated:YES];
+		infoVC.uid = uid;
+		[self.getKeyWindowNav pushViewController:infoVC animated:YES];
+	}
 }
 
 - (void)onFollowInRoom:(NSString *)roomUid {
-    __block BOOL isSameRoom = NO;
+	if (self.openType == SessionListOpenTypeDefault) {
-    __block RoomInfoModel *roomModel;
+		__block BOOL isSameRoom = NO;
-    [self.getKeyWindowNav.viewControllers enumerateObjectsUsingBlock:^(__kindof UIViewController * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+		__block RoomInfoModel *roomModel;
-        if ([obj isKindOfClass:[XPRoomViewController class]]) {
+		[self.getKeyWindowNav.viewControllers enumerateObjectsUsingBlock:^(__kindof UIViewController * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
-            XPRoomViewController<RoomHostDelegate> * rooomVC = obj;
+			if ([obj isKindOfClass:[XPRoomViewController class]]) {
-            [[self getKeyWindowNav] popToRootViewControllerAnimated:NO];
+				XPRoomViewController<RoomHostDelegate> * rooomVC = obj;
-            roomModel = rooomVC.getRoomInfo;
+				[[self getKeyWindowNav] popToRootViewControllerAnimated:NO];
-            if(rooomVC.getRoomInfo.uid == [roomUid integerValue]) {
+				roomModel = rooomVC.getRoomInfo;
-                isSameRoom = YES;
+				if(rooomVC.getRoomInfo.uid == [roomUid integerValue]) {
-            } else {
+					isSameRoom = YES;
-                [rooomVC exitRoom];
+				} else {
-            }
+					[rooomVC exitRoom];
-            *stop = YES;
+				}
-        }
+				*stop = YES;
-    }];
+			}
-    if (!isSameRoom) {
+		}];
-        if (roomModel.type == RoomType_MiniGame) {
+		if (!isSameRoom) {
-            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+			if (roomModel.type == RoomType_MiniGame) {
-                [XPRoomViewController openRoom:roomUid fromNick:self.userInfo.nick fromType:UserEnterRoomFromType_Follow_User fromUid:[NSString stringWithFormat:@"%ld", self.userInfo.uid] viewController:[[XCCurrentVCStackManager shareManager] getCurrentVC]];
+				dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-            });
+					[XPRoomViewController openRoom:roomUid fromNick:self.userInfo.nick fromType:UserEnterRoomFromType_Follow_User fromUid:[NSString stringWithFormat:@"%ld", self.userInfo.uid] viewController:[[XCCurrentVCStackManager shareManager] getCurrentVC]];
-        } else {
+				});
-            [XPRoomViewController openRoom:roomUid fromNick:self.userInfo.nick fromType:UserEnterRoomFromType_Follow_User fromUid:[NSString stringWithFormat:@"%ld", self.userInfo.uid] viewController:self];
+			} else {
-        }
+				[XPRoomViewController openRoom:roomUid fromNick:self.userInfo.nick fromType:UserEnterRoomFromType_Follow_User fromUid:[NSString stringWithFormat:@"%ld", self.userInfo.uid] viewController:self];
-    } 
+			}
+		}
+	}
 }
 
 - (void)didFailRetry:(NIMMessage *)message {

xplan-ios/Main/Mine/View/Cell/Friend/XPMineAttentionTableViewCell.m

@@ -50,7 +50,7 @@
 
 #pragma mark - Private Method
 - (void)initSubViews {
-	self.backgroundColor = [ThemeColor appCellBackgroundColor];
+	self.backgroundColor = [UIColor clearColor];
 	self.selectionStyle = UITableViewCellSelectionStyleNone;
 	[self.contentView addSubview:self.avatarImageView];
 	[self.contentView addSubview:self.stackView];
@@ -111,65 +111,79 @@
 	_fansInfo = fansInfo;
 	if (_fansInfo) {
 		self.avatarImageView.imageUrl = _fansInfo.avatar;
-		self.experImageView.imageUrl = _fansInfo.experUrl;
-		self.charmImageView.imageUrl = _fansInfo.charmUrl;
-        self.nobleImageView.imageUrl = _fansInfo.userVipInfoVO.vipIcon;
 		self.nickLabel.text = _fansInfo.nick;
-		NSString *sexStr;
-		if (_fansInfo.gender == GenderType_Male) {
-			sexStr = @"common_male";
-		} else {
-			sexStr = @"common_female";
-		}
-		self.sexImageView.image = [UIImage imageNamed:sexStr];
 		self.signLabel.text = _fansInfo.userDesc && _fansInfo.userDesc.length > 0? _fansInfo.userDesc : @"这个人很懒还没有签名";
-		self.findButton.hidden = _fansInfo.userInRoomUid.length <= 0 || _fansInfo.isInRoom;
+		if (!_fansInfo.isInRoom) {
-		UIImage* image = self.experImageView.image;
+			self.experImageView.hidden = NO;
-		if (image) {
+			self.charmImageView.hidden = NO;
-			CGFloat scale = image.size.width / image.size.height;
+			self.nobleImageView.hidden = NO;
-			[self.experImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+			self.sexImageView.hidden = NO;
-				make.size.mas_equalTo(CGSizeMake(20* scale, 20));
+			self.experImageView.imageUrl = _fansInfo.experUrl;
-			}];
+			self.charmImageView.imageUrl = _fansInfo.charmUrl;
+			self.nobleImageView.imageUrl = _fansInfo.userVipInfoVO.vipIcon;
+			NSString *sexStr;
+			if (_fansInfo.gender == GenderType_Male) {
+				sexStr = @"common_male";
+			} else {
+				sexStr = @"common_female";
+			}
+			self.sexImageView.image = [UIImage imageNamed:sexStr];
+			
+			self.findButton.hidden = _fansInfo.userInRoomUid.length <= 0;
+			UIImage* image = self.experImageView.image;
+			if (image) {
+				CGFloat scale = image.size.width / image.size.height;
+				[self.experImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+					make.size.mas_equalTo(CGSizeMake(20* scale, 20));
+				}];
+			} else {
+				NSURL *imgUrl = [NSURL URLWithString:_fansInfo.experUrl];
+				UIImage *myImage = [UIImage imageWithData:[NSData dataWithContentsOfURL:imgUrl]];
+				CGFloat scale = myImage.size.width / myImage.size.height;
+				[self.experImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+					make.size.mas_equalTo(CGSizeMake(20* scale, 20));
+				}];
+			}
+			
+			UIImage* charmImage = self.charmImageView.image;
+			if (charmImage) {
+				CGFloat scale = charmImage.size.width / charmImage.size.height;
+				[self.charmImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+					make.size.mas_equalTo(CGSizeMake(20* scale, 20));
+				}];
+			} else {
+				NSURL *imgUrl = [NSURL URLWithString:_fansInfo.charmUrl];
+				UIImage *myImage = [UIImage imageWithData:[NSData dataWithContentsOfURL:imgUrl]];
+				CGFloat scale = myImage.size.width / myImage.size.height;
+				[self.charmImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+					make.size.mas_equalTo(CGSizeMake(20* scale, 20));
+				}];
+			}
+			
+			UIImage *nobleImage = self.nobleImageView.image;
+			if (nobleImage) {
+				CGFloat scale = nobleImage.size.width / nobleImage.size.height;
+				[self.nobleImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+					make.size.mas_equalTo(CGSizeMake(20* scale, 20));
+				}];
+			} else {
+				[self.nobleImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+					make.size.mas_equalTo(CGSizeMake(0, 20));
+				}];
+			}
+			if (fansInfo.userVipInfoVO && fansInfo.userVipInfoVO.friendNickColour) {
+				self.nickLabel.textColor = [self colorWithHexString:fansInfo.userVipInfoVO.friendNickColour];
+			} else {
+				self.nickLabel.textColor = [ThemeColor mainTextColor];
+			}
 		} else {
-			NSURL *imgUrl = [NSURL URLWithString:_fansInfo.experUrl];
+			self.experImageView.hidden = YES;
-			UIImage *myImage = [UIImage imageWithData:[NSData dataWithContentsOfURL:imgUrl]];
+			self.charmImageView.hidden = YES;
-			CGFloat scale = myImage.size.width / myImage.size.height;
+			self.nobleImageView.hidden = YES;
-			[self.experImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+			self.sexImageView.hidden = YES;
-				make.size.mas_equalTo(CGSizeMake(20* scale, 20));
+			self.findButton.hidden = YES;
-			}];
+			self.nickLabel.textColor = [ThemeColor mainTextColor];
 		}
-		
-		UIImage* charmImage = self.charmImageView.image;
-		if (charmImage) {
-			CGFloat scale = charmImage.size.width / charmImage.size.height;
-			[self.charmImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-				make.size.mas_equalTo(CGSizeMake(20* scale, 20));
-			}];
-		} else {
-			NSURL *imgUrl = [NSURL URLWithString:_fansInfo.charmUrl];
-			UIImage *myImage = [UIImage imageWithData:[NSData dataWithContentsOfURL:imgUrl]];
-			CGFloat scale = myImage.size.width / myImage.size.height;
-			[self.charmImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-				make.size.mas_equalTo(CGSizeMake(20* scale, 20));
-			}];
-		}
-        
-        UIImage *nobleImage = self.nobleImageView.image;
-        if (nobleImage) {
-            CGFloat scale = nobleImage.size.width / nobleImage.size.height;
-            [self.nobleImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-                make.size.mas_equalTo(CGSizeMake(20* scale, 20));
-            }];
-        } else {
-            [self.nobleImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-                make.size.mas_equalTo(CGSizeMake(0, 20));
-            }];
-        }
-        if (fansInfo.userVipInfoVO && fansInfo.userVipInfoVO.friendNickColour) {
-            self.nickLabel.textColor = [self colorWithHexString:fansInfo.userVipInfoVO.friendNickColour];
-        } else {
-            self.nickLabel.textColor = [ThemeColor mainTextColor];
-        }
 	}
 }
 

xplan-ios/Main/Mine/View/Cell/Friend/XPMineFansTableViewCell.h

@@ -17,8 +17,6 @@ NS_ASSUME_NONNULL_BEGIN
 @interface XPMineFansTableViewCell : UITableViewCell
 ///粉丝信息
 @property (nonatomic,strong) FansInfoModel *fansInfo;
-///是否在房间中
-@property (nonatomic,assign) BOOL isInRoom;
 ///代理
 @property (nonatomic,weak) id<XPMineFansTableViewCellDelegate> delegate;
 

xplan-ios/Main/Mine/View/Cell/Friend/XPMineFansTableViewCell.m

@@ -51,7 +51,7 @@
 
 #pragma mark - Private Method
 - (void)initSubViews {
-	self.backgroundColor = [ThemeColor appCellBackgroundColor];
+	self.backgroundColor = [UIColor clearColor];
 	self.selectionStyle = UITableViewCellSelectionStyleNone;
 	[self.contentView addSubview:self.avatarImageView];
 	[self.contentView addSubview:self.stackView];
@@ -112,69 +112,85 @@
 	_fansInfo = fansInfo;
 	if (_fansInfo) {
 		self.avatarImageView.imageUrl = _fansInfo.avatar;
-		self.experImageView.imageUrl = _fansInfo.experUrl;
+		
-		self.charmImageView.imageUrl = _fansInfo.charmUrl;
-        self.nobleImageView.imageUrl = _fansInfo.userVipInfoVO.vipIcon;
 		self.nickLabel.text = _fansInfo.nick;
-		NSString *sexStr;
-		if (_fansInfo.gender == GenderType_Male) {
-			sexStr = @"common_male";
-		} else {
-			sexStr = @"common_female";
-		}
-		self.sexImageView.image = [UIImage imageNamed:sexStr];
 		self.signLabel.text = _fansInfo.userDesc && _fansInfo.userDesc.length > 0? _fansInfo.userDesc : @"这个人很懒还没有签名";
-		
+		if (!_fansInfo.isInRoom) {
-		BOOL isMyFriend = [[NIMSDK sharedSDK].userManager isMyFriend:_fansInfo.uid];
+			self.experImageView.hidden = NO;
-		self.attentionButton.enabled = !isMyFriend;
+			self.charmImageView.hidden = NO;
-		self.attentionButton.hidden = _fansInfo.isInRoom;
+			self.nobleImageView.hidden = NO;
-		UIImage* image = self.experImageView.image;
+			self.sexImageView.hidden = NO;
-		if (image) {
+			self.attentionButton.hidden = NO;
-			CGFloat scale = image.size.width / image.size.height;
+			self.experImageView.imageUrl = _fansInfo.experUrl;
-			[self.experImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+			self.charmImageView.imageUrl = _fansInfo.charmUrl;
-				make.size.mas_equalTo(CGSizeMake(20* scale, 20));
+			self.nobleImageView.imageUrl = _fansInfo.userVipInfoVO.vipIcon;
-			}];
+			NSString *sexStr;
+			if (_fansInfo.gender == GenderType_Male) {
+				sexStr = @"common_male";
+			} else {
+				sexStr = @"common_female";
+			}
+			self.sexImageView.image = [UIImage imageNamed:sexStr];
+			
+			
+			BOOL isMyFriend = [[NIMSDK sharedSDK].userManager isMyFriend:_fansInfo.uid];
+			self.attentionButton.enabled = !isMyFriend;
+			self.attentionButton.hidden = _fansInfo.isInRoom;
+			UIImage* image = self.experImageView.image;
+			if (image) {
+				CGFloat scale = image.size.width / image.size.height;
+				[self.experImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+					make.size.mas_equalTo(CGSizeMake(20* scale, 20));
+				}];
+			} else {
+				NSURL *imgUrl = [NSURL URLWithString:_fansInfo.experUrl];
+				UIImage *myImage = [UIImage imageWithData:[NSData dataWithContentsOfURL:imgUrl]];
+				CGFloat scale = myImage.size.width / myImage.size.height;
+				[self.experImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+					make.size.mas_equalTo(CGSizeMake(20* scale, 20));
+				}];
+			}
+			
+			UIImage* charmImage = self.charmImageView.image;
+			if (charmImage) {
+				CGFloat scale = charmImage.size.width / charmImage.size.height;
+				[self.charmImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+					make.size.mas_equalTo(CGSizeMake(20* scale, 20));
+				}];
+			} else {
+				NSURL *imgUrl = [NSURL URLWithString:_fansInfo.charmUrl];
+				UIImage *myImage = [UIImage imageWithData:[NSData dataWithContentsOfURL:imgUrl]];
+				CGFloat scale = myImage.size.width / myImage.size.height;
+				[self.charmImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+					make.size.mas_equalTo(CGSizeMake(20* scale, 20));
+				}];
+			}
+			
+			UIImage *nobleImage = self.nobleImageView.image;
+			if (nobleImage) {
+				CGFloat scale = nobleImage.size.width / nobleImage.size.height;
+				[self.nobleImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+					make.size.mas_equalTo(CGSizeMake(20* scale, 20));
+				}];
+			} else {
+				[self.nobleImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+					make.size.mas_equalTo(CGSizeMake(0, 20));
+				}];
+			}
+			
+			if (fansInfo.userVipInfoVO && fansInfo.userVipInfoVO.friendNickColour) {
+				self.nickLabel.textColor = [self colorWithHexString:fansInfo.userVipInfoVO.friendNickColour];
+			} else {
+				self.nickLabel.textColor = [ThemeColor mainTextColor];
+			}
 		} else {
-			NSURL *imgUrl = [NSURL URLWithString:_fansInfo.experUrl];
+			self.experImageView.hidden = YES;
-			UIImage *myImage = [UIImage imageWithData:[NSData dataWithContentsOfURL:imgUrl]];
+			self.charmImageView.hidden = YES;
-			CGFloat scale = myImage.size.width / myImage.size.height;
+			self.nobleImageView.hidden = YES;
-			[self.experImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+			self.sexImageView.hidden = YES;
-				make.size.mas_equalTo(CGSizeMake(20* scale, 20));
+			self.attentionButton.hidden = YES;
-			}];
+			self.nickLabel.textColor = [ThemeColor mainTextColor];
 		}
-		
-		UIImage* charmImage = self.charmImageView.image;
-		if (charmImage) {
-			CGFloat scale = charmImage.size.width / charmImage.size.height;
-			[self.charmImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-				make.size.mas_equalTo(CGSizeMake(20* scale, 20));
-			}];
-		} else {
-			NSURL *imgUrl = [NSURL URLWithString:_fansInfo.charmUrl];
-			UIImage *myImage = [UIImage imageWithData:[NSData dataWithContentsOfURL:imgUrl]];
-			CGFloat scale = myImage.size.width / myImage.size.height;
-			[self.charmImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-				make.size.mas_equalTo(CGSizeMake(20* scale, 20));
-			}];
-		}
-        
-        UIImage *nobleImage = self.nobleImageView.image;
-        if (nobleImage) {
-            CGFloat scale = nobleImage.size.width / nobleImage.size.height;
-            [self.nobleImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-                make.size.mas_equalTo(CGSizeMake(20* scale, 20));
-            }];
-        } else {
-            [self.nobleImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-                make.size.mas_equalTo(CGSizeMake(0, 20));
-            }];
-        }
-        
-        if (fansInfo.userVipInfoVO && fansInfo.userVipInfoVO.friendNickColour) {
-            self.nickLabel.textColor = [self colorWithHexString:fansInfo.userVipInfoVO.friendNickColour];
-        } else {
-            self.nickLabel.textColor = [ThemeColor mainTextColor];
-        }
 	}
 }
 

xplan-ios/Main/Mine/View/Cell/Friend/XPMineFriendTableViewCell.h

@@ -11,7 +11,8 @@ NS_ASSUME_NONNULL_BEGIN
 @class UserInfoModel;
 @interface XPMineFriendTableViewCell : UITableViewCell
 @property (nonatomic,strong) UserInfoModel *userInfo;
-
+///是否在房内聊天
+@property (nonatomic,assign) BOOL isInRoom;
 @end
 
 NS_ASSUME_NONNULL_END

xplan-ios/Main/Mine/View/Cell/Friend/XPMineFriendTableViewCell.m

@@ -47,7 +47,7 @@
 
 #pragma mark - Private Method
 - (void)initSubViews {
-	self.backgroundColor = [ThemeColor appCellBackgroundColor];
+	self.backgroundColor = [UIColor clearColor];
 	self.selectionStyle = UITableViewCellSelectionStyleNone;
 	[self.contentView addSubview:self.avatarImageView];
 	[self.contentView addSubview:self.stackView];
@@ -90,45 +90,52 @@
 	_userInfo = userInfo;
 	if (_userInfo) {
 		self.avatarImageView.imageUrl = _userInfo.avatar;
-		self.experImageView.imageUrl = _userInfo.userLevelVo.experUrl;
-		self.charmImageView.imageUrl = _userInfo.userLevelVo.charmUrl;
 		self.nickLabel.text = _userInfo.nick;
-		NSString *sexStr;
-		if (_userInfo.gender == GenderType_Male) {
-			sexStr = @"common_male";
-		} else {
-			sexStr = @"common_female";
-		}
-		self.sexImageView.image = [UIImage imageNamed:sexStr];
 		self.signLabel.text = _userInfo.userDesc && _userInfo.userDesc.length > 0? _userInfo.userDesc : @"这个人很懒还没有签名";
-		UIImage* image = self.experImageView.image;
+		if (self.isInRoom) {
-		if (image) {
+			self.experImageView.hidden = NO;
-			CGFloat scale = image.size.width / image.size.height;
+			self.charmImageView.hidden = NO;
-			[self.experImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+			self.experImageView.imageUrl = _userInfo.userLevelVo.experUrl;
-				make.size.mas_equalTo(CGSizeMake(20* scale, 20));
+			self.charmImageView.imageUrl = _userInfo.userLevelVo.charmUrl;
-			}];
+			NSString *sexStr;
+			if (_userInfo.gender == GenderType_Male) {
+				sexStr = @"common_male";
+			} else {
+				sexStr = @"common_female";
+			}
+			self.sexImageView.image = [UIImage imageNamed:sexStr];
+			UIImage* image = self.experImageView.image;
+			if (image) {
+				CGFloat scale = image.size.width / image.size.height;
+				[self.experImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+					make.size.mas_equalTo(CGSizeMake(20* scale, 20));
+				}];
+			} else {
+				NSURL *imgUrl = [NSURL URLWithString:_userInfo.userLevelVo.experUrl];
+				UIImage *myImage = [UIImage imageWithData:[NSData dataWithContentsOfURL:imgUrl]];
+				CGFloat scale = myImage.size.width / myImage.size.height;
+				[self.experImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+					make.size.mas_equalTo(CGSizeMake(20* scale, 20));
+				}];
+			}
+			
+			UIImage* charmImage = self.charmImageView.image;
+			if (charmImage) {
+				CGFloat scale = charmImage.size.width / charmImage.size.height;
+				[self.charmImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+					make.size.mas_equalTo(CGSizeMake(20* scale, 20));
+				}];
+			} else {
+				NSURL *imgUrl = [NSURL URLWithString:_userInfo.userLevelVo.charmUrl];
+				UIImage *myImage = [UIImage imageWithData:[NSData dataWithContentsOfURL:imgUrl]];
+				CGFloat scale = myImage.size.width / myImage.size.height;
+				[self.charmImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+					make.size.mas_equalTo(CGSizeMake(20* scale, 20));
+				}];
+			}
 		} else {
-			NSURL *imgUrl = [NSURL URLWithString:_userInfo.userLevelVo.experUrl];
+			self.experImageView.hidden = YES;
-			UIImage *myImage = [UIImage imageWithData:[NSData dataWithContentsOfURL:imgUrl]];
+			self.charmImageView.hidden = YES;
-			CGFloat scale = myImage.size.width / myImage.size.height;
-			[self.experImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-				make.size.mas_equalTo(CGSizeMake(20* scale, 20));
-			}];
-		}
-		
-		UIImage* charmImage = self.charmImageView.image;
-		if (charmImage) {
-			CGFloat scale = charmImage.size.width / charmImage.size.height;
-			[self.charmImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-				make.size.mas_equalTo(CGSizeMake(20* scale, 20));
-			}];
-		} else {
-			NSURL *imgUrl = [NSURL URLWithString:_userInfo.userLevelVo.charmUrl];
-			UIImage *myImage = [UIImage imageWithData:[NSData dataWithContentsOfURL:imgUrl]];
-			CGFloat scale = myImage.size.width / myImage.size.height;
-			[self.charmImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-				make.size.mas_equalTo(CGSizeMake(20* scale, 20));
-			}];
 		}
 	}
 }

xplan-ios/Main/Mine/View/Friend/XPMineFriendViewController.m

@@ -47,12 +47,14 @@
 - (void)viewDidLoad {
 	[super viewDidLoad];
 	NSArray * array  = [[NIMSDK sharedSDK].userManager myFriends];
-	NSMutableArray * uids = [NSMutableArray array];
+	if (array.count > 0) {
-	for (int i = 0; i< array.count; i++) {
+		NSMutableArray * uids = [NSMutableArray array];
-		NIMUser * user = [array objectAtIndex:i];
+		for (int i = 0; i< array.count; i++) {
-		[uids addObject:user.userId];
+			NIMUser * user = [array objectAtIndex:i];
+			[uids addObject:user.userId];
+		}
+		[self.presenter getUserListInfo:uids];
 	}
-	[self.presenter getUserListInfo:uids];
 	[self initSubViews];
 	[self initSubViewConstraints];
 }

xplan-ios/Main/Room/View/BaseUIContainerView/XPRoomFunctionContainerView.m

@@ -125,6 +125,8 @@
 @property (nonatomic,strong) XPRoomPKProgressView *roompkPanelView;
 ///pk详情
 @property (nonatomic,strong) RoomPKDetailInfoModel *pkDetailInfo;
+///是否正在加载打招呼
+@property (nonatomic,assign) BOOL isLoadGreet;
 @end
 
 @implementation XPRoomFunctionContainerView
@@ -316,7 +318,8 @@
 
 #pragma mark - 新用户打招呼动画
 - (void)handleNewUserGreet {
-	if (self.delegate.getUserInfo.fromType == UserEnterRoomFromType_New_User_Greet) {
+	if (self.delegate.getUserInfo.fromType == UserEnterRoomFromType_New_User_Greet && !self.isLoadGreet) {
+		self.isLoadGreet = YES;
 		dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
 			NSString * roomUid = [NSString stringWithFormat:@"%ld", self.delegate.getRoomInfo.uid];
 			[Api newUserStartGreet:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {

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

@@ -106,10 +106,16 @@
 }
 
 - (void)checkButtonAction:(UIButton *)sender {
-	[self closeButtonAction:sender];
+	[UIView animateWithDuration:.35 animations:^{
-	if (self.delegate && [self.delegate respondsToSelector:@selector(xPRoomNewUserGreetView:didClickCheckout:)]) {
+		CGRect frame = self.frame;
-		[self.delegate xPRoomNewUserGreetView:self didClickCheckout:sender];
+		frame.origin.x = -KScreenWidth;
-	}
+		self.frame= frame;
+	} completion:^(BOOL finished) {
+		[self removeFromSuperview];
+		if (self.delegate && [self.delegate respondsToSelector:@selector(xPRoomNewUserGreetView:didClickCheckout:)]) {
+			[self.delegate xPRoomNewUserGreetView:self didClickCheckout:sender];
+		}
+	}];
 }
 
 #pragma mark - Getters And Setters

xplan-ios/Main/Tabbar/View/TabbarViewController.m

@@ -142,7 +142,8 @@ NSString * const kUserFirstLoginKey = @"kUserFirstLoginKey";
 }
 
 - (void)getNewUserGreetInfoSucces:(NewUserGreetModel *)greetInfo {
-	[[NSUserDefaults standardUserDefaults] setBool:YES forKey:kUserFirstLoginKey];
+	NSString * key = [NSString stringWithFormat:@"%@_%@", kUserFirstLoginKey, [AccountInfoStorage instance].getUid];
+	[[NSUserDefaults standardUserDefaults] setBool:YES forKey:key];
 	if (greetInfo.sayHello) {
 		XPNewUserGreetRoomAlertView * alertView = [[XPNewUserGreetRoomAlertView alloc] init];
 		alertView.greetInfo = greetInfo;
@@ -336,8 +337,8 @@ NSString * const kUserFirstLoginKey = @"kUserFirstLoginKey";
 
 #pragma mark - 快捷进房
 - (void)initQuickEnterRoom {
-	BOOL isNotFirstLogin = [[NSUserDefaults standardUserDefaults] boolForKey:kUserFirstLoginKey];
+	NSString * key = [NSString stringWithFormat:@"%@_%@", kUserFirstLoginKey, [AccountInfoStorage instance].getUid];
-	isNotFirstLogin = NO;
+	BOOL isNotFirstLogin = [[NSUserDefaults standardUserDefaults] boolForKey:key];
 	if (isNotFirstLogin) {
 		[self.presenter getShortCutRecommendRoom];
 	} else {