优化冒泡页面的显示（行距） & 跟进一下 TTTAttributedLabel 的版本

Author: wanghengheng

Coding_iOS/Controllers/Login/RegisterViewController.m

@@ -253,7 +253,7 @@ - (UIView *)customFooterView{
                                                      }];
     //label
     UITTTAttributedLabel *lineLabel = ({
-        UITTTAttributedLabel *label = [[UITTTAttributedLabel alloc] init];
+        UITTTAttributedLabel *label = [[UITTTAttributedLabel alloc] initWithFrame:CGRectZero];
         label.textAlignment = NSTextAlignmentCenter;
         label.font = [UIFont systemFontOfSize:14];
         label.textColor = kColorDark2;

Coding_iOS/Util/OC_Category/UILabel+Common.m

@@ -15,15 +15,12 @@ - (void)setLongString:(NSString *)str withFitWidth:(CGFloat)width{
 
 - (void) setLongString:(NSString *)str withFitWidth:(CGFloat)width maxHeight:(CGFloat)maxHeight{
     self.numberOfLines = 0;
-    CGSize resultSize = [str getSizeWithFont:self.font constrainedToSize:CGSizeMake(width, CGFLOAT_MAX)];
-    CGFloat resultHeight = resultSize.height;
-    if (maxHeight > 0 && resultHeight > maxHeight) {
-        resultHeight = maxHeight;
-    }
-    CGRect frame = self.frame;
-    frame.size.height = resultHeight;
-    [self setFrame:frame];
     self.text = str;
+    CGSize resultSize = [self sizeThatFits:CGSizeMake(width, maxHeight)];
+    if (maxHeight > 0 && resultSize.height > maxHeight) {
+        resultSize.height = maxHeight;
+    }
+    self.size = resultSize;
 }
 
 - (void) setLongString:(NSString *)str withVariableWidth:(CGFloat)maxWidth{

Coding_iOS/Views/Cell/ProjectInfoCell.m

@@ -49,7 +49,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
             [self.contentView addSubview:_proTitleL];
         }
         if (!_proInfoL) {
-            _proInfoL = [[UITTTAttributedLabel alloc] init];
+            _proInfoL = [[UITTTAttributedLabel alloc] initWithFrame:CGRectZero];
             _proInfoL.delegate = self;
             _proInfoL.linkAttributes = kLinkAttributes;
             _proInfoL.activeLinkAttributes = kLinkAttributesActive;

Coding_iOS/Views/Cell/TweetCell.m

@@ -98,7 +98,8 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
             self.contentLabel.font = kTweet_ContentFont;
             self.contentLabel.textColor = kColorDark3;
             self.contentLabel.numberOfLines = 0;
-            
+            self.contentLabel.lineHeightMultiple = 1.2;
+
             self.contentLabel.linkAttributes = kLinkAttributes;
             self.contentLabel.activeLinkAttributes = kLinkAttributesActive;
             self.contentLabel.delegate = self;
@@ -377,9 +378,23 @@ + (CGFloat)cellHeightWithObj:(id)obj needTopView:(BOOL)needTopView{
 
 + (CGFloat)contentLabelHeightWithTweet:(Tweet *)tweet{
     CGFloat height = 0;
+//    if (tweet.content.length > 0) {
+//        height += MIN(kTweet_ContentMaxHeight, [tweet.content getHeightWithFont:kTweet_ContentFont constrainedToSize:CGSizeMake(kTweetCell_ContentWidth, CGFLOAT_MAX)]);
+//        height += 15;
+//    }
+    static UITTTAttributedLabel *p_contentLabel = nil;
     if (tweet.content.length > 0) {
-        height += MIN(kTweet_ContentMaxHeight, [tweet.content getHeightWithFont:kTweet_ContentFont constrainedToSize:CGSizeMake(kTweetCell_ContentWidth, CGFLOAT_MAX)]);
-        height += 15;
+        if (!p_contentLabel) {
+            p_contentLabel = [[UITTTAttributedLabel alloc] initWithFrame:CGRectMake(kTweetCell_PadingLeft, kTweetCell_PadingTop, kTweetCell_ContentWidth, 20)];
+            p_contentLabel.font = kTweet_ContentFont;
+            p_contentLabel.textColor = kColorDark3;
+            p_contentLabel.numberOfLines = 0;
+            p_contentLabel.lineHeightMultiple = 1.2;
+            p_contentLabel.linkAttributes = kLinkAttributes;
+            p_contentLabel.activeLinkAttributes = kLinkAttributesActive;
+        }
+        [p_contentLabel setLongString:tweet.content withFitWidth:kTweetCell_ContentWidth maxHeight:kTweet_ContentMaxHeight];
+        height += p_contentLabel.height + 15;
     }
     return height;
 }

Coding_iOS/Views/Cell/TweetCommentCell.m

@@ -11,7 +11,7 @@
 
 #define kTweetCommentCell_LeftOrRightPading 10.0
 #define kTweetCommentCell_ContentWidth (kScreen_Width -kPaddingLeftWidth - kPaddingLeftWidth - 2*kTweetCommentCell_LeftOrRightPading)
-#define kTweetCommentCell_ContentMaxHeight 105.0
+#define kTweetCommentCell_ContentMaxHeight 150.0
 
 #import "TweetCommentCell.h"
 

Podfile

@@ -3,7 +3,7 @@ platform :ios, '9.0'
 
 target "Coding_iOS" do
 
-pod 'TTTAttributedLabel', '1.10.1'
+pod 'TTTAttributedLabel', '2.0.0'
 pod 'RegexKitLite-NoWarning', '1.1.0'
 pod 'hpple', '0.2.0'
 pod 'MBProgressHUD', '0.9'

Podfile.lock

@@ -67,7 +67,7 @@ PODS:
   - SSKeychain (1.2.3)
   - TMCache (2.1.0)
   - TPKeyboardAvoiding (1.2.4)
-  - TTTAttributedLabel (1.10.1)
+  - TTTAttributedLabel (2.0.0)
   - "UIImage+BlurredFrame (0.0.4)"
   - UMengAnalytics (4.2.4)
   - UMengUShare/Core (6.4.5):
@@ -111,7 +111,7 @@ DEPENDENCIES:
   - SSKeychain (= 1.2.3)
   - TMCache (= 2.1.0)
   - TPKeyboardAvoiding (= 1.2.4)
-  - TTTAttributedLabel (= 1.10.1)
+  - TTTAttributedLabel (= 2.0.0)
   - "UIImage+BlurredFrame (= 0.0.4)"
   - UMengAnalytics (= 4.2.4)
   - UMengUShare/Social/QQ (= 6.4.5)
@@ -182,11 +182,11 @@ SPEC CHECKSUMS:
   SSKeychain: 3f42991739c6c60a9cf1bbd4dff6c0d3694bcf3d
   TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed
   TPKeyboardAvoiding: 0a40dfbb0af7c8bdae1dd457496dccfd217d85f6
-  TTTAttributedLabel: c8f3801a6463b9c9b82b0c84c465fdda9751892a
+  TTTAttributedLabel: 8cffe8e127e4e82ff3af1e5386d4cd0ad000b656
   "UIImage+BlurredFrame": ad2f7195c6947ea3117c7d202f75a51958d5061a
   UMengAnalytics: ef8d45f94c0e5771dc364cf6a5731d9d3b101da2
   UMengUShare: a5711c54e640b04e3048e931d2b88d50f9cfa55c
 
-PODFILE CHECKSUM: 4e7599df566b810cb65e8505f699da5ada302db4
+PODFILE CHECKSUM: 36e1606f3eaec7aedeba960c5747dba1ea4490d1
 
 COCOAPODS: 1.5.0