走你~

wanghengheng · wanghengheng · commit 6b480857b905 · 2016-10-09T15:45:28.000+08:00
diff --git a/Coding_iOS/Controllers/TweetSendViewController.m b/Coding_iOS/Controllers/TweetSendViewController.m
@@ -81,7 +81,7 @@ - (void)viewDidLoad
     //    &#28155;&#21152;myTableView
     _myTableView = ({
         TPKeyboardAvoidingTableView *tableView = [[TPKeyboardAvoidingTableView alloc] initWithFrame:self.view.bounds style:UITableViewStylePlain];
-        tableView.backgroundColor = [UIColor clearColor];
+        tableView.backgroundColor = [UIColor whiteColor];
         tableView.dataSource = self;
         tableView.delegate = self;
         tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
diff --git a/Coding_iOS/Util/OC_Category/NSString+Common.m b/Coding_iOS/Util/OC_Category/NSString+Common.m
@@ -157,9 +157,12 @@ - (CGSize)getSizeWithFont:(UIFont *)font constrainedToSize:(CGSize)size{
     if (self.length <= 0) {
         return resultSize;
     }
+    NSMutableParagraphStyle *style = [NSMutableParagraphStyle new];
+    style.lineBreakMode = NSLineBreakByWordWrapping;
     resultSize = [self boundingRectWithSize:CGSizeMake(floor(size.width), floor(size.height))//&#29992;&#30456;&#23545;&#23567;&#30340; width &#21435;&#35745;&#31639; height / &#23567; heigth &#31639; width
                                     options:(NSStringDrawingUsesFontLeading | NSStringDrawingUsesLineFragmentOrigin)
-                                 attributes:@{NSFontAttributeName: font}
+                                 attributes:@{NSFontAttributeName: font,
+                                              NSParagraphStyleAttributeName: style}
                                     context:nil].size;
     resultSize = CGSizeMake(floor(resultSize.width + 1), floor(resultSize.height + 1));//&#19978;&#38754;&#29992;&#30340;&#23567; width&#65288;height&#65289; &#26469;&#35745;&#31639;&#20102;&#65292;&#36825;&#37324;&#35201; +1
     return resultSize;
diff --git a/Coding_iOS/Views/Cell/TweetSendTextCell.m b/Coding_iOS/Views/Cell/TweetSendTextCell.m
@@ -104,7 +104,7 @@ - (UIView *)keyboardToolBar{
         
         UIView  *keyboardToolBar = [[UIView alloc] initWithFrame:CGRectMake(0, CGRectGetHeight(_footerToolBar.frame) - 40, kScreen_Width, 40)];
         [keyboardToolBar addLineUp:YES andDown:NO andColor:kColorDDD];
-        keyboardToolBar.backgroundColor = kColorTableSectionBg;
+        keyboardToolBar.backgroundColor = kColorNavBG;
         if (!_locationButton) {
             _locationButton = [self locationButtonWithStr:nil];
         }

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ - (UIView *)keyboardToolBar{`
`104`	`104`
`105`	`105`	`UIView *keyboardToolBar = [[UIView alloc] initWithFrame:CGRectMake(0, CGRectGetHeight(_footerToolBar.frame) - 40, kScreen_Width, 40)];`
`106`	`106`	`[keyboardToolBar addLineUp:YES andDown:NO andColor:kColorDDD];`
`107`		`- keyboardToolBar.backgroundColor = kColorTableSectionBg;`
	`107`	`+ keyboardToolBar.backgroundColor = kColorNavBG;`
`108`	`108`	`if (!_locationButton) {`
`109`	`109`	`_locationButton = [self locationButtonWithStr:nil];`
`110`	`110`	`}`