moliparty/peko-ios
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

部分简单转繁体

Browse Source
This commit is contained in:
liyuhua
2023-08-09 11:55:27 +08:00
parent 471b84dc7f
commit 7a1ffa871a
73 changed files with 722 additions and 567 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
YuMi/Modules/YMLogin/View/LoginBindPhoneViewController.m
View File

@@ -50,7 +50,7 @@
}
- (void)viewDidAppear:(BOOL)animated {
[self showErrorToast:@"第三方登录需绑定手机号喔~"];
[self showErrorToast:YMLocalizedString(@"LoginBindPhoneViewController0")];
}
- (void)setUpUI {

2
YuMi/Modules/YMLogin/View/LoginFullInfoViewController.m
View File

@@ -426,7 +426,7 @@ UIKIT_EXTERN NSString * kUserCompleteInfoFinishKey;
- (UILabel *)codeDesLabel {
if (!_codeDesLabel) {
_codeDesLabel = [[UILabel alloc] init];
_codeDesLabel.text = @"(选填)";
_codeDesLabel.text = YMLocalizedString(@"LoginFullInfoViewController5");
_codeDesLabel.font = [UIFont systemFontOfSize:15];
_codeDesLabel.textColor = [DJDKMIMOMColor textThirdColor];
[_codeDesLabel setContentHuggingPriority:UILayoutPriorityRequired forAxis:UILayoutConstraintAxisHorizontal];

2
YuMi/Modules/YMLogin/View/NewLogin/XPForgetPwdViewController.m
View File

@@ -180,7 +180,7 @@
- (XPLoginInputView *)pwdInputView {
if (!_pwdInputView) {
_pwdInputView = [[XPLoginInputView alloc] init];
NSMutableAttributedString *placeholder = [[NSMutableAttributedString alloc] initWithString:@"请输入密码(6-16个字符)"];
NSMutableAttributedString *placeholder = [[NSMutableAttributedString alloc] initWithString:YMLocalizedString(@"XPForgetPwdViewController6")];
[placeholder addAttribute:NSForegroundColorAttributeName value:UIColor.whiteColor range:NSMakeRange(0, placeholder.length)];
_pwdInputView.inputTextField.attributedPlaceholder = placeholder;
_pwdInputView.inputTextField.keyboardType = UIKeyboardTypeAlphabet;

2
YuMi/Modules/YMLogin/View/NewLogin/XPLoginPwdViewController.m
View File

@@ -183,7 +183,7 @@
- (UIButton *)forgetBtn {
if (!_forgetBtn) {
_forgetBtn = [UIButton buttonWithType:UIButtonTypeCustom];
[_forgetBtn setTitle:@"忘记密码？" forState:UIControlStateNormal];
[_forgetBtn setTitle:YMLocalizedString(@"XPRoomRedPacketPwdView1") forState:UIControlStateNormal];
[_forgetBtn setTitleColor:UIColor.whiteColor forState:UIControlStateNormal];
_forgetBtn.titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightRegular];
[_forgetBtn addTarget:self action:@selector(forgetBtnClicked) forControlEvents:UIControlEventTouchUpInside];

2
YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAnchorPKMatchView.m
View File

@@ -94,7 +94,7 @@
self.timer = nil;
}
TTAlertConfig *config = [[TTAlertConfig alloc] init];
config.message = @"暂未匹配到合适的PK对象\n是否继续？";
config.message = YMLocalizedString(@"XPAnchorPKMatchView1");
[TTPopup alertWithConfig:config confirmHandler:^{
[Api matchRandomPK:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
if (code == 200) {

4
YuMi/Modules/YMRoom/View/AcrossRoomPK/View/XPAcrossRoomPKSelectRoomView.m
View File

@@ -240,7 +240,7 @@
}
} erbanNo:self.searchTextField.text roomUid:@"" pageNum:@"1" pageSize:@"50"];
} else {
[XNDJTDDLoadingTool showErrorWithMessage:@"请输入要搜索的厅ID"];
[XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPAnchorPKSelectRoomView1")];
}
}
@@ -325,7 +325,7 @@
_searchTextField.textColor = [UIColor whiteColor];
_searchTextField.backgroundColor = [UIColor clearColor];
_searchTextField.font = [UIFont systemFontOfSize:13];
NSString *placeholder = [NSString stringWithFormat:@"请输入厅的ID"];
NSString *placeholder = [NSString stringWithFormat:YMLocalizedString(@"XPAnchorPKSelectRoomView1")];
_searchTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:placeholder attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:13], NSForegroundColorAttributeName : [UIColor colorWithWhite:1 alpha:0.4]}];
}
return _searchTextField;

2
YuMi/Modules/YMRoom/View/AcrossRoomPK/View/XPAcrossRoomPKViewController.m
View File

@@ -391,7 +391,7 @@
_titleLabel = [[UILabel alloc] init];
_titleLabel.textColor = UIColor.whiteColor;
_titleLabel.font = [UIFont boldSystemFontOfSize:18];
_titleLabel.text = @"跨房PK";
_titleLabel.text = YMLocalizedString(@"XPAcrossRoomPKInviteView8");
}
return _titleLabel;
}

6
YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKInviteView.m
View File

@@ -284,7 +284,7 @@
- (XPAnchorPKInviteSubView *)inviteView {
if (!_inviteView) {
_inviteView = [[XPAnchorPKInviteSubView alloc] init];
_inviteView.titleLabel.text = @"邀请方:";
_inviteView.titleLabel.text = YMLocalizedString(@"XPAnchorPKInviteView3");
}
return _inviteView;
}
@@ -292,7 +292,7 @@
- (XPAnchorPKInviteSubView *)timeView {
if (!_timeView) {
_timeView = [[XPAnchorPKInviteSubView alloc] init];
_timeView.titleLabel.text = @"PK时长:";
_timeView.titleLabel.text = YMLocalizedString(@"XPAnchorPKInviteView4");
}
return _timeView;
}
@@ -300,7 +300,7 @@
- (XPAnchorPKInviteSubView *)descView {
if (!_descView) {
_descView = [[XPAnchorPKInviteSubView alloc] init];
_descView.titleLabel.text = @"PK玩法:";
_descView.titleLabel.text = YMLocalizedString(@"XPAnchorPKInviteView5");
}
return _descView;
}

10
YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPKResultView.m
View File

@@ -93,7 +93,7 @@
- (void)setData:(AcrossRoomPkRankModel *)data {
self.titleLabel.text = data.nick ? data.nick : @"";
self.contentLabel.text = [NSString stringWithFormat:@"PK值：%@", data.amount? data.amount : @""];
self.contentLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPAnchorPKResultView6"), data.amount? data.amount : @""];
self.headImageView.imageUrl = data.avatar;
}
@@ -278,7 +278,7 @@
}
self.avatarImageView.imageUrl = data.cAvatar;
self.roomTitleLabel.text = data.cNick;
self.pkValueLabel.text = [NSString stringWithFormat:@"PK值：%lld", data.cAmount];
self.pkValueLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPAnchorPKResultView6"), @(data.cAmount)];
if (data.csRank.count > 0) {//有贡献
self.contributeTitleBgImageView.hidden = NO;
self.contributeTitleLabel.hidden = NO;
@@ -322,7 +322,7 @@
} else {
dispatch_async(dispatch_get_main_queue(), ^{
//设置按钮显示读秒效果
[self.closeBtn setTitle:[NSString stringWithFormat:@"关闭(%ld)", tempTime] forState:UIControlStateNormal];
[self.closeBtn setTitle:[NSString stringWithFormat:YMLocalizedString(@"XPAnchorPKResultView7"), tempTime] forState:UIControlStateNormal];
});
tempTime--;
}
@@ -348,7 +348,7 @@
if (!_closeBtn) {
_closeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
[_closeBtn addTarget:self action:@selector(onCloseBtnClick:) forControlEvents:UIControlEventTouchUpInside];
[_closeBtn setTitle:@"关闭(5)" forState:UIControlStateNormal];
[_closeBtn setTitle:YMLocalizedString(@"XPAnchorPKResultView8") forState:UIControlStateNormal];
_closeBtn.titleLabel.font = [UIFont systemFontOfSize:12];
[_closeBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
[_closeBtn setBackgroundColor:UIColorRGBAlpha(0xFFFFFF, 0.37)];
@@ -426,7 +426,7 @@
- (UILabel *)noneContrbuteLabel {
if (!_noneContrbuteLabel) {
_noneContrbuteLabel = [[UILabel alloc] init];
_noneContrbuteLabel.text = @"暂时无人送礼，再玩一局吧～";
_noneContrbuteLabel.text = YMLocalizedString(@"XPAnchorPKResultView5");
_noneContrbuteLabel.textColor = UIColorFromRGB(0xDAD7FF);
_noneContrbuteLabel.font = [UIFont systemFontOfSize:10];
_noneContrbuteLabel.textAlignment = NSTextAlignmentCenter;

6
YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorRandomPKRuleView.m
View File

@@ -193,7 +193,7 @@ CGSize size = [self.ruleLabel sizeThatFits:CGSizeMake(300 -36, CGFLOAT_MAX)];
_randomLabel = [[UILabel alloc] init];
_randomLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium];
_randomLabel.textColor = [DJDKMIMOMColor mainTextColor];
_randomLabel.text= @"随机PK";
_randomLabel.text= YMLocalizedString(@"XPAnchorRandomPKRuleView1");
}
return _randomLabel;
}
@@ -249,7 +249,7 @@ CGSize size = [self.ruleLabel sizeThatFits:CGSizeMake(300 -36, CGFLOAT_MAX)];
_inviteLabel = [[UILabel alloc] init];
_inviteLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium];
_inviteLabel.textColor = [DJDKMIMOMColor mainTextColor];
_inviteLabel.text= @"邀请PK";
_inviteLabel.text= YMLocalizedString(@"XPAnchorRandomPKRuleView3");
}
return _inviteLabel;
}
@@ -257,7 +257,7 @@ CGSize size = [self.ruleLabel sizeThatFits:CGSizeMake(300 -36, CGFLOAT_MAX)];
- (UILabel *)inviteContentLb {
if (!_inviteContentLb) {
_inviteContentLb = [[UILabel alloc] init];
NSString * title = @"指定一个主播房主播，邀请其进行PK，对方接受后开启PK";
NSString * title = YMLocalizedString(@"XPAnchorRandomPKRuleView4");
NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] initWithString:title attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:12], NSForegroundColorAttributeName:[DJDKMIMOMColor mainTextColor]}];
NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
paragraphStyle.lineSpacing = 5;

4
YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKSelectRoomView.m
View File

@@ -241,7 +241,7 @@
}
} erbanNo:self.searchTextField.text roomUid:@"" pageNum:@"1" pageSize:@"50" pkType:@"2"];
} else {
[XNDJTDDLoadingTool showErrorWithMessage:@"请输入要搜索的厅ID"];
[XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"XPAnchorPKSelectRoomView1")];
}
}
@@ -312,7 +312,7 @@
_searchTextField.textColor = [UIColor whiteColor];
_searchTextField.backgroundColor = [UIColor clearColor];
_searchTextField.font = [UIFont systemFontOfSize:13];
NSString *placeholder = [NSString stringWithFormat:@"请输入厅的ID"];
NSString *placeholder = YMLocalizedString(@"XPAnchorPKSelectRoomView2");
_searchTextField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:placeholder attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:13], NSForegroundColorAttributeName : [UIColor colorWithWhite:1 alpha:0.4]}];
}
return _searchTextField;

2
YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKViewController.m
View File

@@ -376,7 +376,7 @@
_titleLabel = [[UILabel alloc] init];
_titleLabel.textColor = UIColor.whiteColor;
_titleLabel.font = [UIFont boldSystemFontOfSize:18];
_titleLabel.text = @"主播PK";
_titleLabel.text = YMLocalizedString(@"XPAnchorPKViewController4");
}
return _titleLabel;
}

4
YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTaskViewController.m
View File

@@ -324,7 +324,7 @@
}];
self.myAvatarImageView.imageUrl = self.model.memberAvatar;
self.intimateLabel.text = [NSString stringWithFormat:@"亲密值LV%ld", self.model.levelSeq];
self.intimateLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPAnchorFansTaskViewController1"), self.model.levelSeq];
self.progressLabel.text = [NSString stringWithFormat:@"%ld/%ld", self.model.levelExper, self.model.nextLevelExper];
[self.tableView reloadData];
@@ -351,7 +351,7 @@
- (void)exitButtonAction:(UIButton *)button {
self.explainBgImageView.hidden = YES;
[TTPopup alertWithMessage:@"退出粉丝团后24小时内不能再次加入，确定退出吗？" confirmHandler:^{
[TTPopup alertWithMessage:YMLocalizedString(@"XPAnchorFansTaskViewController2") confirmHandler:^{
[self.presenter outAnchorFansTeam:self.roomUid];
} cancelHandler:^{

4
YuMi/Modules/YMRoom/View/AnchorView/FansTeam/View/XPAnchorFansTeamEntranceView.m
View File

@@ -79,14 +79,14 @@
make.right.mas_equalTo(self.iconImageView).mas_offset(8);
}];
if (model.hasFansTeamCurrentRoom) {//已开通粉丝团
self.titleLabel.text = [NSString stringWithFormat:@"粉丝团（%ld）", model.anchorFansNum];
self.titleLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPAnchorFansTeamEntranceView0"), model.anchorFansNum];
} else {
self.titleLabel.text = YMLocalizedString(@"XPAnchorFansTeamEntranceView1");
}
} else {
if (model.hasFansTeamCurrentRoom) {//已开通粉丝团
if (model.isAnchorFans) {
self.titleLabel.text = [NSString stringWithFormat:@"粉丝LV.%zd ", model.fansLevelSeq];
self.titleLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPAnchorFansTeamEntranceView2"), model.fansLevelSeq];
self.iconImageView.image = [UIImage imageNamed:@"anchor_fansTeam_entrance_hadOpen"];
[self.iconImageView mas_remakeConstraints:^(MASConstraintMaker *make) {
make.width.mas_equalTo(20);

2
YuMi/Modules/YMRoom/View/AnchorView/XPAnchorAudienceUpMicView.m
View File

@@ -182,7 +182,7 @@
- (UILabel *)descripLabel {
if (!_descripLabel) {
_descripLabel = [[UILabel alloc] init];
_descripLabel.text = @"TA悄悄点击了嘉宾位置\n需要邀请TA上麦互动吗？";
_descripLabel.text = YMLocalizedString(@"XPAnchorAudienceUpMicView0");
_descripLabel.textColor = [DJDKMIMOMColor textThirdColor];
_descripLabel.textAlignment = NSTextAlignmentCenter;
_descripLabel.font = [UIFont systemFontOfSize:12];

2
YuMi/Modules/YMRoom/View/AnchorView/XPRoomAnchorInfoCardView.m
View File

@@ -184,7 +184,7 @@
_descLabel.font = [UIFont boldSystemFontOfSize:14];
_descLabel.textColor = [DJDKMIMOMColor textThirdColor];
_descLabel.textAlignment = NSTextAlignmentCenter;
_descLabel.text = @"点击加关注，下次直播不迷路~";
_descLabel.text = YMLocalizedString(@"XPRoomAnchorInfoCardView1");
}
return _descLabel;
}

2
YuMi/Modules/YMRoom/View/AnimationView/XPRoomEnterHideTipView.m
View File

@@ -85,7 +85,7 @@
UILabel *label = [[UILabel alloc] init];
label.font = [UIFont systemFontOfSize:14];
label.textColor = [UIColor whiteColor];
label.text = @"你已隐身进入房间～";
label.text = YMLocalizedString(@"XPRoomEnterHideTipView0");
_descLabel = label;
}
return _descLabel;

2
YuMi/Modules/YMRoom/View/AnimationView/XPRoomLuckyBigPrizeView.m
View File

@@ -68,7 +68,7 @@
NSDictionary * dic = @{NSFontAttributeName:[UIFont systemFontOfSize:fontSize], NSForegroundColorAttributeName:[UIColor whiteColor]};
NSDictionary * mainDic = @{NSFontAttributeName:[UIFont systemFontOfSize:fontSize], NSForegroundColorAttributeName:[DJDKMIMOMColor appMainColor]};
NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] init];
[attributedString appendAttributedString:[[NSMutableAttributedString alloc] initWithString:@"恭喜 " attributes:dic]];
[attributedString appendAttributedString:[[NSMutableAttributedString alloc] initWithString:YMLocalizedString(@"XPGiftLuckyGiftBroadcastCell0") attributes:dic]];
if (nick) {
[attributedString appendAttributedString:[[NSMutableAttributedString alloc] initWithString:nick attributes:mainDic]];
}

4
YuMi/Modules/YMRoom/View/AnimationView/XPRoomNobleLevelUpView.m
View File

@@ -82,7 +82,7 @@
CGFloat totalWidth = 0;
NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init];
[attribute appendAttributedString:[self createAttribute:@"引爆全场！恭喜 " color:[UIColor whiteColor]]];
[attribute appendAttributedString:[self createAttribute:YMLocalizedString(@"XPRoomNobleLevelUpView0") color:[UIColor whiteColor]]];
CGFloat width1 = [attribute.string boundingRectWithSize:CGSizeMake(CGFLOAT_MAX, height) options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:22]} context:nil].size.width;
self.firstLabel.attributedText = attribute;
@@ -90,7 +90,7 @@
[attribute1 appendAttributedString:[self createAttribute:@" " color:[DJDKMIMOMColor giftBroadcastNumberColor]]];
[attribute1 appendAttributedString:[self createAttribute:nobleInfo[@"nick"] color:[DJDKMIMOMColor giftBroadcastNumberColor]]];
[attribute1 appendAttributedString:[self createAttribute:@" " color:[DJDKMIMOMColor giftBroadcastNumberColor]]];
[attribute1 appendAttributedString:[self createAttribute:[NSString stringWithFormat:@"贵族身份升级为%@!", nobleInfo[@"currVipName"]] color:[UIColor whiteColor]]];
[attribute1 appendAttributedString:[self createAttribute:[NSString stringWithFormat:YMLocalizedString(@"XPRoomNobleLevelUpView1"), nobleInfo[@"currVipName"]] color:[UIColor whiteColor]]];
CGFloat width2 = [attribute1.string boundingRectWithSize:CGSizeMake(CGFLOAT_MAX, height) options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:22]} context:nil].size.width;
self.secondLabel.attributedText = attribute1;

8
YuMi/Modules/YMRoom/View/ArrangeMic/View/Cell/XPArrangeMicTableViewCell.m
View File

@@ -101,13 +101,13 @@
self.rankLabel.text = [NSString stringWithFormat:@"%ld", _userInfo.number];
if (self.isManager) {
if (_userInfo.arrangeMicType == ArrangeMicType_Dating) {
NSString * title = _userInfo.groupType == GroupType_Blue ? @"抱上男神" : YMLocalizedString(@"XPArrangeMicTableViewCell1");
NSString * title = _userInfo.groupType == GroupType_Blue ? YMLocalizedString(@"XPArrangeMicTableViewCell10") : YMLocalizedString(@"XPArrangeMicTableViewCell1");
UIColor * color = _userInfo.groupType == GroupType_Blue ? UIColorFromRGB(0x518EFF) : UIColorFromRGB(0xFF6B77);
[self.arrangeMicButton setTitle:title forState:UIControlStateNormal];
[self.arrangeMicButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
[self.arrangeMicButton setBackgroundColor:color];
}if (_userInfo.arrangeMicType == ArrangeMicType_Room_PK) {
NSString * title = _userInfo.groupType == GroupType_Blue ? @"抱上蓝队" : YMLocalizedString(@"XPArrangeMicTableViewCell3");
NSString * title = _userInfo.groupType == GroupType_Blue ? YMLocalizedString(@"XPArrangeMicTableViewCell11") : YMLocalizedString(@"XPArrangeMicTableViewCell3");
UIColor * color = _userInfo.groupType == GroupType_Blue ? UIColorFromRGB(0x518EFF) : UIColorFromRGB(0xFF6B77);
[self.arrangeMicButton setTitle:title forState:UIControlStateNormal];
[self.arrangeMicButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
@@ -119,13 +119,13 @@
}
}else {
if (_userInfo.arrangeMicType == ArrangeMicType_Dating) {
NSString * title = _userInfo.groupType == GroupType_Blue ? @"已选男神" : YMLocalizedString(@"XPArrangeMicTableViewCell6");
NSString * title = _userInfo.groupType == GroupType_Blue ? YMLocalizedString(@"XPArrangeMicTableViewCell12") : YMLocalizedString(@"XPArrangeMicTableViewCell6");
UIColor * color = _userInfo.groupType == GroupType_Blue ? UIColorFromRGB(0x518EFF) : UIColorFromRGB(0xFF6B77);
[self.arrangeMicButton setTitle:title forState:UIControlStateNormal];
[self.arrangeMicButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
[self.arrangeMicButton setBackgroundColor:color];
} else if(_userInfo.arrangeMicType == ArrangeMicType_Room_PK) {
NSString * title = _userInfo.groupType == GroupType_Blue ? @"已选蓝队" : YMLocalizedString(@"XPArrangeMicTableViewCell8");
NSString * title = _userInfo.groupType == GroupType_Blue ?YMLocalizedString(@"XPArrangeMicTableViewCell13") : YMLocalizedString(@"XPArrangeMicTableViewCell8");
UIColor * color = _userInfo.groupType == GroupType_Blue ? UIColorFromRGB(0x518EFF) : UIColorFromRGB(0xFF6B77);
[self.arrangeMicButton setTitle:title forState:UIControlStateNormal];
[self.arrangeMicButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];

12
YuMi/Modules/YMRoom/View/ArrangeMic/View/XPArrangeMicViewController.m
View File

@@ -214,12 +214,12 @@
NSMutableAttributedString *attributString = [[NSMutableAttributedString alloc] initWithString:YMLocalizedString(@"XPArrangeMicViewController5") attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:16], NSForegroundColorAttributeName:[DJDKMIMOMColor mainTextColor]}];
return attributString;
}else{
NSMutableAttributedString *attributString = [[NSMutableAttributedString alloc] initWithString:@"报名才能排麦哦~" attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:16], NSForegroundColorAttributeName:[DJDKMIMOMColor mainTextColor]}];
NSMutableAttributedString *attributString = [[NSMutableAttributedString alloc] initWithString:YMLocalizedString(@"XPArrangeMicViewController6") attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:16], NSForegroundColorAttributeName:[DJDKMIMOMColor mainTextColor]}];
return attributString;
}
}else{
if (self.userInfo.isManager) {
NSString * str = [NSString stringWithFormat:@"当前排麦的人数:%@", count];
NSString * str = [NSString stringWithFormat:YMLocalizedString(@"XPArrangeMicViewController7"), count];
NSMutableAttributedString *attributString = [[NSMutableAttributedString alloc] initWithString:str attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:16], NSForegroundColorAttributeName:[DJDKMIMOMColor mainTextColor]}];
[attributString addAttribute:NSForegroundColorAttributeName value:[DJDKMIMOMColor appEmphasizeColor] range:[str rangeOfString:count]];
@@ -227,12 +227,12 @@
}else{
if ([count intValue] > 0) {
count = count.length > 0 ? count : @"0";
NSString * str = [NSString stringWithFormat:@"我在队列中排列位置:%ld", [count integerValue]];
NSString * str = [NSString stringWithFormat:YMLocalizedString(@"XPArrangeMicViewController8"), [count integerValue]];
NSMutableAttributedString *attributString = [[NSMutableAttributedString alloc] initWithString:str attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:16], NSForegroundColorAttributeName:[DJDKMIMOMColor mainTextColor]}];
[attributString addAttribute:NSForegroundColorAttributeName value:[DJDKMIMOMColor appEmphasizeColor] range:[str rangeOfString:count]];
return attributString;
}else{
NSMutableAttributedString *attributString = [[NSMutableAttributedString alloc] initWithString:@"报名才能排麦哦~" attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:16], NSForegroundColorAttributeName:[DJDKMIMOMColor mainTextColor]}];
NSMutableAttributedString *attributString = [[NSMutableAttributedString alloc] initWithString:YMLocalizedString(@"XPArrangeMicViewController6") attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:16], NSForegroundColorAttributeName:[DJDKMIMOMColor mainTextColor]}];
return attributString;
}
@@ -625,7 +625,7 @@
if (cell == nil) {
cell = [[XPArrangeMicEmptyTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPArrangeMicEmptyTableViewCell class])];
}
cell.emptyTitle = self.userInfo.isManager ? @"冷冷清清的无人排麦哦~\n分享房间邀请好友加入一起嗨" : @"立即报名，你就是排麦第一人啦！";
cell.emptyTitle = self.userInfo.isManager ? YMLocalizedString(@"XPArrangeMicViewController26") : YMLocalizedString(@"XPArrangeMicViewController27");
return cell;
}
@@ -666,7 +666,7 @@
} else {
if (self.arrangeMicInfo.myPos.integerValue > 0) {
[TTPopup alertWithMessage:@"取消报名后再次报名需要重新排麦哦！确认取消报名吗？" confirmHandler:^{
[TTPopup alertWithMessage:YMLocalizedString(@"XPArrangeMicViewController19") confirmHandler:^{
if (self.userInfo.type == ArrangeMicType_Dating) {
__block GroupType grouptype = GroupType_default;
[self.arrangeMicInfo.queue enumerateObjectsUsingBlock:^(ArrangeMicUserModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {

2
YuMi/Modules/YMRoom/View/BackMusic/View/SubViews/XPRoomBackMusicPlayerView.m
View File

@@ -249,7 +249,7 @@ UIKIT_EXTERN NSString * kRoomBackMusicPlayMusicOrderKey;
- (void)playOrderButtonAction:(UIButton *)sender {
sender.selected = !sender.selected;
NSString * title = sender.selected ? @"单曲循环" : YMLocalizedString(@"XPRoomBackMusicPlayerView1");
NSString * title = sender.selected ? YMLocalizedString(@"XPRoomBackMusicPlayerView5") : YMLocalizedString(@"XPRoomBackMusicPlayerView1");
[XNDJTDDLoadingTool showSuccessWithMessage:title];
NSUserDefaults * defaults = [NSUserDefaults standardUserDefaults];
NSInteger type = sender.selected ? 1 : 0;

16
YuMi/Modules/YMRoom/View/BackMusic/View/XPRoomTransferMusicViewController.m
View File

@@ -132,14 +132,14 @@
if ([self.httpServer start:&err]) {
self.ipAddress = @"";
if (status == AFNetworkReachabilityStatusReachableViaWWAN) {
self.ipAddress = @"（您正在4G/3G/2G网络下，暂无法使用）";
self.wifiLabel.text = @"请连接WIFI";
self.ipAddress = YMLocalizedString(@"XPRoomTransferMusicViewController1");
self.wifiLabel.text = YMLocalizedString(@"XPRoomTransferMusicViewController2");
} else if (status == AFNetworkReachabilityStatusNotReachable) {
self.ipAddress = YMLocalizedString(@"XPRoomTransferMusicViewController3");
self.wifiLabel.text = @"请连接WIFI";
self.wifiLabel.text = YMLocalizedString(@"XPRoomTransferMusicViewController2");
} else {
self.ipAddress = [NSString stringWithFormat:@"http://%@:%d/",[SJXCSMIPHelper deviceIPAdress],[self.httpServer listeningPort]];
self.wifiLabel.text = @"已连接WIFI";
self.wifiLabel.text = YMLocalizedString(@"XPRoomTransferMusicViewController5");
}
self.ipLabel.text = self.ipAddress;
}
@@ -150,18 +150,18 @@
case AFNetworkReachabilityStatusNotReachable:
{
self.ipLabel.text = YMLocalizedString(@"XPRoomTransferMusicViewController6");
self.wifiLabel.text = @"请连接WIFI";
self.wifiLabel.text = YMLocalizedString(@"XPRoomTransferMusicViewController2");
}
break;
case AFNetworkReachabilityStatusReachableViaWWAN:
{
self.ipLabel.text = YMLocalizedString(@"XPRoomTransferMusicViewController8");
self.wifiLabel.text = @"请连接WIFI";
self.wifiLabel.text = YMLocalizedString(@"XPRoomTransferMusicViewController2");
}
break;
default:
self.ipLabel.text = self.ipAddress;
self.wifiLabel.text = @"已连接WIFI";
self.wifiLabel.text = YMLocalizedString(@"XPRoomTransferMusicViewController5");
break;
}
}];
@@ -287,7 +287,7 @@
_wifiLabel = [[UILabel alloc] init];
_wifiLabel.font = [UIFont systemFontOfSize:15];
_wifiLabel.textColor = [UIColor whiteColor];
_wifiLabel.text = @"已连接Wifi";
_wifiLabel.text = YMLocalizedString(@"XPRoomTransferMusicViewController5");
}
return _wifiLabel;
}

2
YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomDatingVipUpMicView.m
View File

@@ -79,7 +79,7 @@
- (UITextView *)contentView {
if (!_contentView) {
_contentView = [[UITextView alloc] init];
_contentView.text = @"1.每轮相亲在“嘉宾交流”阶段累积送礼满999钻石且送礼价值最高的用户自动登上VIP席位；\n\n2.若出现多个满足上VIP席位要求的用户，VIP席位最终由送礼价值最高的用户获得，若送礼价值相同以最先达到该值的用户为准；\n\n3.VIP席位的用户可选择是否下麦，其他用户不可因此代替坐上席位；\n\n4.用户只能在“嘉宾交流”阶段抢夺VIP席位，“嘉宾交流”阶段后直到结束本轮前，即使送出超过之前VIP总礼物价值也不能换人；\n\n5.每轮相亲结束后VIP席位清空，下一轮重新开始抢位。";
_contentView.text = YMLocalizedString(@"XPRoomDatingVipUpMicView0");
_contentView.backgroundColor = [UIColor clearColor];
_contentView.textColor = UIColorFromRGB(0xFFF9BC);
_contentView.font = [UIFont systemFontOfSize:12];

18
YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomFunctionContainerView.m
View File

@@ -402,16 +402,16 @@
switch (roomInfo.blindDateState) {
case RoomPlayDateingType_Talk:
[self.datingProgresButton setTitle:@"开始选择>" forState:UIControlStateNormal];
[self.datingProgresButton setTitle:YMLocalizedString(@"XPRoomFunctionContainerView0") forState:UIControlStateNormal];
break;
case RoomPlayDateingType_Pick:
[self.datingProgresButton setTitle:@"公布心动>" forState:UIControlStateNormal];
[self.datingProgresButton setTitle:YMLocalizedString(@"XPRoomFunctionContainerView1") forState:UIControlStateNormal];
break;
case RoomPlayDateingType_Result:
[self.datingProgresButton setTitle:@"结束本轮>" forState:UIControlStateNormal];
[self.datingProgresButton setTitle:YMLocalizedString(@"XPRoomFunctionContainerView2") forState:UIControlStateNormal];
break;
case RoomPlayDateingType_Finish:
[self.datingProgresButton setTitle:@"嘉宾交流>" forState:UIControlStateNormal];
[self.datingProgresButton setTitle:YMLocalizedString(@"XPRoomFunctionContainerView3") forState:UIControlStateNormal];
break;
default:
break;
@@ -1059,13 +1059,13 @@
RoomInfoModel * roomInfo = self.delegate.getRoomInfo;
NSString * message = @"";
if (roomInfo.blindDateState == RoomPlayDateingType_Talk) {
message = @"进入心动选人环节?";
message = YMLocalizedString(@"XPRoomFunctionContainerView8");
} else if(roomInfo.blindDateState == RoomPlayDateingType_Pick) {
message = @"进入心动公布环节?";
message =YMLocalizedString(@"XPRoomFunctionContainerView9");
} else if(roomInfo.blindDateState == RoomPlayDateingType_Result) {
message = @"结束本轮,同时清空魅力值?";
message = YMLocalizedString(@"XPRoomFunctionContainerView10");
} else if (roomInfo.blindDateState == RoomPlayDateingType_Finish) {
message = @"进入嘉宾交流环节?";
message =YMLocalizedString(@"XPRoomFunctionContainerView11");
}
TTAlertConfig * config = [[TTAlertConfig alloc] init];
config.message = message;
@@ -1577,7 +1577,7 @@
[_datingProgresButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xFA7186), UIColorFromRGB(0xFA4972)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(65, 30)] forState:UIControlStateNormal];
[_datingProgresButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
_datingProgresButton.titleLabel.font = [UIFont systemFontOfSize:13];
[_datingProgresButton setTitle:@"开始选择>" forState:UIControlStateNormal];
[_datingProgresButton setTitle:YMLocalizedString(@"XPRoomFunctionContainerView13") forState:UIControlStateNormal];
[_datingProgresButton addTarget:self action:@selector(datingProgresButtonAction:) forControlEvents:UIControlEventTouchUpInside];
_datingProgresButton.layer.masksToBounds = YES;
_datingProgresButton.layer.cornerRadius = 15;

2
YuMi/Modules/YMRoom/View/FaceView/View/XPRoomFaceViewController.m
View File

@@ -301,7 +301,7 @@
RoomFaceInfoModel * faceInfo = [self.nobelFaceList safeObjectAtIndex1:indexPath.row];
if (faceInfo.faceVipInfo.vipLevel > self.userInfo.userVipInfoVO.vipLevel) {
TTAlertConfig *config = [[TTAlertConfig alloc] init];
config.message = [NSString stringWithFormat:@"尚未达到发送%@所需贵族等级，\n 所需贵族等级：%@", faceInfo.name,faceInfo.faceVipInfo.vipName];
config.message = [NSString stringWithFormat:YMLocalizedString(@"XPRoomFaceViewController1"), faceInfo.name,faceInfo.faceVipInfo.vipName];
config.actionStyle = TTAlertActionConfirmStyle;
[TTPopup alertWithConfig:config confirmHandler:^{

1
YuMi/Modules/YMRoom/View/FirstRecharge/View/XPFirstRechargeView.m
View File

@@ -343,6 +343,7 @@
} else {
[XNDJTDDLoadingTool showErrorWithMessage:msg];
}
[XNDJTDDLoadingTool hideHUD];
} receipt:receipt chooseEnv:@"true" chargeRecordId:orderId transcationId:transcationId uid:uid ticket:ticket];
}

2
YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomMenuContainerView.m
View File

@@ -439,7 +439,7 @@ NSString * const kRoomPlayEnterKey = @"kRoomPlayEnterKey";
if (!_inputButton) {
_inputButton = [UIButton buttonWithType:UIButtonTypeCustom];
if ([ClientConfig shareConfig].canOpen) {
[_inputButton setTitle:@"说点什么..." forState:UIControlStateNormal];
[_inputButton setTitle:YMLocalizedString(@"XPRoomMenuContainerView2") forState:UIControlStateNormal];
} else {
[_inputButton setTitle:YMLocalizedString(@"XPRoomMenuContainerView3") forState:UIControlStateNormal];
}

2
YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomSendTextView.m
View File

@@ -258,7 +258,7 @@
- (UITextField *)editTextFiled{
if (!_editTextFiled) {
_editTextFiled = [[UITextField alloc] init];
NSAttributedString * attribute = [[NSAttributedString alloc] initWithString:@"请输入消息..." attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:15], NSForegroundColorAttributeName : [DJDKMIMOMColor secondTextColor]}];
NSAttributedString * attribute = [[NSAttributedString alloc] initWithString:YMLocalizedString(@"XPRoomSendTextView0") attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:15], NSForegroundColorAttributeName : [DJDKMIMOMColor secondTextColor]}];
_editTextFiled.attributedPlaceholder = attribute;
_editTextFiled.borderStyle = UITextBorderStyleNone;
_editTextFiled.textColor = [DJDKMIMOMColor alertTitleColor];

64
YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageParser.m
View File

@@ -137,7 +137,7 @@
messageInfo.bubbleImageUrl = [self parseMessageBubble:message];
NSString * nick = [NSString stringWithFormat:@"%@:", ((NIMMessageChatroomExtension *)message.messageExt).roomNickname];
if ([message.from isEqualToString:uid]) {
nick = @"我:";
nick = YMLocalizedString(@"XPRoomMessageParser0");
}
NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init];
@@ -256,7 +256,7 @@
}
[attribute appendAttributedString:[self createNickAtrribute:nick uid:message.from.integerValue]];
if (extModel.carName.length > 0) {
[attribute appendAttributedString:[self createTextAttribute:@" 驾着 " color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]];
[attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser1") color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]];
[attribute appendAttributedString:[self createTextAttribute:extModel.carName color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]];
[attribute appendAttributedString:[self createSapceAttribute:2]];
}
@@ -320,15 +320,15 @@
XPRoomStarKitchenModel * giftInfo = [XPRoomStarKitchenModel modelWithDictionary:attachment.data];
NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init];
CGFloat fontSize = 13;
[attribute appendAttributedString:[self createTextAttribute:@"恭喜" color:[UIColor whiteColor] font:fontSize]];
[attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser14") color:[UIColor whiteColor] font:fontSize]];
NSString * nick = giftInfo.nick;
if (nick.length > 6) {
nick = [nick substringToIndex:6];
}
[attribute appendAttributedString:[self createTextAttribute:nick color:[DJDKMIMOMColor colorWithHexString:@"#FEF23E"] font:fontSize]];
[attribute appendAttributedString:[self createTextAttribute:@"在星级厨房中获得" color:[UIColor whiteColor] font:fontSize]];
[attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser112") color:[UIColor whiteColor] font:fontSize]];
[attribute appendAttributedString:[self createTextAttribute:[NSString stringWithFormat:@"%@", giftInfo.diamonds] color:[DJDKMIMOMColor colorWithHexString:@"#00EAFF"] font:fontSize]];
[attribute appendAttributedString:[self createTextAttribute:@"钻石价值的碎片奖励" color:[UIColor whiteColor] font:fontSize]];
[attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser113") color:[UIColor whiteColor] font:fontSize]];
NSMutableParagraphStyle *paragraphStyle = [NSMutableParagraphStyle new];
paragraphStyle.lineBreakMode = NSLineBreakByCharWrapping;
paragraphStyle.lineSpacing = 4.0f;//行间距
@@ -365,7 +365,7 @@
- (XPMessageInfoModel *)createRoomSailingAttribute:(AttachmentModel *)attachment messageInfo:(XPMessageInfoModel *)messageInfo{
RoomSailingPrizeModel *info = [RoomSailingPrizeModel modelWithDictionary:attachment.data];
NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init];
[attribute appendAttributedString:[self createTextAttribute:@"厉害了! " color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]];
[attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomCandyGiftView0") color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]];
[attribute appendAttributedString:[self createTextAttribute:info.nick color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]];
[attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser13") color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]];
[attribute appendAttributedString:[self createTextAttribute:info.prizeName color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]];
@@ -398,8 +398,8 @@
[attribute appendAttributedString:[self createTextAttribute:info.nick color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]];
[attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser16") color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]];
[attribute appendAttributedString:[self createTextAttribute:info.roomTitle color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]];
[attribute appendAttributedString:[self createTextAttribute:[NSString stringWithFormat:@"通过%@", info.luckyBagName] color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]];
[attribute appendAttributedString:[self createTextAttribute:[NSString stringWithFormat:@",开出%@", info.giftName] color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]];
[attribute appendAttributedString:[self createTextAttribute:[NSString stringWithFormat:YMLocalizedString(@"XPRoomMessageParser17"), info.luckyBagName] color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]];
[attribute appendAttributedString:[self createTextAttribute:[NSString stringWithFormat:YMLocalizedString(@"XPRoomMessageParser18" ), info.giftName] color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]];
messageInfo.content = attribute;
return messageInfo;
}
@@ -452,23 +452,23 @@
if (model.voteMode == RoomPKVoteModeType_NumberPerson) {
victoryStr = YMLocalizedString(@"XPRoomMessageParser25");
NSString * resultScale = [NSString stringWithFormat:@"%@:%@",[NSString stringWithFormat:@"%lld", team.score],[NSString stringWithFormat:@"%lld", team.score]];
NSString * result = [NSString stringWithFormat:@"本场PK结果：%@！\nPK值:%@",victoryStr, resultScale];
NSString * result = [NSString stringWithFormat:YMLocalizedString(@"XPRoomMessageParser26"),victoryStr, resultScale];
[attribute appendAttributedString:[self createTextAttribute:result color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]];
}else{
if (team.protecScore > 0) {
NSString * resultScale = [NSString stringWithFormat:@"%@:%@",[NSString stringWithFormat:@"%lld", team.score],[NSString stringWithFormat:@"%lld", team.score]];
victoryStr = YMLocalizedString(@"XPRoomMessageParser27");
NSString * result = [NSString stringWithFormat:@"本场PK结果：%@！\nPK值%@",victoryStr, resultScale];
NSString * result = [NSString stringWithFormat:YMLocalizedString(@"XPRoomMessageParser28"),victoryStr, resultScale];
[attribute appendAttributedString:[self createTextAttribute:result color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]];
}else{
victoryStr = YMLocalizedString(@"XPRoomMessageParser29");
NSString * result = [NSString stringWithFormat:@"本场PK结果：%@！\nPK值%@",victoryStr, @"0:0"];
NSString * result = [NSString stringWithFormat:YMLocalizedString(@"XPRoomMessageParser28"),victoryStr, @"0:0"];
[attribute appendAttributedString:[self createTextAttribute:result color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]];
}
}
if (team.protector > 0) {
[attribute appendAttributedString:[[NSMutableAttributedString alloc] initWithString:@"\n"]];
NSString * teamStr = [NSString stringWithFormat:@"蓝队守护者：%@ \n 蓝队守护值： %@ \n 红队守护者： %@ \n 红队守护值： %@", blueTeam.protector.nick.length > 0 ? blueTeam.protector.nick : @"", [[NSNumber numberWithLongLong:blueTeam.protecScore] stringValue], redTeam.protector.nick.length > 0 ? redTeam.protector.nick : @"", [[NSNumber numberWithLongLong:redTeam.protecScore] stringValue]];
NSString * teamStr = [NSString stringWithFormat:YMLocalizedString(@"XPRoomMessageParser31"), blueTeam.protector.nick.length > 0 ? blueTeam.protector.nick : @"", [[NSNumber numberWithLongLong:blueTeam.protecScore] stringValue], redTeam.protector.nick.length > 0 ? redTeam.protector.nick : @"", [[NSNumber numberWithLongLong:redTeam.protecScore] stringValue]];
[attribute appendAttributedString:[self createTextAttribute:teamStr color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]];
}
}else{
@@ -490,13 +490,13 @@
NSString * resultScale = [NSString stringWithFormat:@"%@:%@",[NSString stringWithFormat:@"%lld", victoryTeam.score],[NSString stringWithFormat:@"%lld", failTeam.score]];
NSString * result;
if (model.voteMode == RoomPKVoteModeType_NumberPerson) {
result = [NSString stringWithFormat:@"本场PK结果：%@胜利！\nPK值%@ \n 胜利方战斗值：%@",victoryStr, resultScale,[NSNumber numberWithLongLong:victoryTeam.score]];
result = [NSString stringWithFormat:YMLocalizedString(@"XPRoomMessageParser34"),victoryStr, resultScale,[NSNumber numberWithLongLong:victoryTeam.score]];
}else{
if (victoryTeam.protector) {
NSString * victoryProteror = victoryTeam.protector.nick.length > 0 ? victoryTeam.protector.nick : @"";
result = [NSString stringWithFormat:@"本场PK结果：%@胜利! \nPK值%@ \n %@守护者：%@ \n %@守护值：%@",victoryStr, resultScale,victoryStr, victoryProteror, victoryStr,[[NSNumber numberWithLongLong:victoryTeam.protecScore] stringValue]];
result = [NSString stringWithFormat:YMLocalizedString(@"XPRoomMessageParser35"),victoryStr, resultScale,victoryStr, victoryProteror, victoryStr,[[NSNumber numberWithLongLong:victoryTeam.protecScore] stringValue]];
}else{
result = [NSString stringWithFormat:@"本场PK结果：%@胜利! \nPK值%@ \n %@守护值：%@",victoryStr, resultScale,victoryStr,[[NSNumber numberWithLongLong:victoryTeam.protecScore] stringValue]];
result = [NSString stringWithFormat:YMLocalizedString(@"XPRoomMessageParser36"),victoryStr, resultScale,victoryStr,[[NSNumber numberWithLongLong:victoryTeam.protecScore] stringValue]];
}
}
[attribute appendAttributedString:[self createTextAttribute:result color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]];
@@ -514,7 +514,7 @@
}else if (model.voteMode == RoomPKVoteModeType_NumberPerson){
pkType = YMLocalizedString(@"XPRoomMessageParser38");
}
NSString * title = [NSString stringWithFormat:@"管理发起房间PK，本次PK时间为%.0f秒，%@", model.duration, pkType];
NSString * title = [NSString stringWithFormat:YMLocalizedString(@"XPRoomMessageParser114"), model.duration, pkType];
[attribute appendAttributedString:[self createTextAttribute:title color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]];
}else if (attachment.second == Custom_Message_Sub_Room_PK_Start){
NSString * title = [NSString stringWithFormat:YMLocalizedString(@"XPRoomMessageParser40"), model.duration];
@@ -526,7 +526,7 @@
}else if (model.voteMode == RoomPKVoteModeType_NumberPerson){
pkType = YMLocalizedString(@"XPRoomMessageParser42");
}
NSString * title = [NSString stringWithFormat:@"管理员重新开始PK，本次PK时间为%.0f秒，%@", model.duration, pkType];
NSString * title = [NSString stringWithFormat:YMLocalizedString(@"XPRoomMessageParser43"), model.duration, pkType];
[attribute appendAttributedString:[self createTextAttribute:title color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]];
}
}
@@ -596,7 +596,7 @@
}
RoomInfoModel * roomInfo = [RoomInfoModel modelWithDictionary:dic];
NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init];
[attribute appendAttributedString:[self createTextAttribute:@"消息：" color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]];
[attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser45") color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]];
if (roomInfo.isCloseScreen) {
[attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser46") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]];
} else {
@@ -610,7 +610,7 @@
}
RoomInfoModel * roomInfo = [RoomInfoModel modelWithDictionary:dic];
NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init];
[attribute appendAttributedString:[self createTextAttribute:@"消息：" color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]];
[attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser45") color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]];
if (roomInfo.hasAnimationEffect) {
[attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser49") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]];
} else {
@@ -629,7 +629,7 @@
uid = ((NSString *)attachment.data[@"uid"]).integerValue;
}
NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init];
[attribute appendAttributedString:[self createTextAttribute:@"消息：" color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]];
[attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser45") color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]];
if (roleType.integerValue == 1) {
[attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser53") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]];
[attribute appendAttributedString:[self createTextAttribute:nick color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]];
@@ -649,8 +649,8 @@
NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init];
if(attachment.second == Custom_Message_Sub_Room_Play_Dating_Pick_Heart) {
DatingInfoModel * datingModel = [DatingInfoModel modelWithDictionary:attachment.data];
NSString * targetGender = datingModel.targetGender == GenderType_Male ? @"男" : YMLocalizedString(@"XPRoomMessageParser57");
NSString * pickString = [NSString stringWithFormat:@"%d号%@嘉宾:", (datingModel.targetPosition + 1), targetGender];
NSString * targetGender = datingModel.targetGender == GenderType_Male ? YMLocalizedString(@"XPSessionFindNewFiltrateView2") : YMLocalizedString(@"XPRoomMessageParser57");
NSString * pickString = [NSString stringWithFormat:YMLocalizedString(@"XPRoomMessageParser58"), (datingModel.targetPosition + 1), targetGender];
[attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser59") color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]];
[attribute appendAttributedString:[self createTextAttribute:pickString color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]];
NSString * targetNick = datingModel.targetNickname ? datingModel.targetNickname : @"";
@@ -711,7 +711,7 @@
- (XPMessageInfoModel *)createCandyTreeHighLevelAttribute:(AttachmentModel *)attachment messageInfo:(XPMessageInfoModel *)messageInfo{
NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init];
//action
[attribute appendAttributedString:[self createTextAttribute:@"厉害了 " color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]];
[attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser77") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]];
CandyTreeGiftInfoModel * giftInfo = [CandyTreeGiftInfoModel modelWithDictionary:attachment.data];
[attribute appendAttributedString:[self createTextAttribute:giftInfo.nick color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]];
[attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser78") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]];
@@ -721,7 +721,7 @@
}
if (attachment.second == Custom_Message_Sub_Candy_Tree_Me && giftInfo.uid.integerValue == [AccountInfoStorage instance].getUid.integerValue) {
[attribute appendAttributedString:[self createTextAttribute:@"(仅自己可见)" color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]];
[attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser79") color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]];
}
[self attributeAddHihtLight:attribute uid:giftInfo.uid.integerValue];
@@ -743,7 +743,7 @@
[attribute appendAttributedString:[self createTextAttribute:[NSString stringWithFormat:@"%@(%@)", attachment.data[@"nick"], attachment.data[@"erbanNo"]] color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]];
[attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser81") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]];
[attribute appendAttributedString:[self createTextAttribute:attachment.data[@"currVipName"] color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]];
[attribute appendAttributedString:[self createTextAttribute:@"贵族身份！" color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]];
[attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser82") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]];
} else if (attachment.second == Custom_Message_Sub_Room_Noble_LevelUp || attachment.second == Custom_Message_Sub_AllRoom_Noble_LevelUp_Suspend) {///贵族升级
[attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser83") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]];
[attribute appendAttributedString:[self createTextAttribute:attachment.data[@"nick"] color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]];
@@ -858,7 +858,7 @@
if (attachment.second == Custom_Message_Sub_AllBatchSend || attachment.second == Custom_Message_Sub_AllMicroSend) {///普通礼物
if (attachment.second == Custom_Message_Sub_AllBatchSend) {
//打赏
[attribute appendAttributedString:[self createTextAttribute:@" 打赏 " color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]];
[attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser98") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]];
[attribute appendAttributedString:[self createSapceAttribute:2]];
for (int i = 0; i < info.targetUsers.count; i++) {
GiftReceiveUserInfoModel *targetInfo = [info.targetUsers safeObjectAtIndex1:i];
@@ -873,7 +873,7 @@
}
} else {
//打赏
[attribute appendAttributedString:[self createTextAttribute:@" 全麦打赏 " color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]];
[attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser99") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]];
[attribute appendAttributedString:[self createSapceAttribute:2]];
}
@@ -887,9 +887,9 @@
[attribute appendAttributedString:[self createTextAttribute:[NSString stringWithFormat:@" X%ld",info.giftNum] color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]];
} else if(attachment.second == Custom_Message_Sub_AllMicroLuckySend || attachment.second == Custom_Message_Sub_AllBatchMicroLuckySend) {///福袋礼物
//action
NSString * sendTitle = @" 送出 ";
NSString * sendTitle = YMLocalizedString(@"XPRoomMessageParser100");
if (attachment.second == Custom_Message_Sub_AllMicroLuckySend) {
sendTitle = @" 全麦送出 ";
sendTitle = YMLocalizedString(@"XPRoomMessageParser101");
}
//打赏
[attribute appendAttributedString:[self createTextAttribute:sendTitle color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]];
@@ -900,7 +900,7 @@
[attribute appendAttributedString:[self createSapceAttribute:2]];
// 福袋名称
[attribute appendAttributedString:[self createTextAttribute:@" 给 " color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]];
[attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser102") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]];
[attribute appendAttributedString:[self createSapceAttribute:2]];
if (info.luckyGiftList) {
//target
@@ -908,7 +908,7 @@
[attribute appendAttributedString:[self createSapceAttribute:2]];
// 福袋名称
[attribute appendAttributedString:[self createTextAttribute:@" 爆出了 " color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]];
[attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser103") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]];
[attribute appendAttributedString:[self createSapceAttribute:2]];
[info.luckyGiftList.giftList enumerateObjectsUsingBlock:^(GiftListsInfo * _Nonnull giftListInfo, NSUInteger idx, BOOL * _Nonnull stop) {
@@ -982,7 +982,7 @@
}];
} else {
//打赏
[attribute appendAttributedString:[self createTextAttribute:@" 打赏 " color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]];
[attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser111") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]];
[attribute appendAttributedString:[self createSapceAttribute:2]];
//target
[attribute appendAttributedString: [self createNickAtrribute:info.targetNick uid:info.targetUid.integerValue]];

4
YuMi/Modules/YMRoom/View/MessageContainerView/XPRoomMessageContainerView.m
View File

@@ -515,7 +515,7 @@ NSString * const kRoomShowTopicKey = @"kRoomShowTopicKey";
NSDateComponents *compons = [PLTimeUtil compareTwoDate:date secondDate:[NSDate date]];
if (ABS(compons.year) > 0 || ABS(compons.month) > 0 || ABS(compons.day) > 0) {
NIMMessage * message = [[NIMMessage alloc] init];
NSString * content = [NSString stringWithFormat:@"[房间公告] \n %@", roomInfo.introduction];
NSString * content = [NSString stringWithFormat:YMLocalizedString(@"XPRoomMessageContainerView3"), roomInfo.introduction];
message.text = content;
message.localExt = @{@"isRoomTopic": @(NO)};
[message setValue:@(NIMMessageTypeTip) forKey:@"messageType"];
@@ -527,7 +527,7 @@ NSString * const kRoomShowTopicKey = @"kRoomShowTopicKey";
}
} else {
NIMMessage * message = [[NIMMessage alloc] init];
NSString * content = [NSString stringWithFormat:@"[房间公告] \n %@", roomInfo.introduction];
NSString * content = [NSString stringWithFormat:YMLocalizedString(@"XPRoomMessageContainerView3"), roomInfo.introduction];
message.text = content;
message.localExt = @{@"isRoomTopic": @(NO)};
[message setValue:@(NIMMessageTypeTip) forKey:@"messageType"];

20
YuMi/Modules/YMRoom/View/MoreView/Presenter/XPMoreMenuPresenter.m
View File

@@ -26,19 +26,19 @@
- (void)getMoreMenuDataSource:(RoomInfoModel *)roomInfo isSuperAdmin:(BOOL)isSuperAdmin {
XPRoomMoreItemModel * roomPK = [[XPRoomMoreItemModel alloc] init];
roomPK.title = roomInfo.roomModeType == RoomModeType_Open_PK_Mode ? @"PK中..." : YMLocalizedString(@"XPMoreMenuPresenter1");
roomPK.title = roomInfo.roomModeType == RoomModeType_Open_PK_Mode ?YMLocalizedString(@"XPMoreMenuPresenter26") : YMLocalizedString(@"XPMoreMenuPresenter1");
roomPK.imageName= @"room_more_menu_room_pk";
roomPK.type = roomInfo.roomModeType == RoomModeType_Open_PK_Mode ? RoomMoreMenuType_Room_PK_Close : RoomMoreMenuType_Room_PK_Open;
roomPK.titleColor = [DJDKMIMOMColor roomMoreMenuTextColor];
XPRoomMoreItemModel * giftValue = [[XPRoomMoreItemModel alloc] init];
giftValue.title = roomInfo.showGiftValue ? @"关闭礼物值" : YMLocalizedString(@"XPMoreMenuPresenter3");
giftValue.title = roomInfo.showGiftValue ? YMLocalizedString(@"XPMoreMenuPresenter27") : YMLocalizedString(@"XPMoreMenuPresenter3");
giftValue.imageName= @"room_more_menu_gift_value";
giftValue.type = roomInfo.showGiftValue ? RoomMoreMenuType_Gift_Value_Close : RoomMoreMenuType_Gift_Value_Open;
giftValue.titleColor = [DJDKMIMOMColor roomMoreMenuTextColor];
XPRoomMoreItemModel * giftEffect = [[XPRoomMoreItemModel alloc] init];
giftEffect.title = roomInfo.hasAnimationEffect ? @"关闭我的特效" : YMLocalizedString(@"XPMoreMenuPresenter5");
giftEffect.title = roomInfo.hasAnimationEffect ? YMLocalizedString(@"XPMoreMenuPresenter28") : YMLocalizedString(@"XPMoreMenuPresenter5");
giftEffect.imageName = @"room_more_menu_gift_effect";
giftEffect.type = roomInfo.hasAnimationEffect ? RoomMoreMenuType_Gift_Effect_Close : RoomMoreMenuType_Gift_Effect_Open;
giftEffect.titleColor = [DJDKMIMOMColor roomMoreMenuTextColor];
@@ -50,38 +50,38 @@
wishGift.titleColor = [DJDKMIMOMColor roomMoreMenuTextColor];
XPRoomMoreItemModel * dating = [[XPRoomMoreItemModel alloc] init];
dating.title = roomInfo.roomModeType == RoomModeType_Open_Blind ? @"相亲中.." : YMLocalizedString(@"XPMoreMenuPresenter8");
dating.title = roomInfo.roomModeType == RoomModeType_Open_Blind ? YMLocalizedString(@"XPMoreMenuPresenter29") : YMLocalizedString(@"XPMoreMenuPresenter8");
dating.imageName = @"room_more_menu_dating";
dating.type = roomInfo.roomModeType == RoomModeType_Open_Blind ? RoomMoreMenuType_Room_Dating_Close : RoomMoreMenuType_Room_Dating_Open;
dating.titleColor = [DJDKMIMOMColor roomMoreMenuTextColor];
XPRoomMoreItemModel * acrossRoomPK = [[XPRoomMoreItemModel alloc] init];
acrossRoomPK.title = roomInfo.roomModeType == RoomModeType_Open_AcrossRoomPK_mode ? @"跨房PK中" : @"跨房PK";
acrossRoomPK.title = roomInfo.roomModeType == RoomModeType_Open_AcrossRoomPK_mode ? YMLocalizedString(@"XPMoreMenuPresenter30") : YMLocalizedString(@"XPMoreMenuPresenter31");
acrossRoomPK.imageName = @"room_more_menu_cross_pk";
acrossRoomPK.type = roomInfo.roomModeType == RoomModeType_Open_AcrossRoomPK_mode ? RoomMoreMenuType_Room_Across_PK_Close : RoomMoreMenuType_Room_Across_PK_Open;
acrossRoomPK.titleColor = [DJDKMIMOMColor roomMoreMenuTextColor];
XPRoomMoreItemModel * anchorRoomPK = [[XPRoomMoreItemModel alloc] init];
anchorRoomPK.title = roomInfo.roomModeType == RoomModeType_Open_AcrossRoomPK_mode ? @"主播PK中" : @"主播PK";
anchorRoomPK.title = roomInfo.roomModeType == RoomModeType_Open_AcrossRoomPK_mode ? YMLocalizedString(@"XPMoreMenuPresenter32") : YMLocalizedString(@"XPMoreMenuPresenter33");
anchorRoomPK.imageName = @"room_more_menu_anchor_pk";
anchorRoomPK.type = roomInfo.roomModeType == RoomModeType_Open_AcrossRoomPK_mode ? RoomMoreMenuType_Room_Anchor_PK_Close : RoomMoreMenuType_Room_Anchor_PK_Open;
anchorRoomPK.titleColor = [DJDKMIMOMColor roomMoreMenuTextColor];
if (roomInfo.pkState == AcrossRoomPkStateTypePenalty) {
if ([roomInfo.winUid isEqualToString:[AccountInfoStorage instance].getUid]) {
anchorRoomPK.title = @"结束PK";
anchorRoomPK.title = YMLocalizedString(@"XPMoreMenuPresenter15");
} else if ([roomInfo.winUid isEqualToString:roomInfo.pkUid]) {
anchorRoomPK.title = YMLocalizedString(@"XPMoreMenuPresenter14");
} else {
anchorRoomPK.title = @"结束PK";
anchorRoomPK.title = YMLocalizedString(@"XPMoreMenuPresenter15");
}
} else if (roomInfo.pkState == AcrossRoomPkStateTypePenaltyEnd) {
anchorRoomPK.title = @"结束PK";
anchorRoomPK.title = YMLocalizedString(@"XPMoreMenuPresenter15");
}
if (roomInfo.pkMatchStartTime) {
anchorRoomPK.title = YMLocalizedString(@"XPMoreMenuPresenter17");
}
XPRoomMoreItemModel * messageScreen = [[XPRoomMoreItemModel alloc] init];
messageScreen.title = roomInfo.isCloseScreen ? @"开启公屏" : YMLocalizedString(@"XPMoreMenuPresenter19");
messageScreen.title = roomInfo.isCloseScreen ? YMLocalizedString(@"XPMoreMenuPresenter34") : YMLocalizedString(@"XPMoreMenuPresenter19");
messageScreen.imageName = @"room_more_menu_message";
messageScreen.type = roomInfo.isCloseScreen ? RoomMoreMenuType_Message_Screen_Open : RoomMoreMenuType_Message_Screen_Close;
messageScreen.titleColor = [DJDKMIMOMColor roomMoreMenuTextColor];

22
YuMi/Modules/YMRoom/View/MoreView/View/XPRoomMoreMenuViewController.m
View File

@@ -245,7 +245,7 @@ UIKIT_EXTERN NSString * const kRoomGiftEffectUpdateNotificationKey;
}
TTAlertConfig * config = [[TTAlertConfig alloc] init];
config.title = @"";
config.message = @"关闭礼物值将会清除当前麦上所有礼物值数据，确认关闭吗？";
config.message = YMLocalizedString(@"XPRoomMoreMenuViewController3");
[TTPopup alertWithConfig:config confirmHandler:^{
[self.presenter closeRoomGiftValue:roomUid];
} cancelHandler:^{
@@ -303,13 +303,13 @@ UIKIT_EXTERN NSString * const kRoomGiftEffectUpdateNotificationKey;
case RoomMoreMenuType_Room_Dating_Open:
{
if (self.roomInfo.roomModeType == RoomModeType_Open_AcrossRoomPK_mode) {
[self showErrorToast:@"跨房PK中不可开启相亲模式!"];
[self showErrorToast:YMLocalizedString(@"XPRoomMoreMenuViewController6")];
[self dismissViewControllerAnimated:NO completion:nil];
return;
}
if (self.roomInfo.roomModeType == RoomModeType_Open_PK_Mode) {
[self showErrorToast:@"房间PK中不可开启相亲模式!"];
[self showErrorToast:YMLocalizedString(@"XPRoomMoreMenuViewController7")];
[self dismissViewControllerAnimated:NO completion:nil];
return;
}
@@ -329,7 +329,7 @@ UIKIT_EXTERN NSString * const kRoomGiftEffectUpdateNotificationKey;
[StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventroom_more_tool_click eventAttributes:@{@"roomMoreMenuType" : @"closeRoomDating"}];
TTAlertConfig * config = [[TTAlertConfig alloc] init];
config.title = YMLocalizedString(@"XPRoomMoreMenuViewController10");
config.message = @"关闭相亲模式？";
config.message = YMLocalizedString(@"XPRoomMoreMenuViewController11");
config.confirmButtonConfig.title = YMLocalizedString(@"XPRoomMoreMenuViewController12");
[TTPopup alertWithConfig:config confirmHandler:^{
[self.presenter closeRoomDating:roomUid];
@@ -347,13 +347,13 @@ UIKIT_EXTERN NSString * const kRoomGiftEffectUpdateNotificationKey;
case RoomMoreMenuType_Room_Across_PK_Open:
{
if (self.roomInfo.roomModeType == RoomModeType_Open_Blind) {
[self showErrorToast:@"相亲中不可开启跨房PK!"];
[self showErrorToast:YMLocalizedString(@"XPRoomMoreMenuViewController13")];
[self dismissViewControllerAnimated:NO completion:nil];
return;
}
if (self.roomInfo.roomModeType == RoomModeType_Open_PK_Mode) {
[self showErrorToast:@"PK中不可以开启跨房PK！"];
[self showErrorToast:YMLocalizedString(@"XPRoomMoreMenuViewController14")];
[self dismissViewControllerAnimated:NO completion:nil];
return;
}
@@ -366,7 +366,7 @@ UIKIT_EXTERN NSString * const kRoomGiftEffectUpdateNotificationKey;
case RoomMoreMenuType_Room_Across_PK_Close:
{
[StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventroom_more_tool_click eventAttributes:@{@"roomMoreMenuType" : @"closeAcrossPk"}];
[self showErrorToast:@"正在跨房PK中!"];
[self showErrorToast:YMLocalizedString(@"XPRoomMoreMenuViewController15")];
[self dismissViewControllerAnimated:NO completion:nil];
}
break;
@@ -374,7 +374,7 @@ UIKIT_EXTERN NSString * const kRoomGiftEffectUpdateNotificationKey;
{
if (self.hostDelegate.getRoomInfo.pkMatchStartTime) {//PK匹配中
TTAlertConfig *config = [[TTAlertConfig alloc] init];
config.message = @"取消匹配？";
config.message = YMLocalizedString(@"XPRoomMoreMenuViewController16");
[TTPopup alertWithConfig:config confirmHandler:^{
[self.presenter requestCancelMatchRandomPK:roomUid];
} cancelHandler:^{
@@ -414,7 +414,7 @@ UIKIT_EXTERN NSString * const kRoomGiftEffectUpdateNotificationKey;
[StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventroom_more_tool_click eventAttributes:@{@"roomMoreMenuType" : @"clearScreen"}];
TTAlertConfig * config = [[TTAlertConfig alloc] init];
config.title = YMLocalizedString(@"XPRoomMoreMenuViewController17");
config.message = @"确定要清空公屏消息吗？\n(清空后不可恢复哦~)";
config.message = YMLocalizedString(@"XPRoomMoreMenuViewController18");
config.confirmButtonConfig.title = YMLocalizedString(@"XPRoomMoreMenuViewController19");
[TTPopup alertWithConfig:config confirmHandler:^{
[self.presenter cleanScreen:roomUid uid:[AccountInfoStorage instance].getUid];
@@ -426,13 +426,13 @@ UIKIT_EXTERN NSString * const kRoomGiftEffectUpdateNotificationKey;
case RoomMoreMenuType_Room_PK_Open:
{
if (self.roomInfo.roomModeType == RoomModeType_Open_Blind) {
[self showErrorToast:@"相亲中不可以开启PK模式！"];
[self showErrorToast:YMLocalizedString(@"XPRoomMoreMenuViewController20")];
[self dismissViewControllerAnimated:NO completion:nil];
return;
}
if (self.roomInfo.roomModeType == RoomModeType_Open_AcrossRoomPK_mode) {
[self showErrorToast:@"跨房PK中不可以开启PK模式！"];
[self showErrorToast:YMLocalizedString(@"XPRoomMoreMenuViewController21")];
[self dismissViewControllerAnimated:NO completion:nil];
return;
}

4
YuMi/Modules/YMRoom/View/NewUserGift/XPNewUserRoomGiftView.m
View File

@@ -95,7 +95,7 @@
#pragma mark - Getters And Setters
- (void)setGiftInfo:(GiftInfoModel *)giftInfo {
NSString *giftStr = [NSString stringWithFormat:@"%@*%zd", giftInfo.giftName, giftInfo.count];
NSMutableAttributedString *str = [[NSMutableAttributedString alloc] initWithString:@"获得新人礼物 " attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:12],NSForegroundColorAttributeName:UIColorFromRGB(0xEEFEEC)}];
NSMutableAttributedString *str = [[NSMutableAttributedString alloc] initWithString:YMLocalizedString(@"XPNewUserRoomGiftView0") attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:12],NSForegroundColorAttributeName:UIColorFromRGB(0xEEFEEC)}];
[str appendAttributedString:[[NSMutableAttributedString alloc] initWithString:giftStr attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:12 weight:UIFontWeightHeavy],NSForegroundColorAttributeName:UIColorFromRGB(0xEEFEEC)}]];
self.titleLabel.attributedText = str;
self.iconImageView.imageUrl = giftInfo.giftUrl;
@@ -117,7 +117,7 @@
_descLabel.textAlignment = NSTextAlignmentCenter;
_descLabel.font = [UIFont systemFontOfSize:12];
_descLabel.textColor = UIColorFromRGB(0xEEFEEC);
_descLabel.text = @"已放入背包，尽快使用吧~";
_descLabel.text = YMLocalizedString(@"XPNewUserRoomGiftView1");
}
return _descLabel;
}

6
YuMi/Modules/YMRoom/View/NewUserGreet/XPRoomNewUserGreetView.m
View File

@@ -106,9 +106,9 @@
- (void)setSayHelloUserAvatarList:(NSArray<NSString *> *)sayHelloUserAvatarList {
if (sayHelloUserAvatarList.count > 0) {
if (sayHelloUserAvatarList.count == 1) {
self.titleLabel.text = @"Ta向你发送了一条消息~";
self.titleLabel.text = YMLocalizedString(@"XPRoomNewUserGreetView0");
}else {
self.titleLabel.text = @"Ta们向你发送了多条消息~";
self.titleLabel.text = YMLocalizedString(@"XPRoomNewUserGreetView1");
}
[self.titleLabel sizeToFit];
}
@@ -163,7 +163,7 @@
_titleLabel = [[UILabel alloc] init];
_titleLabel.font = [UIFont systemFontOfSize:13 weight:UIFontWeightMedium];
_titleLabel.textColor = [UIColor whiteColor];
_titleLabel.text = @"Ta向你发送了多条消息~";
_titleLabel.text = YMLocalizedString(@"XPRoomNewUserGreetView2");
}
return _titleLabel;
}

6
YuMi/Modules/YMRoom/View/ReleaseRadio/View/XPReleaseRadioViewController.m
View File

@@ -145,7 +145,7 @@ static NSString *const KXPReleaseRadioTableViewCellIdentifier = @"KXPReleaseRadi
- (void)setupData {
self.releaseNumLabel.text = [NSString stringWithFormat:@"%zd/%zd",self.model.availableTimes, self.model.total];
self.releaseTimeDescLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPReleaseRadioViewController1"), self.model.minutes];
self.radioTextView.placeholderText = [NSString stringWithFormat:@"输入内容不能少于%zd个字，请文明发言哦~", self.model.minWords] ;
self.radioTextView.placeholderText = [NSString stringWithFormat:YMLocalizedString(@"XPReleaseRadioViewController2"), self.model.minWords] ;
self.releaseTimeDescLabel.hidden = self.model.seconds > 0;
self.countDownStackView.hidden = self.model.seconds <= 0;
if (self.model.seconds > 0) {
@@ -380,7 +380,7 @@ static NSString *const KXPReleaseRadioTableViewCellIdentifier = @"KXPReleaseRadi
- (UILabel *)headDescLabel {
if (!_headDescLabel) {
_headDescLabel = [[UILabel alloc] init];
_headDescLabel.text = @"你将在首页发布一条广播，邀请其他用户进入当前房间！";
_headDescLabel.text = YMLocalizedString(@"XPReleaseRadioViewController4");
_headDescLabel.font = [UIFont systemFontOfSize:10];
_headDescLabel.textColor = [DJDKMIMOMColor secondTextColor];
}
@@ -432,7 +432,7 @@ static NSString *const KXPReleaseRadioTableViewCellIdentifier = @"KXPReleaseRadi
_radioTextView.backgroundColor = UIColorFromRGB(0xF1F1FA);
_radioTextView.layer.cornerRadius = 8;
_radioTextView.layer.masksToBounds = YES;
_radioTextView.placeholderText = @"输入内容不能少于5个字，请文明发言哦~";
_radioTextView.placeholderText = YMLocalizedString(@"XPReleaseRadioViewController7");
_radioTextView.placeholderTextColor = [DJDKMIMOMColor textThirdColor];
_radioTextView.placeholderFont = [UIFont systemFontOfSize:12];
_radioTextView.font = [UIFont systemFontOfSize:12];

8
YuMi/Modules/YMRoom/View/RoomHeaderView/RoomHeaderView.m
View File

@@ -210,9 +210,9 @@
///最小化进房 人数不对的问题
[[[NIMSDK sharedSDK] chatroomManager] fetchChatroomInfo:[NSString stringWithFormat:@"%ld", (long)self.hostDelegate.getRoomInfo.roomId] completion:^(NSError * _Nullable error, NIMChatroom * _Nullable chatroom) {
if (error == nil) {
self.idLabel.text = [NSString stringWithFormat:@"在线:%ld ID:%ld", (long)(chatroom.onlineUserCount > 0 ? chatroom.onlineUserCount : 0), (long)roomInfo.erbanNo];
self.idLabel.text = [NSString stringWithFormat:YMLocalizedString(@"RoomHeaderView3"), (long)(chatroom.onlineUserCount > 0 ? chatroom.onlineUserCount : 0), (long)roomInfo.erbanNo];
} else {
self.idLabel.text = [NSString stringWithFormat:@"在线:%ld ID:%ld", (long)(roomInfo.onlineNum > 0 ? roomInfo.onlineNum : 0), (long)roomInfo.erbanNo];
self.idLabel.text = [NSString stringWithFormat:YMLocalizedString(@"RoomHeaderView3"), (long)(roomInfo.onlineNum > 0 ? roomInfo.onlineNum : 0), (long)roomInfo.erbanNo];
}
}];
@@ -236,7 +236,7 @@
- (void)onRoomUpdate {
RoomInfoModel* roomInfo = self.hostDelegate.getRoomInfo;
self.titleLabel.text = roomInfo.title;
self.idLabel.text = [NSString stringWithFormat:@"在线:%ld ID:%ld", (long)(roomInfo.onlineNum > 0 ? roomInfo.onlineNum : 0), (long)roomInfo.erbanNo];
self.idLabel.text = [NSString stringWithFormat:YMLocalizedString(@"RoomHeaderView3"), (long)(roomInfo.onlineNum > 0 ? roomInfo.onlineNum : 0), (long)roomInfo.erbanNo];
self.giftEffectImageView.hidden = roomInfo.hasAnimationEffect;
if (roomInfo.uid == [AccountInfoStorage instance].getUid.integerValue) {
self.collectButton.hidden = YES;
@@ -259,7 +259,7 @@
RoomInfoModel * roomInfo = [self.hostDelegate getRoomInfo];
XPShareInfoModel * shareInfo = [[XPShareInfoModel alloc] init];
shareInfo.shareTitle = YMLocalizedString(@"RoomHeaderView10");
shareInfo.shareContent = [NSString stringWithFormat:@"%@ 这个房间很好玩，推荐给你，快来和我一起玩吧~", roomInfo.title];
shareInfo.shareContent = [NSString stringWithFormat:YMLocalizedString(@"RoomHeaderView11"), roomInfo.title];
shareInfo.shareImageUrl = [self.hostDelegate getRoomInfo].avatar;
shareInfo.type = ShareType_Room;
shareInfo.roomUid = roomInfo.uid;

2
YuMi/Modules/YMRoom/View/RoomPK/View/Cell/XPRoomPKTypeTableViewCell.m
View File

@@ -70,7 +70,7 @@
- (UILabel *)typeLabel {
if (!_typeLabel) {
_typeLabel = [[UILabel alloc] init];
_typeLabel.text = @"按团队PK";
_typeLabel.text = YMLocalizedString(@"XPRoomPKTypeTableViewCell1");
_typeLabel.font = [UIFont systemFontOfSize:14];
_typeLabel.textColor = [DJDKMIMOMColor mainTextColor];
}

2
YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKPlayingView.m
View File

@@ -207,7 +207,7 @@
- (void)setPkDetailInfo:(RoomPKInfoModel *)pkDetailInfo {
_pkDetailInfo = pkDetailInfo;
if (_pkDetailInfo) {
self.voteModeLabel.text = _pkDetailInfo.voteMode == RoomPKVoteModeType_GiftValue ? @"按礼物价值" : YMLocalizedString(@"XPRoomPKPlayingView1");
self.voteModeLabel.text = _pkDetailInfo.voteMode == RoomPKVoteModeType_GiftValue ? YMLocalizedString(@"XPRoomPKVoteTableViewCell1") : YMLocalizedString(@"XPRoomPKPlayingView1");
}
}

8
YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKProgressView.m
View File

@@ -835,7 +835,7 @@
#pragma mark - XPRoomPKPlayingViewDelegate
- (void)xPRoomPKPlayingView:(XPRoomPKPlayingView *)view didClickResetBegin:(UIButton *)sender {
[TTPopup dismiss];
[TTPopup alertWithMessage:@"重新开始将会提前结束本次PK\n确认重新开始吗?" confirmHandler:^{
[TTPopup alertWithMessage:YMLocalizedString(@"XPRoomPKProgressView3") confirmHandler:^{
RoomPKInfoModel * roompkInfo = self.roomPKInfo;
NSString * roomUid = [NSString stringWithFormat:@"%ld", self.roomInfo.uid];
[Api createRoomPK:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
@@ -866,7 +866,7 @@
NSString * roomUid = [NSString stringWithFormat:@"%ld", self.roomInfo.uid];
if (self.redChooseArray.count > 0 && self.blueChooseArray.count > 0) {
if (self.roomPKInfo.pkStatus == RoomPKStatusType_End || self.roomPKInfo.pkStatus == RoomPKStatusType_ReStart) {
[TTPopup alertWithMessage:@"是否再次开始PK?" confirmHandler:^{
[TTPopup alertWithMessage:YMLocalizedString(@"XPRoomPKProgressView10") confirmHandler:^{
[Api createRoomPK:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
if (code == 200) {
RoomPKInfoModel * newRoomPKInfo = [RoomPKInfoModel modelWithDictionary:data.data];
@@ -891,7 +891,7 @@
} else if(self.roomPKInfo.pkStatus == RoomPKStatusType_Playing) {
[self didTapBackImageRecognizer];
} else if(self.roomPKInfo.pkStatus == RoomPKStatusType_NonStart) {
[TTPopup alertWithMessage:@"当前正在准备阶段，是否确认准备开始PK?" confirmHandler:^{
[TTPopup alertWithMessage:YMLocalizedString(@"XPRoomPKProgressView5" ) confirmHandler:^{
NSString * teamJsonStr = [self roomPKTeamJsonString];
///开始PK
[Api begainRoomPK:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
@@ -1085,7 +1085,7 @@
- (UIButton *)beginButton {
if (!_beginButton) {
_beginButton = [UIButton buttonWithType:UIButtonTypeCustom];
[_beginButton setTitle:@"开始PK" forState:UIControlStateNormal];
[_beginButton setTitle:YMLocalizedString(@"XPRoomPKProgressView9") forState:UIControlStateNormal];
[_beginButton setTitleColor:UIColorFromRGB(0x602A06) forState:UIControlStateNormal];
_beginButton.titleLabel.font = [UIFont systemFontOfSize:15];
[_beginButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xFFDAA8), UIColorFromRGB(0xFFBD64)] gradientType:GradientTypeUpleftToLowright imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal];

44
YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKResultView.m
View File

@@ -312,9 +312,9 @@
self.bottomImageView.image = [UIImage imageNamed:@"room_pk_result_bottom_loser_bg"];
}
[self.resultButton setTitle:@"· 蓝队战绩 ·" forState:UIControlStateNormal];
[self.resultButton setTitle:YMLocalizedString(@"XPRoomPKResultView0") forState:UIControlStateNormal];
[self.resultButton setTitleColor:kBlueTeamColor forState:UIControlStateNormal];
[self.checkButton setTitle:@"查看我的战绩>" forState:UIControlStateNormal];
[self.checkButton setTitle:YMLocalizedString(@"XPRoomPKResultView1") forState:UIControlStateNormal];
[self.checkButton setTitleColor:kRedTeamColor forState:UIControlStateNormal];
self.fightScoreLable.groupType = GroupType_Blue;
self.guardScoreLable.groupType = GroupType_Blue;
@@ -354,8 +354,8 @@
self.topImageView.image = [UIImage imageNamed:@"room_pk_result_top_draw_bg"];
self.bottomImageView.image = [UIImage imageNamed:@"room_pk_result_bottom_loser_bg"];
}
[self.resultButton setTitle:@"· 红队战绩 ·" forState:UIControlStateNormal];
[self.checkButton setTitle:@"查看对方战绩>" forState:UIControlStateNormal];
[self.resultButton setTitle:YMLocalizedString(@"XPRoomPKResultView3") forState:UIControlStateNormal];
[self.checkButton setTitle:YMLocalizedString(@"XPRoomPKResultView4") forState:UIControlStateNormal];
[self.resultButton setTitleColor:kRedTeamColor forState:UIControlStateNormal];
[self.checkButton setTitleColor:kBlueTeamColor forState:UIControlStateNormal];
self.fightScoreLable.groupType = GroupType_Red;
@@ -400,9 +400,9 @@
self.bottomImageView.image = [UIImage imageNamed:@"room_pk_result_bottom_win_bg"];
}
[self.resultButton setTitle:@"· 红队战绩 ·" forState:UIControlStateNormal];
[self.resultButton setTitle:YMLocalizedString(@"XPRoomPKResultView6") forState:UIControlStateNormal];
[self.resultButton setTitleColor:kRedTeamColor forState:UIControlStateNormal];
[self.checkButton setTitle:@"查看我的战绩>" forState:UIControlStateNormal];
[self.checkButton setTitle:YMLocalizedString(@"XPRoomPKResultView7") forState:UIControlStateNormal];
[self.checkButton setTitleColor:kBlueTeamColor forState:UIControlStateNormal];
self.fightScoreLable.groupType = GroupType_Red;
self.guardScoreLable.groupType = GroupType_Red;
@@ -441,9 +441,9 @@
self.bottomImageView.image = [UIImage imageNamed:@"room_pk_result_bottom_loser_bg"];
self.topImageView.image = [UIImage imageNamed:@"room_pk_result_top_draw_bg"];
}
[self.resultButton setTitle:@"· 蓝队战绩 ·" forState:UIControlStateNormal];
[self.resultButton setTitle:YMLocalizedString(@"XPRoomPKResultView9") forState:UIControlStateNormal];
[self.resultButton setTitleColor:kBlueTeamColor forState:UIControlStateNormal];
[self.checkButton setTitle:@"查看红队战绩>" forState:UIControlStateNormal];
[self.checkButton setTitle:YMLocalizedString(@"XPRoomPKResultView10") forState:UIControlStateNormal];
[self.checkButton setTitleColor:kRedTeamColor forState:UIControlStateNormal];
self.fightScoreLable.groupType = GroupType_Blue;
@@ -478,9 +478,9 @@
self.topImageView.image = [UIImage imageNamed:@"room_pk_result_top_loser_bg"];
self.bottomImageView.image = [UIImage imageNamed:@"room_pk_result_bottom_loser_bg"];
if (self.roomPKResultInfoModel.result == RoomPKResultType_Blue) {
[self.resultButton setTitle:@"· 红队战绩 ·" forState:UIControlStateNormal];
[self.resultButton setTitle:YMLocalizedString(@"XPRoomPKResultView6") forState:UIControlStateNormal];
[self.resultButton setTitleColor:kRedTeamColor forState:UIControlStateNormal];
[self.checkButton setTitle:@"查看蓝队战绩>" forState:UIControlStateNormal];
[self.checkButton setTitle:YMLocalizedString(@"XPRoomPKResultView13") forState:UIControlStateNormal];
[self.checkButton setTitleColor:kBlueTeamColor forState:UIControlStateNormal];
self.fightScoreLable.groupType = GroupType_Red;
self.guardScoreLable.groupType = GroupType_Red;
@@ -493,9 +493,9 @@
}
self.guardScoreLable.content = [NSString stringWithFormat:@"%lld", redPKTeam.protecScore];
} else {
[self.resultButton setTitle:@"· 蓝队战绩 ·" forState:UIControlStateNormal];
[self.resultButton setTitle:YMLocalizedString(@"XPRoomPKResultView9") forState:UIControlStateNormal];
[self.resultButton setTitleColor:kBlueTeamColor forState:UIControlStateNormal];
[self.checkButton setTitle:@"查看红队战绩>" forState:UIControlStateNormal];
[self.checkButton setTitle:YMLocalizedString(@"XPRoomPKResultView10") forState:UIControlStateNormal];
[self.checkButton setTitleColor:kRedTeamColor forState:UIControlStateNormal];
self.fightScoreLable.groupType = GroupType_Blue;
self.guardScoreLable.groupType = GroupType_Blue;
@@ -530,9 +530,9 @@
if (self.roomPKResultInfoModel.result == RoomPKResultType_Blue) { // win
self.topImageView.image = [UIImage imageNamed:@"room_pk_result_top_win_bg"];
self.bottomImageView.image = [UIImage imageNamed:@"room_pk_result_bottom_win_bg"];
[self.resultButton setTitle:@"· 蓝队胜利 ·" forState:UIControlStateNormal];
[self.resultButton setTitle:YMLocalizedString(@"XPRoomPKResultView18") forState:UIControlStateNormal];
[self.resultButton setTitleColor:kBlueTeamColor forState:UIControlStateNormal];
[self.checkButton setTitle:@"查看红队战绩>" forState:UIControlStateNormal];
[self.checkButton setTitle:YMLocalizedString(@"XPRoomPKResultView10") forState:UIControlStateNormal];
[self.checkButton setTitleColor:kRedTeamColor forState:UIControlStateNormal];
self.fightScoreLable.groupType = GroupType_Blue;
@@ -549,9 +549,9 @@
} else if (self.roomPKResultInfoModel.result == RoomPKResultType_Red) { // loser
self.topImageView.image = [UIImage imageNamed:@"room_pk_result_top_win_bg"];
self.bottomImageView.image = [UIImage imageNamed:@"room_pk_result_bottom_win_bg"];
[self.resultButton setTitle:@"· 红队胜利 ·" forState:UIControlStateNormal];
[self.resultButton setTitle:YMLocalizedString(@"XPRoomPKResultView21") forState:UIControlStateNormal];
[self.resultButton setTitleColor:kRedTeamColor forState:UIControlStateNormal];
[self.checkButton setTitle:@"查看蓝队战绩>" forState:UIControlStateNormal];
[self.checkButton setTitle:YMLocalizedString(@"XPRoomPKResultView13") forState:UIControlStateNormal];
[self.checkButton setTitleColor:kBlueTeamColor forState:UIControlStateNormal];
self.fightScoreLable.groupType = GroupType_Red;
@@ -568,12 +568,12 @@
} else { // 平局
self.bottomImageView.image = [UIImage imageNamed:@"room_pk_result_bottom_loser_bg"];
self.topImageView.image = [UIImage imageNamed:@"room_pk_result_top_draw_bg"];
[self.resultButton setTitle:@"· 势均力敌 ·" forState:UIControlStateNormal];
[self.resultButton setTitle:YMLocalizedString(@"XPRoomPKResultView24") forState:UIControlStateNormal];
[self.resultButton setTitleColor:kRedTeamColor forState:UIControlStateNormal];
self.checkButton.hidden = YES;
self.fightScoreLable.groupType = GroupType_Red;
self.pkUserContaierView.hidden = YES;
self.fightScoreLable.title = @"本局平局 战斗值:";
self.fightScoreLable.title = YMLocalizedString(@"XPRoomPKResultView25");
self.fightScoreLable.content = [NSString stringWithFormat:@"%lld", redPKTeam.score];
[self loadTeamMemberUserAvatar:redPKTeam.teamMembers mvpUserId:redPKTeam.mvp];
}
@@ -641,7 +641,7 @@
_pkUserLabel = [[UILabel alloc] init];
_pkUserLabel.font = [UIFont systemFontOfSize:14];
_pkUserLabel.textColor = [UIColor whiteColor];
_pkUserLabel.text = @"PK选手:";
_pkUserLabel.text = YMLocalizedString(@"XPRoomPKResultView26");
}
return _pkUserLabel;
}
@@ -649,7 +649,7 @@
- (XPRomPKResultTitleLabel *)fightScoreLable {
if (!_fightScoreLable) {
_fightScoreLable = [[XPRomPKResultTitleLabel alloc] init];
_fightScoreLable.title = @"战斗值:";
_fightScoreLable.title = YMLocalizedString(@"XPRoomPKResultView27");
}
return _fightScoreLable;
}
@@ -657,7 +657,7 @@
- (XPRomPKResultTitleLabel *)guardPersonLable {
if (!_guardPersonLable) {
_guardPersonLable = [[XPRomPKResultTitleLabel alloc] init];
_guardPersonLable.title = @"守护者:";
_guardPersonLable.title = YMLocalizedString(@"XPRoomPKResultView28");
}
return _guardPersonLable;
}
@@ -665,7 +665,7 @@
- (XPRomPKResultTitleLabel *)guardScoreLable {
if (!_guardScoreLable) {
_guardScoreLable = [[XPRomPKResultTitleLabel alloc] init];
_guardScoreLable.title = @"守护值:";
_guardScoreLable.title = YMLocalizedString(@"XPRoomPKResultView29");
}
return _guardScoreLable;
}

6
YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKViewController.m
View File

@@ -84,7 +84,7 @@
#pragma mark - Private Method
- (void)initSubViews {
self.title = @"创建PK";
self.title = YMLocalizedString(@"XPRoomPKViewController0");
self.duraTime = 30;
self.voteType = RoomPKVoteModeType_GiftValue;
NSArray * array = self.hostDelegate.getRoomPKGroupTeamList;
@@ -365,7 +365,7 @@
}
- (void)closePKButtonAction:(UIButton *)sender {
NSString * title = @"结束PK,会关闭现在进行的PK并恢复普通房间模式，确定关闭当前PK吗？";
NSString * title = YMLocalizedString(@"XPRoomPKViewController3");
[TTPopup alertWithMessage:title confirmHandler:^{
NSString * roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid];
[self.presenter closeRoomPK:roomUid];
@@ -376,7 +376,7 @@
}
- (void)onceAgainPKButtonAction:(UIButton *)sender {
NSString * title = @"创建此PK，会覆盖现在进行的PK,\n 确定覆盖当前PK吗？";
NSString * title = YMLocalizedString(@"XPRoomPKViewController4");
[TTPopup alertWithMessage:title confirmHandler:^{
NSString * roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid];
[self.presenter createRoomPKMode:2 voteMode:self.voteType duration:self.duraTime roomUid:roomUid];

2
YuMi/Modules/YMRoom/View/RoomRecommend/XPRoomRecommendView.m
View File

@@ -192,7 +192,7 @@
- (NSMutableArray *)titleArray {
if (!_titleArray) {
_titleArray = [NSMutableArray arrayWithObjects:@"收起房间", @"退出房间", YMLocalizedString(@"XPRoomRecommendView3"), nil];
_titleArray = [NSMutableArray arrayWithObjects:YMLocalizedString(@"XPRoomRecommendView1"), YMLocalizedString(@"XPRoomRecommendView2"), YMLocalizedString(@"XPRoomRecommendView3"), nil];
}
return _titleArray;
}

4
YuMi/Modules/YMRoom/View/Sailing/View/XPSailingAnimationView.m
View File

@@ -65,13 +65,13 @@
RoomSailingPrizeModel * info = [RoomSailingPrizeModel modelWithDictionary:_prizeInfo];
NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init];
CGFloat fontSize = 12;
[attribute appendAttributedString:[self createAttribute:@"厉害了! " color:[UIColor whiteColor] fontSize:fontSize]];
[attribute appendAttributedString:[self createAttribute:YMLocalizedString(@"XPRoomMessageParser12") color:[UIColor whiteColor] fontSize:fontSize]];
NSString * nick = info.nick;
if (nick.length > 6) {
nick = [nick substringToIndex:6];
}
[attribute appendAttributedString:[self createAttribute:nick color:UIColorFromRGB(0xFFFE95) fontSize:fontSize]];
[attribute appendAttributedString:[self createAttribute:@"在航海冒险中获得 " color:[UIColor whiteColor] fontSize:fontSize]];
[attribute appendAttributedString:[self createAttribute:YMLocalizedString(@"XPRoomMessageParser13") color:[UIColor whiteColor] fontSize:fontSize]];
[attribute appendAttributedString:[self createAttribute:info.prizeName color:UIColorFromRGB(0xFFFE95) fontSize:fontSize]];
if (info.prizeNum > 1) {
[attribute appendAttributedString:[self createAttribute:[NSString stringWithFormat:@" X%d", info.prizeNum] color:[UIColor whiteColor] fontSize:fontSize]];

2
YuMi/Modules/YMRoom/View/Sailing/View/XPSailingBuyFuelView.m
View File

@@ -97,7 +97,7 @@
_titleLabel = [[UILabel alloc] init];
_titleLabel.font = [UIFont systemFontOfSize:15];
_titleLabel.textColor = UIColorFromRGB(0x64472E);
_titleLabel.text = @"当前燃油不足 \n 可参与活动获得燃油哦~";
_titleLabel.text = YMLocalizedString(@"XPSailingBuyFuelView0");
_titleLabel.textAlignment = NSTextAlignmentCenter;
_titleLabel.numberOfLines = 2;
}

2
YuMi/Modules/YMRoom/View/Sailing/View/XPSailingRankView.m
View File

@@ -123,7 +123,7 @@
}
- (NSArray<NSString *> *)titles {
return @[@"今日榜单", YMLocalizedString(@"XPSailingRankView1")];
return @[YMLocalizedString(@"XPSailingRankView2"), YMLocalizedString(@"XPSailingRankView1")];
}
- (UIImageView *)backImageView {

2
YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftEmptyCollectionViewCell.m
View File

@@ -57,7 +57,7 @@
- (UILabel *)emptyPackTip {
if (!_emptyPackTip) {
_emptyPackTip = [[UILabel alloc] init];
_emptyPackTip.text = @"背包暂无内容~";;
_emptyPackTip.text = YMLocalizedString(@"XPGiftEmptyCollectionViewCell0");;
_emptyPackTip.textColor = [DJDKMIMOMColor secondTextColor];
_emptyPackTip.font = [UIFont systemFontOfSize:12];
_emptyPackTip.textAlignment = NSTextAlignmentCenter;

4
YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftBarView.m
View File

@@ -337,7 +337,7 @@
normaleColor = [DJDKMIMOMColor textThirdColor];
highlightColor = [DJDKMIMOMColor giftNameSelectColor];
}
NSString * title = [NSString stringWithFormat:@"余额：%@", diamonds];
NSString * title = [NSString stringWithFormat:YMLocalizedString(@"XPGiftBarView0"), diamonds];
NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] initWithString:title attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:12], NSForegroundColorAttributeName:normaleColor}];
[attribute addAttribute:NSForegroundColorAttributeName value:highlightColor range:[title rangeOfString:diamonds]];
self.balanceLabel.attributedText = attribute;
@@ -427,7 +427,7 @@
_sendGiftButton = [UIButton buttonWithType:UIButtonTypeCustom];
[_sendGiftButton setTitle:YMLocalizedString(@"XPGiftBarView2") forState:UIControlStateNormal];
[_sendGiftButton setTitleColor:[DJDKMIMOMColor mainTextColor] forState:UIControlStateNormal];
[_sendGiftButton setTitle:@"赠送中..." forState:UIControlStateDisabled];
[_sendGiftButton setTitle:YMLocalizedString(@"XPGiftBarView3" ) forState:UIControlStateDisabled];
[_sendGiftButton setTitleColor:[DJDKMIMOMColor disableButtonTextColor] forState:UIControlStateDisabled];
[_sendGiftButton setTitle:YMLocalizedString(@"XPGiftBarView4") forState:UIControlStateSelected];
[_sendGiftButton setTitleColor:[DJDKMIMOMColor disableButtonTextColor] forState:UIControlStateSelected];

4
YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftInfoView.m
View File

@@ -238,7 +238,7 @@ static NSString *kSendGiftViewHidePunishNewIcon = @"kSendGiftViewHidePunishNewIc
giftTotal += gift.count * gift.goldPrice;
}
}];
NSMutableAttributedString *str = [[NSMutableAttributedString alloc] initWithString:@"总价值:" attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:10],NSForegroundColorAttributeName:[DJDKMIMOMColor textThirdColor]}];
NSMutableAttributedString *str = [[NSMutableAttributedString alloc] initWithString:YMLocalizedString(@"XPGiftInfoView0" ) attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:10],NSForegroundColorAttributeName:[DJDKMIMOMColor textThirdColor]}];
[str appendAttributedString:[[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"%@",[self countFormatCoinStr:giftTotal]] attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:12],NSForegroundColorAttributeName:[DJDKMIMOMColor appMainColor]}]];
NSTextAttachment *attachImage = [[NSTextAttachment alloc] init];
attachImage.image = [UIImage imageNamed:@"gift_diamond"];
@@ -325,7 +325,7 @@ static NSString *kSendGiftViewHidePunishNewIcon = @"kSendGiftViewHidePunishNewIc
- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
if ((self.segmentType ==GiftSegmentType_Pack || self.segmentType == GiftSegmentType_WeekStar) && self.datasource.count == 0) {
XPGiftEmptyCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPGiftEmptyCollectionViewCell class]) forIndexPath:indexPath];
cell.emptyTitle = @"暂时木有礼物~";
cell.emptyTitle = YMLocalizedString(@"XPGiftInfoView1");
return cell;
}

2
YuMi/Modules/YMRoom/View/SendGiftView/View/XPSendGiftView.m
View File

@@ -660,7 +660,7 @@ UIKIT_EXTERN NSString * kShowFirstRechargeView;
GiftInfoModel * giftInfo = self.giftInfoView.lastSelectGift;
TTAlertConfig *config = [[TTAlertConfig alloc] init];
config.actionStyle = TTAlertActionConfirmStyle;
config.message = [NSString stringWithFormat:@"尚未达到赠送%@所需要的贵族等级哦\n所需贵族等级：%@", giftInfo.giftName, giftInfo.giftVipInfo.vipName];
config.message = [NSString stringWithFormat:YMLocalizedString(@"XPSendGiftView4"), giftInfo.giftName, giftInfo.giftVipInfo.vipName];
[TTPopup alertWithConfig:config confirmHandler:^{
} cancelHandler:^{

4
YuMi/Modules/YMRoom/View/SendRedPacket/XPReceiveRedPacketView.m
View File

@@ -269,7 +269,7 @@
self.diamondLabel.text = resultData.currentUserAmount;
self.getLabel.text = YMLocalizedString(@"XPReceiveRedPacketView1");
} else if (resultData.redEnvelopeState == RedPacketState_Remain_Zero) {//抢光了
self.getLabel.text = @"抢完了，下次早点来哦~";
self.getLabel.text = YMLocalizedString(@"XPReceiveRedPacketView2");
[self.getLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerX.mas_equalTo(self);
make.top.mas_equalTo(self.bgImageView).mas_offset(59);
@@ -443,7 +443,7 @@
label.font = [UIFont systemFontOfSize:12];
label.textColor = UIColorFromRGB(0xCF9380);
label.textAlignment = NSTextAlignmentCenter;
label.text = @"抢完了，下次早点来哦~";
label.text = YMLocalizedString(@"XPReceiveRedPacketView2");
_getLabel = label;
}
return _getLabel;

4
YuMi/Modules/YMRoom/View/SendRedPacket/XPRoomRedPacketPwdView.m
View File

@@ -176,9 +176,9 @@
if (!_forgetBtn) {
_forgetBtn = [[UIButton alloc] init];
[_forgetBtn addTarget:self action:@selector(onFogetButtonClick:) forControlEvents:UIControlEventTouchUpInside];
[_forgetBtn setTitle:@"忘记密码？" forState:UIControlStateNormal];
[_forgetBtn setTitle:YMLocalizedString(@"XPRoomRedPacketPwdView1") forState:UIControlStateNormal];
[_forgetBtn setTitleColor:UIColorFromRGB(0xEA3B36) forState:UIControlStateNormal];
_forgetBtn.font = [UIFont systemFontOfSize:13];
_forgetBtn.titleLabel.font = [UIFont systemFontOfSize:13];
}
return _forgetBtn;
}

10
YuMi/Modules/YMRoom/View/SendRedPacket/XPRoomSendRedPacketViewController.m
View File

@@ -306,17 +306,17 @@
//判断红包数量
NSInteger packetCount = [self.packetTextField.text integerValue];
if (packetCount > 100 || packetCount < 1) {
[self showErrorToast:@"红包数量不能小于1或大于100！"];
[self showErrorToast:YMLocalizedString(@"XPRoomSendRedPacketViewController17")];
return;
}
//判断钻石数量
NSInteger diamonCount = [self.diamondTextField.text integerValue];
if (diamonCount > 999999 || diamonCount < 100) {
[self showErrorToast:@"钻石数量不能小于100或大于999999！"];
[self showErrorToast:YMLocalizedString(@"XPRoomSendRedPacketViewController18")];
return;
}
if (diamonCount % 10 != 0) {
[self showErrorToast:@"钻石数必须为10的倍数！"];
[self showErrorToast:YMLocalizedString(@"XPRoomSendRedPacketViewController19")];
return;
}
[self.presenter getUserModel];
@@ -357,7 +357,7 @@
[TTPopup dismiss];
NSString *roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid];
NSNumber *type = self.roomButton.isSelected ? @(1) : @(2);
NSString *message = self.wishTextView.text.length ? self.wishTextView.text : @"恭喜发财，大吉大利！";
NSString *message = self.wishTextView.text.length ? self.wishTextView.text :YMLocalizedString(@"XPRoomSendRedPacketViewController4");
[self.presenter sendRedPacketWithNum:self.packetTextField.text goldNum:self.diamondTextField.text roomUid:roomUid type:type password:pwd message:message];
}
@@ -691,7 +691,7 @@
- (UILabel *)wishPlaceHolderLabel {
if (!_wishPlaceHolderLabel) {
UILabel *label = [[UILabel alloc] init];
label.text = @"恭喜发财，大吉大利！";
label.text = YMLocalizedString(@"XPRoomSendRedPacketViewController4");
label.font = [UIFont systemFontOfSize:16];
label.textColor = UIColorRGBAlpha(0xffffff, 0.5);
_wishPlaceHolderLabel = label;

2
YuMi/Modules/YMRoom/View/Setting/View/XPRoomInviteUserViewController.m
View File

@@ -52,7 +52,7 @@
#pragma mark - Private Method
- (void)initSubViews {
self.title = self.isManagerOrOwner ? @"在线房主/管理员" : YMLocalizedString(@"XPRoomInviteUserViewController1");
self.title = self.isManagerOrOwner ? YMLocalizedString(@"XPRoomInviteUserViewController3") : YMLocalizedString(@"XPRoomInviteUserViewController1");
[self.view addSubview:self.tableView];
}

10
YuMi/Modules/YMRoom/View/Setting/View/XPRoomSettingViewController.m
View File

@@ -302,9 +302,9 @@ XPRoomSettingItemModel * itemModel = [[self.datasource safeObjectAtIndex1:indexP
if (self.roomInfo.roomModeType == RoomModeType_Open_Blind) return;
NSString *msg;
if (isOn) {
msg = @"开启排麦模式要排队才能上麦，确定开启吗？";
msg = YMLocalizedString(@"XPRoomSettingViewController1");
} else {
msg = @"关闭排麦模式后会清空排麦列表哦，确定关闭吗？";
msg = YMLocalizedString(@"XPRoomSettingViewController2");
}
TTAlertConfig *config = [[TTAlertConfig alloc] init];
config.title = YMLocalizedString(@"XPRoomSettingViewController3");
@@ -329,7 +329,7 @@ XPRoomSettingItemModel * itemModel = [[self.datasource safeObjectAtIndex1:indexP
}
TTAlertConfig *config = [[TTAlertConfig alloc] init];
config.message = @"开启离开模式后，房主会固定显示在房主位，确认开启吗？";
config.message = YMLocalizedString(@"XPRoomSettingViewController4" );
config.shouldDismissOnBackgroundTouch = NO;
[TTPopup alertWithConfig:config confirmHandler:^{
@@ -361,7 +361,7 @@ XPRoomSettingItemModel * itemModel = [[self.datasource safeObjectAtIndex1:indexP
}
TTAlertConfig *config = [[TTAlertConfig alloc] init];
config.title = YMLocalizedString(@"XPRoomSettingViewController5");
config.message = @"关闭后将看不到礼物特效，运作更加流畅。是否确认关闭礼物特效?";
config.message = YMLocalizedString(@"XPRoomSettingViewController6");
config.shouldDismissOnBackgroundTouch = NO;
[TTPopup alertWithConfig:config confirmHandler:^{
@@ -380,7 +380,7 @@ XPRoomSettingItemModel * itemModel = [[self.datasource safeObjectAtIndex1:indexP
}
TTAlertConfig *config = [[TTAlertConfig alloc] init];
config.title = YMLocalizedString(@"XPRoomSettingViewController7");
config.message = @"关闭后将看不到聊天信息，运作更加流畅。是否确认关闭公屏?";
config.message = YMLocalizedString(@"XPRoomSettingViewController8");
config.shouldDismissOnBackgroundTouch = NO;
[TTPopup alertWithConfig:config confirmHandler:^{
[self.presenter updateRoomMessageScreenState:YES roomId:roomId];

4
YuMi/Modules/YMRoom/View/Setting/View/XPRoomTagListViewController.m
View File

@@ -51,7 +51,7 @@
[self.presenter getRoomTagList];
} else {
[self.presenter getRoomClassifyList];
self.titleLabel.text = @"快给您的房间选个分类吧！";
self.titleLabel.text = YMLocalizedString(@"XPRoomTagListViewController0");
}
[self initSubViews];
[self initSubViewConstraints];
@@ -201,7 +201,7 @@
_titleLabel = [[UILabel alloc] init];
_titleLabel.textColor = UIColor.whiteColor;
_titleLabel.font = [UIFont systemFontOfSize:22];
_titleLabel.text = @"快给您的房间选个标签吧！";
_titleLabel.text = YMLocalizedString(@"XPRoomTagListViewController1");
}
return _titleLabel;
}

6
YuMi/Modules/YMRoom/View/StageView/AnchorStageView.m
View File

@@ -157,7 +157,7 @@
NIMChatroomMember * member = members.firstObject;
if (!member) return;
// 2.0.0 锁麦/解锁
NSString * lockTitle = micModel.microState.posState == MicroPosStateType_Free ? @"锁麦" : YMLocalizedString(@"AnchorStageView1");
NSString * lockTitle = micModel.microState.posState == MicroPosStateType_Free ? YMLocalizedString(@"StageView23") : YMLocalizedString(@"AnchorStageView1");
TTActionSheetConfig *lockMic = [TTActionSheetConfig normalTitle:lockTitle clickAction:^{
NSString * roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid];
NSString * state = micModel.microState.posState == MicroPosStateType_Free ? @"1" : @"0";
@@ -168,7 +168,7 @@
} roomUid:roomUid state:state position:position ticket:ticket uid:uid];
}];
// 2.0.1 闭麦/开麦
NSString * muteTitle = micModel.microState.micState == MicroMicStateType_Open ? @"闭麦" : YMLocalizedString(@"AnchorStageView3");
NSString * muteTitle = micModel.microState.micState == MicroMicStateType_Open ? YMLocalizedString(@"StageView25") : YMLocalizedString(@"AnchorStageView3");
TTActionSheetConfig *muteMic = [TTActionSheetConfig normalTitle:muteTitle clickAction:^{
NSString * roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid];
NSString * state = micModel.microState.micState == MicroMicStateType_Open ? @"1" : @"0";
@@ -199,7 +199,7 @@
if (microView) {
[XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"AnchorStageView5")];
} else {
[XNDJTDDLoadingTool showErrorWithMessage:@"让主播抱你上麦进行更多互动吧~"];
[XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"AnchorStageView6")];
[self sendMessageToRoomOwnerWithUserModel:self.hostDelegate.getUserInfo];
}
}

4
YuMi/Modules/YMRoom/View/StageView/DatingStageView.m
View File

@@ -201,7 +201,7 @@
if ([super getIndexByUid:[AccountInfoStorage instance].getUid] != -1) {
[XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"DatingStageView0")];
} else {
[XNDJTDDLoadingTool showErrorWithMessage:@"需要排麦才可以上麦哦~"];
[XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"StageView20")];
}
} else {
[super didSelectAtIndex:index];
@@ -218,7 +218,7 @@
if (roomInfo.blindDateVipUid == [AccountInfoStorage instance].getUid.integerValue) {
NSString * position = [self indexToPosition:index];
// 2.1.3 闭麦/开麦
NSString * muteTitle = micModel.microState.micState == MicroMicStateType_Open ? @"闭麦" : YMLocalizedString(@"DatingStageView3");
NSString * muteTitle = micModel.microState.micState == MicroMicStateType_Open ? YMLocalizedString(@"StageView25") : YMLocalizedString(@"DatingStageView3");
TTActionSheetConfig *muteMic = [TTActionSheetConfig normalTitle:muteTitle clickAction:^{
NSString * roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid];
NSString * state = micModel.microState.micState == MicroMicStateType_Open ? @"1" : @"0";

6
YuMi/Modules/YMRoom/View/StageView/MicroView/Dating/DatingMicroView.m
View File

@@ -168,7 +168,7 @@
MicroQueueModel *sequence = [micQueue objectForKey:[NSString stringWithFormat:@"%d", userInfo.selectMicPosition]];
NSString *selectNum;
if (sequence.userInfo.vipMic) {
selectNum = @"选VIP";
selectNum = YMLocalizedString(@"DatingMicroView5");
} else {
selectNum = [NSString stringWithFormat:YMLocalizedString(@"DatingMicroView6"), (userInfo.selectMicPosition + 1)];
}
@@ -209,7 +209,7 @@
MicroQueueModel *sequence = [micQueue objectForKey:[NSString stringWithFormat:@"%d", userInfo.selectMicPosition]];
NSString *selectNum;
if (sequence.userInfo.vipMic) {
selectNum = @"选VIP";
selectNum = YMLocalizedString(@"DatingMicroView5");
} else {
selectNum = [NSString stringWithFormat:YMLocalizedString(@"DatingMicroView12"), (userInfo.selectMicPosition + 1)];
}
@@ -250,7 +250,7 @@
MicroQueueModel *sequence = [micQueue objectForKey:[NSString stringWithFormat:@"%d", userInfo.selectMicPosition]];
NSString *selectNum;
if (sequence.userInfo.vipMic) {
selectNum = @"选VIP";
selectNum = YMLocalizedString(@"DatingMicroView5");
} else {
selectNum = [NSString stringWithFormat:YMLocalizedString(@"DatingMicroView19"), (userInfo.selectMicPosition + 1)];
}

2
YuMi/Modules/YMRoom/View/StageView/MicroView/MicroGiftValueView.m
View File

@@ -65,7 +65,7 @@
if (giftValue < 1000000) {
value = @(giftValue).stringValue;
} else if (giftValue >= 100000000) {
value = @"9999万+";
value = YMLocalizedString(@"MicroGiftValueView0");
} else {
value = [NSString stringWithFormat:YMLocalizedString(@"MicroGiftValueView1"), giftValue/10000];
}

18
YuMi/Modules/YMRoom/View/StageView/StageView.m
View File

@@ -519,7 +519,7 @@
[RtcManager instance].localMuted = YES;
TTAlertConfig *config = [[TTAlertConfig alloc] init];
config.title = YMLocalizedString(@"StageView0");
config.message = @"你已被房主或管理员拉上麦，但并未开启麦克风。如需要说话，请打开麦克风。";
config.message = YMLocalizedString(@"XPMiniRoomView3");
[TTPopup alertWithConfig:config confirmHandler:^{
} cancelHandler:^{
@@ -669,7 +669,7 @@
}
MicroQueueModel* micModel = [self.micQueue objectForKey:up];
if (micModel.userInfo) {///麦上已经有人,不上麦
[XNDJTDDLoadingTool showErrorWithMessage:@"该麦位已经有人了哦~"];
[XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"StageView4")];
return;
}
NIMChatroomQueueUpdateRequest *request = [[NIMChatroomQueueUpdateRequest alloc]init];
@@ -724,12 +724,12 @@
// 2.1.2 锁麦/解锁
NSString * lockTitle;
if (roomInfo.roomModeType == RoomModeType_Open_Micro_Mode) {
lockTitle = micModel.microState.posState == MicroPosStateType_Free ? @"切换为排麦" : YMLocalizedString(@"StageView8");
lockTitle = micModel.microState.posState == MicroPosStateType_Free ? YMLocalizedString(@"StageView22") : YMLocalizedString(@"StageView8");
}else {
lockTitle = micModel.microState.posState == MicroPosStateType_Free ? @"锁麦" : YMLocalizedString(@"StageView10");
lockTitle = micModel.microState.posState == MicroPosStateType_Free ? YMLocalizedString(@"StageView23") : YMLocalizedString(@"StageView10");
}
if (![ClientConfig shareConfig].canOpen) {
lockTitle = micModel.microState.posState == MicroPosStateType_Free ? @"锁定坑位" : YMLocalizedString(@"StageView12");
lockTitle = micModel.microState.posState == MicroPosStateType_Free ? YMLocalizedString(@"StageView24") : YMLocalizedString(@"StageView12");
}
TTActionSheetConfig *lockMic = [TTActionSheetConfig normalTitle:lockTitle clickAction:^{
NSString * roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid];
@@ -742,9 +742,9 @@
}];
// 2.1.3 闭麦/开麦
NSString * muteTitle = micModel.microState.micState == MicroMicStateType_Open ? @"闭麦" : YMLocalizedString(@"StageView14");
NSString * muteTitle = micModel.microState.micState == MicroMicStateType_Open ? YMLocalizedString(@"StageView25") : YMLocalizedString(@"StageView14");
if (![ClientConfig shareConfig].canOpen) {
muteTitle = micModel.microState.micState == MicroMicStateType_Open ? @"关闭麦位话筒" : YMLocalizedString(@"StageView16");
muteTitle = micModel.microState.micState == MicroMicStateType_Open ? YMLocalizedString(@"StageView26") : YMLocalizedString(@"StageView16");
}
TTActionSheetConfig *muteMic = [TTActionSheetConfig normalTitle:muteTitle clickAction:^{
NSString * roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid];
@@ -757,7 +757,7 @@
}];
// 抱Ta上麦
NSString * inviteTitle = ([position isEqualToString:@"-1"] && roomInfo.roomModeType == RoomModeType_Open_Blind) ? @"抱Ta上麦当主持" : YMLocalizedString(@"StageView18");
NSString * inviteTitle = ([position isEqualToString:@"-1"] && roomInfo.roomModeType == RoomModeType_Open_Blind) ? YMLocalizedString(@"StageView27") : YMLocalizedString(@"StageView18");
TTActionSheetConfig *inviteMic = [TTActionSheetConfig normalTitle:inviteTitle clickAction:^{
XPRoomInviteUserViewController * inviteUserMicVC = [[XPRoomInviteUserViewController alloc] init];
inviteUserMicVC.isManagerOrOwner = ([position isEqualToString:@"-1"] && roomInfo.roomModeType == RoomModeType_Open_Blind);
@@ -779,7 +779,7 @@
if ([self getIndexByUid:[AccountInfoStorage instance].getUid] != -1) {
[XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"StageView19")];
} else {
[XNDJTDDLoadingTool showErrorWithMessage:@"需要排麦才可以上麦哦~"];
[XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"StageView20")];
}
}
return;

10
YuMi/Modules/YMRoom/View/UserCard/Presenter/XPUserCardPresenter.m
View File

@@ -172,7 +172,7 @@
XPUserCardItemModel * item = [[XPUserCardItemModel alloc] init];
item.type = UserCardItemType_Invite_Micro;
if (i == 0) {
item.title = roomInfo.roomModeType == RoomModeType_Open_Blind ? @"主持位" : YMLocalizedString(@"XPUserCardPresenter1");
item.title = roomInfo.roomModeType == RoomModeType_Open_Blind ?YMLocalizedString(@"XPUserCardPresenter21") : YMLocalizedString(@"XPUserCardPresenter1");
item.imageName = roomInfo.leaveMode ? @"usercard_invite_micro_owner_disable" : @"usercard_invite_micro_owner";
if (roomInfo.leaveMode) {
item.isEnable = NO;
@@ -213,17 +213,17 @@
MicroQueueModel * micQueue = [userInfo.micQueue objectForKey:userInfo.position];
NSMutableArray * array = [NSMutableArray array];
XPUserCardMicroItemModel * muteItem = [[XPUserCardMicroItemModel alloc] init];
muteItem.title = userInfo.micState == MicroMicStateType_Open ? @"闭麦" : YMLocalizedString(@"XPUserCardPresenter6");
muteItem.title = userInfo.micState == MicroMicStateType_Open ? YMLocalizedString(@"StageView25") : YMLocalizedString(@"XPUserCardPresenter6");
muteItem.status = userInfo.micState == MicroMicStateType_Open;
muteItem.type = UserCardMicroType_Mute;
XPUserCardMicroItemModel * upDownItem = [[XPUserCardMicroItemModel alloc] init];
upDownItem.title = userInfo.position.length <= 0 ? @"抱Ta上麦" : [uid isEqualToString:targetUid] ? @"下麦旁听" : YMLocalizedString(@"XPUserCardPresenter9");
upDownItem.title = userInfo.position.length <= 0 ? YMLocalizedString(@"StageView18") : [uid isEqualToString:targetUid] ? YMLocalizedString(@"StageView28") : YMLocalizedString(@"XPUserCardPresenter9");
upDownItem.status = userInfo.position.length > 0 ? YES : NO;
upDownItem.type = UserCardMicroType_UpDown;
XPUserCardMicroItemModel * lockItem = [[XPUserCardMicroItemModel alloc] init];
lockItem.title = userInfo.posState == MicroPosStateType_Free ? @"锁麦" : YMLocalizedString(@"XPUserCardPresenter11");
lockItem.title = userInfo.posState == MicroPosStateType_Free ? YMLocalizedString(@"StageView23") : YMLocalizedString(@"XPUserCardPresenter11");
lockItem.status = userInfo.posState == MicroPosStateType_Free;
lockItem.type = UserCardMicroType_Lock;
@@ -641,7 +641,7 @@
- (XPUserCardItemModel *)attentionItem {
if (!_attentionItem) {
_attentionItem = [[XPUserCardItemModel alloc] init];
_attentionItem.title = @"关注Ta";
_attentionItem.title = YMLocalizedString(@"StageView29");
_attentionItem.imageName = @"usercard_attention_normal";
_attentionItem.selectTitle = YMLocalizedString(@"XPUserCardPresenter16");
_attentionItem.selectImageName = @"usercard_attention_disable";

24
YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.m
View File

@@ -791,15 +791,15 @@
if (self.targetUserInfo.userVipInfoVO.preventKick) {
//2、判断是否为管理员操作
if (self.cardInfo.roomInfo.uid != [AccountInfoStorage instance].getUid.integerValue) {
[self showErrorToast:[NSString stringWithFormat:@"该用户为%@贵族，只有房主才可以踢出哦~", self.targetUserInfo.userVipInfoVO.vipName]];
[self showErrorToast:[NSString stringWithFormat:YMLocalizedString(@"XPUserCardViewController4"), self.targetUserInfo.userVipInfoVO.vipName]];
} else {//房主操作
NSString *message = [NSString stringWithFormat:@"该用户为%@贵族\n确认是否要将其踢出房间？", self.targetUserInfo.userVipInfoVO.vipName];
NSString *message = [NSString stringWithFormat:YMLocalizedString(@"XPUserCardViewController5"), self.targetUserInfo.userVipInfoVO.vipName];
TTAlertConfig *config = [[TTAlertConfig alloc] init];
config.title = @"";
config.message = message;
[TTPopup alertWithConfig:config confirmHandler:^{
if ([self isInSudGame:self.cardInfo.uid]) {
NSString *message = [NSString stringWithFormat:@"游戏模式下默认该玩家退出游戏是否要将此用户踢出房间？"];
NSString *message = [NSString stringWithFormat:YMLocalizedString(@"XPUserCardViewController6")];
TTAlertConfig *config = [[TTAlertConfig alloc] init];
config.title = @"";
config.message = message;
@@ -816,7 +816,7 @@
return;
}
if ([self isInSudGame:self.cardInfo.uid]) {
NSString *message = [NSString stringWithFormat:@"游戏模式下默认该玩家退出游戏是否要将此用户踢出房间？"];
NSString *message = YMLocalizedString(@"XPUserCardViewController6");
TTAlertConfig *config = [[TTAlertConfig alloc] init];
config.title = @"";
config.message = message;
@@ -829,7 +829,7 @@
} cancelHandler:^{
}];
} else {
NSString *message = [NSString stringWithFormat:@"是否需要将%@踢出房间？",self.targetUserInfo.nick];
NSString *message = [NSString stringWithFormat:YMLocalizedString(@"XPUserCardViewController8"),self.targetUserInfo.nick];
TTAlertConfig *config = [[TTAlertConfig alloc] init];
config.title = YMLocalizedString(@"XPUserCardViewController9");
config.message = message;
@@ -851,15 +851,15 @@
if (self.targetUserInfo.userVipInfoVO.preventKick) {
//2、判断是否为管理员操作
if (self.cardInfo.roomInfo.uid != [AccountInfoStorage instance].getUid.integerValue) {
[self showErrorToast:[NSString stringWithFormat:@"该用户为%@贵族，只有房主才可以踢出哦~", self.targetUserInfo.userVipInfoVO.vipName]];
[self showErrorToast:[NSString stringWithFormat:YMLocalizedString(@"XPUserCardViewController4"), self.targetUserInfo.userVipInfoVO.vipName]];
} else {//房主操作
NSString *message = [NSString stringWithFormat:@"该用户为%@贵族\n确认是否要将其拉黑？", self.targetUserInfo.userVipInfoVO.vipName];
NSString *message = [NSString stringWithFormat:YMLocalizedString(@"XPUserCardViewController11"), self.targetUserInfo.userVipInfoVO.vipName];
TTAlertConfig *config = [[TTAlertConfig alloc] init];
config.title = @"";
config.message = message;
[TTPopup alertWithConfig:config confirmHandler:^{
if ([self isInSudGame:self.cardInfo.uid]) {
NSString *message = [NSString stringWithFormat:@"游戏模式下默认该玩家退出游戏是否要将此用户踢出房间？"];
NSString *message = YMLocalizedString(@"XPUserCardViewController6");
TTAlertConfig *config = [[TTAlertConfig alloc] init];
config.title = @"";
config.message = message;
@@ -888,7 +888,7 @@
} cancelHandler:^{
}];
} else {
NSString *title = [NSString stringWithFormat:@"你正在拉黑%@",self.targetUserInfo.nick];
NSString *title = [NSString stringWithFormat:YMLocalizedString(@"XPUserCardViewController14"),self.targetUserInfo.nick];
TTAlertConfig *config = [[TTAlertConfig alloc] init];
config.title = title;
config.message = YMLocalizedString(@"XPUserCardViewController15");
@@ -977,11 +977,11 @@
if (sender.selected) {
if ([self isInSudGame:self.cardInfo.uid]) {
if (self.cardInfo.uid.integerValue == [AccountInfoStorage instance].getUid.integerValue) {
[self showErrorToast:@"游戏中不可主动下麦！"];
[self showErrorToast:YMLocalizedString(@"XPUserCardViewController17")];
[self dismissViewControllerAnimated:YES completion:nil];
} else {
TTAlertConfig *config = [[TTAlertConfig alloc] init];
config.message = @"抱Ta下麦后默认该玩家退出游戏，是否继续？";
config.message = YMLocalizedString(@"XPUserCardViewController18");
[TTPopup alertWithConfig:config confirmHandler:^{
[self.presenter kickDownMicro:self.cardInfo.position roomId:roomId];
} cancelHandler:^{
@@ -1050,7 +1050,7 @@
- (void)pickHeartButtonAction:(UIButton *)sender {
if (self.cardInfo.position.length > 0) {
TTAlertConfig * config = [[TTAlertConfig alloc] init];
config.title = [NSString stringWithFormat:@"确认选择%d号嘉宾吗？", (self.cardInfo.position.intValue + 1)];
config.title = [NSString stringWithFormat:YMLocalizedString(@"XPUserCardViewController19"), (self.cardInfo.position.intValue + 1)];
config.message = YMLocalizedString(@"XPUserCardViewController20");
config.messageColor = UIColorFromRGB(0xFE5D7F);
config.messageFont = [UIFont systemFontOfSize:14];

4
YuMi/Modules/YMRoom/View/WishGift/View/XPWishGiftCreateItemViewController.m
View File

@@ -322,13 +322,13 @@
#pragma mark - Event Response
- (void)sureButtonAction:(UIButton *)sender {
if (![self canSubtractMinCount:self.number]) {
NSString * toast = [NSString stringWithFormat:@"礼物数量范围需为%d~%d", [self subtractMinCount], [self addMaxCount]];
NSString * toast = [NSString stringWithFormat:YMLocalizedString(@"XPWishGiftCreateItemViewController8"), [self subtractMinCount], [self addMaxCount]];
[self showErrorToast:toast];
self.textField.text = [NSString stringWithFormat:@"%d", [self subtractMinCount]];
self.number = [self subtractMinCount];
return;
} else if(![self canAddMaxCount:self.number]){
NSString * toast = [NSString stringWithFormat:@"礼物数量范围需为%d~%d", [self subtractMinCount], [self addMaxCount]];
NSString * toast = [NSString stringWithFormat:YMLocalizedString(@"XPWishGiftCreateItemViewController8"), [self subtractMinCount], [self addMaxCount]];
[self showErrorToast:toast];
self.textField.text = [NSString stringWithFormat:@"%d", [self addMaxCount]];
self.number = [self addMaxCount];

6
YuMi/Modules/YMRoom/View/WishGift/View/XPWishGiftCreateViewController.m
View File

@@ -152,7 +152,7 @@
if (info) {
TTAlertConfig * config = [[TTAlertConfig alloc] init];
config.title = @"";
config.message = @"确认删除该条数据？";
config.message = YMLocalizedString(@"XPWishGiftCreateViewController3");
[TTPopup alertWithConfig:config confirmHandler:^{
[self.presenter deleteWishGiftItem:self.roomUid itemId:[NSString stringWithFormat:@"%ld", info.itemId]];
} cancelHandler:^{
@@ -212,7 +212,7 @@
if (self.datasource.count > 0) {
TTAlertConfig * config = [[TTAlertConfig alloc] init];
config.title = @"";
config.message = @"确认清空当前数据？";
config.message = YMLocalizedString(@"XPWishGiftCreateViewController4");
[TTPopup alertWithConfig:config confirmHandler:^{
[self.presenter deleteWishGiftItem:self.roomUid itemId:@"-1"];
} cancelHandler:^{
@@ -225,7 +225,7 @@
- (void)addWishButtonAction:(UIButton *)sender {
if (self.datasource.count == 3) {
[self showErrorToast:@"最多只可添加三个心愿呦~"];
[self showErrorToast:YMLocalizedString(@"XPWishGiftCreateViewController6")];
return;
}
XPWishGiftCreateItemViewController * createItemVC = [[XPWishGiftCreateItemViewController alloc] init];

4
YuMi/Modules/YMRoom/View/WishGift/View/XPWishGiftViewController.m
View File

@@ -230,7 +230,7 @@
view.hidden = YES;
}
}
self.titleLabel.text = [NSString stringWithFormat:@"今日心愿礼物%d/%ld",finishNumber,list.count];
self.titleLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPWishGiftViewController2"),finishNumber,list.count];
}
#pragma mark - Event Response
@@ -272,7 +272,7 @@
if (!_tipsLbel) {
_tipsLbel = [[UILabel alloc] init];
_tipsLbel.font = [UIFont systemFontOfSize:10];
_tipsLbel.text = @"-当日设置的心愿，会在次日0点失效-";
_tipsLbel.text = YMLocalizedString(@"XPWishGiftViewController3");
_tipsLbel.textColor = [DJDKMIMOMColor textThirdColor];
}
return _tipsLbel;

2
YuMi/Modules/YMRoom/View/XPMiniRoomView.m
View File

@@ -568,7 +568,7 @@ UIKIT_EXTERN NSString *kRoomKickoutTime;
[RtcManager instance].localMuted = YES;
TTAlertConfig *config = [[TTAlertConfig alloc] init];
config.title = YMLocalizedString(@"XPMiniRoomView2");
config.message = @"你已被房主或管理员拉上麦，但并未开启麦克风。如需要说话，请打开麦克风。";
config.message =YMLocalizedString(@"XPMiniRoomView3");
[TTPopup alertWithConfig:config confirmHandler:^{
} cancelHandler:^{

6
YuMi/Modules/YMRoom/View/XPRoomViewController.m
View File

@@ -1344,7 +1344,7 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出
NSDictionary * spamRes = message.yidunAntiSpamRes.toJSONObject;
NSDictionary * spamResExt = ((NSString *)spamRes[@"ext"]).toJSONObject;
if ([spamResExt[@"antispam"][@"suggestion"] intValue] == 2) {
[self showErrorToast:@"消息中可能含有违规信息，请停止发送类似信息!"];
[self showErrorToast:YMLocalizedString(@"XPRoomViewController10")];
return;
}
}
@@ -1409,7 +1409,7 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出
if (code == 200) {
ArrangeMicModel * arrangeMicModel= [ArrangeMicModel modelWithJSON:data.data];
if (arrangeMicModel.myPos.intValue > 0) {
[TTPopup alertWithMessage:@"退出房间后将退出目前排麦，再次进入需要重新排麦，确认退出房间吗？" confirmHandler:^{
[TTPopup alertWithMessage:YMLocalizedString(@"XPRoomViewController11") confirmHandler:^{
__block NSString * grouptype = @"0";
if (self.roomInfo.roomModeType == RoomModeType_Open_Blind) {
[arrangeMicModel.queue enumerateObjectsUsingBlock:^(ArrangeMicUserModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
@@ -1448,7 +1448,7 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出
if (code == 200) {
ArrangeMicModel * arrangeMicModel= [ArrangeMicModel modelWithJSON:data.data];
if (arrangeMicModel.myPos.intValue > 0) {
[TTPopup alertWithMessage:@"退出房间后将退出目前排麦，再次进入需要重新排麦，确认退出房间吗？" confirmHandler:^{
[TTPopup alertWithMessage:YMLocalizedString(@"XPRoomViewController11") confirmHandler:^{
__block NSString * grouptype = @"0";
[arrangeMicModel.queue enumerateObjectsUsingBlock:^(ArrangeMicUserModel * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
if (obj.uid.integerValue == [AccountInfoStorage instance].getUid.integerValue) {

2
YuMi/Modules/YMWeb/XPWebViewController.m
View File

@@ -516,7 +516,7 @@ NSString * const kJSOpenRoomForGiftId = @"openRoomForGiftId";
shareInfo.shareUrl = urlStr;
XPShareItem *cycle = [XPShareItem itemWitTag:XPShareItemTagFaceBook title:@"FaceBook" imageName:@"share_fb" disableImageName:@"share_fb"];
XPShareItem *wechat = [XPShareItem itemWitTag:XPShareItemTagLine title:@"Line" imageName:@"share_line" disableImageName:@"share_line"];
XPShareItem *qq = [XPShareItem itemWitTag:XPShareItemTagCopyLink title:YMLocalizedString(@"RoomHeaderView3") imageName:@"share_copy_link" disableImageName:@"share_copy_link"];
XPShareItem *qq = [XPShareItem itemWitTag:XPShareItemTagCopyLink title:YMLocalizedString(@"XPWebViewNavView1") imageName:@"share_copy_link" disableImageName:@"share_copy_link"];
NSArray * items = @[wechat,cycle, qq];
CGFloat margin = 15;
CGSize itemSize = CGSizeMake((KScreenWidth-2*margin)/4, 65);