Commit 5e306d8de30ad16d7f4efe02fefa19dd819ece38

Authored by zhangxiaowen
1 parent 220d686c

no message

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