更新个人主页

Author: 张达棣

Coding_iOS.xcodeproj/project.pbxproj

@@ -10,9 +10,9 @@
   },
   "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "433ECD69-91E4-4E60-9763-B27EA86C3648",
   "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
-    "0BE8B4916C79C0D6BC415A5C19AC33B37D62A706" : "Coding-iOS\/Coding_iOS\/Resources\/webview\/",
+    "0BE8B4916C79C0D6BC415A5C19AC33B37D62A706" : "Coding-iOS--826169105\/Coding_iOS\/Resources\/webview\/",
     "B810104048DF61B07FF1F2922D434EA5073F4362" : "Coding_iOS",
-    "9F3660E5AC46AAE96CC141F90EBB3A671D67F2C2" : "Coding-iOS\/"
+    "9F3660E5AC46AAE96CC141F90EBB3A671D67F2C2" : "Coding-iOS--826169105\/"
   },
   "DVTSourceControlWorkspaceBlueprintNameKey" : "Coding_iOS",
   "DVTSourceControlWorkspaceBlueprintVersion" : 204,

Coding_iOS.xcworkspace/xcshareddata/Coding_iOS.xcscmblueprint

@@ -38,6 +38,8 @@
 #import <ReactiveCocoa/RACEXTScope.h>
 #import "UIImageView+WebCache.h"
 #import <Masonry/Masonry.h>
+#import "UIView+SDAutoLayout.h"
+#import "UITableView+SDAutoTableViewCellHeight.h"
 
 #import "BaseNavigationController.h"
 #import "BaseViewController.h"
@@ -193,4 +195,4 @@
 /** defines a weak `self` named `__weakSelf` */
 #define ESWeakSelf      ESWeak(self, __weakSelf);
 /** defines a strong `self` named `_self` from `__weakSelf` */
-#define ESStrongSelf    ESStrong(__weakSelf, _self);
+#define ESStrongSelf    ESStrong(__weakSelf, _self);

Coding_iOS/.DS_Store

@@ -19,10 +19,10 @@
 #import "SVPullToRefresh.h"
 #import "Coding_NetAPIManager.h"
 #import "SettingMineInfoViewController.h"
-
+#import "EaseUserInfoCell.h"
+#import "UserActiveGraphCell.h"
 
 @interface MeDisplayViewController ()
-@property (strong, nonatomic) UIView *tableHeaderView;
 @property (strong, nonatomic) EaseUserHeaderView *eaV;
 @property (strong, nonatomic) UIView *sectionHeaderView;
 
@@ -31,13 +31,13 @@ @interface MeDisplayViewController ()
 @property (strong, nonatomic) NSMutableArray *dataList;//特指「话题列表」的数据
 @property (assign, nonatomic) BOOL canLoadMore, willLoadMore, isLoading;
 @property (nonatomic, assign) NSInteger curPage;
-
+@property (nonatomic, strong) EaseUserInfoCell *userInfoCell;
+@property (nonatomic, strong) ActivenessModel *activenessModel;
 @end
 
 @implementation MeDisplayViewController
 
 - (void)viewDidLoad{
-    _curUser = [Login curLoginUser];
     _dataIndex = 0;
     _dataList = @[].mutableCopy;
     _canLoadMore = YES;
@@ -47,30 +47,39 @@ - (void)viewDidLoad{
     [super viewDidLoad];
     self.title = @"个人主页";
     [self.myTableView registerClass:[CSTopicCell class] forCellReuseIdentifier:kCellIdentifier_TopicCell];
+     [self.myTableView registerClass:[UserActiveGraphCell class] forCellReuseIdentifier:kCellIdentifier_UserActiveGraphCell];
     [self setupHeaderV];
 }
 
+- (void)viewWillAppear:(BOOL)animated {
+    [super viewWillAppear:animated];
+    _curUser = [Login curLoginUser];
+    [self.myTableView reloadData];
+
+}
+
 - (void)setupHeaderV{
     __weak typeof(self) weakSelf = self;
-    if (!_tableHeaderView) {
-        _eaV = [EaseUserHeaderView userHeaderViewWithUser:_curUser image:[StartImagesManager shareManager].curImage.image];
-        _eaV.userIconClicked = ^(){
-            [weakSelf userIconClicked];
-        };
-        _eaV.fansCountBtnClicked = ^(){
-            [weakSelf fansCountBtnClicked];
-        };
-        _eaV.followsCountBtnClicked = ^(){
-            [weakSelf followsCountBtnClicked];
-        };
-        _eaV.nameBtnClicked = ^(){
-            [weakSelf goToSettingInfo];
-        };
-        _eaV.clipsToBounds = YES;
-        _tableHeaderView = [[UIView alloc] initWithFrame:_eaV.bounds];
-        [_tableHeaderView addSubview:_eaV];
-        self.myTableView.tableHeaderView = _tableHeaderView;
-    }
+    _userInfoCell = [[EaseUserInfoCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:kCellIdentifier_EaseUserInfoCell];
+    _userInfoCell.userIconClicked = ^(){
+        [weakSelf userIconClicked]; //用户头像点击
+    };
+    _userInfoCell.fansCountBtnClicked = ^(){
+        [weakSelf fansCountBtnClicked]; //粉丝
+    };
+    _userInfoCell.followsCountBtnClicked = ^(){
+        [weakSelf followsCountBtnClicked]; //关注
+    };
+    _userInfoCell.editButtonClicked = ^(){
+        [weakSelf goToSettingInfo]; //编辑
+    };
+    
+    [[Coding_NetAPIManager sharedManager] request_Users_activenessWithGlobalKey:_curUser.global_key andBlock:^(ActivenessModel *data, NSError *error) {
+        weakSelf.activenessModel = data;
+        [weakSelf.myTableView reloadData];
+    }];
+
+    
     if (!_sectionHeaderView) {
         _sectionHeaderView = [[XTSegmentControl alloc] initWithFrame:CGRectMake(0, 0, kScreen_Width, 44.0) Items:@[@"冒泡", @"话题"] selectedBlock:^(NSInteger index) {
             weakSelf.dataIndex = index;
@@ -93,6 +102,13 @@ - (void)setDataIndex:(NSInteger)dataIndex{
 
 - (void)refresh{
     if (_dataIndex == 0) {
+        _curUser = [Login curLoginUser];
+        [self.myTableView reloadData];
+        __weak typeof(self) weakSelf = self;
+        [[Coding_NetAPIManager sharedManager] request_Users_activenessWithGlobalKey:_curUser.global_key andBlock:^(ActivenessModel *data, NSError *error) {
+            weakSelf.activenessModel = data;
+            [weakSelf.myTableView reloadData];
+        }];
         [super refresh];
     }else{
         if (!_isLoading) {
@@ -133,7 +149,9 @@ - (void)requestTopicsMore:(BOOL)loadMore{
             [weakSelf.myTableView reloadData];
             weakSelf.myTableView.showsInfiniteScrolling = hasMoreData;
         }
-        [weakSelf.view configBlankPage:EaseBlankPageTypeMyJoinedTopic hasData:weakSelf.dataList.count > 0 hasError:error != nil offsetY:[_eaV originalHeight] + 60 reloadButtonBlock:^(id sender) {
+        
+        CGFloat offsetY = _userInfoCell.frame.size.height + [UserActiveGraphCell cellHeight] + 100;
+        [weakSelf.view configBlankPage:EaseBlankPageTypeMyJoinedTopic hasData:weakSelf.dataList.count > 0 hasError:error != nil offsetY:offsetY reloadButtonBlock:^(id sender) {
             [weakSelf refresh];
         }];
 
@@ -173,15 +191,38 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView{
 }
 
 #pragma mark TableM
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView{
+    return 3;
+}
+
 - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section{
+    if (section < 2) {
+        return nil;
+    }
     return self.sectionHeaderView;
+
 }
 
 - (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{
+    if (section < 2) {
+        return 0.0;
+    }
     return 44.0;
 }
 
+- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section{
+    if (section < 2) {
+        return 20;
+    }
+
+    return 0;
+}
+
+
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
+    if (section < 2) {
+        return 1;
+    }
     if (_dataIndex == 0) {
         return [super tableView:tableView numberOfRowsInSection:section];
     }else{
@@ -190,9 +231,18 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger
 }
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
-    if (_dataIndex == 0) {
+    if (indexPath.section == 0) {
+        EaseUserInfoCell *cell = self.userInfoCell;
+        cell.user = _curUser;
+        return cell;
+    } else if (indexPath.section == 1) {
+        UserActiveGraphCell *cell = [tableView dequeueReusableCellWithIdentifier:kCellIdentifier_UserActiveGraphCell forIndexPath:indexPath];
+        cell.activenessModel = _activenessModel;
+        return cell;
+        
+    } else if (_dataIndex == 0) {
         return [super tableView:tableView cellForRowAtIndexPath:indexPath];
-    }else{
+    } else{
         NSDictionary *topic = _dataList[indexPath.row];
         CSTopicCell *cell = [tableView dequeueReusableCellWithIdentifier:kCellIdentifier_TopicCell forIndexPath:indexPath];
         [cell updateDisplayByTopic:topic];
@@ -202,7 +252,12 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 }
 
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
-    if (_dataIndex == 0) {
+    if (indexPath.section == 0) {
+        return [tableView cellHeightForIndexPath:indexPath model:_curUser keyPath:@"user" cellClass:[EaseUserInfoCell class] contentViewWidth:kScreen_Width];
+        
+    } else if (indexPath.section == 1) {
+        return [UserActiveGraphCell cellHeight];
+    } else if (_dataIndex == 0) {
         return [super tableView:tableView heightForRowAtIndexPath:indexPath];
     }else{
         NSDictionary *topic = _dataList[indexPath.row];
@@ -211,6 +266,9 @@ - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPa
 }
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
+    if (indexPath.section < 2) {
+        return;
+    }
     if (_dataIndex == 0) {
         [super tableView:tableView didSelectRowAtIndexPath:indexPath];
     }else{

Coding_iOS/Coding_iOS-Prefix.pch.example

@@ -11,6 +11,7 @@
 #import "Coding_NetAPIManager.h"
 #import "EditTaskViewController.h"
 #import "RDVTabBarController.h"
+#import "TaskSelectionView.h"
 
 @interface MyTask_RootViewController ()
 
@@ -20,6 +21,12 @@ @interface MyTask_RootViewController ()
 
 @property (strong, nonatomic) XTSegmentControl *mySegmentControl;
 @property (strong, nonatomic) iCarousel *myCarousel;
+
+@property (strong, nonatomic) UIButton *titleBtn;
+@property (nonatomic,assign) NSInteger selectNum;  //筛选状态
+@property (nonatomic, strong) TaskSelectionView *myFliterMenu;
+
+
 @end
 
 @implementation MyTask_RootViewController
@@ -46,7 +53,7 @@ - (void)viewDidLoad
 {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
-    self.title = @"我的任务";
+    [self setupTitleBtn];
 
     _myProjects = [Projects projectsWithType:ProjectsTypeAll andUser:nil];
     _myProTksDict = [[NSMutableDictionary alloc] initWithCapacity:1];
@@ -69,6 +76,20 @@ - (void)viewDidLoad
         icarousel;
     });
     self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"addBtn_Nav"] style:UIBarButtonItemStylePlain target:self action:@selector(addItemClicked:)];
+    
+    
+    
+    //初始化过滤目录
+    _myFliterMenu = [[TaskSelectionView alloc] initWithFrame:CGRectMake(0, 64, kScreen_Width, kScreen_Height - 64) items:nil];
+    __weak typeof(self) weakSelf = self;
+    _myFliterMenu.clickBlock = ^(NSInteger pageIndex){
+        [weakSelf.titleBtn setTitle:weakSelf.myFliterMenu.items[pageIndex] forState:UIControlStateNormal];
+    };
+    _myFliterMenu.closeBlock=^(){
+        [weakSelf.myFliterMenu dismissMenu];
+    };
+
+    
 }
 
 - (void)addItemClicked:(id)sender{
@@ -194,4 +215,40 @@ - (void)carouselCurrentItemIndexDidChange:(iCarousel *)carousel{
     }];
 }
 
+- (void)setupTitleBtn{
+    if (!_titleBtn) {
+        _titleBtn = [UIButton new];
+        [_titleBtn setTitleColor:kColorNavTitle forState:UIControlStateNormal];
+        [_titleBtn.titleLabel setFont:[UIFont systemFontOfSize:kNavTitleFontSize]];
+        [_titleBtn addTarget:self action:@selector(fliterClicked:) forControlEvents:UIControlEventTouchUpInside];
+        self.navigationItem.titleView = _titleBtn;
+        [self setTitleBtnStr:@"我的任务"];
+    }
+}
+
+- (void)setTitleBtnStr:(NSString *)titleStr{
+    if (_titleBtn) {
+        CGFloat titleWidth = [titleStr getWidthWithFont:_titleBtn.titleLabel.font constrainedToSize:CGSizeMake(kScreen_Width, 30)];
+        CGFloat imageWidth = 12;
+        CGFloat btnWidth = titleWidth +imageWidth;
+        _titleBtn.frame = CGRectMake((kScreen_Width-btnWidth)/2, (44-30)/2, btnWidth, 30);
+        _titleBtn.titleEdgeInsets = UIEdgeInsetsMake(0, -imageWidth, 0, imageWidth);
+        _titleBtn.imageEdgeInsets = UIEdgeInsetsMake(0, titleWidth, 0, -titleWidth);
+        [_titleBtn setTitle:titleStr forState:UIControlStateNormal];
+        [_titleBtn setImage:[UIImage imageNamed:@"btn_fliter_down"] forState:UIControlStateNormal];
+    }
+}
+
+-(void)fliterClicked:(id)sender{
+    if (_myFliterMenu.showStatus) {
+        [_myFliterMenu dismissMenu];
+    }else {
+        [_myFliterMenu showMenuAtView:kKeyWindow];
+    }
+
+    
+}
+
+
+
 @end