Skip to content

Commit 1d4055e

Browse files
wanghenghengEase
wanghengheng
authored and
Ease
committed
修改一下 error tip
1 parent f08a46c commit 1d4055e

38 files changed

+157
-223
lines changed

‎Coding_iOS/Controllers/AddMDCommentViewController.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ - (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error{
208208
return;
209209
else{
210210
DebugLog(@"%@", error.description);
211-
[self showError:error];
211+
[NSObject showError:error];
212212
}
213213
}
214214

‎Coding_iOS/Controllers/CodeListViewController.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ - (void)goToVCWith:(CodeTree_File *)codeTreeFile andRef:(NSString *)ref{
104104
CodeViewController *vc = [CodeViewController codeVCWithProject:_myProject andCodeFile:nextCodeFile];
105105
[self.navigationController pushViewController:vc animated:YES];
106106
}else{
107-
[self showHudTipStr:@"有些文件还不支持查看呢_(:з」∠)_"];
107+
[NSObject showHudTipStr:@"有些文件还不支持查看呢_(:з」∠)_"];
108108
}
109109
}
110110

‎Coding_iOS/Controllers/ConversationViewController.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ - (void)doTranspondMessage:(PrivateMessage *)curMessage{
390390
}else{
391391
[[Coding_NetAPIManager sharedManager] request_SendPrivateMessage:curMessage andBlock:^(id data, NSError *error) {
392392
if (data) {
393-
[self showHudTipStr:@"已发送"];
393+
[NSObject showHudTipStr:@"已发送"];
394394
DebugLog(@"转发成功：%@, %@", curMessage.friend.name, curMessage.htmlMedia.contentOrigional);
395395
}
396396
}];

‎Coding_iOS/Controllers/EditLabelViewController.m

+1-13
Original file line numberDiff line numberDiff line change
@@ -110,24 +110,12 @@ - (void)addBtnClick:(UIButton *)sender
110110
[weakSelf.myTableView reloadData];
111111
sender.enabled = FALSE;
112112

113-
[weakSelf showHudTipStr:@"添加标签成功^^"];
113+
[NSObject showHudTipStr:@"添加标签成功^^"];
114114
}
115115
}];
116116
}
117117
}
118118

119-
- (void)showHudTipStr:(NSString *)tipStr
120-
{
121-
if (tipStr && tipStr.length > 0) {
122-
MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:kKeyWindow animated:YES];
123-
hud.mode = MBProgressHUDModeText;
124-
hud.labelText = tipStr;
125-
hud.margin = 10.f;
126-
hud.removeFromSuperViewOnHide = YES;
127-
[hud hide:YES afterDelay:1.0];
128-
}
129-
}
130-
131119
#pragma mark - UITableViewDataSource
132120
- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
133121
{

‎Coding_iOS/Controllers/EditTaskViewController.m

+5-5
Original file line numberDiff line numberDiff line change
@@ -209,12 +209,12 @@ - (void)doneBtnClicked{
209209
}
210210
}];
211211
}else{
212-
[self showStatusBarQueryStr:@"正在修改任务"];
212+
[NSObject showStatusBarQueryStr:@"正在修改任务"];
213213
_myCopyTask.isRequesting = YES;
214214
[[Coding_NetAPIManager sharedManager] request_EditTask:_myCopyTask oldTask:_myTask andBlock:^(id data, NSError *error) {
215215
_myCopyTask.isRequesting = NO;
216216
if (data) {
217-
[self showStatusBarSuccessStr:@"修改任务成功"];
217+
[NSObject showStatusBarSuccessStr:@"修改任务成功"];
218218
_myTask.content = _myCopyTask.content;
219219
_myTask.owner = _myCopyTask.owner;
220220
_myTask.status = _myCopyTask.status;
@@ -223,7 +223,7 @@ - (void)doneBtnClicked{
223223
}
224224
[self.navigationController popViewControllerAnimated:YES];
225225
}else{
226-
[self showStatusBarError:error];
226+
[NSObject showStatusBarError:error];
227227
}
228228
}];
229229
}
@@ -465,7 +465,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
465465
NSLog(@"haimeizuo");
466466
}else if (cellType == LeftImage_LRTextCellTypeTaskOwner) {
467467
if (_myCopyTask.project == nil) {
468-
[self showHudTipStr:@"需要选定所属项目先~"];
468+
[NSObject showHudTipStr:@"需要选定所属项目先~"];
469469
return;
470470
}
471471
ProjectMemberListViewController *vc = [[ProjectMemberListViewController alloc] init];
@@ -541,7 +541,7 @@ - (void)goToDescriptionVC{
541541

542542
- (void)goToTagsVC{
543543
if (!_myCopyTask.project) {
544-
[self showHudTipStr:@"需要选定所属项目先~"];
544+
[NSObject showHudTipStr:@"需要选定所属项目先~"];
545545
return;
546546
}
547547
EditLabelViewController *vc = [[EditLabelViewController alloc] init];

‎Coding_iOS/Controllers/FileEditViewController.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ - (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error{
240240
return;
241241
else{
242242
DebugLog(@"%@", error.description);
243-
[self showError:error];
243+
[NSObject showError:error];
244244
}
245245
}
246246

‎Coding_iOS/Controllers/FileListViewController.m

+9-9
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ - (void)sendRequestRootFolders{
230230
[weakSelf.refreshControl endRefreshing];
231231
[weakSelf.view endLoading];
232232
weakSelf.rootFolders = preRootFolders;
233-
[weakSelf showHudTipStr:@"文件夹不存在"];
233+
[NSObject showHudTipStr:@"文件夹不存在"];
234234
weakSelf.navigationItem.rightBarButtonItem = nil;
235235
[weakSelf.view configBlankPage:EaseBlankPageTypeFolderDleted hasData:([weakSelf totalDataRow] > 0) hasError:NO reloadButtonBlock:nil];
236236
}
@@ -321,7 +321,7 @@ - (void)creatFolderBtnClicked{
321321
[weakSelf.view configBlankPage:EaseBlankPageTypeView hasData:([weakSelf totalDataRow] > 0) hasError:(error != nil) reloadButtonBlock:^(id sender) {
322322
[weakSelf refreshRootFolders];
323323
}];
324-
[weakSelf showHudTipStr:@"创建文件夹成功"];
324+
[NSObject showHudTipStr:@"创建文件夹成功"];
325325
}
326326
}];
327327
}];
@@ -374,7 +374,7 @@ - (void)downloadFilesBtnClicked{
374374
}
375375
if (addDownloadCount == 0) {
376376
NSString *tipStr = downloadingCount == 0? @"所选的文件都已经下载到本地了" : @"所选的文件都已经在下载队列中了";
377-
[self showHudTipStr:tipStr];
377+
[NSObject showHudTipStr:tipStr];
378378
}
379379
[self changeEditStateToEditing:NO];
380380
}
@@ -423,7 +423,7 @@ - (void)qb_imagePickerController:(QBImagePickerController *)imagePickerControlle
423423
if ([Coding_FileManager writeUploadDataWithName:fileName andAsset:assetItem]) {
424424
[needToUploads addObject:fileName];
425425
}else{
426-
[self showHudTipStr:[NSString stringWithFormat:@"%@ 文件处理失败", originalFileName]];
426+
[NSObject showHudTipStr:[NSString stringWithFormat:@"%@ 文件处理失败", originalFileName]];
427427
}
428428
}
429429
for (NSString *fileName in needToUploads) {
@@ -540,9 +540,9 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
540540
if (tableView.isEditing) {
541541
if (indexPath.row < _curFolder.sub_folders.count + _uploadFiles.count) {
542542
if (indexPath.row < _uploadFiles.count) {
543-
[self showHudTipStr:@"正在上传的不能批处理"];
543+
[NSObject showHudTipStr:@"正在上传的不能批处理"];
544544
}else{
545-
[self showHudTipStr:@"文件夹不能批处理"];
545+
[NSObject showHudTipStr:@"文件夹不能批处理"];
546546
}
547547
[tableView deselectRowAtIndexPath:indexPath animated:YES];
548548
}
@@ -652,7 +652,7 @@ - (void)renameFolder:(ProjectFolder *)folder{
652652
if (data) {
653653
ProjectFolder *originalFolder = (ProjectFolder *)data;
654654
originalFolder.name = originalFolder.next_name;
655-
[self showHudTipStr:[NSString stringWithFormat:@"成功重命名为:%@", originalFolder.name]];
655+
[NSObject showHudTipStr:[NSString stringWithFormat:@"成功重命名为:%@", originalFolder.name]];
656656
[weakSelf.myTableView reloadData];
657657
}
658658
}];
@@ -672,7 +672,7 @@ - (void)renameFile:(ProjectFile *)file{
672672
[[Coding_NetAPIManager sharedManager] request_RenameFile:file withName:textValue andBlock:^(id data, NSError *error) {
673673
if (data) {
674674
file.name = textValue;
675-
[self showHudTipStr:[NSString stringWithFormat:@"成功重命名为:%@", file.name]];
675+
[NSObject showHudTipStr:[NSString stringWithFormat:@"成功重命名为:%@", file.name]];
676676
[weakSelf.myTableView reloadData];
677677
}
678678
}];
@@ -736,7 +736,7 @@ - (void)deleteFile:(ProjectFile *)file fromDisk:(BOOL)fromDisk{
736736
NSError *fileError;
737737
[fm removeItemAtPath:filePath error:&fileError];
738738
if (fileError) {
739-
[self showError:fileError];
739+
[NSObject showError:fileError];
740740
}
741741
}
742742
[self.myTableView performSelector:@selector(reloadData) withObject:nil afterDelay:0.1];

‎Coding_iOS/Controllers/FileVersionsViewController.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ - (void)doDeleteFileVersion:(FileVersion *)curVersion fromDisk:(BOOL)fromDisk{
238238
NSError *fileError;
239239
[fm removeItemAtPath:filePath error:&fileError];
240240
if (fileError) {
241-
[self showError:fileError];
241+
[NSObject showError:fileError];
242242
}
243243
}
244244
[self.myTableView performSelector:@selector(reloadData) withObject:nil afterDelay:0.1];

‎Coding_iOS/Controllers/FileViewController.m

+8-8
Original file line numberDiff line numberDiff line change
@@ -331,9 +331,9 @@ - (void)goToShareFileLink{
331331
- (void)doCopyShareUrl{
332332
if (_curFile.share_url.length > 0) {
333333
[[UIPasteboard generalPasteboard] setString:_curFile.share_url];
334-
[self showHudTipStr:@"链接已拷贝到粘贴板"];
334+
[NSObject showHudTipStr:@"链接已拷贝到粘贴板"];
335335
}else{
336-
[self showHudTipStr:@"文件还未打开共享"];
336+
[NSObject showHudTipStr:@"文件还未打开共享"];
337337
}
338338
}
339339

@@ -353,7 +353,7 @@ - (void)doCloseShareUrl{
353353
[[Coding_NetAPIManager sharedManager] request_CloseShareHash:hashStr andBlock:^(id data, NSError *error) {
354354
if (data) {
355355
weakSelf.curFile.share_url = nil;
356-
[weakSelf showHudTipStr:@"共享链接已关闭"];
356+
[NSObject showHudTipStr:@"共享链接已关闭"];
357357
}
358358
}];
359359
}
@@ -419,7 +419,7 @@ - (void)doDeleteCurFile:(ProjectFile *)file fromDisk:(BOOL)fromDisk{
419419
NSError *fileError;
420420
[fm removeItemAtPath:filePath error:&fileError];
421421
if (fileError) {
422-
[self showError:fileError];
422+
[NSObject showError:fileError];
423423
}else if (fromDisk){
424424
[self.navigationController popViewControllerAnimated:YES];
425425
if (self.fileHasBeenDeletedBlock) {
@@ -451,17 +451,17 @@ - (void)saveCurImg{
451451

452452
UIImage *image = [UIImage imageWithData:[NSData dataWithContentsOfURL:self.fileUrl]];
453453
if (!image) {
454-
[self showHudTipStr:@"提取图片失败"];
454+
[NSObject showHudTipStr:@"提取图片失败"];
455455
return;
456456
}
457457
UIImageWriteToSavedPhotosAlbum(image, self, selectorToCall, NULL);
458458
}
459459

460460
- (void) imageWasSavedSuccessfully:(UIImage *)paramImage didFinishSavingWithError:(NSError *)paramError contextInfo:(void *)paramContextInfo{
461461
if (paramError == nil){
462-
[self showHudTipStr:@"成功保存到相册"];
462+
[NSObject showHudTipStr:@"成功保存到相册"];
463463
} else {
464-
[self showHudTipStr:@"保存失败"];
464+
[NSObject showHudTipStr:@"保存失败"];
465465
}
466466
}
467467

@@ -501,7 +501,7 @@ - (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error{
501501
return;
502502
else{
503503
DebugLog(@"%@", error.description);
504-
[self showError:error];
504+
[NSObject showError:error];
505505
}
506506
}
507507

‎Coding_iOS/Controllers/FolderToMoveViewController.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ - (void)easeToolBar:(EaseToolBar *)toolBar didClickedIndex:(NSInteger)index{
149149
[weakSelf.rootFolders.list insertObject:data atIndex:1];
150150
}
151151
[weakSelf.myTableView reloadData];
152-
[weakSelf showHudTipStr:@"创建文件夹成功"];
152+
[NSObject showHudTipStr:@"创建文件夹成功"];
153153
}
154154
}];
155155
}];

‎Coding_iOS/Controllers/Login/CannotLoginViewController.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ - (void)footerBtnClicked:(id)sender{
195195
}
196196

197197
- (void)popToRootVC{
198-
[self showHudTipStr:@"已发送邮件"];
198+
[NSObject showHudTipStr:@"已发送邮件"];
199199
[self.navigationController popToRootViewControllerAnimated:YES];
200200
}
201201

‎Coding_iOS/Controllers/Login/LoginViewController.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ - (void)sendLogin{
416416
if (global_key.length > 0) {
417417
[weakSelf changeUITo2FAWithGK:global_key];
418418
}else{
419-
[self showError:error];
419+
[NSObject showError:error];
420420
[weakSelf refreshCaptchaNeeded];
421421
}
422422
}

‎Coding_iOS/Controllers/Login/PasswordViewController.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ - (void)footerBtnClicked:(id)sender{
157157
tipStr = @"新密码不得长于64位";
158158
}
159159
if (tipStr) {
160-
[self showHudTipStr:tipStr];
160+
[NSObject showHudTipStr:tipStr];
161161
return;
162162
}
163163
[self.view endEditing:YES];

‎Coding_iOS/Controllers/MeSetting/SettingMineInfoViewController.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ - (void)imagePickerController:(UIImagePickerController *)picker didFinishPicking
427427
weakSelf.curUser.avatar = responseObj;
428428
[weakSelf.myTableView reloadData];
429429
} failureBlock:^(NSError *error) {
430-
[weakSelf showError:error];
430+
[NSObject showError:error];
431431
} progerssBlock:^(CGFloat progressValue) {
432432
}];
433433

‎Coding_iOS/Controllers/MeSetting/SettingPasswordViewController.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ - (void)doneBtnClicked:(id)sender{
125125
[self.view endEditing:YES];
126126
NSString *tipStr = [_myUser changePasswordTips];
127127
if (tipStr) {
128-
[self showHudTipStr:tipStr];
128+
[NSObject showHudTipStr:tipStr];
129129
return;
130130
}
131131
self.navigationItem.rightBarButtonItem.enabled = NO;

‎Coding_iOS/Controllers/MeSetting/SettingTagsViewController.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPa
119119
[tempArray removeObject:tagId];
120120
}else{
121121
if (tempArray.count >= 10) {
122-
[self showHudTipStr:@"用户个性标签不能超过10个"];
122+
[NSObject showHudTipStr:@"用户个性标签不能超过10个"];
123123
return;
124124
}
125125
[tempArray addObject:tagId];

‎Coding_iOS/Controllers/ProjectMemberActivityListViewController.m

+9-9
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ - (void)goToVCWithItem:(HtmlMediaItem *)clickedItem activity:(ProjectActivity *)
7979
vc.myTask = [Task taskWithBackend_project_path:[NSString stringWithFormat:@"/user/%@/project/%@", pathArray[2], pathArray[4]] andId:pathArray[6]];
8080
[self.navigationController pushViewController:vc animated:YES];
8181
}else{
82-
[self showHudTipStr:@"任务不存在"];
82+
[NSObject showHudTipStr:@"任务不存在"];
8383
}
8484
}else if ([target_type isEqualToString:@"TaskComment"]){
8585
Task *task = proAct.task;
@@ -89,7 +89,7 @@ - (void)goToVCWithItem:(HtmlMediaItem *)clickedItem activity:(ProjectActivity *)
8989
vc.myTask = [Task taskWithBackend_project_path:[NSString stringWithFormat:@"/user/%@/project/%@", pathArray[0], pathArray[1]] andId:task.id.stringValue];
9090
[self.navigationController pushViewController:vc animated:YES];
9191
}else{
92-
[self showHudTipStr:@"任务不存在"];
92+
[NSObject showHudTipStr:@"任务不存在"];
9393
}
9494
}else if ([target_type isEqualToString:@"ProjectTopic"]){
9595

@@ -105,7 +105,7 @@ - (void)goToVCWithItem:(HtmlMediaItem *)clickedItem activity:(ProjectActivity *)
105105
vc.curTopic = [ProjectTopic topicWithId:[NSNumber numberWithInteger:[pathArray[6] integerValue]]];
106106
[self.navigationController pushViewController:vc animated:YES];
107107
}else{
108-
[self showHudTipStr:@"讨论不存在"];
108+
[NSObject showHudTipStr:@"讨论不存在"];
109109
}
110110
}else if ([target_type isEqualToString:@"ProjectFile"]){
111111
File *file = proAct.file;
@@ -137,7 +137,7 @@ - (void)goToVCWithItem:(HtmlMediaItem *)clickedItem activity:(ProjectActivity *)
137137
vc.rootFolders = nil;
138138
[self.navigationController pushViewController:vc animated:YES];
139139
}else{
140-
[self showHudTipStr:(isFile? @"文件不存在" :@"文件夹不存在")];
140+
[NSObject showHudTipStr:(isFile? @"文件不存在" :@"文件夹不存在")];
141141
}
142142
}else if ([target_type isEqualToString:@"ProjectMember"]) {
143143
if ([proAct.action isEqualToString:@"quit"]) {
@@ -154,7 +154,7 @@ - (void)goToVCWithItem:(HtmlMediaItem *)clickedItem activity:(ProjectActivity *)
154154

155155
}else if ([target_type isEqualToString:@"Depot"]) {
156156
if ([proAct.action_msg isEqualToString:@"删除了"]) {
157-
[self showHudTipStr:@"删除了，不能看了~"];
157+
[NSObject showHudTipStr:@"删除了，不能看了~"];
158158
}else if ([proAct.action isEqualToString:@"fork"]) {
159159
NSArray *nameComponents = [proAct.depot.name componentsSeparatedByString:@"/"];
160160
if (nameComponents.count == 2) {
@@ -164,7 +164,7 @@ - (void)goToVCWithItem:(HtmlMediaItem *)clickedItem activity:(ProjectActivity *)
164164
vc.myProject.name = nameComponents[1];
165165
[self.navigationController pushViewController:vc animated:YES];
166166
}else{
167-
[self showHudTipStr:@"没找到 Fork 到哪里去了~"];
167+
[NSObject showHudTipStr:@"没找到 Fork 到哪里去了~"];
168168
}
169169
}else{
170170
ProjectViewController *vc = [ProjectViewController codeVCWithCodeRef:proAct.ref andProject:project];
@@ -195,17 +195,17 @@ - (void)goToVCWithItem:(HtmlMediaItem *)clickedItem activity:(ProjectActivity *)
195195
if (vc) {
196196
[self.navigationController pushViewController:vc animated:YES];
197197
}else{
198-
[self showHudTipStr:@"不知道这是个什么东西o(╯□╰)o~"];
198+
[NSObject showHudTipStr:@"不知道这是个什么东西o(╯□╰)o~"];
199199
}
200200
}else{
201201
if ([target_type isEqualToString:@"Project"]){//这是什么鬼。。遗留的 type 吧
202-
[self showHudTipStr:@"还不能查看详细信息呢~"];
202+
[NSObject showHudTipStr:@"还不能查看详细信息呢~"];
203203
// }else if ([target_type isEqualToString:@"MergeRequestComment"]){//过期类型，已用CommitLineNote替代
204204
// }else if ([target_type isEqualToString:@"PullRequestComment"]){//过期类型，已用CommitLineNote替代
205205
// }else if ([target_type isEqualToString:@"ProjectStar"]){//不用解析
206206
// }else if ([target_type isEqualToString:@"ProjectWatcher"]){//不用解析
207207
}else if ([target_type isEqualToString:@"QcTask"]){//还不能解析
208-
[self showHudTipStr:@"还不能查看详细信息呢~"];
208+
[NSObject showHudTipStr:@"还不能查看详细信息呢~"];
209209
}
210210
}
211211
}else{//cell上面第一个Label

0 commit comments

Comments
 (0)