Skip to content

pidan / FuSiLive

Go to a project
Commit 62ee5acf by ludi
Options

修复两个bug

parent 8c39d5f4
Inline Side-by-side
Showing with 46 additions and 45 deletions
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 = 202506260034; CURRENT_PROJECT_VERSION = 202506260035;
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 = 202506260034; CURRENT_PROJECT_VERSION = 202506260035;
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/View/FunctionView/FUSLiveFunctionView.m
...@@ -2450,7 +2450,7 @@ BDAlphaPlayerMetalViewDelegate ...@@ -2450,7 +2450,7 @@ BDAlphaPlayerMetalViewDelegate
self.treasureBoxListIcon.hidden = YES; self.treasureBoxListIcon.hidden = YES;
[[self fus_viewWithLayer:FUSLiveFunctionLayerFloatButtons] addSubview:self.treasureBoxListIcon]; [[self fus_viewWithLayer:FUSLiveFunctionLayerFloatButtons] addSubview:self.treasureBoxListIcon];
// [self fus_updateTreasureBoxListIconType:1]; [self fus_updateTreasureBoxListIconType:1];
__weak typeof(self) weakSelf = self; __weak typeof(self) weakSelf = self;
self.treasureBoxListIcon.clickLiveTreasureBoxListIconViewHandler = ^(FUSTreasureBoxInfoModel *treasureBoxModel, BOOL isAutoShow) { self.treasureBoxListIcon.clickLiveTreasureBoxListIconViewHandler = ^(FUSTreasureBoxInfoModel *treasureBoxModel, BOOL isAutoShow) {
...@@ -2555,6 +2555,7 @@ BDAlphaPlayerMetalViewDelegate ...@@ -2555,6 +2555,7 @@ BDAlphaPlayerMetalViewDelegate
[self.treasureBoxListIcon fus_updateTreasureBoxList:^(BOOL succeed) { [self.treasureBoxListIcon fus_updateTreasureBoxList:^(BOOL succeed) {
weakSelf.treasureBoxListIcon.hidden = weakSelf.treasureBoxListIcon.currentModel == nil; weakSelf.treasureBoxListIcon.hidden = weakSelf.treasureBoxListIcon.currentModel == nil;
[weakSelf fus_reloadUIWithKeyboardSetPart];
}]; }];
} }
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PK/FUSPunishment/FUSLivePunishListCell.m
...@@ -136,6 +136,7 @@ ...@@ -136,6 +136,7 @@
make.left.equalTo(self.titleLabel.mas_left); make.left.equalTo(self.titleLabel.mas_left);
make.top.equalTo(self.releaseConditionLabel.mas_bottom).offset(8); make.top.equalTo(self.releaseConditionLabel.mas_bottom).offset(8);
make.size.mas_offset(CGSizeMake(54, 54)); make.size.mas_offset(CGSizeMake(54, 54));
make.bottom.offset(-10);
}]; }];
self.releaseGiftImageView = [[UIImageView alloc] init]; self.releaseGiftImageView = [[UIImageView alloc] init];
...@@ -158,45 +159,47 @@ ...@@ -158,45 +159,47 @@
make.left.right.offset(0); make.left.right.offset(0);
}]; }];
//进度条不限制长度，让去解救的按钮宽度来决定它的长度 // 新版本不需要
self.releaseProgressView = [[UIProgressView alloc] initWithProgressViewStyle:UIProgressViewStyleDefault];
self.releaseProgressView.trackTintColor = [[UIColor blackColor] colorWithAlphaComponent:0.2]; // //进度条不限制长度，让去解救的按钮宽度来决定它的长度
self.releaseProgressView.progressTintColor = [UIColor fus_themeColor]; // self.releaseProgressView = [[UIProgressView alloc] initWithProgressViewStyle:UIProgressViewStyleDefault];
self.releaseProgressView.frame = CGRectMake(0, 0, UIView.fus_screenW - 15*2 - 14 - 68, 4); // self.releaseProgressView.trackTintColor = [[UIColor blackColor] colorWithAlphaComponent:0.2];
[bgView addSubview:self.releaseProgressView]; // self.releaseProgressView.progressTintColor = [UIColor fus_themeColor];
[self.releaseProgressView mas_makeConstraints:^(MASConstraintMaker *make) { // self.releaseProgressView.frame = CGRectMake(0, 0, UIView.fus_screenW - 15*2 - 14 - 68, 4);
make.left.equalTo(self.titleLabel.mas_left); // [bgView addSubview:self.releaseProgressView];
make.top.equalTo(releaseBgView.mas_bottom).offset(14); // [self.releaseProgressView mas_makeConstraints:^(MASConstraintMaker *make) {
make.height.offset(4); // make.left.equalTo(self.titleLabel.mas_left);
make.bottom.offset(-17); // make.top.equalTo(releaseBgView.mas_bottom).offset(14);
}]; // make.height.offset(4);
// make.bottom.offset(-17);
self.releaseGiftCompletedNumLabel = [[UILabel alloc] init]; // }];
self.releaseGiftCompletedNumLabel.font = [UIFont fus_themeFont:12]; //
[bgView addSubview:self.releaseGiftCompletedNumLabel]; // self.releaseGiftCompletedNumLabel = [[UILabel alloc] init];
[self.releaseGiftCompletedNumLabel mas_makeConstraints:^(MASConstraintMaker *make) { // self.releaseGiftCompletedNumLabel.font = [UIFont fus_themeFont:12];
make.right.equalTo(self.releaseProgressView.mas_right); // [bgView addSubview:self.releaseGiftCompletedNumLabel];
make.bottom.equalTo(self.releaseProgressView.mas_top).offset(-5); // [self.releaseGiftCompletedNumLabel mas_makeConstraints:^(MASConstraintMaker *make) {
}]; // make.right.equalTo(self.releaseProgressView.mas_right);
// make.bottom.equalTo(self.releaseProgressView.mas_top).offset(-5);
self.gotoReleaseBtn = [UIButton buttonWithType:UIButtonTypeCustom]; // }];
self.gotoReleaseBtn.layer.cornerRadius = 24/2.0; //
self.gotoReleaseBtn.layer.masksToBounds = YES; // self.gotoReleaseBtn = [UIButton buttonWithType:UIButtonTypeCustom];
self.gotoReleaseBtn.backgroundColor = [UIColor fus_themeColor]; // self.gotoReleaseBtn.layer.cornerRadius = 24/2.0;
[self.gotoReleaseBtn setTitle:[NSString fus_versionLocalString:@"去解救"] forState:UIControlStateNormal]; // self.gotoReleaseBtn.layer.masksToBounds = YES;
[self.gotoReleaseBtn setTitleColor:[UIColor colorWithHex:@"#22222B"] forState:UIControlStateNormal]; // self.gotoReleaseBtn.backgroundColor = [UIColor fus_themeColor];
self.gotoReleaseBtn.titleLabel.font = [UIFont fus_themeFont:11]; // [self.gotoReleaseBtn setTitle:[NSString fus_versionLocalString:@"去解救"] forState:UIControlStateNormal];
[self.gotoReleaseBtn.titleLabel sizeToFit]; // [self.gotoReleaseBtn setTitleColor:[UIColor colorWithHex:@"#22222B"] forState:UIControlStateNormal];
[bgView addSubview:self.gotoReleaseBtn]; // self.gotoReleaseBtn.titleLabel.font = [UIFont fus_themeFont:11];
[self.gotoReleaseBtn mas_makeConstraints:^(MASConstraintMaker *make) { // [self.gotoReleaseBtn.titleLabel sizeToFit];
make.right.offset(-11); // [bgView addSubview:self.gotoReleaseBtn];
make.left.equalTo(self.releaseProgressView.mas_right).offset(10); // [self.gotoReleaseBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.offset(self.gotoReleaseBtn.titleLabel.width + 14); // make.right.offset(-11);
make.height.offset(24); // make.left.equalTo(self.releaseProgressView.mas_right).offset(10);
make.bottom.equalTo(self.releaseProgressView.mas_bottom); // make.width.offset(self.gotoReleaseBtn.titleLabel.width + 14);
}]; // make.height.offset(24);
// make.bottom.equalTo(self.releaseProgressView.mas_bottom);
[self.gotoReleaseBtn addTarget:self action:@selector(gotoReleaseBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside]; // }];
//
// [self.gotoReleaseBtn addTarget:self action:@selector(gotoReleaseBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside];
} }
...@@ -263,9 +266,6 @@ ...@@ -263,9 +266,6 @@
[self fus_updateProgressLabelWithModel:model]; [self fus_updateProgressLabelWithModel:model];
// 不用去解救
self.gotoReleaseBtn.hidden = YES;
} }
/// 更新进度描述 /// 更新进度描述
-(void)fus_updateProgressLabelWithModel:(FUSLiveRoomPunishListModel *)model{ -(void)fus_updateProgressLabelWithModel:(FUSLiveRoomPunishListModel *)model{
......
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