From 736ee054b87d4188326824bb56404ee35c8b87bc Mon Sep 17 00:00:00 2001 From: fengshuo <963787902@qq.com> Date: Tue, 3 Jan 2023 11:28:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E6=92=AD=E8=AF=84=E7=BA=A7=E6=80=BB?= =?UTF-8?q?=E6=98=AF=E6=98=BE=E7=A4=BAs=E7=BA=A7=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SubViews/AnchorLevel/AnchorLevelProgressView.m | 14 ++++++++++++-- .../View/SubViews/AnchorLevel/AnchorLevelView.m | 1 - xplan-ios/Main/Mine/View/SubViews/XPMineHeadView.m | 1 + 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/xplan-ios/Main/Mine/View/SubViews/AnchorLevel/AnchorLevelProgressView.m b/xplan-ios/Main/Mine/View/SubViews/AnchorLevel/AnchorLevelProgressView.m index 4ecdb67f..7c6b165c 100644 --- a/xplan-ios/Main/Mine/View/SubViews/AnchorLevel/AnchorLevelProgressView.m +++ b/xplan-ios/Main/Mine/View/SubViews/AnchorLevel/AnchorLevelProgressView.m @@ -101,7 +101,12 @@ NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] initWithString:task attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:11], NSForegroundColorAttributeName:[ThemeColor colorWithHexString:@"#8A8CAB"]}]; [attribute addAttribute:NSForegroundColorAttributeName value:[ThemeColor colorWithHexString:@"#F86099"] range:[task rangeOfString:diamond]]; self.taskLabel.attributedText = attribute; - self.titleLabel.text = [NSString stringWithFormat:@"还差%ld钻可完成", (_levelInfo.targetDiamond - _levelInfo.currentDiamond)]; + if (_levelInfo.currentDiamond > _levelInfo.targetDiamond) { + self.titleLabel.text = @"已完成"; + } else { + self.titleLabel.text = [NSString stringWithFormat:@"还差%ld钻可完成", (_levelInfo.targetDiamond - _levelInfo.currentDiamond)]; + } + CGFloat itemWidth = ((CGFloat)_levelInfo.currentDiamond / (CGFloat)_levelInfo.targetDiamond)* 260; [self.progressView mas_updateConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(itemWidth); @@ -112,7 +117,12 @@ NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] initWithString:task attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:11], NSForegroundColorAttributeName:[ThemeColor colorWithHexString:@"#8A8CAB"]}]; [attribute addAttribute:NSForegroundColorAttributeName value:[ThemeColor colorWithHexString:@"#F86099"] range:[task rangeOfString:diamond]]; self.taskLabel.attributedText = attribute; - self.titleLabel.text = [NSString stringWithFormat:@"还差%.0f%@可完成", (_levelInfo.targetReply - _levelInfo.currentReply) * 100, @"%"]; + if (_levelInfo.currentReply > _levelInfo.targetReply) { + self.titleLabel.text = @"已完成"; + } else { + self.titleLabel.text = [NSString stringWithFormat:@"还差%.0f%@可完成", (_levelInfo.targetReply - _levelInfo.currentReply) * 100, @"%"]; + } + CGFloat itemWidth = _levelInfo.currentReply * 260; [self.progressView mas_updateConstraints:^(MASConstraintMaker *make) { diff --git a/xplan-ios/Main/Mine/View/SubViews/AnchorLevel/AnchorLevelView.m b/xplan-ios/Main/Mine/View/SubViews/AnchorLevel/AnchorLevelView.m index d02d9d30..dc1547c1 100644 --- a/xplan-ios/Main/Mine/View/SubViews/AnchorLevel/AnchorLevelView.m +++ b/xplan-ios/Main/Mine/View/SubViews/AnchorLevel/AnchorLevelView.m @@ -120,7 +120,6 @@ - (void)setLevelInfo:(AnchorLevelModel *)levelInfo { _levelInfo = levelInfo; if (_levelInfo) { - _levelInfo.grade = @"S"; self.diamondView.levelInfo = _levelInfo; self.replyView.levelInfo = _levelInfo; self.timeView.nextRemaining = _levelInfo.nextRemaining; diff --git a/xplan-ios/Main/Mine/View/SubViews/XPMineHeadView.m b/xplan-ios/Main/Mine/View/SubViews/XPMineHeadView.m index 0b68b948..5a34d6ea 100644 --- a/xplan-ios/Main/Mine/View/SubViews/XPMineHeadView.m +++ b/xplan-ios/Main/Mine/View/SubViews/XPMineHeadView.m @@ -752,6 +752,7 @@ [_anchorLevel setTitleColor:[ThemeColor mainTextColor] forState:UIControlStateNormal]; [_anchorLevel setTitleEdgeInsets:UIEdgeInsetsMake(0, 25, 0, 0)]; [_anchorLevel addTarget:self action:@selector(anchorLevelAction:) forControlEvents:UIControlEventTouchUpInside]; + _anchorLevel.hidden = YES; } return _anchorLevel; }