diff --git a/Ash_AWord.xcodeproj/project.pbxproj b/Ash_AWord.xcodeproj/project.pbxproj index b1fa605..f63328d 100644 --- a/Ash_AWord.xcodeproj/project.pbxproj +++ b/Ash_AWord.xcodeproj/project.pbxproj @@ -50,6 +50,8 @@ A94D0EDD1AD5757A0002DEB1 /* UpdateViewModel.m in Sources */ = {isa = PBXBuildFile; fileRef = A94D0EDC1AD5757A0002DEB1 /* UpdateViewModel.m */; }; A94DF6351AD4D94E00DCDCB0 /* MyNoteViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A94DF6331AD4D94E00DCDCB0 /* MyNoteViewController.m */; }; A94DF6361AD4D94E00DCDCB0 /* MyNoteViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A94DF6341AD4D94E00DCDCB0 /* MyNoteViewController.xib */; }; + A950AB401AEC8B5E00D0F6DD /* closeButton@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A950AB3E1AEC8B5E00D0F6DD /* closeButton@2x.png */; }; + A950AB411AEC8B5E00D0F6DD /* closeButtonClick@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A950AB3F1AEC8B5E00D0F6DD /* closeButtonClick@2x.png */; }; A95510921AC39E6A0006D16F /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = A95510911AC39E6A0006D16F /* main.m */; }; A95510951AC39E6A0006D16F /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = A95510941AC39E6A0006D16F /* AppDelegate.m */; }; A95510981AC39E6A0006D16F /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A95510971AC39E6A0006D16F /* ViewController.m */; }; @@ -247,6 +249,8 @@ A94DF6321AD4D94E00DCDCB0 /* MyNoteViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyNoteViewController.h; sourceTree = ""; }; A94DF6331AD4D94E00DCDCB0 /* MyNoteViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MyNoteViewController.m; sourceTree = ""; }; A94DF6341AD4D94E00DCDCB0 /* MyNoteViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MyNoteViewController.xib; sourceTree = ""; }; + A950AB3E1AEC8B5E00D0F6DD /* closeButton@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "closeButton@2x.png"; sourceTree = ""; }; + A950AB3F1AEC8B5E00D0F6DD /* closeButtonClick@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "closeButtonClick@2x.png"; sourceTree = ""; }; A955108C1AC39E6A0006D16F /* Ash_AWord.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Ash_AWord.app; sourceTree = BUILT_PRODUCTS_DIR; }; A95510901AC39E6A0006D16F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; A95510911AC39E6A0006D16F /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; @@ -909,6 +913,8 @@ A97559C91ACBF0BC004ADA42 /* btn_good@2x.png */, A97559CA1ACBF0BC004ADA42 /* btn_share_clicked@2x.png */, A97559CB1ACBF0BC004ADA42 /* btn_share@2x.png */, + A950AB3E1AEC8B5E00D0F6DD /* closeButton@2x.png */, + A950AB3F1AEC8B5E00D0F6DD /* closeButtonClick@2x.png */, A97559AA1ACB9DF0004ADA42 /* navigationButtonRefresh@2x.png */, A97559AB1ACB9DF0004ADA42 /* navigationButtonRefreshClick@2x.png */, A97559A61ACB9DE4004ADA42 /* navigationButtonPublish@2x.png */, @@ -1289,6 +1295,7 @@ A97559D11ACBF0BC004ADA42 /* btn_share@2x.png in Resources */, A98D659E1AD37F18008668EE /* MessageTableViewCell.xib in Resources */, A93441E11ACA89AA00A6B233 /* Profile_filter_voiceIcon@2x.png in Resources */, + A950AB411AEC8B5E00D0F6DD /* closeButtonClick@2x.png in Resources */, A97C55031AC933AD0038818A /* UMShareEditViewController.xib in Resources */, A97DBE4E1ACAED4900705682 /* camera-close-select@2x.png in Resources */, A97559A91ACB9DE4004ADA42 /* navigationButtonPublishClick@2x.png in Resources */, @@ -1298,6 +1305,7 @@ A97559CE1ACBF0BC004ADA42 /* btn_good_clicked@2x.png in Resources */, A97883881AD369DF00D46477 /* mainCellDingClick@2x.png in Resources */, A90BA0211AD606B400728393 /* voice-record-level@2x.png in Resources */, + A950AB401AEC8B5E00D0F6DD /* closeButton@2x.png in Resources */, A90BA0141AD6066000728393 /* voice-bottom-sure-click@2x.png in Resources */, A90BA0121AD6066000728393 /* voice-bottom-close-click@2x.png in Resources */, A97C55061AC933AD0038818A /* UMSnsAccountViewController.xib in Resources */, 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 7ed5384..89055fe 100644 --- a/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -713,11 +713,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/Views/Note/NoteTableViewCell.m" - timestampString = "451547020.189351" + timestampString = "451710683.81762" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "146" - endingLineNumber = "146" + startingLineNumber = "148" + endingLineNumber = "148" landmarkName = "-setText_Image:" landmarkType = "5"> @@ -729,11 +729,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/My/MyNoteViewController.m" - timestampString = "451657598.552821" + timestampString = "451710108.719984" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "38" - endingLineNumber = "38" + startingLineNumber = "40" + endingLineNumber = "40" landmarkName = "-viewDidLoad" landmarkType = "5"> @@ -1161,11 +1161,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/My/MyNoteViewController.m" - timestampString = "451659407.266745" + timestampString = "451710471.277773" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "156" - endingLineNumber = "156" + startingLineNumber = "172" + endingLineNumber = "172" landmarkName = "-footerRereshing" landmarkType = "5"> @@ -1209,11 +1209,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/Views/Message/MessageTableViewCell.m" - timestampString = "450754371.933898" + timestampString = "451711171.409368" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "237" - endingLineNumber = "237" + startingLineNumber = "239" + endingLineNumber = "239" landmarkName = "-audioPlayer:stateChanged:" landmarkType = "5"> @@ -1225,11 +1225,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/Views/Message/MessageTableViewCell.m" - timestampString = "450754371.933898" + timestampString = "451711171.409368" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "242" - endingLineNumber = "242" + startingLineNumber = "244" + endingLineNumber = "244" landmarkName = "-audioPlayer:didEncounterError:" landmarkType = "5"> @@ -1241,11 +1241,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/Views/Message/MessageTableViewCell.m" - timestampString = "450754371.933898" + timestampString = "451711171.409368" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "247" - endingLineNumber = "247" + startingLineNumber = "249" + endingLineNumber = "249" landmarkName = "-audioPlayer:didStartPlayingQueueItemId:" landmarkType = "5"> @@ -1257,11 +1257,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/Views/Message/MessageTableViewCell.m" - timestampString = "450754371.933898" + timestampString = "451711171.409368" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "251" - endingLineNumber = "251" + startingLineNumber = "253" + endingLineNumber = "253" landmarkName = "-audioPlayer:didFinishBufferingSourceWithQueueItemId:" landmarkType = "5"> @@ -1273,11 +1273,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/Views/Message/MessageTableViewCell.m" - timestampString = "450754371.933898" + timestampString = "451711171.409368" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "252" - endingLineNumber = "252" + startingLineNumber = "254" + endingLineNumber = "254" landmarkName = "-audioPlayer:didFinishBufferingSourceWithQueueItemId:" landmarkType = "5"> @@ -1289,11 +1289,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/Views/Message/MessageTableViewCell.m" - timestampString = "450754371.933898" + timestampString = "451711171.409368" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "257" - endingLineNumber = "257" + startingLineNumber = "259" + endingLineNumber = "259" landmarkName = "-audioPlayer:didFinishPlayingQueueItemId:withReason:andProgress:andDuration:" landmarkType = "5"> @@ -1561,11 +1561,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/My/MyNoteViewController.m" - timestampString = "451659437.269634" + timestampString = "451710471.277773" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "71" - endingLineNumber = "71" + startingLineNumber = "87" + endingLineNumber = "87" landmarkName = "-longPressToDo:" landmarkType = "5"> diff --git a/Ash_AWord/Resource/closeButton@2x.png b/Ash_AWord/Resource/closeButton@2x.png new file mode 100644 index 0000000..e187531 Binary files /dev/null and b/Ash_AWord/Resource/closeButton@2x.png differ diff --git a/Ash_AWord/Resource/closeButtonClick@2x.png b/Ash_AWord/Resource/closeButtonClick@2x.png new file mode 100644 index 0000000..d5c91a9 Binary files /dev/null and b/Ash_AWord/Resource/closeButtonClick@2x.png differ diff --git a/Ash_AWord/ViewControllers/My/MyMessageViewController.m b/Ash_AWord/ViewControllers/My/MyMessageViewController.m index edc4cd0..b53f67c 100644 --- a/Ash_AWord/ViewControllers/My/MyMessageViewController.m +++ b/Ash_AWord/ViewControllers/My/MyMessageViewController.m @@ -16,6 +16,8 @@ NSMutableArray* _text_voiceArr; NSInteger _playIndex; NSInteger _reportIndex; + BOOL _isShowDel; + } @end @@ -30,6 +32,7 @@ _text_voiceArr = [[NSMutableArray alloc] init]; _playIndex = -1; _reportIndex = -1; + _isShowDel = NO; } return self; } @@ -38,6 +41,7 @@ // Do any additional setup after loading the view from its nib. if(!_otherUserId){ self.navigationItem.title = @"我发表的声音"; + self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"管理" style:UIBarButtonItemStyleDone target:self action:@selector(showDelBtn)]; }else{ self.navigationItem.title = [NSString stringWithFormat:@"%@发表的声音",_otherName]; } @@ -47,6 +51,18 @@ longPressGr.minimumPressDuration = 1.0; [self.tableView addGestureRecognizer:longPressGr]; } +-(void)showDelBtn +{ + if (_isShowDel) { + self.navigationItem.rightBarButtonItem.title = @"管理"; + _isShowDel = NO; + }else{ + _isShowDel = YES; + self.navigationItem.rightBarButtonItem.title = @"取消"; + + } + [self.tableView reloadData]; +} -(void)longPressToDo:(UILongPressGestureRecognizer *)gesture { if(gesture.state == UIGestureRecognizerStateBegan) @@ -216,9 +232,22 @@ [cell setText_Voice:text_voice]; cell.tag = indexPath.section; cell.delegate = self; + if (_isShowDel) { + cell.closeBtn.hidden = NO; + cell.closeBtn.tag = indexPath.section; + cell.timeLabel.hidden = YES; + [cell.closeBtn addTarget:self action:@selector(msgDel:) forControlEvents:UIControlEventTouchUpInside]; + } + return cell; } - +-(void)msgDel:(UIButton*)button +{ + _reportIndex = button.tag; + UIAlertView* alertView = [[UIAlertView alloc] initWithTitle:@"确认删除" message:@"是否删除" delegate:self cancelButtonTitle:@"取消" otherButtonTitles:@"删除", nil]; + alertView.tag = 0; + [alertView show]; +} -(void)playWithIndex:(NSInteger)index { diff --git a/Ash_AWord/ViewControllers/My/MyNoteViewController.m b/Ash_AWord/ViewControllers/My/MyNoteViewController.m index 62171ba..e247a5c 100644 --- a/Ash_AWord/ViewControllers/My/MyNoteViewController.m +++ b/Ash_AWord/ViewControllers/My/MyNoteViewController.m @@ -15,6 +15,7 @@ NSInteger _page; NSMutableArray* _text_imageArr; NSInteger _reportIndex; + BOOL _isShowDel; } @end @@ -28,6 +29,7 @@ _page = 1; _text_imageArr = [[NSMutableArray alloc] init]; _reportIndex = -1; + _isShowDel = NO; } return self; } @@ -37,6 +39,7 @@ // Do any additional setup after loading the view from its nib. if(!_otherUserId){ self.navigationItem.title = @"我发表的图片"; + self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"管理" style:UIBarButtonItemStyleDone target:self action:@selector(showDelBtn)]; }else{ self.navigationItem.title = [NSString stringWithFormat:@"%@发表的图片",_otherName]; } @@ -46,8 +49,21 @@ UILongPressGestureRecognizer * longPressGr = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(longPressToDo:)]; longPressGr.minimumPressDuration = 1.0; [self.tableView addGestureRecognizer:longPressGr]; + } +-(void)showDelBtn +{ + if (_isShowDel) { + self.navigationItem.rightBarButtonItem.title = @"管理"; + _isShowDel = NO; + }else{ + _isShowDel = YES; + self.navigationItem.rightBarButtonItem.title = @"取消"; + + } + [self.tableView reloadData]; +} -(void)longPressToDo:(UILongPressGestureRecognizer *)gesture { if(gesture.state == UIGestureRecognizerStateBegan) @@ -221,10 +237,22 @@ cell.selectionStyle = UITableViewCellSelectionStyleNone; Text_Image* text_image = [_text_imageArr objectAtIndex:indexPath.section]; [cell setText_Image:text_image]; + if (_isShowDel) { + cell.closeBtn.hidden = NO; + cell.closeBtn.tag = indexPath.section; + cell.timeLabel.hidden = YES; + [cell.closeBtn addTarget:self action:@selector(msgDel:) forControlEvents:UIControlEventTouchUpInside]; + } return cell; } - +-(void)msgDel:(UIButton*)button +{ + _reportIndex = button.tag; + UIAlertView* alertView = [[UIAlertView alloc] initWithTitle:@"确认删除" message:@"是否删除" delegate:self cancelButtonTitle:@"取消" otherButtonTitles:@"删除", nil]; + alertView.tag = 0; + [alertView show]; +} - (void)didReceiveMemoryWarning { [super didReceiveMemoryWarning]; // Dispose of any resources that can be recreated. diff --git a/Ash_AWord/Views/Message/MessageTableViewCell.h b/Ash_AWord/Views/Message/MessageTableViewCell.h index d7d44c4..7dcebb1 100644 --- a/Ash_AWord/Views/Message/MessageTableViewCell.h +++ b/Ash_AWord/Views/Message/MessageTableViewCell.h @@ -23,10 +23,12 @@ @property (weak, nonatomic) IBOutlet UILabel *nowTimeLabel; @property (weak, nonatomic) IBOutlet UIButton *playBtn; @property (weak, nonatomic) IBOutlet UIButton *goodBtn; +- (IBAction)closeBtnClick:(id)sender; @property (weak, nonatomic)id delegate; - (IBAction)goodBtnClick:(id)sender; @property (weak, nonatomic) IBOutlet UIButton *shareBtn; - (IBAction)shareBtnClick:(id)sender; +@property (weak, nonatomic) IBOutlet UIButton *closeBtn; @property (weak, nonatomic) IBOutlet NSLayoutConstraint *contentHeight; @property (weak, nonatomic) IBOutlet UILabel *totalTimeLabel; - (IBAction)playBtnClick:(id)sender; diff --git a/Ash_AWord/Views/Message/MessageTableViewCell.m b/Ash_AWord/Views/Message/MessageTableViewCell.m index 1dc0d0f..21e97e8 100644 --- a/Ash_AWord/Views/Message/MessageTableViewCell.m +++ b/Ash_AWord/Views/Message/MessageTableViewCell.m @@ -115,6 +115,7 @@ [_avatarImageView sd_setImageWithURL:text_voice.ownerFigureurl placeholderImage:[UIImage imageNamed:@"defaultUserIcon"]]; _timeLabel.text = [CommonUtil timeFromtimeSp:text_voice.createTime.stringValue]; + _timeLabel.hidden = NO; UIFont *font = [UIFont appFontOfSize:14.0]; CGSize size = CGSizeMake(300*[Ash_UIUtil currentScreenSizeRate],MAXFLOAT); @@ -126,6 +127,7 @@ [_goodBtn setTitle:[NSString stringWithFormat:@"%ld",(long)text_voice.praiseCount] forState:UIControlStateSelected]; [_shareBtn setTitle:[NSString stringWithFormat:@"%ld",(long)text_voice.shareCount] forState:UIControlStateNormal]; + _closeBtn.hidden = YES; [self setGoodBtnSelect:text_voice.hasPraised]; } @@ -266,4 +268,6 @@ [[AppDelegate visibleViewController].navigationController pushViewController:myNoteViewController animated:YES]; } } +- (IBAction)closeBtnClick:(id)sender { +} @end diff --git a/Ash_AWord/Views/Message/MessageTableViewCell.xib b/Ash_AWord/Views/Message/MessageTableViewCell.xib index 623b9aa..333e2f9 100644 --- a/Ash_AWord/Views/Message/MessageTableViewCell.xib +++ b/Ash_AWord/Views/Message/MessageTableViewCell.xib @@ -103,6 +103,21 @@ + @@ -185,6 +200,8 @@ + + @@ -205,6 +222,7 @@ + @@ -222,6 +240,7 @@ + diff --git a/Ash_AWord/Views/Note/NoteTableViewCell.h b/Ash_AWord/Views/Note/NoteTableViewCell.h index 2801cbe..3c25514 100644 --- a/Ash_AWord/Views/Note/NoteTableViewCell.h +++ b/Ash_AWord/Views/Note/NoteTableViewCell.h @@ -17,7 +17,9 @@ @property (weak, nonatomic) IBOutlet UIImageView *contentImgView; @property (weak, nonatomic) IBOutlet UIButton *goodBtn; @property (weak, nonatomic) IBOutlet UIButton *badBtn; +- (IBAction)closeBtnClick:(id)sender; @property (weak, nonatomic) IBOutlet UIButton *shareBtn; +@property (weak, nonatomic) IBOutlet UIButton *closeBtn; @property (weak, nonatomic) IBOutlet NSLayoutConstraint *contentHeight; - (IBAction)avatarBtnClick:(id)sender; diff --git a/Ash_AWord/Views/Note/NoteTableViewCell.m b/Ash_AWord/Views/Note/NoteTableViewCell.m index 91752f7..2b46181 100644 --- a/Ash_AWord/Views/Note/NoteTableViewCell.m +++ b/Ash_AWord/Views/Note/NoteTableViewCell.m @@ -107,7 +107,7 @@ - (IBAction)shareBtnClick:(id)sender { - [SetUpViewController shareAppWithViewController:nil andTitle:@"遇见你" andContent:_text_image.content andImage:_contentImgView.image andUrl:[NSString stringWithFormat:@"%@/web/image_share_info?record_id=%ld",Ash_AWord_API_URL,_text_image.messageId]]; + [SetUpViewController shareAppWithViewController:nil andTitle:@"遇见你" andContent:_text_image.content andImage:_contentImgView.image andUrl:[NSString stringWithFormat:@"%@/web/image_share_info?record_id=%ld",Ash_AWord_API_URL,(long)_text_image.messageId]]; PropertyEntity* pro = [NoteViewModel requireShareWithRecordId:_text_image.messageId]; [RequireEngine requireWithProperty:pro completionBlock:^(id viewModel) { if ([viewModel success]) { @@ -132,6 +132,7 @@ [_avatar sd_setImageWithURL:text_image.ownerFigureurl placeholderImage:[UIImage imageNamed:@"defaultUserIcon"]]; _timeLabel.text = [CommonUtil timeFromtimeSp:text_image.createTime.stringValue]; + _timeLabel.hidden = NO; UIFont *font = [UIFont appFontOfSize:14.0]; CGSize size = CGSizeMake(300*[Ash_UIUtil currentScreenSizeRate],MAXFLOAT); @@ -144,6 +145,7 @@ [_goodBtn setTitle:[NSString stringWithFormat:@"%ld",(long)text_image.praiseCount] forState:UIControlStateSelected]; [_shareBtn setTitle:[NSString stringWithFormat:@"%ld",(long)text_image.shareCount] forState:UIControlStateNormal]; + _closeBtn.hidden = YES; [self setGoodBtnSelect:text_image.hasPraised]; @@ -215,4 +217,6 @@ return photo; } +- (IBAction)closeBtnClick:(id)sender { +} @end diff --git a/Ash_AWord/Views/Note/NoteTableViewCell.xib b/Ash_AWord/Views/Note/NoteTableViewCell.xib index 568cf31..6afddb5 100644 --- a/Ash_AWord/Views/Note/NoteTableViewCell.xib +++ b/Ash_AWord/Views/Note/NoteTableViewCell.xib @@ -133,6 +133,21 @@ + @@ -162,6 +177,8 @@ + + @@ -172,6 +189,7 @@ + @@ -188,6 +206,7 @@ +