文件数量的显示

wanghengheng · wanghengheng · commit e63f28267ac9 · 2015-01-08T13:51:00.000+08:00
diff --git a/Coding_iOS/Models/ProjectFolder.h b/Coding_iOS/Models/ProjectFolder.h
@@ -19,9 +19,9 @@
 + (ProjectFolder *)folderWithId:(NSNumber *)file_id;
 - (ProjectFolder *)hasFolderWithId:(NSNumber *)file_id;
 
-- (void)setCountWithArray:(NSArray *)countArray;
 - (BOOL)isDefaultFolder;
 - (BOOL)canCreatSubfolder;
+- (NSInteger)fileCountIncludeSub;
 
 - (NSString *)toFilesPath;
 - (NSDictionary *)toFilesParams;
diff --git a/Coding_iOS/Models/ProjectFolder.m b/Coding_iOS/Models/ProjectFolder.m
@@ -44,23 +44,19 @@ - (instancetype)init
     }
     return self;
 }
-- (void)setCountWithArray:(NSArray *)countArray{
-    __block NSInteger count = _sub_folders.count;
-    [countArray enumerateObjectsUsingBlock:^(NSDictionary *obj, NSUInteger idx, BOOL *stop) {
-        NSNumber *folder_id = [obj objectForKey:@"folder"];
-        if (folder_id && folder_id.integerValue == _file_id.integerValue) {
-            count += [(NSNumber *)[obj objectForKey:@"count"] integerValue];
-            *stop = YES;
-        }
-    }];
-    self.count = [NSNumber numberWithInteger:count];
-}
 - (BOOL)isDefaultFolder{
     return !(_file_id && _file_id.integerValue != 0);
 }
 - (BOOL)canCreatSubfolder{
     return !((_parent_id && _parent_id.integerValue != 0) || [self isDefaultFolder]);
 }
+- (NSInteger)fileCountIncludeSub{
+    NSInteger fileCount = self.count.integerValue;
+    for (ProjectFolder *subFolder in self.sub_folders) {
+        fileCount += subFolder.fileCountIncludeSub;
+    }
+    return fileCount;
+}
 - (NSString *)toFilesPath{
     return [NSString stringWithFormat:@"api/project/%@/files/%@", _project_id.stringValue, _file_id.stringValue];
 }
diff --git a/Coding_iOS/Views/Cell/ProjectFolderListCell.m b/Coding_iOS/Views/Cell/ProjectFolderListCell.m
@@ -50,7 +50,7 @@ - (void)layoutSubviews{
         _iconView.image = [UIImage imageNamed:@"icon_file_folder_normal"];
     }
     _nameLabel.text = !_useToMove?
-    [NSString stringWithFormat:@"%@（%ld）", _folder.name, (long)(_folder.count.integerValue)]
+    [NSString stringWithFormat:@"%@（%ld）", _folder.name, (long)(_folder.fileCountIncludeSub)]
     :[NSString stringWithFormat:@"%@（%ld）", _folder.name, (long)_folder.sub_folders.count];
 }
 

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ - (void)layoutSubviews{`
`50`	`50`	`_iconView.image = [UIImage imageNamed:@"icon_file_folder_normal"];`
`51`	`51`	`}`
`52`	`52`	`_nameLabel.text = !_useToMove?`
`53`		`- [NSString stringWithFormat:@"%@（%ld）", _folder.name, (long)(_folder.count.integerValue)]`
	`53`	`+ [NSString stringWithFormat:@"%@（%ld）", _folder.name, (long)(_folder.fileCountIncludeSub)]`
`54`	`54`	`:[NSString stringWithFormat:@"%@（%ld）", _folder.name, (long)_folder.sub_folders.count];`
`55`	`55`	`}`
`56`	`56`