From e59ece722201aee4b1b67a2a1d7f1ac40c8c5130 Mon Sep 17 00:00:00 2001 From: liyuhua <15626451870@163.com> Date: Wed, 19 Jul 2023 14:41:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../noble_open_btn@2x.png | Bin 617 -> 593 bytes .../noble_open_btn@3x.png | Bin 815 -> 1030 bytes YuMi/CustomUI/TTPopup/Config/TTAlertConfig.m | 2 +- YuMi/CustomUI/XNDJTDDLoadingTool.m | 4 +- .../SessionList/SessionListViewController.m | 1 + .../View/XPMineGuildSearchViewController.h | 2 +- .../View/XPMineGuildSearchViewController.m | 6 +- .../Guild/View/XPMineGuildViewController.m | 1 + .../View/SubViews/XPNobleCenterPayView.m | 8 +- .../XPIAPRechargeCollectionViewCell.m | 4 +- .../YMMine/View/XPMineViewController.m | 1 + .../SubViews/XPMonentPublishSuccessView.m | 2 +- .../View/XPMonentsAttentionViewController.m | 2 +- .../View/XPMonentsRecommendViewController.m | 2 +- .../YMMonents/View/XPMonentsViewController.m | 2 +- .../View/Cell/XPSearchListTableViewCell.m | 4 +- .../SubView/XPRoomSearchRecommendHeadView.m | 2 +- .../XPRoomSearchContainerViewController.m | 2 +- .../View/XPRoomSearchRecordViewController.m | 4 +- .../Model/XPRoomStarKitchenModel.h | 2 + .../View/AnimationView/XPRoomAnimationView.m | 2 +- .../Tool/XPRoomMessageParser.m | 65 ++++++--- .../View/AnchorCard/XPAnchorCardView.m | 2 +- .../View/PIFullScreenBannerAnimation.m | 2 +- .../YMTabbar/View/TabbarViewController.m | 2 +- YuMi/Network/HttpRequestHelper.m | 10 +- YuMi/Structure/MVP/View/MvpViewController.m | 6 +- YuMi/Tools/Date/NSDate+DateUtils.m | 4 +- YuMi/zh-Hans.lproj/Localizable.strings | 22 ++- YuMi/zh-Hant.lproj/Localizable.strings | 130 ++++++++++-------- 30 files changed, 185 insertions(+), 111 deletions(-) diff --git a/YuMi/Assets.xcassets/jm/Noble/noble_open_btn.imageset/noble_open_btn@2x.png b/YuMi/Assets.xcassets/jm/Noble/noble_open_btn.imageset/noble_open_btn@2x.png index e9a26841b515778a6bb7992481cb8bbada052794..c65771fe91d27863319b2a9fe3f17c9dbc18773c 100644 GIT binary patch delta 568 zcmV-80>}O71knVLB!8SxOjJbx001{PH#0LcGcz+ZG&D3cG&D3cH8nLgH8nUmI6OQ& zNJvOgQBjhTk~1?iGcz+ZG&D0aGylq0jCDfHq)wWCMP^w%^}nIXXBr^N1669?So-45w^ z$^ZZXQ%OWYR5;7clD)f)`>|XUbeeSTAt0G4a_u3C0R=AQ_j3yA^nU@@9iZq_V2Slk)?nbH=uzN3 zqt+Y@)nk#((T>%-6n*$(eb`bPmtyMxs@yIcRM`x;JtnKY787nyz2V~$04Pdv%MGs| zp-%MpQ(S2raVd1k-vD2_9J&m{Jv1($0&B$}%SyNA&Cm}JiL!-K0FKKt$=O*}%FWR9%~?coYK zzro^ykE|1&&mL6VawDN3qqux8zOO6e7;+9YxntV2v46uVZktr@sEG+NrAzWSjyf2{ zah^zN4sgeyNKFXoAX`{!0e4Eb)7z;iJjd~h;&e-)=L)nbw%xt&?_C>HTY(n9rmlm^ z_p6|;8-SJ)Cdi_Qhha+=Kp1EbgyCrjgyHQ`8h)(KWtlr9FUxavgoeXU2w`v^216LU zQHFw74@u!W3D@10000BYXE4~B$z zTl_vA=H_VjXiMPI4tEy zW!OjfTl#yLe?Jm>Z)3pm1-^S`c(3Yq?=5r6kGF{lvb?d@e|?|F{ARbt9EZAWhvHl27hKPv#HsV|&r1n`4c}hhIln;v!IR~c0oCia!tS!32NrFuibPmRp`CKMHGzNwYnaU^KnPVS`&I|OvNYH}SW z9uW1M_%mw3kHwi$j~O*SG5VczIW6w&SgP$5?`9Fwjj=6ns3;h8b|qe%VXmXE;Z6USh4k1r2UfZ4HK3e5mYEylfliL zup~O(mer~6mGhhaaBmx%dGr3u`qVs}bn2wkwP_W-M{Q5(rmFZg1V4GY(arhqzojuqto6UgD6D2TadSh)%p=n6f)+y4PwKX7=C7Oer0V$Lm6LDiPe?lc zVqQc>%gve$iw@VQp5*;sG?M+@WDGr}FISpvH2=Ey;IdwBx8xl58xMOOr)x^=(wcTQ zukFcc!Q#*pDmuqlT=U;$P8N7~VCKcNyw&0dGPOn5FTXFgygpkxI!RbxZ|e0)vsiP( zdb2!zW@^8iq?|9ok@4>)o2BIElk<`?BD?P}X4EgOyOF29t5oU&v%qAfh3&Ik*Wb^- z(atHkcjf1W>nH4ckadvxZ2?J_3}M0A}+ad zMrLoibo<#!>9+@?*?DVLW=ibXac6CGR?g1TbKTCx-#fqmNB^XzCwkMkHoXq+65Q;s znfE4Zj{drEX1Ve!HOGGboUv1M|I>$EoE;}+{-&H$J=*ZR>dGdezTfs8?NgWhlCKx8 cbNItLU)^|l-@Kwdz*NrQ>FVdQ&MBb@0FCLvasU7T delta 792 zcmV+z1LypP2(Jc^B!8<=OjJex|NlZlLNhZnGcz+YGczH#Dq`N$I*&1fQv?}IT($m!C?Hw z{B5E+Ha))olYbR-riG=XT5kJY!7$&r$S&;79}=#gB)ANVmMP>B%BdhWq&K8omxlF(L| zRopfVJQnk6m!|1Ddu%6<*_usvVy?xY76L4ANf|{(n(t->pIyZDK&}!bCG`0r<=@^D z9`l-yAI?&m%exM-L|x`>&vBv3lvNa?T1_kin%7o*TfqWJPsWivo3d z=t%W`sfhZ}89lKkkGn}*Vbai;w^HU!oO%0b-ng2#%&=Lv7@%42jJrsZg?sad$OkzW WzY$i6Z4oN~0000 *)titles { if (!_titles) { - _titles = @[@"关注",@"推荐", YMLocalizedString(@"XPMonentsViewController3")]; + _titles = @[YMLocalizedString(@"XPMonentsViewController1"),YMLocalizedString(@"XPMonentsViewController2"), YMLocalizedString(@"XPMonentsViewController3")]; } return _titles; } diff --git a/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPSearchListTableViewCell.m b/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPSearchListTableViewCell.m index 523c6d4d..f8d67a76 100644 --- a/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPSearchListTableViewCell.m +++ b/YuMi/Modules/YMNewHome/View/Search/View/Cell/XPSearchListTableViewCell.m @@ -52,7 +52,7 @@ if (resultModel) { self.avatarImageView.imageUrl = resultModel.avatar; self.nickLabel.text = type == SearchType_Room ? resultModel.title : resultModel.nick; - self.idLabel.text = [NSString stringWithFormat:@"%@号:%@",AppName, resultModel.erbanNo]; + self.idLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPMineUserInfoTableViewCell3"),AppName, resultModel.erbanNo]; self.sexImageView.image = resultModel.gender == GenderType_Female ? [UIImage imageNamed:@"common_female"] : [UIImage imageNamed:@"common_male"]; if (type == SearchType_Users) { self.numberLabel.text = YMLocalizedString(@"XPSearchListTableViewCell1"); @@ -72,7 +72,7 @@ if (resultModel) { self.avatarImageView.imageUrl = resultModel.avatar; self.nickLabel.text = resultModel.title ; - self.idLabel.text = [NSString stringWithFormat:@"%@号:%@",AppName, resultModel.erbanNo]; + self.idLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPMineUserInfoTableViewCell3"),AppName, resultModel.erbanNo]; self.sexImageView.image = resultModel.gender == GenderType_Female ? [UIImage imageNamed:@"common_female"] : [UIImage imageNamed:@"common_male"]; if (resultModel.onlineNum > 100) { self.numberLabel.text = [NSString stringWithFormat:@"%ld", resultModel.onlineNum]; diff --git a/YuMi/Modules/YMNewHome/View/Search/View/SubView/XPRoomSearchRecommendHeadView.m b/YuMi/Modules/YMNewHome/View/Search/View/SubView/XPRoomSearchRecommendHeadView.m index 9059897f..eaed0877 100644 --- a/YuMi/Modules/YMNewHome/View/Search/View/SubView/XPRoomSearchRecommendHeadView.m +++ b/YuMi/Modules/YMNewHome/View/Search/View/SubView/XPRoomSearchRecommendHeadView.m @@ -49,7 +49,7 @@ UILabel *label = [[UILabel alloc] init]; label.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; label.textColor = [DJDKMIMOMColor textThirdColor]; - label.text = @"暂无开播厅房~"; + label.text = YMLocalizedString(@"XPRoomSearchRecommendHeadView0"); _emptyTitle = label; } return _emptyTitle; diff --git a/YuMi/Modules/YMNewHome/View/Search/View/XPRoomSearchContainerViewController.m b/YuMi/Modules/YMNewHome/View/Search/View/XPRoomSearchContainerViewController.m index b109fc05..2802bbcc 100644 --- a/YuMi/Modules/YMNewHome/View/Search/View/XPRoomSearchContainerViewController.m +++ b/YuMi/Modules/YMNewHome/View/Search/View/XPRoomSearchContainerViewController.m @@ -252,7 +252,7 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey; } - (NSArray *)titles { - return @[@"房间", YMLocalizedString(@"XPRoomSearchContainerViewController4")]; + return @[YMLocalizedString(@"XPGuildIncomeSectionView0"), YMLocalizedString(@"XPRoomSearchContainerViewController4")]; } - (XPHomeSearchNavView *)searchView { diff --git a/YuMi/Modules/YMNewHome/View/Search/View/XPRoomSearchRecordViewController.m b/YuMi/Modules/YMNewHome/View/Search/View/XPRoomSearchRecordViewController.m index 4289a102..a844c60e 100644 --- a/YuMi/Modules/YMNewHome/View/Search/View/XPRoomSearchRecordViewController.m +++ b/YuMi/Modules/YMNewHome/View/Search/View/XPRoomSearchRecordViewController.m @@ -318,7 +318,7 @@ NSString * const XPConstSearchRecordStoreKey = @"XPConstSearchRecordStoreKey"; TTAlertConfig * config = [[TTAlertConfig alloc] init]; config.confirmButtonConfig.title = YMLocalizedString(@"XPRoomSearchRecordViewController0"); config.cancelButtonConfig.title = YMLocalizedString(@"XPRoomSearchRecordViewController1"); - config.message = @"确定清空搜索记录吗？"; + config.message = YMLocalizedString(@"XPRoomSearchRecordViewController2"); [TTPopup alertWithConfig:config confirmHandler:^{ [self cleanSearchRecord]; [self.searchList removeAllObjects]; @@ -332,7 +332,7 @@ NSString * const XPConstSearchRecordStoreKey = @"XPConstSearchRecordStoreKey"; TTAlertConfig * config = [[TTAlertConfig alloc] init]; config.confirmButtonConfig.title = YMLocalizedString(@"XPRoomSearchRecordViewController3"); config.cancelButtonConfig.title = YMLocalizedString(@"XPRoomSearchRecordViewController4"); - config.message = @"确定清空进房记录吗？"; + config.message = YMLocalizedString(@"XPRoomSearchRecordViewController5"); [TTPopup alertWithConfig:config confirmHandler:^{ [self.presenter cleanInRoomRecord]; } cancelHandler:^{ diff --git a/YuMi/Modules/YMRoom/View/AnimationView/Model/XPRoomStarKitchenModel.h b/YuMi/Modules/YMRoom/View/AnimationView/Model/XPRoomStarKitchenModel.h index 3898b93e..818c84ed 100644 --- a/YuMi/Modules/YMRoom/View/AnimationView/Model/XPRoomStarKitchenModel.h +++ b/YuMi/Modules/YMRoom/View/AnimationView/Model/XPRoomStarKitchenModel.h @@ -25,6 +25,8 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic,copy) NSString *diamonds; ///bannerId @property (nonatomic,copy) NSString * bannerId; +///需要的等级 +@property (nonatomic,assign) NSInteger needLevel; @end NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m index fe17a8d0..975e86b5 100644 --- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m +++ b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m @@ -885,7 +885,7 @@ if (finished) { self.isPlayOfB = NO; [nobleLevelUpView removeFromSuperview]; - if (self.animationListB > 0) { + if (self.animationListB.count > 0) { [self.animationListB removeObjectAtIndex:0]; } if(self.isAnimationListAFinish == YES){ diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageParser.m b/YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageParser.m index e1210caf..293e32e1 100644 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageParser.m +++ b/YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageParser.m @@ -48,7 +48,8 @@ #import "XPRoomTopicAlertView.h" #import "XPRoomSendTextView.h" #import "XPRoomPKResultView.h" - +#import "XPWebViewController.h" +#import "XCCurrentVCStackManager.h" @implementation XPRoomMessageParser - (XPMessageInfoModel*)parseMessageAttribute:(NIMMessage *)message { @@ -124,7 +125,7 @@ } else if (first == CustomMessageType_RedPacket && attachment.second == Custom_Message_Sub_OpenRedPacketSuccess) { return [self createRedPacketAttribute:attachment messageInfo:messageInfo]; } else if (first == CustomMessageType_Graffiti_Star_Kitchen){ - return [self createStarKitchenAttribute:attachment]; + return [self createStarredKitchenAttribute:attachment messageInfo:messageInfo]; } return nil; } @@ -298,23 +299,53 @@ } #pragma mark -星级厨房 -- (NSAttributedString *)createStarKitchenAttribute:(AttachmentModel *)attachment{ - XPRoomStarKitchenModel *starModel = [XPRoomStarKitchenModel modelWithDictionary:attachment.data]; - NSString *title = [NSString stringWithFormat:YMLocalizedString(@"XPRoomMessageParser103"),starModel.nick,starModel.itemMultiple,starModel.diamonds]; - NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] initWithString:title attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:kRoomMessageDefalutFont],NSForegroundColorAttributeName:[DJDKMIMOMColor messageDefaultTextColor]}]; - [attribute addAttributes:@{NSForegroundColorAttributeName:[DJDKMIMOMColor messageNickColor]} range:[title rangeOfString:starModel.nick]]; - [attribute addAttributes:@{NSForegroundColorAttributeName:[DJDKMIMOMColor messageTextColor]} range:[title rangeOfString:[NSString stringWithFormat:@" %@",starModel.itemMultiple]]]; - [attribute addAttributes:@{NSForegroundColorAttributeName:[DJDKMIMOMColor messageTextColor]} range:[title rangeOfString:[NSString stringWithFormat:@" %@",starModel.diamonds]]]; - @kWeakify(self) - [attribute yy_setTextHighlightRange:[title rangeOfString:starModel.nick] color:nil backgroundColor:nil tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { - @kStrongify(self); - if (starModel.uid.integerValue <= 0) {return;} - [self showUserCard:starModel.uid.integerValue]; - }]; +//- (NSAttributedString *)createStarKitchenAttribute:(AttachmentModel *)attachment{ +// XPRoomStarKitchenModel *starModel = [XPRoomStarKitchenModel modelWithDictionary:attachment.data]; +// NSString *title = [NSString stringWithFormat:YMLocalizedString(@"XPRoomMessageParser103"),starModel.nick,starModel.itemMultiple,starModel.diamonds]; +// NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] initWithString:title attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:kRoomMessageDefalutFont],NSForegroundColorAttributeName:[DJDKMIMOMColor messageDefaultTextColor]}]; +// [attribute addAttributes:@{NSForegroundColorAttributeName:[DJDKMIMOMColor messageNickColor]} range:[title rangeOfString:starModel.nick]]; +// [attribute addAttributes:@{NSForegroundColorAttributeName:[DJDKMIMOMColor messageTextColor]} range:[title rangeOfString:[NSString stringWithFormat:@" %@",starModel.itemMultiple]]]; +// [attribute addAttributes:@{NSForegroundColorAttributeName:[DJDKMIMOMColor messageTextColor]} range:[title rangeOfString:[NSString stringWithFormat:@" %@",starModel.diamonds]]]; +// @kWeakify(self) +// [attribute yy_setTextHighlightRange:[title rangeOfString:starModel.nick] color:nil backgroundColor:nil tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { +// @kStrongify(self); +// if (starModel.uid.integerValue <= 0) {return;} +// [self showUserCard:starModel.uid.integerValue]; +// }]; +// +// return attribute; +//} - return attribute; +- (XPMessageInfoModel *)createStarredKitchenAttribute:(AttachmentModel *)attachment messageInfo:(XPMessageInfoModel *)messageInfo{ + XPRoomStarKitchenModel * giftInfo = [XPRoomStarKitchenModel modelWithDictionary:attachment.data]; + NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init]; + CGFloat fontSize = 13; + [attribute appendAttributedString:[self createTextAttribute:@"恭喜" 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:[NSString stringWithFormat:@"%@", giftInfo.diamonds] color:[DJDKMIMOMColor colorWithHexString:@"#00EAFF"] font:fontSize]]; + [attribute appendAttributedString:[self createTextAttribute:@"钻石价值的碎片奖励" color:[UIColor whiteColor] font:fontSize]]; + NSMutableParagraphStyle *paragraphStyle = [NSMutableParagraphStyle new]; + paragraphStyle.lineBreakMode = NSLineBreakByCharWrapping; + paragraphStyle.lineSpacing = 4.0f;//行间距 + paragraphStyle.baseWritingDirection = NSWritingDirectionLeftToRight; + [attribute addAttribute:NSParagraphStyleAttributeName value:paragraphStyle range:NSMakeRange(0, attribute.length)]; + @kWeakify(self); + [attribute yy_setTextHighlightRange:NSMakeRange(0, attribute.length) color:nil backgroundColor:nil tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { + @kStrongify(self); + if (giftInfo &&giftInfo.needLevel < self.hostDelegate.getUserInfo.userLevelVo.experLevelSeq && giftInfo.skipUrl.length > 0) { + XPWebViewController * webVC = [[XPWebViewController alloc] init]; + webVC.url = giftInfo.skipUrl; + [[XCCurrentVCStackManager shareManager].getCurrentVC.navigationController pushViewController:webVC animated:YES]; + } + }]; + messageInfo.content = attribute; + return messageInfo; } - #pragma mark - 红包 - (XPMessageInfoModel *)createRedPacketAttribute:(AttachmentModel *)attachment messageInfo:(XPMessageInfoModel *)messageInfo{ XPOpenRedPacketModel *info = [XPOpenRedPacketModel modelWithDictionary:attachment.data]; diff --git a/YuMi/Modules/YMTabbar/View/AnchorCard/XPAnchorCardView.m b/YuMi/Modules/YMTabbar/View/AnchorCard/XPAnchorCardView.m index 354b9dcb..ae15ae53 100644 --- a/YuMi/Modules/YMTabbar/View/AnchorCard/XPAnchorCardView.m +++ b/YuMi/Modules/YMTabbar/View/AnchorCard/XPAnchorCardView.m @@ -191,7 +191,7 @@ } else { dispatch_async(dispatch_get_main_queue(), ^{ //设置按钮显示读秒效果 - self.countLabel.text = [NSString stringWithFormat:@"剩余%zds", tempTime]; + self.countLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPRoomSearchRecordViewController9"), tempTime]; }); tempTime--; } diff --git a/YuMi/Modules/YMTabbar/View/PIFullScreenBannerAnimation.m b/YuMi/Modules/YMTabbar/View/PIFullScreenBannerAnimation.m index 3fe3878c..0aca3441 100644 --- a/YuMi/Modules/YMTabbar/View/PIFullScreenBannerAnimation.m +++ b/YuMi/Modules/YMTabbar/View/PIFullScreenBannerAnimation.m @@ -379,7 +379,7 @@ if (finished) { self.isPlayOfB = NO; [nobleLevelUpView removeFromSuperview]; - if (self.animationListB > 0) { + if (self.animationListB.count > 0) { [self.animationListB removeObjectAtIndex:0]; } if(self.isAnimationListAFinish == YES){ diff --git a/YuMi/Modules/YMTabbar/View/TabbarViewController.m b/YuMi/Modules/YMTabbar/View/TabbarViewController.m index 0b9f4fd2..5c339f44 100644 --- a/YuMi/Modules/YMTabbar/View/TabbarViewController.m +++ b/YuMi/Modules/YMTabbar/View/TabbarViewController.m @@ -644,7 +644,7 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey; self.viewControllers = nil; NSArray *normalImageNames = @[@"tab_gameHome_normal",@"tab_monents_normal",@"tab_message_normal", @"tab_mine_normal"]; NSArray *selectImageNames = @[@"tab_gameHome_selected",@"tab_monents_select",@"tab_message_selected", @"tab_mine_selected"]; - NSArray *tabLabel = @[@"首页",@"动态",@"消息", YMLocalizedString(@"TabbarViewController5")]; + NSArray *tabLabel = @[YMLocalizedString(@"TabbarViewController2"),YMLocalizedString(@"TabbarViewController3"),YMLocalizedString(@"TabbarViewController4"), YMLocalizedString(@"TabbarViewController5")]; UIViewController *game; UIViewController *msg; diff --git a/YuMi/Network/HttpRequestHelper.m b/YuMi/Network/HttpRequestHelper.m index 4ca2939a..db3db0cf 100644 --- a/YuMi/Network/HttpRequestHelper.m +++ b/YuMi/Network/HttpRequestHelper.m @@ -40,7 +40,7 @@ { if ([AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == 0) { dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.01 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - failure(-1, @"请检查网络连接。"); + failure(-1, YMLocalizedString(@"HttpRequestHelper0")); }); return; } @@ -70,7 +70,7 @@ { if ([AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == 0) { dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.01 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - failure(-1, @"请检查网络连接。"); + failure(-1, YMLocalizedString(@"HttpRequestHelper0")); }); return; @@ -101,7 +101,7 @@ { if ([AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == 0) { dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.01 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - failure(-1, @"请检查网络连接。"); + failure(-1, YMLocalizedString(@"HttpRequestHelper0")); }); return; @@ -211,7 +211,7 @@ // 别问，反正 oauth/ticket 接口要通过这种方式取错误码。 NSHTTPURLResponse *response = error.userInfo[@"com.alamofire.serialization.response.error.response"]; if (response && response.statusCode == 401) { - failure(response.statusCode, @"登录已过期。"); + failure(response.statusCode, YMLocalizedString(@"HttpRequestHelper7")); } else { if (error.code == -1009 || error.code == -1001 || error.code == -1004 || error.code == -1003 || error.code == -1002 || error.code == 3840) { @@ -238,7 +238,7 @@ if ([AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == 0) { dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.01 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - completion(nil, -1, @"请检查网络连接。"); + completion(nil, -1, YMLocalizedString(@"HttpRequestHelper0")); }); return; } diff --git a/YuMi/Structure/MVP/View/MvpViewController.m b/YuMi/Structure/MVP/View/MvpViewController.m index 608084ab..e66ea671 100644 --- a/YuMi/Structure/MVP/View/MvpViewController.m +++ b/YuMi/Structure/MVP/View/MvpViewController.m @@ -51,8 +51,8 @@ - (void)accountCanceled:(NSDictionary *)data { NSString *date = [NSString stringWithFormat:@"%.0f",[[data objectForKey:@"cancelDate"] doubleValue]]; - NSString *dateDes = [NSString stringWithFormat:@"注销时间：%@", [PLTimeUtil getDateWithYYMMDD:date]]; - NSString *msg = [NSString stringWithFormat:@"%@\n\n请联系客服（微信：kefu01）咨询哦!", dateDes]; + NSString *dateDes = [NSString stringWithFormat:YMLocalizedString(@"MvpViewController0"), [PLTimeUtil getDateWithYYMMDD:date]]; + NSString *msg = [NSString stringWithFormat:YMLocalizedString(@"MvpViewController1"), dateDes]; TTAlertMessageAttributedConfig *dateAttrConfig = [[TTAlertMessageAttributedConfig alloc] init]; dateAttrConfig.text = dateDes; dateAttrConfig.color = DJDKMIMOMColor.appMainColor; @@ -101,7 +101,7 @@ TTAlertConfig * config = [[TTAlertConfig alloc] init]; config.title = YMLocalizedString(@"MvpViewController6"); NSString *dateDes = [PLTimeUtil getDateWithYYMMDD:data.date]; - NSString * title = [NSString stringWithFormat:@"您的账号因%@被封禁\n解封时间：%@", data.reason,dateDes]; + NSString * title = [NSString stringWithFormat:YMLocalizedString(@"MvpViewController7"), data.reason,dateDes]; TTAlertMessageAttributedConfig * inviteAlertConfig = [[TTAlertMessageAttributedConfig alloc] init]; inviteAlertConfig.text = dateDes; inviteAlertConfig.color = [DJDKMIMOMColor appMainColor]; diff --git a/YuMi/Tools/Date/NSDate+DateUtils.m b/YuMi/Tools/Date/NSDate+DateUtils.m index 6973ce8a..627a59e1 100644 --- a/YuMi/Tools/Date/NSDate+DateUtils.m +++ b/YuMi/Tools/Date/NSDate+DateUtils.m @@ -76,9 +76,9 @@ NSString * const kDateFormatYYMMDDTHHmmss = @"yyyy-MM-dd'T'HH:mm:ss"; [currentFormatter setDateFormat:@"HH:mm"]; } else { if (date.timeIntervalSince1970 > 0) { - [currentFormatter setDateFormat:@"MM月dd日 HH:mm"]; + [currentFormatter setDateFormat:YMLocalizedString(@"DateUtils0")]; } else{ - [currentFormatter setDateFormat:@"yyyy年MM月dd日 HH:mm"]; + [currentFormatter setDateFormat:YMLocalizedString(@"DateUtils1")]; } } NSString *dateString = [currentFormatter stringFromDate: date]; diff --git a/YuMi/zh-Hans.lproj/Localizable.strings b/YuMi/zh-Hans.lproj/Localizable.strings index 8b6565dd..962f43c1 100644 --- a/YuMi/zh-Hans.lproj/Localizable.strings +++ b/YuMi/zh-Hans.lproj/Localizable.strings @@ -125,6 +125,8 @@ "HttpRequestHelper4" = "大鹅开小差中~请稍后再试"; "HttpRequestHelper5" = "接口报错信息未知"; "HttpRequestHelper6" = "请检查网络连接"; +"HttpRequestHelper7" = "登录已过期。"; + "AppDelegate_ThirdConfig0" = "Piko"; @@ -354,6 +356,8 @@ "XPMineUserInfoTableViewCell0" = "%@号"; "XPMineUserInfoTableViewCell1" = "我是个默认签名"; "XPMineUserInfoTableViewCell2" = "直播中"; +"XPMineUserInfoTableViewCell3" = "%@号:%@"; + "XPMineVisitorEmptyTableViewCell0" = "暂无数据"; @@ -626,6 +630,8 @@ "XPRoomSearchRecordViewController6" = "大家都在搜"; "XPRoomSearchRecordViewController7" = "搜索记录"; "XPRoomSearchRecordViewController8" = "进房记录"; +"XPRoomSearchRecordViewController9" = "剩余%zds"; + "XPHomeRedommendCollectionViewCell0" = "PK中"; "XPHomeRedommendCollectionViewCell1" = "虚位以待"; @@ -1360,7 +1366,7 @@ "XPGiftInfoView1" = "暂时木有礼物"; "XPGiftInfoView2" = "礼物"; "XPGiftInfoView3" = "幸运"; -"XPGiftInfoView4" = "周星礼物"; +"XPGiftInfoView4" = "周星"; "XPGiftInfoView5" = "背包"; "XPGiftInfoView6" = "涂鸦礼物"; "XPGiftInfoView7" = "惩罚礼物"; @@ -1886,6 +1892,8 @@ "XPMonentsMineViewController1" = "删除成功"; "XPMonentsViewController0" = "推荐"; +"XPMonentsViewController1" = "关注"; +"XPMonentsViewController2" = "推荐"; "XPMonentsViewController3" = "最新"; "XPMonentsRecommendHeaderView0" = "推荐话题"; @@ -1958,6 +1966,9 @@ "TabbarViewController0" = "您已被踢下线，若非正常行为，请及时修改密码"; "TabbarViewController1" = "对方撤回了一条消息"; +"TabbarViewController2" = "首页"; +"TabbarViewController3" = "论坛"; +"TabbarViewController4" = "消息"; "TabbarViewController5" = "我的"; "XPLoginPhoneViewController0" = "请输入正确的手机号"; @@ -2052,14 +2063,14 @@ "LoginBindPhoneViewController1" = "手机格式不正确"; "LoginBindPhoneViewController2" = "绑定手机号"; -"MvpViewController0" = "注销时间"; +"MvpViewController0" = "注销时间: %@"; "MvpViewController1" = "%@\n\n请联繫客服（微信：kefu01）咨询哦"; "MvpViewController2" = "该账号已注销"; "MvpViewController3" = "为了营造更安全的网络环境\n保护您和他人的财产安全\n请先进行实名认证"; "MvpViewController4" = "确定"; "MvpViewController5" = "实名认证"; "MvpViewController6" = "您被封号了"; -"MvpViewController7" = "您的账号因%@被封禁\n解封时间"; +"MvpViewController7" = "您的账号因%@被封禁\n解封时间：%@"; "XPRoomInsideRecommendEmptyCell" = "努力寻找合适房间中~"; @@ -2498,6 +2509,11 @@ "LoginForgetPasswordViewController9" = "请输入密码（6-16个字符）"; ///"XPGiftLuckyGiftBroadcastCell0" "XPGiftLuckyGiftBroadcastCell6"="周星榜"; +///XNDJTDDLoadingTool +"XNDJTDDLoadingTool0"="加载中…"; +///DateUtils +"DateUtils0"="MM月dd日 HH:mm"; +"DateUtils1"="yyyy年MM月dd日 HH:mm"; ///不能脚本生成的 "App_Common_And" = "和"; "App_Common_Male" = "男"; diff --git a/YuMi/zh-Hant.lproj/Localizable.strings b/YuMi/zh-Hant.lproj/Localizable.strings index d56509be..b419e787 100644 --- a/YuMi/zh-Hant.lproj/Localizable.strings +++ b/YuMi/zh-Hant.lproj/Localizable.strings @@ -1,4 +1,4 @@ -/* +/* Localizable.strings YuMi @@ -42,7 +42,7 @@ "XPRoomActivityContainerView2" = "PK已開始暫時無法排麥"; ///XPWebViewNavView "XPWebViewNavView0"="充值"; -"RoomHeaderView3" = "複制链接"; +"RoomHeaderView3" = "複製鏈接"; ///LoginPresenter.m "LoginPresenter0" = "登錄取消"; "LoginPresenter1" = "登錄失敗，請重試"; @@ -61,7 +61,7 @@ "XPFirstRechargeViewController0" = "1.每人僅可獲得1次首充福利\n2.每個ID、設備僅能參加一次。"; "XPFirstRechargeViewController1" = "立即充值"; ///XPFirstRechargeSuccessView.m -"XPFirstRechargeSuccessView0" = "裝扮類物品可進入“我的一我的裝扮”使用哦"; +"XPFirstRechargeSuccessView0" = "裝扮類物品可進入「我的一我的裝扮」使用哦"; "XPFirstRechargeSuccessView1" = "我知道了"; "StatisticsServiceHelper0" = "應用啟動"; @@ -125,6 +125,8 @@ "HttpRequestHelper4" = "大鵝開小差中~請稍後再試"; "HttpRequestHelper5" = "接口報錯信息未知"; "HttpRequestHelper6" = "請檢查網絡連接"; +"HttpRequestHelper7" = "登錄已過期。"; + "AppDelegate_ThirdConfig0" = "Piko"; @@ -302,7 +304,7 @@ "AnchorLevelView0" = "當前評級"; ///XPMineHeadView.m -"XPMineHeadView0" = "魔羯水瓶雙魚白羊金牛雙子巨蟹獅子處女天秤天蝎射手魔羯"; +"XPMineHeadView0" = "魔羯水瓶雙魚白羊金牛雙子巨蟹獅子處女天秤天蠍射手魔羯"; "XPMineHeadView1" = "錯誤日期格式!"; "XPMineHeadView2" = "錯誤日期格式!!"; "XPMineHeadView3" = "錯誤日期格式!!!"; @@ -354,6 +356,8 @@ "XPMineUserInfoTableViewCell0" = "%@號"; "XPMineUserInfoTableViewCell1" = "我是個默認簽名"; "XPMineUserInfoTableViewCell2" = "直播中"; +"XPMineUserInfoTableViewCell3" = "%@號:%@"; + "XPMineVisitorEmptyTableViewCell0" = "暫無數據"; @@ -473,18 +477,18 @@ "XPMineRechargeViewController3" = "已閱讀並同意"; ///XPMinePayPwdViewController.m -"XPMinePayPwdViewController0" = "设置支付密码"; -"XPMinePayPwdViewController1" = "获取手机号失败"; -"XPMinePayPwdViewController2" = "验证码发送成功"; -"XPMinePayPwdViewController3" = "设置支付密码成功"; -"XPMinePayPwdViewController4" = "支付密码必须为6位的纯数字哦～"; -"XPMinePayPwdViewController5" = "支付密码必须为纯数字"; -"XPMinePayPwdViewController6" = "两次输入密码不一致"; -"XPMinePayPwdViewController7" = "请输入验证码"; -"XPMinePayPwdViewController8" = "确定"; -"XPMinePayPwdViewController9" = "验证码已发送至您绑定的手机%@****%@"; -"XPMinePayPwdViewController10" = "输入支付密码"; -"XPMinePayPwdViewController11" = "再次输入支付密码"; +"XPMinePayPwdViewController0" = "設置支付密碼"; +"XPMinePayPwdViewController1" = "獲取手機號失敗"; +"XPMinePayPwdViewController2" = "驗證碼發送成功"; +"XPMinePayPwdViewController3" = "設置支付密碼成功"; +"XPMinePayPwdViewController4" = "支付密碼必須為6位的純數字哦～"; +"XPMinePayPwdViewController5" = "支付密碼必須為純數字"; +"XPMinePayPwdViewController6" = "兩次輸入密碼不一致"; +"XPMinePayPwdViewController7" = "請輸入驗證碼"; +"XPMinePayPwdViewController8" = "確定"; +"XPMinePayPwdViewController9" = "驗證碼已發送至您綁定的手機%@****%@"; +"XPMinePayPwdViewController10" = "輸入支付密碼"; +"XPMinePayPwdViewController11" = "再次輸入支付密碼"; "XPMineBlackListViewController0" = "黑名單"; "XPMineBlackListViewController1" = "移除"; @@ -626,6 +630,8 @@ "XPRoomSearchRecordViewController6" = "大家都在搜"; "XPRoomSearchRecordViewController7" = "搜索記錄"; "XPRoomSearchRecordViewController8" = "進房記錄"; +"XPRoomSearchRecordViewController9" = "剩余%zds"; + "XPHomeRedommendCollectionViewCell0" = "PK中"; "XPHomeRedommendCollectionViewCell1" = "虛位以待"; @@ -907,19 +913,19 @@ "XPUserCardViewController3" = "操作成功"; "XPUserCardViewController4" = "該用戶為%@貴族，只有房主才可以踢出哦"; "XPUserCardViewController5" = "該用戶為%@貴族\n確認是否要將其踢出房間"; -"XPUserCardViewController6" = "游戲模式下默認該玩家退出游戲是否要將此用戶踢出房間"; -"XPUserCardViewController7" = "游戲模式下默認該玩家退出游戲是否要將此用戶踢出房間"; +"XPUserCardViewController6" = "遊戲模式下默認該玩家退出遊戲是否要將此用戶踢出房間"; +"XPUserCardViewController7" = "遊戲模式下默認該玩家退出遊戲是否要將此用戶踢出房間"; "XPUserCardViewController8" = "是否需要將%@踢出房間"; "XPUserCardViewController9" = "操作提醒"; "XPUserCardViewController10" = "該用戶為%@貴族，只有房主才可以踢出哦"; "XPUserCardViewController11" = "該用戶為%@貴族\n確認是否要將其拉黑"; -"XPUserCardViewController12" = "游戲模式下默認該玩家退出游戲是否要將此用戶踢出房間"; -"XPUserCardViewController13" = "是否將%@加入黑名單？加入後他將無法進入此房間游戲模式下默認該玩家退出游戲"; +"XPUserCardViewController12" = "遊戲模式下默認該玩家退出遊戲是否要將此用戶踢出房間"; +"XPUserCardViewController13" = "是否將%@加入黑名單？加入後他將無法進入此房間遊戲模式下默認該玩家退出遊戲"; "XPUserCardViewController14" = "你正在拉黑"; "XPUserCardViewController15" = "拉黑後他將無法加入此房間"; "XPUserCardViewController16" = "房間公屏已關閉"; -"XPUserCardViewController17" = "游戲中不可主動下麥"; -"XPUserCardViewController18" = "抱Ta下麥後默認該玩家退出游戲，是否繼續"; +"XPUserCardViewController17" = "遊戲中不可主動下麥"; +"XPUserCardViewController18" = "抱Ta下麥後默認該玩家退出遊戲，是否繼續"; "XPUserCardViewController19" = "確認選擇%d號嘉賓嗎"; "XPUserCardViewController20" = "該選擇不能被取消修改"; "XPUserCardViewController21" = "複製成功"; @@ -978,7 +984,7 @@ "XPRoomRankEntranceView0" = "房間榜"; -"XPRoomDatingVipUpMicView0" = "1.每輪相親在“嘉賓交流”階段累積送禮滿999鑽石且送禮價值最高的用戶自動登上VIP席位；\n\n2.若出現多個滿足上VIP席位要求的用戶，VIP席位最終由送禮價值最高的用戶獲得，若送禮價值相同以最先達到該值的用戶為準；\n\n3.VIP席位的用戶可選擇是否下麥，其他用戶不可因此代替坐上席位；\n\n4.用戶只能在“嘉賓交流”階段搶奪VIP席位，“嘉賓交流”階段後直到結束本輪前，即使送出超過之前VIP總禮物價值也不能換人；\n\n5.每輪相親結束後VIP席位清空，下一輪重新開始搶位"; +"XPRoomDatingVipUpMicView0" = "1.每輪相親在「嘉賓交流」階段累積送禮滿999鑽石且送禮價值最高的用戶自動登上VIP席位；\n\n2.若出現多個滿足上VIP席位要求的用戶，VIP席位最終由送禮價值最高的用戶獲得，若送禮價值相同以最先達到該值的用戶為準；\n\n3.VIP席位的用戶可選擇是否下麥，其他用戶不可因此代替坐上席位；\n\n4.用戶只能在「嘉賓交流」階段搶奪VIP席位，「嘉賓交流」階段後直到結束本輪前，即使送出超過之前VIP總禮物價值也不能換人；\n\n5.每輪相親結束後VIP席位清空，下一輪重新開始搶位"; "XPNewUserRoomGiftView0" = "獲得新人禮物"; "XPNewUserRoomGiftView1" = "已放入背包，儘快使用吧"; @@ -986,7 +992,7 @@ "XPMoreMenuPresenter1" = "PK模式"; "XPMoreMenuPresenter3" = "開啟禮物值"; "XPMoreMenuPresenter5" = "開啟我的特效"; -"XPMoreMenuPresenter6" = "心愿禮物"; +"XPMoreMenuPresenter6" = "心願禮物"; "XPMoreMenuPresenter8" = "相親房"; "XPMoreMenuPresenter10" = "跨房"; "XPMoreMenuPresenter12" = "主播"; @@ -1077,7 +1083,7 @@ "LittleGameMicroView0" = "房主"; "LittleGameMicroView1" = "未準備"; "LittleGameMicroView2" = "已準備"; -"LittleGameMicroView3" = "游戲中"; +"LittleGameMicroView3" = "遊戲中"; "LittleGameMicroView4" = "未準備"; "MicroGiftValueView0" = "9999萬"; @@ -1202,7 +1208,7 @@ "XPRoomMessageHeaderView0" = "平臺嚴禁未成年人直播或打賞，倡導綠色互動，禁止宣傳及發佈政治、低俗、暴力、色情等違規違法內容，嚴禁違規交易和誘導欺詐用戶，如有違規將對賬號進行封禁，發現請及時舉報"; "XPRoomMessageParser0" = "我"; -"XPRoomMessageParser1" = " 駕着"; +"XPRoomMessageParser1" = " 駕著"; "XPRoomMessageParser2" = "根據首頁推薦"; "XPRoomMessageParser3" = "跟隨"; "XPRoomMessageParser4" = "接受"; @@ -1351,7 +1357,7 @@ "XPGiftUserCollectionViewCell0" = "房主位"; "XPGiftTwelveStarBroadcastView0" = "上期星座月%@星主"; -"XPGiftTwelveStarBroadcastView1" = "上期星座月天蝎座星主"; +"XPGiftTwelveStarBroadcastView1" = "上期星座月天蠍座星主"; "XPGiftTwelveStarBroadcastView2" = "昵稱"; "XPGiftTwelveStarBroadcastView3" = "活動詳情"; "XPGiftTwelveStarBroadcastView4" = "星座物語，限定開啟星座月"; @@ -1360,7 +1366,7 @@ "XPGiftInfoView1" = "暫時木有禮物"; "XPGiftInfoView2" = "禮物"; "XPGiftInfoView3" = "幸運"; -"XPGiftInfoView4" = "周星禮物"; +"XPGiftInfoView4" = "周星"; "XPGiftInfoView5" = "背包"; "XPGiftInfoView6" = "塗鴉禮物"; "XPGiftInfoView7" = "懲罰禮物"; @@ -1439,7 +1445,7 @@ "XPArrangeMicEmptyTableViewCell0" = "暫無數據"; -"XPFirstRechargeSuccessView0" = "裝扮類物品可進入“我的一我的裝扮”使用哦"; +"XPFirstRechargeSuccessView0" = "裝扮類物品可進入「我的一我的裝扮」使用哦"; "XPFirstRechargeSuccessView1" = "我知道了"; "XPRoomGiftCompoundView0" = "恭喜"; @@ -1604,25 +1610,25 @@ "XPRoomRankViewController1" = "魅力榜"; -"XPWishGiftHistoryViewController0" = "歷史心愿單"; +"XPWishGiftHistoryViewController0" = "歷史心願單"; "XPWishGiftViewController0" = "還沒有人助力嗷"; "XPWishGiftViewController1" = "人已助力"; -"XPWishGiftViewController2" = "今日心愿禮物"; -"XPWishGiftViewController3" = "-當日設置的心愿，會在次日0點失效"; +"XPWishGiftViewController2" = "今日心願禮物"; +"XPWishGiftViewController3" = "-當日設置的心願，會在次日0點失效"; -"XPWishGiftCreateViewController0" = "心愿單已創建"; -"XPWishGiftCreateViewController1" = "創建心愿單"; -"XPWishGiftCreateViewController2" = "歷史心愿"; +"XPWishGiftCreateViewController0" = "心願單已創建"; +"XPWishGiftCreateViewController1" = "創建心願單"; +"XPWishGiftCreateViewController2" = "歷史心願"; "XPWishGiftCreateViewController3" = "確認刪除該條數據"; "XPWishGiftCreateViewController4" = "確認清空當前數據"; -"XPWishGiftCreateViewController5" = "當前暫無心愿"; -"XPWishGiftCreateViewController6" = "最多只可添加三個心愿呦"; -"XPWishGiftCreateViewController7" = "確認創建當前心愿？ \n創建後當日不可在編輯或刪除"; -"XPWishGiftCreateViewController8" = "至少需要添加一個心愿禮物"; -"XPWishGiftCreateViewController9" = "設置心愿"; +"XPWishGiftCreateViewController5" = "當前暫無心願"; +"XPWishGiftCreateViewController6" = "最多只可添加三個心願呦"; +"XPWishGiftCreateViewController7" = "確認創建當前心願？ \n創建後當日不可在編輯或刪除"; +"XPWishGiftCreateViewController8" = "至少需要添加一個心願禮物"; +"XPWishGiftCreateViewController9" = "設置心願"; "XPWishGiftCreateViewController10" = "清空數據"; -"XPWishGiftCreateViewController11" = "添加心愿"; +"XPWishGiftCreateViewController11" = "添加心願"; "XPWishGiftCreateViewController12" = "確定創建"; "XPWishGiftEmptyTableViewCell0" = "暫無數據"; @@ -1724,7 +1730,7 @@ "NIMTimeUtils1" = "昨天"; "NIMTimeUtils3" = "前天"; -"NIMTimeUtils4" = "凌晨"; +"NIMTimeUtils4" = "淩晨"; "NIMTimeUtils5" = "上午"; "NIMTimeUtils6" = "下午"; "NIMTimeUtils7" = "晚上"; @@ -1820,7 +1826,7 @@ "MessageContentText0" = "未知消息類型"; -"SessionUserInfoTableViewCell0" = "魔羯水瓶雙魚白羊金牛雙子巨蟹獅子處女天秤天蝎射手魔羯"; +"SessionUserInfoTableViewCell0" = "魔羯水瓶雙魚白羊金牛雙子巨蟹獅子處女天秤天蠍射手魔羯"; "SessionUserInfoTableViewCell1" = "錯誤日期格式"; "SessionUserInfoTableViewCell2" = "錯誤日期格式"; "SessionUserInfoTableViewCell3" = "錯誤日期格式"; @@ -1886,6 +1892,8 @@ "XPMonentsMineViewController1" = "刪除成功"; "XPMonentsViewController0" = "推薦"; +"XPMonentsViewController1" = "關註"; +"XPMonentsViewController2" = "推薦"; "XPMonentsViewController3" = "最新"; "XPMonentsRecommendHeaderView0" = "推薦話題"; @@ -1958,6 +1966,9 @@ "TabbarViewController0" = "您已被踢下線，若非正常行為，請及時修改密碼"; "TabbarViewController1" = "對方撤回了一條消息"; +"TabbarViewController2" = "首頁"; +"TabbarViewController3" = "論壇"; +"TabbarViewController4" = "消息"; "TabbarViewController5" = "我的"; "XPLoginPhoneViewController0" = "請輸入正確的手機號"; @@ -2030,7 +2041,7 @@ "LoginVerifCodeViewController3" = "填寫驗證碼"; "LoginVerifCodeViewController4" = "重新獲取驗證碼"; -"UserPrivacyView0" = "“%@”隱私政策"; +"UserPrivacyView0" = "「%@」隱私政策"; "UserPrivacyView1" = "歡迎您使用%@。我們將通過《隱私政策》和《用戶協議》幫助您瞭解我們收集、使用、存儲和共享個人信息的情況，特別是我們所採集的個人信息類型與用途的對應關係。\n\n為了保障產品的正常運行，我們會收集您的部分必要信息。我們可能會收集聯絡方式等個人敏感信息，您有權拒絕向我們提供這些信息。我們不會向第三方共享、提供、轉讓或者從第三方獲取您的個人信息，除非經過您的同意"; "UserPrivacyView2" = "您可以查看完整的《隱私政策》和《用戶協議》,如果您同意,請點擊下方同意按鈕開始接受我們的服務"; "UserPrivacyView3" = "同意"; @@ -2052,14 +2063,14 @@ "LoginBindPhoneViewController1" = "手機格式不正確"; "LoginBindPhoneViewController2" = "綁定手機號"; -"MvpViewController0" = "註銷時間"; +"MvpViewController0" = "註銷時間: %@"; "MvpViewController1" = "%@\n\n請聯繫客服（微信：kefu01）咨詢哦"; "MvpViewController2" = "該賬號已註銷"; "MvpViewController3" = "為了營造更安全的網絡環境\n保護您和他人的財產安全\n請先進行實名認證"; "MvpViewController4" = "確定"; "MvpViewController5" = "實名認證"; "MvpViewController6" = "您被封號了"; -"MvpViewController7" = "您的賬號因%@被封禁\n解封時間"; +"MvpViewController7" = "您的賬號因%@被封禁\n解封時間：%@"; "XPRoomInsideRecommendEmptyCell" = "努力尋找合適房間中~"; @@ -2069,7 +2080,7 @@ "LoginVerifCodeViewController3" = "驗證碼"; "LoginVerifCodeViewController4" = "重新獲取"; -"XPLoginViewController11" = "同意隱私政策和用戶協議後，才可以注冊登錄哦~"; +"XPLoginViewController11" = "同意隱私政策和用戶協議後，才可以註冊登錄哦~"; "XPMonentsMineViewController2" = "刪除後不可恢複\n確定刪除該動態嗎？"; "XPMineUserInfoViewController13" = "資料"; @@ -2116,7 +2127,7 @@ "XPMineGuildIncomeStatisViewController0" = "收入統計"; "XPMineGuildIncomeStatisViewController1" = "按日統計"; "XPMineGuildIncomeStatisViewController2" = "每周統計"; -"XPMineGuildIncomeStatisViewController3" = "金币明細"; +"XPMineGuildIncomeStatisViewController3" = "金幣明細"; ///XPMineGuildIncomeDetailViewController.m "XPMineGuildIncomeDetailViewController0" = "收入明細"; @@ -2304,8 +2315,8 @@ "MessageContentGuildDialogView8"="拒絕"; "MessageContentGuildDialogView9"="確定通過該房間的加入邀請嗎？"; "MessageContentGuildDialogView10"="確定拒絕該房間的加入邀請嗎？"; -"MessageContentGuildDialogView11"="同意邀请"; -"MessageContentGuildDialogView12"="拒绝邀请"; +"MessageContentGuildDialogView11"="同意邀請"; +"MessageContentGuildDialogView12"="拒絕邀請"; "MessageContentGuildDialogView13"="確定通過該房間的退出申請嗎？"; "MessageContentGuildDialogView14"="確定拒絕該房間的退出申請嗎？"; "MessageContentGuildDialogView15"="同意退出"; @@ -2347,7 +2358,7 @@ "XPMineChooseGiveDiamondVC5"="鉆石余額不足，請重新輸入"; "XPMineChooseGiveDiamondVC6"="贈送成功"; ///XPMineConfirmGiveDiamondView -"XPMineConfirmGiveDiamondView0"="确認支付"; +"XPMineConfirmGiveDiamondView0"="確認支付"; "XPMineConfirmGiveDiamondView1"="向%@轉贈"; "XPMineConfirmGiveDiamondView2"="手續費"; "XPMineConfirmGiveDiamondView3"="總消耗鉆石"; @@ -2372,8 +2383,8 @@ "XPMineChooseGiveGiftView3"="禮物數量有誤，請重新輸入"; "XPMineChooseGiveGiftView4"="請輸入禮物數量"; "XPMineChooseGiveGiftView5"="暫時沒有禮物"; -"XPMineGoldIncomeRecordVC0"="暂无更多数据～"; -"XPIncomeRecordGoldDetailsCell0"="已兑:%@"; +"XPMineGoldIncomeRecordVC0"="暫無更多數據～"; +"XPIncomeRecordGoldDetailsCell0"="已兌:%@"; ///XPIncomeRecordGoldDetailsHeadView "XPIncomeRecordGoldDetailsHeadView0"="本周收益"; "XPIncomeRecordGoldDetailsHeadView1"="成員"; @@ -2381,9 +2392,9 @@ "XPIncomeRecordGoldDetailsHeadView3"="金幣收益"; "XPIncomeRecordGoldDetailsHeadView4"="可結算金幣"; "XPIncomeRecordGoldDetailsHeadView5"="總收入(鉆石)"; -"XPIncomeRecordGoldDetailsHeadView6"="基礎總結算金币"; +"XPIncomeRecordGoldDetailsHeadView6"="基礎總結算金幣"; "XPIncomeRecordGoldDetailsHeadView7"="公會收益"; -"XPIncomeRecordGoldDetailsHeadView8"="成員總金币"; +"XPIncomeRecordGoldDetailsHeadView8"="成員總金幣"; "XPIncomeRecordGoldDetailsHeadView9"="成員總兌換"; "XPMineTheGuildCell0" = "我的公會"; @@ -2407,7 +2418,7 @@ "XPExchangeDiamondsItemView1"="我的金幣：%.2f"; "XPExchangeDiamondsView0"="兌換鉆石"; -"XPExchangeDiamondsView1"="确定兌換"; +"XPExchangeDiamondsView1"="確定兌換"; "XPExchangeDiamondsView2"="金幣數不足"; "XPExchangeDiamondsView3"="至少需要兌換%ld鉆石"; "XPExchangeDiamondsView4"="兌換鉆石數不能超過%ld鉆"; @@ -2498,7 +2509,12 @@ "LoginForgetPasswordViewController9" = "請輸入密碼（6-16個字符）"; ///"XPGiftLuckyGiftBroadcastCell0" "XPGiftLuckyGiftBroadcastCell6"="周星榜"; -///不能脚本生成的 +///XNDJTDDLoadingTool +"XNDJTDDLoadingTool0"="加載中…"; +///DateUtils +"DateUtils0"="MM月dd日 HH:mm"; +"DateUtils1"="yyyy年MM月dd日 HH:mm"; +///不能腳本生成的 "App_Common_And" = "和"; "App_Common_Male" = "男"; "App_Common_FeMale" = "女";