Skip to content

pidan / FuSiLive

Go to a project
Commit 946ce572 by ludi
Options

修复一些bug

parent 35908849
Inline Side-by-side
Showing with 72 additions and 47 deletions
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Chinese.strings
...@@ -3426,3 +3426,7 @@ ...@@ -3426,3 +3426,7 @@
"俱乐部" = "社团"; "俱乐部" = "社团";
"邀请你进行PK" = "邀请你进行PK";
"昨日" = "昨日";
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Chinese_Traditional.strings
...@@ -3426,3 +3426,7 @@ ...@@ -3426,3 +3426,7 @@
"俱乐部" = "社團"; "俱乐部" = "社團";
"邀请你进行PK" = "邀請你進行PK";
"昨日" = "昨日";
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_English.strings
...@@ -3426,3 +3426,7 @@ ...@@ -3426,3 +3426,7 @@
"俱乐部" = "Fans group"; "俱乐部" = "Fans group";
"邀请你进行PK" = "Inviting you to PK";
"昨日" = "Yesterday";
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Japanese.strings
...@@ -3404,3 +3404,7 @@ ...@@ -3404,3 +3404,7 @@
"俱乐部" = "Fans group"; "俱乐部" = "Fans group";
"邀请你进行PK" = "PKに招待中";
"昨日" = "昨日";
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Thai.strings
...@@ -3398,3 +3398,7 @@ ...@@ -3398,3 +3398,7 @@
"俱乐部" = "Fans group"; "俱乐部" = "Fans group";
"邀请你进行PK" = "เชิญคุณเข้าร่วม PK";
"昨日" = "เมื่อวาน";
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_vietnamese.strings
...@@ -3404,3 +3404,7 @@ ...@@ -3404,3 +3404,7 @@
"俱乐部" = "Nhóm người hâm mộ"; "俱乐部" = "Nhóm người hâm mộ";
"邀请你进行PK" = "Mời bạn vào PK";
"昨日" = "hôm qua";
FuSiLive.xcodeproj/project.pbxproj
...@@ -673,7 +673,7 @@ ...@@ -673,7 +673,7 @@
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements; CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 202506260038; CURRENT_PROJECT_VERSION = 202506260039;
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 6GG26BHUMC; DEVELOPMENT_TEAM = 6GG26BHUMC;
ENABLE_ON_DEMAND_RESOURCES = NO; ENABLE_ON_DEMAND_RESOURCES = NO;
...@@ -938,7 +938,7 @@ ...@@ -938,7 +938,7 @@
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements; CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 202506260038; CURRENT_PROJECT_VERSION = 202506260039;
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 6GG26BHUMC; DEVELOPMENT_TEAM = 6GG26BHUMC;
ENABLE_ON_DEMAND_RESOURCES = NO; ENABLE_ON_DEMAND_RESOURCES = NO;
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/Controller/FUSLiveMainViewController.m
...@@ -675,7 +675,7 @@ typedef NS_ENUM(NSInteger, FUSStreamState) { ...@@ -675,7 +675,7 @@ typedef NS_ENUM(NSInteger, FUSStreamState) {
} }
// 进入包房成功提示送礼view通知 // 进入包房成功提示送礼view通知
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(recieveJoinRoomSuccessNotification) name:FUSLiveUDKeys.fus_IS_JOIN_ROOM_SUCCESS object:nil]; // [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(recieveJoinRoomSuccessNotification) name:FUSLiveUDKeys.fus_IS_JOIN_ROOM_SUCCESS object:nil];
} }
break; break;
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSModel/FUSPKAnchorModel.swift
...@@ -209,6 +209,8 @@ extension FUSVSIndexDevoteUserModel{ ...@@ -209,6 +209,8 @@ extension FUSVSIndexDevoteUserModel{
// model.total = contributeUserModel.point // model.total = contributeUserModel.point
model.inHide = contributeUserModel.inHide == true ? "1" : "0" model.inHide = contributeUserModel.inHide == true ? "1" : "0"
model.inVip = contributeUserModel.vip model.inVip = contributeUserModel.vip
model.extraShow = contributeUserModel.extraShow
model.multiple = contributeUserModel.multiple
return model return model
} }
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSModel/FUSPKContributeUserModel.swift
...@@ -22,6 +22,11 @@ class FUSPKContributeUserModel: FUSSwiftBaseModel { ...@@ -22,6 +22,11 @@ class FUSPKContributeUserModel: FUSSwiftBaseModel {
@objc var inHide : Bool = false @objc var inHide : Bool = false
/// 倍率
@objc public var multiple: String = ""
/// 是否显示倍率 (0:否\1:是)
@objc public var extraShow: Int = 0
var index = 0 var index = 0
...@@ -37,6 +42,10 @@ class FUSPKContributeUserModel: FUSSwiftBaseModel { ...@@ -37,6 +42,10 @@ class FUSPKContributeUserModel: FUSSwiftBaseModel {
model.vip = json["vip"].intValue model.vip = json["vip"].intValue
model.point = json["point"].intValue model.point = json["point"].intValue
model.inHide = json["inHide"].boolValue model.inHide = json["inHide"].boolValue
if json["extraShow"].count > 0 {
model.extraShow = json["extraShow"].intValue
model.multiple = json["multiple"].stringValue
}
return model as! Self return model as! Self
} }
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/Cell/FUSPKControlContributionUserBlankCell.swift
...@@ -323,8 +323,8 @@ class FUSPKControlContributionHotDataCell: UITableViewCell { ...@@ -323,8 +323,8 @@ class FUSPKControlContributionHotDataCell: UITableViewCell {
let avatarTapBtn = UIButton(type: .custom) let avatarTapBtn = UIButton(type: .custom)
let rankBtn = UIButton(type: .custom) let rankBtn = UIButton(type: .custom)
let faceView = FUSRichIconView(frame: CGRectMake(0, 0, 40, 40)) let faceView = UIImageView(frame: CGRectMake(0, 0, 40, 40))
let richImageView = UIImageView(frame: .init(x: 0, y: 0, width: 37, height: 14)) let richImageView = UIImageView()
let nicknameLabel = UILabel() let nicknameLabel = UILabel()
let hotNumLabel = UILabel() let hotNumLabel = UILabel()
let hotImageView = UIImageView(image: FUSShowRoomCenterBunble.imageNamed("live_list_room_popular_img")) let hotImageView = UIImageView(image: FUSShowRoomCenterBunble.imageNamed("live_list_room_popular_img"))
...@@ -341,6 +341,8 @@ class FUSPKControlContributionHotDataCell: UITableViewCell { ...@@ -341,6 +341,8 @@ class FUSPKControlContributionHotDataCell: UITableViewCell {
make.centerY.equalToSuperview() make.centerY.equalToSuperview()
} }
faceView.layer.cornerRadius = 40 / 2.0
faceView.layer.masksToBounds = true
self.contentView.addSubview(faceView) self.contentView.addSubview(faceView)
faceView.snp.makeConstraints { make in faceView.snp.makeConstraints { make in
make.left.equalTo(60) make.left.equalTo(60)
...@@ -357,22 +359,22 @@ class FUSPKControlContributionHotDataCell: UITableViewCell { ...@@ -357,22 +359,22 @@ class FUSPKControlContributionHotDataCell: UITableViewCell {
}) })
.disposed(by: disposeBag) .disposed(by: disposeBag)
richImageView.contentMode = .scaleAspectFit nicknameLabel.font = .fus_themeMediumFont(15)
self.contentView.addSubview(richImageView) nicknameLabel.textColor = .fus_textColorRich()
richImageView.snp.makeConstraints { make in
make.left.equalTo(faceView.snp.right).offset(8)
make.centerY.equalToSuperview()
make.width.equalTo(37)
make.height.equalTo(14)
}
self.contentView.addSubview(nicknameLabel) self.contentView.addSubview(nicknameLabel)
nicknameLabel.snp.makeConstraints { make in nicknameLabel.snp.makeConstraints { make in
make.left.equalTo(richImageView.snp.right).offset(6) make.left.equalTo(faceView.snp.right).offset(8)
make.centerY.equalToSuperview() make.centerY.equalTo(faceView.snp.centerY)
make.width.lessThanOrEqualTo(174) make.width.lessThanOrEqualTo(174)
} }
richImageView.contentMode = .scaleAspectFit
self.contentView.addSubview(richImageView)
richImageView.snp.makeConstraints { make in
make.left.equalTo(nicknameLabel.snp.right).offset(2)
make.centerY.equalTo(faceView.snp.centerY)
}
hotNumLabel.font = .fus_themeMediumFont(15) hotNumLabel.font = .fus_themeMediumFont(15)
hotNumLabel.textColor = .fus_textColorRich() hotNumLabel.textColor = .fus_textColorRich()
hotNumLabel.text = "0" hotNumLabel.text = "0"
...@@ -382,6 +384,7 @@ class FUSPKControlContributionHotDataCell: UITableViewCell { ...@@ -382,6 +384,7 @@ class FUSPKControlContributionHotDataCell: UITableViewCell {
make.centerY.equalToSuperview() make.centerY.equalToSuperview()
} }
hotImageView.contentMode = .scaleAspectFit
self.contentView.addSubview(hotImageView) self.contentView.addSubview(hotImageView)
hotImageView.snp.makeConstraints { make in hotImageView.snp.makeConstraints { make in
make.right.equalTo(hotNumLabel.snp.left) make.right.equalTo(hotNumLabel.snp.left)
...@@ -413,30 +416,12 @@ class FUSPKControlContributionHotDataCell: UITableViewCell { ...@@ -413,30 +416,12 @@ class FUSPKControlContributionHotDataCell: UITableViewCell {
let isVip = model.privilege["richPower"] as? Int ?? 0 let isVip = model.privilege["richPower"] as? Int ?? 0
var level = model.level var level = model.level
self.nicknameLabel.textColor = .fus_textColorRich() if isVip == 0 {
if isVip == 1, let levelModel = FUSSwiftCacheDataShare.share.fus_levelModel(level: level) { level = -1
self.nicknameLabel.textColor = .init(hex: levelModel.color)
richImageView.setWebImageWithSubURLString(levelModel.icon)
richImageView.isHidden = false
nicknameLabel.snp.remakeConstraints { make in
make.left.equalTo(richImageView.snp.right).offset(6)
make.width.lessThanOrEqualTo(174)
make.centerY.equalToSuperview()
}
}else {
richImageView.isHidden = true
level = 0
nicknameLabel.snp.remakeConstraints { make in
make.left.equalTo(faceView.snp.right).offset(8)
make.width.lessThanOrEqualTo(174)
make.centerY.equalToSuperview()
}
} }
nicknameLabel.layoutIfNeeded()
self.faceView.fus_setupIcon(withFacePath: model.face, level: level) self.richImageView.image = .fus_image(withLevel: level)
self.faceView.setWebImageWithSubURLString(model.face)
self.nicknameLabel.text = model.nickname self.nicknameLabel.text = model.nickname
self.hotNumLabel.text = "\(model.total)" self.hotNumLabel.text = "\(model.total)"
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/Cell/FUSPKUserContributionLogCell.swift
...@@ -125,22 +125,22 @@ class FUSPKUserContributionLogCell: UITableViewCell { ...@@ -125,22 +125,22 @@ class FUSPKUserContributionLogCell: UITableViewCell {
firstBloodImageView.isHidden = true firstBloodImageView.isHidden = true
bgView.addSubview(firstBloodImageView) bgView.addSubview(firstBloodImageView)
firstBloodImageView.snp.makeConstraints { make in firstBloodImageView.snp.makeConstraints { make in
make.right.equalTo(-12) make.right.equalTo(plusLabel.snp.left).offset(-4)
make.bottom.equalTo(-6) make.centerY.equalTo(plusLabel.snp.centerY)
} }
eventDescLabel.font = .fus_themeFont(15) eventDescLabel.font = .fus_themeFont(13)
eventDescLabel.textColor = .white // eventDescLabel.textColor = .white
bgView.addSubview(eventDescLabel) bgView.addSubview(eventDescLabel)
eventDescLabel.snp.makeConstraints { make in eventDescLabel.snp.makeConstraints { make in
make.left.equalTo(13) make.left.equalTo(13)
make.bottom.equalTo(-6) make.bottom.equalTo(-8)
} }
bgView.addSubview(giftBombDescLabel) bgView.addSubview(giftBombDescLabel)
giftBombDescLabel.snp.makeConstraints { make in giftBombDescLabel.snp.makeConstraints { make in
make.right.equalTo(-12) make.right.equalTo(-12)
make.bottom.equalTo(-6) make.bottom.equalTo(-8)
} }
} }
...@@ -176,8 +176,8 @@ class FUSPKUserContributionLogCell: UITableViewCell { ...@@ -176,8 +176,8 @@ class FUSPKUserContributionLogCell: UITableViewCell {
} }
make.append(.fus_localString("礼物暴击")) make.append(.fus_localString("礼物暴击"))
make.append(" ") make.append(" ")
make.append(model.multiple + "x").textColor(.yellow) make.append(model.multiple + "x").textColor(.init(hex: "#FD9E08"))
make.font(.fus_themeFont(15)).textColor(.fus_textColorRich()) make.font(.fus_themeFont(13)).textColor(.fus_textColorRich())
}) })
} }
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPKNew/FUSView/FUSPKControlView/FUSPKControlContributionView.swift
...@@ -666,6 +666,8 @@ extension FUSVSIndexDevoteUserModel { ...@@ -666,6 +666,8 @@ extension FUSVSIndexDevoteUserModel {
model.favorType = json["favorType"].intValue model.favorType = json["favorType"].intValue
model.favorName = json["favorName"].stringValue model.favorName = json["favorName"].stringValue
model.inVip = json["inVip"].intValue model.inVip = json["inVip"].intValue
model.multiple = json["multiple"].stringValue
model.extraShow = json["extraShow"].intValue
return model as! Self return model as! Self
} }
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPunishment/FUSLiveReleasePunishmentView.m
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
self.punishTitleLabel = [[UILabel alloc] init]; self.punishTitleLabel = [[UILabel alloc] init];
self.punishTitleLabel.text = [NSString fus_localString:@"惩罚"]; self.punishTitleLabel.text = [NSString fus_localString:@"惩罚"];
self.punishTitleLabel.font = [UIFont fus_themeFont:10]; self.punishTitleLabel.font = [UIFont fus_themeFont:10];
self.punishTitleLabel.textColor = [UIColor fus_textColorRich]; self.punishTitleLabel.textColor = [UIColor whiteColor];
// self.punishTitleLabel.userInteractionEnabled = YES; // self.punishTitleLabel.userInteractionEnabled = YES;
[self.progressView addSubview:self.punishTitleLabel]; [self.progressView addSubview:self.punishTitleLabel];
[self.punishTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { [self.punishTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartContentLiveActivityView.swift
...@@ -80,6 +80,9 @@ class FUSLiveStartContentLiveActivityView: UIView { ...@@ -80,6 +80,9 @@ class FUSLiveStartContentLiveActivityView: UIView {
self?.jumpUrl = publicizeConfig["jumpUrl"] as? String self?.jumpUrl = publicizeConfig["jumpUrl"] as? String
} }
else {
self?.isHidden = true
}
} failure: { msg, code in } failure: { msg, code in
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment