Commit 36b25bf
committed
文档 改为 文件。。bugfix
1 parent 7418adc commit 36b25bf
4 files changed
Lines changed: 13 additions & 20 deletions
File tree
- Coding_iOS
- Controllers
- NProjectViewController
- Views
- Cell
- TableListView
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -85,9 +85,13 @@ - (void)viewDidLoad | |||
| 85 | 85 | } | |
| 86 | 86 | ||
| 87 | 87 | - (void)changeEditState{ | |
| 88 | - [_myTableView setEditing:!_myTableView.isEditing animated:YES]; | ||
| 88 | + [self changeEditStateToEditing:!_myTableView.isEditing]; | ||
| 89 | + } | ||
| 90 | + | ||
| 91 | + - (void)changeEditStateToEditing:(BOOL)isEditing{ | ||
| 92 | + [_myTableView setEditing:isEditing animated:YES]; | ||
| 89 | 93 | NSArray *rightBarButtonItems; | |
| 90 | - if (_myTableView.isEditing) { | ||
| 94 | + if (isEditing) { | ||
| 91 | 95 | UIBarButtonItem *item1 = [UIBarButtonItem itemWithBtnTitle:@"完成" target:self action:@selector(changeEditState)]; | |
| 92 | 96 | UIBarButtonItem *spaceItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil]; | |
| 93 | 97 | spaceItem.width = 20; | |
@@ -124,17 +128,6 @@ - (void)reverseSelect{ | |||
| 124 | 128 | } | |
| 125 | 129 | } | |
| 126 | 130 | ||
| 127 | - - (void)didReceiveMemoryWarning | ||
| 128 | - { | ||
| 129 | - [super didReceiveMemoryWarning]; | ||
| 130 | - // Dispose of any resources that can be recreated. | ||
| 131 | - } | ||
| 132 | - | ||
| 133 | - - (void)viewWillAppear:(BOOL)animated{ | ||
| 134 | - [super viewWillAppear:animated]; | ||
| 135 | - [self.myTableView reloadData]; | ||
| 136 | - } | ||
| 137 | - | ||
| 138 | 131 | - (void)configuploadFiles{ | |
| 139 | 132 | self.uploadFiles = [[Coding_FileManager sharedManager] uploadFilesInProject:self.curProject.id.stringValue andFolder:self.curFolder.file_id.stringValue]; | |
| 140 | 133 | if (!self.uploadFiles) { | |
@@ -376,7 +369,7 @@ - (void)downloadFilesBtnClicked{ | |||
| 376 | 369 | NSString *tipStr = downloadingCount == 0? @"所选的文件都已经下载到本地了" : @"所选的文件都已经在下载队列中了"; | |
| 377 | 370 | [self showHudTipStr:tipStr]; | |
| 378 | 371 | } | |
| 379 | - [self changeEditState]; | ||
| 372 | + [self changeEditStateToEditing:NO]; | ||
| 380 | 373 | } | |
| 381 | 374 | } | |
| 382 | 375 | ||
@@ -390,10 +383,10 @@ - (void)deleteFilesBtnClicked{ | |||
| 390 | 383 | __weak typeof(self) weakSelf = self; | |
| 391 | 384 | NSArray *selectedFiles = [self selectedFiles]; | |
| 392 | 385 | if (selectedFiles.count > 0) { | |
| 393 | - [[UIActionSheet bk_actionSheetCustomWithTitle:[NSString stringWithFormat:@"确认删除选定的 %lu 个文档？\n删除后将无法恢复!", (unsigned long)selectedFiles.count] buttonTitles:nil destructiveTitle:@"确认删除" cancelTitle:@"取消" andDidDismissBlock:^(UIActionSheet *sheet, NSInteger index) { | ||
| 386 | + [[UIActionSheet bk_actionSheetCustomWithTitle:[NSString stringWithFormat:@"确认删除选定的 %lu 个文件？\n删除后将无法恢复!", (unsigned long)selectedFiles.count] buttonTitles:nil destructiveTitle:@"确认删除" cancelTitle:@"取消" andDidDismissBlock:^(UIActionSheet *sheet, NSInteger index) { | ||
| 394 | 387 | if (index == 0) { | |
| 395 | 388 | [weakSelf deleteFiles:selectedFiles]; | |
| 396 | - [weakSelf changeEditState]; | ||
| 389 | + [weakSelf changeEditStateToEditing:NO]; | ||
| 397 | 390 | } | |
| 398 | 391 | }] showInView:self.view]; | |
| 399 | 392 | } | |
@@ -742,7 +735,7 @@ - (void)moveFiles:(NSArray *)files fromFolder:(ProjectFolder *)folder{ | |||
| 742 | 735 | vc.rootFolders = self.rootFolders; | |
| 743 | 736 | vc.curFolder = nil; | |
| 744 | 737 | vc.moveToFolderBlock = ^(ProjectFolder *curFolder, NSArray *toMovedFileIdList){ | |
| 745 | - [weakSelf changeEditState]; | ||
| 738 | + [weakSelf changeEditStateToEditing:NO]; | ||
| 746 | 739 | [[Coding_NetAPIManager sharedManager] request_MoveFiles:toMovedFileIdList toFolder:curFolder andBlock:^(id data, NSError *error) { | |
| 747 | 740 | if (data) { | |
| 748 | 741 | [weakSelf refreshRootFolders]; | |
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -190,7 +190,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N | |||
| 190 | 190 | if (_myProject.is_public.boolValue) { | |
| 191 | 191 | [cell setImageStr:@"project_item_member" andTitle:@"成员"]; | |
| 192 | 192 | }else{ | |
| 193 | - [cell setImageStr:@"project_item_file" andTitle:@"文档"]; | ||
| 193 | + [cell setImageStr:@"project_item_file" andTitle:@"文件"]; | ||
| 194 | 194 | } | |
| 195 | 195 | break; | |
| 196 | 196 | case 4: | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -34,7 +34,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus | |||
| 34 | 34 | ||
| 35 | 35 | itemsIconList = @[@"icon-bolt", @"icon-tasks", @"icon-comments", @"icon-folder-open", @"icon-code", @"icon-user"]; | |
| 36 | 36 | itemsColorList = @[@"0x3bbd79", @"0x25c2d5", @"0x3899d0", @"0xf8b327", @"0xee8c35", @"0xe7683d"]; | |
| 37 | - itemsTitleList = @[@"动态", @"任务", @"讨论", @"文档", @"代码", @"成员"]; | ||
| 37 | + itemsTitleList = @[@"动态", @"任务", @"讨论", @"文件", @"代码", @"成员"]; | ||
| 38 | 38 | ||
| 39 | 39 | }else if ([reuseIdentifier isEqualToString:kCellIdentifier_ProjectItemsCell_Public]){ | |
| 40 | 40 | itemsNum = 4; | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -66,7 +66,7 @@ - (NSArray*)titlesArray | |||
| 66 | 66 | if (_myProject.is_public.boolValue) { | |
| 67 | 67 | _titlesArray = @[@"全部", @"讨论", @"代码", @"其他"]; | |
| 68 | 68 | }else{ | |
| 69 | - _titlesArray = @[@"全部", @"任务", @"讨论", @"文档", @"代码", @"其他"]; | ||
| 69 | + _titlesArray = @[@"全部", @"任务", @"讨论", @"文件", @"代码", @"其他"]; | ||
| 70 | 70 | } | |
| 71 | 71 | } | |
| 72 | 72 | return _titlesArray; | |
0 commit comments