优化一些bug

Author: zhangdadi

Coding_iOS/Controllers/RootControllers/MyTask_RootViewController.m

@@ -81,8 +81,7 @@ - (void)viewDidLoad
     });
 
     UIBarButtonItem *addBar = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"addBtn_Nav"] style:UIBarButtonItemStylePlain target:self action:@selector(addItemClicked:)];
- //   UIBarButtonItem *screenBar = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"a1-筛选"] style:UIBarButtonItemStylePlain target:self action:@selector(screenItemClicked:)];
-    UIBarButtonItem *screenBar = [self HDCustomNavButtonWithTitle:nil imageName:@"a1-筛选" target:self action:@selector(screenItemClicked:)];
+     UIBarButtonItem *screenBar = [self HDCustomNavButtonWithTitle:nil imageName:@"a1-screen" target:self action:@selector(screenItemClicked:)];
     self.navigationItem.rightBarButtonItems = @[addBar, screenBar];
 
 
@@ -99,17 +98,20 @@ - (void)viewDidLoad
 
     _screenView = [ScreenView creat];
     _screenView.selectBlock = ^(NSString *keyword, NSString *status, NSString *label) {
- //       screenBar.image = [UIImage imageNamed:@"a1-已筛"];
-        [((UIButton *)screenBar.customView) setImage:[UIImage imageNamed:@"a1-已筛"] forState:UIControlStateNormal];
+        [((UIButton *)screenBar.customView) setImage:[UIImage imageNamed:@"a1-hasScreen"] forState:UIControlStateNormal];
         weakSelf.keyword = keyword;
         weakSelf.status = status;
         weakSelf.label = label;
         if (keyword == nil && status == nil && label == nil) {
- //           screenBar.image = [UIImage imageNamed:@"a1-筛选"];
-            [((UIButton *)screenBar.customView) setImage:[UIImage imageNamed:@"a1-筛选"] forState:UIControlStateNormal];
+            [((UIButton *)screenBar.customView) setImage:[UIImage imageNamed:@"a1-screen"] forState:UIControlStateNormal];
 
         }
-        [weakSelf resetCurView];
+        ProjectTaskListView *listView = (ProjectTaskListView *)weakSelf.myCarousel.currentItemView;
+        listView.keyword = keyword;
+        listView.status = status;
+        listView.label = label;
+        [listView refresh];
+
     };
 
 
@@ -154,8 +156,6 @@ - (void)resetCurView{
 }
 
 - (void)configSegmentControlWithData:(Projects *)freshProjects {
-    [_myProTksDict removeAllObjects];
-    [self.myProjectList removeAllObjects];
 
     BOOL dataHasChanged = NO;
     for (Project *freshPro in freshProjects.list) {
@@ -224,6 +224,10 @@ - (UIView *)carousel:(iCarousel *)carousel viewForItemAtIndex:(NSUInteger)index
             };
             [weakSelf.navigationController pushViewController:vc animated:YES];
         } tabBarHeight:CGRectGetHeight(self.rdv_tabBarController.tabBar.frame)];
+        listView.taskcountBlock = ^(NSInteger processingCount, NSInteger doneListCount) {
+            weakSelf.screenView.processingCount = processingCount;
+            weakSelf.screenView.doneListCount = doneListCount;
+        };
     }
     [listView setSubScrollsToTop:(index == carousel.currentItemIndex)];
     return listView;

…ssets/A1-任务/a1-已筛.imageset/Contents.json …1-任务/a1-hasScreen.imageset/Contents.jsonCoding_iOS/Images.xcassets/A1-任务/a1-已筛.imageset/Contents.json renamed to Coding_iOS/Images.xcassets/A1-任务/a1-hasScreen.imageset/Contents.json Coding_iOS/Images.xcassets/A1-任务/a1-已筛.imageset/Contents.json renamed to Coding_iOS/Images.xcassets/A1-任务/a1-hasScreen.imageset/Contents.json

@@ -1502,13 +1502,11 @@ - (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:@"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"];
         if (status.integerValue == 1) {
             pros.processingList = pros.list;
-        } else {
+        } else if (status.integerValue == 2) {
             pros.doneList = pros.list;
         }
 

….xcassets/A1-任务/a1-已筛.imageset/已筛@2x.png …ts/A1-任务/a1-hasScreen.imageset/已筛@2x.pngCoding_iOS/Images.xcassets/A1-任务/a1-已筛.imageset/已筛@2x.png renamed to Coding_iOS/Images.xcassets/A1-任务/a1-hasScreen.imageset/已筛@2x.png Coding_iOS/Images.xcassets/A1-任务/a1-已筛.imageset/已筛@2x.png renamed to Coding_iOS/Images.xcassets/A1-任务/a1-hasScreen.imageset/已筛@2x.png

@@ -14,7 +14,7 @@
 @property (nonatomic, strong) NSString *keyword;
 @property (nonatomic, strong) NSString *status; //任务状态，进行中的为1，已完成的为2
 @property (nonatomic, strong) NSString *label; //任务标签
-
+@property (nonatomic, assign) NSInteger processingCount, doneListCount;
 
 + (instancetype)creat;
 

….xcassets/A1-任务/a1-已筛.imageset/已筛@3x.png …ts/A1-任务/a1-hasScreen.imageset/已筛@3x.pngCoding_iOS/Images.xcassets/A1-任务/a1-已筛.imageset/已筛@3x.png renamed to Coding_iOS/Images.xcassets/A1-任务/a1-hasScreen.imageset/已筛@3x.png Coding_iOS/Images.xcassets/A1-任务/a1-已筛.imageset/已筛@3x.png renamed to Coding_iOS/Images.xcassets/A1-任务/a1-hasScreen.imageset/已筛@3x.png

@@ -37,7 +37,7 @@ - (instancetype)initWithFrame:(CGRect)frame {
 #pragma mark - 外部方法
 
 + (instancetype)creat {
-    ScreenView *screenView = [[ScreenView alloc] initWithFrame:CGRectMake(0, 20, kScreen_Width, kScreen_Height - 20)];
+    ScreenView *screenView = [[ScreenView alloc] initWithFrame:CGRectMake(0, 0, kScreen_Width, kScreen_Height)];
     screenView.hidden = YES;
     [kKeyWindow addSubview:screenView];
 
@@ -117,7 +117,7 @@ - (void)creatView {
     UIView *mainView = [[UIView alloc] init];
     mainView.backgroundColor = [UIColor whiteColor];
     [self addSubview:mainView];
-    mainView.sd_layout.leftSpaceToView(self, 80).topSpaceToView(self, 0).bottomEqualToView(self).rightEqualToView(self);
+    mainView.sd_layout.leftSpaceToView(self, 120).topSpaceToView(self, 0).bottomEqualToView(self).rightEqualToView(self);
 
     UISearchBar *searchBar = [[UISearchBar alloc] init];
     UITextField *searchField = [searchBar valueForKey:@"searchField"];
@@ -128,7 +128,7 @@ - (void)creatView {
     searchBar.cornerRadius = 4;
     searchBar.masksToBounds = YES;
     [mainView addSubview:searchBar];
-    searchBar.sd_layout.leftSpaceToView(mainView, 15).topSpaceToView(mainView, 15).rightSpaceToView(mainView, 15).heightIs(31);
+    searchBar.sd_layout.leftSpaceToView(mainView, 15).topSpaceToView(mainView, 35).rightSpaceToView(mainView, 15).heightIs(31);
     _searchBar = searchBar;
 
     UIButton *resetButton = [[UIButton alloc] init];
@@ -187,5 +187,15 @@ - (void)resetButtonClick {
 
 #pragma mark - get/set方法
 
+- (void)setProcessingCount:(NSInteger)processingCount {
+    _processingCount = processingCount;
+    _tastArray = @[[NSString stringWithFormat:@"进行中的（%ld）", processingCount], _tastArray[1]];
+}
+
+- (void)setDoneListCount:(NSInteger)doneListCount {
+    _doneListCount = doneListCount;
+    _tastArray = @[_tastArray[0], [NSString stringWithFormat:@"已完成的（%ld）", doneListCount]];
+    [self.tableView reloadData];
+}
 
 @end