Merge branch 'develop' of http://git.yoho.cn/ios/Yoho_LivePush into develop

@@ -42,7 +42,7 @@
     }
     }
     
     
     
     
-    self.nameLabel.text = [NSString stringWithFormat:@"  @%@加入了  ", name];
+    self.nameLabel.text = [NSString stringWithFormat:@"  @%@已加入  ", name];
 //    CGFloat nameWidth = [self.nameLabel.text boundingRectWithSize:CGSizeMake(kUserNameWidth, 20) options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName : kFontName} context:nil].size.width;
 //    CGFloat nameWidth = [self.nameLabel.text boundingRectWithSize:CGSizeMake(kUserNameWidth, 20) options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName : kFontName} context:nil].size.width;
 //    [self.nameLabel setWidth:nameWidth];
 //    [self.nameLabel setWidth:nameWidth];
 
 
@@ -58,7 +58,7 @@
         [_nameLabel setTextAlignment:NSTextAlignmentLeft];
         [_nameLabel setTextAlignment:NSTextAlignmentLeft];
         [_nameLabel.layer setCornerRadius:6.0f];
         [_nameLabel.layer setCornerRadius:6.0f];
         [_nameLabel setClipsToBounds:YES];
         [_nameLabel setClipsToBounds:YES];
-        [_nameLabel setBackgroundColor:[UIColor colorWithRed:1 green:1 blue:1 alpha:0.7]];
+        [_nameLabel setBackgroundColor:[UIColor colorWithRed:1 green:1 blue:1 alpha:0.4]];
     }
     }
     
     
     return _nameLabel;
     return _nameLabel;

@@ -23,8 +23,8 @@
 #define kUserAvatarWidth 35
 #define kUserAvatarWidth 35
 #define kUserNameLableMaxWidth (150 * kScreenPointScale)
 #define kUserNameLableMaxWidth (150 * kScreenPointScale)
 
 
-#define kFontUserName [UIFont systemFontOfSize:11]
-#define kFontUserMsg [UIFont systemFontOfSize:13]
+#define kFontUserName [UIFont fontOfLightWithSize:11]
+#define kFontUserMsg [UIFont fontOfSCWithSize:13]
 
 
 
 
 @interface YH_BarrageMsgCell()
 @interface YH_BarrageMsgCell()
@@ -140,7 +140,7 @@
 {
 {
     if (_bgview == nil) {
     if (_bgview == nil) {
         _bgview = [[UIView alloc]initWithFrame:CGRectZero];
         _bgview = [[UIView alloc]initWithFrame:CGRectZero];
-        [_bgview setBackgroundColor:[UIColor colorWithRed:0 green:0 blue:0 alpha:0.7]];
+        [_bgview setBackgroundColor:[UIColor colorWithRed:0 green:0 blue:0 alpha:0.4]];
         [_bgview.layer setCornerRadius:6.0f];
         [_bgview.layer setCornerRadius:6.0f];
         
         
     }
     }
@@ -164,7 +164,7 @@
 {
 {
     if (_nameLabel == nil) {
     if (_nameLabel == nil) {
         _nameLabel = [[UILabel alloc]init];
         _nameLabel = [[UILabel alloc]init];
-        [_nameLabel setTextColor:[UIColor whiteColor]];
+        [_nameLabel setTextColor:[UIColor colorWithHexString:@"#B0B0B0"]];
         [_nameLabel setTextAlignment:NSTextAlignmentLeft];
         [_nameLabel setTextAlignment:NSTextAlignmentLeft];
         [_nameLabel setFont:kFontUserName];
         [_nameLabel setFont:kFontUserName];
         [_nameLabel setBackgroundColor:[UIColor clearColor]];
         [_nameLabel setBackgroundColor:[UIColor clearColor]];