增加头部昵称修改时间显示

anyunzhong · Oct 5, 2015 · 3d63477 · 3d63477
1 parent 4f34cf0
commit 3d63477
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 5 deletions.
diff --git a/DFTimelineView/DFTimelineView/Controller/DFTimeLineViewController.m b/DFTimelineView/DFTimelineView/Controller/DFTimeLineViewController.m
@@ -14,6 +14,7 @@
 #import "DFLineLikeItem.h"
 #import "DFLineCommentItem.h"
 #import "UIImageView+WebCache.h"
+#import <MLLabel+Size.h>
 
 
 
@@ -25,6 +26,9 @@
 #define AvatarRightMargin 15
 #define AvatarPadding 2
 
+
+#define NickFont [UIFont systemFontOfSize:20]
+
 @interface DFTimeLineViewController ()<DFLineCellDelegate>
 
 @property (nonatomic, strong) NSMutableArray *items;
@@ -35,6 +39,8 @@ @interface DFTimeLineViewController ()<DFLineCellDelegate>
 
 @property (nonatomic, strong) UIImageView *userAvatar;
 
+@property (nonatomic, strong) MLLabel *userNick;
+
 @property (strong, nonatomic) UIRefreshControl *refreshControl;
 
 @property (nonatomic, strong) UIView *footer;
@@ -133,14 +139,36 @@ -(void) initHeader
     [avatarBg addSubview:_userAvatar];
     [_userAvatar sd_setImageWithURL:[NSURL URLWithString:[self getAvatarUrl:width*2 height:height*2]]];
 
+    //用户昵称
+    if (_userNick == nil) {
+        NSString *nick = [self getUserNick];
+        if (nick != nil) {
+            CGSize size = [MLLabel getViewSizeByString:nick font:NickFont];
+            width = size.width;
+            height = size.height;
+            x = CGRectGetMinX(avatarBg.frame) - width - 5;
+            y = CGRectGetMidY(avatarBg.frame) - height - 2;
+            _userNick = [[MLLabel alloc] initWithFrame:CGRectMake(x, y, width, height)];
+            _userNick.textColor = [UIColor whiteColor];
+            _userNick.text = nick;
+            _userNick.font = NickFont;
+            _userNick.numberOfLines = 1;
+            _userNick.adjustsFontSizeToFitWidth = NO;
+            _userNick.textInsets = UIEdgeInsetsZero;
+
+            [header addSubview:_userNick];
+        }
+
+    }
+
 
-    //下来刷新
+    //下拉刷新
     if (_refreshControl == nil) {
         _refreshControl = [[UIRefreshControl alloc] init];
         [_refreshControl addTarget:self action:@selector(onPullDown:) forControlEvents:UIControlEventValueChanged];
         [_tableView addSubview:self.refreshControl];
     }
-
+    
 
 
 }
@@ -313,7 +341,7 @@ -(void) showFooter
 
 
 
-
+    
 }
 
 
@@ -333,7 +361,7 @@ -(void) hideFooter
         _tableView.tableFooterView = _footer;
 
         _isLoadingMore = NO;
-
+        
     }];
 
 }
@@ -383,6 +411,13 @@ -(NSString *) getAvatarUrl:(CGFloat) width height:(CGFloat) height
 }
 
 
+
+-(NSString *) getUserNick
+{
+    return nil;
+}
+
+
 -(void) genLikeAttrString:(DFBaseLineItem *) item
 {
     if (item.likes.count == 0) {

diff --git a/DFTimelineView/DFTimelineView/Item/DFBaseLineItem.h b/DFTimelineView/DFTimelineView/Item/DFBaseLineItem.h
@@ -31,6 +31,9 @@ typedef NS_ENUM(NSUInteger, LineItemType){
 
 @property (nonatomic, strong) NSString *location;
 
+@property (nonatomic, assign) long long ts;
+
+
 @property (nonatomic, strong) NSMutableArray *likes;
 @property (nonatomic, strong) NSMutableArray *comments;
 

diff --git a/DFTimelineView/DFTimelineView/View/DFBaseLineCell.m b/DFTimelineView/DFTimelineView/View/DFBaseLineCell.m
@@ -40,6 +40,7 @@
 #import <MLLabel+Size.h>
 #import "DFLikeCommentView.h"
 #import "DFLikeCommentToolbar.h"
+#import <DFToolUtil.h>
 
 
 @interface DFBaseLineCell()<DFLikeCommentToolbarDelegate, DFLikeCommentViewDelegate>
@@ -277,7 +278,7 @@ -(void) updateLocationLikeComment:(CGFloat)height
     height = TimeLabelHeight;
     _timeLabel.hidden = NO;
     _timeLabel.frame = CGRectMake(x, y, width, height);
-    _timeLabel.text = @"昨天";
+    _timeLabel.text = [DFToolUtil preettyTime:self.item.ts];
 
 
     //点赞评论按钮

diff --git a/DFTimelineView/ViewController.m b/DFTimelineView/ViewController.m
@@ -80,6 +80,7 @@ -(void) initData
     textImageItem.thumbImages = thumbImages;
 
     textImageItem.location = @"中国 • 广州";
+    textImageItem.ts = [[NSDate date] timeIntervalSince1970]*1000;
 
 
     DFLineLikeItem *likeItem1_1 = [[DFLineLikeItem alloc] init];
@@ -244,6 +245,12 @@ -(NSString *) getAvatarUrl:(CGFloat) width height:(CGFloat) height
 
 
 
+-(NSString *) getUserNick
+{
+    return @"Allen";
+}
+
+
 -(void) refresh
 {
     //下来刷新