wushenghua/Ash_AWord
1
0
Fork 0
mirror of https://github.com/wu736139669/Ash_AWord.git synced 2026-08-05 05:55:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

new

Browse Source
This commit is contained in:
wu736139669
2015-04-15 09:39:45 +08:00
parent c40d87b6b6
commit 9da3b79297
9 changed files with 182 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ash_AWord.xcodeproj/project.pbxproj
+2 -2
View File
@@ -1519,7 +1519,7 @@
"$(PROJECT_DIR)/Ash_AWord/Vender/UMSocial_Sdk_Extra_Frameworks/Sina", "$(PROJECT_DIR)/Ash_AWord/Vender/UMSocial_Sdk_Extra_Frameworks/Sina",
); );
PRODUCT_NAME = "$(TARGET_NAME)"; 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"; VALID_ARCHS = "arm64 armv7 armv7s x86_64";
}; };
name = Debug; name = Debug;
@@ -1547,7 +1547,7 @@
"$(PROJECT_DIR)/Ash_AWord/Vender/UMSocial_Sdk_Extra_Frameworks/Sina", "$(PROJECT_DIR)/Ash_AWord/Vender/UMSocial_Sdk_Extra_Frameworks/Sina",
); );
PRODUCT_NAME = "$(TARGET_NAME)"; 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"; VALID_ARCHS = "arm64 armv7 armv7s x86_64";
}; };
name = Release; name = Release;
Ash_AWord.xcodeproj/xcuserdata/xmfish.xcuserdatad/xcschemes/Ash_AWord.xcscheme
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0620" LastUpgradeVersion = "0620"
version = "1.8"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"
buildImplicitDependencies = "YES"> buildImplicitDependencies = "YES">
Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+165 -5
View File
@@ -1072,11 +1072,11 @@
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
filePath = "Ash_AWord/Views/Message/MessageTableViewCell.m" filePath = "Ash_AWord/Views/Message/MessageTableViewCell.m"
timestampString = "450632546.880992" timestampString = "450753135.973442"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "99" startingLineNumber = "100"
endingLineNumber = "99" endingLineNumber = "100"
landmarkName = "-tick" landmarkName = "-tick"
landmarkType = "5"> landmarkType = "5">
</BreakpointContent> </BreakpointContent>
@@ -1100,7 +1100,7 @@
<BreakpointProxy <BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent <BreakpointContent
shouldBeEnabled = "Yes" shouldBeEnabled = "No"
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
filePath = "Ash_AWord/ViewControllers/Main/NoteViewController.m" filePath = "Ash_AWord/ViewControllers/Main/NoteViewController.m"
@@ -1116,7 +1116,7 @@
<BreakpointProxy <BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent <BreakpointContent
shouldBeEnabled = "Yes" shouldBeEnabled = "No"
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
filePath = "Ash_AWord/ViewModels/Note/NoteViewModel.m" filePath = "Ash_AWord/ViewModels/Note/NoteViewModel.m"
@@ -1145,5 +1145,165 @@
landmarkType = "5"> landmarkType = "5">
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/ViewControllers/My/MyNoteViewController.m"
timestampString = "450752234.866664"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "52"
endingLineNumber = "52"
landmarkName = "-footerRereshing"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/Views/Message/MessageTableViewCell.m"
timestampString = "450752747.512157"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "51"
endingLineNumber = "51"
landmarkName = "-playBtnClick:"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/Views/Message/MessageTableViewCell.m"
timestampString = "450752843.371363"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "90"
endingLineNumber = "90"
landmarkName = "-tick"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/Views/Message/MessageTableViewCell.m"
timestampString = "450754371.933898"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "237"
endingLineNumber = "237"
landmarkName = "-audioPlayer:stateChanged:"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/Views/Message/MessageTableViewCell.m"
timestampString = "450754371.933898"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "242"
endingLineNumber = "242"
landmarkName = "-audioPlayer:didEncounterError:"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/Views/Message/MessageTableViewCell.m"
timestampString = "450754371.933898"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "247"
endingLineNumber = "247"
landmarkName = "-audioPlayer:didStartPlayingQueueItemId:"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/Views/Message/MessageTableViewCell.m"
timestampString = "450754371.933898"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "251"
endingLineNumber = "251"
landmarkName = "-audioPlayer:didFinishBufferingSourceWithQueueItemId:"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/Views/Message/MessageTableViewCell.m"
timestampString = "450754371.933898"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "252"
endingLineNumber = "252"
landmarkName = "-audioPlayer:didFinishBufferingSourceWithQueueItemId:"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/Views/Message/MessageTableViewCell.m"
timestampString = "450754371.933898"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "257"
endingLineNumber = "257"
landmarkName = "-audioPlayer:didFinishPlayingQueueItemId:withReason:andProgress:andDuration:"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/Views/Message/MessageTableViewCell.m"
timestampString = "450753266.175428"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "101"
endingLineNumber = "101"
landmarkName = "-tick"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints> </Breakpoints>
</Bucket> </Bucket>
Ash_AWord/Info.plist
+1 -1
View File
@@ -62,7 +62,7 @@
</dict> </dict>
</array> </array>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>1</string> <string>2</string>
<key>LSRequiresIPhoneOS</key> <key>LSRequiresIPhoneOS</key>
<true/> <true/>
<key>UILaunchStoryboardName</key> <key>UILaunchStoryboardName</key>
Ash_AWord/Utility/Tool/CommonUtil.h
-1
View File
@@ -39,7 +39,6 @@ NetworkType;
* NSdate转为日历 * NSdate转为日历
*/ */
+(NSDateComponents*)componentsWithDate:(NSDate*)date; +(NSDateComponents*)componentsWithDate:(NSDate*)date;
+(NSDateComponents*)componentsWithDate:(NSDate*)date;
/** /**
* NSdate相差天数 * NSdate相差天数
*/ */
Ash_AWord/ViewControllers/My/MyNoteViewController.m
+2 -2
View File
@@ -49,8 +49,7 @@
} }
-(void)footerRereshing -(void)footerRereshing
{ {
_page++; [self loadData];
[self footerEndRefreshing];
} }
-(void)loadData -(void)loadData
{ {
@@ -77,6 +76,7 @@
}else{ }else{
[self.tableView addGifFooterWithRefreshingTarget:self refreshingAction:@selector(footerRereshing)]; [self.tableView addGifFooterWithRefreshingTarget:self refreshingAction:@selector(footerRereshing)];
} }
_page++;
[self.tableView reloadData]; [self.tableView reloadData];
} failedBlock:^(NSError *error) { } failedBlock:^(NSError *error) {
Ash_AWord/ViewControllers/My/SetUpViewController.m
+1 -1
View File
@@ -222,7 +222,7 @@
NSString *str = [NSString stringWithFormat:@"http://itunes.apple.com/us/app/id%d", kAppleID]; NSString *str = [NSString stringWithFormat:@"http://itunes.apple.com/us/app/id%d", kAppleID];
url = str; url = str;
} }
url = Ash_AWord_First_URL; // url = Ash_AWord_First_URL;
NSString *shareText = [NSString stringWithFormat:@"%@%@",content,url]; NSString *shareText = [NSString stringWithFormat:@"%@%@",content,url];
if(!image) if(!image)
{ {
Ash_AWord/Views/Message/MessageTableViewCell.m
+5 -1
View File
@@ -97,6 +97,9 @@
// DLog("%f",_audioPlayer.progress); // DLog("%f",_audioPlayer.progress);
_nowTimeLabel.text = [NSString stringWithFormat:@"%.2ld:%.2ld",(long)_audioPlayer.progress/60,(long)_audioPlayer.progress%60]; _nowTimeLabel.text = [NSString stringWithFormat:@"%.2ld:%.2ld",(long)_audioPlayer.progress/60,(long)_audioPlayer.progress%60];
_timeProgressView.progress = _audioPlayer.progress/_audioPlayer.duration; _timeProgressView.progress = _audioPlayer.progress/_audioPlayer.duration;
if (_audioPlayer.progress == _audioPlayer.duration) {
[_audioPlayer stop];
}
} }
@@ -148,7 +151,8 @@
return labelRect.size.height+160; return labelRect.size.height+160;
} }
- (IBAction)shareBtnClick:(id)sender { - (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]; PropertyEntity* pro = [MessageViewModel requireShareWithRecordId:_text_voice.messageId];
[RequireEngine requireWithProperty:pro completionBlock:^(id viewModel) { [RequireEngine requireWithProperty:pro completionBlock:^(id viewModel) {
if ([viewModel success]) { if ([viewModel success]) {
Ash_AWord/Views/Note/NoteTableViewCell.m
+5 -5
View File
@@ -107,7 +107,7 @@
- (IBAction)shareBtnClick:(id)sender - (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]; PropertyEntity* pro = [NoteViewModel requireShareWithRecordId:_text_image.messageId];
[RequireEngine requireWithProperty:pro completionBlock:^(id viewModel) { [RequireEngine requireWithProperty:pro completionBlock:^(id viewModel) {
if ([viewModel success]) { if ([viewModel success]) {
@@ -133,16 +133,16 @@
_timeLabel.text = [CommonUtil timeFromtimeSp:text_image.createTime.stringValue]; _timeLabel.text = [CommonUtil timeFromtimeSp:text_image.createTime.stringValue];
UIFont *font = [UIFont appFontOfSize:14.0]; 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]; CGRect labelRect = [text_image.content boundingRectWithSize:size options:NSStringDrawingUsesLineFragmentOrigin|NSStringDrawingUsesFontLeading attributes:@{NSFontAttributeName:font} context:nil];
_contentHeight.constant = labelRect.size.height+25; _contentHeight.constant = labelRect.size.height+25;
_contentTextView.text = text_image.content; _contentTextView.text = text_image.content;
[_contentImgView sd_setImageWithURL:text_image.imageUrl placeholderImage:pressedColorImg]; [_contentImgView sd_setImageWithURL:text_image.imageUrl placeholderImage:pressedColorImg];
[_goodBtn setTitle:[NSString stringWithFormat:@"%ld",text_image.praiseCount] forState:UIControlStateNormal]; [_goodBtn setTitle:[NSString stringWithFormat:@"%ld",(long)text_image.praiseCount] forState:UIControlStateNormal];
[_goodBtn setTitle:[NSString stringWithFormat:@"%ld",text_image.praiseCount] forState:UIControlStateSelected]; [_goodBtn setTitle:[NSString stringWithFormat:@"%ld",(long)text_image.praiseCount] forState:UIControlStateSelected];
[_shareBtn setTitle:[NSString stringWithFormat:@"%ld",text_image.shareCount] forState:UIControlStateNormal]; [_shareBtn setTitle:[NSString stringWithFormat:@"%ld",(long)text_image.shareCount] forState:UIControlStateNormal];
[self setGoodBtnSelect:text_image.hasPraised]; [self setGoodBtnSelect:text_image.hasPraised];