Commit 8b532500467959316b48d50d695314c2ae13a10b
1 parent
c9750ecc
no message
Showing
2 changed files
with
9 additions
and
8 deletions
CNLiveMineModule/Classes/UserInfo/CNLiveUserInfoCell.m
| @@ -56,8 +56,8 @@ static const NSInteger margin = 12; | @@ -56,8 +56,8 @@ static const NSInteger margin = 12; | ||
| 56 | _pic.contentMode = UIViewContentModeScaleToFill; | 56 | _pic.contentMode = UIViewContentModeScaleToFill; |
| 57 | _pic.layer.masksToBounds = YES; | 57 | _pic.layer.masksToBounds = YES; |
| 58 | _pic.layer.cornerRadius = 5.0; | 58 | _pic.layer.cornerRadius = 5.0; |
| 59 | - UIImage *xw_image = [self xw_getImageName:model.content bundleName:@"CNLiveMineModule" targetClass:[CNLiveUserInfoCell class]]; | ||
| 60 | - [_pic sd_setImageWithURL:[NSURL URLWithString:@"头像"] placeholderImage:xw_image]; | 59 | + UIImage *xw_image = [self xw_getImageName:@"default_avatar_f" bundleName:@"CNLiveMineModule" targetClass:[CNLiveUserInfoCell class]]; |
| 60 | + [_pic sd_setImageWithURL:[NSURL URLWithString:model.content] placeholderImage:xw_image]; | ||
| 61 | 61 | ||
| 62 | }else if (model.dataType == CNLiveUserInfoDataTypeNickname){ | 62 | }else if (model.dataType == CNLiveUserInfoDataTypeNickname){ |
| 63 | 63 |
CNLiveMineModule/Classes/UserInfo/CNLiveUserInfoController.m
| @@ -10,6 +10,8 @@ | @@ -10,6 +10,8 @@ | ||
| 10 | #import "MJExtension.h" | 10 | #import "MJExtension.h" |
| 11 | #import "QMUIKit.h" | 11 | #import "QMUIKit.h" |
| 12 | 12 | ||
| 13 | +#import "CNUserInfoManager.h" | ||
| 14 | + | ||
| 13 | #import "CNLiveUserInfoCell.h" | 15 | #import "CNLiveUserInfoCell.h" |
| 14 | #import "CNLiveUserInfoModel.h" | 16 | #import "CNLiveUserInfoModel.h" |
| 15 | #import "CNLiveInfoUpdateController.h" | 17 | #import "CNLiveInfoUpdateController.h" |
| @@ -34,7 +36,7 @@ | @@ -34,7 +36,7 @@ | ||
| 34 | @"layout":@"2", | 36 | @"layout":@"2", |
| 35 | @"data":@"0", | 37 | @"data":@"0", |
| 36 | @"title":@"头像", | 38 | @"title":@"头像", |
| 37 | - @"content":@"default_avatar_f", | 39 | + @"content":CNUserShareModel.faceUrl, |
| 38 | @"height":@"81", | 40 | @"height":@"81", |
| 39 | @"lineHeight":@"0.5" | 41 | @"lineHeight":@"0.5" |
| 40 | }, | 42 | }, |
| @@ -42,7 +44,7 @@ | @@ -42,7 +44,7 @@ | ||
| 42 | @"layout":@"1", | 44 | @"layout":@"1", |
| 43 | @"data":@"1", | 45 | @"data":@"1", |
| 44 | @"title":@"昵称", | 46 | @"title":@"昵称", |
| 45 | - @"content":@"User_Name", | 47 | + @"content":CNUserShareModel.nickname, |
| 46 | @"height":@"51", | 48 | @"height":@"51", |
| 47 | @"lineHeight":@"0.5" | 49 | @"lineHeight":@"0.5" |
| 48 | }, | 50 | }, |
| @@ -50,7 +52,7 @@ | @@ -50,7 +52,7 @@ | ||
| 50 | @"layout":@"1", | 52 | @"layout":@"1", |
| 51 | @"data":@"2", | 53 | @"data":@"2", |
| 52 | @"title":@"性别", | 54 | @"title":@"性别", |
| 53 | - @"content":@"User_Gender", | 55 | + @"content":CNUserShareModel.gender, |
| 54 | @"height":@"60", | 56 | @"height":@"60", |
| 55 | @"lineHeight":@"10" | 57 | @"lineHeight":@"10" |
| 56 | }, | 58 | }, |
| @@ -66,7 +68,7 @@ | @@ -66,7 +68,7 @@ | ||
| 66 | @"layout":@"1", | 68 | @"layout":@"1", |
| 67 | @"data":@"4", | 69 | @"data":@"4", |
| 68 | @"title":@"地区", | 70 | @"title":@"地区", |
| 69 | - @"content":@"User_Address", | 71 | + @"content":CNUserShareModel.location, |
| 70 | @"height":@"60", | 72 | @"height":@"60", |
| 71 | @"lineHeight":@"10" | 73 | @"lineHeight":@"10" |
| 72 | }, | 74 | }, |
| @@ -74,8 +76,7 @@ | @@ -74,8 +76,7 @@ | ||
| 74 | @"layout":@"1", | 76 | @"layout":@"1", |
| 75 | @"data":@"5", | 77 | @"data":@"5", |
| 76 | @"title":@"个性签名", | 78 | @"title":@"个性签名", |
| 77 | -// @"content":User_Introduction?User_Introduction:@"懒到没签名!!!", | ||
| 78 | - @"content":@"懒到没签名!!!", | 79 | + @"content":CNUserShareModel.signature?CNUserShareModel.signature:@"懒到没签名!!!", |
| 79 | @"height":@"51", | 80 | @"height":@"51", |
| 80 | @"lineHeight":@"0.5" | 81 | @"lineHeight":@"0.5" |
| 81 | } | 82 | } |