修复一些bug

0f8db65f · ludi · f48c2f6c · 0f8db65f · 0f8db65f · 0f8db65f
Commit 0f8db65f authored Mar 16, 2026 by ludi
Showing with 53 additions and 16 deletions
DevelopmentPods/FUSCommon/FUSCommon/Classes/Common/View/MediaPreview/FUSBaseMediaPreview.m
DevelopmentPods/FUSCommon/FUSCommon/Classes/Foundation/Http/FUSCommonURLs.m
FuSiLive.xcodeproj/project.pbxproj
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/HomePage/cell/FUSHomeAnchorListSmallCell.m
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/FUSPKControlWebView.swift
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/FUSPKUserContributionLogInLiveAlertView.swift
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/ViewModel/FUSPKControlViewModel.swift
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/NewsFeed/Views/NewsFeedDetailHeaderView/FUSNewsFeedDetailPhotoHeaderView.m
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/NewsFeed/Views/NewsFeedDetailHeaderView/FUSNewsFeedDetailVideoHeaderView.m
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Zone/Controller/FireFlyMyZone/FUSZoneTaskCenterViewController.m
--- a/DevelopmentPods/FUSCommon/FUSCommon/Classes/Common/View/MediaPreview/FUSBaseMediaPreview.m
+++ b/DevelopmentPods/FUSCommon/FUSCommon/Classes/Common/View/MediaPreview/FUSBaseMediaPreview.m
@@ -183,7 +183,7 @@
        cell.cellShownAnimationDoneHandler = nil;
    }
-//    [cell fus_setupMediaCellWithModel:self.mediaList[indexPath.row]];
+    [cell fus_setupMediaCellWithModel:self.mediaList[indexPath.row]];
 //    FUSLogDebug(@"=====model_mid：%@",model.mid);
    return cell;

--- a/DevelopmentPods/FUSCommon/FUSCommon/Classes/Foundation/Http/FUSCommonURLs.m
+++ b/DevelopmentPods/FUSCommon/FUSCommon/Classes/Foundation/Http/FUSCommonURLs.m
@@ -81,7 +81,8 @@
 }
 + (NSString *)fus_newsfeedInput {
-    return [FUSConfig.sharedInstanced.pathConfigs webUrl:@"/fusi/moving/news.html"];
+//    return [FUSConfig.sharedInstanced.pathConfigs webUrl:@"/fusi/moving/news.html"];
+    return [FUSConfig.sharedInstanced.pathConfigs webUrl:@"/vestApp/moving/news.html"];
 }
 /// 邀请有奖-下载帮助页地址

--- a/FuSiLive.xcodeproj/project.pbxproj
+++ b/FuSiLive.xcodeproj/project.pbxproj
@@ -673,7 +673,7 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 202506260040;
+				CURRENT_PROJECT_VERSION = 202506260041;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 6GG26BHUMC;
 				ENABLE_ON_DEMAND_RESOURCES = NO;
@@ -938,7 +938,7 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 202506260040;
+				CURRENT_PROJECT_VERSION = 202506260041;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 6GG26BHUMC;
 				ENABLE_ON_DEMAND_RESOURCES = NO;

--- a/Modules/FUSShowRoomModule/FUSShowRoomModule/Features/HomePage/cell/FUSHomeAnchorListSmallCell.m
+++ b/Modules/FUSShowRoomModule/FUSShowRoomModule/Features/HomePage/cell/FUSHomeAnchorListSmallCell.m
@@ -21,6 +21,8 @@
 @property (nonatomic, strong) UIButton *locationBtn;
 ///用户名
 @property (nonatomic, strong) UILabel *nickNameLabel;
+/// 直播主题
+@property (nonatomic, strong) UILabel *themeLabel;
 /// 这个是龟龟左上角new的那个图标，找了一万年没找到
 @property (nonatomic, strong) FUSBaoFangTagView *tagView;
 ///pk标识动画
@@ -80,13 +82,22 @@
        make.width.offset(40);
    }];
+    self.themeLabel = [[UILabel alloc] init];
+    self.themeLabel.font = [UIFont fus_themeMediumFont:12];
+    self.themeLabel.textColor = [UIColor fus_textColorVeryLight];
+    [self.bgImageView addSubview:self.themeLabel];
+    [self.themeLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.offset(8);
+        make.bottom.offset(-9);
+    }];
    self.nickNameLabel = [[UILabel alloc] init];
    self.nickNameLabel.font = [UIFont fus_themeBoldFont:16];
    self.nickNameLabel.textColor = [UIColor fus_textColorVeryLight];
    [self.bgImageView addSubview:self.nickNameLabel];
    [self.nickNameLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.offset(8);
+        make.left.equalTo(self.themeLabel.mas_left);
-        make.bottom.offset(-9);
+        make.bottom.equalTo(self.themeLabel.mas_top).offset(-4);
    }];
    self.locationBtn = [UIButton buttonWithType:UIButtonTypeCustom];
@@ -179,6 +190,8 @@
    }
    if (model.fus_itemType == 0) {
+        self.themeLabel.hidden = NO;
+        self.themeLabel.text = model.introduce;
        self.nickNameLabel.hidden = NO;
        self.nickNameLabel.text = model.nickname;
        self.bottomAlphaBgView.hidden = NO;
@@ -235,6 +248,7 @@
    }else if (model.fus_itemType == 1 || model.fus_itemType == 2 || model.fus_itemType == 3){
        // 不是正常主播的卡片
+        self.themeLabel.hidden = YES;
        self.nickNameLabel.hidden = YES;
        self.locationBtn.hidden = YES;
        self.hotNumBtn.hidden = YES;

--- a/Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/FUSPKControlWebView.swift
+++ b/Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/FUSPKControlWebView.swift
@@ -34,7 +34,7 @@ class FUSPKControlWebView: FUSPKControlSubBaseView {
        contentView.addSubview(webView)
        webView.snp.makeConstraints { make in
            make.left.bottom.right.equalToSuperview()
-            make.top.equalTo(naviView.snp.bottom)
+            make.top.equalTo(naviView.snp.bottom).offset(8)
        }
    }

--- a/Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/FUSPKUserContributionLogInLiveAlertView.swift
+++ b/Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/FUSPKUserContributionLogInLiveAlertView.swift
@@ -20,7 +20,7 @@ class FUSPKUserContributionLogInLiveAlertView: FUSPKControlSubBaseView {
    let scoreProgressView = FUSPKScoreProgressLargeSmallView(frame: CGRectMake(0, 0, UIView.fus_screenW(), FUSPKScoreProgressLargeSmallView.viewHeight))
    let tableView = UITableView(frame: .zero, style: .plain)
-    private let emptyView = FUSEmptyView(frame: CGRectMake(0, 0, UIView.fus_screenW(), 400))
+    private let emptyView = UIView(frame: CGRectMake(0, 0, UIView.fus_screenW(), 400))
    /// 当前页
    var currentPage: Int = 1
@@ -75,7 +75,13 @@ class FUSPKUserContributionLogInLiveAlertView: FUSPKControlSubBaseView {
        emptyView.backgroundColor = .clear
-        self.emptyView.fus_setEmptyViewIcon(.fus_emptyImg(), title: .fus_localString("暂无数据"), buttonTittle: "")
+        let emptyShowView = FUSEmptyView(frame: CGRectMake(0, 0, 240, 240))
+        emptyShowView.fus_setEmptyViewIcon(.fus_emptyImg(), title: .fus_localString("暂无数据"), buttonTittle: "")
+        emptyView.addSubview(emptyShowView)
+        emptyShowView.snp.makeConstraints { make in
+            make.center.equalToSuperview()
+            make.size.equalTo(emptyShowView.size)
+        }
    }
    override func bindViewModel() {

--- a/Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/ViewModel/FUSPKControlViewModel.swift
+++ b/Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/ViewModel/FUSPKControlViewModel.swift
@@ -166,7 +166,7 @@ extension FUSPKControlViewType {
        switch self {
        case .base, .contribution, .pkRecord, .pkDescription, .contributionLogListInMatch:
            return 620 + UIView.fus_SafeBottom()
-        case .pkMode, .searchPlayer, .matching, .opponent, .setting:
+        case .searchPlayer, .matching, .opponent, .setting:
            return 428 + UIView.fus_SafeBottom()
        case .contributionListInMatch:
            return 513 + UIView.fus_SafeBottom()
@@ -176,8 +176,8 @@ extension FUSPKControlViewType {
            return 495 + UIView.fus_SafeBottom()
        case .punishActivate:
            return 240 + UIView.fus_SafeBottom()
-        case .pkGamePlay:
+        case .pkGamePlay, .pkMode:
-            return 528 + UIView.fus_SafeBottom()
+            return 442 + UIView.fus_SafeBottom()
        default:
            return 0
        }

--- a/Modules/FUSUserCenterModule/FUSUserCenterModule/Features/NewsFeed/Views/NewsFeedDetailHeaderView/FUSNewsFeedDetailPhotoHeaderView.m
+++ b/Modules/FUSUserCenterModule/FUSUserCenterModule/Features/NewsFeed/Views/NewsFeedDetailHeaderView/FUSNewsFeedDetailPhotoHeaderView.m
@@ -22,7 +22,7 @@
 @interface FUSNewsFeedDetailPhotoHeaderView () <FUSRecycleViewDataSource,FUSRecycleViewDelegate>
 /// 内容的Label
-@property (nonatomic, strong) UILabel *contentLabel;
+@property (nonatomic, strong) YYLabel *contentLabel;
 /// 滚动
 @property (nonatomic, strong) FUSRecycleView *recycleView;
@@ -76,10 +76,17 @@
 - (void)layoutSubviews {
+    YYTextLayout *layout = [YYTextLayout layoutWithContainerSize:CGSizeMake(UIView.fus_screenW - FUSNFDPHVContentLeftMargin * 2, CGFLOAT_MAX) text:self.contentLabel.attributedText];
+    CGRect contentLabelRect = layout.textBoundingRect;
    self.contentLabel.x = FUSNFDPHVContentLeftMargin;
    self.contentLabel.y = FUSNFDPHVContentTopMargin;
    if (self.model.headerContentHeight <= 0) {
+        if (contentLabelRect.size.width > 0) {
+            self.contentLabel.size = contentLabelRect.size;
+        }else {
            self.contentLabel.size = [self.model.subtitle sizeWithFont:[UIFont fus_themeFont:14] maxWidth:UIView.fus_screenW - FUSNFDPHVContentLeftMargin * 2];
+        }
        self.model.headerContentHeight = self.contentLabel.size.height;
    } else {
        self.contentLabel.width = UIView.fus_screenW - FUSNFDPHVContentLeftMargin * 2;
@@ -108,7 +115,8 @@
    } else {
        self.unlockPriceView.hidden = YES;
    }
-    self.contentLabel.text = model.subtitle;
+//    self.contentLabel.text = model.subtitle;
+    self.contentLabel.attributedText = [FUSFormatContentHelper fus_createContentAttributedStringWithHTMLString:model.subtitle font:[UIFont fus_themeFont:14] defaultColor:[UIColor fus_textColorMedium] imageSize:CGSizeMake(14, 14)];
    self.photoCountLabel.hidden = model.images.count <= 1;
    self.photoCountLabel.text = [NSString stringWithFormat:@"%d/%d",1,(int)self.model.images.count];
    [self.recycleView reloadData];

--- a/Modules/FUSUserCenterModule/FUSUserCenterModule/Features/NewsFeed/Views/NewsFeedDetailHeaderView/FUSNewsFeedDetailVideoHeaderView.m
+++ b/Modules/FUSUserCenterModule/FUSUserCenterModule/Features/NewsFeed/Views/NewsFeedDetailHeaderView/FUSNewsFeedDetailVideoHeaderView.m
@@ -21,7 +21,7 @@
 @interface FUSNewsFeedDetailVideoHeaderView ()
 /// 内容的Label
-@property (nonatomic, strong) UILabel *contentLabel;
+@property (nonatomic, strong) YYLabel *contentLabel;
 /// 滚动
 @property (nonatomic, strong) UIImageView *bottomMaskImageView;
@@ -120,10 +120,17 @@
 - (void)layoutSubviews {
+    YYTextLayout *layout = [YYTextLayout layoutWithContainerSize:CGSizeMake(UIView.fus_screenW - FUSNFDVHVContentLeftMargin * 2, CGFLOAT_MAX) text:self.contentLabel.attributedText];
+    CGRect contentLabelRect = layout.textBoundingRect;
    self.contentLabel.x = FUSNFDVHVContentLeftMargin;
    self.contentLabel.y = FUSNFDVHVContentTopMargin;
    if (self.model.headerContentHeight <= 0) {
+        if (contentLabelRect.size.width > 0) {
+            self.contentLabel.size = contentLabelRect.size;
+        }else {
            self.contentLabel.size = [self.model.subtitle sizeWithFont:[UIFont fus_themeFont:14] maxWidth:UIView.fus_screenW - FUSNFDVHVContentLeftMargin * 2];
+        }
        self.model.headerContentHeight = self.contentLabel.size.height;
    } else {
        self.contentLabel.width = UIView.fus_screenW - FUSNFDVHVContentLeftMargin * 2;
@@ -163,7 +170,8 @@
    } else {
        self.unlockPriceView.hidden = YES;
    }
-    self.contentLabel.text = model.subtitle;
+//    self.contentLabel.text = model.subtitle;
+    self.contentLabel.attributedText = [FUSFormatContentHelper fus_createContentAttributedStringWithHTMLString:model.subtitle font:[UIFont fus_themeFont:14] defaultColor:[UIColor fus_textColorMedium] imageSize:CGSizeMake(14, 14)];
    __weak typeof(self) weakSelf = self;
    [self.videoView.preImageView setWebImageWithSubURLString:self.model.videos.firstObject.cover placeholder:nil completion:^(UIImage * _Nullable result, NSURL * _Nonnull url, YYWebImageFromType from, YYWebImageStage stage, NSError * _Nullable error) {

--- a/Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Zone/Controller/FireFlyMyZone/FUSZoneTaskCenterViewController.m
+++ b/Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Zone/Controller/FireFlyMyZone/FUSZoneTaskCenterViewController.m