添加一级选择查找

zhangdadi · zhangdadi · commit 732d8d86b740 · 2016-12-16T15:55:02.000+08:00
diff --git a/Coding_iOS/Controllers/RootControllers/MyTask_RootViewController.m b/Coding_iOS/Controllers/RootControllers/MyTask_RootViewController.m
@@ -31,6 +31,7 @@ @interface MyTask_RootViewController ()
 @property (nonatomic, strong) NSString *status; //任务状态，进行中的为1，已完成的为2
 @property (nonatomic, strong) NSString *label; //任务标签
 @property (nonatomic, strong) NSString *project_id;
+@property (nonatomic, strong) NSString *owner, *watcher, *creator;
 @end
 
 @implementation MyTask_RootViewController
@@ -87,10 +88,24 @@ - (void)viewDidLoad
     
     
     //初始化过滤目录
-    _myFliterMenu = [[TaskSelectionView alloc] initWithFrame:CGRectMake(0, 64, kScreen_Width, kScreen_Height - 64) items:nil];
+    _myFliterMenu = [[TaskSelectionView alloc] initWithFrame:CGRectMake(0, 64, kScreen_Width, kScreen_Height - 64) items:@[@"我的任务", @"我关注的", @"我创建的"]];
     __weak typeof(self) weakSelf = self;
     _myFliterMenu.clickBlock = ^(NSInteger pageIndex){
         [weakSelf.titleBtn setTitle:weakSelf.myFliterMenu.items[pageIndex] forState:UIControlStateNormal];
+        weakSelf.owner = weakSelf.watcher = weakSelf.creator = nil;
+        if (pageIndex == 0) {
+            weakSelf.owner = [Login curLoginUser].id.stringValue;
+        }
+        if (pageIndex == 1) {
+            weakSelf.watcher = [Login curLoginUser].id.stringValue;
+        }
+        if (pageIndex == 2) {
+            weakSelf.creator = [Login curLoginUser].id.stringValue;
+        }
+        ProjectTaskListView *listView = (ProjectTaskListView *)weakSelf.myCarousel.currentItemView;
+        [weakSelf assignmentWithlistView:listView];
+        [listView refresh];
+
     };
     _myFliterMenu.closeBlock=^(){
         [weakSelf.myFliterMenu dismissMenu];
@@ -107,9 +122,7 @@ - (void)viewDidLoad
 
         }
         ProjectTaskListView *listView = (ProjectTaskListView *)weakSelf.myCarousel.currentItemView;
-        listView.keyword = keyword;
-        listView.status = status;
-        listView.label = label;
+        [weakSelf assignmentWithlistView:listView];
         [listView refresh];
 
     };
@@ -210,13 +223,11 @@ - (UIView *)carousel:(iCarousel *)carousel viewForItemAtIndex:(NSUInteger)index
    
     ProjectTaskListView *listView = (ProjectTaskListView *)view;
     if (listView) {
-        listView.keyword = _keyword;
-        listView.status = _status;
-        listView.label = _label;
+        [self assignmentWithlistView:listView];
         [listView setTasks:curTasks];
     }else{
         __weak typeof(self) weakSelf = self;
-        listView = [[ProjectTaskListView alloc] initWithFrame:carousel.bounds tasks:curTasks project_id:_project_id keyword:_keyword status:_status label:_label block:^(ProjectTaskListView *taskListView, Task *task) {
+        listView = [[ProjectTaskListView alloc] initWithFrame:carousel.bounds tasks:curTasks project_id:_project_id keyword:_keyword status:_status label:_label  owner:_owner watcher:_watcher creator:_creator block:^(ProjectTaskListView *taskListView, Task *task) {
             EditTaskViewController *vc = [[EditTaskViewController alloc] init];
             vc.myTask = task;
             vc.taskChangedBlock = ^(){
@@ -252,10 +263,7 @@ - (void)carouselCurrentItemIndexDidChange:(iCarousel *)carousel{
     } else {
         _project_id = ((Project *)_myProjectList[index - 1]).id.stringValue;
     }
-    curView.project_id = _project_id;
-    curView.keyword = _keyword;
-    curView.status = _status;
-    curView.label = _label;
+    [self assignmentWithlistView:curView];
 
     [curView refreshToQueryData];
     [carousel.visibleItemViews enumerateObjectsUsingBlock:^(UIView *obj, NSUInteger idx, BOOL *stop) {
@@ -323,5 +331,15 @@ - (UIBarButtonItem *)HDCustomNavButtonWithTitle:(NSString *)title imageName:(NSS
     return barButtonItem;
 }
 
+- (void)assignmentWithlistView:(ProjectTaskListView *)listView {
+    listView.keyword = self.keyword;
+    listView.status = self.status;
+    listView.label = self.label;
+    listView.project_id = self.project_id;
+    listView.owner = self.owner;
+    listView.watcher = self.watcher;
+    listView.creator = self.creator;
+}
+
 
 @end
diff --git a/Coding_iOS/Util/Manager/Coding_NetAPIManager.h b/Coding_iOS/Util/Manager/Coding_NetAPIManager.h
@@ -165,7 +165,7 @@ typedef NS_ENUM(NSInteger, PurposeType) {
 - (void)request_DeleteComment:(TaskComment *)comment ofTask:(Task *)task andBlock:(void (^)(id data, NSError *error))block;
 - (void)request_ChangeWatcher:(User *)watcher ofTask:(Task *)task andBlock:(void (^)(id data, NSError *error))block;
 - (void)request_Search_filtersAndBlock:(void (^)(id data, NSError *error))block; //任务标签
-- (void)request_tasks_searchWithOwner:(NSString *)owner project_id:(NSString *)project_id keyword:(NSString *)keyword status:(NSString *)status label:(NSString *)label page:(NSInteger)page andBlock:(void (^)(id data, NSError *error))block;
+- (void)request_tasks_searchWithOwner:(NSString *)owner watcher:(NSString *)watcher creator:(NSString *)creator project_id:(NSString *)project_id keyword:(NSString *)keyword status:(NSString *)status label:(NSString *)label page:(NSInteger)page andBlock:(void (^)(id data, NSError *error))block;
 
 
 #pragma mark - User
diff --git a/Coding_iOS/Util/Manager/Coding_NetAPIManager.m b/Coding_iOS/Util/Manager/Coding_NetAPIManager.m
@@ -1483,11 +1483,17 @@ - (void)request_Search_filtersAndBlock:(void (^)(id data, NSError *error))block
 
 }
 
-- (void)request_tasks_searchWithOwner:(NSString *)owner project_id:(NSString *)project_id keyword:(NSString *)keyword status:(NSString *)status label:(NSString *)label page:(NSInteger)page andBlock:(void (^)(id data, NSError *error))block {
+- (void)request_tasks_searchWithOwner:(NSString *)owner watcher:(NSString *)watcher creator:(NSString *)creator project_id:(NSString *)project_id keyword:(NSString *)keyword status:(NSString *)status label:(NSString *)label page:(NSInteger)page andBlock:(void (^)(id data, NSError *error))block {
     NSMutableDictionary *param = @{@"page": @(page)}.mutableCopy;
     if (owner != nil) {
         [param setValue:owner forKey:@"owner"];
     }
+    if (watcher != nil) {
+        [param setValue:watcher forKey:@"watcher"];
+    }
+    if (creator != nil) {
+        [param setValue:creator forKey:@"creator"];
+    }
     if (project_id != nil) {
         [param setValue:project_id forKey:@"project_id"];
     }
diff --git a/Coding_iOS/Views/TableListView/ProjectTaskListView.h b/Coding_iOS/Views/TableListView/ProjectTaskListView.h
@@ -17,11 +17,13 @@ typedef void(^ProjectTaskBlock)(ProjectTaskListView *taskListView, Task *task);
 @property (nonatomic, strong) NSString *status; //任务状态，进行中的为1，已完成的为2
 @property (nonatomic, strong) NSString *label; //任务标签
 @property (nonatomic, strong) NSString *project_id;
+@property (nonatomic, strong) NSString *owner, *watcher, *creator;
+
 @property (nonatomic, strong) void (^taskcountBlock)(NSInteger processingCount, NSInteger doneListCount);
 
 - (id)initWithFrame:(CGRect)frame tasks:(Tasks *)tasks block:(ProjectTaskBlock)block tabBarHeight:(CGFloat)tabBarHeight;
 
-- (id)initWithFrame:(CGRect)frame tasks:(Tasks *)tasks project_id:(NSString *)project_id keyword:(NSString *)keyword status:(NSString *)status label:(NSString *)label block:(ProjectTaskBlock)block tabBarHeight:(CGFloat)tabBarHeight;
+- (id)initWithFrame:(CGRect)frame tasks:(Tasks *)tasks project_id:(NSString *)project_id keyword:(NSString *)keyword status:(NSString *)status label:(NSString *)label owner:(NSString *)owner watcher:(NSString *)watcher creator:(NSString *)creator block:(ProjectTaskBlock)block tabBarHeight:(CGFloat)tabBarHeight;
 - (void)setTasks:(Tasks *)tasks;
 - (void)refreshToQueryData;
 - (void)tabBarItemClicked;
diff --git a/Coding_iOS/Views/TableListView/ProjectTaskListView.m b/Coding_iOS/Views/TableListView/ProjectTaskListView.m
@@ -82,7 +82,7 @@ - (id)initWithFrame:(CGRect)frame tasks:(Tasks *)tasks block:(ProjectTaskBlock)b
 }
 
 
-- (id)initWithFrame:(CGRect)frame tasks:(Tasks *)tasks project_id:(NSString *)project_id keyword:(NSString *)keyword status:(NSString *)status label:(NSString *)label block:(ProjectTaskBlock)block tabBarHeight:(CGFloat)tabBarHeight{
+- (id)initWithFrame:(CGRect)frame tasks:(Tasks *)tasks project_id:(NSString *)project_id keyword:(NSString *)keyword status:(NSString *)status label:(NSString *)label owner:(NSString *)owner watcher:(NSString *)watcher creator:(NSString *)creator block:(ProjectTaskBlock)block tabBarHeight:(CGFloat)tabBarHeight{
     self = [super initWithFrame:frame];
     if (self) {
         // Initialization code
@@ -94,6 +94,9 @@ - (id)initWithFrame:(CGRect)frame tasks:(Tasks *)tasks project_id:(NSString *)pr
         self.keyword = keyword;
         self.status = status;
         self.label = label;
+        self.owner = owner;
+        self.watcher = watcher;
+        self.creator = creator;
 
         
         _myTableView = ({
@@ -177,7 +180,7 @@ - (void)sendRequest{
     }
     __weak typeof(self) weakSelf = self;
     
-    [[Coding_NetAPIManager sharedManager] request_tasks_searchWithOwner:nil  project_id:_project_id keyword:_keyword status:_status label:_label page:_page andBlock:^(Tasks *data, NSError *error) {
+    [[Coding_NetAPIManager sharedManager] request_tasks_searchWithOwner:_owner watcher:_watcher creator:_creator project_id:_project_id keyword:_keyword status:_status label:_label page:_page andBlock:^(Tasks *data, NSError *error) {
         [weakSelf endLoading];
         [weakSelf.myRefreshControl endRefreshing];
         [weakSelf.myTableView.infiniteScrollingView stopAnimating];
diff --git a/Coding_iOS/Views/TaskSelectionView.m b/Coding_iOS/Views/TaskSelectionView.m
@@ -30,7 +30,7 @@ - (id)initWithFrame:(CGRect)frame items:(NSArray *)items {
     self = [super initWithFrame:frame];
     if (self) {
         // Initialization code
-        self.items = @[@"我的任务", @"我关注的", @"我创建的"];
+        self.items = items;
         self.pCount=[ProjectCount new];
         self.showStatus=FALSE;
         [self setup];

Original file line number	Diff line number	Diff line change
`@@ -1483,11 +1483,17 @@ - (void)request_Search_filtersAndBlock:(void (^)(id data, NSError *error))block`
`1483`	`1483`
`1484`	`1484`	`}`
`1485`	`1485`
`1486`		`-- (void)request_tasks_searchWithOwner:(NSString )owner project_id:(NSString )project_id keyword:(NSString )keyword status:(NSString )status label:(NSString )label page:(NSInteger)page andBlock:(void (^)(id data, NSError error))block {`
	`1486`	`+- (void)request_tasks_searchWithOwner:(NSString )owner watcher:(NSString )watcher creator:(NSString )creator project_id:(NSString )project_id keyword:(NSString )keyword status:(NSString )status label:(NSString )label page:(NSInteger)page andBlock:(void (^)(id data, NSError error))block {`
`1487`	`1487`	`NSMutableDictionary *param = @{@"page": @(page)}.mutableCopy;`
`1488`	`1488`	`if (owner != nil) {`
`1489`	`1489`	`[param setValue:owner forKey:@"owner"];`
`1490`	`1490`	`}`
	`1491`	`+ if (watcher != nil) {`
	`1492`	`+ [param setValue:watcher forKey:@"watcher"];`
	`1493`	`+ }`
	`1494`	`+ if (creator != nil) {`
	`1495`	`+ [param setValue:creator forKey:@"creator"];`
	`1496`	`+ }`
`1491`	`1497`	`if (project_id != nil) {`
`1492`	`1498`	`[param setValue:project_id forKey:@"project_id"];`
`1493`	`1499`	`}`