修复一些ui问题

Modules/FUSChatCenterModule/FUSChatCenterModule/Features/InstantMessaging/View/Cell/CellContentView/FUSIMChatSubscribeCellView.m

 #import "FUSIMChatSubscribeCellView.h"
 
-#define title_font  [UIFont systemFontOfSize:15 weight:UIFontWeightBold]
 #define detail_font  [UIFont systemFontOfSize:13 weight:UIFontWeightRegular]
 
 #define icon_W    36
@@ -36,7 +35,7 @@
 
         _subscribeTitleLabel = [[UILabel alloc] init];
         _subscribeTitleLabel.textColor = [UIColor fus_textColorRich];
-        _subscribeTitleLabel.font = title_font;
+        _subscribeTitleLabel.font = [UIFont fus_themeBoldFont:13];
 
         _arrowImageView = [[UIImageView alloc] initWithImage:UIImage.fus_rightArrowIcon];
 
@@ -85,7 +84,7 @@
 
     _clickBtn.frame = self.bounds;
 
-    _subscribeTitleLabel.frame = CGRectMake(13, 11, self.width - icon_W - 26, 15);
+    _subscribeTitleLabel.frame = CGRectMake(13, 11, self.width - icon_W - 13 - 4, 15);
 
     CGFloat arrowSize = 18;
     _arrowImageView.left = self.width - arrowSize - 8;

Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Zone/Controller/FireFlyMyZone/FUSMyZoneViewController.m

@@ -139,9 +139,14 @@
 - (void)viewDidLayoutSubviews {
     [super viewDidLayoutSubviews];
     self.tableView.width = self.scollView.width;
-    CGRect frame = CGRectMake(0, self.tableView.bottom, self.scollView.width, [self fus_feedListVisibleHeight]);
+    CGFloat feedListVisibleHeight = [self fus_feedListVisibleHeight];
+    CGFloat newsFeedListHeight = feedListVisibleHeight;
+    if (self.selectedNewsFeedTabType == FUSMyZoneNewsFeedTabTypeSubscribe && self.newsFeedListView.height > 0) {
+        newsFeedListHeight = MIN(self.newsFeedListView.height, feedListVisibleHeight);
+    }
+    CGRect frame = CGRectMake(0, self.tableView.bottom, self.scollView.width, newsFeedListHeight);
     if (!CGRectEqualToRect(frame, self.newsFeedListView.frame)) {
-        self.newsFeedListView.maxHeight = CGRectGetHeight(frame);
+        self.newsFeedListView.maxHeight = feedListVisibleHeight;
         self.newsFeedListView.frame = frame;
     }
 }
@@ -203,15 +208,19 @@
     self.tableView.tableContentHeightDidChangedHandler = ^(CGFloat height) {
         if (weakSelf.tableView.height != height) {
             CGFloat feedListVisibleHeight = [weakSelf fus_feedListVisibleHeight];
+            CGFloat newsFeedListHeight = feedListVisibleHeight;
+            if (weakSelf.selectedNewsFeedTabType == FUSMyZoneNewsFeedTabTypeSubscribe && weakSelf.newsFeedListView.height > 0) {
+                newsFeedListHeight = MIN(weakSelf.newsFeedListView.height, feedListVisibleHeight);
+            }
             weakSelf.tableView.width = weakSelf.scollView.width;
             weakSelf.tableView.height = height;
             
             // 个人页底部有悬浮操作栏，动态列表区域至少要保留可视高度，避免内容较少时无法滚动到“分享/相册/点赞”区域。
             weakSelf.newsFeedListView.maxHeight = feedListVisibleHeight;
             weakSelf.newsFeedListView.width = weakSelf.scollView.width;
-            weakSelf.newsFeedListView.height = feedListVisibleHeight;
+            weakSelf.newsFeedListView.height = newsFeedListHeight;
             weakSelf.newsFeedListView.y = weakSelf.tableView.bottom;
-            weakSelf.scollView.contentSize = CGSizeMake(weakSelf.scollView.width, weakSelf.tableView.height + weakSelf.newsFeedListView.height);
+            weakSelf.scollView.contentSize = CGSizeMake(weakSelf.scollView.width, weakSelf.tableView.height + newsFeedListHeight);
         }
     };
     self.scollView.delegate = self;
@@ -263,7 +272,7 @@
         
         self.newsFeedListView.heightDidChangedHandler = ^(CGFloat height) {
             CGFloat feedListVisibleHeight = [weakSelf fus_feedListVisibleHeight];
-            if (height < feedListVisibleHeight) {
+            if (weakSelf.selectedNewsFeedTabType != FUSMyZoneNewsFeedTabTypeSubscribe && height < feedListVisibleHeight) {
                 height = feedListVisibleHeight;
             }
             

Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Zone/View/FireFlyView/View/FUSMyZoneNewsFeedListView.m

@@ -236,7 +236,7 @@
     self.segmentControlView.isEqualSpace = YES;
     [self.segmentControlView fus_setUnderLineSelectedImage:UIImage.fus_segmentSelected];
     self.segmentControlView.segmentDelegate = self;
-    self.segmentControlView.itemFont = [UIFont fus_themeFont:15];
+    self.segmentControlView.itemFont = [UIFont fus_themeFont:16];
     if (UIView.fus_screenW > 320) {
         self.segmentControlView.space = 30;
     }else{

Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Zone/View/FireFlyView/View/FUSMyZoneSubscribeCollectionView.m

@@ -67,7 +67,7 @@
     [self addSubview:self.subscribeContainerView];
     
     self.subscribeInfoCardView = [[UIImageView alloc] initWithFrame:CGRectZero];
-    self.subscribeInfoCardView.contentMode = UIViewContentModeScaleAspectFit;
+    self.subscribeInfoCardView.contentMode = UIViewContentModeScaleAspectFill;
     self.subscribeInfoCardView.image = [FUSUserCenterBunble imageNamed:@"zone_subscribe_info_bgImage"];
     self.subscribeInfoCardView.userInteractionEnabled = YES;
     [self.subscribeContainerView addSubview:self.subscribeInfoCardView];
@@ -111,19 +111,19 @@
     [super layoutSubviews];
     
     self.subscribeContainerView.frame = CGRectMake(0, 0, CGRectGetWidth(self.bounds), self.subscribeContentHeight);
-    self.subscribeInfoCardView.frame = CGRectMake(15, 12, CGRectGetWidth(self.bounds) - 30, 124);
+    self.subscribeInfoCardView.frame = CGRectMake(18, 12, CGRectGetWidth(self.bounds) - 36, 124);
     self.avatarImageView.frame = CGRectMake(16, 20, 64, 64);
     CGFloat textOriginX = CGRectGetMaxX(self.avatarImageView.frame) + 16;
     CGFloat textWidth = CGRectGetWidth(self.subscribeInfoCardView.bounds) - textOriginX - 16;
-    self.nameLabel.frame = CGRectMake(textOriginX, 25, textWidth, 28);
-    self.userIdLabel.frame = CGRectMake(textOriginX, CGRectGetMaxY(self.nameLabel.frame) + 8, textWidth, 20);
-    self.subscribeButton.frame = CGRectMake(15, CGRectGetMaxY(self.subscribeInfoCardView.frame) + 18, CGRectGetWidth(self.bounds) - 30, 52);
+    self.nameLabel.frame = CGRectMake(textOriginX, 26, textWidth, 28);
+    self.userIdLabel.frame = CGRectMake(textOriginX, CGRectGetMaxY(self.nameLabel.frame) + 2, textWidth, 20);
+    self.subscribeButton.frame = CGRectMake(18, CGRectGetMaxY(self.subscribeInfoCardView.frame) + 18, CGRectGetWidth(self.bounds) - 36, 52);
     self.contentSize = CGSizeMake(CGRectGetWidth(self.bounds), self.subscribeContentHeight);
 }
 
 /// 返回订阅分页的固定内容高度。
 - (CGFloat)subscribeContentHeight {
-    return 220.0;
+    return 240.0;
 }
 
 /// 返回订阅分页用于占位的最小高度。