Commit a06e038a81f661555d182f8595e63bc9cd2c542e

Authored by zhangxiaowen
1 parent ddd6c8e6

no message

CNLiveIntegralModule/Classes/Controller/CNLiveTaskListController.m
@@ -325,7 +325,7 @@ @@ -325,7 +325,7 @@
325 _backButton.adjustsImageWhenHighlighted = NO; 325 _backButton.adjustsImageWhenHighlighted = NO;
326 _backButton.frame = CGRectMake(15, StatusBarHeight, 44, 44); 326 _backButton.frame = CGRectMake(15, StatusBarHeight, 44, 44);
327 [_backButton setContentHorizontalAlignment:UIControlContentHorizontalAlignmentLeft]; 327 [_backButton setContentHorizontalAlignment:UIControlContentHorizontalAlignmentLeft];
328 - UIImage *image = [UIImage cn_getImageName:@"mine_back_white_b" bundleName:@"CNLiveIntegralModule" targetClass:[self class]]; 328 + UIImage *image = [self getImageWithImageName:@"mine_back_white_b" bundleName:@"CNLiveIntegralModule" targetClass:[self class]];
329 [_backButton setImage:image forState:UIControlStateNormal]; 329 [_backButton setImage:image forState:UIControlStateNormal];
330 [_backButton addTarget:self action:@selector(backAction:) forControlEvents:UIControlEventTouchUpInside]; 330 [_backButton addTarget:self action:@selector(backAction:) forControlEvents:UIControlEventTouchUpInside];
331 } 331 }
@@ -371,7 +371,7 @@ @@ -371,7 +371,7 @@
371 - (CNLiveTaskListHeaderView *)headView{ 371 - (CNLiveTaskListHeaderView *)headView{
372 if (!_headView) { 372 if (!_headView) {
373 _headView = [[CNLiveTaskListHeaderView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, NavigationContentTop+SCREEN_WIDTH*100/375.0)]; 373 _headView = [[CNLiveTaskListHeaderView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, NavigationContentTop+SCREEN_WIDTH*100/375.0)];
374 - UIImage *image = [UIImage cn_getImageName:@"integrate_list_bg" bundleName:@"CNLiveIntegralModule" targetClass:[CNLiveTaskListController class]]; 374 + UIImage *image = [self getImageWithImageName:@"integrate_list_bg" bundleName:@"CNLiveIntegralModule" targetClass:[CNLiveTaskListController class]];
375 _headView.image = image; 375 _headView.image = image;
376 _headView.delegate = self; 376 _headView.delegate = self;
377 } 377 }
CNLiveIntegralModule/Classes/Tools/CNLiveAddScoreView.m
@@ -263,7 +263,7 @@ @@ -263,7 +263,7 @@
263 if (!_midImage) { 263 if (!_midImage) {
264 _midImage = [[UIImageView alloc] init]; 264 _midImage = [[UIImageView alloc] init];
265 _midImage.userInteractionEnabled = YES; 265 _midImage.userInteractionEnabled = YES;
266 - UIImage *image = [UIImage cn_getImageName:@"add_score_bg" bundleName:@"CNLiveIntegralModule" targetClass:[self class]]; 266 + UIImage *image = [self getImageWithImageName:@"add_score_bg" bundleName:@"CNLiveIntegralModule" targetClass:[self class]];
267 _midImage.image = image; 267 _midImage.image = image;
268 _midImage.contentMode = UIViewContentModeCenter; 268 _midImage.contentMode = UIViewContentModeCenter;
269 } 269 }
@@ -273,7 +273,7 @@ @@ -273,7 +273,7 @@
273 if (!_scoreBtn) { 273 if (!_scoreBtn) {
274 _scoreBtn = [UIButton buttonWithType:UIButtonTypeCustom]; 274 _scoreBtn = [UIButton buttonWithType:UIButtonTypeCustom];
275 _scoreBtn.adjustsImageWhenHighlighted = NO; 275 _scoreBtn.adjustsImageWhenHighlighted = NO;
276 - UIImage *image = [UIImage cn_getImageName:@"add_score_label" bundleName:@"CNLiveIntegralModule" targetClass:[self class]]; 276 + UIImage *image = [self getImageWithImageName:@"add_score_label" bundleName:@"CNLiveIntegralModule" targetClass:[self class]];
277 [_scoreBtn setImage:image forState:UIControlStateNormal]; 277 [_scoreBtn setImage:image forState:UIControlStateNormal];
278 [_scoreBtn addTarget:self action:@selector(clickedCloseBtn:) forControlEvents:UIControlEventTouchUpInside]; 278 [_scoreBtn addTarget:self action:@selector(clickedCloseBtn:) forControlEvents:UIControlEventTouchUpInside];
279 279
@@ -296,7 +296,7 @@ @@ -296,7 +296,7 @@
296 if(!_colseBtn){ 296 if(!_colseBtn){
297 _colseBtn = [UIButton buttonWithType:UIButtonTypeCustom]; 297 _colseBtn = [UIButton buttonWithType:UIButtonTypeCustom];
298 [_colseBtn addTarget:self action:@selector(clickedClose) forControlEvents:UIControlEventTouchUpInside]; 298 [_colseBtn addTarget:self action:@selector(clickedClose) forControlEvents:UIControlEventTouchUpInside];
299 - UIImage *image = [UIImage cn_getImageName:@"add_score_close" bundleName:@"CNLiveIntegralModule" targetClass:[self class]]; 299 + UIImage *image = [self getImageWithImageName:@"add_score_close" bundleName:@"CNLiveIntegralModule" targetClass:[self class]];
300 [_colseBtn setImage:image forState:UIControlStateNormal]; 300 [_colseBtn setImage:image forState:UIControlStateNormal];
301 301
302 } 302 }
CNLiveIntegralModule/Classes/Tools/CNLiveGoldWhereaboutsView.m
@@ -88,7 +88,7 @@ @@ -88,7 +88,7 @@
88 snowFlake.emissionRange = 0.5 * M_PI; 88 snowFlake.emissionRange = 0.5 * M_PI;
89 snowFlake.spinRange = 0.25 * M_PI; 89 snowFlake.spinRange = 0.25 * M_PI;
90 90
91 - UIImage *image = [UIImage cn_getImageName:[NSString stringWithFormat:@"gold_whereabouts%d",i] bundleName:@"CNLiveIntegralModule" targetClass:[self class]]; 91 + UIImage *image = [self getImageWithImageName:[NSString stringWithFormat:@"gold_whereabouts%d",i] bundleName:@"CNLiveIntegralModule" targetClass:[self class]];
92 snowFlake.contents = (__bridge id _Nullable)(image.CGImage); 92 snowFlake.contents = (__bridge id _Nullable)(image.CGImage);
93 snowFlake.lifetime = 100.f; 93 snowFlake.lifetime = 100.f;
94 94
CNLiveIntegralModule/Classes/Tools/CNLiveSignInView.m
@@ -196,7 +196,7 @@ static const NSInteger margin = 15; @@ -196,7 +196,7 @@ static const NSInteger margin = 15;
196 if (!_bgView) { 196 if (!_bgView) {
197 _bgView = [[UIImageView alloc] init]; 197 _bgView = [[UIImageView alloc] init];
198 _bgView.userInteractionEnabled = YES; 198 _bgView.userInteractionEnabled = YES;
199 - UIImage *image = [UIImage cn_getImageName:@"sign_allday_bg" bundleName:@"CNLiveIntegralModule" targetClass:[self class]]; 199 + UIImage *image = [self getImageWithImageName:@"sign_allday_bg" bundleName:@"CNLiveIntegralModule" targetClass:[self class]];
200 _bgView.image = image; 200 _bgView.image = image;
201 } 201 }
202 return _bgView; 202 return _bgView;
@@ -207,7 +207,7 @@ static const NSInteger margin = 15; @@ -207,7 +207,7 @@ static const NSInteger margin = 15;
207 _scoreBtn.titleLabel.font = [UIFont fontWithName:@"Helvetica-Bold" size:20]; 207 _scoreBtn.titleLabel.font = [UIFont fontWithName:@"Helvetica-Bold" size:20];
208 // [_scoreBtn addTarget:self action:@selector(clickScoreBtn:) forControlEvents:UIControlEventTouchUpInside]; 208 // [_scoreBtn addTarget:self action:@selector(clickScoreBtn:) forControlEvents:UIControlEventTouchUpInside];
209 [_scoreBtn setTitle:@"+0" forState:UIControlStateNormal]; 209 [_scoreBtn setTitle:@"+0" forState:UIControlStateNormal];
210 - UIImage *image = [UIImage cn_getImageName:@"sign_in_soccer" bundleName:@"CNLiveIntegralModule" targetClass:[self class]]; 210 + UIImage *image = [self getImageWithImageName:@"sign_in_soccer" bundleName:@"CNLiveIntegralModule" targetClass:[self class]];
211 [_scoreBtn setImage:image forState:UIControlStateNormal]; 211 [_scoreBtn setImage:image forState:UIControlStateNormal];
212 [_scoreBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; 212 [_scoreBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
213 _scoreBtn.adjustsImageWhenHighlighted = NO; 213 _scoreBtn.adjustsImageWhenHighlighted = NO;
@@ -244,7 +244,7 @@ static const NSInteger margin = 15; @@ -244,7 +244,7 @@ static const NSInteger margin = 15;
244 _closeBtn = [UIButton buttonWithType:UIButtonTypeCustom]; 244 _closeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
245 _closeBtn.titleLabel.font = UIFontMake(12); 245 _closeBtn.titleLabel.font = UIFontMake(12);
246 [_closeBtn addTarget:self action:@selector(clickCloseBtn:) forControlEvents:UIControlEventTouchUpInside]; 246 [_closeBtn addTarget:self action:@selector(clickCloseBtn:) forControlEvents:UIControlEventTouchUpInside];
247 - UIImage *image = [UIImage cn_getImageName:@"sign_day_close" bundleName:@"CNLiveIntegralModule" targetClass:[self class]]; 247 + UIImage *image = [self getImageWithImageName:@"sign_day_close" bundleName:@"CNLiveIntegralModule" targetClass:[self class]];
248 [_closeBtn setImage:image forState:UIControlStateNormal]; 248 [_closeBtn setImage:image forState:UIControlStateNormal];
249 _closeBtn.adjustsImageWhenHighlighted = NO; 249 _closeBtn.adjustsImageWhenHighlighted = NO;
250 250
CNLiveIntegralModule/Classes/View/CNLiveIntegralDetailsTableViewCell.m
@@ -124,7 +124,7 @@ static const NSInteger margin = 15; @@ -124,7 +124,7 @@ static const NSInteger margin = 15;
124 _scoresBtn = [QMUIButton buttonWithType:UIButtonTypeCustom]; 124 _scoresBtn = [QMUIButton buttonWithType:UIButtonTypeCustom];
125 _scoresBtn.titleLabel.font = UIFontMake(14); 125 _scoresBtn.titleLabel.font = UIFontMake(14);
126 [_scoresBtn setTitleColor:[UIColor colorWithRed:249/255.0 green:171/255.0 blue:37/255.0 alpha:1.0] forState:UIControlStateNormal]; 126 [_scoresBtn setTitleColor:[UIColor colorWithRed:249/255.0 green:171/255.0 blue:37/255.0 alpha:1.0] forState:UIControlStateNormal];
127 - UIImage *image = [UIImage cn_getImageName:@"mf_soccer_smallcoin" bundleName:@"CNLiveIntegralModule" targetClass:[self class]]; 127 + UIImage *image = [self getImageWithImageName:@"mf_soccer_smallcoin" bundleName:@"CNLiveIntegralModule" targetClass:[self class]];
128 [_scoresBtn setImage:image forState:UIControlStateNormal]; 128 [_scoresBtn setImage:image forState:UIControlStateNormal];
129 _scoresBtn.adjustsImageWhenHighlighted = NO; 129 _scoresBtn.adjustsImageWhenHighlighted = NO;
130 _scoresBtn.spacingBetweenImageAndTitle = 5; 130 _scoresBtn.spacingBetweenImageAndTitle = 5;
CNLiveIntegralModule/Classes/View/CNLiveIntegralNavigationBar.m
@@ -60,7 +60,7 @@ static const NSInteger margin = 15; @@ -60,7 +60,7 @@ static const NSInteger margin = 15;
60 _left= [UIButton buttonWithType:UIButtonTypeCustom]; 60 _left= [UIButton buttonWithType:UIButtonTypeCustom];
61 _left.adjustsImageWhenHighlighted = NO; 61 _left.adjustsImageWhenHighlighted = NO;
62 _left.frame = CGRectMake(margin, StatusBarHeight, NavigationBarHeight, NavigationBarHeight); 62 _left.frame = CGRectMake(margin, StatusBarHeight, NavigationBarHeight, NavigationBarHeight);
63 - UIImage *image = [UIImage cn_getImageName:@"code_back_black_b" bundleName:@"CNLiveIntegralModule" targetClass:[self class]]; 63 + UIImage *image = [self getImageWithImageName:@"code_back_black_b" bundleName:@"CNLiveIntegralModule" targetClass:[self class]];
64 [_left setImage:[image imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] forState:UIControlStateNormal]; 64 [_left setImage:[image imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] forState:UIControlStateNormal];
65 [_left setContentHorizontalAlignment:UIControlContentHorizontalAlignmentLeft]; 65 [_left setContentHorizontalAlignment:UIControlContentHorizontalAlignmentLeft];
66 [_left addTarget:self action:@selector(goBack) forControlEvents:UIControlEventTouchUpInside]; 66 [_left addTarget:self action:@selector(goBack) forControlEvents:UIControlEventTouchUpInside];
CNLiveIntegralModule/Classes/View/CNLiveSignInButtonSelectView.m
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
38 _selectView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 27, 27)]; 38 _selectView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 27, 27)];
39 _selectView.center = self.center; 39 _selectView.center = self.center;
40 _selectView.userInteractionEnabled = YES; 40 _selectView.userInteractionEnabled = YES;
41 - UIImage *image = [UIImage cn_getImageName:@"sign_day_select" bundleName:@"CNLiveIntegralModule" targetClass:[self class]]; 41 + UIImage *image = [self getImageWithImageName:@"sign_day_select" bundleName:@"CNLiveIntegralModule" targetClass:[self class]];
42 _selectView.image = image; 42 _selectView.image = image;
43 } 43 }
44 return _selectView; 44 return _selectView;
CNLiveIntegralModule/Classes/View/CNLiveSignInButtonView.m
@@ -39,7 +39,7 @@ static const NSInteger margin = 6; @@ -39,7 +39,7 @@ static const NSInteger margin = 6;
39 btn.frame = CGRectMake(i<4?i*(width+margin):(i-4)*(width+margin), i<4?0:(margin+height), width, height); 39 btn.frame = CGRectMake(i<4?i*(width+margin):(i-4)*(width+margin), i<4?0:(margin+height), width, height);
40 40
41 [btn addTarget:self action:@selector(clickBtn:) forControlEvents:UIControlEventTouchUpInside]; 41 [btn addTarget:self action:@selector(clickBtn:) forControlEvents:UIControlEventTouchUpInside];
42 - UIImage *image = [UIImage cn_getImageName:@"sign_day_bg" bundleName:@"CNLiveIntegralModule" targetClass:[self class]]; 42 + UIImage *image = [self getImageWithImageName:@"sign_day_bg" bundleName:@"CNLiveIntegralModule" targetClass:[self class]];
43 [btn setImage:image forState:UIControlStateNormal]; 43 [btn setImage:image forState:UIControlStateNormal];
44 btn.adjustsImageWhenHighlighted = NO; 44 btn.adjustsImageWhenHighlighted = NO;
45 btn.userInteractionEnabled = NO; 45 btn.userInteractionEnabled = NO;
@@ -48,7 +48,7 @@ static const NSInteger margin = 6; @@ -48,7 +48,7 @@ static const NSInteger margin = 6;
48 48
49 if(i == 6){ 49 if(i == 6){
50 btn.width = 2*width+margin; 50 btn.width = 2*width+margin;
51 - UIImage *image = [UIImage cn_getImageName:@"sign_day_bg7" bundleName:@"CNLiveIntegralModule" targetClass:[self class]]; 51 + UIImage *image = [self getImageWithImageName:@"sign_day_bg7" bundleName:@"CNLiveIntegralModule" targetClass:[self class]];
52 [btn setImage:image forState:UIControlStateNormal]; 52 [btn setImage:image forState:UIControlStateNormal];
53 53
54 } 54 }
CNLiveIntegralModule/Classes/View/CNLiveTaskListHeaderView.m
@@ -102,7 +102,7 @@ static const NSInteger margin = 15; @@ -102,7 +102,7 @@ static const NSInteger margin = 15;
102 _headView.layer.masksToBounds = YES; 102 _headView.layer.masksToBounds = YES;
103 _headView.layer.borderColor = [UIColor whiteColor].CGColor; 103 _headView.layer.borderColor = [UIColor whiteColor].CGColor;
104 _headView.layer.borderWidth = 1.5; 104 _headView.layer.borderWidth = 1.5;
105 - UIImage *xw_image = [UIImage cn_getImageName:@"default_avatar_f" bundleName:@"CNLiveIntegralModule" targetClass:[self class]]; 105 + UIImage *xw_image = [self getImageWithImageName:@"default_avatar_f" bundleName:@"CNLiveIntegralModule" targetClass:[self class]];
106 [_headView sd_setImageWithURL:[NSURL URLWithString:CNUserShareModel.faceUrl] placeholderImage:xw_image]; 106 [_headView sd_setImageWithURL:[NSURL URLWithString:CNUserShareModel.faceUrl] placeholderImage:xw_image];
107 107
108 } 108 }
@@ -138,7 +138,7 @@ static const NSInteger margin = 15; @@ -138,7 +138,7 @@ static const NSInteger margin = 15;
138 _detailBtn.titleLabel.font = UIFontMake(12); 138 _detailBtn.titleLabel.font = UIFontMake(12);
139 [_detailBtn addTarget:self action:@selector(clickedDetailButton:) forControlEvents:UIControlEventTouchUpInside]; 139 [_detailBtn addTarget:self action:@selector(clickedDetailButton:) forControlEvents:UIControlEventTouchUpInside];
140 [_detailBtn setTitle:@"明细" forState:UIControlStateNormal]; 140 [_detailBtn setTitle:@"明细" forState:UIControlStateNormal];
141 - UIImage *image = [UIImage cn_getImageName:@"integrate_next_white" bundleName:@"CNLiveIntegralModule" targetClass:[self class]]; 141 + UIImage *image = [self getImageWithImageName:@"integrate_next_white" bundleName:@"CNLiveIntegralModule" targetClass:[self class]];
142 [_detailBtn setImage:image forState:UIControlStateNormal]; 142 [_detailBtn setImage:image forState:UIControlStateNormal];
143 [_detailBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; 143 [_detailBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
144 _detailBtn.spacingBetweenImageAndTitle = 5; 144 _detailBtn.spacingBetweenImageAndTitle = 5;