bugfix

wanghengheng · wanghengheng · commit 16784998a256 · 2016-08-12T11:02:29.000+08:00
diff --git a/Coding_iOS/Resources/.DS_Store b/Coding_iOS/Resources/.DS_Store
diff --git a/Coding_iOS/Util/OC_Category/NSObject+ObjectMap.m b/Coding_iOS/Util/OC_Category/NSObject+ObjectMap.m
@@ -197,7 +197,7 @@ +(id)objectOfClass:(NSString *)object fromJSON:(NSDictionary *)dict {
     
     for (NSString *key in [dict allKeys]) {
         NSString *tempKey;
-        if ([key isEqualToString:@"description"]) {
+        if ([key isEqualToString:@"description"] || [key isEqualToString:@"hash"]) {
             tempKey = [key stringByAppendingString:@"_mine"];
         }else{
             tempKey = key;
@@ -358,7 +358,7 @@ +(NSMutableArray *)arrayMapFromArray:(NSArray *)nestedArray forPropertyName:(NSS
                 // Else, it is an object
                 else {
                     NSString *tempNewKey;
-                    if ([newKey isEqualToString:@"description"]) {
+                    if ([newKey isEqualToString:@"description"] || [newKey isEqualToString:@"hash"]) {
                         tempNewKey = [newKey stringByAppendingString:@"_mine"];
                     }else{
                         tempNewKey = newKey;
diff --git a/Coding_iOS/Util/OC_Category/NSString+Common.m b/Coding_iOS/Util/OC_Category/NSString+Common.m
@@ -157,11 +157,11 @@ - (CGSize)getSizeWithFont:(UIFont *)font constrainedToSize:(CGSize)size{
     if (self.length <= 0) {
         return resultSize;
     }
-    resultSize = [self boundingRectWithSize:size
+    resultSize = [self boundingRectWithSize:CGSizeMake(floor(size.width), floor(size.height))//用相对小的 width 去计算 height / 小 heigth 算 width
                                     options:(NSStringDrawingUsesFontLeading | NSStringDrawingUsesLineFragmentOrigin)
                                  attributes:@{NSFontAttributeName: font}
                                     context:nil].size;
-    resultSize = CGSizeMake(MIN(size.width, ceilf(resultSize.width)), MIN(size.height, ceilf(resultSize.height)));
+    resultSize = CGSizeMake(floor(resultSize.width + 1), floor(resultSize.height + 1));//上面用的小 width（height） 来计算了，这里要 +1
     return resultSize;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -157,11 +157,11 @@ - (CGSize)getSizeWithFont:(UIFont *)font constrainedToSize:(CGSize)size{`
`157`	`157`	`if (self.length <= 0) {`
`158`	`158`	`return resultSize;`
`159`	`159`	`}`
`160`		`- resultSize = [self boundingRectWithSize:size`
	`160`	`+ resultSize = [self boundingRectWithSize:CGSizeMake(floor(size.width), floor(size.height))//用相对小的 width 去计算 height / 小 heigth 算 width`
`161`	`161`	`options:(NSStringDrawingUsesFontLeading \| NSStringDrawingUsesLineFragmentOrigin)`
`162`	`162`	`attributes:@{NSFontAttributeName: font}`
`163`	`163`	`context:nil].size;`
`164`		`- resultSize = CGSizeMake(MIN(size.width, ceilf(resultSize.width)), MIN(size.height, ceilf(resultSize.height)));`
	`164`	`+ resultSize = CGSizeMake(floor(resultSize.width + 1), floor(resultSize.height + 1));//上面用的小 width（height）来计算了，这里要 +1`
`165`	`165`	`return resultSize;`
`166`	`166`	`}`
`167`	`167`