个人中心badge标签

xplan-ios/Main/Mine/View/Cell/XPMineHeadItemCollectionViewCell.m

@@ -17,6 +17,8 @@
 @interface XPMineHeadItemCollectionViewCell ()
 ///显示图片
 @property (nonatomic,strong) NetImageView *logoImageView;
+///角标
+@property (nonatomic,strong) NetImageView *badgeImageView;
 ///显示名字
 @property (nonatomic,strong) UILabel *titleLabel;
 @end
@@ -38,13 +40,20 @@
 - (void)initSubViews {
 	[self.contentView addSubview:self.logoImageView];
 	[self.contentView addSubview:self.titleLabel];
+    [self.contentView addSubview:self.badgeImageView];
 }
 
 - (void)initSubViewConstraints {
 	[self.logoImageView mas_makeConstraints:^(MASConstraintMaker *make) {
 		make.size.mas_equalTo(CGSizeMake(32, 32));
-		make.centerX.top.mas_equalTo(self.contentView);
+		make.centerX.mas_equalTo(self.contentView);
+        make.top.mas_equalTo(6);
 	}];
+    [self.badgeImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.mas_equalTo(self.contentView);
+        make.size.mas_equalTo(CGSizeMake(24, 10));
+        make.centerX.mas_equalTo(self.logoImageView.mas_right);
+    }];
 	
 	[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
 		make.top.mas_equalTo(self.logoImageView.mas_bottom).offset(4);
@@ -59,15 +68,23 @@
 	if (_itemModel) {
 		self.logoImageView.imageUrl = itemModel.centerPic;
 		self.titleLabel.text = _itemModel.centerName;
+        self.badgeImageView.imageUrl = itemModel.centerBadge ? itemModel.centerBadge : nil;
 	}
 }
 
 - (NetImageView *)logoImageView {
-	if (!_logoImageView) {
-		_logoImageView = [[NetImageView alloc] init];
-		_logoImageView.userInteractionEnabled = YES;
-	}
-	return _logoImageView;
+    if (!_logoImageView) {
+        _logoImageView = [[NetImageView alloc] init];
+    }
+    return _logoImageView;
+}
+
+- (NetImageView *)badgeImageView {
+    if (!_badgeImageView) {
+        _badgeImageView = [[NetImageView alloc] init];
+        _badgeImageView.contentMode = UIViewContentModeScaleAspectFit;
+    }
+    return _badgeImageView;
 }
 
 - (UILabel *)titleLabel {

xplan-ios/Main/Mine/View/Cell/XPMineHeadItemTableViewCell.m

@@ -47,9 +47,9 @@
         make.top.bottom.mas_equalTo(self.contentView);
     }];
     [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.mas_equalTo(20);
+        make.top.mas_equalTo(14);
         make.left.right.mas_equalTo(self.mainView);
-        make.height.mas_equalTo(77+32+17);
+        make.height.mas_equalTo(77+32+17+6);
     }];
 }
 
@@ -80,7 +80,7 @@
 
 - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath {
     CGFloat width = (KScreenWidth - 30) / 4;
-    return CGSizeMake(width, 32+4+17);
+    return CGSizeMake(width, 32+4+17+6);
 }
 
 - (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumInteritemSpacingForSectionAtIndex:(NSInteger)section {

xplan-ios/Main/Mine/View/XPMineViewController.m

@@ -387,6 +387,11 @@
 - (void)onGetMineFuntionItemSuccess:(NSArray<XPMineFuntionItemModel *> *)items {
     [self.functionArray removeAllObjects];
     [self.functionArray addObjectsFromArray:items];
+    [self.functionArray enumerateObjectsUsingBlock:^(XPMineFuntionItemModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+        if (obj.skipType == XPMineItemType_Collect_Room | obj.skipType == XPMineItemType_CP) {
+            [self.functionArray removeObject:obj];
+        }
+    }];
     [self.tableView reloadData];
 }