From 869b50c9a03701c7045b3eaf59e0149da750f6fe Mon Sep 17 00:00:00 2001 From: wu736139669 Date: Thu, 2 Apr 2015 11:11:04 +0800 Subject: [PATCH] new --- .../xcshareddata/Ash_AWord.xccheckout | 14 ++++---- Ash_AWord/Views/Note/NoteTableViewCell.m | 4 ++- .../xcschemes/xcschememanagement.plist | 35 +++++++++++++++++++ 3 files changed, 45 insertions(+), 8 deletions(-) diff --git a/Ash_AWord.xcworkspace/xcshareddata/Ash_AWord.xccheckout b/Ash_AWord.xcworkspace/xcshareddata/Ash_AWord.xccheckout index a0b2060..5431d00 100644 --- a/Ash_AWord.xcworkspace/xcshareddata/Ash_AWord.xccheckout +++ b/Ash_AWord.xcworkspace/xcshareddata/Ash_AWord.xccheckout @@ -5,34 +5,34 @@ IDESourceControlProjectFavoriteDictionaryKey IDESourceControlProjectIdentifier - F6799904-4EEF-4ABA-BAB3-793E4F614E1A + 5235EF6E-2233-4B7D-8BC1-630FCDBAF55A IDESourceControlProjectName Ash_AWord IDESourceControlProjectOriginsDictionary - B459B20E6BFCBAF9E5514A0B814271AD85A6C13B - https://github.com/wu736139669/Ash_AWord.git + C2124BD0C46D10FF81834A1B3449A80D6B860D76 + https://github.com/wu736139669/Ash_First.git IDESourceControlProjectPath Ash_AWord.xcworkspace IDESourceControlProjectRelativeInstallPathDictionary - B459B20E6BFCBAF9E5514A0B814271AD85A6C13B + C2124BD0C46D10FF81834A1B3449A80D6B860D76 .. IDESourceControlProjectURL - https://github.com/wu736139669/Ash_AWord.git + https://github.com/wu736139669/Ash_First.git IDESourceControlProjectVersion 111 IDESourceControlProjectWCCIdentifier - B459B20E6BFCBAF9E5514A0B814271AD85A6C13B + C2124BD0C46D10FF81834A1B3449A80D6B860D76 IDESourceControlProjectWCConfigurations IDESourceControlRepositoryExtensionIdentifierKey public.vcs.git IDESourceControlWCCIdentifierKey - B459B20E6BFCBAF9E5514A0B814271AD85A6C13B + C2124BD0C46D10FF81834A1B3449A80D6B860D76 IDESourceControlWCCName Ash_AWord diff --git a/Ash_AWord/Views/Note/NoteTableViewCell.m b/Ash_AWord/Views/Note/NoteTableViewCell.m index 5cf8aec..5b56fc0 100644 --- a/Ash_AWord/Views/Note/NoteTableViewCell.m +++ b/Ash_AWord/Views/Note/NoteTableViewCell.m @@ -64,11 +64,13 @@ UIFont *font = [UIFont appFontOfSize:14.0]; CGSize size = CGSizeMake(300*[Ash_UIUtil currentScreenSizeRate],MAXFLOAT); + CGRect labelRect = [text_image.content boundingRectWithSize:size options:NSStringDrawingUsesLineFragmentOrigin|NSStringDrawingUsesFontLeading attributes:@{NSFontAttributeName:font} context:nil]; CGSize imageSize = [Ash_UIUtil downloadImageSizeWithURL:text_image.imageUrl]; CGFloat imageHeight = imageSize.height; - if (imageHeight!=0 &&imageSize.width!=0) { + if (imageHeight!=0 &&imageSize.width!=0) + { imageHeight = imageHeight/(imageSize.width/(304*[Ash_UIUtil currentScreenSizeRate])); } return imageHeight+labelRect.size.height+95; diff --git a/Pods/Pods.xcodeproj/xcuserdata/xmfish.xcuserdatad/xcschemes/xcschememanagement.plist b/Pods/Pods.xcodeproj/xcuserdata/xmfish.xcuserdatad/xcschemes/xcschememanagement.plist index 168713a..2fdca37 100644 --- a/Pods/Pods.xcodeproj/xcuserdata/xmfish.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/Pods/Pods.xcodeproj/xcuserdata/xmfish.xcuserdatad/xcschemes/xcschememanagement.plist @@ -102,6 +102,11 @@ primary + 0E99819739AC47ABA7FA492B + + primary + + 12D6EACA73735A1B258DC584 primary @@ -112,6 +117,11 @@ primary + 31DC683E7A6647F99E51FDF8 + + primary + + 436E0A2F78024613E0497B57 primary @@ -147,6 +157,11 @@ primary + 911FBED90C744921BBA741B8 + + primary + + B2366AF3542637503A71E0A9 primary @@ -157,16 +172,36 @@ primary + B3EC766BC8404753A0CDA0A5 + + primary + + C37FD853CB072143A5870EDB primary + C98B7D50DC474B978299407B + + primary + + CE6309E0EE9C415DCA1D6900 primary + E91BD44DF6524EF182815260 + + primary + + + E9B6674D0519400D8E9E238A + + primary + + EA0106004E80381BF40BA4E8 primary