优化社区列表官方动态展开标识

DreamSleep/DreamSleep.xcodeproj/project.pbxproj

@@ -3233,7 +3233,7 @@
 				CODE_SIGN_ENTITLEMENTS = DreamSleep/Basement/DSConfig/DreamSleepDebug.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 8;
+				CURRENT_PROJECT_VERSION = 9;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 4NDZ6UX8PW;
@@ -3316,7 +3316,7 @@
 				CODE_SIGN_ENTITLEMENTS = DreamSleep/DreamSleep.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 8;
+				CURRENT_PROJECT_VERSION = 9;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 4NDZ6UX8PW;
 				ENABLE_BITCODE = NO;
@@ -3459,7 +3459,7 @@
 				CODE_SIGN_ENTITLEMENTS = DreamSleep/Basement/DSConfig/DreamSleepBeta.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 8;
+				CURRENT_PROJECT_VERSION = 9;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 4NDZ6UX8PW;

DreamSleep/DreamSleep/Class/CommunityModule/DynamicList/Model/OfficialMessageModel.m

@@ -40,6 +40,8 @@
         return attStr.copy;
     }
     
+    // 计算尾部字符串宽度
+    NSString *tailStr = @"...展开";
     if ([self contentMaxLines].count > kMaxOfficialContentLine) {
         // 1、获取显示最多行字符串
         NSMutableString *mLineStr = [NSMutableString string];
@@ -47,11 +49,11 @@
             [mLineStr appendString:[self contentMaxLines][i]];
         }
         // 2、截取字符串最后1个位置，用于填充自定义富文本
-        NSString * subLineStr = [mLineStr substringWithRange:NSMakeRange(0, mLineStr.length - 1)];
+        NSString * subLineStr = [mLineStr substringWithRange:NSMakeRange(0, mLineStr.length - 3)];
         // 3、将subLineStr转换未富文本
         attStr = [[NSMutableAttributedString alloc] initWithString:subLineStr attributes:[self contentAttributes:NO]];
         // 4、自定义结尾富文本
-        NSMutableAttributedString *dotAtrStr = [[NSMutableAttributedString alloc] initWithString:@"..." attributes:[self contentAttributes:YES]];
+        NSMutableAttributedString *dotAtrStr = [[NSMutableAttributedString alloc] initWithString:tailStr attributes:[self contentAttributes:YES]];
         [attStr appendAttributedString:dotAtrStr.copy];
     }
     
@@ -98,6 +100,10 @@
 }
 
 #pragma mark - private
++ (UIFont *)tailFont {
+    return SysFont(13);
+}
+
 + (CGFloat)contentMaxW {
     return kScreenWidth - 4 * [OfficialMessageModel contentMargin];
 }
@@ -111,11 +117,12 @@
     paragraphStyle.minimumLineHeight = [OfficialMessageModel contentFont].lineHeight;
     paragraphStyle.maximumLineHeight = [OfficialMessageModel contentFont].lineHeight;
     paragraphStyle.alignment = NSTextAlignmentLeft;
-    NSMutableDictionary *mAttributes = [NSMutableDictionary dictionaryWithDictionary:
-                                        @{NSFontAttributeName : [OfficialMessageModel contentFont],
-                                          NSParagraphStyleAttributeName : paragraphStyle}];
+    NSMutableDictionary *mAttributes = [NSMutableDictionary dictionaryWithDictionary:@{NSParagraphStyleAttributeName : paragraphStyle}];
     if (isTail) {
         [mAttributes setObject:BrandColor forKey:NSForegroundColorAttributeName];
+        [mAttributes setObject:[OfficialMessageModel tailFont] forKey:NSFontAttributeName];
+    } else {
+        [mAttributes setObject:[OfficialMessageModel contentFont] forKey:NSFontAttributeName];
     }
     return mAttributes.copy;
 }