完善项目外任务

Author: 张达棣

Coding_iOS/Controllers/RootControllers/MyTask_RootViewController.m

@@ -31,7 +31,7 @@ @interface MyTask_RootViewController ()
 @property (nonatomic, strong) NSString *keyword;
 @property (nonatomic, strong) NSString *status; //任务状态，进行中的为1，已完成的为2
 @property (nonatomic, strong) NSString *label; //任务标签
-
+@property (nonatomic, strong) Tasks *tasks;
 
 @end
 
@@ -139,6 +139,7 @@ - (void)viewWillAppear:(BOOL)animated{
 
 
 - (void)resetCurView{
+    _tasks = nil;
     if (!_myProjects.isLoading) {
         __weak typeof(self) weakSelf = self;
         [[Coding_NetAPIManager sharedManager] request_ProjectsHaveTasks_WithObj:_myProjects andBlock:^(id data, NSError *error) {
@@ -152,14 +153,22 @@ - (void)resetCurView{
 - (void)resetSearView {
     __weak typeof(self) weakSelf = self;
 
-    [[Coding_NetAPIManager sharedManager] request_tasks_searchWithOwner:nil  project_id:nil keyword:_keyword status:_status label:_label andBlock:^(Projects *data, NSError *error) {
-//        weakSelf.myProjectList = data.list;
-//        [weakSelf.myCarousel reloadData];
+    [[Coding_NetAPIManager sharedManager] request_tasks_searchWithOwner:nil  project_id:nil keyword:_keyword status:_status label:_label andBlock:^(Tasks *data, NSError *error) {
+        weakSelf.tasks = data;
         [weakSelf configSearchControlWithData:data];
+        
+        
+//        [weakSelf.myProjectList removeAllObjects];
+//         [weakSelf.myProjectList addObjectsFromArray:_tasks.list];
+//        [_myCarousel reloadData];
+
     }];
 }
 
 - (void)configSegmentControlWithData:(Projects *)freshProjects {
+    [_myProTksDict removeAllObjects];
+    [self.myProjectList removeAllObjects];
+
     BOOL dataHasChanged = NO;
     for (Project *freshPro in freshProjects.list) {
         BOOL hasFreshPro = NO;
@@ -199,31 +208,27 @@ - (void)configSegmentControlWithData:(Projects *)freshProjects {
 
 }
 
-- (void)configSearchControlWithData:(Projects *)freshProjects {
+- (void)configSearchControlWithData:(Tasks *)tasks{
+    
+    [_myProTksDict removeAllObjects];
+    [self.myProjectList removeAllObjects];
+    
     BOOL dataHasChanged = NO;
-    for (Project *freshPro in freshProjects.list) {
-        BOOL hasFreshPro = NO;
-        for (Project *oldPro in self.myProjectList) {
-            if (freshPro.id.integerValue == oldPro.id.integerValue) {
-                hasFreshPro = YES;
-                break;
-            }
-        }
-        if (!hasFreshPro) {
-            dataHasChanged = YES;
-            break;
-        }
-    }
 
-    if (dataHasChanged) {
-//        self.myProjectList = [[NSMutableArray alloc] initWithObjects:[Project project_All], nil];
-        [self.myProjectList addObjectsFromArray:freshProjects.list];
+    if (!dataHasChanged) {
+        self.myProjectList = [[NSMutableArray alloc] initWithObjects:[Project project_All], nil];
+
+        NSMutableDictionary *proDict = @{}.mutableCopy;
+        for (Task *task in tasks.list) {
+            NSLog(@"-----%@--%@", task.project.id, task.project.name);
+            [proDict setObject:task.project forKey:task.project.id.stringValue];
+        }
+        [self.myProjectList addObjectsFromArray:proDict.allValues];
 
         //重置滑块
         if (_mySegmentControl) {
             [_mySegmentControl removeFromSuperview];
         }
-        
         __weak typeof(self) weakSelf = self;
         CGRect segmentFrame = CGRectMake(0, 0, kScreen_Width, kMySegmentControlIcon_Height);
         _mySegmentControl = [[XTSegmentControl alloc] initWithFrame:segmentFrame Items:_myProjectList selectedBlock:^(NSInteger index) {
@@ -251,7 +256,9 @@ - (UIView *)carousel:(iCarousel *)carousel viewForItemAtIndex:(NSUInteger)index
         curTasks = [Tasks tasksWithPro:curPro queryType:TaskQueryTypeAll];
         [_myProTksDict setObject:curTasks forKey:curPro.id];
     }
-    
+    if (_tasks != nil) {
+        curTasks = _tasks;
+    }
     ProjectTaskListView *listView = (ProjectTaskListView *)view;
     if (listView) {
         [listView setTasks:curTasks];
@@ -267,6 +274,9 @@ - (UIView *)carousel:(iCarousel *)carousel viewForItemAtIndex:(NSUInteger)index
         } tabBarHeight:CGRectGetHeight(self.rdv_tabBarController.tabBar.frame)];
     }
     [listView setSubScrollsToTop:(index == carousel.currentItemIndex)];
+    listView.keyword = _keyword;
+    listView.status = _status;
+    listView.label = _label;
     return listView;
 }
 
@@ -283,6 +293,12 @@ - (void)carouselCurrentItemIndexDidChange:(iCarousel *)carousel{
         _mySegmentControl.currentIndex = carousel.currentItemIndex;
     }
     ProjectTaskListView *curView = (ProjectTaskListView *)carousel.currentItemView;
+    NSInteger index = carousel.scrollOffset;
+    if (index == 0) {
+        curView.project_id = nil;
+    } else {
+        curView.project_id = ((Project *)_myProjectList[index - 1]).id.stringValue;
+    }
     [curView refreshToQueryData];
     [carousel.visibleItemViews enumerateObjectsUsingBlock:^(UIView *obj, NSUInteger idx, BOOL *stop) {
         [obj setSubScrollsToTop:(obj == carousel.currentItemView)];

Coding_iOS/Util/Manager/Coding_NetAPIManager.m

@@ -1502,9 +1502,16 @@ - (void)request_tasks_searchWithOwner:(NSString *)owner project_id:(NSString *)p
     }
     [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:@"api/tasks/search" withParams:param withMethodType:Get andBlock:^(id data, NSError *error) {
 
-        Projects *pros = [NSObject objectOfClass:@"Tasks" fromJSON:data[@"data"]];
+ //       Projects *pros = [NSObject objectOfClass:@"Projects" fromJSON:data[@"data"]];
+//        pros.list = [NSObject arrayFromJSON:data[@"data"][@"list"] ofObjects:@"Project"];
+        Tasks *pros = [NSObject objectOfClass:@"Tasks" fromJSON:data[@"data"]];
         pros.list = [NSObject arrayFromJSON:data[@"data"][@"list"] ofObjects:@"Task"];
-//        Tasks
+        if (status.integerValue == 1) {
+            pros.processingList = pros.list;
+        } else {
+            pros.doneList = pros.list;
+        }
+ 
         if (data) {
             block(pros, nil);
         }else{

Coding_iOS/Views/TableListView/ProjectTaskListView.h

@@ -13,6 +13,10 @@
 typedef void(^ProjectTaskBlock)(ProjectTaskListView *taskListView, Task *task);
 
 @interface ProjectTaskListView : UIView<UITableViewDataSource, UITableViewDelegate, UIScrollViewDelegate>
+@property (nonatomic, strong) NSString *keyword;
+@property (nonatomic, strong) NSString *status; //任务状态，进行中的为1，已完成的为2
+@property (nonatomic, strong) NSString *label; //任务标签
+@property (nonatomic, strong) NSString *project_id;
 
 - (id)initWithFrame:(CGRect)frame tasks:(Tasks *)tasks block:(ProjectTaskBlock)block tabBarHeight:(CGFloat)tabBarHeight;
 - (void)setTasks:(Tasks *)tasks;

Coding_iOS/Views/TableListView/ProjectTaskListView.m

@@ -124,6 +124,24 @@ - (void)sendRequest{
         [self beginLoading];
     }
     __weak typeof(self) weakSelf = self;
+    
+    [[Coding_NetAPIManager sharedManager] request_tasks_searchWithOwner:nil  project_id:_project_id keyword:_keyword status:_status label:_label andBlock:^(Tasks *data, NSError *error) {
+        [weakSelf endLoading];
+        [weakSelf.myRefreshControl endRefreshing];
+        [weakSelf.myTableView.infiniteScrollingView stopAnimating];
+        if (data) {
+            [weakSelf.myTasks configWithTasks:data];
+            [weakSelf.myTableView reloadData];
+            weakSelf.myTableView.showsInfiniteScrolling = weakSelf.myTasks.canLoadMore;
+        }
+        [weakSelf configBlankPage:EaseBlankPageTypeTask hasData:(weakSelf.myTasks.list.count > 0) hasError:(error != nil) reloadButtonBlock:^(id sender) {
+            [weakSelf refresh];
+        }];
+
+        
+               
+    }];
+    return;
     [[Coding_NetAPIManager sharedManager] request_ProjectTaskList_WithObj:_myTasks andBlock:^(Tasks *data, NSError *error) {
         [weakSelf endLoading];
         [weakSelf.myRefreshControl endRefreshing];