Commit ce9184aedb35265dc05f80de79b56faedb2c908a
1 parent
4c6430bd
no message
Showing
2 changed files
with
8 additions
and
4 deletions
CNLiveQrCodeModule/Classes/View/CNLiveGroupQrCodeView.m
| @@ -12,6 +12,8 @@ | @@ -12,6 +12,8 @@ | ||
| 12 | #import "QMUIKit.h" | 12 | #import "QMUIKit.h" |
| 13 | #import "SGQRCode.h"//二维码库 | 13 | #import "SGQRCode.h"//二维码库 |
| 14 | 14 | ||
| 15 | +#import "CNUserInfoManager.h" | ||
| 16 | + | ||
| 15 | //#import "SGQRCodeGenerateManager.h" | 17 | //#import "SGQRCodeGenerateManager.h" |
| 16 | //#import "CNLiveGroupAvatorManager.h" | 18 | //#import "CNLiveGroupAvatorManager.h" |
| 17 | 19 |
CNLiveQrCodeModule/Classes/View/CNLiveMyQrCodeView.m
| @@ -12,6 +12,8 @@ | @@ -12,6 +12,8 @@ | ||
| 12 | #import "QMUIKit.h" | 12 | #import "QMUIKit.h" |
| 13 | #import "SGQRCode.h"//二维码库 | 13 | #import "SGQRCode.h"//二维码库 |
| 14 | 14 | ||
| 15 | +#import "CNUserInfoManager.h" | ||
| 16 | + | ||
| 15 | #import "CNLiveNetworking.h" | 17 | #import "CNLiveNetworking.h" |
| 16 | #import "CNLiveEnvironment.h" | 18 | #import "CNLiveEnvironment.h" |
| 17 | 19 | ||
| @@ -97,7 +99,7 @@ static const CGFloat timeValue = 1.5; | @@ -97,7 +99,7 @@ static const CGFloat timeValue = 1.5; | ||
| 97 | - (void)generateQRCode:(NSString *)type{ | 99 | - (void)generateQRCode:(NSString *)type{ |
| 98 | NSDictionary *params = @{ | 100 | NSDictionary *params = @{ |
| 99 | @"appId":AppId, | 101 | @"appId":AppId, |
| 100 | - @"sid":@"10514405", | 102 | + @"sid":CNUserShareModel.uid, |
| 101 | @"type":type | 103 | @"type":type |
| 102 | }; | 104 | }; |
| 103 | [CNLiveNetworking setAllowRequestDefaultArgument:YES]; | 105 | [CNLiveNetworking setAllowRequestDefaultArgument:YES]; |
| @@ -155,7 +157,7 @@ static const CGFloat timeValue = 1.5; | @@ -155,7 +157,7 @@ static const CGFloat timeValue = 1.5; | ||
| 155 | _header.layer.masksToBounds = YES; | 157 | _header.layer.masksToBounds = YES; |
| 156 | _header.layer.cornerRadius = 5; | 158 | _header.layer.cornerRadius = 5; |
| 157 | UIImage *xw_image = [self xw_getImageName:@"default_avatar_f" bundleName:@"CNLiveQrCodeModule" targetClass:[CNLiveMyQrCodeView class]]; | 159 | UIImage *xw_image = [self xw_getImageName:@"default_avatar_f" bundleName:@"CNLiveQrCodeModule" targetClass:[CNLiveMyQrCodeView class]]; |
| 158 | - [_header sd_setImageWithURL:[NSURL URLWithString:@"User_Head"] placeholderImage:xw_image]; | 160 | + [_header sd_setImageWithURL:[NSURL URLWithString:CNUserShareModel.faceUrl] placeholderImage:xw_image]; |
| 159 | } | 161 | } |
| 160 | return _header; | 162 | return _header; |
| 161 | } | 163 | } |
| @@ -166,7 +168,7 @@ static const CGFloat timeValue = 1.5; | @@ -166,7 +168,7 @@ static const CGFloat timeValue = 1.5; | ||
| 166 | _name.numberOfLines = 1; | 168 | _name.numberOfLines = 1; |
| 167 | _name.textColor = [UIColor colorWithRed:51/255.0 green:51/255.0 blue:51/255.0 alpha:1.0]; | 169 | _name.textColor = [UIColor colorWithRed:51/255.0 green:51/255.0 blue:51/255.0 alpha:1.0]; |
| 168 | _name.font = [UIFont systemFontOfSize:16]; | 170 | _name.font = [UIFont systemFontOfSize:16]; |
| 169 | - _name.text = @"User_Name"; | 171 | + _name.text = CNUserShareModel.nickname; |
| 170 | } | 172 | } |
| 171 | return _name; | 173 | return _name; |
| 172 | } | 174 | } |
| @@ -176,7 +178,7 @@ static const CGFloat timeValue = 1.5; | @@ -176,7 +178,7 @@ static const CGFloat timeValue = 1.5; | ||
| 176 | _address.numberOfLines = 1; | 178 | _address.numberOfLines = 1; |
| 177 | _address.textColor = [UIColor colorWithRed:51/255.0 green:51/255.0 blue:51/255.0 alpha:1.0]; | 179 | _address.textColor = [UIColor colorWithRed:51/255.0 green:51/255.0 blue:51/255.0 alpha:1.0]; |
| 178 | _address.font = [UIFont systemFontOfSize:14]; | 180 | _address.font = [UIFont systemFontOfSize:14]; |
| 179 | - _address.text = @"User_Address"; | 181 | + _address.text = CNUserShareModel.location; |
| 180 | } | 182 | } |
| 181 | return _address; | 183 | return _address; |
| 182 | } | 184 | } |