Merge branch 'feature/UI修改版本' of http://git.yabolive.net:88/pidan/FuSiLive into feature/UI修改版本

DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/Categories/UIView/UIView+Screen.m

@@ -58,7 +58,7 @@
 }
 
 + (CGFloat)fus_tabbarHeight {
-    return 49 + self.fus_SafeBottom;
+    return 56 + self.fus_SafeBottom;
 }
 
 

DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/ActionSheet/SLActionSheet.m

@@ -26,7 +26,7 @@
 #define margin_viewToview 1
 #define buttonHeight 50.0f
 #define titleViewHeight 40
-#define margin_btnTobtn 1.0f
+#define margin_btnTobtn 0.5f
 #define separatorHeight 1
 
 #define DefaultCornerRadius 15

DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/AlertView/FUSAlertView.m

@@ -115,7 +115,7 @@ static FUSAlertView *sharedAlertView = nil;
 - (void)fus_setConfirmBtnWithArray:(NSArray *)titlesArray {
     
     [self fus_resetCancelBtn];
-    [_bgView addSubview:_cancelBtn];
+//    [_bgView addSubview:_cancelBtn];
     
     
     if([NSArray isNull:titlesArray]){
@@ -264,6 +264,9 @@ static FUSAlertView *sharedAlertView = nil;
         
         if (_cancelBtn.titleLabel.text.length > 0) {
              self.cancelBtn.frame = CGRectMake(btnX, nextY , btnW, BTN_HEIGHT);
+            if (!self.cancelBtn.superview) {
+                [self.bgView addSubview:self.cancelBtn];
+            }
         }else{
             self.cancelBtn.frame = CGRectMake(btnX, nextY, btnW, 0);
         }
@@ -576,6 +579,7 @@ static FUSAlertView *sharedAlertView = nil;
         [self fus_setConfirmBtnWithArray:titlesArray];
         
         [self fus_layoutSubviews];
+//        NSLog(@"cancelBTnafgwegew:  x:%f  y:%f  w:%f  h:%f",self.cancelBtn.x,self.cancelBtn.y,self.cancelBtn.width,self.cancelBtn.height);
         endOperation();
     }];
 }
@@ -592,6 +596,7 @@ static FUSAlertView *sharedAlertView = nil;
     _cancelBtn.layer.cornerRadius = BTN_HEIGHT / 2.0f;
     _cancelBtn.layer.masksToBounds = YES;
     _cancelBtn.tag = 0;
+    _cancelBtn.hidden = NO;
     [_bgView addSubview:_cancelBtn];
 }
 

DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/BaseVC/FUSBaseViewController.m

@@ -56,13 +56,15 @@
     [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleDefault animated:NO];
     [self setNeedsStatusBarAppearanceUpdate];
     
-    [self.navigationController.navigationBar setShadowImage:[[UIImage alloc] init]];
-    
-    [self.navigationController.navigationBar.subviews.firstObject.subviews enumerateObjectsUsingBlock:^(__kindof UIView * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
-        if ([obj isKindOfClass:NSClassFromString(@"_UIBarBackgroundShadowView")]) {
-            obj.hidden=YES;
-        }
-    }];
+    if (!self.hiddenNavigationBar) {
+        
+        [self.navigationController.navigationBar setShadowImage:[[UIImage alloc] init]];
+        [self.navigationController.navigationBar.subviews.firstObject.subviews enumerateObjectsUsingBlock:^(__kindof UIView * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+            if ([obj isKindOfClass:NSClassFromString(@"_UIBarBackgroundShadowView")]) {
+                obj.hidden=YES;
+            }
+        }];
+    }
     
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(fus_checkStateDidUpdate) name:FUSConfig.sharedInstanced.devConfigs.appStatusUpdateNotificationKey object:nil];
 }

DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FuSiTheme/Theme/UIColor+FUSTheme.h

@@ -24,6 +24,9 @@
 + (UIColor *)fus_lineColor;
 +(UIColor *)fus_separatorLineColor;
 
+/// 分页选择器选择的横杠颜色 222222
++(UIColor *)fus_segmentIndicatorColor;
+
 + (UIColor *)fus_appMainColor;
 + (UIColor *)fus_appSubColor;
 

DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FuSiTheme/Theme/UIColor+FUSTheme.m

@@ -39,6 +39,10 @@
     return [UIColor colorWithHex:@"#dddddd"];
 }
 
++(UIColor *)fus_segmentIndicatorColor{
+    return [UIColor colorWithHex:@"#222222"];
+}
+
 +(UIColor *)fus_separatorLineColor{
     return [[UIColor blackColor] colorWithAlphaComponent:0.09];
 }

FuSiLive/Assets.xcassets/Zone/zone_motoring_selected.imageset/Contents.json

@@ -5,18 +5,18 @@
       "scale" : "1x"
     },
     {
+      "filename" : "20240711-161810.png",
       "idiom" : "universal",
-      "filename" : "我的-座驾仓库-已选@2x.png",
       "scale" : "2x"
     },
     {
+      "filename" : "20240711-161805.png",
       "idiom" : "universal",
-      "filename" : "我的-座驾仓库-已选@3x.png",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}

FuSiLive/Assets.xcassets/fusiPart/common/fus_common_navi_setting_btn.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "fus_common_navi_setting_btn@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "fus_common_navi_setting_btn@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

FuSiLive/Classes/Foundation/Controller/FUSQuicklySettingGroup/FUSCustomSettingCell.m

@@ -51,6 +51,8 @@
 // 圆角的layer
 @property (nonatomic, strong) CAShapeLayer *maskLayer;
 
+@property (nonatomic, strong) UIView *separatorLineView;
+
 @end
 
 @implementation FUSCustomSettingCell
@@ -71,6 +73,16 @@
         
 //        [self.contentView addSubview:self.theImageView];
 //        [self.contentView addSubview:self.leftCircleRedView];
+        
+        self.separatorLineView = [[UIView alloc] init];
+        self.separatorLineView.backgroundColor = [UIColor fus_lineColor];
+        [self  addSubview:self.separatorLineView];
+        [self.separatorLineView mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.right.inset(16);
+            make.bottom.offset(0);
+            make.height.offset(0.5);
+        }];
+        self.separatorLineView.hidden = YES;
     }
     return self;
 }
@@ -225,6 +237,18 @@
     _theCenterLabel.textColor = _item.centerShowTextColor;
     _theCenterLabel.font = _item.centerShowTextFont;
     
+    if (_item.isCenterButtonStyle && ![NSString isNull:_item.centerShowText]) {
+        CGFloat btnH = 44;
+        _theCenterLabel.frame = CGRectMake(0, 0, UIView.fus_screenW - 120, btnH);
+        _theCenterLabel.layer.cornerRadius = btnH / 2.0f;
+        _theCenterLabel.backgroundColor = [UIColor fus_themeColor];
+        _theCenterLabel.layer.masksToBounds = YES;
+        _theCenterLabel.center = CGPointMake(UIView.fus_screenW / 2.0f, kCenterShowTextSettingItemHeight / 2.0f);
+    }else {
+        _theCenterLabel.frame = CGRectMake(0, 0, UIView.fus_screenW, kCenterShowTextSettingItemHeight);
+        _theCenterLabel.backgroundColor = [UIColor clearColor];
+    }
+    
     return _theCenterLabel;
 }
 
@@ -358,10 +382,13 @@
     _leftCircleRedView = nil;
 //    self.theImageView.hidden = YES;
 //    self.leftCircleRedView.hidden = YES;
+    self.separatorLineView.hidden = YES;
     
     // 接收模型
     _item = item;
     
+    self.separatorLineView.hidden = !item.showSeparatorLine;
+    
     //这几种类型的item没有选中状态
     if (item.type != CustomSettingItemTypeShowText&&item.type != CustomSettingItemTypeSwitch&&item.type != CustomSettingItemTypeThirdPartyAccount) {
         self.selectionStyle = UITableViewCellSelectionStyleDefault;

FuSiLive/Classes/Foundation/Controller/FUSQuicklySettingGroup/FUSCustomSettingItem.h

@@ -86,6 +86,9 @@ typedef NS_ENUM(NSInteger, CustomSettingItemType) {
  */
 @property (nonatomic, strong) UIImage *rightShowImage;
 
+/// 是否单独显示分割线
+@property (nonatomic, assign) BOOL showSeparatorLine;
+
 /**
  *  右边的箭头图片对象(UIImage *)
  */
@@ -135,6 +138,9 @@ typedef NS_ENUM(NSInteger, CustomSettingItemType) {
  */
 @property (nonatomic, strong) UIFont *centerShowTextFont;
 
+/// 中间文字是否显示为按钮样式
+@property (nonatomic, assign) BOOL isCenterButtonStyle;
+
 /**
     第三方账号数组(QQ 微信 微博)
  */

FuSiLive/Classes/Foundation/Controller/FUSQuicklySettingGroup/FUSCustomSettingItem.m

@@ -37,6 +37,9 @@
     item.centerShowTextFont = [UIFont systemFontOfSize:16 weight:UIFontWeightLight];
     item.centerShowTextColor = [UIColor colorWithHex:@"#CCCCCC"];
     
+    item.showSeparatorLine = NO;
+    item.isCenterButtonStyle = NO;
+    
     item.itemTag = -999;
     item.redCircleColor = [UIColor redColor];
     

FuSiLive/Classes/Foundation/Controller/FUSQuicklySettingGroup/FUSSettingTableView.m

@@ -37,12 +37,16 @@
     //设置分割线偏移量
     [self setSeparatorInset:UIEdgeInsetsZero];
     //设置分割线颜色
-    [self setSeparatorColor:UIColor.fus_appBGColor];
+    [self setSeparatorColor:UIColor.clearColor];
     //设置右边索引栏属性
     self.sectionIndexBackgroundColor = [UIColor clearColor];
     self.sectionIndexColor = [UIColor lightGrayColor];
     //去掉底部多余的分割线
     self.tableFooterView = [[UIView alloc]init];
+    
+    if (@available(iOS 15.0, *)) {
+        self.sectionHeaderTopPadding = 0;
+    } 
 }
 
 #pragma mark - UITableViewDelegate

FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSMessageView.m

@@ -92,7 +92,7 @@
     }];
     
     self.settingBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-    [self.settingBtn setImage:[UIImage imageNamed:@"fus_my_setting_item_setting_icon"] forState:UIControlStateNormal];
+    [self.settingBtn setImage:[UIImage imageNamed:@"fus_common_navi_setting_btn"] forState:UIControlStateNormal];
     [self.naviView addSubview:self.settingBtn];
     [self.settingBtn mas_makeConstraints:^(MASConstraintMaker *make) {
         make.right.offset(-10);
@@ -193,13 +193,13 @@
     //分页控制
     _segCtrlView = [[FUSSegmentControlView alloc] initWithFrame:CGRectMake(8, 0, UIView.fus_screenW - 16, 38) withItems:@[[NSString fus_localString:@"私信"],[NSString fus_localString:@"亲密"]]];
 //    [_segCtrlView fus_setUnderLineSelectedImage:[UIImage imageNamed:@"common_icon_segment_selected"]];
+    _segCtrlView.itemFont = [UIFont fus_themeFont:18];
     _segCtrlView.itemSelectedFont = [UIFont fus_themeBoldFont:18];
-    _segCtrlView.itemFont = [UIFont fus_themeBoldFont:18];
     [_segCtrlView fus_setItemTitleColor:[UIColor blackColor] forState:UIControlStateSelected];
     [_segCtrlView fus_setItemTitleColor:[UIColor colorWithHex:@"#000000" alpha:0.6] forState:UIControlStateNormal];
     _segCtrlView.alignment = FUSSegmentControlAlignmentLeft;
 //    _segCtrlView.underLine = underLineView;
-    _segCtrlView.underLine.backgroundColor = [UIColor fus_textColorRich];
+    _segCtrlView.underLine.backgroundColor = [UIColor fus_segmentIndicatorColor];
     _segCtrlView.underLineWidth = 8;
     _segCtrlView.isShowUnderLine = YES;
     if (UIView.fus_screenW > 320) {

FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSMyHeaderView.m

@@ -94,10 +94,9 @@
     self.levelLabel.textAlignment = NSTextAlignmentCenter;
     [nickNameBgView addSubview:self.levelLabel];
     [self.levelLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.height.offset(14);
-        make.left.equalTo(self.nickNameLabel.mas_right).offset(6);
+        make.left.equalTo(self.nickNameLabel.mas_right).offset(3);
         make.centerY.equalTo(nickNameBgView.mas_centerY);
-        make.width.offset(14);
+        make.size.mas_equalTo(CGSizeMake(20, 14));
     }];
     
     self.vipMarkImgView = [[UIImageView alloc] init];
@@ -106,7 +105,7 @@
     [self.vipMarkImgView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.right.equalTo(nickNameBgView);
         make.centerY.equalTo(nickNameBgView.mas_centerY);
-        make.left.equalTo(self.levelLabel.mas_right).offset(6);
+        make.left.equalTo(self.levelLabel.mas_right).offset(3);
 //        make.size.mas_equalTo(CGSizeMake(14, 14));
         make.height.offset(14);
     }];
@@ -322,10 +321,7 @@
     // 等级
     NSString *levelString = [NSString isNull:model.lev] ? @"0" : model.lev;
     self.levelLabel.text = [NSString stringWithFormat:@"%@",levelString];
-    CGSize levelSize = [self.levelLabel.text sizeWithFont:self.levelLabel.font maxWidth:MAXFLOAT];
-    [self.levelLabel mas_updateConstraints:^(MASConstraintMaker *make) {
-        make.width.offset(levelSize.width < 14 ? 14 : levelSize.width + 10);
-    }];
+    
     //baoshi
     self.dewNumLabel.text = [NSString isNull:model.chip] ? @"0" : model.chip;
     self.jewNumLabel.text = [NSString isNull:model.diamond] ? @"0" : model.diamond;

FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSMyView.m

@@ -101,7 +101,7 @@ typedef NS_ENUM(NSInteger, FUSMySettingItemType){
     self.tableView.showsVerticalScrollIndicator = NO;
     self.tableView.showsHorizontalScrollIndicator = NO;
     self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
-        self.tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+    self.tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
     [self addSubview:self.tableView];
     
     UIView *headerBgView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, self.tableView.width, [FUSMyHeaderView fus_viewHeight])];
@@ -184,6 +184,7 @@ typedef NS_ENUM(NSInteger, FUSMySettingItemType){
             itemModel.font = [UIFont fus_themeBoldFont:17];
             itemModel.titleColor = [UIColor fus_textColorRich];
             itemModel.itemTag = [itemTypVaule integerValue];
+            itemModel.rightShowTextFont = [UIFont fus_themeFont:17];
             
             switch (itemTypVaule.integerValue) {
                 case FUSMySettingItemTypeImAnchor:
@@ -192,7 +193,6 @@ typedef NS_ENUM(NSInteger, FUSMySettingItemType){
                     itemModel.rightShowImageFrame = CGRectMake(0, 0, 22, 22);
                     break;
                 case FUSMySettingItemTypeSetIntitationCode:
-                    itemModel.rightShowTextFont = [UIFont fus_themeFont:17];
                     itemModel.rightShowTextColor = [UIColor fus_textColorLight];
                     self.inputInviteCodeItem = itemModel;
                     self.inputInviteCodeIndexPath = [NSIndexPath indexPathForRow:j inSection:i];
@@ -208,7 +208,6 @@ typedef NS_ENUM(NSInteger, FUSMySettingItemType){
                     break;
                 case FUSMySettingItemTypeBackpack:
                     itemModel.rightShowText = @"座駕";
-                    itemModel.rightShowTextFont = [UIFont fus_themeFont:17];
                     itemModel.rightShowTextColor = [UIColor fus_textColorLight];
                     break;
                 default:

FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/cell/FUSHomeAnchorListSmallCell.m

@@ -21,6 +21,9 @@
 /// 这个是龟龟左上角new的那个图标，找了一万年没找到
 @property (nonatomic, strong) FUSBaoFangTagView *tagView;
 
+///底部的阴影View
+@property (nonatomic, strong) UIImageView *bottomAlphaBgView;
+
 @end
 
 @implementation FUSHomeAnchorListSmallCell
@@ -49,6 +52,12 @@
         make.edges.equalTo(self.contentView);
     }];
     
+    self.bottomAlphaBgView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"baofang_video_list_bottom_mask"]];
+    [self.bgImageView addSubview:self.bottomAlphaBgView];
+    [self.bottomAlphaBgView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.bottom.right.offset(0);
+    }];
+    
     self.hotNumBtn = [UIButton buttonWithType:UIButtonTypeCustom];
     self.hotNumBtn.backgroundColor = [UIColor colorWithHex:@"#040404" alpha:0.24];
     self.hotNumBtn.titleLabel.font = [UIFont fus_themeFont:11];

FuSiLive/Classes/FusiVersionFeature/ViewController/ImAnchor/View/FUSImAnchorHeaderView.m

@@ -94,11 +94,13 @@
     self.levelLabel.backgroundColor = [UIColor colorWithHex:@"#87878A" alpha:0.32];
     self.levelLabel.layer.cornerRadius = 14 / 2.0f;
     self.levelLabel.layer.masksToBounds = YES;
+    self.levelLabel.textAlignment = NSTextAlignmentCenter;
     [nickNameBgView addSubview:self.levelLabel];
     [self.levelLabel mas_makeConstraints:^(MASConstraintMaker *make) {;
         make.centerY.equalTo(nickNameBgView.mas_centerY);
-        make.left.equalTo(self.nickNameLabel.mas_right).offset(4);
-        make.height.offset(14);
+        make.left.equalTo(self.nickNameLabel.mas_right).offset(3);
+//        make.height.offset(14);
+        make.size.mas_equalTo(CGSizeMake(20, 14));
     }];
     
     self.vipMarkImgView = [[UIImageView alloc] init];
@@ -107,7 +109,7 @@
     [self.vipMarkImgView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.right.equalTo(nickNameBgView);
         make.centerY.equalTo(nickNameBgView.mas_centerY);
-        make.left.equalTo(self.levelLabel.mas_right).offset(5);
+        make.left.equalTo(self.levelLabel.mas_right).offset(3);
 //        make.size.mas_equalTo(CGSizeMake(14, 14));
         make.height.offset(14);
     }];
@@ -248,7 +250,7 @@
     self.idLabel.text = [NSString stringWithFormat:@"ID: %@",model.uid];
     // 等级
     NSString *levelString = [NSString isNull:model.lev] ? @"0" : model.lev;
-    self.levelLabel.text = [NSString stringWithFormat:@"  %@  ",levelString];
+    self.levelLabel.text = [NSString stringWithFormat:@"%@",levelString];
     //性别
     if ([model.sex integerValue] == 0) {
         self.ageBtn.selected = YES;

FuSiLive/Classes/FusiVersionFeature/ViewController/NovaList/FUSHomeNovaListViewController.m

@@ -86,7 +86,7 @@
 -(void)ffsetupSegmentView{
     
     self.segmentView = [[FUSSegmentControlView alloc] initWithFrame:CGRectMake(16, 0, UIView.fus_screenW - 16*2, 40) withItems:@[[NSString fus_localString:@"按时间"], [NSString fus_localString:@"按热度"]]];
-    self.segmentView.underLine.backgroundColor = [UIColor fus_textColorRich];
+    self.segmentView.underLine.backgroundColor = [UIColor fus_segmentIndicatorColor];
     self.segmentView.underLineWidth = 8;
     self.segmentView.isShowUnderLine = YES;
     self.segmentView.space = 20;
@@ -207,7 +207,7 @@
     [self.followAllBtn setTitle:[NSString fus_localString:@"全部追踪"] forState:UIControlStateNormal];
     [self.followAllBtn setTitle:[NSString fus_localString:@"已追踪"] forState:UIControlStateDisabled];
     [self.followAllBtn setImage:nil forState:UIControlStateNormal];
-    [self.followAllBtn setImage:[UIImage imageNamed:@"home_nova_list_followAll_btn"] forState:UIControlStateDisabled];
+    [self.followAllBtn setImage:[UIImage imageNamed:@"zone_motoring_selected"] forState:UIControlStateDisabled];
     [self.followAllBtn setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateNormal];
     self.followAllBtn.titleLabel.font = [UIFont fus_themeMediumFont:16];
     self.followAllBtn.layer.cornerRadius = 44/2.0f;

FuSiLive/Classes/InstantMessaging/View/FUSChatIntimacyV2View.m

@@ -81,7 +81,7 @@
     }];
     
     self.progressBgView = [[UIView alloc] init];
-    self.progressBgView.backgroundColor = [UIColor colorWithHex:@"#666666"];
+    self.progressBgView.backgroundColor = [UIColor colorWithHex:@"#dddddd"];
     self.progressBgView.layer.cornerRadius = 2;
     self.progressBgView.layer.masksToBounds = YES;
     [intimacyProgressBgView addSubview:self.progressBgView];

FuSiLive/Classes/InstantMessaging/View/ToolViews/FUSIMGiftView.m

@@ -174,7 +174,7 @@
     _diamondCountBtn.x = CGRectGetMaxX(_orangeDiamondView.frame) + 4;
     _diamondCountBtn.titleLabel.font = [UIFont fus_themeFont:14];
     [_diamondCountBtn setTitle:[FUSCacheDataShare shareStore].userDetailInfo.diamond forState:UIControlStateNormal];
-    [_diamondCountBtn setTitleColor:[UIColor colorWithHex:@"#2BE1B0"] forState:UIControlStateNormal];
+    [_diamondCountBtn setTitleColor:[UIColor fus_diamondBlue] forState:UIControlStateNormal];
     [_diamondCountBtn sizeToFit];
     _diamondCountBtn.centerY = _giftBottomView.height / 2;
     [_diamondCountBtn addTarget:self action:@selector(tapDiamondAction) forControlEvents:UIControlEventTouchUpInside];
@@ -191,7 +191,7 @@
     
 //    [_rechargeBtn setTitle:title forState:UIControlStateNormal];
     [_rechargeBtn setAttributedTitle:atrTitle forState:UIControlStateNormal];
-    [_rechargeBtn setTitleColor:[UIColor colorWithHex:@"#2BE1B0"] forState:UIControlStateNormal];
+    [_rechargeBtn setTitleColor:[UIColor fus_diamondBlue] forState:UIControlStateNormal];
     _rechargeBtn.titleLabel.font = [UIFont fus_themeFont:14];
     [_rechargeBtn addTarget:self action:@selector(rechargeBtnClickAction) forControlEvents:UIControlEventTouchUpInside];
      [_giftBottomView addSubview:_rechargeBtn];
@@ -201,7 +201,7 @@
     _sendBtn.frame = CGRectMake(_giftBottomView.width - 78, 0, 70, _giftBottomView.height);
     _sendBtn.centerY = _giftBottomView.height / 2;
     [_sendBtn setTitle:[NSString fus_localString:@"赠送"] forState:UIControlStateNormal];
-    [_sendBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+    [_sendBtn setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateNormal];
     _sendBtn.titleLabel.font = [UIFont fus_themeFont:15];
     [_sendBtn addTarget:self action:@selector(sendBtnClickAction) forControlEvents:UIControlEventTouchUpInside];
     [_giftBottomView addSubview:_sendBtn];

FuSiLive/Classes/Setting/Controller/FUSNoticeSettingViewController.m

@@ -41,6 +41,7 @@
     [self fus_requestPushConfig];
     [self fus_refreshTableHeader];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(fus_refreshTableHeader) name:UIApplicationDidBecomeActiveNotification object:nil];
+    self.tableView.separatorColor = [UIColor clearColor];
 }
 
 - (void)fus_requestPushConfig {
@@ -80,6 +81,7 @@
     __weak typeof(self) weakSelf = self;
     
     self.liveNoticeItem = [FUSCustomSettingItem fus_itemWithTitle:[NSString fus_localString:@"开播消息提醒"] type:CustomSettingItemTypeSwitch];
+    self.liveNoticeItem.showSeparatorLine = YES;
     self.liveNoticeItem.switchClick = ^(FUSCustomSettingItem *item){
         [FUSSettingHttpRequest fus_setPushConfigSwitch:item.switchState type:1 success:^{
         } failure:^(NSString *msg, int code) {
@@ -89,6 +91,7 @@
     };
     
     self.newsFeedNoticeItem = [FUSCustomSettingItem fus_itemWithTitle:[NSString fus_localString:@"分享内容提醒"] type:CustomSettingItemTypeSwitch];
+    self.newsFeedNoticeItem.showSeparatorLine = YES;
     self.newsFeedNoticeItem.switchClick = ^(FUSCustomSettingItem *item){
         [FUSSettingHttpRequest fus_setPushConfigSwitch:item.switchState type:4 success:^{
         } failure:^(NSString *msg, int code) {

FuSiLive/Classes/Setting/Controller/FUSPrivacySettingViewController.m

@@ -34,6 +34,7 @@
     
     FUSCustomSettingItem *item2 = [FUSCustomSettingItem fus_itemWithTitle:[NSString fus_localString:@"启动声音"] type:CustomSettingItemTypeSwitch];
     item2.switchState = [[[NSUserDefaults standardUserDefaults] objectForKey:SETTING_LAUNCH_SOUND_SWITCH_BOOL] boolValue];
+    item2.showSeparatorLine = YES;
     item2.switchClick = ^(FUSCustomSettingItem *item){
         [[NSUserDefaults standardUserDefaults] setObject:@(item.currentSwitchState) forKey:SETTING_LAUNCH_SOUND_SWITCH_BOOL];
     };
@@ -84,10 +85,10 @@
     group2.groupHeaderTextFont = [UIFont fus_themeFont:12];
     group2.groupHeaderText = [NSString fus_localString:@"其他"];
     
-    group2.groupFooterTextBgColor  = [UIColor colorWithHex:@"#2B3238" alpha:0.5];
-    group2.groupFooterOriginY = 6;
-    group2.groupFooterHeight = 0.5 + group2.groupFooterOriginY * 2;
-    group2.groupFooterOriginX = 16;
+//    group2.groupFooterTextBgColor  = [UIColor colorWithHex:@"#2B3238" alpha:0.5];
+//    group2.groupFooterOriginY = 6;
+//    group2.groupFooterHeight = 0.5 + group2.groupFooterOriginY * 2;
+//    group2.groupFooterOriginX = 16;
     group2.items = @[item2,item4];
     
     [self.allGroups addObject:group2];

FuSiLive/Classes/Setting/Controller/FUSSettingViewController.m

@@ -504,6 +504,7 @@
     // 第七组
     _item14 = [FUSCustomSettingItem fus_itemWithTitle:nil type:CustomSettingItemTypeCenterShowText];
     _item14.centerShowText = [NSString fus_localString:@"退出登录"];
+    _item14.isCenterButtonStyle = YES;
     _item14.centerShowTextColor = [UIColor fus_textColorRich];
     _item14.itemClick = ^(FUSCustomSettingItem *item) {
         [FUSAlertView showAlertWithTitle:[NSString fus_localString:@"退出后还可使用本帐号登录，但将收不到私信及主播动态"] message:nil cancelButtonTitle:[NSString fus_localString:@"取消"] otherButtonTitles:@[[NSString fus_localString:@"退出"]] clickBlock:^(NSInteger buttonIndex) {

FuSiLive/Classes/Setting/View/FUSBlackListTableViewCell.m

@@ -20,6 +20,8 @@
     self.selectionStyle = UITableViewCellSelectionStyleNone;
     self.contentView.backgroundColor = UIColor.fus_appBGColor;
     
+    self.nameLabel.textColor = [UIColor fus_textColorRich];
+    
     FUSSwipeButtonModel *deleteBtnModel = [[FUSSwipeButtonModel alloc] init];
     deleteBtnModel.buttonBackgroundColor = [UIColor colorWithHex:@"#FF322B"];
     deleteBtnModel.buttonTitle = [NSString fus_localString:@"取消拉黑"];

FuSiLive/Classes/SingleChat/Main/View/FUSChatTextInputView/ToolView/FUSChatPhotoView.m

@@ -65,11 +65,13 @@
         self.cameraBtnWidth.constant = btnWidth1;
         [self.btnAlbum setTitle:[NSString fus_localString:@"相册"] forState:UIControlStateNormal];
         [self.btnCamera setTitle:[NSString fus_localString:@"拍摄"] forState:UIControlStateNormal];
+        [self.btnAlbum setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateNormal];
+        [self.btnCamera setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateNormal];
         
         self.btnSend.style = FUSButtonStyleBlue;
         self.btnSend.layer.cornerRadius = _btnSend.height / 2.0;
         self.btnSend.layer.masksToBounds = YES;
-        [self.btnSend setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+        [self.btnSend setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateNormal];
         [self.btnSend setTitle:[NSString fus_localString:@"发送"] forState:UIControlStateNormal];
         
         [self.collectionView reloadData];
@@ -416,7 +418,9 @@
     }];
     
     [self.collectionView reloadData];
-    [self.collectionView scrollToItemAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0] atScrollPosition:UICollectionViewScrollPositionRight animated:NO];
+    if (self.photos.count > 0) {
+        [self.collectionView scrollToItemAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0] atScrollPosition:UICollectionViewScrollPositionRight animated:NO];
+    }
 }
 
 /**

FuSiLive/Classes/SingleChat/Main/View/FUSChatTextInputView/ToolView/FUSChatPhotoView.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina5_9" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina5_9" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment version="4096" identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -69,7 +67,7 @@
                             </connections>
                         </button>
                     </subviews>
-                    <color key="backgroundColor" red="0.066666666666666666" green="0.070588235294117646" blue="0.10196078431372549" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
                         <constraint firstItem="AT6-ao-bCm" firstAttribute="leading" secondItem="qlH-iz-tTS" secondAttribute="trailing" constant="8" id="3ys-Cw-oOq"/>
                         <constraint firstItem="4be-s7-pQd" firstAttribute="centerY" secondItem="AT6-ao-bCm" secondAttribute="centerY" id="R9K-93-xdw"/>
@@ -94,7 +92,8 @@
                     </connections>
                 </collectionView>
             </subviews>
-            <color key="backgroundColor" red="0.066666666666666666" green="0.070588235294117646" blue="0.10196078431372549" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <viewLayoutGuide key="safeArea" id="EBF-je-a9W"/>
+            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
                 <constraint firstItem="eEV-Kv-21J" firstAttribute="top" secondItem="89O-LJ-uTe" secondAttribute="bottom" id="7kW-b6-NCD"/>
                 <constraint firstItem="89O-LJ-uTe" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="5" id="B2e-TX-fmN"/>
@@ -109,7 +108,6 @@
             <nil key="simulatedTopBarMetrics"/>
             <nil key="simulatedBottomBarMetrics"/>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <viewLayoutGuide key="safeArea" id="EBF-je-a9W"/>
             <connections>
                 <outlet property="btnAlbum" destination="qlH-iz-tTS" id="Rzk-ne-bg7"/>
                 <outlet property="btnCamera" destination="AT6-ao-bCm" id="XDo-YD-aij"/>

FuSiLive/Classes/ZhaiXin/Main/Controller/FUSIMZhaiXinViewController.m

@@ -130,7 +130,7 @@
     
     _settingBtn = [UIButton buttonWithType:UIButtonTypeCustom];
     _settingBtn.frame = CGRectMake(UIView.fus_screenW - 44, 0, 44, 44);
-    [_settingBtn setImage:[UIImage imageNamed:@"fus_my_setting_item_setting_icon"] forState:UIControlStateNormal];
+    [_settingBtn setImage:[UIImage imageNamed:@"fus_common_navi_setting_btn"] forState:UIControlStateNormal];
     [_settingBtn addTarget:self action:@selector(fus_clickSettingBtnAction) forControlEvents:UIControlEventTouchUpInside];
     _settingBtn.hidden = YES;
     [self.navView addSubview:self.settingBtn];

FuSiLive/Classes/Zone/View/FUSMotoringTableViewCell.m

@@ -32,6 +32,8 @@
     self.selectedBackgroundView.backgroundColor = UIColor.fus_listBGPressColor;
     self.layer.cornerRadius = 8;
     self.layer.masksToBounds = YES;
+    
+    self.motoringNameLabel.textColor = [UIColor fus_textColorRich];
 }
 
 - (void)setModel:(FUSZoneMotoringModel *)model

FuSiLive/Classes/Zone/View/FireFlyView/View/FUSMyZoneBottomView.m

@@ -13,6 +13,8 @@
 #import "UIView+Corner.h"
 
 @interface FUSMyZoneBottomView ()
+/// 背景的imageview
+@property (weak, nonatomic) IBOutlet UIImageView *bgImgView;
 
 @property (weak, nonatomic) IBOutlet UIView *videoChatBottomBgView;
 @property (strong, nonatomic) IBOutlet UIView *newsFeedBottomBgView;
@@ -66,9 +68,16 @@
 #pragma mark - UI
 - (void)fus_initUI {
     
-    self.layer.shadowColor = [UIColor colorWithHex:@"#2C2C2C"].CGColor;
-    self.layer.shadowRadius = 4.0f;
-    self.layer.shadowOpacity = 0.1f;
+//    self.layer.shadowColor = [UIColor colorWithHex:@"#2C2C2C"].CGColor;
+//    self.layer.shadowRadius = 4.0f;
+//    self.layer.shadowOpacity = 0.1f;
+    
+    self.bgImgView.image = nil;
+    self.bgImgView.hidden = YES;
+//    self.bgImgView.backgroundColor = [UIColor colorWithHex:@"#F1F0F0"];
+//    [self.bgImgView addRoundedCorners:UIRectCornerTopLeft|UIRectCornerTopRight  withRadii:CGSizeMake(16, 16) viewRect:CGRectMake(0, 0, UIView.fus_screenW, 78)];
+    
+    self.videoChatBottomBgView.backgroundColor = [UIColor colorWithHex:@"#F1F0F0"];
     
     [self.videoChatBottomBgView addSubview:self.videoChatPriceBtn];
     [self.videoChatBottomBgView addSubview:self.audioChatPriceBtn];
@@ -89,8 +98,8 @@
 }
 
 - (void)fus_addViewShadows:(UIView *)view {
-    
-    [view addRoundedCorners:UIRectCornerTopLeft|UIRectCornerTopRight withRadii:CGSizeMake(8, 8)];
+    // 这里，一个view会layout3次，并且最后一次width会变成453，不知道为什么，所以强制width=screen width了
+    [view addRoundedCorners:UIRectCornerTopLeft|UIRectCornerTopRight withRadii:CGSizeMake(16, 16) viewRect:CGRectMake(0, 0, UIView.fus_screenW, view.height)];
 }
 
 - (void)setIsMyZone:(BOOL)isMyZone {

FuSiLive/Classes/Zone/View/FireFlyView/View/FUSMyZoneBottomView.xib

@@ -125,6 +125,7 @@
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <connections>
                 <outlet property="audioChatBtn" destination="gpn-FP-2gH" id="3pj-PK-f9Q"/>
+                <outlet property="bgImgView" destination="iP1-GD-wtB" id="xXn-5V-e2N"/>
                 <outlet property="chatBtn" destination="C5j-bF-Uaw" id="iYe-3o-t1s"/>
                 <outlet property="focusBtn" destination="7Hf-xI-nTF" id="1Tg-QA-2pK"/>
                 <outlet property="newsFeedBottomBgView" destination="Tig-pS-zMa" id="0M7-Jw-LAw"/>