no message

zhangxiaowen
1 parent 2e03faa8
Showing 5 changed files with 55 additions and 47 deletions
CNLiveMineModule/Classes/Controller/CNLiveMineController.m
CNLiveMineModule/Classes/Model/CNLiveMineModel.m
CNLiveMineModule/Classes/View/CNLiveMineCell.m
CNLiveMineModule/Classes/View/CNLiveMineHeaderView.h
CNLiveMineModule/Classes/View/CNLiveMineHeaderView.m
@@ -154,6 +154,7 @@ static const CGFloat timeValue = 1.5;
     if(self.soccerBtn){
         self.soccerBtn.frame = CGRectMake(SCREEN_WIDTH-67-10, SCREEN_HEIGHT-71-10-TabBarHeight, 67, 71);
     }
+    self.headerView.isRefresh = YES;
     [self.tableView reloadData];
 }
@@ -48,7 +48,7 @@ static const NSInteger margin = 10;
 - (CGFloat)height{
     //订单
     if(self.type == CNLiveMineCellTypeOrder){
-        return 2*margin+self.titleHeight+self.itemHeight+margin;
+        return 2*margin+self.titleHeight+ceilf(self.buttons.count/5.0)*(self.itemHeight+margin);
     }
     //工具
     else if(self.type == CNLiveMineCellTypeTool){
@@ -42,7 +42,6 @@
     [self.contentView addSubview:self.allButton];
     [self.contentView addSubview:self.line];
     [self.contentView addSubview:self.collectionView];
-
 }
 - (void)setModel:(CNLiveMineModel *)model{
@@ -262,7 +261,7 @@
     return _collectionView;
 }
-#pragma mark - 代理
+#pragma mark - UICollectionViewDelegate, UICollectionViewDataSource
 - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath {
     switch (self.model.type) {
         case CNLiveMineCellTypeOrder:
@@ -26,7 +26,7 @@ typedef NS_ENUM(NSInteger, CNLiveMineHeaderViewType) {
 @interface CNLiveMineHeaderView : UIView
 @property (nonatomic, weak) id<CNLiveMineHeaderViewDelegate> delegate;
 @property (nonatomic, assign) BOOL interactionEnabled;
-
+@property (nonatomic, assign) BOOL isRefresh;
 - (void)layoutSubviews;
 @end
@@ -11,6 +11,7 @@
 #import <SDWebImage/SDWebImage.h>
 #import "QMUIKit.h"
 #import "CNLiveCategory.h"
+#import "CNLiveBaseKit.h"
 #import "CNUserInfoManager.h"
 #import "CNLiveUserInfoNotification.h"
@@ -51,10 +52,10 @@ static const NSInteger margin = 20;
         [_header sd_setImageWithURL:[NSURL URLWithString:info] placeholderImage:xw_image];
     }else if(type == CNLiveUserInfoDataTypeNickname){
-        _name.attributedText = [self createAttributedImageName:@"mine_code" string:info isFront:NO];
+        _name.attributedText = [self createAttributedImageName:@"mine_code" string:info font:16.0 isFront:NO];
     }else if(type == CNLiveUserInfoDataTypeAddress){
-        _address.attributedText = [self createAttributedImageName:@"mine_location" string:info isFront:YES];
+        _address.attributedText = [self createAttributedImageName:@"mine_location" string:info font:13.0 isFront:YES];
     }
 }
@@ -62,7 +63,6 @@ static const NSInteger margin = 20;
 - (void)dealloc {
     NSLog(@"CNLiveMineHeaderView -- dealloc");
     [CNLiveUserInfoNotification removeObserver:self];
-
 }
 - (void)createSubViews {
@@ -112,7 +112,6 @@ static const NSInteger margin = 20;
     [_name mas_remakeConstraints:^(MASConstraintMaker *make) {
         make.bottom.equalTo(self.certification.mas_top);
         make.left.equalTo(self.certification.mas_left);
-//        make.right.equalTo(self.bgView.mas_right).with.offset(-margin);
         make.right.mas_lessThanOrEqualTo(self.bgView.mas_right).with.offset(-margin);
         make.height.equalTo(self.certification.mas_height);
@@ -134,6 +133,21 @@ static const NSInteger margin = 20;
     }];
 }
+
+- (void)setInteractionEnabled:(BOOL)interactionEnabled{
+    _interactionEnabled = interactionEnabled;
+    _sign.userInteractionEnabled = interactionEnabled;
+    _witness.userInteractionEnabled = interactionEnabled;
+}
+
+- (void)setIsRefresh:(BOOL)isRefresh{
+    _isRefresh = isRefresh;
+    if(isRefresh){
+        _name.attributedText = [self createAttributedImageName:@"mine_code" string:CNUserShareModel.nickname font:16.0 isFront:NO];
+        _address.attributedText = [self createAttributedImageName:@"mine_location" string:CNUserShareModel.location font:13.0 isFront:YES];
+    }
+}
+
 /*
  // Only override drawRect: if you perform custom drawing.
  // An empty implementation adversely affects performance during animation.
@@ -142,7 +156,7 @@ static const NSInteger margin = 20;
  }
  */
 #pragma mark - Private Methods
-- (NSMutableAttributedString *)createAttributedImageName:(NSString *)imageName string:(NSString *)string isFront:(BOOL)isFront{
+- (NSMutableAttributedString *)createAttributedImageName:(NSString *)imageName string:(NSString *)string font:(CGFloat)font isFront:(BOOL)isFront{
     if(isFront){
         string = [NSString stringWithFormat:@" %@",string];
     }
@@ -150,15 +164,15 @@ static const NSInteger margin = 20;
     NSMutableAttributedString *attri =  [[NSMutableAttributedString alloc] initWithString:string];
     // 修改富文本中的不同文字的样式
 //    [attri addAttribute:NSForegroundColorAttributeName value:[UIColor whiteColor] range:NSMakeRange(0, string.length)];
-//    [attri addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:14] range:NSMakeRange(0, string.length)];
+    [attri addAttribute:NSFontAttributeName value:UIFontCNMake(font) range:NSMakeRange(0, string.length)];
     // 2.添加表情图片
     NSTextAttachment *attch = [[NSTextAttachment alloc] init];
     // 表情图片
-    UIImage *xw_image = [self getImageWithImageName:imageName bundleName:@"CNLiveMineModule" targetClass:[CNLiveMineHeaderView class]];
+    UIImage *xw_image = [self getImageWithImageName:imageName bundleName:@"CNLiveMineModule" targetClass:[self class]];
     attch.image = xw_image;
     if(isFront){
         // 设置图片大小
-        attch.bounds = CGRectMake(0, -1.5, 10, 12);
+        attch.bounds = CGRectMake(0, -2, 10, 12);
         // 创建带有图片的富文本
         NSAttributedString *str = [NSAttributedString attributedStringWithAttachment:attch];
         [attri insertAttributedString:str atIndex:0];// 插入某个位置
@@ -194,6 +208,33 @@ static const NSInteger margin = 20;
 }
+#pragma mark - 响应方法
+- (void)headerTapDidClicked:(UITapGestureRecognizer *)tap{
+    if (self.delegate && [self.delegate respondsToSelector:@selector(headerView:pushToController:)]) {
+        [self.delegate headerView:self pushToController:CNLiveMineHeaderViewTypeUerInfo];
+    }
+}
+
+- (void)nameTapDidClicked:(UITapGestureRecognizer *)tap{
+    if (self.delegate && [self.delegate respondsToSelector:@selector(headerView:pushToController:)]) {
+        [self.delegate headerView:self pushToController:CNLiveMineHeaderViewTypeCode];
+    }
+}
+
+- (void)signDidClicked:(UIButton *)btn{
+    if (self.delegate && [self.delegate respondsToSelector:@selector(headerView:pushToController:)]) {
+        btn.userInteractionEnabled = NO;
+        [self.delegate headerView:self pushToController:CNLiveMineHeaderViewTypeSign];
+    }
+}
+
+- (void)witnessDidClicked:(UIButton *)btn{
+    if (self.delegate && [self.delegate respondsToSelector:@selector(headerView:pushToController:)]) {
+        btn.userInteractionEnabled = NO;
+        [self.delegate headerView:self pushToController:CNLiveMineHeaderViewTypeWintess];
+    }
+}
+
 #pragma mark - 懒加载
 - (UIButton *)witness {
     if (!_witness) {
@@ -236,7 +277,7 @@ static const NSInteger margin = 20;
         _name.numberOfLines = 1;
         _name.textColor = [UIColor whiteColor];
         _name.font = [UIFont systemFontOfSize:16];
-        _name.attributedText = [self createAttributedImageName:@"mine_code" string:CNUserShareModel.nickname isFront:NO];
+        _name.attributedText = [self createAttributedImageName:@"mine_code" string:CNUserShareModel.nickname font:16.0 isFront:NO];
         UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(nameTapDidClicked:)];
         [_name addGestureRecognizer:tap];
@@ -259,7 +300,7 @@ static const NSInteger margin = 20;
         _address.numberOfLines = 1;
         _address.textColor = [UIColor colorWithRed:140/255.0 green:140/255.0 blue:142/255.0 alpha:1.0];
         _address.font = [UIFont systemFontOfSize:13];
-        _address.attributedText = [self createAttributedImageName:@"mine_location" string:CNUserShareModel.location isFront:YES];
+        _address.attributedText = [self createAttributedImageName:@"mine_location" string:CNUserShareModel.location font:13.0 isFront:YES];
     }
     return _address;
 }
@@ -283,37 +324,4 @@ static const NSInteger margin = 20;
     return _sign;
 }
-#pragma mark - 响应方法
-- (void)headerTapDidClicked:(UITapGestureRecognizer *)tap{
-    if (self.delegate && [self.delegate respondsToSelector:@selector(headerView:pushToController:)]) {
-        [self.delegate headerView:self pushToController:CNLiveMineHeaderViewTypeUerInfo];
-    }
-}
-
-- (void)nameTapDidClicked:(UITapGestureRecognizer *)tap{
-    if (self.delegate && [self.delegate respondsToSelector:@selector(headerView:pushToController:)]) {
-        [self.delegate headerView:self pushToController:CNLiveMineHeaderViewTypeCode];
-    }
-}
-
-- (void)setInteractionEnabled:(BOOL)interactionEnabled{
-    _interactionEnabled = interactionEnabled;
-    _sign.userInteractionEnabled = interactionEnabled;
-    _witness.userInteractionEnabled = interactionEnabled;
-}
-
-- (void)signDidClicked:(UIButton *)btn{
-    if (self.delegate && [self.delegate respondsToSelector:@selector(headerView:pushToController:)]) {
-        btn.userInteractionEnabled = NO;
-        [self.delegate headerView:self pushToController:CNLiveMineHeaderViewTypeSign];
-    }
-}
-
-- (void)witnessDidClicked:(UIButton *)btn{
-    if (self.delegate && [self.delegate respondsToSelector:@selector(headerView:pushToController:)]) {
-        btn.userInteractionEnabled = NO;
-        [self.delegate headerView:self pushToController:CNLiveMineHeaderViewTypeWintess];
-    }
-}
-
 @end