no message

zhangxiaowen
1 parent 089f690c
Showing 3 changed files with 20 additions and 32 deletions
CNLiveMineModule/Classes/Controller/CNLiveMineController.m
CNLiveMineModule/Classes/View/CNLiveMineCell.m
CNLiveMineModule/Classes/View/CNLiveMineHeaderView.m
@@ -96,7 +96,6 @@ static const NSInteger kHEIGHT = 240;
     }
     [self createSubViews];
     [self loadData];
-
 }
 - (void)dealloc {
@@ -112,14 +111,12 @@ static const NSInteger kHEIGHT = 240;
     [self.tableView addSubview:headerView];
     self.headerView = headerView;
     [self.view addSubview:self.soccerBtn];
-
 }
 #pragma mark - UITableViewDelegate
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
     CNLiveMineModel *model = self.data[indexPath.row];
     return model.height;
-    
 }
 #pragma mark - UITableViewDataSource
@@ -275,7 +272,6 @@ static const NSInteger kHEIGHT = 240;
 - (NSMutableArray *)data {
     if (!_data) {
         _data = [NSMutableArray array];
-        
     }
     return _data;
 }
@@ -293,22 +289,20 @@ static const NSInteger kHEIGHT = 240;
         _tableView.estimatedSectionFooterHeight = 0;
         [_tableView registerClass:[CNLiveMineCell class] forCellReuseIdentifier:kCNLiveMineCell];
         _tableView.contentInset = UIEdgeInsetsMake(kHEIGHT, 0, 0, 0);
-
     }
     return _tableView;
 }
+
 - (UIButton *)soccerBtn{
     if(!_soccerBtn){
         _soccerBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         _soccerBtn.adjustsImageWhenHighlighted = NO;
         _soccerBtn.frame = CGRectMake(SCREEN_WIDTH-67-10, SCREEN_HEIGHT-71-10-TabBarHeight, 67, 71);
-        UIImage *xw_image = [self xw_getImageName:@"mine_soccer_task" bundle:@"CNLiveMineModule" targetClass:[CNLiveMineController class]];
+        UIImage *xw_image = [self xw_getImageName:@"mine_soccer_task" bundleName:@"CNLiveMineModule" targetClass:[CNLiveMineController class]];
         [_soccerBtn setImage:xw_image forState:UIControlStateNormal];
         [_soccerBtn addTarget:self action:@selector(soccerDidClicked:) forControlEvents:UIControlEventTouchUpInside];
- 
     }
     return _soccerBtn;
-    
 }
 #pragma mark - 响应方法
@@ -324,13 +318,12 @@ static const NSInteger kHEIGHT = 240;
  *  @param targetClass 类和bundle的同级目录
  *  @return 返回UIImage
  */
-- (UIImage *)xw_getImageName:(NSString *)imageName bundle:(NSString *)bundleName targetClass:(Class)targetClass{
+- (UIImage *)xw_getImageName:(NSString *)imageName bundleName:(NSString *)bundleName targetClass:(Class)targetClass{
     NSBundle *bundle = [NSBundle bundleForClass:targetClass];
     NSURL *url = [bundle URLForResource:bundleName withExtension:@"bundle"];
     NSBundle *targetBundle = [NSBundle bundleWithURL:url];
     UIImage *image = [UIImage imageNamed:imageName inBundle:targetBundle compatibleWithTraitCollection:nil];
     return image?image:[UIImage imageNamed:imageName inBundle:[NSBundle mainBundle] compatibleWithTraitCollection:nil];
-    
 }
 @end
@@ -21,9 +21,7 @@
 @end
 @implementation CNLiveMineCell
-
-- (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
-{
+- (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier{
     self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
     if (self) {
         self.contentView.backgroundColor = HexColor(0xf4f4f4);
@@ -31,6 +29,7 @@
     }
     return self;
 }
+
 - (void)xw_layoutSubviews{
     self.bgView = [[UIView alloc] init];
     _bgView.backgroundColor = [UIColor whiteColor];
@@ -49,12 +48,12 @@
     _line.backgroundColor = HexColor(0xebebeb);
     [self.contentView addSubview:self.line];
-    
 }
+
 - (void)setModel:(CNLiveMineModel *)model{
     _model = model;
     [_titleButton setTitle:model.name forState:UIControlStateNormal];
-    UIImage *xw_image = [self xw_getImageName:model.pic bundle:@"CNLiveMineModule" targetClass:[CNLiveMineCell class]];
+    UIImage *xw_image = [self xw_getImageName:model.pic bundleName:@"CNLiveMineModule" targetClass:[CNLiveMineCell class]];
     [_titleButton setImage:xw_image forState:UIControlStateNormal];
     switch (model.type) {
@@ -161,10 +160,8 @@
     }
 }
 - (void)goods_layoutSubviews{
-    //图片相对于button的偏移量
-    [_titleButton setImageEdgeInsets:UIEdgeInsetsMake(0, -self.model.margin/2.0, 0, 0)];
-    //文字相对于图片的偏移量
-    [_titleButton setTitleEdgeInsets:UIEdgeInsetsMake(0, self.model.margin/2.0, 0, 0)];
+    [_titleButton setImageEdgeInsets:UIEdgeInsetsMake(0, -self.model.margin, 0, 0)];
+    [_titleButton setTitleEdgeInsets:UIEdgeInsetsMake(0, self.model.margin, 0, 0)];
     [_bgView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(self.contentView.mas_left).with.offset(self.model.margin);
@@ -199,10 +196,8 @@
 }
 - (void)sports_layoutSubviews{
-    //图片相对于button的偏移量
-    [_titleButton setImageEdgeInsets:UIEdgeInsetsMake(0, -self.model.margin/2.0, 0, 0)];
-    //文字相对于图片的偏移量
-    [_titleButton setTitleEdgeInsets:UIEdgeInsetsMake(0, self.model.margin/2.0, 0, 0)];
+    [_titleButton setImageEdgeInsets:UIEdgeInsetsMake(0, -self.model.margin, 0, 0)];
+    [_titleButton setTitleEdgeInsets:UIEdgeInsetsMake(0, self.model.margin, 0, 0)];
     [_bgView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(self.contentView.mas_left).with.offset(self.model.margin);
@@ -252,7 +247,7 @@
     [btn setTitle:title forState:UIControlStateNormal];
     [btn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
-    UIImage *xw_image = [self xw_getImageName:image bundle:@"CNLiveMineModule" targetClass:[CNLiveMineCell class]];
+    UIImage *xw_image = [self xw_getImageName:image bundleName:@"CNLiveMineModule" targetClass:[CNLiveMineCell class]];
     [btn setImage:xw_image forState:UIControlStateNormal];
     btn.adjustsImageWhenHighlighted = NO;
     [btn addTarget:self action:@selector(btnDidClicked:) forControlEvents:UIControlEventTouchUpInside];
@@ -287,7 +282,7 @@
  *  @param targetClass 类和bundle的同级目录
  *  @return 返回UIImage
  */
-- (UIImage *)xw_getImageName:(NSString *)imageName bundle:(NSString *)bundleName targetClass:(Class)targetClass{
+- (UIImage *)xw_getImageName:(NSString *)imageName bundleName:(NSString *)bundleName targetClass:(Class)targetClass{
     NSBundle *bundle = [NSBundle bundleForClass:targetClass];
     NSURL *url = [bundle URLForResource:bundleName withExtension:@"bundle"];
     NSBundle *targetBundle = [NSBundle bundleWithURL:url];
@@ -152,7 +152,7 @@ static const NSInteger margin = 20;
     // 2.添加表情图片
     NSTextAttachment *attch = [[NSTextAttachment alloc] init];
     // 表情图片
-    UIImage *xw_image = [self xw_getImageName:imageName bundle:@"CNLiveMineModule" targetClass:[CNLiveMineHeaderView class]];
+    UIImage *xw_image = [self xw_getImageName:imageName bundleName:@"CNLiveMineModule" targetClass:[CNLiveMineHeaderView class]];
     attch.image = xw_image;
     if(isFront){
         // 设置图片大小
@@ -178,7 +178,7 @@ static const NSInteger margin = 20;
         // 2.添加表情图片
         NSTextAttachment *attch = [[NSTextAttachment alloc] init];
         // 表情图片
-        UIImage *xw_image = [self xw_getImageName:image bundle:@"CNLiveMineModule" targetClass:[CNLiveMineHeaderView class]];
+        UIImage *xw_image = [self xw_getImageName:image bundleName:@"CNLiveMineModule" targetClass:[CNLiveMineHeaderView class]];
         attch.image = xw_image;
         // 创建带有图片的富文本
         NSAttributedString *str = [NSAttributedString attributedStringWithAttachment:attch];
@@ -196,7 +196,7 @@ static const NSInteger margin = 20;
 - (UIButton *)witness {
     if (!_witness) {
         _witness = [UIButton buttonWithType:UIButtonTypeCustom];
-        UIImage *xw_image = [self xw_getImageName:@"mine_observer" bundle:@"CNLiveMineModule" targetClass:[CNLiveMineHeaderView class]];
+        UIImage *xw_image = [self xw_getImageName:@"mine_observer" bundleName:@"CNLiveMineModule" targetClass:[CNLiveMineHeaderView class]];
         _witness.imageView.contentMode = UIViewContentModeScaleAspectFit;
         [_witness setImage:xw_image forState:UIControlStateNormal];
         _witness.adjustsImageWhenHighlighted = NO;
@@ -208,7 +208,7 @@ static const NSInteger margin = 20;
     if (!_bgView) {
         _bgView = [[UIImageView alloc] init];
         _bgView.userInteractionEnabled = YES;
-        UIImage *xw_image = [self xw_getImageName:@"mine_bg" bundle:@"CNLiveMineModule" targetClass:[CNLiveMineHeaderView class]];
+        UIImage *xw_image = [self xw_getImageName:@"mine_bg" bundleName:@"CNLiveMineModule" targetClass:[CNLiveMineHeaderView class]];
         _bgView.image = xw_image;
     }
     return _bgView;
@@ -219,7 +219,7 @@ static const NSInteger margin = 20;
         _header.userInteractionEnabled = YES;
         _header.layer.masksToBounds = YES;
         _header.layer.cornerRadius = 30;
-        UIImage *xw_image = [self xw_getImageName:@"default_avatar_y" bundle:@"CNLiveMineModule" targetClass:[CNLiveMineHeaderView class]];
+        UIImage *xw_image = [self xw_getImageName:@"default_avatar_y" bundleName:@"CNLiveMineModule" targetClass:[CNLiveMineHeaderView class]];
         [_header sd_setImageWithURL:[NSURL URLWithString:@"头像"] placeholderImage:xw_image];
         __weak typeof(self) weakSelf = self;
 //        [_header addGestureTapEventHandle:^(id  _Nonnull sender, UITapGestureRecognizer * _Nonnull gestureRecognizer) {
@@ -281,7 +281,7 @@ static const NSInteger margin = 20;
         [_sign setTitle:@"签到赚积分" forState:UIControlStateNormal];
         _sign.titleLabel.font = [UIFont systemFontOfSize:13.0];
         [_sign setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
-        UIImage *xw_image = [self xw_getImageName:@"sign_in_soccer" bundle:@"CNLiveMineModule" targetClass:[CNLiveMineHeaderView class]];
+        UIImage *xw_image = [self xw_getImageName:@"sign_in_soccer" bundleName:@"CNLiveMineModule" targetClass:[CNLiveMineHeaderView class]];
         [_sign setImage:xw_image forState:UIControlStateNormal];
         [_sign addTarget:self action:@selector(signDidClicked:) forControlEvents:UIControlEventTouchUpInside];
         UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:_sign.layer.bounds byRoundingCorners:UIRectCornerBottomLeft | UIRectCornerTopLeft cornerRadii:CGSizeMake(16, 16)];
@@ -314,7 +314,7 @@ static const NSInteger margin = 20;
  *  @param targetClass 类和bundle的同级目录
  *  @return 返回UIImage
  */
-- (UIImage *)xw_getImageName:(NSString *)imageName bundle:(NSString *)bundleName targetClass:(Class)targetClass{
+- (UIImage *)xw_getImageName:(NSString *)imageName bundleName:(NSString *)bundleName targetClass:(Class)targetClass{
     NSBundle *bundle = [NSBundle bundleForClass:targetClass];
     NSURL *url = [bundle URLForResource:bundleName withExtension:@"bundle"];
     NSBundle *targetBundle = [NSBundle bundleWithURL:url];