From 3c62ef569311b5cb978e0fc5b0141c0b1f38a07c Mon Sep 17 00:00:00 2001 From: liyuhua <15626451870@163.com> Date: Thu, 30 May 2024 11:16:29 +0800 Subject: [PATCH] =?UTF-8?q?=E9=92=B1=E5=8C=85=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../YMMine/View/IncomeRecord/XPExchangeDiamondsView.m | 8 ++++---- YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordVC.m | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsView.m b/YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsView.m index 8dede07c..d334c06a 100644 --- a/YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsView.m +++ b/YuMi/Modules/YMMine/View/IncomeRecord/XPExchangeDiamondsView.m @@ -228,9 +228,9 @@ -(void)setModel:(XPExchangeDiamondsModel *)model{ _model = model; if(self.type == IncomeRecord_Gold){ - _titleNumView.text = [NSString stringWithFormat:YMLocalizedString(@"XPExchangeDiamondsItemView0"),@(_model.golds)]; + _titleNumView.text = [NSString stringWithFormat:YMLocalizedString(@"XPExchangeDiamondsItemView0"),@(_model.diamonds)]; NSString *diamondNum = [NSString stringWithFormat:@"%ld",_model.minDiamonds];; - NSMutableAttributedString *attStr = [[NSMutableAttributedString alloc]initWithString:diamondNum attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:16 weight:UIFontWeightMedium],NSForegroundColorAttributeName:UIColorFromRGB(0xACB8D9)}]; + NSMutableAttributedString *attStr = [[NSMutableAttributedString alloc]initWithString:diamondNum attributes:@{NSFontAttributeName:kFontBold(15),NSForegroundColorAttributeName:[UIColor colorWithWhite:1 alpha:0.6]}]; _numberView.attributedPlaceholder = attStr; UIImage *image = [UIImage imageNamed:@"ms_exchange_coin_icon"]; [_iconView setImage:image forState:UIControlStateNormal]; @@ -240,9 +240,9 @@ }else{ NSString *goldNum = [NSString stringWithFormat:@"%.0f",ceilf(_model.minDiamonds / _model.rate)]; - NSMutableAttributedString *attStr = [[NSMutableAttributedString alloc]initWithString:goldNum attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:16 weight:UIFontWeightMedium],NSForegroundColorAttributeName:UIColorFromRGB(0xACB8D9)}]; + NSMutableAttributedString *attStr = [[NSMutableAttributedString alloc]initWithString:goldNum attributes:@{NSFontAttributeName:kFontBold(15),NSForegroundColorAttributeName:[UIColor colorWithWhite:1 alpha:0.6]}]; _numberView.attributedPlaceholder = attStr; - _titleNumView.text = [NSString stringWithFormat:YMLocalizedString(@"XPExchangeDiamondsItemView1"),_model.diamonds]; + _titleNumView.text = [NSString stringWithFormat:YMLocalizedString(@"XPExchangeDiamondsItemView1"),_model.golds]; UIImage *image = [UIImage imageNamed:@"exchange_new_diamonds_icon"]; [_iconView setImage:image forState:UIControlStateNormal]; } diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordVC.m b/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordVC.m index bedb3783..c6f3adad 100644 --- a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordVC.m +++ b/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordVC.m @@ -123,8 +123,8 @@ self.recordModel.golds = self.recordModel.golds - gold.doubleValue; NSString *diamondNum = [NSString stringWithFormat:@"%.0f",self.recordModel.diamonds]; NSString *goldNum = [NSString stringWithFormat:@"%.2f",self.recordModel.golds]; - self.diamondView.number = diamondNum; - self.goldView.number = goldNum; + self.diamondView.number = goldNum; + self.goldView.number = diamondNum; } #pragma mark - XPIncomeRecordProtocol - (void)requestQueryWithRoomTypeFail{ @@ -140,8 +140,8 @@ -(void)getRecordIncomeSuccess:(XPIncomeRecordModel *)model{ [self hideHUD]; self.recordModel = model; - self.diamondView.number = @(model.diamonds).stringValue; - self.goldView.number = [NSString stringWithFormat:@"%.2f",model.golds]; + self.goldView.number = @(model.diamonds).stringValue; + self.diamondView.number = [NSString stringWithFormat:@"%.2f",model.golds]; // NSString * myUid = [AccountInfoStorage instance].getUid; // if(![self.clanInfo.clan.elderUid isEqualToString:myUid]){ // self.goldView.isClanPresident = !self.recordModel.hasGoldExchangeAuth;