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

修复bug

Browse Source
This commit is contained in:
liyuhua
2023-07-19 14:41:04 +08:00
parent 979cc9f672
commit e59ece7222
30 changed files with 185 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
YuMi/Assets.xcassets/jm/Noble/noble_open_btn.imageset/noble_open_btn@2x.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 617 B

After

Width:  |  Height:  |  Size: 593 B

BIN
YuMi/Assets.xcassets/jm/Noble/noble_open_btn.imageset/noble_open_btn@3x.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 815 B

After

Width:  |  Height:  |  Size: 1.0 KiB

2
YuMi/CustomUI/TTPopup/Config/TTAlertConfig.m
View File

@@ -47,7 +47,7 @@ static CGFloat kAlertButtonCornerRadius = 8.f;
// cancel button
_cancelButtonConfig = [[TTAlertButtonConfig alloc] init];
_cancelButtonConfig.title = @"取消";// 取消按钮
_cancelButtonConfig.title = YMLocalizedString(@"XPRoomSettingInputView4");// 取消按钮
_cancelButtonConfig.font = [UIFont systemFontOfSize:kAlertButtonFont];// 按钮字体
_cancelButtonConfig.titleColor = [DJDKMIMOMColor cancelButtonTextColor];// 字体颜色
_cancelButtonConfig.backgroundImage = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor cancelButtonGradientStartColor], [DJDKMIMOMColor cancelButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)];

4
YuMi/CustomUI/XNDJTDDLoadingTool.m
View File

@@ -296,7 +296,7 @@ static NSArray * _animationImages = nil;
loadingTitleLabel = [[UILabel alloc] init];
loadingTitleLabel.textColor = [UIColor colorWithRed:(153.0)/255.0f green:(153.0)/255.0f blue:(153.0)/255.0f alpha:1];
loadingTitleLabel.font = [UIFont systemFontOfSize:14];
loadingTitleLabel.text = @"加载中…";
loadingTitleLabel.text = YMLocalizedString(@"XNDJTDDLoadingTool0");
loadingTitleLabel.textAlignment = NSTextAlignmentCenter;
[loadingBGView addSubview:loadingImageView];
@@ -343,7 +343,7 @@ static NSArray * _animationImages = nil;
loadingTitleLabel = [[UILabel alloc] init];
loadingTitleLabel.textColor = UIColorFromRGB(0xC9BCF2);
loadingTitleLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightMedium];
loadingTitleLabel.text = @"加载中…";
loadingTitleLabel.text = YMLocalizedString(@"XNDJTDDLoadingTool0");
loadingTitleLabel.textAlignment = NSTextAlignmentCenter;
[loadingBGView addSubview:loadingImageView];

1
YuMi/Modules/YMMessage/View/SessionList/SessionListViewController.m
View File

@@ -496,6 +496,7 @@ NSString * const kMessageShowReadDotKey = @"kMessageShowReadDotKey";
- (UITableView *)sessionListView {
if (!_sessionListView) {
_sessionListView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain];
_sessionListView.contentInset = UIEdgeInsetsMake(0, 0, 100, 0);
_sessionListView.separatorStyle = UITableViewCellSeparatorStyleNone;
_sessionListView.backgroundColor = UIColor.clearColor;
_sessionListView.delegate = self;

2
YuMi/Modules/YMMine/View/Guild/View/XPMineGuildSearchViewController.h
View File

@@ -34,7 +34,7 @@ typedef NS_ENUM(NSInteger, GuildSearchType) {
@property (nonatomic,copy) NSString *clanOwnerUid;
///搜索的类型
@property (nonatomic,assign) GuildSearchType searchType;
@property(nonatomic,assign) BOOL isPush;
@end
NS_ASSUME_NONNULL_END

6
YuMi/Modules/YMMine/View/Guild/View/XPMineGuildSearchViewController.m
View File

@@ -189,7 +189,11 @@
#pragma mark - XPGuildSearchNavView
- (void)xPGuildSearchNavView:(XPGuildSearchNavView *)view didClickBack:(UIButton *)sender {
[self.navigationController popViewControllerAnimated:YES];
if(self.isPush){
[self.navigationController popViewControllerAnimated:YES];
return;
}
[self dismissViewControllerAnimated:YES completion:nil];
}
- (void)xPGuildSearchNavView:(XPGuildSearchNavView *)view didClickSearch:(UIButton *)sender {

1
YuMi/Modules/YMMine/View/Guild/View/XPMineGuildViewController.m
View File

@@ -198,6 +198,7 @@ UIKIT_EXTERN NSString *kInviteMemeberSuccess;
searchVC.modalPresentationStyle = UIModalPresentationOverFullScreen;
searchVC.searchType = GuildSearchType_Guild_Add_Member;
searchVC.delegate = self;
searchVC.isPush = YES;
[self.navigationController pushViewController:searchVC animated:YES];
};

8
YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterPayView.m
View File

@@ -84,7 +84,7 @@
XPNobleCenterPayCell *cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([XPNobleCenterPayCell class]) forIndexPath:indexPath];
cell.isChoose = indexPath.row == self.path.row;
cell.iconImage = indexPath.row == 0 ? kImage( @"mine_noble_center__diamond") : kImage(@"mine_noble_center_apple");
NSString *num = [NSString stringWithFormat:@"（2990%@）",YMLocalizedString(@"XPNobleCenterPayView1")];
NSString *num = [NSString stringWithFormat:@"（%@%@）",self.diamonds,YMLocalizedString(@"XPNobleCenterPayView1")];
NSString *text = indexPath.row == 0 ? [NSString stringWithFormat:@"%@%@",self.listData[indexPath.row],num] : self.listData[indexPath.row];
NSMutableAttributedString *titleAtt = [[NSMutableAttributedString alloc]initWithString:text attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:16 weight:UIFontWeightSemibold],NSForegroundColorAttributeName:UIColorFromRGB(0x1F1B4F)}];
@@ -97,6 +97,8 @@
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
self.path = indexPath;
self.type = indexPath.row == 0 ? NobleCenterPayType_diamond : NobleCenterPayType_Apple;
self.diamondNumView.text = indexPath.row == 0 ? @"2990" : @"$2.99";
self.diamondNumTitle.text = indexPath.row == 0 ? YMLocalizedString(@"XPNobleCenterPayView1"):@"";
[self.tableView reloadData];
}
-(void)backAction{
@@ -104,7 +106,7 @@
}
-(void)setDiamonds:(NSString *)diamonds{
_diamonds = diamonds;
self.diamondNumView.text = _diamonds;
[self.tableView reloadData];
}
-(void)payBtnAction{
[self backAction];
@@ -133,7 +135,7 @@
- (UILabel *)diamondNumView{
if(!_diamondNumView){
_diamondNumView = [UILabel new];
_diamondNumView.text = @"0";
_diamondNumView.text = @"2990";
_diamondNumView.font = [UIFont systemFontOfSize:28 weight:UIFontWeightSemibold];
_diamondNumView.textColor = UIColorFromRGB(0x9168FA);
}

4
YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeCollectionViewCell.m
View File

@@ -68,8 +68,8 @@
- (void)setRechargeModel:(RechargeListModel *)rechargeModel {
_rechargeModel = rechargeModel;
NSMutableAttributedString *priceStr = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"￥%.2f",rechargeModel.money.floatValue]];
[priceStr addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:8] range:NSMakeRange(0, 1)];
NSMutableAttributedString *priceStr = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"$%.2f",rechargeModel.money.floatValue]];
// [priceStr addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:8] range:NSMakeRange(0, 1)];
self.priceLabel.attributedText = priceStr;
NSCharacterSet* nonDigits =[[NSCharacterSet decimalDigitCharacterSet] invertedSet];
int remainSecond = [[rechargeModel.prodName stringByTrimmingCharactersInSet:nonDigits] intValue];

1
YuMi/Modules/YMMine/View/XPMineViewController.m
View File

@@ -110,6 +110,7 @@ UIKIT_EXTERN NSString *kRequestRicket;
- (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated];
self.isRefreshRoomInfo = NO;
[StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventusercenter_recharge_card_show];
[StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventusercenter_noble_card_show];

2
YuMi/Modules/YMMonents/View/SubViews/XPMonentPublishSuccessView.m
View File

@@ -83,7 +83,7 @@
- (UILabel *)tipsLabel {
if (!_tipsLabel) {
_tipsLabel = [[UILabel alloc] init];
_tipsLabel.text = @"咻，收到小可爱的动态了呢~\n审核通过后小秘书会帮你发送并通知你哦~";
_tipsLabel.text = YMLocalizedString(@"XPMonentPublishSuccessView1");
_tipsLabel.font = [UIFont systemFontOfSize:13];
_tipsLabel.numberOfLines = 0;
_tipsLabel.textColor = UIColorFromRGB(0x999999);

2
YuMi/Modules/YMMonents/View/XPMonentsAttentionViewController.m
View File

@@ -166,7 +166,7 @@
}
- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClicDelete:(MonentsInfoModel *)monentsInfo {
[TTPopup alertWithMessage:@"删除后不可恢复\n确定删除该动态吗？" confirmHandler:^{
[TTPopup alertWithMessage:YMLocalizedString(@"XPMonentsTopicLatestViewController1") confirmHandler:^{
[self.presenter deleteMonents:monentsInfo.dynamicId worldId:[NSString stringWithFormat:@"%ld", monentsInfo.worldId]];
} cancelHandler:^{

2
YuMi/Modules/YMMonents/View/XPMonentsRecommendViewController.m
View File

@@ -173,7 +173,7 @@
}
- (void)xPMonentsTableViewCell:(XPMonentsTableViewCell *)view didClicDelete:(MonentsInfoModel *)monentsInfo {
[TTPopup alertWithMessage:@"删除后不可恢复\n确定删除该动态吗？" confirmHandler:^{
[TTPopup alertWithMessage:YMLocalizedString(@"XPMonentsTopicLatestViewController1") confirmHandler:^{
[self.presenter deleteMonents:monentsInfo.dynamicId worldId:[NSString stringWithFormat:@"%ld", monentsInfo.worldId]];
} cancelHandler:^{

2
YuMi/Modules/YMMonents/View/XPMonentsViewController.m
View File

@@ -218,7 +218,7 @@
- (NSArray<NSString *> *)titles {
if (!_titles) {
_titles = @[@"关注",@"推荐", YMLocalizedString(@"XPMonentsViewController3")];
_titles = @[YMLocalizedString(@"XPMonentsViewController1"),YMLocalizedString(@"XPMonentsViewController2"), YMLocalizedString(@"XPMonentsViewController3")];
}
return _titles;
}

4
YuMi/Modules/YMNewHome/View/Search/View/Cell/XPSearchListTableViewCell.m
View File

@@ -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];

2
YuMi/Modules/YMNewHome/View/Search/View/SubView/XPRoomSearchRecommendHeadView.m
View File

@@ -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;

2
YuMi/Modules/YMNewHome/View/Search/View/XPRoomSearchContainerViewController.m
View File

@@ -252,7 +252,7 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey;
}
- (NSArray<NSString *> *)titles {
return @[@"房间", YMLocalizedString(@"XPRoomSearchContainerViewController4")];
return @[YMLocalizedString(@"XPGuildIncomeSectionView0"), YMLocalizedString(@"XPRoomSearchContainerViewController4")];
}
- (XPHomeSearchNavView *)searchView {

4
YuMi/Modules/YMNewHome/View/Search/View/XPRoomSearchRecordViewController.m
View File

@@ -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:^{

2
YuMi/Modules/YMRoom/View/AnimationView/Model/XPRoomStarKitchenModel.h
View File

@@ -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

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

@@ -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){

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

@@ -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];

2
YuMi/Modules/YMTabbar/View/AnchorCard/XPAnchorCardView.m
View File

@@ -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--;
}

2
YuMi/Modules/YMTabbar/View/PIFullScreenBannerAnimation.m
View File

@@ -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){

2
YuMi/Modules/YMTabbar/View/TabbarViewController.m
View File

@@ -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;

10
YuMi/Network/HttpRequestHelper.m
View File

@@ -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;
}

6
YuMi/Structure/MVP/View/MvpViewController.m
View File

@@ -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];

4
YuMi/Tools/Date/NSDate+DateUtils.m
View File

@@ -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];

22
YuMi/zh-Hans.lproj/Localizable.strings
View File

@@ -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" = "男";

130
YuMi/zh-Hant.lproj/Localizable.strings
View File

@@ -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" = "女";