Skip to content

pidan / FuSiLive

Go to a project
Commit 12a78d60 by ludi
Options

修复一系列bug

parent 734c4258
Expand all
Inline Side-by-side
Showing with 61 additions and 16 deletions
DevelopmentPods/FUSCommon/FUSCommon/Assets/Asset.xcassets/Setting/socialPlat_line_dark.imageset/Contents.json
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"scale" : "2x" "scale" : "2x"
}, },
{ {
"filename" : "socialPlat_line_dark@3x.png", "filename" : "20250411-160731.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "3x" "scale" : "3x"
} }
......
DevelopmentPods/FUSCommon/FUSCommon/Assets/Asset.xcassets/Setting/socialPlat_twitter_dark.imageset/Contents.json
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"scale" : "2x" "scale" : "2x"
}, },
{ {
"filename" : "socialPlat_twitter_dark@3x.png", "filename" : "20250411-160736.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "3x" "scale" : "3x"
} }
......
FuSiLive.xcodeproj/project.pbxproj
...@@ -485,7 +485,7 @@ ...@@ -485,7 +485,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements; CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 20250402113546; CURRENT_PROJECT_VERSION = 20250402113547;
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 6GG26BHUMC; DEVELOPMENT_TEAM = 6GG26BHUMC;
ENABLE_ON_DEMAND_RESOURCES = NO; ENABLE_ON_DEMAND_RESOURCES = NO;
...@@ -753,7 +753,7 @@ ...@@ -753,7 +753,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements; CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 20250402113546; CURRENT_PROJECT_VERSION = 20250402113547;
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/HomePage/View/FUSHomeNaviView.m
...@@ -185,7 +185,7 @@ ...@@ -185,7 +185,7 @@
imageView.tag = 1; imageView.tag = 1;
imageView.image = nil; imageView.image = nil;
imageView.animationImages = images; imageView.animationImages = images;
imageView.animationDuration = 2; imageView.animationDuration = 1.5;
if (self.state == state) { if (self.state == state) {
[imageView startAnimating]; [imageView startAnimating];
} }
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/Cell/FUSInviteFunctionStepTwoContentView.swift
...@@ -234,7 +234,8 @@ class FUSInviteFunctionStepTwoContentView: FUSInviteFunctionStepContentBaseView ...@@ -234,7 +234,8 @@ class FUSInviteFunctionStepTwoContentView: FUSInviteFunctionStepContentBaseView
} else { } else {
self.vipLevelImageView.image = .fus_image(withLevel: 0) self.vipLevelImageView.isHidden = true
// self.vipLevelImageView.image = .fus_image(withLevel: 0)
// 如果服务器配置了0级，则使用0级的颜色 // 如果服务器配置了0级，则使用0级的颜色
// let levelmodel = FUSSwiftCacheDataShare.share.fus_levelModel(level: 0) // let levelmodel = FUSSwiftCacheDataShare.share.fus_levelModel(level: 0)
// if let color = levelmodel?.color, // if let color = levelmodel?.color,
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/Cell/FUSInviteRewardInviteFunctionHeader.swift
...@@ -71,7 +71,7 @@ class FUSInviteRewardInviteFunctionHeader: FUSBaseView { ...@@ -71,7 +71,7 @@ class FUSInviteRewardInviteFunctionHeader: FUSBaseView {
// MARK: 这个东西有关于layout的报错，其实是没问题的，报错的原因是因为本身FFInviteRewardInviteFunctionHeader一开始的width为0，然后这里又规范了其宽度，所以冲突了，但是显示的时候，给FFInviteRewardInviteFunctionHeader指定了对的宽度后，就没问题了 // MARK: 这个东西有关于layout的报错，其实是没问题的，报错的原因是因为本身FFInviteRewardInviteFunctionHeader一开始的width为0，然后这里又规范了其宽度，所以冲突了，但是显示的时候，给FFInviteRewardInviteFunctionHeader指定了对的宽度后，就没问题了
emissaryLineImageView.isHidden = true emissaryLineImageView.isHidden = true
emissaryLineImageView.contentMode = .scaleAspectFit emissaryLineImageView.contentMode = .left
self.addSubview(emissaryLineImageView) self.addSubview(emissaryLineImageView)
emissaryLineImageView.snp.makeConstraints { make in emissaryLineImageView.snp.makeConstraints { make in
make.left.equalTo(titleLabel.snp.right).offset(7) make.left.equalTo(titleLabel.snp.right).offset(7)
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/Cell/FUSInviteRewardMyClansmanCell.swift
...@@ -53,6 +53,7 @@ class FUSInviteRewardMyClansmanCell: UITableViewCell { ...@@ -53,6 +53,7 @@ class FUSInviteRewardMyClansmanCell: UITableViewCell {
avatarView.layer.cornerRadius = 24 avatarView.layer.cornerRadius = 24
avatarView.layer.masksToBounds = true avatarView.layer.masksToBounds = true
avatarView.isUserInteractionEnabled = true
bgView.addSubview(avatarView) bgView.addSubview(avatarView)
avatarView.snp.makeConstraints { make in avatarView.snp.makeConstraints { make in
make.left.equalTo(14) make.left.equalTo(14)
...@@ -134,7 +135,8 @@ class FUSInviteRewardMyClansmanCell: UITableViewCell { ...@@ -134,7 +135,8 @@ class FUSInviteRewardMyClansmanCell: UITableViewCell {
// } // }
}else { }else {
self.vipLevelImageView.image = .fus_image(withLevel: 0) self.vipLevelImageView.isHidden = true
// self.vipLevelImageView.image = .fus_image(withLevel: 0)
// 如果服务器配置了0级，则使用0级的颜色 // 如果服务器配置了0级，则使用0级的颜色
// let levelmodel = FUSSwiftCacheDataShare.share.fus_levelModel(level: 0) // let levelmodel = FUSSwiftCacheDataShare.share.fus_levelModel(level: 0)
// if let color = levelmodel?.color, // if let color = levelmodel?.color,
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/Cell/FUSInviteRewardMyHeaderCell.swift
...@@ -52,7 +52,7 @@ class FUSInviteRewardMyHeaderCell: UITableViewCell { ...@@ -52,7 +52,7 @@ class FUSInviteRewardMyHeaderCell: UITableViewCell {
let charBgBtn = UIButton(type: .custom) let charBgBtn = UIButton(type: .custom)
let avatarView: UIImageView = .init(frame: CGRectMake(0, 0, 48, 48)) let avatarView: UIImageView = .init(frame: CGRectMake(0, 0, 48, 48))
let nickNameLabel = UILabel() let nickNameLabel = UILabel()
let vipLevelImageView : UIImageView = .init() let vipLevelBtn = UIButton(type: .custom)
let descLabel = UILabel() let descLabel = UILabel()
let emissarySignBtn = UIButton(type: .custom) let emissarySignBtn = UIButton(type: .custom)
let myEmissaryCodeView = FUSInviteRewardMyHeaderTemplateView() let myEmissaryCodeView = FUSInviteRewardMyHeaderTemplateView()
...@@ -99,16 +99,17 @@ class FUSInviteRewardMyHeaderCell: UITableViewCell { ...@@ -99,16 +99,17 @@ class FUSInviteRewardMyHeaderCell: UITableViewCell {
make.centerY.equalToSuperview() make.centerY.equalToSuperview()
} }
nickNameCenterView.addSubview(vipLevelImageView) charBgBtn.addSubview(vipLevelBtn)
nickNameLabel.font = .fus_themeFont(15) nickNameLabel.font = .fus_themeFont(15)
nickNameLabel.textColor = .fus_textColorMedium() nickNameLabel.textColor = .fus_textColorMedium()
nickNameCenterView.addSubview(nickNameLabel) nickNameCenterView.addSubview(nickNameLabel)
vipLevelImageView.snp.makeConstraints { make in vipLevelBtn.snp.makeConstraints { make in
make.left.equalTo(nickNameLabel.snp.right).offset(2) make.left.equalTo(nickNameLabel.snp.right).offset(2)
// make.size.equalTo(CGSizeMake(32, 13)) // make.size.equalTo(CGSizeMake(32, 13))
make.centerY.equalTo(nickNameLabel.snp.centerY) make.centerY.equalTo(nickNameLabel.snp.centerY)
make.height.equalTo(14) make.height.equalTo(14)
make.width.greaterThanOrEqualTo(20)
} }
nickNameLabel.snp.makeConstraints { make in nickNameLabel.snp.makeConstraints { make in
make.top.equalToSuperview() make.top.equalToSuperview()
...@@ -188,6 +189,12 @@ class FUSInviteRewardMyHeaderCell: UITableViewCell { ...@@ -188,6 +189,12 @@ class FUSInviteRewardMyHeaderCell: UITableViewCell {
self?.clickedHandler?(.charater) self?.clickedHandler?(.charater)
}).disposed(by: disposeBag) }).disposed(by: disposeBag)
vipLevelBtn.rx.tap.subscribe(onNext: {[weak self] in
if self?.vipLevelBtn.tag == 0 {
FUSRouter.userRouter().fus_pushToBuyVIPController(withAnimate: true)
}
})
.disposed(by: disposeBag)
} }
func fus_setup(model: FUSInviteDataMyselfGetInfoModel) { func fus_setup(model: FUSInviteDataMyselfGetInfoModel) {
...@@ -198,7 +205,9 @@ class FUSInviteRewardMyHeaderCell: UITableViewCell { ...@@ -198,7 +205,9 @@ class FUSInviteRewardMyHeaderCell: UITableViewCell {
if model.agentFactor.userInfo.userIsVip == 1 { if model.agentFactor.userInfo.userIsVip == 1 {
// self.avatarView.fus_setupIcon(withFacePath: model.agentFactor.userInfo.userFace, level: model.agentFactor.userInfo.userLevel) // self.avatarView.fus_setupIcon(withFacePath: model.agentFactor.userInfo.userFace, level: model.agentFactor.userInfo.userLevel)
self.vipLevelImageView.image = UIImage.fus_image(withLevel: model.agentFactor.userInfo.userLevel); let level = model.agentFactor.userInfo.userLevel
self.vipLevelBtn.setImage(UIImage.fus_image(withLevel: level), for: .normal)
self.vipLevelBtn.tag = level <= 0 ? 0 : 1
// let levelmodel = FUSSwiftCacheDataShare.share.fus_levelModel(level:model.agentFactor.userInfo.userLevel) // let levelmodel = FUSSwiftCacheDataShare.share.fus_levelModel(level:model.agentFactor.userInfo.userLevel)
// self.vipLevelImageView.isHidden = false // self.vipLevelImageView.isHidden = false
// self.vipLevelImageView.setWebImageWithSubURLString(levelmodel?.icon) // self.vipLevelImageView.setWebImageWithSubURLString(levelmodel?.icon)
...@@ -210,7 +219,8 @@ class FUSInviteRewardMyHeaderCell: UITableViewCell { ...@@ -210,7 +219,8 @@ class FUSInviteRewardMyHeaderCell: UITableViewCell {
// let levelmodel = FUSSwiftCacheDataShare.share.fus_levelModel(level:0) // let levelmodel = FUSSwiftCacheDataShare.share.fus_levelModel(level:0)
// self.avatarView.fus_setupIcon(withFacePath: model.agentFactor.userInfo.userFace, level:0) // self.avatarView.fus_setupIcon(withFacePath: model.agentFactor.userInfo.userFace, level:0)
self.vipLevelImageView.image = UIImage.fus_image(withLevel: 0); self.vipLevelBtn.setImage( UIImage.fus_image(withLevel: 0), for: .normal)
self.vipLevelBtn.tag = 0
// self.vipLevelImageView.isHidden = true // self.vipLevelImageView.isHidden = true
// if let nickNameColor = levelmodel?.color, // if let nickNameColor = levelmodel?.color,
// isValidString(nickNameColor) == false{ // isValidString(nickNameColor) == false{
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/View/FUSInviteEmissaryConditionAlertView.swift
...@@ -30,6 +30,7 @@ class FUSInviteEmissaryConditionAlertView: FUSBaseView { ...@@ -30,6 +30,7 @@ class FUSInviteEmissaryConditionAlertView: FUSBaseView {
let contentView = FUSPanGestureAlertView(frame: CGRectMake(0, 0, UIView.fus_screenW(), 335 + UIView.fus_SafeBottom())) let contentView = FUSPanGestureAlertView(frame: CGRectMake(0, 0, UIView.fus_screenW(), 335 + UIView.fus_SafeBottom()))
let avatarBtn = UIButton(type: .custom) let avatarBtn = UIButton(type: .custom)
let nickNameLabel = UILabel() let nickNameLabel = UILabel()
let vipLevelBtn = UIButton(type: .custom)
let emissaryConditionCountLable = UILabel() let emissaryConditionCountLable = UILabel()
let emissarySignBtn = UIButton(type: .custom) let emissarySignBtn = UIButton(type: .custom)
let emissaryConditionTitleLabel = UILabel() let emissaryConditionTitleLabel = UILabel()
...@@ -71,6 +72,8 @@ class FUSInviteEmissaryConditionAlertView: FUSBaseView { ...@@ -71,6 +72,8 @@ class FUSInviteEmissaryConditionAlertView: FUSBaseView {
make.centerY.equalTo(avatarBtn.snp.centerY) make.centerY.equalTo(avatarBtn.snp.centerY)
} }
contentView.addSubview(vipLevelBtn)
nickNameLabel.font = .fus_themeFont(15) nickNameLabel.font = .fus_themeFont(15)
nickNameLabel.textColor = .fus_textColorRich() nickNameLabel.textColor = .fus_textColorRich()
nickNameLabel.text = " " nickNameLabel.text = " "
...@@ -79,6 +82,13 @@ class FUSInviteEmissaryConditionAlertView: FUSBaseView { ...@@ -79,6 +82,13 @@ class FUSInviteEmissaryConditionAlertView: FUSBaseView {
make.left.top.equalToSuperview() make.left.top.equalToSuperview()
} }
vipLevelBtn.snp.makeConstraints { make in
make.left.equalTo(nickNameLabel.snp.right).offset(2)
make.centerY.equalTo(nickNameLabel.snp.centerY)
make.height.equalTo(14)
make.width.greaterThanOrEqualTo(20)
}
nickNameCenterView.addSubview(emissaryConditionCountLable) nickNameCenterView.addSubview(emissaryConditionCountLable)
emissaryConditionCountLable.snp.makeConstraints { make in emissaryConditionCountLable.snp.makeConstraints { make in
make.left.bottom.equalToSuperview() make.left.bottom.equalToSuperview()
...@@ -141,6 +151,19 @@ class FUSInviteEmissaryConditionAlertView: FUSBaseView { ...@@ -141,6 +151,19 @@ class FUSInviteEmissaryConditionAlertView: FUSBaseView {
self.emissaryConditionTitleLabel.text = agentFactor.agentTitle self.emissaryConditionTitleLabel.text = agentFactor.agentTitle
self.emissaryConditionContentLabel.text = agentFactor.agentContent self.emissaryConditionContentLabel.text = agentFactor.agentContent
//vip
let privilege = FUSSwiftCacheDataShare.share.userInfo.value?.privilege
let richPower = (privilege?["richPower"] as? Bool) ?? false
if richPower == true {
let level = FUSSwiftCacheDataShare.share.userInfo.value?.level.intValue ?? 0
self.vipLevelBtn.setImage(.fus_image(withLevel: level), for: .normal)
self.vipLevelBtn.tag = level == 0 ? 0 : 1
} else {
self.vipLevelBtn.setImage(.fus_image(withLevel: 0), for: .normal)
self.vipLevelBtn.tag = 0
}
var topConstain = emissaryConditionContentView.snp.top var topConstain = emissaryConditionContentView.snp.top
var conditionFulfilled: Int = 0 var conditionFulfilled: Int = 0
emissaryConditionContentView.removeAllSubviews() emissaryConditionContentView.removeAllSubviews()
...@@ -196,6 +219,14 @@ class FUSInviteEmissaryConditionAlertView: FUSBaseView { ...@@ -196,6 +219,14 @@ class FUSInviteEmissaryConditionAlertView: FUSBaseView {
bgBtn.rx.tap.subscribe(onNext: {[weak self] in bgBtn.rx.tap.subscribe(onNext: {[weak self] in
self?.fus_dismissWithAnimation() self?.fus_dismissWithAnimation()
}).disposed(by: disposeBag) }).disposed(by: disposeBag)
vipLevelBtn.rx.tap.subscribe(onNext: {[weak self] in
if self?.vipLevelBtn.tag == 0 {
self?.fus_dismissWithAnimation()
FUSRouter.userRouter().fus_pushToBuyVIPController(withAnimate: true)
}
})
.disposed(by: disposeBag)
} }
override func layoutSubviews() { override func layoutSubviews() {
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/View/FUSMyEmissaryQRCodeView.swift
...@@ -126,7 +126,8 @@ class FUSMyEmissaryQRCodeView: FUSBaseView { ...@@ -126,7 +126,8 @@ class FUSMyEmissaryQRCodeView: FUSBaseView {
} else { } else {
self.vipLevelImageView.image = .fus_image(withLevel: 0) self.vipLevelImageView.isHidden = true
// self.vipLevelImageView.image = .fus_image(withLevel: 0)
// 如果服务器配置了0级，则使用0级的颜色 // 如果服务器配置了0级，则使用0级的颜色
// let levelmodel = FUSSwiftCacheDataShare.share.fus_levelModel(level: 0) // let levelmodel = FUSSwiftCacheDataShare.share.fus_levelModel(level: 0)
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Setting/SocialBind/FUSSocialBindSettingViewController.m
...@@ -218,7 +218,7 @@ ...@@ -218,7 +218,7 @@
[weakSelf fus_doBindingThirdPartyWithIndex:3]; [weakSelf fus_doBindingThirdPartyWithIndex:3];
}; };
group.items = @[self.facebookItem, self.googleItem, self.appleItem, self.phoneItem, self.twitterItem]; group.items = @[self.facebookItem, self.googleItem, self.appleItem,self.lineItem, self.phoneItem, self.twitterItem];
[self.tableView.allGroups appendObject:group]; [self.tableView.allGroups appendObject:group];
[self fus_updateSoicials]; [self fus_updateSoicials];
...@@ -330,7 +330,7 @@ ...@@ -330,7 +330,7 @@
// weakSelf.isBindingThirdCount = NO; // weakSelf.isBindingThirdCount = NO;
// }]; // }];
[FUSLoadingView fus_showProgressViewWithMessage:@""]; [FUSLoadingView fus_showProgressViewWithMessage:@""];
[[FUSThirdAccountLoginHelper sharedInstanse] fus_loginWithPlatform:FUSSocializedPlatformLine facebookFromWeb:YES viewController:self loadingFinish:^{ [[FUSThirdAccountLoginHelper sharedInstanse] fus_loginWithPlatform:FUSSocializedPlatformLine facebookFromWeb:NO viewController:self loadingFinish:^{
} success:^(NSDictionary *infoDict) { } success:^(NSDictionary *infoDict) {
[FUSLoadingView fus_dismissProgressView]; [FUSLoadingView fus_dismissProgressView];
......
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