From 9da3b79297fc9b37e9c54d1cc5ca9e2c38b1d3a1 Mon Sep 17 00:00:00 2001 From: wu736139669 Date: Wed, 15 Apr 2015 09:39:45 +0800 Subject: [PATCH] new --- Ash_AWord.xcodeproj/project.pbxproj | 4 +- .../xcschemes/Ash_AWord.xcscheme | 2 +- .../xcdebugger/Breakpoints_v2.xcbkptlist | 170 +++++++++++++++++- Ash_AWord/Info.plist | 2 +- Ash_AWord/Utility/Tool/CommonUtil.h | 1 - .../ViewControllers/My/MyNoteViewController.m | 4 +- .../ViewControllers/My/SetUpViewController.m | 2 +- .../Views/Message/MessageTableViewCell.m | 6 +- Ash_AWord/Views/Note/NoteTableViewCell.m | 10 +- 9 files changed, 182 insertions(+), 19 deletions(-) diff --git a/Ash_AWord.xcodeproj/project.pbxproj b/Ash_AWord.xcodeproj/project.pbxproj index a2e39f6..2a6b412 100644 --- a/Ash_AWord.xcodeproj/project.pbxproj +++ b/Ash_AWord.xcodeproj/project.pbxproj @@ -1519,7 +1519,7 @@ "$(PROJECT_DIR)/Ash_AWord/Vender/UMSocial_Sdk_Extra_Frameworks/Sina", ); PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE = "c1cb5078-a2e9-47e1-9034-a1ab2bf7a109"; + PROVISIONING_PROFILE = "e0b4f9a8-771b-4fcc-afb8-a404945e92fa"; VALID_ARCHS = "arm64 armv7 armv7s x86_64"; }; name = Debug; @@ -1547,7 +1547,7 @@ "$(PROJECT_DIR)/Ash_AWord/Vender/UMSocial_Sdk_Extra_Frameworks/Sina", ); PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE = "c1cb5078-a2e9-47e1-9034-a1ab2bf7a109"; + PROVISIONING_PROFILE = "e0b4f9a8-771b-4fcc-afb8-a404945e92fa"; VALID_ARCHS = "arm64 armv7 armv7s x86_64"; }; name = Release; diff --git a/Ash_AWord.xcodeproj/xcuserdata/xmfish.xcuserdatad/xcschemes/Ash_AWord.xcscheme b/Ash_AWord.xcodeproj/xcuserdata/xmfish.xcuserdatad/xcschemes/Ash_AWord.xcscheme index 20b265f..7bfe036 100644 --- a/Ash_AWord.xcodeproj/xcuserdata/xmfish.xcuserdatad/xcschemes/Ash_AWord.xcscheme +++ b/Ash_AWord.xcodeproj/xcuserdata/xmfish.xcuserdatad/xcschemes/Ash_AWord.xcscheme @@ -1,7 +1,7 @@ + version = "1.3"> 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 ba09156..82d65d9 100644 --- a/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -1072,11 +1072,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/Views/Message/MessageTableViewCell.m" - timestampString = "450632546.880992" + timestampString = "450753135.973442" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "99" - endingLineNumber = "99" + startingLineNumber = "100" + endingLineNumber = "100" landmarkName = "-tick" landmarkType = "5"> @@ -1100,7 +1100,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Ash_AWord/Info.plist b/Ash_AWord/Info.plist index 5bc6565..7a54975 100644 --- a/Ash_AWord/Info.plist +++ b/Ash_AWord/Info.plist @@ -62,7 +62,7 @@ CFBundleVersion - 1 + 2 LSRequiresIPhoneOS UILaunchStoryboardName diff --git a/Ash_AWord/Utility/Tool/CommonUtil.h b/Ash_AWord/Utility/Tool/CommonUtil.h index 49fe28b..233f042 100644 --- a/Ash_AWord/Utility/Tool/CommonUtil.h +++ b/Ash_AWord/Utility/Tool/CommonUtil.h @@ -39,7 +39,6 @@ NetworkType; * NSdate转为日历 */ +(NSDateComponents*)componentsWithDate:(NSDate*)date; -+(NSDateComponents*)componentsWithDate:(NSDate*)date; /** * NSdate相差天数 */ diff --git a/Ash_AWord/ViewControllers/My/MyNoteViewController.m b/Ash_AWord/ViewControllers/My/MyNoteViewController.m index 77681cb..5d74279 100644 --- a/Ash_AWord/ViewControllers/My/MyNoteViewController.m +++ b/Ash_AWord/ViewControllers/My/MyNoteViewController.m @@ -49,8 +49,7 @@ } -(void)footerRereshing { - _page++; - [self footerEndRefreshing]; + [self loadData]; } -(void)loadData { @@ -77,6 +76,7 @@ }else{ [self.tableView addGifFooterWithRefreshingTarget:self refreshingAction:@selector(footerRereshing)]; } + _page++; [self.tableView reloadData]; } failedBlock:^(NSError *error) { diff --git a/Ash_AWord/ViewControllers/My/SetUpViewController.m b/Ash_AWord/ViewControllers/My/SetUpViewController.m index 507a558..db7afbe 100644 --- a/Ash_AWord/ViewControllers/My/SetUpViewController.m +++ b/Ash_AWord/ViewControllers/My/SetUpViewController.m @@ -222,7 +222,7 @@ NSString *str = [NSString stringWithFormat:@"http://itunes.apple.com/us/app/id%d", kAppleID]; url = str; } - url = Ash_AWord_First_URL; +// url = Ash_AWord_First_URL; NSString *shareText = [NSString stringWithFormat:@"%@%@",content,url]; if(!image) { diff --git a/Ash_AWord/Views/Message/MessageTableViewCell.m b/Ash_AWord/Views/Message/MessageTableViewCell.m index 5c02766..b31109b 100644 --- a/Ash_AWord/Views/Message/MessageTableViewCell.m +++ b/Ash_AWord/Views/Message/MessageTableViewCell.m @@ -97,6 +97,9 @@ // DLog("%f",_audioPlayer.progress); _nowTimeLabel.text = [NSString stringWithFormat:@"%.2ld:%.2ld",(long)_audioPlayer.progress/60,(long)_audioPlayer.progress%60]; _timeProgressView.progress = _audioPlayer.progress/_audioPlayer.duration; + if (_audioPlayer.progress == _audioPlayer.duration) { + [_audioPlayer stop]; + } } @@ -148,7 +151,8 @@ return labelRect.size.height+160; } - (IBAction)shareBtnClick:(id)sender { - [SetUpViewController shareAppWithViewController:nil andTitle:@"遇见你" andContent:_text_voice.content andImage:nil andUrl:nil]; + + [SetUpViewController shareAppWithViewController:nil andTitle:@"遇见你" andContent:_text_voice.content andImage:nil andUrl:[NSString stringWithFormat:@"%@/web/voice_share_info?record_id=%ld",Ash_AWord_API_URL,_text_voice.messageId]]; PropertyEntity* pro = [MessageViewModel requireShareWithRecordId:_text_voice.messageId]; [RequireEngine requireWithProperty:pro completionBlock:^(id viewModel) { if ([viewModel success]) { diff --git a/Ash_AWord/Views/Note/NoteTableViewCell.m b/Ash_AWord/Views/Note/NoteTableViewCell.m index 1110e11..dbeb1b8 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:nil]; + [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]]; PropertyEntity* pro = [NoteViewModel requireShareWithRecordId:_text_image.messageId]; [RequireEngine requireWithProperty:pro completionBlock:^(id viewModel) { if ([viewModel success]) { @@ -133,16 +133,16 @@ _timeLabel.text = [CommonUtil timeFromtimeSp:text_image.createTime.stringValue]; UIFont *font = [UIFont appFontOfSize:14.0]; - CGSize size = CGSizeMake(310*[Ash_UIUtil currentScreenSizeRate],MAXFLOAT); + CGSize size = CGSizeMake(300*[Ash_UIUtil currentScreenSizeRate],MAXFLOAT); CGRect labelRect = [text_image.content boundingRectWithSize:size options:NSStringDrawingUsesLineFragmentOrigin|NSStringDrawingUsesFontLeading attributes:@{NSFontAttributeName:font} context:nil]; _contentHeight.constant = labelRect.size.height+25; _contentTextView.text = text_image.content; [_contentImgView sd_setImageWithURL:text_image.imageUrl placeholderImage:pressedColorImg]; - [_goodBtn setTitle:[NSString stringWithFormat:@"%ld",text_image.praiseCount] forState:UIControlStateNormal]; - [_goodBtn setTitle:[NSString stringWithFormat:@"%ld",text_image.praiseCount] forState:UIControlStateSelected]; - [_shareBtn setTitle:[NSString stringWithFormat:@"%ld",text_image.shareCount] forState:UIControlStateNormal]; + [_goodBtn setTitle:[NSString stringWithFormat:@"%ld",(long)text_image.praiseCount] forState:UIControlStateNormal]; + [_goodBtn setTitle:[NSString stringWithFormat:@"%ld",(long)text_image.praiseCount] forState:UIControlStateSelected]; + [_shareBtn setTitle:[NSString stringWithFormat:@"%ld",(long)text_image.shareCount] forState:UIControlStateNormal]; [self setGoodBtnSelect:text_image.hasPraised];