iOS Team / CNLiveMineModule · Commits

Commit 8b532500467959316b48d50d695314c2ae13a10b

Authored by zhangxiaowen
1 parent c9750ecc

no message

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