0.0.9

liushiyu
1 parent eb33d63d
Showing 3 changed files with 10 additions and 7 deletions
CNLiveCMineModule.podspec
CNLiveCMineModule/Classes/inte/View/CNLiveCMineInteCollectionViewCell.m
CNLiveCMineModule/Classes/inte/View/CNLiveCMineInteHeaderSignView.m
@@ -8,7 +8,7 @@
  
 Pod::Spec.new do |s|
   s.name             = 'CNLiveCMineModule'
-  s.version          = '0.0.8'
+  s.version          = '0.0.9'
   s.summary          = '网家家C端个人中心'
  
 # This description is used to generate tags and improve search results.
@@ -493,7 +493,7 @@
     self.nameLabel.text = annouModel.title;
     self.dateLabel.text = annouModel.publishTime;
  
-    if ([annouModel.model isEqualToString:@"roof"]) {
+    if ([annouModel.model cn_containsString:@"roof"]) {
         self.tagLabel.backgroundColor = UIColorHex(#F5A623);
         self.tagLabel.text = @" 置顶 ";
         __weak typeof(self) weakSelf = self;
@@ -170,12 +170,15 @@
     self.annouLabel.hidden = announModel.list.count == 0;
     if (announModel.list.count > 0) {
         NSMutableArray * listArray = announModel.list.mutableCopy;
-        NSArray * tempArray = announModel.list.count > 5 ? [listArray subarrayWithRange:NSMakeRange(0, 4)] : listArray;
-        NSMutableString * tempString = [[NSMutableString alloc] init];
-        for (CNLiveCMineInteListSubModel * subModel in tempArray) {
-            [tempString appendFormat:@"%@    ",subModel.title];
+        NSMutableString * tempString_roof = [[NSMutableString alloc] init];
+        NSMutableString * tempString_none = [[NSMutableString alloc] init];
+        for (CNLiveCMineInteListSubModel * subModel in listArray) {
+            if ([subModel.model cn_containsString:@"roof"]) {
+                [tempString_roof appendFormat:@"%@    ",subModel.title];
+            }
+            [tempString_none appendFormat:@"%@    ",subModel.title];
         }
-        self.annouLabel.text = tempString;
+        self.annouLabel.text = !CNLiveStringIsEmpty(tempString_roof) ? tempString_roof : tempString_none;
     }
  
     if (announModel == nil) self.titleLabel.top = CGRectGetMaxY(self.topView.frame) + 10;