iOS Team / CNLiveSettingModule · Commits

Commit 5e306d8de30ad16d7f4efe02fefa19dd819ece38

Authored by zhangxiaowen
1 parent 220d686c

no message

Inline Side-by-side
Showing 11 changed files with 14 additions and 14 deletions
CNLiveSettingModule/Classes/AboutUs/CNLiveAboutUsController.m
  View file @5e306d8
... ... @@ -260,7 +260,7 @@ static const NSInteger timeValue = 1.5;
260 260 _headerView.clipsToBounds = YES;
261 261 _headerView.backgroundColor = [UIColor colorWithRed:242/255.0 green:242/255.0 blue:242/255.0 alpha:1.0];
262 262 UIImageView *imageView = [[UIImageView alloc] initWithFrame:CGRectMake((SCREEN_WIDTH-70)/2.0, 30, 70, 140)];
263   - UIImage *image = [UIImage cn_getImageName:@"about_us_icon" bundleName:@"CNLiveSettingModule" targetClass:[CNLiveSettingNavigationBar class]];
  263 + UIImage *image = [self getImageWithImageName:@"about_us_icon" bundleName:@"CNLiveSettingModule" targetClass:[CNLiveSettingNavigationBar class]];
264 264 imageView.image = [image imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
265 265 imageView.contentMode = UIViewContentModeScaleAspectFill;
266 266 imageView.clipsToBounds = YES;
... ...
CNLiveSettingModule/Classes/Cancellation/CNLiveCancellationView.m
  View file @5e306d8
... ... @@ -106,9 +106,9 @@ static const NSInteger margin = 15;
106 106 - (UIButton *)agreeBtn{
107 107 if (!_agreeBtn) {
108 108 _agreeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
109   - UIImage *xw_image1 = [UIImage cn_getImageName:@"cancellation_agree" bundleName:@"CNLiveSettingModule" targetClass:[CNLiveCancellationView class]];
  109 + UIImage *xw_image1 = [self getImageWithImageName:@"cancellation_agree" bundleName:@"CNLiveSettingModule" targetClass:[CNLiveCancellationView class]];
110 110  
111   - UIImage *xw_image2 = [UIImage cn_getImageName:@"cancellation_agree_sel" bundleName:@"CNLiveSettingModule" targetClass:[CNLiveCancellationView class]];
  111 + UIImage *xw_image2 = [self getImageWithImageName:@"cancellation_agree_sel" bundleName:@"CNLiveSettingModule" targetClass:[CNLiveCancellationView class]];
112 112  
113 113 [_agreeBtn setImage:xw_image1 forState:UIControlStateNormal];
114 114 [_agreeBtn setImage:xw_image2 forState:UIControlStateSelected];
... ...
CNLiveSettingModule/Classes/FontSIze/CNLiveFontSettingCell.m
  View file @5e306d8
... ... @@ -50,7 +50,7 @@
50 50  
51 51 // 1.设置头像
52 52 self.headImage.frame = fontSettingFrame.iconFrame;
53   - UIImage *image = [UIImage cn_getImageName:@"font_size_logo" bundleName:@"CNLiveSettingModule" targetClass:[self class]];
  53 + UIImage *image = [self getImageWithImageName:@"font_size_logo" bundleName:@"CNLiveSettingModule" targetClass:[self class]];
54 54 [_headImage sd_setImageWithURL:[NSURL URLWithString:model.icon] placeholderImage:image];
55 55  
56 56 // 2.设置内容
... ...
CNLiveSettingModule/Classes/FontSIze/CNLiveFontSettingContentButton.m
  View file @5e306d8
... ... @@ -37,11 +37,11 @@
37 37 CNLiveFontSettingModel *FontSetting = fontSettingFrame.model;
38 38  
39 39 if ([FontSetting.fromMe isEqualToString:@"1"]) {
40   - normal = [UIImage cn_getImageName:@"font_size_message_me" bundleName:@"CNLiveSettingModule" targetClass:[self class]];
  40 + normal = [self getImageWithImageName:@"font_size_message_me" bundleName:@"CNLiveSettingModule" targetClass:[self class]];
41 41 normal = [normal stretchableImageWithLeftCapWidth:normal.size.width * 0.5 topCapHeight:normal.size.height * 0.9];
42 42 }
43 43 else{
44   - normal = [UIImage cn_getImageName:@"font_size_message_other" bundleName:@"CNLiveSettingModule" targetClass:[self class]];
  44 + normal = [self getImageWithImageName:@"font_size_message_other" bundleName:@"CNLiveSettingModule" targetClass:[self class]];
45 45 normal = [normal stretchableImageWithLeftCapWidth:normal.size.width * 0.5 topCapHeight:normal.size.height * 0.9];
46 46 }
47 47  
... ...
CNLiveSettingModule/Classes/FontSIze/CNLiveFontSettingController.m
  View file @5e306d8
... ... @@ -119,7 +119,7 @@
119 119 //背景图
120 120 UIImageView *imageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.width-70-30, 8)];
121 121 imageView.center = self.slider.center;
122   - UIImage *image = [UIImage cn_getImageName:@"font_size_slider" bundleName:@"CNLiveSettingModule" targetClass:[self class]];
  122 + UIImage *image = [self getImageWithImageName:@"font_size_slider" bundleName:@"CNLiveSettingModule" targetClass:[self class]];
123 123 imageView.image = image;
124 124 [bottomView addSubview:imageView];
125 125 [bottomView addSubview:self.slider];
... ...
CNLiveSettingModule/Classes/Privacy/CNLiveNotSeeCollectionViewCell.m
  View file @5e306d8
... ... @@ -38,14 +38,14 @@
38 38 if(model.type == CNLiveNotSeeModelTypeAdd){
39 39 _avatarImage.layer.masksToBounds = NO;
40 40 _avatarImage.layer.cornerRadius = 0;
41   - UIImage *xw_image = [UIImage cn_getImageName:@"privacy_plus" bundleName:@"CNLiveSettingModule" targetClass:[CNLiveNotSeeCollectionViewCell class]];
  41 + UIImage *xw_image = [self getImageWithImageName:@"privacy_plus" bundleName:@"CNLiveSettingModule" targetClass:[CNLiveNotSeeCollectionViewCell class]];
42 42 [_avatarImage sd_setImageWithURL:[NSURL URLWithString:@""] placeholderImage:xw_image];
43 43 _nameLabel.text = @"";
44 44  
45 45 }else if (model.type == CNLiveNotSeeModelTypeMinus){
46 46 _avatarImage.layer.masksToBounds = NO;
47 47 _avatarImage.layer.cornerRadius = 0;
48   - UIImage *xw_image = [UIImage cn_getImageName:@"privacy_less" bundleName:@"CNLiveSettingModule" targetClass:[CNLiveNotSeeCollectionViewCell class]];
  48 + UIImage *xw_image = [self getImageWithImageName:@"privacy_less" bundleName:@"CNLiveSettingModule" targetClass:[CNLiveNotSeeCollectionViewCell class]];
49 49 [_avatarImage sd_setImageWithURL:[NSURL URLWithString:@""] placeholderImage:xw_image];
50 50 _nameLabel.text = @"";
51 51  
... ...
CNLiveSettingModule/Classes/Privacy/CNLivePrivacyContactTableViewCell.m
  View file @5e306d8
... ... @@ -194,7 +194,7 @@
194 194  
195 195 - (UIImageView *)moreImage {
196 196 if (!_moreImage) {
197   - UIImage *xw_image = [UIImage cn_getImageName:@"mine_info_front" bundleName:@"CNLiveSettingModule" targetClass:[CNLivePrivacyContactTableViewCell class]];
  197 + UIImage *xw_image = [self getImageWithImageName:@"mine_info_front" bundleName:@"CNLiveSettingModule" targetClass:[CNLivePrivacyContactTableViewCell class]];
198 198 _moreImage = [[UIImageView alloc] initWithImage:xw_image];
199 199 }
200 200 return _moreImage;
... ...
CNLiveSettingModule/Classes/Privacy/CNLivePrivacyTableViewCell.m
  View file @5e306d8
... ... @@ -141,7 +141,7 @@ static const NSInteger margin = 12;
141 141 - (UIImageView *)arrowImage {
142 142 if (!_arrowImage) {
143 143 _arrowImage = [[UIImageView alloc] init];
144   - UIImage *xw_image = [UIImage cn_getImageName:@"mine_info_front" bundleName:@"CNLiveSettingModule" targetClass:[CNLivePrivacyTableViewCell class]];
  144 + UIImage *xw_image = [self getImageWithImageName:@"mine_info_front" bundleName:@"CNLiveSettingModule" targetClass:[CNLivePrivacyTableViewCell class]];
145 145 _arrowImage.image = xw_image;
146 146 }
147 147 return _arrowImage;
... ...
CNLiveSettingModule/Classes/UpdateTel/CNLiveUpdateTelView.m
  View file @5e306d8
... ... @@ -204,7 +204,7 @@ static const NSInteger timeValue = 1.5;
204 204 if (!_countryImg) {
205 205 _countryImg = [[UIImageView alloc] init];
206 206 _countryImg.userInteractionEnabled = YES;
207   - UIImage *image = [UIImage cn_getImageName:@"mine_info_front" bundleName:@"CNLiveSettingModule" targetClass:[self class]];
  207 + UIImage *image = [self getImageWithImageName:@"mine_info_front" bundleName:@"CNLiveSettingModule" targetClass:[self class]];
208 208 _countryImg.image = image;
209 209 _countryImg.contentMode = UIViewContentModeCenter;
210 210 UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(countryTap:)];
... ...
CNLiveSettingModule/Classes/View/CNLiveSettingCell.m
  View file @5e306d8
... ... @@ -163,7 +163,7 @@ static const NSInteger margin = 12;
163 163 - (UIImageView *)front {
164 164 if (!_front) {
165 165 _front = [[UIImageView alloc] init];
166   - UIImage *xw_image = [UIImage cn_getImageName:@"mine_info_front" bundleName:@"CNLiveSettingModule" targetClass:[CNLiveSettingCell class]];
  166 + UIImage *xw_image = [self getImageWithImageName:@"mine_info_front" bundleName:@"CNLiveSettingModule" targetClass:[CNLiveSettingCell class]];
167 167 _front.image = xw_image;
168 168 _front.contentMode = UIViewContentModeCenter;
169 169  
... ...
CNLiveSettingModule/Classes/View/CNLiveSettingNavigationBar.m
  View file @5e306d8
... ... @@ -60,7 +60,7 @@ static const NSInteger margin = 15;
60 60 _left= [UIButton buttonWithType:UIButtonTypeCustom];
61 61 _left.adjustsImageWhenHighlighted = NO;
62 62 _left.frame = CGRectMake(margin, StatusBarHeight, NavigationBarHeight, NavigationBarHeight);
63   - UIImage *image = [UIImage cn_getImageName:@"mine_back_black_b" bundleName:@"CNLiveSettingModule" targetClass:[CNLiveSettingNavigationBar class]];
  63 + UIImage *image = [self getImageWithImageName:@"mine_back_black_b" bundleName:@"CNLiveSettingModule" targetClass:[CNLiveSettingNavigationBar class]];
64 64 [_left setImage:[image imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] forState:UIControlStateNormal];
65 65 _left.titleLabel.font = [UIFont systemFontOfSize:15];
66 66 [_left setContentHorizontalAlignment:UIControlContentHorizontalAlignmentLeft];
... ...