diff --git a/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index ee18f87..7e8e014 100644 --- a/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -58,11 +58,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Main/NoteViewController.m" - timestampString = "455182245.754147" + timestampString = "456990925.57948" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "227" - endingLineNumber = "227" + startingLineNumber = "228" + endingLineNumber = "228" landmarkName = "-tableView:cellForRowAtIndexPath:" landmarkType = "5"> @@ -170,11 +170,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Main/NoteViewController.m" - timestampString = "451816790.449978" + timestampString = "456990925.57948" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "209" - endingLineNumber = "209" + startingLineNumber = "210" + endingLineNumber = "210" landmarkName = "-tableView:heightForRowAtIndexPath:" landmarkType = "5"> @@ -186,11 +186,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Main/NoteViewController.m" - timestampString = "451816790.449978" + timestampString = "456990925.57948" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "195" - endingLineNumber = "195" + startingLineNumber = "196" + endingLineNumber = "196" landmarkName = "-numberOfSectionsInTableView:" landmarkType = "5"> @@ -202,11 +202,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Note/NotePublishViewController.m" - timestampString = "451641749.207606" + timestampString = "456990925.57948" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "77" - endingLineNumber = "77" + startingLineNumber = "78" + endingLineNumber = "78" landmarkName = "-textView:shouldChangeTextInRange:replacementText:" landmarkType = "5"> @@ -250,11 +250,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Main/NoteViewController.m" - timestampString = "451816790.449978" + timestampString = "456990925.57948" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "169" - endingLineNumber = "169" + startingLineNumber = "170" + endingLineNumber = "170" landmarkName = "-loadData" landmarkType = "5"> @@ -266,11 +266,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Main/NoteViewController.m" - timestampString = "451816790.449978" + timestampString = "456990925.57948" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "167" - endingLineNumber = "167" + startingLineNumber = "168" + endingLineNumber = "168" landmarkName = "-loadData" landmarkType = "5"> @@ -713,11 +713,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Message/MessagePublishViewController.m" - timestampString = "450631991.198771" + timestampString = "456990925.57948" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "249" - endingLineNumber = "249" + startingLineNumber = "251" + endingLineNumber = "251" landmarkName = "-detectionVoice" landmarkType = "5"> @@ -729,11 +729,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Message/MessagePublishViewController.m" - timestampString = "450631991.198771" + timestampString = "456990925.57948" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "241" - endingLineNumber = "241" + startingLineNumber = "243" + endingLineNumber = "243" landmarkName = "-updateIndicateur" landmarkType = "5"> @@ -745,11 +745,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Message/MessagePublishViewController.m" - timestampString = "450631991.198771" + timestampString = "456990925.57948" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "218" - endingLineNumber = "218" + startingLineNumber = "220" + endingLineNumber = "220" landmarkName = "-alertView:clickedButtonAtIndex:" landmarkType = "5"> @@ -761,11 +761,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Message/MessagePublishViewController.m" - timestampString = "450631991.198771" + timestampString = "456990925.57948" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "228" - endingLineNumber = "228" + startingLineNumber = "230" + endingLineNumber = "230" landmarkName = "-alertView:clickedButtonAtIndex:" landmarkType = "5"> @@ -825,11 +825,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Message/MessagePublishViewController.m" - timestampString = "450624994.91475" + timestampString = "456990925.57948" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "162" - endingLineNumber = "162" + startingLineNumber = "164" + endingLineNumber = "164" landmarkName = "-audio" landmarkType = "5"> @@ -841,11 +841,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Message/MessagePublishViewController.m" - timestampString = "450624994.91475" + timestampString = "456990925.57948" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "148" - endingLineNumber = "148" + startingLineNumber = "150" + endingLineNumber = "150" landmarkName = "-audio" landmarkType = "5"> @@ -857,11 +857,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Message/MessagePublishViewController.m" - timestampString = "450624994.91475" + timestampString = "456990925.57948" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "149" - endingLineNumber = "149" + startingLineNumber = "151" + endingLineNumber = "151" landmarkName = "-audio" landmarkType = "5"> @@ -905,11 +905,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Main/MessageViewController.m" - timestampString = "455711777.493401" + timestampString = "456990925.57948" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "215" - endingLineNumber = "215" + startingLineNumber = "219" + endingLineNumber = "219" landmarkName = "-playWithIndex:" landmarkType = "5"> @@ -921,11 +921,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Message/MessagePublishViewController.m" - timestampString = "450631991.198771" + timestampString = "456990925.57948" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "336" - endingLineNumber = "336" + startingLineNumber = "338" + endingLineNumber = "338" landmarkName = "-audioRecorderDidFinishRecording:successfully:" landmarkType = "5"> @@ -969,11 +969,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Main/MessageViewController.m" - timestampString = "455711777.493401" + timestampString = "456990925.57948" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "132" - endingLineNumber = "132" + startingLineNumber = "136" + endingLineNumber = "136" landmarkName = "-footerRereshing" landmarkType = "5"> @@ -985,11 +985,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Main/NoteViewController.m" - timestampString = "451816790.449978" + timestampString = "456990925.57948" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "155" - endingLineNumber = "155" + startingLineNumber = "156" + endingLineNumber = "156" landmarkName = "-headerRereshing" landmarkType = "5"> @@ -1177,11 +1177,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Main/NoteViewController.m" - timestampString = "451816790.449978" + timestampString = "456990925.57948" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "164" - endingLineNumber = "164" + startingLineNumber = "165" + endingLineNumber = "165" landmarkName = "-loadData" landmarkType = "5"> @@ -1241,11 +1241,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Main/NoteViewController.m" - timestampString = "451816790.449978" + timestampString = "456990925.57948" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "116" - endingLineNumber = "116" + startingLineNumber = "117" + endingLineNumber = "117" landmarkName = "-canBecomeFirstResponder" landmarkType = "5"> @@ -1529,11 +1529,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Main/NoteViewController.m" - timestampString = "452502958.630353" + timestampString = "456990925.57948" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "218" - endingLineNumber = "218" + startingLineNumber = "219" + endingLineNumber = "219" landmarkName = "-tableView:cellForRowAtIndexPath:" landmarkType = "5"> @@ -1545,11 +1545,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Main/NoteViewController.m" - timestampString = "452502960.942063" + timestampString = "456990925.57948" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "216" - endingLineNumber = "216" + startingLineNumber = "217" + endingLineNumber = "217" landmarkName = "-tableView:cellForRowAtIndexPath:" landmarkType = "5"> @@ -1561,11 +1561,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Main/NoteViewController.m" - timestampString = "455182245.754147" + timestampString = "456990925.57948" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "296" - endingLineNumber = "296" + startingLineNumber = "297" + endingLineNumber = "297" landmarkName = "-didReceiveMemoryWarning" landmarkType = "5"> @@ -1577,11 +1577,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Main/NoteViewController.m" - timestampString = "455182245.754147" + timestampString = "456990925.57948" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "279" - endingLineNumber = "279" + startingLineNumber = "280" + endingLineNumber = "280" landmarkName = "-imagePickerController:didFinishPickingMediaWithInfo:" landmarkType = "5"> @@ -1593,11 +1593,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Main/NoteViewController.m" - timestampString = "455182245.754147" + timestampString = "456990925.57948" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "274" - endingLineNumber = "274" + startingLineNumber = "275" + endingLineNumber = "275" landmarkName = "-imagePickerControllerDidCancel:" landmarkType = "5"> @@ -2137,11 +2137,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Note/NoteCommentViewController.m" - timestampString = "456214002.949678" + timestampString = "456989677.640236" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "133" - endingLineNumber = "133" + startingLineNumber = "139" + endingLineNumber = "139" landmarkName = "-loadData" landmarkType = "5"> @@ -2153,11 +2153,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Note/NoteCommentViewController.m" - timestampString = "456214002.949678" + timestampString = "456989677.640236" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "131" - endingLineNumber = "131" + startingLineNumber = "137" + endingLineNumber = "137" landmarkName = "-loadData" landmarkType = "5"> @@ -2201,11 +2201,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Note/NoteCommentViewController.m" - timestampString = "456214002.949678" + timestampString = "456989677.640236" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "130" - endingLineNumber = "130" + startingLineNumber = "136" + endingLineNumber = "136" landmarkName = "-loadData" landmarkType = "5"> @@ -2233,11 +2233,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Note/NoteCommentViewController.m" - timestampString = "456214002.949678" + timestampString = "456989677.640236" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "108" - endingLineNumber = "108" + startingLineNumber = "114" + endingLineNumber = "114" landmarkName = "-requirePraiseUser" landmarkType = "5"> @@ -2249,11 +2249,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Note/NoteCommentViewController.m" - timestampString = "456214002.949678" + timestampString = "456989677.640236" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "105" - endingLineNumber = "105" + startingLineNumber = "111" + endingLineNumber = "111" landmarkName = "-requirePraiseUser" landmarkType = "5"> @@ -2265,11 +2265,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Note/NoteCommentViewController.m" - timestampString = "456214002.949678" + timestampString = "456989677.640236" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "106" - endingLineNumber = "106" + startingLineNumber = "112" + endingLineNumber = "112" landmarkName = "-requirePraiseUser" landmarkType = "5"> @@ -2313,11 +2313,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Note/NoteCommentViewController.m" - timestampString = "456214002.949678" + timestampString = "456989677.640236" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "132" - endingLineNumber = "132" + startingLineNumber = "138" + endingLineNumber = "138" landmarkName = "-loadData" landmarkType = "5"> @@ -2345,11 +2345,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/Views/Common/CommentTableViewCell.m" - timestampString = "456068317.847602" + timestampString = "456988908.52767" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "66" - endingLineNumber = "66" + startingLineNumber = "71" + endingLineNumber = "71" landmarkName = "-setCommentInfoViewModel:" landmarkType = "5"> @@ -2361,11 +2361,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Note/NoteCommentViewController.m" - timestampString = "456214002.949678" + timestampString = "456989677.640236" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "224" - endingLineNumber = "224" + startingLineNumber = "223" + endingLineNumber = "223" landmarkName = "-tableView:cellForRowAtIndexPath:" landmarkType = "5"> @@ -2377,11 +2377,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Note/NoteCommentViewController.m" - timestampString = "456034301.74356" + timestampString = "456982707.310468" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "37" - endingLineNumber = "37" + startingLineNumber = "39" + endingLineNumber = "39" landmarkName = "-viewDidLoad" landmarkType = "5"> @@ -2409,11 +2409,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/Views/Common/CommentTableViewCell.m" - timestampString = "456068317.847602" + timestampString = "456988908.52767" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "101" - endingLineNumber = "101" + startingLineNumber = "106" + endingLineNumber = "106" landmarkName = "-linkPushed:" landmarkType = "5"> @@ -2441,11 +2441,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/Views/Common/CommentTableViewCell.m" - timestampString = "456068281.61508" + timestampString = "456988908.52767" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "50" - endingLineNumber = "50" + startingLineNumber = "55" + endingLineNumber = "55" landmarkName = "-avatarBtnClick:" landmarkType = "5"> @@ -2585,11 +2585,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Note/NoteCommentViewController.m" - timestampString = "456212684.376134" + timestampString = "456982707.310468" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "34" - endingLineNumber = "34" + startingLineNumber = "36" + endingLineNumber = "36" landmarkName = "-viewDidLoad" landmarkType = "5"> @@ -2617,11 +2617,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Message/MessageCommentViewController.m" - timestampString = "456214095.079766" + timestampString = "456990312.358791" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "138" - endingLineNumber = "138" + startingLineNumber = "140" + endingLineNumber = "140" landmarkName = "-loadData" landmarkType = "5"> @@ -2821,7 +2821,7 @@ + + + + diff --git a/Ash_AWord/Config/Common.h b/Ash_AWord/Config/Common.h index 9a6ecdb..b7c10fe 100644 --- a/Ash_AWord/Config/Common.h +++ b/Ash_AWord/Config/Common.h @@ -55,6 +55,11 @@ #define kReceiveMessage @"kReceiveMessage" +//发表 +#define kNotePushSuccessNotificationName @"kNotePushSuccessNotificationName" +#define kMessagePushSuccessNotificationName @"kMessagePushSuccessNotificationName" + + //文字标签 #define kNetworkErrorTips @"网络连接失败" #define kSSoErrorTips @"授权失败,请重新授权" diff --git a/Ash_AWord/Utility/Network/RequireEngine.m b/Ash_AWord/Utility/Network/RequireEngine.m index 0dbc662..924dcd0 100644 --- a/Ash_AWord/Utility/Network/RequireEngine.m +++ b/Ash_AWord/Utility/Network/RequireEngine.m @@ -146,6 +146,8 @@ failure:^(AFHTTPRequestOperation *__unused task, NSError *error) { if (failedBlock) { failedBlock(error); + }else{ + [MBProgressHUD errorHudWithView:nil label:kNetworkErrorTips hidesAfter:1.0]; } [self responseFromCacheWithAPIKey:apiKey property:proper completionBlock:completionBlock]; diff --git a/Ash_AWord/ViewControllers/Main/MessageViewController.m b/Ash_AWord/ViewControllers/Main/MessageViewController.m index a97c106..2f30a15 100644 --- a/Ash_AWord/ViewControllers/Main/MessageViewController.m +++ b/Ash_AWord/ViewControllers/Main/MessageViewController.m @@ -46,8 +46,12 @@ self.navigationItem.title = @"听你说"; self.navigationItem.leftBarButtonItem = [Ash_UIUtil leftBarButtonItemWithTarget:self action:@selector(publish) image:[UIImage imageNamed:@"navigationButtonPublish"] highlightedImage:[UIImage imageNamed:@"navigationButtonPublishClick"]]; self.navigationItem.rightBarButtonItem = [Ash_UIUtil leftBarButtonItemWithTarget:self action:@selector(headerBeginRefreshing) image:[UIImage imageNamed:@"navigationButtonRefresh"] highlightedImage:[UIImage imageNamed:@"navigationButtonRefreshClick"]]; + [self headerBeginRefreshing]; + //注册通知的观察者 + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(headerBeginRefreshing) name:kMessagePushSuccessNotificationName object:nil]; + UILongPressGestureRecognizer * longPressGr = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(longPressToDo:)]; longPressGr.minimumPressDuration = 1.0; [self.tableView addGestureRecognizer:longPressGr]; @@ -98,7 +102,7 @@ Text_Voice* text_Voice = [_text_voiceArr objectAtIndex:_reportIndex]; reportViewController.authorName = text_Voice.ownerName; reportViewController.msgId = text_Voice.messageId; - reportViewController.msgType = Message_Type; + reportViewController.msgType = Message_Voice_Type; reportViewController.hidesBottomBarWhenPushed = YES; [self.navigationController pushViewController:reportViewController animated:YES]; } diff --git a/Ash_AWord/ViewControllers/Main/NoteViewController.m b/Ash_AWord/ViewControllers/Main/NoteViewController.m index a5666b2..5a996d5 100644 --- a/Ash_AWord/ViewControllers/Main/NoteViewController.m +++ b/Ash_AWord/ViewControllers/Main/NoteViewController.m @@ -48,6 +48,9 @@ [self checkUpdate]; + //注册通知的观察者 + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(headerBeginRefreshing) name:kNotePushSuccessNotificationName object:nil]; + UILongPressGestureRecognizer * longPressGr = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(longPressToDo:)]; longPressGr.minimumPressDuration = 1.0; [self.tableView addGestureRecognizer:longPressGr]; @@ -67,8 +70,7 @@ NSIndexPath * indexPath = [self.tableView indexPathForRowAtPoint:point]; UITableViewCell* cell = [self.tableView cellForRowAtIndexPath:indexPath]; if(indexPath == nil) return ; - //add your code here -// NSLog(@"%ld",indexPath.section); + //启动弹出菜单 NSMutableArray *menuItems = [NSMutableArray array]; UIMenuItem *messageRepItem = [[UIMenuItem alloc] initWithTitle:@"举报" action:@selector(messageRep:)]; @@ -97,13 +99,12 @@ Text_Image* text_image = [_text_imageArr objectAtIndex:_reportIndex]; reportViewController.authorName = text_image.ownerName; reportViewController.msgId = text_image.messageId; - reportViewController.msgType = Note_Type; + reportViewController.msgType = Note_Img_Type; reportViewController.hidesBottomBarWhenPushed = YES; [self.navigationController pushViewController:reportViewController animated:YES]; } - - } + -(BOOL)canPerformAction:(SEL)action withSender:(id)sender { diff --git a/Ash_AWord/ViewControllers/Message/MessageCommentViewController.m b/Ash_AWord/ViewControllers/Message/MessageCommentViewController.m index f21032b..0f24e80 100644 --- a/Ash_AWord/ViewControllers/Message/MessageCommentViewController.m +++ b/Ash_AWord/ViewControllers/Message/MessageCommentViewController.m @@ -92,7 +92,9 @@ _commentTextView.commentType = Voice_Type; [_commentTextView setComentComplete:^(){ - [weakSelf headerBeginRefreshing]; + _isFirstLoad = NO; + _page = 1; + [weakSelf loadData]; }]; [self.view addSubview:_commentTextView]; _commentTextView.recordId = _text_Voice.messageId; @@ -214,12 +216,18 @@ [tableView registerNib:nib forCellReuseIdentifier:cellIdentifier]; cell = [tableView dequeueReusableCellWithIdentifier:cellIdentifier]; } - + cell.commentType = Voice_Type; + CommentInfoViewModel* commentInfoViewModel = [_commentInfoArr objectAtIndex:indexPath.row]; cell.ownerId = _text_Voice.ownerId; [cell setCommentWithUid:^(NSString* ownerId){ [_commentTextView showWithUid:ownerId]; }]; + [cell setDelCommentSuccess:^(void){ + _isFirstLoad = NO; + _page = 1; + [self loadData]; + }]; [cell setCommentInfoViewModel:commentInfoViewModel]; return cell; diff --git a/Ash_AWord/ViewControllers/Message/MessagePublishViewController.m b/Ash_AWord/ViewControllers/Message/MessagePublishViewController.m index 3f1123a..8a9ccdd 100644 --- a/Ash_AWord/ViewControllers/Message/MessagePublishViewController.m +++ b/Ash_AWord/ViewControllers/Message/MessagePublishViewController.m @@ -86,6 +86,8 @@ [MBProgressHUD hideAllHUDsForView:self.view animated:YES]; if ([messagePublihViewModel success]) { [MBProgressHUD checkHudWithView:self.view label:@"发布成功" hidesAfter:1.0]; + [[NSNotificationCenter defaultCenter] postNotificationName:kNotePushSuccessNotificationName object:nil]; + [self dismissViewControllerAnimated:YES completion:nil]; }else{ [MBProgressHUD errorHudWithView:self.view label:messagePublihViewModel.errMessage hidesAfter:1.0]; diff --git a/Ash_AWord/ViewControllers/My/MyMessageViewController.m b/Ash_AWord/ViewControllers/My/MyMessageViewController.m index 648dbbb..9abfc3a 100644 --- a/Ash_AWord/ViewControllers/My/MyMessageViewController.m +++ b/Ash_AWord/ViewControllers/My/MyMessageViewController.m @@ -121,7 +121,7 @@ Text_Voice* text_Voice = [_text_voiceArr objectAtIndex:_reportIndex]; reportViewController.authorName = text_Voice.ownerName; reportViewController.msgId = text_Voice.messageId; - reportViewController.msgType = Message_Type; + reportViewController.msgType = Message_Voice_Type; reportViewController.hidesBottomBarWhenPushed = YES; [self.navigationController pushViewController:reportViewController animated:YES]; } diff --git a/Ash_AWord/ViewControllers/My/MyNoteViewController.m b/Ash_AWord/ViewControllers/My/MyNoteViewController.m index 8da728c..b523cff 100644 --- a/Ash_AWord/ViewControllers/My/MyNoteViewController.m +++ b/Ash_AWord/ViewControllers/My/MyNoteViewController.m @@ -118,7 +118,7 @@ Text_Image* text_image = [_text_imageArr objectAtIndex:_reportIndex]; reportViewController.authorName = text_image.ownerName; reportViewController.msgId = text_image.messageId; - reportViewController.msgType = Note_Type; + reportViewController.msgType = Note_Img_Type; reportViewController.hidesBottomBarWhenPushed = YES; [self.navigationController pushViewController:reportViewController animated:YES]; } diff --git a/Ash_AWord/ViewControllers/Note/NoteCommentViewController.m b/Ash_AWord/ViewControllers/Note/NoteCommentViewController.m index b963685..bc3f554 100644 --- a/Ash_AWord/ViewControllers/Note/NoteCommentViewController.m +++ b/Ash_AWord/ViewControllers/Note/NoteCommentViewController.m @@ -15,6 +15,7 @@ #import "CommentViewModel.h" #import "CommentTableViewCell.h" #import "PraiseUserListViewController.h" +#import "ReportViewController.h" @interface NoteCommentViewController () { NoteTableViewCell* _headView; @@ -23,6 +24,7 @@ NSInteger _page; NSMutableArray* _commentInfoArr; BOOL _isFirstLoad; + NSInteger _reportIndex; } @end @@ -33,7 +35,7 @@ // Do any additional setup after loading the view from its nib. _page = 1; _isFirstLoad = YES; - + _reportIndex = -1; _commentInfoArr = [[NSMutableArray alloc] init]; [self customViewDidLoad]; self.navigationItem.title = @"评论"; @@ -85,8 +87,9 @@ _commentTextView.frame = self.view.frame; _commentTextView.commentType = Image_Type; [_commentTextView setComentComplete:^(){ - _isFirstLoad = YES; - [weakSelf headerBeginRefreshing]; + _isFirstLoad = NO; + _page = 1; + [weakSelf loadData]; }]; [self.view addSubview:_commentTextView]; _commentTextView.recordId = _text_image.messageId; @@ -94,12 +97,15 @@ [_commentTextView setHidden:YES]; + + [self loadData]; [self requirePraiseUser]; } + -(void)requirePraiseUser { PropertyEntity* pro = [UserViewModel requireLoadPraiseUserWithRecordId:_text_image.messageId withPage:1 withPage_size:10 withType:Image_Type]; @@ -156,13 +162,6 @@ if (_isFirstLoad) { CGPoint point = self.tableView.contentOffset; // //计算内容加上点赞列表cell高于显示多少,移动到能看到点赞列表。 -// point.y = _headView.frame.size.height+80-self.tableView.frame.size.height; -// -// if (_commentInfoArr.count > 0) { -// point.y += [CommentTableViewCell getHeightWithCommentInfoViewModel:[_commentInfoArr objectAtIndex:0]]; -// } -// [self.tableView setContentOffset:point]; -// [self.tableView scrollToRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0] atScrollPosition:UITableViewScrollPositionTop animated:YES ]; point.y = _headView.frame.size.height; [self.tableView setContentOffset:point animated:YES]; @@ -218,12 +217,17 @@ [tableView registerNib:nib forCellReuseIdentifier:cellIdentifier]; cell = [tableView dequeueReusableCellWithIdentifier:cellIdentifier]; } - + cell.commentType = Image_Type; CommentInfoViewModel* commentInfoViewModel = [_commentInfoArr objectAtIndex:indexPath.row]; cell.ownerId = _text_image.ownerId; [cell setCommentWithUid:^(NSString* ownerId){ [_commentTextView showWithUid:ownerId]; }]; + [cell setDelCommentSuccess:^(void){ + _isFirstLoad = NO; + _page = 1; + [self loadData]; + }]; [cell setCommentInfoViewModel:commentInfoViewModel]; return cell; diff --git a/Ash_AWord/ViewControllers/Note/NotePublishViewController.m b/Ash_AWord/ViewControllers/Note/NotePublishViewController.m index 6b6d297..26c2a58 100644 --- a/Ash_AWord/ViewControllers/Note/NotePublishViewController.m +++ b/Ash_AWord/ViewControllers/Note/NotePublishViewController.m @@ -58,6 +58,7 @@ [MBProgressHUD hideAllHUDsForView:self.view animated:YES]; if ([notePublishViewModel success]) { [MBProgressHUD checkHudWithView:self.view label:@"发布成功" hidesAfter:1.0]; + [[NSNotificationCenter defaultCenter] postNotificationName:kNotePushSuccessNotificationName object:nil]; [self dismissViewControllerAnimated:YES completion:nil]; }else{ [MBProgressHUD errorHudWithView:self.view label:notePublishViewModel.errMessage hidesAfter:1.0]; diff --git a/Ash_AWord/ViewModels/Common/CommentViewModel.h b/Ash_AWord/ViewModels/Common/CommentViewModel.h index db15783..c54bab9 100644 --- a/Ash_AWord/ViewModels/Common/CommentViewModel.h +++ b/Ash_AWord/ViewModels/Common/CommentViewModel.h @@ -24,6 +24,7 @@ @property (nonatomic, strong)NSArray* commentInfoArr; +(PropertyEntity*)requireAddCommentWithReconrdId:(NSInteger)recordId withContent:(NSString*)content WithType:(CommentType)commentType withToUid:(NSString*)otherId; ++(PropertyEntity*)requireDelCommentWithCommentId:(NSInteger)commentId; +(PropertyEntity*)requireLoadCommentWithRecordId:(NSInteger)recordId withPage:(NSInteger)page withPage_size:(NSInteger)page_size WithType:(CommentType)commentType; @end diff --git a/Ash_AWord/ViewModels/Common/CommentViewModel.m b/Ash_AWord/ViewModels/Common/CommentViewModel.m index 0dab13a..7f1ba28 100644 --- a/Ash_AWord/ViewModels/Common/CommentViewModel.m +++ b/Ash_AWord/ViewModels/Common/CommentViewModel.m @@ -55,6 +55,19 @@ }; return pro; } ++(PropertyEntity*)requireDelCommentWithCommentId:(NSInteger)commentId +{ + PropertyEntity *pro = [[PropertyEntity alloc] init]; + pro.requireType = HTTPRequestTypeWithPOSTDATA; + pro.responesOBJ = self.class; + NSDictionary* dic = @{ + @"commentId": [NSString stringWithFormat:@"%ld",commentId], + }; + pro.pro = @{@"root": dic, + @"command": @"10202", + }; + return pro; +} +(PropertyEntity*)requireLoadCommentWithRecordId:(NSInteger)recordId withPage:(NSInteger)page withPage_size:(NSInteger)page_size WithType:(CommentType)commentType { PropertyEntity *pro = [[PropertyEntity alloc] init]; diff --git a/Ash_AWord/ViewModels/LoginViewModel.h b/Ash_AWord/ViewModels/LoginViewModel.h index 89d3828..03b4f09 100644 --- a/Ash_AWord/ViewModels/LoginViewModel.h +++ b/Ash_AWord/ViewModels/LoginViewModel.h @@ -9,8 +9,10 @@ #import "BaseViewModel.h" typedef enum { - Note_Type = 0, - Message_Type = 1, + Note_Img_Type = 0, + Message_Voice_Type = 1, + Report_Note_Img_Type = 2, + Report_Message_Voice_Type = 3, }Msg_Type; @interface LoginViewModel : BaseViewModel diff --git a/Ash_AWord/Views/Common/CommentTableViewCell.h b/Ash_AWord/Views/Common/CommentTableViewCell.h index 0589668..d9443c3 100644 --- a/Ash_AWord/Views/Common/CommentTableViewCell.h +++ b/Ash_AWord/Views/Common/CommentTableViewCell.h @@ -11,7 +11,7 @@ @class CommentInfoViewModel; typedef void (^CommentWithUid)(NSString*); - +typedef void (^DelCommentSuccess)(void); @interface CommentTableViewCell : UITableViewCell @property (weak, nonatomic) IBOutlet UIImageView *avatarImageView; @property (weak, nonatomic) IBOutlet UILabel *nameLabel; @@ -20,6 +20,9 @@ typedef void (^CommentWithUid)(NSString*); @property (weak, nonatomic) IBOutlet DTAttributedTextView *contentTextView; @property (strong, nonatomic)NSString* ownerId; @property (strong, nonatomic)CommentWithUid commentWithUid; +@property (strong, nonatomic)DelCommentSuccess delCommentSuccess; + +@property (assign, nonatomic)CommentType commentType; - (IBAction)avatarBtnClick:(id)sender; -(void)setCommentInfoViewModel:(CommentInfoViewModel*)commentInfoViewModel; +(CGFloat)getHeightWithCommentInfoViewModel:(CommentInfoViewModel*)commentInfoViewModel isReplyOwner:(BOOL)isReplyOwner; diff --git a/Ash_AWord/Views/Common/CommentTableViewCell.m b/Ash_AWord/Views/Common/CommentTableViewCell.m index 0edd77b..038c38d 100644 --- a/Ash_AWord/Views/Common/CommentTableViewCell.m +++ b/Ash_AWord/Views/Common/CommentTableViewCell.m @@ -10,7 +10,8 @@ #import "CommentViewModel.h" #import "PersonalInfoViewController.h" #import "AppDelegate.h" -@interface CommentInfoViewModel() +#import "ReportViewController.h" +@interface CommentInfoViewModel() @end @implementation CommentTableViewCell { @@ -28,6 +29,10 @@ UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleTap:)]; [_contentTextView addGestureRecognizer:tap]; + + UILongPressGestureRecognizer * longPressGr = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(longPressToDo:)]; + longPressGr.minimumPressDuration = 1.0; + [self addGestureRecognizer:longPressGr]; } - (void)setSelected:(BOOL)selected animated:(BOOL)animated { @@ -128,4 +133,89 @@ } } +-(void)longPressToDo:(UILongPressGestureRecognizer *)gesture +{ + if(gesture.state == UIGestureRecognizerStateBegan) + { + + //启动弹出菜单 + NSMutableArray *menuItems = [NSMutableArray array]; + UIMenuItem *messageRepItem = [[UIMenuItem alloc] initWithTitle:@"举报" action:@selector(messageRep:)]; + [menuItems addObject:messageRepItem]; + + UIMenuItem *messageCopyItem = [[UIMenuItem alloc] initWithTitle:@"复制" action:@selector(messageCopy:)]; + [menuItems addObject:messageCopyItem]; + + if ([_commentInfoViewModel.ownerId isEqualToString:[AWordUser sharedInstance].uid]) { + UIMenuItem *messageDelItem = [[UIMenuItem alloc] initWithTitle:@"删除" action:@selector(messageDel:)]; + [menuItems addObject:messageDelItem]; + } + + UIMenuController *menu = [UIMenuController sharedMenuController]; + [menu setMenuItems:menuItems]; + [self becomeFirstResponder]; + CGRect targetRect = self.frame; + + [menu setTargetRect:targetRect inView:self.superview]; + [menu setMenuVisible:YES animated:YES]; + } +} +-(void)messageCopy:(id)sender{ + + UIPasteboard *pasteboard = [UIPasteboard generalPasteboard]; + pasteboard.string = _commentInfoViewModel.content; +} +-(void)messageDel:(id)sender{ + + UIAlertView* alertView = [[UIAlertView alloc] initWithTitle:@"确认删除" message:@"是否删除" delegate:self cancelButtonTitle:@"取消" otherButtonTitles:@"删除", nil]; + alertView.tag = 0; + [alertView show]; +} +-(void)messageRep:(id)sender { +// UIMenuController *menu = [UIMenuController sharedMenuController]; +// [menu setMenuVisible:NO animated:YES]; + + ReportViewController* reportViewController = [[ReportViewController alloc] init]; + reportViewController.authorName = _commentInfoViewModel.ownerName; + reportViewController.msgId = _commentInfoViewModel.commentId.integerValue; + if (_commentType == Image_Type) { + reportViewController.msgType = Report_Note_Img_Type; + }else{ + reportViewController.msgType = Report_Message_Voice_Type; + } + reportViewController.hidesBottomBarWhenPushed = YES; + [[AppDelegate visibleViewController].navigationController pushViewController:reportViewController animated:YES]; + +} +-(BOOL)canPerformAction:(SEL)action withSender:(id)sender +{ + if ( action == @selector(messageRep:) || action== @selector(messageCopy:)|| action== @selector(messageDel:)) { + return YES; + } + + return NO; +} +-(BOOL) canBecomeFirstResponder{ + return YES; +} + +#pragma mark --UIAlertViewDelegate +-(void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex +{ + //删除 + if (buttonIndex == 1) { + PropertyEntity* pro = [CommentViewModel requireDelCommentWithCommentId:_commentInfoViewModel.commentId.integerValue]; + [RequireEngine requireWithProperty:pro completionBlock:^(id viewModel) { + if ([viewModel success]) { + if (_delCommentSuccess) { + _delCommentSuccess(); + } + }else{ + [MBProgressHUD errorHudWithView:nil label:[viewModel errMessage] hidesAfter:1.0]; + } + } failedBlock:nil]; + } +} + + @end