From 8d3098d7638efe77ea5aaaaafcb2944ace78e58c Mon Sep 17 00:00:00 2001 From: chenshuanglin <1273934588@qq.com> Date: Wed, 22 Mar 2023 10:08:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E9=94=AE=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E9=A1=B5UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xplan-ios/Main/Login/View/LoginViewController.m | 8 ++++---- .../Mine/View/Guild/View/SubViews/XPGuildHeaderView.m | 2 +- .../Mine/View/Noble/View/SubViews/XPNobleDiscountView.m | 2 +- .../View/NewUserRecharge/XPNewUserGreetRoomAlertView.m | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/xplan-ios/Main/Login/View/LoginViewController.m b/xplan-ios/Main/Login/View/LoginViewController.m index 8d9d3a31..ed460ca8 100644 --- a/xplan-ios/Main/Login/View/LoginViewController.m +++ b/xplan-ios/Main/Login/View/LoginViewController.m @@ -334,7 +334,7 @@ typedef NS_ENUM(NSUInteger, XYLoginType) { CMModel.logBtnOriginRight = 52; CMModel.logBtnUsableBGColor = [ThemeColor appMainColor]; CMModel.logBtnText = @"本机号码一键登录"; - CMModel.logBtnTextColor = UIColor.whiteColor; + CMModel.logBtnTextColor = [ThemeColor mainTextColor]; CMModel.logBtnTextFont = [UIFont systemFontOfSize:18 weight:UIFontWeightMedium]; CMModel.numberOffsetTopY = 170; @@ -351,10 +351,10 @@ typedef NS_ENUM(NSUInteger, XYLoginType) { CMModel.privacyState = YES; } - CMModel.privacyColor = [ThemeColor mainTextColor]; - CMModel.appPrivacyText = @"同意《默认》，并授权魔力获取本机号码。"; + CMModel.privacyColor = [ThemeColor secondTextColor]; + CMModel.appPrivacyText = [NSString stringWithFormat:@"同意《默认》，并授权%@获取本机号码。",AppName]; CMModel.privacyFont = [UIFont systemFontOfSize:12]; - CMModel.protocolColor = [ThemeColor appMainColor]; + CMModel.protocolColor = [ThemeColor mainTextColor]; CMModel.appPrivacyOriginBottomMargin = 30; CMModel.backActionBlock = ^{ //点击了返回按钮 diff --git a/xplan-ios/Main/Mine/View/Guild/View/SubViews/XPGuildHeaderView.m b/xplan-ios/Main/Mine/View/Guild/View/SubViews/XPGuildHeaderView.m index 39c05078..fcfeea95 100644 --- a/xplan-ios/Main/Mine/View/Guild/View/SubViews/XPGuildHeaderView.m +++ b/xplan-ios/Main/Mine/View/Guild/View/SubViews/XPGuildHeaderView.m @@ -30,7 +30,7 @@ @property (nonatomic,strong) NetImageView *avatarImageView; ///公会名称 @property (nonatomic,strong) UILabel *clanNameLabel; -///魔力id +///id @property (nonatomic,strong) UILabel *daeIdLabel; ///房间数量 @property (nonatomic,strong) UILabel *roomNumberLabel; diff --git a/xplan-ios/Main/Mine/View/Noble/View/SubViews/XPNobleDiscountView.m b/xplan-ios/Main/Mine/View/Noble/View/SubViews/XPNobleDiscountView.m index 1cbcea1c..8b279d94 100644 --- a/xplan-ios/Main/Mine/View/Noble/View/SubViews/XPNobleDiscountView.m +++ b/xplan-ios/Main/Mine/View/Noble/View/SubViews/XPNobleDiscountView.m @@ -121,7 +121,7 @@ self.discountLabel.hidden = YES; self.experienceButton.hidden = YES; self.openStackView.hidden = NO; - NSString *title = [NSString stringWithFormat:@"%.0f立刻成为魔力贵族", _info.money]; + NSString *title = [NSString stringWithFormat:@"%.0f立刻成为%@贵族", _info.money, AppName]; self.coinLabe.text = title; _backImagView.image = [UIImage imageNamed:@"noble_open_btn_bg"]; } diff --git a/xplan-ios/Main/Tabbar/View/NewUserRecharge/XPNewUserGreetRoomAlertView.m b/xplan-ios/Main/Tabbar/View/NewUserRecharge/XPNewUserGreetRoomAlertView.m index ae8f7bd5..934c1d49 100644 --- a/xplan-ios/Main/Tabbar/View/NewUserRecharge/XPNewUserGreetRoomAlertView.m +++ b/xplan-ios/Main/Tabbar/View/NewUserRecharge/XPNewUserGreetRoomAlertView.m @@ -232,7 +232,7 @@ nick = [nick substringToIndex:6]; } [self.nickButton setTitle:nick forState:UIControlStateNormal]; - self.greetLabel.text = _greetInfo.sayHelloMsg.length > 0 ? _greetInfo.sayHelloMsg : @"欢迎来到魔力，Ta已经等待你很久啦，快来一起玩吧~"; + self.greetLabel.text = _greetInfo.sayHelloMsg.length > 0 ? _greetInfo.sayHelloMsg : [NSString stringWithFormat:@"欢迎来到%@，Ta已经等待你很久啦，快来一起玩吧~",AppName]; self.genderImageView.image = greetInfo.gender == 1 ? [UIImage imageNamed:@"common_male"] : [UIImage imageNamed:@"common_female"]; if (greetInfo.voiceCard.propVals.count) { self.voiceShowBgImage.hidden = NO;