This commit is contained in:
wu736139669
2015-04-02 11:11:04 +08:00
parent c38301d9cc
commit 869b50c9a0
3 changed files with 45 additions and 8 deletions
@@ -5,34 +5,34 @@
<key>IDESourceControlProjectFavoriteDictionaryKey</key>
<false/>
<key>IDESourceControlProjectIdentifier</key>
<string>F6799904-4EEF-4ABA-BAB3-793E4F614E1A</string>
<string>5235EF6E-2233-4B7D-8BC1-630FCDBAF55A</string>
<key>IDESourceControlProjectName</key>
<string>Ash_AWord</string>
<key>IDESourceControlProjectOriginsDictionary</key>
<dict>
<key>B459B20E6BFCBAF9E5514A0B814271AD85A6C13B</key>
<string>https://github.com/wu736139669/Ash_AWord.git</string>
<key>C2124BD0C46D10FF81834A1B3449A80D6B860D76</key>
<string>https://github.com/wu736139669/Ash_First.git</string>
</dict>
<key>IDESourceControlProjectPath</key>
<string>Ash_AWord.xcworkspace</string>
<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
<dict>
<key>B459B20E6BFCBAF9E5514A0B814271AD85A6C13B</key>
<key>C2124BD0C46D10FF81834A1B3449A80D6B860D76</key>
<string>..</string>
</dict>
<key>IDESourceControlProjectURL</key>
<string>https://github.com/wu736139669/Ash_AWord.git</string>
<string>https://github.com/wu736139669/Ash_First.git</string>
<key>IDESourceControlProjectVersion</key>
<integer>111</integer>
<key>IDESourceControlProjectWCCIdentifier</key>
<string>B459B20E6BFCBAF9E5514A0B814271AD85A6C13B</string>
<string>C2124BD0C46D10FF81834A1B3449A80D6B860D76</string>
<key>IDESourceControlProjectWCConfigurations</key>
<array>
<dict>
<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
<string>public.vcs.git</string>
<key>IDESourceControlWCCIdentifierKey</key>
<string>B459B20E6BFCBAF9E5514A0B814271AD85A6C13B</string>
<string>C2124BD0C46D10FF81834A1B3449A80D6B860D76</string>
<key>IDESourceControlWCCName</key>
<string>Ash_AWord</string>
</dict>
+3 -1
View File
@@ -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;
@@ -102,6 +102,11 @@
<key>primary</key>
<true/>
</dict>
<key>0E99819739AC47ABA7FA492B</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>12D6EACA73735A1B258DC584</key>
<dict>
<key>primary</key>
@@ -112,6 +117,11 @@
<key>primary</key>
<true/>
</dict>
<key>31DC683E7A6647F99E51FDF8</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>436E0A2F78024613E0497B57</key>
<dict>
<key>primary</key>
@@ -147,6 +157,11 @@
<key>primary</key>
<true/>
</dict>
<key>911FBED90C744921BBA741B8</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>B2366AF3542637503A71E0A9</key>
<dict>
<key>primary</key>
@@ -157,16 +172,36 @@
<key>primary</key>
<true/>
</dict>
<key>B3EC766BC8404753A0CDA0A5</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>C37FD853CB072143A5870EDB</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>C98B7D50DC474B978299407B</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>CE6309E0EE9C415DCA1D6900</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>E91BD44DF6524EF182815260</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>E9B6674D0519400D8E9E238A</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>EA0106004E80381BF40BA4E8</key>
<dict>
<key>primary</key>