iOS Team / CNLiveSettingModule · Commits

Commit a7ca7b543cb6fbaf03ee58be1fdcc4b71ab25291

Authored by zhangxiaowen
1 parent fe057016

no message

Inline Side-by-side
Showing 9 changed files with 3 additions and 150 deletions
CNLiveSettingModule/Classes/AboutUs/CNLiveAboutUsController.m
  View file @a7ca7b5
... ... @@ -300,24 +300,6 @@ static const NSInteger timeValue = 1.5;
300 300 }
301 301 }
302 302  
303   -#pragma mark - 私有方法
304   -/**
305   - * 创建图片
306   - *
307   - * @param imageName 图片名字
308   - * @param bundleName 图片所在的bundle名字
309   - * @param targetClass 类和bundle的同级目录
310   - * @return 返回UIImage
311   - */
312   -- (UIImage *)xw_getImageName:(NSString *)imageName bundleName:(NSString *)bundleName targetClass:(Class)targetClass{
313   - NSBundle *bundle = [NSBundle bundleForClass:targetClass];
314   - NSURL *url = [bundle URLForResource:bundleName withExtension:@"bundle"];
315   - NSBundle *targetBundle = [NSBundle bundleWithURL:url];
316   - UIImage *image = [UIImage imageNamed:imageName inBundle:targetBundle compatibleWithTraitCollection:nil];
317   - return image?image:[UIImage imageNamed:imageName inBundle:[NSBundle mainBundle] compatibleWithTraitCollection:nil];
318   -
319   -}
320   -
321 303 #pragma mark - CNLiveSettingNavigationBarDelegate
322 304 - (void)navigationBar:(CNLiveSettingNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{
323 305 if ([actionEvents isEqualToString:@"1"]) {
... ...
CNLiveSettingModule/Classes/BackgroundImage/CNLiveBackgroundImageController.m
  View file @a7ca7b5
... ... @@ -297,21 +297,6 @@ static const NSInteger timeValue = 1.5;
297 297 }
298 298 });
299 299 }
300   -/**
301   - * 创建图片
302   - *
303   - * @param imageName 图片名字
304   - * @param bundleName 图片所在的bundle名字
305   - * @param targetClass 类和bundle的同级目录
306   - * @return 返回UIImage
307   - */
308   -- (UIImage *)xw_getImageName:(NSString *)imageName bundleName:(NSString *)bundleName targetClass:(Class)targetClass{
309   - NSBundle *bundle = [NSBundle bundleForClass:targetClass];
310   - NSURL *url = [bundle URLForResource:bundleName withExtension:@"bundle"];
311   - NSBundle *targetBundle = [NSBundle bundleWithURL:url];
312   - UIImage *image = [UIImage imageNamed:imageName inBundle:targetBundle compatibleWithTraitCollection:nil];
313   - return image?image:[UIImage imageNamed:imageName inBundle:[NSBundle mainBundle] compatibleWithTraitCollection:nil];
314   -}
315 300  
316 301 #pragma mark - CNLiveSettingNavigationBarDelegate
317 302 - (void)navigationBar:(CNLiveSettingNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{
... ...
CNLiveSettingModule/Classes/Cancellation/CNLiveCancellationView.m
  View file @a7ca7b5
... ... @@ -155,22 +155,5 @@ static const NSInteger margin = 15;
155 155 return _cancellationBtn;
156 156 }
157 157  
158   -/**
159   - * 创建图片
160   - *
161   - * @param imageName 图片名字
162   - * @param bundleName 图片所在的bundle名字
163   - * @param targetClass 类和bundle的同级目录
164   - * @return 返回UIImage
165   - */
166   -- (UIImage *)xw_getImageName:(NSString *)imageName bundleName:(NSString *)bundleName targetClass:(Class)targetClass{
167   - NSBundle *bundle = [NSBundle bundleForClass:targetClass];
168   - NSURL *url = [bundle URLForResource:bundleName withExtension:@"bundle"];
169   - NSBundle *targetBundle = [NSBundle bundleWithURL:url];
170   - UIImage *image = [UIImage imageNamed:imageName inBundle:targetBundle compatibleWithTraitCollection:nil];
171   - return image?image:[UIImage imageNamed:imageName inBundle:[NSBundle mainBundle] compatibleWithTraitCollection:nil];
172   -
173   -}
174   -
175 158 @end
176 159  
... ...
CNLiveSettingModule/Classes/Controller/CNLiveSettingController.m
  View file @a7ca7b5
... ... @@ -372,22 +372,6 @@ static const NSInteger timeValue = 1.5;
372 372 }];
373 373 }
374 374  
375   -/**
376   - * 创建图片
377   - *
378   - * @param imageName 图片名字
379   - * @param bundleName 图片所在的bundle名字
380   - * @param targetClass 类和bundle的同级目录
381   - * @return 返回UIImage
382   - */
383   -- (UIImage *)xw_getImageName:(NSString *)imageName bundleName:(NSString *)bundleName targetClass:(Class)targetClass{
384   - NSBundle *bundle = [NSBundle bundleForClass:targetClass];
385   - NSURL *url = [bundle URLForResource:bundleName withExtension:@"bundle"];
386   - NSBundle *targetBundle = [NSBundle bundleWithURL:url];
387   - UIImage *image = [UIImage imageNamed:imageName inBundle:targetBundle compatibleWithTraitCollection:nil];
388   - return image?image:[UIImage imageNamed:imageName inBundle:[NSBundle mainBundle] compatibleWithTraitCollection:nil];
389   -}
390   -
391 375 #pragma mark - CNLiveSettingNavigationBarDelegate
392 376 - (void)navigationBar:(CNLiveSettingNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{
393 377 if ([actionEvents isEqualToString:@"1"]) {
... ...
CNLiveSettingModule/Classes/FontSIze/CNLiveFontSettingCell.m
  View file @a7ca7b5
... ... @@ -58,22 +58,6 @@
58 58  
59 59 }
60 60  
61   -/**
62   - * 创建图片
63   - *
64   - * @param imageName 图片名字
65   - * @param bundleName 图片所在的bundle名字
66   - * @param targetClass 类和bundle的同级目录
67   - * @return 返回UIImage
68   - */
69   -- (UIImage *)xw_getImageName:(NSString *)imageName bundleName:(NSString *)bundleName targetClass:(Class)targetClass{
70   - NSBundle *bundle = [NSBundle bundleForClass:targetClass];
71   - NSURL *url = [bundle URLForResource:bundleName withExtension:@"bundle"];
72   - NSBundle *targetBundle = [NSBundle bundleWithURL:url];
73   - UIImage *image = [UIImage imageNamed:imageName inBundle:targetBundle compatibleWithTraitCollection:nil];
74   - return image?image:[UIImage imageNamed:imageName inBundle:[NSBundle mainBundle] compatibleWithTraitCollection:nil];
75   -}
76   -
77 61 @end
78 62  
79 63  
... ...
CNLiveSettingModule/Classes/FontSIze/CNLiveFontSettingContentButton.m
  View file @a7ca7b5
... ... @@ -72,22 +72,6 @@
72 72 return YES;
73 73 }
74 74  
75   -/**
76   - * 创建图片
77   - *
78   - * @param imageName 图片名字
79   - * @param bundleName 图片所在的bundle名字
80   - * @param targetClass 类和bundle的同级目录
81   - * @return 返回UIImage
82   - */
83   -- (UIImage *)xw_getImageName:(NSString *)imageName bundleName:(NSString *)bundleName targetClass:(Class)targetClass{
84   - NSBundle *bundle = [NSBundle bundleForClass:targetClass];
85   - NSURL *url = [bundle URLForResource:bundleName withExtension:@"bundle"];
86   - NSBundle *targetBundle = [NSBundle bundleWithURL:url];
87   - UIImage *image = [UIImage imageNamed:imageName inBundle:targetBundle compatibleWithTraitCollection:nil];
88   - return image?image:[UIImage imageNamed:imageName inBundle:[NSBundle mainBundle] compatibleWithTraitCollection:nil];
89   -}
90   -
91 75 #pragma mark - 懒加载
92 76 - (UILabel *)content{
93 77 if(!_content){
... ...
CNLiveSettingModule/Classes/FontSIze/CNLiveFontSettingController.m
  View file @a7ca7b5
... ... @@ -272,20 +272,4 @@
272 272 _tapGesture.enabled = YES;
273 273 }
274 274  
275   -/**
276   - * 创建图片
277   - *
278   - * @param imageName 图片名字
279   - * @param bundleName 图片所在的bundle名字
280   - * @param targetClass 类和bundle的同级目录
281   - * @return 返回UIImage
282   - */
283   -- (UIImage *)xw_getImageName:(NSString *)imageName bundleName:(NSString *)bundleName targetClass:(Class)targetClass{
284   - NSBundle *bundle = [NSBundle bundleForClass:targetClass];
285   - NSURL *url = [bundle URLForResource:bundleName withExtension:@"bundle"];
286   - NSBundle *targetBundle = [NSBundle bundleWithURL:url];
287   - UIImage *image = [UIImage imageNamed:imageName inBundle:targetBundle compatibleWithTraitCollection:nil];
288   - return image?image:[UIImage imageNamed:imageName inBundle:[NSBundle mainBundle] compatibleWithTraitCollection:nil];
289   -}
290   -
291 275 @end
... ...
CNLiveSettingModule/Classes/View/CNLiveSettingCell.m
  View file @a7ca7b5
... ... @@ -9,6 +9,7 @@
9 9 #import "CNLiveSettingCell.h"
10 10 #import <Masonry/Masonry.h>
11 11 #import "CNLiveCategory.h"
  12 +#import "CNLiveBaseKit.h"
12 13  
13 14 #import "CNLiveSettingModel.h"
14 15  
... ... @@ -144,7 +145,7 @@ static const NSInteger margin = 12;
144 145 _title = [[UILabel alloc] init];
145 146 _title.numberOfLines = 1;
146 147 _title.textColor = [UIColor colorWithRed:51/255.0 green:51/255.0 blue:51/255.0 alpha:1.0];
147   - _title.font = [UIFont systemFontOfSize:16];
  148 + _title.font = [UIFont systemFontOfSize:16*RATIO];
148 149 }
149 150 return _title;
150 151 }
... ... @@ -155,7 +156,7 @@ static const NSInteger margin = 12;
155 156 _content.numberOfLines = 1;
156 157 _content.lineBreakMode = NSLineBreakByTruncatingTail;
157 158 _content.textColor = [UIColor colorWithRed:102/255.0 green:102/255.0 blue:102/255.0 alpha:1.0];
158   - _content.font = [UIFont systemFontOfSize:14];
  159 + _content.font = [UIFont systemFontOfSize:14*RATIO];
159 160 }
160 161 return _content;
161 162 }
... ... @@ -179,22 +180,5 @@ static const NSInteger margin = 12;
179 180 return _switchOn;
180 181 }
181 182  
182   -/**
183   - * 创建图片
184   - *
185   - * @param imageName 图片名字
186   - * @param bundleName 图片所在的bundle名字
187   - * @param targetClass 类和bundle的同级目录
188   - * @return 返回UIImage
189   - */
190   -- (UIImage *)xw_getImageName:(NSString *)imageName bundleName:(NSString *)bundleName targetClass:(Class)targetClass{
191   - NSBundle *bundle = [NSBundle bundleForClass:targetClass];
192   - NSURL *url = [bundle URLForResource:bundleName withExtension:@"bundle"];
193   - NSBundle *targetBundle = [NSBundle bundleWithURL:url];
194   - UIImage *image = [UIImage imageNamed:imageName inBundle:targetBundle compatibleWithTraitCollection:nil];
195   - return image?image:[UIImage imageNamed:imageName inBundle:[NSBundle mainBundle] compatibleWithTraitCollection:nil];
196   -
197   -}
198   -
199 183 @end
200 184  
... ...
CNLiveSettingModule/Classes/View/CNLiveSettingNavigationBar.m
  View file @a7ca7b5
... ... @@ -104,21 +104,4 @@ static const NSInteger margin = 15;
104 104 }
105 105 }
106 106  
107   -/**
108   - * 创建图片
109   - *
110   - * @param imageName 图片名字
111   - * @param bundleName 图片所在的bundle名字
112   - * @param targetClass 类和bundle的同级目录
113   - * @return 返回UIImage
114   - */
115   -- (UIImage *)xw_getImageName:(NSString *)imageName bundleName:(NSString *)bundleName targetClass:(Class)targetClass{
116   - NSBundle *bundle = [NSBundle bundleForClass:targetClass];
117   - NSURL *url = [bundle URLForResource:bundleName withExtension:@"bundle"];
118   - NSBundle *targetBundle = [NSBundle bundleWithURL:url];
119   - UIImage *image = [UIImage imageNamed:imageName inBundle:targetBundle compatibleWithTraitCollection:nil];
120   - return image?image:[UIImage imageNamed:imageName inBundle:[NSBundle mainBundle] compatibleWithTraitCollection:nil];
121   -
122   -}
123   -
124 107 @end
... ...