修改了一系列bug

DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/EmptyView/FUSEmptyView.h

@@ -43,6 +43,9 @@ typedef enum : NSInteger{
 //是否居中显示内容
 @property (nonatomic, assign) FUSEmptyViewContentAligment contentAligment;
 
+/// 文字竖直方向位置调整
+@property (nonatomic, assign) CGFloat contentVerticalOffset;
+
 // 类型。默认是放图片的
 @property (nonatomic, assign) FUSEmptyViewType type;
 

DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/EmptyView/FUSEmptyView.m

@@ -44,6 +44,7 @@
 
 - (void)initUI{
     self.clipsToBounds = YES;
+    self.contentVerticalOffset = 0;
     
     _imageScale = 0.5;
     _bgImageView = [[UIImageView alloc] initWithFrame:self.bounds];
@@ -189,7 +190,7 @@
         default:
             break;
     }
-    
+    _emptyContentBgView.y = _emptyContentBgView.y + self.contentVerticalOffset;
     self.bgImageView.frame = self.bounds;
 }
 

FuSiLive.xcodeproj/project.pbxproj

@@ -57,6 +57,7 @@
 		00A4529B2C2FEDB2004EC526 /* FUSControllerPushHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 00A4529A2C2FEDB2004EC526 /* FUSControllerPushHelper.m */; };
 		00A6F0982C2EAAF700162BA0 /* FUSVideoOfficialEndV2View.m in Sources */ = {isa = PBXBuildFile; fileRef = 00A6F0972C2EAAF700162BA0 /* FUSVideoOfficialEndV2View.m */; };
 		00B48E072C213CCD001E4872 /* FUSSettingInitDataModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 00B48E062C213CCD001E4872 /* FUSSettingInitDataModel.m */; };
+		00B7A0882C3BF3DD009B62AE /* FUSSettingThirdPartTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 00B7A0872C3BF3DD009B62AE /* FUSSettingThirdPartTableViewCell.m */; };
 		00CABAC72C32A25A00D269B7 /* FFHomeListNovaListCollectionViewSmallCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 00CABAC62C32A25A00D269B7 /* FFHomeListNovaListCollectionViewSmallCell.m */; };
 		00CABAC92C32BD8700D269B7 /* img_novaList_cell_new_animation.webp in Resources */ = {isa = PBXBuildFile; fileRef = 00CABAC82C32BD8700D269B7 /* img_novaList_cell_new_animation.webp */; };
 		BE02D73D2C255ECA006FD462 /* FUSLiveFunctionViewHalfWebManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE02D73C2C255ECA006FD462 /* FUSLiveFunctionViewHalfWebManager.swift */; };
@@ -1431,6 +1432,8 @@
 		00A6F0972C2EAAF700162BA0 /* FUSVideoOfficialEndV2View.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FUSVideoOfficialEndV2View.m; sourceTree = "<group>"; };
 		00B48E052C213CCD001E4872 /* FUSSettingInitDataModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FUSSettingInitDataModel.h; sourceTree = "<group>"; };
 		00B48E062C213CCD001E4872 /* FUSSettingInitDataModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FUSSettingInitDataModel.m; sourceTree = "<group>"; };
+		00B7A0862C3BF3DD009B62AE /* FUSSettingThirdPartTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FUSSettingThirdPartTableViewCell.h; sourceTree = "<group>"; };
+		00B7A0872C3BF3DD009B62AE /* FUSSettingThirdPartTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FUSSettingThirdPartTableViewCell.m; sourceTree = "<group>"; };
 		00B8649F2C2AF52B0061F6FF /* FuSiLive.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = FuSiLive.entitlements; sourceTree = "<group>"; };
 		00CABAC52C32A25A00D269B7 /* FFHomeListNovaListCollectionViewSmallCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FFHomeListNovaListCollectionViewSmallCell.h; sourceTree = "<group>"; };
 		00CABAC62C32A25A00D269B7 /* FFHomeListNovaListCollectionViewSmallCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FFHomeListNovaListCollectionViewSmallCell.m; sourceTree = "<group>"; };
@@ -7120,6 +7123,8 @@
 				BED0F6D72C0C49C80017B285 /* FUSSettingThirdPartyTableViewCell.h */,
 				BED0F6D82C0C49C80017B285 /* FUSSettingThirdPartyTableViewCell.m */,
 				BED0F6D92C0C49C80017B285 /* FUSSettingThirdPartyTableViewCell.xib */,
+				00B7A0862C3BF3DD009B62AE /* FUSSettingThirdPartTableViewCell.h */,
+				00B7A0872C3BF3DD009B62AE /* FUSSettingThirdPartTableViewCell.m */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -9314,6 +9319,7 @@
 				BED0FC6E2C0C49CA0017B285 /* FUSMyZoneNewsFeedListView.m in Sources */,
 				BE03983E2C134566003EB21B /* Vectors.swift in Sources */,
 				BED0FA1B2C0C49C90017B285 /* FUSBottomOptionalView.m in Sources */,
+				00B7A0882C3BF3DD009B62AE /* FUSSettingThirdPartTableViewCell.m in Sources */,
 				BED0FAC92C0C49C90017B285 /* FUSTreasureBoxOptionModel.m in Sources */,
 				BED0F92C2C0C49C90017B285 /* FUSSingleVideoPreview.m in Sources */,
 				BED0F9582C0C49C90017B285 /* FUSUserDefaultsStoreSwiftString.swift in Sources */,

FuSiLive/Classes/Foundation/Controller/FUSImagePicker/Controller/FUSImagePickerViewController.m

@@ -132,7 +132,7 @@
 {
     [super viewDidAppear:animated];
     
-    [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent animated:NO];
+//    [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent animated:NO];
 }
 
 #pragma mark - UI
@@ -151,10 +151,9 @@
  */
 - (void)initNav
 {
-    self.navigationBar.barStyle = UIBarStyleBlack;
-    
-    [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent animated:YES];
-    
+//    self.navigationBar.barStyle = UIBarStyleBlack;
+//    
+//    [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent animated:YES];
 }
 
 // 取消按钮

FuSiLive/Classes/Foundation/Controller/FUSImagePicker/Controller/FUSPhotoViewController.m

@@ -238,6 +238,7 @@
         self.titleButton = [UIButton buttonWithType:UIButtonTypeCustom];
         self.titleButton.frame = CGRectMake(0, 0, 60, 44);
         [self.titleButton setTitle:title forState:UIControlStateNormal];
+        [self.titleButton setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateNormal];
         [self.titleButton setImage:[UIImage imageNamed:@"fireFly_board_down_arrow"] forState:UIControlStateNormal];
         [self.titleButton setImage:[UIImage imageNamed:@"fireFly_board_up_arrow"] forState:UIControlStateSelected];
         [self.titleButton addTarget:self action:@selector(fus_clickAlbumPickerBtnAction:) forControlEvents:UIControlEventTouchUpInside];
@@ -250,7 +251,7 @@
         self.albumTableView.delegate = self;
         self.albumTableView.dataSource = self;
         self.albumTableView.separatorStyle = UITableViewCellSeparatorStyleNone;
-        self.albumTableView.backgroundColor = [UIColor colorWithHex:@"#121216"];
+        self.albumTableView.backgroundColor = [UIColor fus_appBGColor];
         self.albumTableView.y = -self.albumTableView.frame.size.height;
         [self.view addSubview:self.albumTableView];
         
@@ -277,26 +278,28 @@
         [self.navigationItem setRightBarButtonItems:@[confirmBarItem] animated:YES];
         self.confirmBtn.enabled = NO;
     } else {
-        UIButton *cancleBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        cancleBtn.frame = CGRectMake(0, 0, 100, 30);
-        [cancleBtn setTitle:[NSString fus_localString:@"取消"] forState:UIControlStateNormal];
-        cancleBtn.titleLabel.font = [UIFont fus_themeFont:16];
-        cancleBtn.contentHorizontalAlignment = UIControlContentHorizontalAlignmentRight;
-        [cancleBtn addTarget:self action:@selector(onClickCancleBtn) forControlEvents:UIControlEventTouchUpInside];
-        UIBarButtonItem *cancleBarItem = [[UIBarButtonItem alloc]initWithCustomView:cancleBtn];
-        [self.navigationItem setRightBarButtonItems:@[cancleBarItem] animated:YES];
+//        UIButton *cancleBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+//        cancleBtn.frame = CGRectMake(0, 0, 100, 30);
+//        [cancleBtn setTitle:[NSString fus_localString:@"取消"] forState:UIControlStateNormal];
+//        cancleBtn.titleLabel.font = [UIFont fus_themeFont:16];
+//        cancleBtn.contentHorizontalAlignment = UIControlContentHorizontalAlignmentRight;
+//        [cancleBtn addTarget:self action:@selector(onClickCancleBtn) forControlEvents:UIControlEventTouchUpInside];
+//        UIBarButtonItem *cancleBarItem = [[UIBarButtonItem alloc]initWithCustomView:cancleBtn];
+//        [self.navigationItem setRightBarButtonItems:@[cancleBarItem] animated:YES];
     }
     
     FUSChoseButton *backBtn = [FUSChoseButton buttonWithType:UIButtonTypeCustom];
-    backBtn.frame = CGRectMake(0, 0, 18 * 0.5, 31 * 0.5);
+    backBtn.frame = CGRectMake(0, 0, 30, 31 * 0.5);
+    backBtn.imageView.contentMode = UIViewContentModeScaleAspectFit;
     [backBtn addTarget:self action:@selector(onClickBackBtn) forControlEvents:UIControlEventTouchUpInside];
-    UIImage *backImage = [UIImage imageNamed:[FUSRTL RTLImageName:@"common_navigation_back_white"]];
+//    UIImage *backImage = [UIImage imageNamed:[FUSRTL RTLImageName:@"common_navigation_back_white"]];
+    UIImage *backImage = [UIImage fus_backImage];
     [backBtn setImage:backImage forState:UIControlStateNormal];
 
     UIBarButtonItem *backBarItem = [[UIBarButtonItem alloc]initWithCustomView:backBtn];
     [self.navigationItem setLeftBarButtonItems:@[backBarItem] animated:YES];
     
-    [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent animated:YES];
+//    [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent animated:YES];
     
 }
 
@@ -348,7 +351,7 @@
     
     [self.view addSubview:bottomView];
     
-    UIVisualEffectView *visualView = [[UIVisualEffectView alloc]initWithEffect:[UIBlurEffect effectWithStyle:UIBlurEffectStyleDark]];
+    UIVisualEffectView *visualView = [[UIVisualEffectView alloc]initWithEffect:[UIBlurEffect effectWithStyle:UIBlurEffectStyleLight]];
     visualView.frame = bottomView.bounds;
     [bottomView addSubview:visualView];
     
@@ -365,8 +368,8 @@
     [previewBtn setTitle:[NSString fus_localString:@"预览"] forState:UIControlStateNormal];
     previewBtn.titleLabel.font = strFont;
     [bottomView addSubview:previewBtn];
-    [previewBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
-    [previewBtn setTitleColor:[UIColor colorWithWhite:1 alpha:0.3] forState:UIControlStateDisabled];
+    [previewBtn setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateNormal];
+    [previewBtn setTitleColor:[UIColor fus_textColorLight] forState:UIControlStateDisabled];
     self.previewBtn = previewBtn;
     
     // 确认按钮
@@ -871,7 +874,7 @@
  */
 - (void)onClickBackBtn
 {
-    [self.navigationController dismissViewControllerAnimated:YES completion:nil];
+    
 //    if ([FUSImagePickerManager sharedManager].disableAlbumSelection) {
 ////        [self dismissViewControllerAnimated:YES completion:nil];
 //        if ([self.navigationController isKindOfClass:[FUSImagePickerViewController class]]) {
@@ -883,6 +886,16 @@
 //    } else {
 //         [self.navigationController popViewControllerAnimated:YES];
 //    }
+    
+    if ([self.navigationController isKindOfClass:[FUSImagePickerViewController class]]) {
+        FUSImagePickerViewController *imagePickerVC = (FUSImagePickerViewController *)self.navigationController;
+        
+        if (imagePickerVC.imagePickerDelegate && [imagePickerVC.imagePickerDelegate respondsToSelector:@selector(fus_imagePickerDidCancle:)]) {
+            [imagePickerVC.imagePickerDelegate fus_imagePickerDidCancle:imagePickerVC];
+        }
+    }else {
+        [self.navigationController popViewControllerAnimated:YES];
+    }
 }
 
 /**

FuSiLive/Classes/Foundation/Controller/FUSImagePicker/View/FUSPhotosAlbumCell.m

@@ -50,7 +50,7 @@
     self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
     if (self) {
         [self initUI];
-        self.contentView.backgroundColor = [UIColor colorWithHex:@"#121216"];
+        self.contentView.backgroundColor = [UIColor fus_appBGColor];
     }
     return self;
 }
@@ -99,7 +99,7 @@
     self.albumTitleLabel = [[UILabel alloc] initWithFrame:CGRectMake(CGRectGetMaxX(_coverImageView.frame) + 8, 0, 200, 30)];
     self.albumTitleLabel.center = CGPointMake(_albumTitleLabel.center.x, self.contentView.height / 2.0);
     _albumTitleLabel.textAlignment = NSTextAlignmentLeft;
-    _albumTitleLabel.textColor = [UIColor colorWithHex:@"#CCCCCC"];
+    _albumTitleLabel.textColor = [UIColor fus_textColorRich];
     _albumTitleLabel.font = [UIFont fus_themeFont:16];
     _albumTitleLabel.userInteractionEnabled = YES;
     [self.contentView addSubview:_albumTitleLabel];
@@ -113,7 +113,7 @@
 {
     self.photosCountLabel = [[UILabel alloc] init];
     self.photosCountLabel.textAlignment = NSTextAlignmentLeft;
-    self.photosCountLabel.textColor = [UIColor colorWithHex:@"#666666"];
+    self.photosCountLabel.textColor = [UIColor fus_textColorMedium];
     self.photosCountLabel.font = [UIFont fus_themeFont:16];
     self.photosCountLabel.userInteractionEnabled = YES;
     [self.contentView addSubview:self.photosCountLabel];
@@ -123,7 +123,7 @@
 - (void)initSeparatorView
 {
     self.separatorLine = [[UIView alloc]initWithFrame:CGRectMake(20, self.contentView.height - 0.5, [[UIScreen mainScreen] bounds].size.width - 20, 0.5)];
-    self.separatorLine.backgroundColor = [UIColor colorWithHex:@"#2B3138"];
+    self.separatorLine.backgroundColor = [UIColor fus_separatorLineColor];
     [self.contentView addSubview:self.separatorLine];
 }
 

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

@@ -10,7 +10,7 @@
 #import "FUSCustomSettingItem.h"
 #import "FUSCustomSettingGroup.h"
 #import "UIImageView+WebImage.h"
-#import "FUSSettingThirdPartyTableViewCell.h"
+#import "FUSSettingThirdPartTableViewCell.h"
 #import "FUSThirdPartyAccountModel.h"
 #import "FUSDefine.h"
 #import <Masonry/Masonry.h>
@@ -36,7 +36,7 @@
 /**
  *   第三方账号cell
  */
-@property (nonatomic,strong) FUSSettingThirdPartyTableViewCell *thirdPartyCell;
+@property (nonatomic,strong) FUSSettingThirdPartTableViewCell *thirdPartyCell;
 
 /**
  左侧红点
@@ -230,12 +230,13 @@
 }
 
 #pragma mark - 第三方账号cell
-- (FUSSettingThirdPartyTableViewCell *)thirdPartyCell
+- (FUSSettingThirdPartTableViewCell *)thirdPartyCell
 {
     if (_thirdPartyCell == nil) {
         
-        _thirdPartyCell = [[[NSBundle mainBundle] loadNibNamed:NSStringFromClass([FUSSettingThirdPartyTableViewCell class]) owner:self options:nil] firstObject];
-        _thirdPartyCell.frame = CGRectMake(-5, 0, UIView.fus_screenW + 10, kThirdPartyAccountSettingItemHeight);
+//        _thirdPartyCell = [[[NSBundle mainBundle] loadNibNamed:NSStringFromClass([FUSSettingThirdPartyTableViewCell class]) owner:self options:nil] firstObject];
+//        _thirdPartyCell.frame = CGRectMake(-5, 0, UIView.fus_screenW + 10, kThirdPartyAccountSettingItemHeight);
+        _thirdPartyCell = [[FUSSettingThirdPartTableViewCell alloc] initWithFrame:CGRectMake(-5, 0, UIView.fus_screenW + 10, kThirdPartyAccountSettingItemHeight)];
         
         __weak typeof(self) weakSelf = self;
         _thirdPartyCell.thirdBtnClickBlock = ^(NSInteger index) {
@@ -252,8 +253,8 @@
     _thirdPartyCell.twitterBtn.selected = NO;
     _thirdPartyCell.lineBtn.userInteractionEnabled = YES;
     _thirdPartyCell.lineBtn.selected = NO;
-    _thirdPartyCell.wechatBtn.userInteractionEnabled = YES;
-    _thirdPartyCell.wechatBtn.selected = NO;
+//    _thirdPartyCell.wechatBtn.userInteractionEnabled = YES;
+//    _thirdPartyCell.wechatBtn.selected = NO;
     _thirdPartyCell.fireflyidBtn.userInteractionEnabled = YES;
     _thirdPartyCell.fireflyidBtn.selected = NO;
     
@@ -262,8 +263,8 @@
             switch ([accountModel.openType integerValue]) {
                 case 2: // 微信
                 {
-                    _thirdPartyCell.wechatBtn.userInteractionEnabled = NO;
-                    _thirdPartyCell.wechatBtn.selected = YES;
+//                    _thirdPartyCell.wechatBtn.userInteractionEnabled = NO;
+//                    _thirdPartyCell.wechatBtn.selected = YES;
                 }
                     break;
                 case 4: // Google
@@ -458,6 +459,9 @@
         case CustomSettingItemTypeThirdPartyAccount:
         {
             [self.contentView addSubview:self.thirdPartyCell];
+            [self.thirdPartyCell mas_makeConstraints:^(MASConstraintMaker *make) {
+                make.edges.equalTo(self.contentView);
+            }];
         }
             break;
         default:

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

@@ -133,6 +133,11 @@
 - (void)setSelectName:(NSString *)selectName{
     _selectName = selectName;
     [self.selectBtn setTitle:selectName forState:UIControlStateNormal];
+    
+    CGSize textSize = [selectName sizeWithFont:self.selectBtn.titleLabel.font maxWidth:UIView.fus_screenW - 40];
+    [self.selectBtn mas_updateConstraints:^(MASConstraintMaker *make) {
+        make.width.offset(textSize.width + 40);
+    }];
 }
 
 @end

FuSiLive/Classes/NewsFeed/Views/FUSNewsFeedCollectionView.m

@@ -270,6 +270,7 @@
         self.emptyView = nil;
         self.emptyView = [[FUSEmptyView alloc] initWithFrame:frame];
         self.emptyView.type = FUSEmptyViewTypeBG;
+        self.emptyView.contentVerticalOffset = 80;
         switch (self.dataHelper.dataType) {
             case FUSNewsFeedDataTypeRecommond:
             case FUSNewsFeedDataTypeFollow:

FuSiLive/Classes/Setting/View/FUSSettingThirdPartTableViewCell.h

+//
+//  FUSSettingThirdPartTableViewCell.h
+//  FuSiLive
+//
+//  Created by aaa on 2024/7/8.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface FUSSettingThirdPartTableViewCell : UITableViewCell
+
+@property (strong, nonatomic) UIButton *facebookBtn;
+@property (strong, nonatomic) UIButton *twitterBtn;
+@property (strong, nonatomic) UIButton *lineBtn;
+@property (strong, nonatomic) UIButton *fireflyidBtn;
+@property (strong, nonatomic) UIButton *googleBtn;
+
+//1=Facebook 2=twitter 3=Line 4=微信 5=FuSi ID
+@property (nonatomic, copy) void(^thirdBtnClickBlock)(NSInteger index);
+
+@end
+
+NS_ASSUME_NONNULL_END

FuSiLive/Classes/Setting/View/FUSSettingThirdPartTableViewCell.m

+//
+//  FUSSettingThirdPartTableViewCell.m
+//  FuSiLive
+//
+//  Created by aaa on 2024/7/8.
+//
+
+#import "FUSSettingThirdPartTableViewCell.h"
+
+@implementation FUSSettingThirdPartTableViewCell
+
+- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier{
+    self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
+    if (self) {
+        [self fus_createUI];
+    }
+    return self;
+}
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        [self fus_createUI];
+    }
+    return self;
+}
+
+-(void)fus_createUI{
+    
+    self.facebookBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+    self.facebookBtn.tag = 10;
+    self.twitterBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+    self.twitterBtn.tag = 11;
+    self.lineBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+    self.lineBtn.tag = 12;
+    self.fireflyidBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+    self.fireflyidBtn.tag = 14;
+    self.googleBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+    self.googleBtn.tag = 15;
+    
+    NSArray *btnImgNamesArr = @[@"icon_setting_facebook_dark",@"icon_setting_twitter_dark",@"icon_setting_line_dark",@"icon_setting_google_dark",@"icon_setting_yaboid_dark"];
+    NSArray *btnSelectImgNamesArr = @[@"icon_setting_facebook_light",@"icon_setting_twitter_light",@"icon_setting_line_light",@"icon_setting_google_light",@"icon_setting_yaboid_light"];
+    NSArray *btnsArr = @[self.facebookBtn,self.twitterBtn,self.lineBtn,self.googleBtn,self.fireflyidBtn];
+    [btnsArr enumerateObjectsUsingBlock:^(UIButton  * obj, NSUInteger idx, BOOL * _Nonnull stop) {
+        
+        [obj setImage:[UIImage imageNamed:btnImgNamesArr[idx]] forState:UIControlStateNormal];
+        [obj setImage:[UIImage imageNamed:btnSelectImgNamesArr[idx]] forState:UIControlStateSelected];
+        [self.contentView addSubview:obj];
+        [obj addTarget:self action:@selector(onButtonClickAction:) forControlEvents:UIControlEventTouchUpInside];
+        
+    }];
+    
+    [btnsArr mas_distributeViewsAlongAxis:MASAxisTypeHorizontal withFixedSpacing:10 leadSpacing:0 tailSpacing:0];
+//    [btnsArr mas_distributeViewsAlongAxis:MASAxisTypeHorizontal withFixedItemLength:56 leadSpacing:0 tailSpacing:0];
+    [btnsArr mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.bottom.offset(0);
+    }];
+}
+
+-(void)onButtonClickAction:(UIButton *)sender{
+    if (_thirdBtnClickBlock) _thirdBtnClickBlock(sender.tag - 9);
+}
+
+@end

FuSiLive/Classes/Setting/View/FUSSettingThirdPartyTableViewCell.h

@@ -5,7 +5,7 @@
 //  Created by 曾治铭 on 16/3/4.
 //  Copyright © 2024年 FuSiLive. All rights reserved.
 //
-
+//TODO: ludy:这个刚刚重构完，重构的class是FUSSettingThirdPartTableViewCell，如果验了没bug，那么就删除这个view
 #import <UIKit/UIKit.h>
 
 @interface FUSSettingThirdPartyTableViewCell : UITableViewCell

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

@@ -111,7 +111,7 @@
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
     FUSMyZoneBaseCell *cell = [tableView dequeueReusableCellWithIdentifier:_cellManager.groupArray[indexPath.section][indexPath.row] forIndexPath:indexPath];
     cell.selectedBackgroundView = [[UIView alloc] init];
-    cell.selectedBackgroundView.backgroundColor = [UIColor colorWithHex:@"#21212E"];
+    cell.selectedBackgroundView.backgroundColor = [UIColor fus_appBGPressColor];
     [cell fus_setupCellWithModel:_zoneModel isMyZone:_isMyZone];
     [_cellManager fus_addMyZoneCellActionWithCell:cell];
     return cell;