Commit 30dc6ef8f4186d23df948a34dfb442fa2ec56221

Authored by zhangxiaowen
1 parent d3b55ace

no message

CNLiveMineModule/Classes/Controller/CNLiveMineController.m
@@ -271,11 +271,11 @@ static const CGFloat timeValue = 1.5; @@ -271,11 +271,11 @@ static const CGFloat timeValue = 1.5;
271 NSString *darenIdentity = [NSString stringWithFormat:@"%@",[data objectForKey:@"darenIdentity"]]; 271 NSString *darenIdentity = [NSString stringWithFormat:@"%@",[data objectForKey:@"darenIdentity"]];
272 if ([darenIdentity isEqualToString:@"1"]) { //普通用户 272 if ([darenIdentity isEqualToString:@"1"]) { //普通用户
273 CNUserShareModel.isDaren = 0; 273 CNUserShareModel.isDaren = 0;
274 - self.headerView.certificationImages = @[@"mine_overbadge",@"mine_common", @"mine_wjj_certification"]; 274 + self.headerView.certificationImages = @[@"mine_wjj_certification",@"mine_common",@"mine_overbadge"];
275 275
276 } else if ([darenIdentity isEqualToString:@"0"]) { //达人用户 276 } else if ([darenIdentity isEqualToString:@"0"]) { //达人用户
277 CNUserShareModel.isDaren = 1; 277 CNUserShareModel.isDaren = 1;
278 - self.headerView.certificationImages = @[@"mine_overbadge",@"mine_doyen", @"mine_wjj_certification"]; 278 + self.headerView.certificationImages = @[@"mine_wjj_certification",@"mine_doyen", @"mine_overbadge"];
279 279
280 } 280 }
281 } 281 }
CNLiveMineModule/Classes/View/CNLiveMineHeaderView.m
@@ -198,14 +198,14 @@ static const NSInteger margin = 20; @@ -198,14 +198,14 @@ static const NSInteger margin = 20;
198 // 2.添加表情图片 198 // 2.添加表情图片
199 NSTextAttachment *attch = [[NSTextAttachment alloc] init]; 199 NSTextAttachment *attch = [[NSTextAttachment alloc] init];
200 // 表情图片 200 // 表情图片
201 - UIImage *xw_image = [self getImageWithImageName:image bundleName:@"CNLiveMineModule" targetClass:[CNLiveMineHeaderView class]]; 201 + UIImage *xw_image = [self getImageWithImageName:image bundleName:@"CNLiveMineModule" targetClass:[self class]];
202 attch.image = xw_image; 202 attch.image = xw_image;
203 // 创建带有图片的富文本 203 // 创建带有图片的富文本
204 NSAttributedString *str = [NSAttributedString attributedStringWithAttachment:attch]; 204 NSAttributedString *str = [NSAttributedString attributedStringWithAttachment:attch];
205 NSAttributedString *space = [[NSAttributedString alloc]initWithString:@" "]; 205 NSAttributedString *space = [[NSAttributedString alloc]initWithString:@" "];
206 206
207 - [attri insertAttributedString:space atIndex:0];  
208 - [attri insertAttributedString:str atIndex:0];// 插入某个位置 207 + [attri insertAttributedString:str atIndex:attri.length];// 插入某个位置
  208 + [attri insertAttributedString:space atIndex:attri.length];
209 209
210 } 210 }
211 return attri; 211 return attri;
@@ -294,7 +294,7 @@ static const NSInteger margin = 20; @@ -294,7 +294,7 @@ static const NSInteger margin = 20;
294 _certification.numberOfLines = 1; 294 _certification.numberOfLines = 1;
295 _certification.textColor = [UIColor whiteColor]; 295 _certification.textColor = [UIColor whiteColor];
296 _certification.font = [UIFont systemFontOfSize:16]; 296 _certification.font = [UIFont systemFontOfSize:16];
297 - _certification.attributedText = [self createAttributedImages:@[@"mine_overbadge",@"mine_common", @"mine_wjj_certification"]]; 297 + _certification.attributedText = [self createAttributedImages:@[@"mine_wjj_certification",@"mine_common",@"mine_overbadge"]];
298 } 298 }
299 return _certification; 299 return _certification;
300 } 300 }
Example/CNLiveMineModule/CNLIVEAppDelegate.m
@@ -20,6 +20,7 @@ @@ -20,6 +20,7 @@
20 // Override point for customization after application launch. 20 // Override point for customization after application launch.
21 self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds]; 21 self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
22 [CNLiveEnvironmentManager setEnvironment:CNLiveDebugAppStore]; 22 [CNLiveEnvironmentManager setEnvironment:CNLiveDebugAppStore];
  23 +// [CNLiveEnvironmentManager setEnvironment:CNLiveProductionAppStore];
23 [CNLiveUserSystemCenter setAppId:AppId appKey:APPKey appSecret:AppSecret isTestEnvironment:TestEnvironment]; 24 [CNLiveUserSystemCenter setAppId:AppId appKey:APPKey appSecret:AppSecret isTestEnvironment:TestEnvironment];
24 if ([CNUserShareManager isLogin]) { 25 if ([CNUserShareManager isLogin]) {
25 [CNLiveUserSystemCenter setUserId:CNUserShareModel.uid]; 26 [CNLiveUserSystemCenter setUserId:CNUserShareModel.uid];