|
@@ -38,9 +38,9 @@ static const CGFloat SpaceHeight = 38.0f;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- (void)caculateValueHeight {
|
|
- (void)caculateValueHeight {
|
|
|
- if (self.location.length == 0) {
|
|
|
|
|
- return;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+// if (self.location.length == 0) {
|
|
|
|
|
+// return;
|
|
|
|
|
+// }
|
|
|
CGFloat w = self.width;
|
|
CGFloat w = self.width;
|
|
|
if (w <= 0) {
|
|
if (w <= 0) {
|
|
|
w = CGRectGetWidth([UIScreen mainScreen].bounds);
|
|
w = CGRectGetWidth([UIScreen mainScreen].bounds);
|
|
@@ -50,14 +50,14 @@ static const CGFloat SpaceHeight = 38.0f;
|
|
|
options:(NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading)
|
|
options:(NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading)
|
|
|
attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:15.0f]}
|
|
attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:15.0f]}
|
|
|
context:nil].size.height;
|
|
context:nil].size.height;
|
|
|
- CGFloat navBtnHeight = 30.0f;
|
|
|
|
|
|
|
+ CGFloat navBtnHeight = 70.0f;
|
|
|
if (h < navBtnHeight) { // navigation button height
|
|
if (h < navBtnHeight) { // navigation button height
|
|
|
h = navBtnHeight;
|
|
h = navBtnHeight;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
_height = h + SpaceHeight;
|
|
_height = h + SpaceHeight;
|
|
|
- if (_height < 100.0f) {
|
|
|
|
|
- _height = 100.0f;
|
|
|
|
|
|
|
+ if (_height < 106.0f) {
|
|
|
|
|
+ _height = 106.0f;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|