From fe2a1b3d416af27ec4f5bc5619011e84ebb99eb8 Mon Sep 17 00:00:00 2001 From: wu736139669 Date: Sun, 26 Apr 2015 11:21:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=A0=E9=99=A4=E6=93=8D?= =?UTF-8?q?=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ash_AWord.xcodeproj/project.pbxproj | 8 +++ .../xcdebugger/Breakpoints_v2.xcbkptlist | 60 +++++++++--------- Ash_AWord/Resource/closeButton@2x.png | Bin 0 -> 5230 bytes Ash_AWord/Resource/closeButtonClick@2x.png | Bin 0 -> 5276 bytes .../My/MyMessageViewController.m | 31 ++++++++- .../ViewControllers/My/MyNoteViewController.m | 30 ++++++++- .../Views/Message/MessageTableViewCell.h | 2 + .../Views/Message/MessageTableViewCell.m | 4 ++ .../Views/Message/MessageTableViewCell.xib | 19 ++++++ Ash_AWord/Views/Note/NoteTableViewCell.h | 2 + Ash_AWord/Views/Note/NoteTableViewCell.m | 6 +- Ash_AWord/Views/Note/NoteTableViewCell.xib | 19 ++++++ 12 files changed, 148 insertions(+), 33 deletions(-) create mode 100644 Ash_AWord/Resource/closeButton@2x.png create mode 100644 Ash_AWord/Resource/closeButtonClick@2x.png 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 0000000000000000000000000000000000000000..e18753171867d52dc7667adbecef5c3c0689f710 GIT binary patch literal 5230 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 aa09kaT!U~n#exn_bGq7wS|u8`VgCcfa#3^u literal 0 HcmV?d00001 diff --git a/Ash_AWord/Resource/closeButtonClick@2x.png b/Ash_AWord/Resource/closeButtonClick@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..d5c91a98f4e99e10d61d74b0d1c7b333eef6ac38 GIT binary patch literal 5276 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 bhZ}2?JU>9!wKE_`XFmfy6Wt1J=ji_dVa7|e literal 0 HcmV?d00001 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 @@ +