修复bug

2023-08-04 11:47:43 +08:00
parent dba85043bc
commit 20458f8f31
68 changed files with 266 additions and 191 deletions
--- a/YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme
+++ b/YuMi.xcodeproj/xcshareddata/xcschemes/YuMi.xcscheme
@@ -31,7 +31,7 @@
      </Testables>
   </TestAction>
   <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
      launchStyle = "0"
--- a/YuMi/Assets.xcassets/jm/mineview_set.imageset/Contents.json
+++ b/YuMi/Assets.xcassets/jm/mineview_set.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mineview_set@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mineview_set@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/YuMi/Assets.xcassets/jm/mineview_set.imageset/mineview_set@2x.png
+++ b/YuMi/Assets.xcassets/jm/mineview_set.imageset/mineview_set@2x.png
--- a/YuMi/Assets.xcassets/jm/mineview_set.imageset/mineview_set@3x.png
+++ b/YuMi/Assets.xcassets/jm/mineview_set.imageset/mineview_set@3x.png
--- a/YuMi/Modules/YMLogin/View/LoginBindPhoneViewController.m
+++ b/YuMi/Modules/YMLogin/View/LoginBindPhoneViewController.m
@@ -108,7 +108,7 @@
 	// 登录
 	[[RACSignal combineLatest:@[self.phoneTextField.rac_textSignal]
 					   reduce:^id(NSString *phone){
-		BOOL enable =  phone.length == 11;
+		BOOL enable =  phone.length > 0;
 		return @(enable);
 	}] subscribeNext:^(NSNumber *enable) {
 		@strongify(self)
--- a/YuMi/Modules/YMLogin/View/NewLogin/XPForgetPwdViewController.m
+++ b/YuMi/Modules/YMLogin/View/NewLogin/XPForgetPwdViewController.m
@@ -87,7 +87,7 @@

 - (void)racBind {
    RAC(self.sureBtn, enabled) = [[RACSignal combineLatest:@[self.phoneInputView.inputTextField.rac_textSignal, self.pwdInputView.inputTextField.rac_textSignal, self.pwdInputView.inputTextField.rac_textSignal] reduce:^id _Nonnull(NSString *phone, NSString* smsCode, NSString *password){
-        return @((phone.length == 11) && smsCode.length >= 5 && (password.length >= 6 && password.length <= 16));
+        return @((phone.length > 0) && smsCode.length >= 5 && (password.length >= 6 && password.length <= 16));
    }] takeUntil:self.rac_willDeallocSignal];
 }

--- a/YuMi/Modules/YMMessage/View/FindNew/View/View/XPSessionFindNewAlertView.m
+++ b/YuMi/Modules/YMMessage/View/FindNew/View/View/XPSessionFindNewAlertView.m
@@ -194,7 +194,7 @@
 - (UIButton *)findButton {
 	if (!_findButton) {
 		_findButton = [UIButton buttonWithType:UIButtonTypeCustom];
-		[_findButton setTitle:@"去找TA" forState:UIControlStateNormal];
+		[_findButton setTitle:YMLocalizedString(@"XPSessionFindNewAlertView2") forState:UIControlStateNormal];
 		[_findButton setTitleColor:[DJDKMIMOMColor confirmButtonTextColor] forState:UIControlStateNormal];
 		_findButton.titleLabel.font = [UIFont systemFontOfSize:14];
 		[_findButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal];
--- a/YuMi/Modules/YMMessage/View/FindNew/View/XPSessionFindNewViewController.m
+++ b/YuMi/Modules/YMMessage/View/FindNew/View/XPSessionFindNewViewController.m
@@ -164,7 +164,7 @@
 		listView.delegate = self;
 		[TTPopup popupView:listView style:TTPopupStyleActionSheet];
 	} else {
-		[self showErrorToast:@"该用户被打招呼次数太多了，换一个吧~"];
+		[self showErrorToast:YMLocalizedString(@"XPSessionFindNewViewController0")];
 	}
 }

--- a/YuMi/Modules/YMMessage/View/NIMMessageMaker.m
+++ b/YuMi/Modules/YMMessage/View/NIMMessageMaker.m
@@ -34,7 +34,7 @@
    [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm"];
    NSString *dateString = [dateFormatter stringFromDate:[NSDate date]];
    NIMVideoObject *videoObject = [[NIMVideoObject alloc] initWithSourcePath:filePath scene:NIMNOSSceneTypeMessage];
-    videoObject.displayName = [NSString stringWithFormat:@"视频发送于%@", dateString];
+    videoObject.displayName = [NSString stringWithFormat:@"%@%@", YMLocalizedString(@"NIMMessageMaker1"),dateString];
    NIMMessage *message = [[NIMMessage alloc] init];
    message.messageObject = videoObject;
    message.apnsContent = YMLocalizedString(@"NIMMessageMaker2");
@@ -68,7 +68,7 @@
    NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
    [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm"];
    NSString *dateString = [dateFormatter stringFromDate:[NSDate date]];
-    imageObject.displayName = [NSString stringWithFormat:@"图片发送于%@", dateString];
+    imageObject.displayName = [NSString stringWithFormat:@"%@%@",YMLocalizedString(@"NIMMessageMaker3"), dateString];
    NIMMessage *message     = [[NIMMessage alloc] init];
    message.messageObject   = imageObject;
    message.apnsContent = YMLocalizedString(@"NIMMessageMaker4");
--- a/YuMi/Modules/YMMessage/View/NIMMessageUtils.m
+++ b/YuMi/Modules/YMMessage/View/NIMMessageUtils.m
@@ -20,19 +20,19 @@
            text = message.text;
            break;
        case NIMMessageTypeAudio:
-            text = @"[语音]";
+            text = YMLocalizedString(@"NIMMessageUtils0");
            break;
        case NIMMessageTypeImage:
-            text = @"[图片]";
+            text = YMLocalizedString(@"NIMMessageUtils1");
            break;
        case NIMMessageTypeVideo:
-            text = @"[视频]";
+            text = YMLocalizedString(@"NIMMessageUtils2");
            break;
        case NIMMessageTypeLocation:
-            text = @"[位置]";
+            text = YMLocalizedString(@"NIMMessageUtils3");
            break;
        case NIMMessageTypeFile:
-            text = @"[文件]";
+            text = YMLocalizedString(@"NIMMessageUtils4");
            break;
        case NIMMessageTypeCustom: {
            NIMCustomObject *obj = (NIMCustomObject *) message.messageObject;
@@ -43,27 +43,27 @@
 				}
 			} else if(attachment.first == CustomMessageType_Gift) {
 				if (attachment.second == Custom_Message_Sub_Gift_Send) {
-					text = @"[礼物]";
+					text = YMLocalizedString(@"NIMMessageUtils5");
 				}
 			} else if(attachment.first == CustomMessageType_Hall) {
-				text = @"[您收到一条公会消息]";
+				text = YMLocalizedString(@"NIMMessageUtils6");
 			} else if(attachment.first == CustomMessageType_Member_Online && attachment.second == Custom_Message_Type_Attention_Member_Online) {
-				return @"您关注的TA上线了，快去围观吧~~~";
+				return YMLocalizedString(@"NIMMessageUtils7");
 			} else if(attachment.first == CustomMessageType_Application_Share && attachment.second == Custom_Message_Sub_Application_Share_Room) {
-				return @"[分享房间]";
+				return YMLocalizedString(@"NIMMessageUtils8");
 			}else if(attachment.first == CustomMessageType_User_UpGrade && (attachment.second == Custom_Message_Sub_User_UpGrade_Charm || attachment.second == Custom_Message_Sub_User_UpGrade_Exper)) {
-				return @"[升级消息]";
+				return YMLocalizedString(@"NIMMessageUtils9");
 			} else if(attachment.first == CustomMessageType_Tweet && attachment.second == Custom_Message_Sub_Tweet_News) {
-				return @"[推文消息]";
+				return YMLocalizedString(@"NIMMessageUtils10");
 			} else if(attachment.first == CustomMessageType_FindNew && attachment.second == Custom_Message_Find_New_Greet_New_User) {
 				NSString * text = attachment.data[@"message"];
-				return text.length > 0 ? text : @"[消息]";
+				return text.length > 0 ? text : YMLocalizedString(@"NIMMessageUtils11");
 			}  else if(attachment.first == CustomMessageType_Monents && attachment.second == Custom_Message_Sub_Monents_Share) {
-				return @"[分享了一条动态]";
+                return  YMLocalizedString(@"NIMMessageUtils12");;
            } else if(attachment.first == CustomMessageType_RedPacket && attachment.second == Custom_Message_Sub_AllDiamandRedPacket) {
-                return @"[你收到一个全服红包]";
+                return  YMLocalizedString(@"NIMMessageUtils13");;
            } else {
-				text = @"[消息]";
+                text =  YMLocalizedString(@"NIMMessageUtils14");;
 			}
 			if (!text) {
 				text = message.text;
@@ -71,7 +71,7 @@
        }
            break;
        default:
-            text = @"[未知消息]";
+            text =  YMLocalizedString(@"NIMMessageUtils15");;
            break;
    }
    return text;
--- a/YuMi/Modules/YMMessage/View/NIMTimeUtils.m
+++ b/YuMi/Modules/YMMessage/View/NIMTimeUtils.m
@@ -36,11 +36,11 @@
    }
    else if(isSameMonth && (nowDateComponents.day == (msgDateComponents.day+1)))//昨天
    {
-        result = showDetail?  [[NSString alloc] initWithFormat:@"昨天%@ %zd:%02d",result,hour,(int)msgDateComponents.minute] : YMLocalizedString(@"NIMTimeUtils1");
+        result = showDetail?  [[NSString alloc] initWithFormat:@"%@%@ %zd:%02d",YMLocalizedString(@"NIMTimeUtils1"),result,hour,(int)msgDateComponents.minute] : YMLocalizedString(@"NIMTimeUtils1");
    }
    else if(isSameMonth && (nowDateComponents.day == (msgDateComponents.day+2))) //前天
    {
-        result = showDetail? [[NSString alloc] initWithFormat:@"前天%@ %zd:%02d",result,hour,(int)msgDateComponents.minute] : YMLocalizedString(@"NIMTimeUtils3");
+        result = showDetail? [[NSString alloc] initWithFormat:@"%@%@ %zd:%02d",YMLocalizedString(@"NIMTimeUtils3"),result,hour,(int)msgDateComponents.minute] : YMLocalizedString(@"NIMTimeUtils3");
    }
    else if([nowDate timeIntervalSinceDate:msgDate] < 7 * OnedayTimeIntervalValue)//一周内
    {
--- a/YuMi/Modules/YMMessage/View/SayHello/View/CustomView/XPSessionSayHelloHeaderView.m
+++ b/YuMi/Modules/YMMessage/View/SayHello/View/CustomView/XPSessionSayHelloHeaderView.m
@@ -100,7 +100,7 @@
 	if (level.length < 0) {
 		return;
 	}
-	NSString * title = [NSString stringWithFormat:@"当前主播评级：%@", level];
+	NSString * title = [NSString stringWithFormat:@"%@：%@",YMLocalizedString(@"XPSessionSayHelloHeaderView0"), level];
 	NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] initWithString:title attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:12], NSForegroundColorAttributeName:[DJDKMIMOMColor colorWithHexString:@"#1A1A1A"]}];
 	[attribute addAttribute:NSForegroundColorAttributeName value:[DJDKMIMOMColor colorWithHexString:@"#FF8400"] range:[title rangeOfString:level]];
 	[attribute addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:16 weight:UIFontWeightSemibold] range:[title rangeOfString:level]];
@@ -112,7 +112,7 @@
 		return;
 	}
 	NSString * levelStr = [NSString stringWithFormat:YMLocalizedString(@"XPSessionSayHelloHeaderView1"), level];
-	NSString * title = [NSString stringWithFormat:@"当前打招呼流量：%@", levelStr];
+	NSString * title = [NSString stringWithFormat:@"%@：%@", YMLocalizedString(@"XPSessionSayHelloHeaderView2"),levelStr];
 	NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] initWithString:title attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:14], NSForegroundColorAttributeName:[DJDKMIMOMColor mainTextColor]}];
 	[attribute addAttribute:NSForegroundColorAttributeName value:[DJDKMIMOMColor colorWithHexString:@"#171A58"] range:[title rangeOfString:levelStr]];
 	[attribute addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:24 weight:UIFontWeightMedium] range:[title rangeOfString:levelStr]];
--- a/YuMi/Modules/YMMessage/View/Session/Cell/SessionUserInfoTableViewCell.m
+++ b/YuMi/Modules/YMMessage/View/Session/Cell/SessionUserInfoTableViewCell.m
@@ -214,15 +214,15 @@
 	NSInteger day = [self getDay:time];

 	if (month<1 || month>12 || day<1 || day>31){
-		return @"错误日期格式!";
+		return YMLocalizedString(@"SessionUserInfoTableViewCell1");
 	}

 	if(month==2 && day>29)
 	{
-		return @"错误日期格式!!";
+		return YMLocalizedString(@"SessionUserInfoTableViewCell1");
 	}else if(month==4 || month==6 || month==9 || month==11) {
 		if (day>30) {
-			return @"错误日期格式!!!";
+			return YMLocalizedString(@"SessionUserInfoTableViewCell1");
 		}
 	}

--- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentOpenLiveView.m
+++ b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentOpenLiveView.m
@@ -133,7 +133,7 @@
 	if (!_titleLabel) {
 		_titleLabel = [[UILabel alloc] init];
 		_titleLabel.font = [UIFont systemFontOfSize:17];
-		_titleLabel.text = @"你关注的TA";
+		_titleLabel.text = YMLocalizedString(@"MessageContentOpenLiveView1");
 		_titleLabel.textColor = [DJDKMIMOMColor mainTextColor];
 	}
 	return _titleLabel;
--- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentRedPacketView.m
+++ b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentRedPacketView.m
@@ -108,7 +108,7 @@
    NSTimeInterval now = [[NSDate date] timeIntervalSince1970];
    if (now - model.message.timestamp > 60*30) {
        self.titleLabel.text = YMLocalizedString(@"MessageContentRedPacketView0");
-        self.descLabel.text = @"下次要快点来哦~";
+        self.descLabel.text = YMLocalizedString(@"MessageContentRedPacketView1");
        self.subLabel.hidden = YES;
        self.bgImageView.image = [UIImage imageNamed:@"redPacket_msg_inValid_bg"];
        self.bgImageView.userInteractionEnabled = NO;
@@ -123,7 +123,7 @@
                self.bgImageView.userInteractionEnabled = NO;
            } else {
                self.titleLabel.text = info.sendUserNick;
-                self.descLabel.text = @"点击进房领取>";
+                self.descLabel.text = YMLocalizedString(@"MessageContentRedPacketView4");
                self.subLabel.hidden = NO;
                self.bgImageView.image = [UIImage imageNamed:@"redPacket_msg_valid_bg"];
                self.bgImageView.userInteractionEnabled = YES;
--- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentTextClickable.m
+++ b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentTextClickable.m
@@ -160,7 +160,7 @@
 				if (code == 200) {
 					UserInfoModel * userInfo = [UserInfoModel modelWithDictionary:data.data];
 					if (!userInfo.isBindPhone) {
-						[XNDJTDDLoadingTool showErrorWithMessage:@"请先绑定手机号！"];
+						[XNDJTDDLoadingTool showErrorWithMessage:YMLocalizedString(@"MessageContentTextClickable0")];
 						return;
 					}
 					//登录密码
--- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageLevelUpgradeModel.m
+++ b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageLevelUpgradeModel.m
@@ -21,10 +21,10 @@
 		ContentLevelUpgradeModel * model = [ContentLevelUpgradeModel modelWithJSON:attach.data];
 		if (attach.second == Custom_Message_Sub_User_UpGrade_Charm) {
 			self.imageName = @"message_content_upgrade_charm";
-			self.level = [NSString stringWithFormat:@"恭喜！您的魅力等级已到达Lv%@", model.levelName];
+			self.level = [NSString stringWithFormat:YMLocalizedString(@"MessageLevelUpgradeModel0"), model.levelName];
 		} else {
 			self.imageName =  @"message_content_upgrade_expre";
-			self.level = [NSString stringWithFormat:@"恭喜！您的等级已到达Lv%@", model.levelName];
+			self.level = [NSString stringWithFormat:YMLocalizedString(@"MessageLevelUpgradeModel1"), model.levelName];
 		}
 	}
 	return self;
--- a/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageRiskAlertModel.m
+++ b/YuMi/Modules/YMMessage/View/Session/Content/SesssionModel/MessageRiskAlertModel.m
@@ -27,7 +27,7 @@
 		}

 		NSMutableAttributedString * attribute  = [[NSMutableAttributedString alloc] initWithString:text attributes:[self messageTextAttibutes]];
-		NSRange range = [text rangeOfString:@"《整治网络直播乱象》"];
+		NSRange range = [text rangeOfString:YMLocalizedString(@"MessageRiskAlertModel0")];
 		if ((range.location + range.length) <= text.length) {
 			[attribute addAttribute:NSForegroundColorAttributeName value:[DJDKMIMOMColor appEmphasizeColor] range:range];
 			[attribute yy_setTextHighlightRange:range color:nil backgroundColor:nil tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) {
--- a/YuMi/Modules/YMMessage/View/Session/SessionViewController.m
+++ b/YuMi/Modules/YMMessage/View/Session/SessionViewController.m
@@ -372,7 +372,7 @@
 	if (user) {
 		self.sessionNavView.title = user.userInfo.nickName;
 	} else {
-		self.sessionNavView.title = @"加载中……";
+		self.sessionNavView.title = YMLocalizedString(@"XNDJTDDLoadingTool0");
 	}
    [[NIMSDK sharedSDK].conversationManager markAllMessagesReadInSession:self.session];
    [self.presenter getChatLimitReceiverUid:self.session.sessionId];
@@ -436,7 +436,7 @@
 	self.sessionNavView.userInfo = userInfo;
 	if (userInfo.roomUid && self.openType == SessionListOpenTypeDefault) {
 		if ([self showChatRiskView:userInfo]) {
-			self.riskAlertView.warning = userInfo.banAccount ? @" 温馨提醒：当前对方账号存在异常，请谨慎来往！" :  @"温馨提示：对方和您非好友关系，请注意隐私安全！";
+			self.riskAlertView.warning = userInfo.banAccount ? YMLocalizedString(@"SessionViewController17") :  YMLocalizedString(@"SessionViewController18");
 			if (!self.riskAlertView.superview) {
 				[self.view addSubview:self.riskAlertView];
 				[self.riskAlertView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -455,7 +455,7 @@
 		}
 	} else {
 		if ([self showChatRiskView:userInfo]) {
-			self.riskAlertView.warning = userInfo.banAccount ? @" 温馨提醒：当前对方账号存在异常，请谨慎来往！" :  @"温馨提示：对方和您非好友关系，请注意隐私安全！";
+			self.riskAlertView.warning = userInfo.banAccount ? YMLocalizedString(@"SessionViewController17") :  YMLocalizedString(@"SessionViewController18");
 			if (!self.riskAlertView.superview) {
 				[self.view addSubview:self.riskAlertView];
 				[self.riskAlertView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -867,10 +867,10 @@
 		[self presentViewController:imagePicker animated:YES completion:NULL];
 	} denied:^{
 		@kStrongify(self);
-		[self showNotPhoto:@"相机不可用" content:YMLocalizedString(@"SessionViewController10")];
+		[self showNotPhoto:YMLocalizedString(@"SessionViewController19") content:YMLocalizedString(@"SessionViewController10")];
 	} restriction:^{
 		@kStrongify(self);
-		[self showNotPhoto:@"相机不可用" content:YMLocalizedString(@"SessionViewController12")];
+		[self showNotPhoto:YMLocalizedString(@"SessionViewController19") content:YMLocalizedString(@"SessionViewController12")];
 	}];

 }
@@ -923,10 +923,10 @@
 			});
 		} denied:^{
 			@kStrongify(self);
-			[self showNotPhoto:@"无法访问相册" content:YMLocalizedString(@"SessionViewController14")];
+			[self showNotPhoto:YMLocalizedString(@"SessionViewController20") content:YMLocalizedString(@"SessionViewController14")];
 		} restriction:^{
 			@kStrongify(self);
-			[self showNotPhoto:@"无法访问相册" content:YMLocalizedString(@"SessionViewController16")];
+			[self showNotPhoto:YMLocalizedString(@"SessionViewController20") content:YMLocalizedString(@"SessionViewController16")];
 		}];
 	} else {
 		[_keyboardManager hideAllBoardView];
--- a/YuMi/Modules/YMMessage/View/Session/View/SessionChatLimitView.m
+++ b/YuMi/Modules/YMMessage/View/Session/View/SessionChatLimitView.m
@@ -46,8 +46,8 @@
    NSInteger wealth = wealthLevel > 0 ? wealthLevel : 3;
    UIColor *highlightColor = DJDKMIMOMColor.appMainColor;
    NSMutableAttributedString *attStr = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:YMLocalizedString(@"SessionChatLimitView0"), wealth, charm] attributes:@{NSFontAttributeName: [UIFont systemFontOfSize: 12],NSForegroundColorAttributeName: DJDKMIMOMColor.mainTextColor}];;
-    NSRange wealthLevelRange = [attStr.mutableString rangeOfString:[NSString stringWithFormat:@"财富等级≥%zd", wealth]];
-    NSRange charmLevelRange = [attStr.mutableString rangeOfString:[NSString stringWithFormat:@"魅力等级≥%zd", charm]];
+    NSRange wealthLevelRange = [attStr.mutableString rangeOfString:[NSString stringWithFormat:@"%@≥%zd",YMLocalizedString(@"SessionChatLimitView1"), wealth]];
+    NSRange charmLevelRange = [attStr.mutableString rangeOfString:[NSString stringWithFormat:@"%@≥%zd",YMLocalizedString(@"SessionChatLimitView2"), charm]];
    [attStr yy_setColor:highlightColor range:wealthLevelRange];
    [attStr yy_setColor:highlightColor range:charmLevelRange];
    self.textLabel.attributedText = attStr;
--- a/YuMi/Modules/YMMessage/View/Session/View/SessionNavLiveView.m
+++ b/YuMi/Modules/YMMessage/View/Session/View/SessionNavLiveView.m
@@ -70,7 +70,7 @@
 		_liveLabel = [[UILabel alloc] init];
 		_liveLabel.font = [UIFont systemFontOfSize:10];
 		_liveLabel.textColor = [DJDKMIMOMColor textThirdColor];
-		_liveLabel.text = @"直播中 >";
+		_liveLabel.text = [NSString stringWithFormat:@"%@ >",YMLocalizedString(@"SessionNavLiveView0")];
 	}
 	return _liveLabel;
 }
--- a/YuMi/Modules/YMMessage/View/Session/View/SessionRiskView.m
+++ b/YuMi/Modules/YMMessage/View/Session/View/SessionRiskView.m
@@ -68,7 +68,7 @@
 - (UILabel *)warnTextLabel {
 	if (!_warnTextLabel) {
 		_warnTextLabel = [[UILabel alloc]init];
-		_warnTextLabel.text = @"温馨提示：对方和您非好友关系，请注意隐私安全！";
+		_warnTextLabel.text = YMLocalizedString(@"SessionRiskView0");
 		_warnTextLabel.textColor = UIColorFromRGB(0xFF5858);
 		_warnTextLabel.font = [UIFont systemFontOfSize:12.f];
 	}
--- a/YuMi/Modules/YMMessage/View/SessionList/SessionListViewController.m
+++ b/YuMi/Modules/YMMessage/View/SessionList/SessionListViewController.m
@@ -463,7 +463,7 @@ NSString * const kMessageShowReadDotKey = @"kMessageShowReadDotKey";
 	}
 	TTAlertConfig * config = [[TTAlertConfig alloc] init];
 	config.confirmButtonConfig.title = YMLocalizedString(@"SessionListViewController3");
-	config.message = @"清除当前未读消息提醒？";
+	config.message = YMLocalizedString(@"SessionListViewController4");
 	[TTPopup alertWithConfig:config confirmHandler:^{
 		[[NIMSDK sharedSDK].conversationManager markAllMessagesRead];
 		[self setTabBarItemBadge:0];
--- a/YuMi/Modules/YMMine/Presenter/XPMineSettingPresent.m
+++ b/YuMi/Modules/YMMine/Presenter/XPMineSettingPresent.m
@@ -47,7 +47,7 @@
 - (void)getMineSettingDataSourceWith:(UserInfoModel *)userinfo {
    if (self.datasouce.count > 0) {
        self.phoneItem.subTitle = userinfo.isBindPhone ? userinfo.phone : YMLocalizedString(@"XPMineSettingPresent0");
-        self.payItem.subTitle = userinfo.isBindPaymentPwd ? @"修改" : YMLocalizedString(@"XPMineSettingPresent2");
+        self.payItem.subTitle = userinfo.isBindPaymentPwd ? YMLocalizedString(@"XPMineSettingPresent26") : YMLocalizedString(@"XPMineSettingPresent2");
    } else {
        if ([ClientConfig shareConfig].canOpen) {
            XPMineSettingItemModel * phoneItem = [[XPMineSettingItemModel alloc] init];
@@ -57,7 +57,7 @@
            self.phoneItem = phoneItem;
            
            XPMineSettingItemModel * loginItem = [[XPMineSettingItemModel alloc] init];
-            loginItem.title = userinfo.isBindPasswd ? @"重置密码" : YMLocalizedString(@"XPMineSettingPresent6");
+            loginItem.title = userinfo.isBindPasswd ? YMLocalizedString(@"XPMineLoginPasswordViewController6") : YMLocalizedString(@"XPMineSettingPresent6");
            loginItem.subTitle = YMLocalizedString(@"XPMineSettingPresent7");
            loginItem.type = XPMineSettingItemType_Login_Password;
            self.loginItem = loginItem;
@@ -69,7 +69,7 @@

            XPMineSettingItemModel * payItem = [[XPMineSettingItemModel alloc] init];
            payItem.title = YMLocalizedString(@"XPMineSettingPresent9");
-            payItem.subTitle = userinfo.isBindPaymentPwd ? @"修改" : YMLocalizedString(@"XPMineSettingPresent11");
+            payItem.subTitle = userinfo.isBindPaymentPwd ? YMLocalizedString(@"XPMineSettingPresent26") : YMLocalizedString(@"XPMineSettingPresent11");
            payItem.type = XPMineSettingItemType_Pay_Password;
            self.payItem = payItem;
            
@@ -104,7 +104,7 @@
            updateItem.type = XPMineSettingItemType_CheckUpdate;
            
            XPMineSettingItemModel * aboutusItem = [[XPMineSettingItemModel alloc] init];
-            aboutusItem.title = [NSString stringWithFormat:@"关于%@", AppName];
+            aboutusItem.title = [NSString stringWithFormat:@"%@%@",YMLocalizedString(@"XPMineAboutUsViewController0"), AppName];
            aboutusItem.subTitle = @"";
            aboutusItem.type = XPMineSettingItemType_About_Us;
            
@@ -127,7 +127,7 @@
            self.phoneItem = phoneItem;

            XPMineSettingItemModel * loginItem = [[XPMineSettingItemModel alloc] init];
-            loginItem.title = userinfo.isBindPasswd ? @"重置密码" : YMLocalizedString(@"XPMineSettingPresent23");
+            loginItem.title = userinfo.isBindPasswd ? YMLocalizedString(@"XPMineLoginPasswordViewController6") : YMLocalizedString(@"XPMineSettingPresent23");
            loginItem.subTitle = @"";
            loginItem.type = XPMineSettingItemType_Login_Password;
            self.loginItem = loginItem;
--- a/YuMi/Modules/YMMine/Presenter/XPMineUserInfoEditPresenter.m
+++ b/YuMi/Modules/YMMine/Presenter/XPMineUserInfoEditPresenter.m
@@ -129,7 +129,7 @@
 	if (!_nickItem) {
 		_nickItem = [[XPMineUserInfoEditModel alloc] init];
 		_nickItem.type = XPMineUserInfoEditType_Nick;
-		_nickItem.title = @"昵称:";
+		_nickItem.title = YMLocalizedString(@"XPMineUserInfoEditPresenter1");
 	}
 	return _nickItem;
 }
@@ -138,7 +138,7 @@
 	if (!_avatarItem) {
 		_avatarItem = [[XPMineUserInfoEditModel alloc] init];
 		_avatarItem.type = XPMineUserInfoEditType_Avatar;
-		_avatarItem.title = @"头像:";
+        _avatarItem.title = YMLocalizedString(@"XPMineUserInfoEditPresenter2");
 	}
 	return _avatarItem;
 }
@@ -148,7 +148,7 @@
 	if (!_birthItem) {
 		_birthItem = [[XPMineUserInfoEditModel alloc] init];
 		_birthItem.type = XPMineUserInfoEditType_Birth;
-		_birthItem.title = @"生日:";
+        _birthItem.title =YMLocalizedString(@"XPMineUserInfoEditPresenter3");
 	}
 	return _birthItem;
 }
@@ -157,7 +157,7 @@
 	if (!_photoItem) {
 		_photoItem = [[XPMineUserInfoEditModel alloc] init];
 		_photoItem.type = XPMineUserInfoEditType_Photo;
-		_photoItem.title = @"相册:";
+        _photoItem.title = YMLocalizedString(@"XPMineUserInfoEditPresenter4");
 	}
 	return _photoItem;
 }
@@ -166,7 +166,7 @@
 	if (!_desItem) {
 		_desItem = [[XPMineUserInfoEditModel alloc] init];
 		_desItem.type = XPMineUserInfoEditType_UseDes;
-		_desItem.title = @"个人介绍:";
+        _desItem.title = YMLocalizedString(@"XPMineUserInfoEditPresenter5");
 	}
 	return _desItem;
 }
--- a/YuMi/Modules/YMMine/View/Cell/Friend/XPMineAttentionTableViewCell.m
+++ b/YuMi/Modules/YMMine/View/Cell/Friend/XPMineAttentionTableViewCell.m
@@ -286,7 +286,7 @@
 - (UIButton *)findButton {
 	if (!_findButton) {
 		_findButton = [UIButton buttonWithType:UIButtonTypeCustom];
-		[_findButton setTitle:@"找到Ta" forState:UIControlStateNormal];
+		[_findButton setTitle:YMLocalizedString(@"XPMineAttentionTableViewCell1") forState:UIControlStateNormal];
 		[_findButton setTitleColor:[DJDKMIMOMColor appEmphasizeColor] forState:UIControlStateNormal];
 		_findButton.titleLabel.font = [UIFont systemFontOfSize:12];
 		_findButton.layer.masksToBounds = YES;
--- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataGiftTableViewCell.m
+++ b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataGiftTableViewCell.m
@@ -205,7 +205,7 @@

 - (NSArray<NSString *> *)titles {
 	if (!_titles) {
-		_titles = @[@"普通礼物", YMLocalizedString(@"XPMineDataGiftTableViewCell2")];
+		_titles = @[YMLocalizedString(@"XPWishGiftCreateItemViewController0"), YMLocalizedString(@"XPMineDataGiftTableViewCell2")];
 	}
 	return _titles;
 }
--- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoTableViewCell.m
+++ b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoTableViewCell.m
@@ -89,7 +89,7 @@
 	_userInfo = userInfo;
 	if (_userInfo) {
 		self.nameLabel.text = _userInfo.nick;
-		self.idLabel.text = [NSString stringWithFormat:@"%@号：%ld",AppName, (long)_userInfo.erbanNo];
+		self.idLabel.text = [NSString stringWithFormat:@"%@%@：%ld",AppName,YMLocalizedString(@"App_Common_hao"), (long)_userInfo.erbanNo];
 		self.signLabel.text = _userInfo.userDesc.length > 0 ? _userInfo.userDesc : YMLocalizedString(@"XPMineUserInfoTableViewCell1");
 		NSString * sexStr;
 		if (_userInfo.gender == GenderType_Male) {
--- a/YuMi/Modules/YMMine/View/Cell/XPMineListCell.m
+++ b/YuMi/Modules/YMMine/View/Cell/XPMineListCell.m
@@ -17,7 +17,8 @@
@property (nonatomic,strong) UILabel * titleVeiw;
@property (nonatomic,strong) UIImageView * arrowView;
@property (nonatomic,strong) UIView *lineView;
-
+///角标
+@property (nonatomic,strong) NetImageView *badgeImageView;
@end
@implementation XPMineListCell

@@ -34,7 +35,9 @@
 	self.selectionStyle = UITableViewCellSelectionStyleNone;
 	self.backgroundColor = [UIColor clearColor];
 	[self.contentView addSubview:self.bgView];
+   
 	[self.bgView addSubview:self.iconView];
+    [self.bgView addSubview:self.badgeImageView];
 	[self.bgView addSubview:self.titleVeiw];
 	[self.bgView addSubview:self.arrowView];
 	[self.bgView addSubview:self.lineView];
@@ -46,12 +49,17 @@
 			make.right.mas_equalTo(-15);
 			make.top.bottom.equalTo(self.contentView);
 	}];
+    
 	[self.iconView mas_makeConstraints:^(MASConstraintMaker *make) {
 			make.left.mas_equalTo(11);
 			make.width.height.mas_equalTo(25);
 			make.centerY.equalTo(self.bgView);
 	}];
-
+    [self.badgeImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.bottom.mas_equalTo(self.iconView.mas_top);
+        make.size.mas_equalTo(CGSizeMake(24, 10));
+        make.left.mas_equalTo(self.iconView.mas_centerX);
+    }];
 	[self.titleVeiw mas_makeConstraints:^(MASConstraintMaker *make) {
 		make.left.mas_equalTo(42);
 		make.centerY.equalTo(self.bgView);
@@ -83,6 +91,7 @@
 		}else{
 			self.iconView.imageUrl = _itemModel.centerPic;
 		}
+        self.badgeImageView.imageUrl = itemModel.centerBadge ? itemModel.centerBadge : nil;
 	}
 }
 -(void)setCornerWithIsTop:(BOOL)isTop isBottom:(BOOL)isBottom{
@@ -137,4 +146,11 @@
 	}
 	return _lineView;
 }
+- (NetImageView *)badgeImageView {
+    if (!_badgeImageView) {
+        _badgeImageView = [[NetImageView alloc] init];
+        _badgeImageView.contentMode = UIViewContentModeScaleAspectFit;
+    }
+    return _badgeImageView;
+}
@end
--- a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressShopSearchTableViewCell.m
+++ b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressShopSearchTableViewCell.m
@@ -50,7 +50,7 @@
    if (data) {
        self.avatarImageView.imageUrl = data.avatar;
        self.nickLabel.text = data.nick;
-        self.idLabel.text = [NSString stringWithFormat:@"%@号:%@",AppName, data.erbanNo];
+        self.idLabel.text = [NSString stringWithFormat:@"%@%@:%@",AppName, YMLocalizedString(@"App_Common_hao"),data.erbanNo];
        self.sexImageView.image = data.gender == GenderType_Female ? [UIImage imageNamed:@"common_female"] : [UIImage imageNamed:@"common_male"];
    }
 }
--- a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressUpShopCardTableViewCell.m
+++ b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressUpShopCardTableViewCell.m
@@ -132,7 +132,7 @@
 - (void)setNobleCardModel:(DressUpShopModel *)nobleCardModel {
    _nobleCardModel = nobleCardModel;
    if (_nobleCardModel) {
-        self.titleLabel.text = [NSString stringWithFormat:@"%@(%zd天)", nobleCardModel.name, nobleCardModel.dressDay];
+        self.titleLabel.text = [NSString stringWithFormat:@"%@(%zd%@)", nobleCardModel.name, nobleCardModel.dressDay,YMLocalizedString(@"App_Commont_Day")];
        self.nobleImageView.imageUrl = nobleCardModel.pic;
        self.diamondLabel.text = [NSString stringWithFormat:@"%zd", nobleCardModel.dressPrice];
        self.limitTimeBgView.hidden = (nobleCardModel.dressLimitStatus != 0);
--- a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressUpShopCollectionViewCell.m
+++ b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressUpShopCollectionViewCell.m
@@ -120,7 +120,7 @@
 - (void)setDressUpModel:(DressUpShopModel *)dressUpModel {
    _dressUpModel = dressUpModel;
    if (dressUpModel) {
-        self.titleLabel.text = [NSString stringWithFormat:@"%@(%zd天)", dressUpModel.name, dressUpModel.dressDay];
+        self.titleLabel.text = [NSString stringWithFormat:@"%@(%zd%@)", dressUpModel.name, dressUpModel.dressDay,YMLocalizedString(@"App_Commont_Day")];
        self.dressUpImageView.imageUrl = dressUpModel.pic;
        self.diamondLabel.text = [NSString stringWithFormat:@"%zd", dressUpModel.dressPrice];
        self.limitTimeBgView.hidden = (dressUpModel.dressLimitStatus != 0);
--- a/YuMi/Modules/YMMine/View/DressUp/View/XPDressUpShopCardViewController.m
+++ b/YuMi/Modules/YMMine/View/DressUp/View/XPDressUpShopCardViewController.m
@@ -103,22 +103,22 @@

 - (void)useHeadwearSuccess:(NSString *)headWearId {
 //    [self.presenter getUserHeadwearList];
-    [self showSuccessToast:headWearId.integerValue == 0 ? @"取消使用头饰成功" : YMLocalizedString(@"XPDressUpShopCardViewController2")];
+    [self showSuccessToast:headWearId.integerValue == 0 ? YMLocalizedString(@"XPMineDressUpViewController6") : YMLocalizedString(@"XPDressUpShopCardViewController2")];
    
 }

 - (void)useCarSuccess:(NSString *)carId {
 //    [self.presenter getUserCarList];
-    [self showSuccessToast:carId.integerValue == 0 ? @"取消使用座驾成功" : YMLocalizedString(@"XPDressUpShopCardViewController4")];
+    [self showSuccessToast:carId.integerValue == 0 ? YMLocalizedString(@"XPMineDressUpViewController7") : YMLocalizedString(@"XPDressUpShopCardViewController4")];
 }

 - (void)useNameplateSuccess:(NSString *)nameplateId {
 //    [self.presenter getUserNameplateList];
-    [self showSuccessToast:nameplateId.integerValue == 0 ? @"取消使用铭牌成功" : YMLocalizedString(@"XPDressUpShopCardViewController6")];
+    [self showSuccessToast:nameplateId.integerValue == 0 ? YMLocalizedString(@"XPMineDressUpViewController8") : YMLocalizedString(@"XPDressUpShopCardViewController6")];
 }

 - (void)userNobleCardSuccess:(NSString *)nobleCardId {
-    [self showSuccessToast:nobleCardId.integerValue == 0 ? @"取消使用资料卡成功" : YMLocalizedString(@"XPDressUpShopCardViewController8")];
+    [self showSuccessToast:nobleCardId.integerValue == 0 ? YMLocalizedString(@"XPMineDressUpViewController9") : YMLocalizedString(@"XPDressUpShopCardViewController8")];
    if (nobleCardId.integerValue == 0) {
        for (NobleCardModel *model in self.datasource) {
            model.used = NO;
--- a/YuMi/Modules/YMMine/View/DressUp/View/XPDressUpShopListViewController.m
+++ b/YuMi/Modules/YMMine/View/DressUp/View/XPDressUpShopListViewController.m
@@ -102,21 +102,21 @@

 - (void)useHeadwearSuccess:(NSString *)headWearId {
 //    [self.presenter getUserHeadwearList];
-    [self showSuccessToast:headWearId.integerValue == 0 ? @"取消使用头饰成功" : YMLocalizedString(@"XPDressUpShopListViewController2")];
+    [self showSuccessToast:headWearId.integerValue == 0 ? YMLocalizedString(@"XPMineDressUpViewController6") : YMLocalizedString(@"XPDressUpShopListViewController2")];
 }

 - (void)useCarSuccess:(NSString *)carId {
 //    [self.presenter getUserCarList];
-    [self showSuccessToast:carId.integerValue == 0 ? @"取消使用座驾成功" : YMLocalizedString(@"XPDressUpShopListViewController4")];
+    [self showSuccessToast:carId.integerValue == 0 ? YMLocalizedString(@"XPMineDressUpViewController7") : YMLocalizedString(@"XPDressUpShopListViewController4")];
 }

 - (void)useNameplateSuccess:(NSString *)nameplateId {
 //    [self.presenter getUserNameplateList];
-    [self showSuccessToast:nameplateId.integerValue == 0 ? @"取消使用铭牌成功" : YMLocalizedString(@"XPDressUpShopListViewController6")];
+    [self showSuccessToast:nameplateId.integerValue == 0 ? YMLocalizedString(@"XPMineDressUpViewController8") : YMLocalizedString(@"XPDressUpShopListViewController6")];
 }

 - (void)userNobleCardSuccess:(NSString *)nobleCardId {
-    [self showSuccessToast:nobleCardId.integerValue == 0 ? @"取消使用资料卡成功" : YMLocalizedString(@"XPDressUpShopListViewController8")];
+    [self showSuccessToast:nobleCardId.integerValue == 0 ? YMLocalizedString(@"XPMineDressUpViewController9") : YMLocalizedString(@"XPDressUpShopListViewController8")];
    if (nobleCardId.integerValue == 0) {
        for (NobleCardModel *model in self.datasource) {
            model.used = NO;
@@ -151,7 +151,7 @@
        return cell;
    }
    XPMineDressEmptyCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPMineDressEmptyCollectionViewCell class]) forIndexPath:indexPath];
-    cell.emptyTitle = self.type == DressUpShopListType_HeadWear ? @"暂无头饰" : self.type == DressUpShopListType_Car ? @"暂无座驾" : self.type == DressUpShopListType_Nameplate ? @"暂无铭牌" : YMLocalizedString(@"XPDressUpShopListViewController12");
+    cell.emptyTitle = self.type == DressUpShopListType_HeadWear ? YMLocalizedString(@"XPDressUpShopCardViewController10") : self.type == DressUpShopListType_Car ? YMLocalizedString(@"XPDressUpShopCardViewController12") : self.type == DressUpShopListType_Nameplate ? YMLocalizedString(@"XPDressUpShopCardViewController11") : YMLocalizedString(@"XPDressUpShopListViewController12");
    return cell;
 }

--- a/YuMi/Modules/YMMine/View/DressUp/View/XPDressUpShopViewController.m
+++ b/YuMi/Modules/YMMine/View/DressUp/View/XPDressUpShopViewController.m
@@ -279,7 +279,7 @@
 }

 - (NSArray<NSString *> *)titles {
-    return @[@"头饰", @"座驾", @"铭牌", @"资料卡", YMLocalizedString(@"XPDressUpShopViewController6")];
+    return @[YMLocalizedString(@"XPMineDressUpViewController1"), YMLocalizedString(@"XPMineDressUpViewController2"), YMLocalizedString(@"XPMineDressUpViewController3"), YMLocalizedString(@"XPMineDressUpViewController4"), YMLocalizedString(@"XPDressUpShopViewController6")];
 }

 - (XPDressUpShopListViewController *)headwearView {
--- a/YuMi/Modules/YMMine/View/DressUp/View/XPMineDressUpBubbleViewController.m
+++ b/YuMi/Modules/YMMine/View/DressUp/View/XPMineDressUpBubbleViewController.m
@@ -64,7 +64,7 @@
 }

 - (void)useBubbleSuccess:(NSString *)bubbleId {
-    [self showSuccessToast:bubbleId.integerValue == 0 ? @"取消使用气泡成功" : YMLocalizedString(@"XPMineDressUpBubbleViewController1")];
+    [self showSuccessToast:bubbleId.integerValue == 0 ? YMLocalizedString(@"XPMineDressUpBubbleViewController3") : YMLocalizedString(@"XPMineDressUpBubbleViewController1")];
    if (bubbleId.integerValue == 0) {
        for (ChatBubbleModel *model in self.datasource) {
            model.hasUsed = NO;
@@ -99,7 +99,7 @@
        return cell;
    }
    XPMineDressEmptyCollectionViewCell * cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPMineDressEmptyCollectionViewCell class]) forIndexPath:indexPath];
-    cell.emptyTitle = @"亲爱的用户，你还没有聊天气泡噢！";
+    cell.emptyTitle = YMLocalizedString(@"XPMineDressUpBubbleViewController2");
    return cell;
 }

--- a/YuMi/Modules/YMMine/View/DressUp/View/XPMineDressUpListViewController.m
+++ b/YuMi/Modules/YMMine/View/DressUp/View/XPMineDressUpListViewController.m
@@ -93,22 +93,22 @@

 - (void)useHeadwearSuccess:(NSString *)headWearId {
 	[self.presenter getUserHeadwearList];
-	[self showSuccessToast:headWearId.integerValue == 0 ? @"取消使用头饰成功" : YMLocalizedString(@"XPMineDressUpListViewController1")];
+	[self showSuccessToast:headWearId.integerValue == 0 ? YMLocalizedString(@"XPMineDressUpViewController6") : YMLocalizedString(@"XPMineDressUpListViewController1")];
 	
 }

 - (void)useCarSuccess:(NSString *)carId {
 	[self.presenter getUserCarList];
-	[self showSuccessToast:carId.integerValue == 0 ? @"取消使用座驾成功" : YMLocalizedString(@"XPMineDressUpListViewController3")];
+	[self showSuccessToast:carId.integerValue == 0 ? YMLocalizedString(@"XPMineDressUpViewController7") : YMLocalizedString(@"XPMineDressUpListViewController3")];
 }

 - (void)useNameplateSuccess:(NSString *)nameplateId {
 	[self.presenter getUserNameplateList];
-	[self showSuccessToast:nameplateId.integerValue == 0 ? @"取消使用铭牌成功" : YMLocalizedString(@"XPMineDressUpListViewController5")];
+	[self showSuccessToast:nameplateId.integerValue == 0 ? YMLocalizedString(@"XPMineDressUpViewController8") : YMLocalizedString(@"XPMineDressUpListViewController5")];
 }

 - (void)userNobleCardSuccess:(NSString *)nobleCardId {
-    [self showSuccessToast:nobleCardId.integerValue == 0 ? @"取消使用资料卡成功" : YMLocalizedString(@"XPMineDressUpListViewController7")];
+    [self showSuccessToast:nobleCardId.integerValue == 0 ? YMLocalizedString(@"XPMineDressUpViewController9") : YMLocalizedString(@"XPMineDressUpListViewController7")];
    if (nobleCardId.integerValue == 0) {
        for (NobleCardModel *model in self.datasource) {
            model.used = NO;
@@ -186,7 +186,7 @@
 	if (cell == nil) {
 		cell = [[XPMineDressEmptyTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass([XPMineDressEmptyTableViewCell class])];
 	}
-	cell.emptyTitle = self.type == DressUpListType_HeadWear ? @"亲爱的用户，你还没有头饰噢！" : self.type == DressUpListType_Car ? @"亲爱的用户，你还没有座驾噢！" : @"亲爱的用户，你还没有铭牌噢！";
+	cell.emptyTitle = self.type == DressUpListType_HeadWear ? YMLocalizedString(@"XPMineDressUpListViewController11") : self.type == DressUpListType_Car ? YMLocalizedString(@"XPMineDressUpListViewController12") : YMLocalizedString(@"XPMineDressUpListViewController10" );
 	return cell;
 }

--- a/YuMi/Modules/YMMine/View/DressUp/View/XPMineDressUpViewController.m
+++ b/YuMi/Modules/YMMine/View/DressUp/View/XPMineDressUpViewController.m
@@ -194,7 +194,7 @@
 }

 - (NSArray<NSString *> *)titles {
-	return @[@"头饰", @"座驾", @"铭牌", @"资料卡", YMLocalizedString(@"XPMineDressUpViewController5")];
+	return @[YMLocalizedString(@"XPMineDressUpViewController1"), YMLocalizedString(@"XPMineDressUpViewController2"), YMLocalizedString(@"XPMineDressUpViewController3"), YMLocalizedString(@"XPMineDressUpViewController4"), YMLocalizedString(@"XPMineDressUpViewController5")];
 }

 - (XPMineDressUpListViewController *)headwearView {
--- a/YuMi/Modules/YMMine/View/Friend/XPMineContactViewController.m
+++ b/YuMi/Modules/YMMine/View/Friend/XPMineContactViewController.m
@@ -120,7 +120,7 @@

 - (NSArray<NSString *> *)titles {
 	if (!_titles) {
-		_titles = @[@"消息", @"好友",@"粉丝", YMLocalizedString(@"XPMineContactViewController3")];
+		_titles = @[YMLocalizedString(@"TabbarViewController4"), YMLocalizedString(@"XPMonentsTooBarView3"),YMLocalizedString(@"XPMineHeadView5"), YMLocalizedString(@"XPMineContactViewController3")];
 	}
 	return _titles;
 }
--- a/YuMi/Modules/YMMine/View/Friend/XPMineShareViewController.m
+++ b/YuMi/Modules/YMMine/View/Friend/XPMineShareViewController.m
@@ -87,7 +87,7 @@
 	switch (self.shareType) {
 		case MineShareType_Monents:
 		{
-			title = [NSString stringWithFormat:@"确认分享给%@吗？", nick];
+			title = [NSString stringWithFormat:YMLocalizedString(@"XPMineShareViewController1"), nick];
 			attachment.first = CustomMessageType_Monents;
 			attachment.second = Custom_Message_Sub_Monents_Share;
 			ContentShareMonentsModel * shareInfo = [[ContentShareMonentsModel alloc] init];
@@ -163,7 +163,7 @@

 - (NSArray<NSString *> *)titles {
 	if (!_titles) {
-		_titles = @[@"好友",@"粉丝", YMLocalizedString(@"XPMineShareViewController4")];
+		_titles = @[YMLocalizedString(@"XPMonentsTooBarView3"),YMLocalizedString(@"XPMineContactViewController3"), YMLocalizedString(@"XPMineShareViewController4")];
 	}
 	return _titles;
 }
--- a/YuMi/Modules/YMMine/View/MineInfo/XPMineSimpleUserInfoHeaderView.m
+++ b/YuMi/Modules/YMMine/View/MineInfo/XPMineSimpleUserInfoHeaderView.m
@@ -202,7 +202,7 @@
        self.avatarImageView.imageUrl = userInfo.avatar;
        self.bgImageView.imageUrl = userInfo.avatar;
        self.introduceLabel.text = _userInfo.userDesc.length > 0 ? _userInfo.userDesc : YMLocalizedString(@"XPMineSimpleUserInfoHeaderView0");
-        self.fansLabel.text =[NSString stringWithFormat:@"粉丝：%ld", _userInfo.fansNum];
+        self.fansLabel.text =[NSString stringWithFormat:@"%@：%ld",YMLocalizedString(@"XPMineHeadView5"), _userInfo.fansNum];
        
        self.userGiftWall = self.userInfo.userGiftWall;
        self.userLuckyBagGiftWall = self.userInfo.userLuckyBagGiftWall;
@@ -433,7 +433,7 @@

 - (NSArray<NSString *> *)titles {
    if (!_titles) {
-        _titles = @[@"普通礼物", YMLocalizedString(@"XPMineSimpleUserInfoHeaderView5")];
+        _titles = @[YMLocalizedString(@"XPWishGiftCreateItemViewController0"), YMLocalizedString(@"XPMineSimpleUserInfoHeaderView5")];
    }
    return _titles;
 }
--- a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoAlbumViewController.m
+++ b/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoAlbumViewController.m
@@ -86,10 +86,10 @@
 			[self presentViewController:imagePicker animated:YES completion:NULL];
 		} denied:^{
 			@strongify(self);
-			[self showNotPhoto:@"相机不可用" content:YMLocalizedString(@"XPMineUserInfoAlbumViewController3")];
+			[self showNotPhoto:YMLocalizedString(@"SessionViewController19") content:YMLocalizedString(@"XPMineUserInfoAlbumViewController3")];
 		} restriction:^{
 			@strongify(self);
-			[self showNotPhoto:@"相机不可用" content:YMLocalizedString(@"XPMineUserInfoAlbumViewController5")];
+			[self showNotPhoto:YMLocalizedString(@"SessionViewController19") content:YMLocalizedString(@"XPMineUserInfoAlbumViewController5")];
 		}];
 	}];
 	
@@ -104,10 +104,10 @@
 			[self presentViewController:imagePicker animated:YES completion:NULL];
 		} denied:^{
 			@strongify(self);
-			[self showNotPhoto:@"相册不可用" content:YMLocalizedString(@"XPMineUserInfoAlbumViewController8")];
+			[self showNotPhoto:YMLocalizedString(@"SessionViewController21") content:YMLocalizedString(@"XPMineUserInfoAlbumViewController8")];
 		} restriction:^{
 			@strongify(self);
-			[self showNotPhoto:@"相册不可用" content:YMLocalizedString(@"XPMineUserInfoAlbumViewController10")];
+			[self showNotPhoto:YMLocalizedString(@"SessionViewController21") content:YMLocalizedString(@"XPMineUserInfoAlbumViewController10")];
 		}];
 	}];
 	
@@ -173,7 +173,7 @@
 - (void)xPMineUserInfoAlbumCollectionViewCell:(XPMineUserInfoAlbumCollectionViewCell *)cell didDeleteItem:(UserPhoto *)photo {
 	TTAlertConfig * config = [[TTAlertConfig alloc] init];
 	config.title = YMLocalizedString(@"XPMineUserInfoAlbumViewController12");
-	config.message = @"是否需要删除？";
+	config.message = YMLocalizedString(@"XPMineUserInfoAlbumViewController13");
 	[TTPopup alertWithConfig:config confirmHandler:^{
 		[self.presenter deleteImageUrlFromServerWithPid:photo.pid];
 	} cancelHandler:^{
--- a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoDesViewController.m
+++ b/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoDesViewController.m
@@ -124,7 +124,7 @@ static NSInteger maxCount = 60;
 	if (!_useDescTextView) {
 		_useDescTextView = [[SZTextView alloc] init];
 		_useDescTextView.delegate = self;
-		_useDescTextView.placeholder = @"填写自我介绍，可以让别人更了解你哦～";
+		_useDescTextView.placeholder = YMLocalizedString(@"XPMineUserInfoDesViewController2");
 		_useDescTextView.placeholderTextColor = [DJDKMIMOMColor secondTextColor];
 		_useDescTextView.font = [UIFont systemFontOfSize:14];
 		_useDescTextView.textColor = [DJDKMIMOMColor mainTextColor];
--- a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoEditViewController.m
+++ b/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoEditViewController.m
@@ -81,10 +81,10 @@
 			[self presentViewController:imagePicker animated:YES completion:NULL];
 		} denied:^{
 			@strongify(self);
-			[self showNotPhoto:@"相机不可用" content:YMLocalizedString(@"XPMineUserInfoEditViewController3")];
+			[self showNotPhoto:YMLocalizedString(@"SessionViewController19") content:YMLocalizedString(@"XPMineUserInfoEditViewController3")];
 		} restriction:^{
 			@strongify(self);
-			[self showNotPhoto:@"相机不可用" content:YMLocalizedString(@"XPMineUserInfoEditViewController5")];
+			[self showNotPhoto:YMLocalizedString(@"SessionViewController19") content:YMLocalizedString(@"XPMineUserInfoEditViewController5")];
 		}];
 	}];
 	
@@ -99,10 +99,10 @@
 			[self presentViewController:imagePicker animated:YES completion:NULL];
 		} denied:^{
 			@strongify(self);
-			[self showNotPhoto:@"相册不可用" content:YMLocalizedString(@"XPMineUserInfoEditViewController8")];
+			[self showNotPhoto:YMLocalizedString(@"SessionViewController21") content:YMLocalizedString(@"XPMineUserInfoEditViewController8")];
 		} restriction:^{
 			@strongify(self);
-			[self showNotPhoto:@"相册不可用" content:YMLocalizedString(@"XPMineUserInfoEditViewController10")];
+			[self showNotPhoto:YMLocalizedString(@"SessionViewController21") content:YMLocalizedString(@"XPMineUserInfoEditViewController10")];
 		}];
 	}];

--- a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoGiftWallViewController.m
+++ b/YuMi/Modules/YMMine/View/MineInfo/XPMineUserInfoGiftWallViewController.m
@@ -123,7 +123,7 @@

 - (NSArray<NSString *> *)titles {
 	if (!_titles) {
-		_titles = @[@"普通礼物", YMLocalizedString(@"XPMineUserInfoGiftWallViewController2")];
+		_titles = @[YMLocalizedString(@"XPWishGiftCreateItemViewController0"), YMLocalizedString(@"XPMineUserInfoGiftWallViewController2")];
 	}
 	return _titles;
 }
--- a/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeViewController.m
+++ b/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeViewController.m
@@ -356,7 +356,7 @@
 - (UIButton *)protcoloButton {
    if (!_protcoloButton) {
        _protcoloButton = [UIButton buttonWithType:UIButtonTypeCustom];
-        [_protcoloButton setTitle:@"《用户充值协议》" forState:UIControlStateNormal];
+        [_protcoloButton setTitle:YMLocalizedString(@"XPIAPRechargeViewController3") forState:UIControlStateNormal];
        [_protcoloButton setTitleColor:[DJDKMIMOMColor appMainColor] forState:UIControlStateNormal];
        _protcoloButton.titleLabel.font = [UIFont systemFontOfSize:12];
        [_protcoloButton addTarget:self action:@selector(protcoloButtonAction:) forControlEvents:UIControlEventTouchUpInside];
@@ -376,7 +376,7 @@
 - (UILabel *)contactLabel {
    if (!_contactLabel) {
        _contactLabel = [[UILabel alloc] init];
-        _contactLabel.text = @"如有任何问题请咨询客服，Piko号：88001";
+        _contactLabel.text = [NSString stringWithFormat:@"%@: 88001",YMLocalizedString(@"XPIAPRechargeViewController5")];
        _contactLabel.font = [UIFont systemFontOfSize:12];
        _contactLabel.textColor = [DJDKMIMOMColor appMainColor];
    }
--- a/YuMi/Modules/YMMine/View/Recharge/XPMineRechargeViewController.m
+++ b/YuMi/Modules/YMMine/View/Recharge/XPMineRechargeViewController.m
@@ -283,7 +283,7 @@
 - (UIButton *)protcoloButton {
 	if (!_protcoloButton) {
 		_protcoloButton = [UIButton buttonWithType:UIButtonTypeCustom];
-		[_protcoloButton setTitle:@"《用户充值协议》" forState:UIControlStateNormal];
+		[_protcoloButton setTitle:YMLocalizedString(@"XPIAPRechargeViewController3") forState:UIControlStateNormal];
 		[_protcoloButton setTitleColor:[DJDKMIMOMColor appMainColor] forState:UIControlStateNormal];
 		_protcoloButton.titleLabel.font = [UIFont systemFontOfSize:12];
 		[_protcoloButton addTarget:self action:@selector(protcoloButtonAction:) forControlEvents:UIControlEventTouchUpInside];
--- a/YuMi/Modules/YMMine/View/Setting/XPMineAboutUsViewController.m
+++ b/YuMi/Modules/YMMine/View/Setting/XPMineAboutUsViewController.m
@@ -26,7 +26,7 @@

 - (void)viewDidLoad {
 	[super viewDidLoad];
-	self.title = [NSString stringWithFormat:@"关于%@",AppName];
+	self.title = [NSString stringWithFormat:@"%@%@",YMLocalizedString(@"XPMineSettingPresent19"),AppName];
 	[self initSubViews];
 	[self makeConstriants];
    
--- a/YuMi/Modules/YMMine/View/Setting/XPMineFeedbackViewController.m
+++ b/YuMi/Modules/YMMine/View/Setting/XPMineFeedbackViewController.m
@@ -92,7 +92,7 @@

 #pragma mark - FeedbackCoreClient
 - (void)saveFeedbackSuccess {
-	[self showSuccessToast:[NSString stringWithFormat:@"感谢您的宝贵意见，让我们共同营造更好的%@", AppName]];
+	[self showSuccessToast:[NSString stringWithFormat:@"%@%@",YMLocalizedString(@"XPMineFeedbackViewController1"), AppName]];
 	[self.navigationController popViewControllerAnimated:YES];
 }
 #pragma mark - Event Response
@@ -126,7 +126,7 @@
 - (SZTextView *)contentTextView {
 	if (!_contentTextView) {
 		_contentTextView = [[SZTextView alloc] init];
-        NSString * placeholder = @"请详细描述您所遇到的问题与情况，感谢您提出宝贵的意见。";
+        NSString * placeholder = YMLocalizedString(@"XPMineFeedbackViewController3");
        _contentTextView.attributedPlaceholder = [[NSAttributedString alloc] initWithString:placeholder attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:14], NSForegroundColorAttributeName : [DJDKMIMOMColor secondTextColor]}];
 		_contentTextView.textColor = [DJDKMIMOMColor mainTextColor];
 		_contentTextView.backgroundColor = [DJDKMIMOMColor appCellBackgroundColor];
--- a/YuMi/Modules/YMMine/View/Setting/XPMineSettingViewController.m
+++ b/YuMi/Modules/YMMine/View/Setting/XPMineSettingViewController.m
@@ -109,7 +109,7 @@
 		case XPMineSettingItemType_Pay_Password:
 		{
 			if (!self.userInfo.isBindPhone) {
-				[self showErrorToast:@"请先绑定手机号码哦～"];
+				[self showErrorToast:YMLocalizedString(@"XPMineSettingViewController1")];
 				return;
 			}
 			//支付密码
@@ -180,7 +180,7 @@
 		{
            TTAlertConfig *config = [[TTAlertConfig alloc] init];
            config.title = YMLocalizedString(@"XPMineSettingViewController2");
-            config.message = @"要清除缓存吗？";
+            config.message = YMLocalizedString(@"XPMineSettingViewController3");
            [TTPopup alertWithConfig:config confirmHandler:^{
                NSSet *websiteDataTypes = [WKWebsiteDataStore allWebsiteDataTypes];
                NSDate *dateFrom = [NSDate dateWithTimeIntervalSince1970:0];
--- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m
+++ b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m
@@ -269,6 +269,7 @@
 	
 	[self.signLabel mas_makeConstraints:^(MASConstraintMaker *make) {
 		make.left.mas_equalTo(self.signBackView).offset(10);
+        make.right.mas_equalTo(self.signBackView).offset(10);
 		make.top.mas_equalTo(self.signBackView).offset(23);
 	}];
 }
--- a/YuMi/Modules/YMMine/View/XPPermissionsViewController.m
+++ b/YuMi/Modules/YMMine/View/XPPermissionsViewController.m
@@ -273,7 +273,7 @@
        _footerTip = [[UILabel alloc] init];
        _footerTip.textColor = DJDKMIMOMColor.mainTextColor;
        _footerTip.font = [UIFont systemFontOfSize:12];
-        _footerTip.text = @"—— 仅展示能查询到的已授权系统权限 ——";
+        _footerTip.text = YMLocalizedString(@"XPPermissionsViewController8");
    }
    return _footerTip;
 }
@@ -281,7 +281,7 @@
 - (UIButton *)gotoSetting {
    if (!_gotoSetting) {
        _gotoSetting = [UIButton buttonWithType:UIButtonTypeCustom];
-        [_gotoSetting setTitle:@"前往系统设置>" forState:UIControlStateNormal];
+        [_gotoSetting setTitle:YMLocalizedString(@"XPPermissionsViewController9") forState:UIControlStateNormal];
        [_gotoSetting setTitleColor:DJDKMIMOMColor.appMainColor forState:UIControlStateNormal];
        _gotoSetting.titleLabel.font = [UIFont systemFontOfSize:14];
        _gotoSetting.titleLabel.adjustsFontSizeToFitWidth = YES;
--- a/YuMi/Modules/YMMonents/View/XPMomentsSimpleDetailViewController.m
+++ b/YuMi/Modules/YMMonents/View/XPMomentsSimpleDetailViewController.m
@@ -257,7 +257,7 @@
        if (self.datasource.count > 0) {
            MonentsCommentModel* monent = [self.datasource safeObjectAtIndex1:indexPath.row];
            self.commentId = monent.commentId;
-            self.inputBarView.inputTextView.placeholder = [NSString stringWithFormat:@"回复: %@", monent.nick];
+            self.inputBarView.inputTextView.placeholder = [NSString stringWithFormat:@"%@: %@",YMLocalizedString(@"XPMonentsDetailViewController3"), monent.nick];
            [self.inputBarView textViewBecomeFirstResponder];
        }
    }
@@ -296,7 +296,7 @@
    TTActionSheetConfig *action;
    if (self.monentsInfo.uid.integerValue == [AccountInfoStorage instance].getUid.integerValue) {
        action = [TTActionSheetConfig normalTitle:YMLocalizedString(@"XPMomentsSimpleDetailViewController4") clickAction:^{
-            [TTPopup alertWithMessage:@"删除后不可恢复\n确定删除该动态吗？" confirmHandler:^{
+            [TTPopup alertWithMessage:YMLocalizedString(@"XPMonentsTopicLatestViewController1") confirmHandler:^{
                [self.presenter deleteMonents:self.monentsInfo.dynamicId worldId:[NSString stringWithFormat:@"%ld", self.monentsInfo.worldId]];
            } cancelHandler:^{

@@ -325,7 +325,7 @@
 - (void)xPMonentsCommentTableViewCell:(XPMonentsCommentTableViewCell *)view didClickCommon:(MonentsReplyModel *)commentInfo {
    if (commentInfo) {
        self.commentId = commentInfo.replyId;
-        self.inputBarView.inputTextView.placeholder = [NSString stringWithFormat:@"回复: %@", commentInfo.nick];
+        self.inputBarView.inputTextView.placeholder = [NSString stringWithFormat:@"%@: %@",YMLocalizedString(@"XPMonentsDetailViewController3"), commentInfo.nick];
        [self.inputBarView textViewBecomeFirstResponder];
    }
 }
@@ -347,7 +347,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:^{

--- a/YuMi/Modules/YMMonents/View/XPMonentTopicContainerViewController.m
+++ b/YuMi/Modules/YMMonents/View/XPMonentTopicContainerViewController.m
@@ -182,7 +182,7 @@

 - (NSArray<NSString *> *)titles {
 	if (!_titles) {
-		_titles = @[@"推荐", YMLocalizedString(@"XPMonentTopicContainerViewController1")];
+		_titles = @[YMLocalizedString(@"XPMonentsViewController0" ), YMLocalizedString(@"XPMonentTopicContainerViewController1")];
 	}
 	return _titles;
 }
--- a/YuMi/Modules/YMMonents/View/XPMonentsDetailViewController.m
+++ b/YuMi/Modules/YMMonents/View/XPMonentsDetailViewController.m
@@ -184,7 +184,7 @@
 }

 - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {
-	self.commentLabel.text = [NSString stringWithFormat:@"所有评论(%@)", self.monentsInfo.commentCount];
+	self.commentLabel.text = [NSString stringWithFormat:@"%@(%@)",YMLocalizedString(@"XPMonentsDetailViewController2"),self.monentsInfo.commentCount];
 	return self.sectionView;
 }

@@ -221,7 +221,7 @@
 		if (self.datasource.count > 0) {
 			MonentsCommentModel* monent = [self.datasource safeObjectAtIndex1:indexPath.row];
 			self.commentId = monent.commentId;
-			self.inputBarView.inputTextView.placeholder = [NSString stringWithFormat:@"回复: %@", monent.nick];
+			self.inputBarView.inputTextView.placeholder = [NSString stringWithFormat:@"%@: %@", YMLocalizedString(@"XPMonentsDetailViewController3"),monent.nick];
 			[self.inputBarView textViewBecomeFirstResponder];
 		}
 	}
@@ -239,7 +239,7 @@
 - (void)xPMonentsCommentTableViewCell:(XPMonentsCommentTableViewCell *)view didClickCommon:(MonentsReplyModel *)commentInfo {
 	if (commentInfo) {
 		self.commentId = commentInfo.replyId;
-		self.inputBarView.inputTextView.placeholder = [NSString stringWithFormat:@"回复: %@", commentInfo.nick];
+		self.inputBarView.inputTextView.placeholder = [NSString stringWithFormat:@"%@: %@",YMLocalizedString(@"XPMonentsDetailViewController3"), commentInfo.nick];
 		[self.inputBarView textViewBecomeFirstResponder];
 	}
 }
@@ -260,7 +260,7 @@
 }

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

--- a/YuMi/Modules/YMMonents/View/XPMonentsInteractiveViewController.m
+++ b/YuMi/Modules/YMMonents/View/XPMonentsInteractiveViewController.m
@@ -186,7 +186,7 @@

 #pragma mark - Event Response
 - (void)rightButtonAction:(UIButton *)sender {
-	[TTPopup alertWithMessage:@"清空后所有互动通知将被删除，确定清空吗？" confirmHandler:^{
+	[TTPopup alertWithMessage:YMLocalizedString(@"XPMonentsInteractiveViewController2") confirmHandler:^{
 		[[self presenter] clearInteractiveMessage];
 	} cancelHandler:^{
 	}];
--- a/YuMi/Modules/YMMonents/View/XPMonentsLatestViewController.m
+++ b/YuMi/Modules/YMMonents/View/XPMonentsLatestViewController.m
@@ -170,7 +170,7 @@
 }

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

--- a/YuMi/Modules/YMMonents/View/XPMonentsPublishViewController.m
+++ b/YuMi/Modules/YMMonents/View/XPMonentsPublishViewController.m
@@ -269,7 +269,7 @@

 #pragma mark - XPMonentsPublishCollectionViewCellDelegate
 - (void)XPMonentsPublishCollectionViewCell:(XPMonentsPublishCollectionViewCell *)view didDeleteItem:(UIImage *)image {
-	[TTPopup alertWithMessage:@"确认删除吗？" confirmHandler:^{
+	[TTPopup alertWithMessage:YMLocalizedString(@"XPMonentsPublishViewController1") confirmHandler:^{
 		if ([self.datasource containsObject:image]) {
 			[self.datasource removeObject:image];
 		}
@@ -370,7 +370,7 @@
 	if (self.isEdited) {
 		TTAlertConfig * config = [[TTAlertConfig alloc] init];
 		config.title = YMLocalizedString(@"XPMonentsPublishViewController2");
-		config.message = @"还没有发布哎~确定要返回吗？";
+		config.message = YMLocalizedString(@"XPMomentsSimpleDetailViewController12");
 		config.confirmButtonConfig.title = YMLocalizedString(@"XPMonentsPublishViewController4");
 		config.cancelButtonConfig.title = YMLocalizedString(@"XPMonentsPublishViewController5");
 		[TTPopup alertWithConfig:config confirmHandler:^{
@@ -480,7 +480,7 @@
 		_textView = [[SZTextView alloc] init];
 		_textView.textColor = [DJDKMIMOMColor mainTextColor];
 		_textView.font = [UIFont systemFontOfSize:15];
-		_textView.placeholder = @"记录你此刻生活，分享给有趣的人看...";
+        _textView.placeholder = [NSString stringWithFormat:@"%@...",YMLocalizedString(@"XPMonentsPublishViewController9")];
 		_textView.placeholderTextColor = [DJDKMIMOMColor secondTextColor];
 		_textView.backgroundColor = [UIColor clearColor];
 		_textView.delegate = self;
@@ -510,7 +510,7 @@
 - (UILabel *)descriptionLabel {
 	if (!_descriptionLabel) {
 		_descriptionLabel = [[UILabel alloc] init];
-		_descriptionLabel.text = @"禁止出现商业广告、微信号码、QQ号码、电话号码,  以及低俗、色情、恐怖、暴力和具有侮辱性语言等内容，违规者封号处理 ！";
+		_descriptionLabel.text = YMLocalizedString(@"XPMonentsPublishViewController10");
 		_descriptionLabel.font = [UIFont systemFontOfSize:11];
 		_descriptionLabel.textColor = [DJDKMIMOMColor secondTextColor];
 		_descriptionLabel.numberOfLines = 0;
--- a/YuMi/Modules/YMMonents/View/XPMonentsTopicLatestViewController.m
+++ b/YuMi/Modules/YMMonents/View/XPMonentsTopicLatestViewController.m
@@ -148,7 +148,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:^{

--- a/YuMi/Modules/YMMonents/View/XPMonentsTopicRecommondViewController.m
+++ b/YuMi/Modules/YMMonents/View/XPMonentsTopicRecommondViewController.m
@@ -164,7 +164,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:^{

--- a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyTableViewCell.m
+++ b/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyTableViewCell.m
@@ -85,7 +85,7 @@
 	[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
 		make.left.mas_equalTo(self.bgView).offset(65);
 		make.bottom.mas_equalTo(self.bgView.mas_centerY).offset(-8);
-		make.right.lessThanOrEqualTo(self.numberImageView.mas_left).offset(-10);
+		make.right.equalTo(self.numberImageView.mas_left).offset(-10);
 	}];

 	[self.tagImageView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -101,6 +101,7 @@

 	[self.numberLabel mas_makeConstraints:^(MASConstraintMaker *make) {
 		make.right.mas_equalTo(self.bgView).offset(-12);
+        make.width.mas_equalTo(40);
 		make.centerY.mas_equalTo(self.titleLabel);
 	}];

@@ -133,6 +134,10 @@
       
 		self.idLabel.text = [NSString stringWithFormat:@"ID:%@", _roomInfo.erbanNo];
 		self.numberLabel.text = [NSString stringWithFormat:@"%ld", _roomInfo.onlineNum];
+        CGFloat getWidth =  [self.numberLabel.text sizeWithAttributes:@{NSFontAttributeName:self.numberLabel.font}].width+5;
+        [self.numberLabel mas_updateConstraints:^(MASConstraintMaker *make) {
+            make.width.mas_equalTo(getWidth);
+        }];
 	}
 }

--- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKCountDownView.m
+++ b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKCountDownView.m
@@ -133,7 +133,7 @@
        _titleLabel = [[UILabel alloc] init];
        _titleLabel.font = [UIFont systemFontOfSize:10];
        _titleLabel.textColor = [UIColor whiteColor];
-        _titleLabel.text = @"下一场PK";
+        _titleLabel.text = YMLocalizedString(@"XPAcrossRoomPKCountDownView0");
    }
    return _titleLabel;
 }
--- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKResultView.m
+++ b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKResultView.m
@@ -280,14 +280,14 @@
 	if (data.csRank.count > 0) {//有贡献
 		AcrossRoomPkRankModel *contributeInfo = [data.csRank safeObjectAtIndex1:0];
 		self.contributeNick.text = contributeInfo.nick ? contributeInfo.nick : @"";
-		self.contributeValue.text = [NSString stringWithFormat:@"神豪值：%@", contributeInfo.amount? contributeInfo.amount : @""];
+		self.contributeValue.text = [NSString stringWithFormat:@"%@：%@",YMLocalizedString(@"XPAcrossRoomPKResultView0"), contributeInfo.amount? contributeInfo.amount : @""];
 		self.contributeAvatar.imageUrl = contributeInfo.avatar;
 	}
 	
 	if (data.crRank.count > 0) {
 		AcrossRoomPkRankModel *charmInfo = [data.crRank safeObjectAtIndex1:0];
 		self.charmNick.text = charmInfo.nick ? charmInfo.nick : @"";
-		self.charmValue.text = [NSString stringWithFormat:@"魅力值：%@", charmInfo.amount? charmInfo.amount : @""];
+		self.charmValue.text = [NSString stringWithFormat:@"%@：%@",YMLocalizedString(@"XPAcrossRoomPKResultView1"), charmInfo.amount? charmInfo.amount : @""];
 		self.charmAvatar.imageUrl = charmInfo.avatar;
 	}
 }
--- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKRuleView.m
+++ b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrossRoomPKRuleView.m
@@ -77,7 +77,7 @@
 - (UILabel *)titleLabel {
 	if (!_titleLabel) {
 		_titleLabel = [[UILabel alloc] init];
-		_titleLabel.text = @"如何开启跨房PK";
+		_titleLabel.text =YMLocalizedString(@"XPAcrossRoomPKRuleView0");
 		_titleLabel.textColor = [UIColor whiteColor];
 		_titleLabel.font = [UIFont systemFontOfSize:18 weight:UIFontWeightBold];
 	}
@@ -92,7 +92,7 @@
 		_ruleTextView.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium];
 		_ruleTextView.scrollEnabled = NO;
 		_ruleTextView.editable = NO;
-		_ruleTextView.text = @"1）只有牌照房房主和超管才可以发起跨房pk，一次只能选择一个牌照房发起；\n2）只有房主和超管才可以接受或拒绝跨房pk请求，若10秒内不点击pk邀请弹窗，弹窗消失，视为自动拒绝；\n3）发起pk时需选择pk时间和pk对象，自定义时间下限为5，上限为180，只能填写整数；\n4）pk发起后，未到pk时间无法自行结束，若有特殊情况需提前结束可联系客服，但本场pk不算胜负。\n";
+		_ruleTextView.text = YMLocalizedString(@"XPAcrossRoomPKRuleView1");
 	}
 	return _ruleTextView;
 }
--- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrpssRoomPKPanelView.m
+++ b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAcrpssRoomPKPanelView.m
@@ -684,7 +684,7 @@
 		_ruleTextView.backgroundColor = [UIColor clearColor];
 		_ruleTextView.textColor = [UIColor whiteColor];
 		_ruleTextView.font = [UIFont systemFontOfSize:12];
-		_ruleTextView.text = @"1）按收到的礼物价值积分（1钻石=1分），礼物值高的一方获胜。\n2）PK结束后，若比分差距≥1314或双方分数总值≥15000（平局除外）将在与获胜方相同类型的房间公示PK结果；若比分差距≥5200或双方分数总值≥30000（平局除外）将在全服所有房间公示PK结果。";
+		_ruleTextView.text = YMLocalizedString(@"XPAcrpssRoomPKPanelView1");
 	}
 	return _ruleTextView;
 }
--- a/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAnchorPKMatchView.m
+++ b/YuMi/Modules/YMRoom/View/AcrossRoomPK/View/SubViews/XPAnchorPKMatchView.m
@@ -62,7 +62,7 @@

 - (void)cancelMatch:(UITapGestureRecognizer *)ges {
    TTAlertConfig *config = [[TTAlertConfig alloc] init];
-    config.message = @"取消匹配？";
+    config.message = YMLocalizedString(@"XPAnchorPKMatchView0");
    [TTPopup alertWithConfig:config confirmHandler:^{
        [Api cancelMatchRandomPK:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
            if (code == 200) {
--- a/YuMi/Tools/SDPhotoBrowser/SDPhotoBrowserConfig.h
+++ b/YuMi/Tools/SDPhotoBrowser/SDPhotoBrowserConfig.h
@@ -16,7 +16,7 @@ typedef enum {
 #define SDPhotoBrowserSaveImageSuccessText @" ^_^ 保存成功 ";

 // 图片保存失败提示文字
-#define SDPhotoBrowserSaveImageFailText @" >_< 保存失败 ";
+#define SDPhotoBrowserSaveImageFailText @" >_< 保存失敗 ";

 // browser背景颜色
 #define SDPhotoBrowserBackgrounColor [UIColor colorWithRed:0 green:0 blue:0 alpha:0.95]
--- a/YuMi/zh-Hans.lproj/Localizable.strings
+++ b/YuMi/zh-Hans.lproj/Localizable.strings
@@ -157,13 +157,14 @@
 "XPMineSettingPresent23" = "设置密码";
 "XPMineSettingPresent24" = "清除缓存";
 "XPMineSettingPresent25" = "注销账号";
+"XPMineSettingPresent26" = "修改";

 "XPMineUserInfoEditPresenter0" = "上传失败";
-"XPMineUserInfoEditPresenter1" = "昵称";
-"XPMineUserInfoEditPresenter2" = "头像";
-"XPMineUserInfoEditPresenter3" = "生日";
-"XPMineUserInfoEditPresenter4" = "相册";
-"XPMineUserInfoEditPresenter5" = "个人介绍";
+"XPMineUserInfoEditPresenter1" = "昵称:";
+"XPMineUserInfoEditPresenter2" = "头像:";
+"XPMineUserInfoEditPresenter3" = "生日:";
+"XPMineUserInfoEditPresenter4" = "相册:";
+"XPMineUserInfoEditPresenter5" = "个人介绍:";

 "XPMineUserInfolbumPresenter0" = "上传失败";

@@ -174,7 +175,7 @@
 "XPMineFriendViewController0" = "您还没有任何好友";

 "XPMineShareViewController0" = "选择好友";
-"XPMineShareViewController1" = "确认分享给%@吗";
+"XPMineShareViewController1" = "确认分享给%@吗?";
 "XPMineShareViewController4" = "关注";

 "XPMineContactViewController3" = "关注";
@@ -243,7 +244,9 @@
 "XPMineDressEmptyCollectionViewCell0" = "暂无数据";

 "XPMineDressUpBubbleViewController1" = "气泡使用成功";
-"XPMineDressUpBubbleViewController2" = "亲爱的用户，你还没有聊天气泡噢";
+"XPMineDressUpBubbleViewController2" = "亲爱的用户，你还没有聊天气泡噢!";
+"XPMineDressUpBubbleViewController3" = "取消使用气泡成功";
+

 "XPDressUpShopCardViewController0" = "购买成功";
 "XPDressUpShopCardViewController2" = "头饰使用成功";
@@ -251,15 +254,31 @@
 "XPDressUpShopCardViewController6" = "铭牌使用成功";
 "XPDressUpShopCardViewController8" = "资料卡使用成功";
 "XPDressUpShopCardViewController9" = "暂无资料卡";
+"XPDressUpShopCardViewController10" = "暂无头饰";
+"XPDressUpShopCardViewController11" = "暂无铭牌";
+"XPDressUpShopCardViewController12" = "暂无座驾";
+

 "XPMineDressUpViewController0" = "我的装扮";
+"XPMineDressUpViewController1" = "头饰";
+"XPMineDressUpViewController2" = "座驾";
+"XPMineDressUpViewController3" = "铭牌";
+"XPMineDressUpViewController4" = "资料卡";
 "XPMineDressUpViewController5" = "聊天气泡";
+"XPMineDressUpViewController6" = "取消使用头饰成功";
+"XPMineDressUpViewController7" = "取消使用座驾成功";
+"XPMineDressUpViewController8" = "取消使用铭牌成功";
+"XPMineDressUpViewController9" = "取消使用资料卡成功";
+
+

 "XPMineDressUpListViewController1" = "头饰使用成功";
 "XPMineDressUpListViewController3" = "座驾使用成功";
 "XPMineDressUpListViewController5" = "铭牌使用成功";
 "XPMineDressUpListViewController7" = "资料卡使用成功";
-"XPMineDressUpListViewController10" = "亲爱的用户，你还没有铭牌噢";
+"XPMineDressUpListViewController10" = "亲爱的用户，你还没有铭牌噢!";
+"XPMineDressUpListViewController11" = "亲爱的用户，你还没有头饰噢！";
+"XPMineDressUpListViewController12" = "亲爱的用户，你还没有座驾噢！";

 "XPDressUpShopViewController0" = "我的装扮";
 "XPDressUpShopViewController1" = "装扮商城";
@@ -338,7 +357,7 @@
 "XPMineFansTableViewCell2" = "互相关注";

 "XPMineAttentionTableViewCell0" = "这个人很懒还没有签名";
-"XPMineAttentionTableViewCell1" = "找到";
+"XPMineAttentionTableViewCell1" = "找到Ta";

 "XPMineFriendEmptyTableViewCell0" = "暂无数据";

@@ -389,7 +408,7 @@
 "XPMineUserInfoAlbumViewController10" = "相册权限受限,点击确定去系统设置";
 "XPMineUserInfoAlbumViewController11" = "最多只能上传8张照片";
 "XPMineUserInfoAlbumViewController12" = "删除是不可逆操作";
-"XPMineUserInfoAlbumViewController13" = "是否需要删除";
+"XPMineUserInfoAlbumViewController13" = "是否需要删除?";
 "XPMineUserInfoAlbumViewController14" = "相片已送审，审核成功后自动上传相片";
 "XPMineUserInfoAlbumViewController15" = "删除成功";
 "XPMineUserInfoAlbumViewController16" = "编辑";
@@ -423,7 +442,7 @@

 "XPMineUserInfoDesViewController0" = "修改个人介绍";
 "XPMineUserInfoDesViewController1" = "最多输入%ld个介绍";
-"XPMineUserInfoDesViewController2" = "填写自我介绍，可以让别人更瞭解你哦";
+"XPMineUserInfoDesViewController2" = "填写自我介绍，可以让别人更瞭解你哦~";
 "XPMineUserInfoDesViewController3" = "完成";

 "XPMineUserInfoEditViewController0" = "编辑个人资料";
@@ -466,7 +485,7 @@
 "XPIAPRechargeViewController0" = "购买失败";
 "XPIAPRechargeViewController1" = "出现未知错误，请重新尝试";
 "XPIAPRechargeViewController2" = "确定充值";
-"XPIAPRechargeViewController3" = "《用户充值协议";
+"XPIAPRechargeViewController3" = "《用户充值协议》";
 "XPIAPRechargeViewController4" = "已阅读并同意";
 "XPIAPRechargeViewController5" = "如有任何问题请咨询客服，Piko号";
 "XPIAPRechargeViewController6" = "我的账户";
@@ -502,9 +521,9 @@
 "XPMineResetPayPwdViewController5" = "确定";

 "XPMineSettingViewController0" = "设置";
-"XPMineSettingViewController1" = "请先绑定手机号码哦";
+"XPMineSettingViewController1" = "请先绑定手机号码哦~";
 "XPMineSettingViewController2" = "清除缓存";
-"XPMineSettingViewController3" = "要清除缓存吗";
+"XPMineSettingViewController3" = "要清除缓存吗？";
 "XPMineSettingViewController4" = "清除缓存完成";
 "XPMineSettingViewController5" = "目前已更新到最新版本";
 "XPMineSettingViewController6" = "目前已更新到最新版本";
@@ -524,7 +543,7 @@
 "XPMineFeedbackViewController0" = "反馈";
 "XPMineFeedbackViewController1" = "感谢您的宝贵意见，让我们共同营造更好的";
 "XPMineFeedbackViewController2" = "问题描述";
-"XPMineFeedbackViewController3" = "请详细描述您所遇到的问题与情况，感谢您提出宝贵的意见";
+"XPMineFeedbackViewController3" = "请详细描述您所遇到的问题与情况，感谢您提出宝贵的意见。";
 "XPMineFeedbackViewController4" = "请输入您的QQ或微信号";
 "XPMineFeedbackViewController5" = "提交反馈";

@@ -614,8 +633,8 @@
 "XPPermissionsViewController5" = "相机";
 "XPPermissionsViewController6" = "拍摄照片或录制视频";
 "XPPermissionsViewController7" = "未有已授权的系统权限";
-"XPPermissionsViewController8" = "—— 仅展示能查询到的已授权系统权限";
-"XPPermissionsViewController9" = "前往系统设置";
+"XPPermissionsViewController8" = "—— 仅展示能查询到的已授权系统权限 ——";
+"XPPermissionsViewController9" = "前往系统设置>";

 "XPRoomSearchContainerViewController0" = "请输入需要搜索的内容";
 "XPRoomSearchContainerViewController1" = "请输入需要搜索的内容";
@@ -847,7 +866,7 @@
 "XPAcrossRoomPKInviteResultView1" = "对方拒绝你的pk请求";

 "XPAcrpssRoomPKPanelView0" = "PK结果计算中";
-"XPAcrpssRoomPKPanelView1" = "1）按收到的礼物价值积分（1鑽石=1分），礼物值高的一方获胜。\n2）PK结束后，若比分差距≥1314或双方分数总值≥15000（平局除外）将在与获胜方相同类型的房间公示PK结果；若比分差距≥5200或双方分数总值≥30000（平局除外）将在全服所有房间公示PK结果";
+"XPAcrpssRoomPKPanelView1" = "1）按收到的礼物价值积分（1钻石=1分），礼物值高的一方获胜。\n2）PK结束后，若比分差距≥1314或双方分数总值≥15000（平局除外）将在与获胜方相同类型的房间公示PK结果；若比分差距≥5200或双方分数总值≥30000（平局除外）将在全服所有房间公示PK结果。";
 "XPAcrpssRoomPKPanelView2" = "助攻";
 "XPAcrpssRoomPKPanelView3" = "去围观";
 "XPAcrpssRoomPKPanelView4" = "神豪";
@@ -855,7 +874,7 @@

 "XPAcrossRoomPKForceEndResultView0" = "PK结束";

-"XPAcrossRoomPKCountDownView0" = "下一场";
+"XPAcrossRoomPKCountDownView0" = "下一场PK";

 "XPAcrossRoomPKPrizeView0" = "去围观";
 "XPAcrossRoomPKPrizeView1" = "来围观";
@@ -863,7 +882,7 @@
 "XPAcrossRoomPKResultView0" = "神豪值";
 "XPAcrossRoomPKResultView1" = "魅力值";

-"XPAnchorPKMatchView0" = "取消匹配";
+"XPAnchorPKMatchView0" = "取消匹配?";
 "XPAnchorPKMatchView1" = "暂未匹配到合适的PK对象\n是否继续";
 "XPAnchorPKMatchView2" = "PK匹配中";

@@ -876,8 +895,8 @@
 "XPAcrossRoomPKInviteView6" = "拒绝";
 "XPAcrossRoomPKInviteView7" = "接受";

-"XPAcrossRoomPKRuleView0" = "如何开启跨房";
-"XPAcrossRoomPKRuleView1" = "1）只有牌照房房主和超管才可以发起跨房pk，一次只能选择一个牌照房发起；\n2）只有房主和超管才可以接受或拒绝跨房pk请求，若10秒内不点击pk邀请弹窗，弹窗消失，视为自动拒绝；\n3）发起pk时需选择pk时间和pk对象，自定义时间下限为5，上限为180，只能填写整数；\n4）pk发起后，未到pk时间无法自行结束，若有特殊情况需提前结束可联繫客服，但本场pk不算胜负";
+"XPAcrossRoomPKRuleView0" = "如何开启跨房PK";
+"XPAcrossRoomPKRuleView1" = "1）只有牌照房房主和超管才可以发起跨房pk，一次只能选择一个牌照房发起；\n2）只有房主和超管才可以接受或拒绝跨房pk请求，若10秒内不点击pk邀请弹窗，弹窗消失，视为自动拒绝；\n3）发起pk时需选择pk时间和pk对象，自定义时间下限为5，上限为180，只能填写整数；\n4）pk发起后，未到pk时间无法自行结束，若有特殊情况需提前结束可联系客服，但本场pk不算胜负。\n";

 "XPAcrossRoomPKEmptyTableViewCell0" = "暂无搜索结果";

@@ -1674,22 +1693,22 @@
 "NIMMessageMaker4" = "发来了一张图片";
 "NIMMessageMaker5" = "你收到了一条快捷评论";

-"NIMMessageUtils0" = "[语音";
-"NIMMessageUtils1" = "[图片";
-"NIMMessageUtils2" = "[视频";
-"NIMMessageUtils3" = "[位置";
-"NIMMessageUtils4" = "[文件";
-"NIMMessageUtils5" = "[礼物";
-"NIMMessageUtils6" = "[您收到一条公会消息";
-"NIMMessageUtils7" = "您关注的TA上线了，快去围观吧";
-"NIMMessageUtils8" = "[分享房间";
-"NIMMessageUtils9" = "[升级消息";
-"NIMMessageUtils10" = "[推文消息";
-"NIMMessageUtils11" = "[消息";
-"NIMMessageUtils12" = "[分享了一条动态";
-"NIMMessageUtils13" = "[你收到一个全服红包";
-"NIMMessageUtils14" = "[消息";
-"NIMMessageUtils15" = "[未知消息";
+"NIMMessageUtils0" = "[语音]";
+"NIMMessageUtils1" = "[图片]";
+"NIMMessageUtils2" = "[视频]";
+"NIMMessageUtils3" = "[位置]";
+"NIMMessageUtils4" = "[文件]";
+"NIMMessageUtils5" = "[礼物]";
+"NIMMessageUtils6" = "[您收到一条公会消息]";
+"NIMMessageUtils7" = "您关注的TA上线了，快去围观吧]";
+"NIMMessageUtils8" = "[分享房间]";
+"NIMMessageUtils9" = "[升级消息]";
+"NIMMessageUtils10" = "[推文消息]";
+"NIMMessageUtils11" = "[消息]";
+"NIMMessageUtils12" = "[分享了一条动态]";
+"NIMMessageUtils13" = "[你收到一个全服红包]";
+"NIMMessageUtils14" = "[消息]";
+"NIMMessageUtils15" = "[未知消息]";

 "XPSessionFindNewTableViewCell0" = "打招呼";
 "XPSessionFindNewTableViewCell1" = "打招呼";
@@ -1714,6 +1733,7 @@

 "XPSessionFindNewAlertView0" = "忽略";
 "XPSessionFindNewAlertView1" = "去找";
+"XPSessionFindNewAlertView2" = "去找TA";

 "XPSessionFindNewViewController0" = "该用户被打招呼次数太多了，换一个吧";
 "XPSessionFindNewViewController1" = "发现萌新";
@@ -1747,7 +1767,7 @@
 "SessionListViewController1" = "删除";
 "SessionListViewController2" = "暂无未读消息需要清理";
 "SessionListViewController3" = "清除";
-"SessionListViewController4" = "清除当前未读消息提醒";
+"SessionListViewController4" = "清除当前未读消息提醒?";
 "SessionListViewController5" = "消息";
 "SessionListViewController6" = "置顶";
 "SessionListViewController7" = "取消置顶";
@@ -1775,6 +1795,11 @@
 "SessionViewController12" = "相册权限受限,点击确定去系统设置";
 "SessionViewController14" = "相册权限受限,点击确定去系统设置";
 "SessionViewController16" = "相册权限受限,点击确定去系统设置";
+"SessionViewController17"=" 温馨提醒：当前对方账号存在异常，请谨慎来往！";
+"SessionViewController18"="温馨提示：对方和您非好友关系，请注意隐私安全！";
+"SessionViewController19"="相机不可用";
+"SessionViewController20"="无法访问相册";
+"SessionViewController21"="相册不可用";

 "MessageContentApplicationShareView0" = "立即进入";

@@ -1784,7 +1809,7 @@

 "MessageUnSupportModel0" = "暂不支持此种类型消息";

-"MessageRiskAlertModel0" = "《整治网络直播乱象";
+"MessageRiskAlertModel0" = "《整治网络直播乱象》";

 "MessageOpenLiveModel0" = "%@ 上线了";

@@ -1792,8 +1817,8 @@
 "PKIDLoginViewController2" = "请联繫客服处理";
 "PKIDLoginViewController3" = "LINE：pekoyuyin";
 "PKIDLoginViewController4" = "我知道了";
-"MessageLevelUpgradeModel0" = "恭喜！您的魅力等级已到达";
-"MessageLevelUpgradeModel1" = "恭喜！您的等级已到达";
+"MessageLevelUpgradeModel0" = "恭喜！您的魅力等级已到达Lv%@";
+"MessageLevelUpgradeModel1" = "恭喜！您的等级已到达Lv%@";

 "MessageTextModel0" = "未知消息类型";

@@ -1811,16 +1836,16 @@

 "MessageContentLevelUpgradeView0" = "立即查看";

-"MessageContentTextClickable0" = "请先绑定手机号";
+"MessageContentTextClickable0" = "请先绑定手机号！";

 "MessageContentOpenLiveView0" = "%@ 上线了";
-"MessageContentOpenLiveView1" = "你关注的";
+"MessageContentOpenLiveView1" = "你关注的TA";

 "MessageContentRedPacketView0" = "红包已失效";
-"MessageContentRedPacketView1" = "下次要快点来哦";
+"MessageContentRedPacketView1" = "下次要快点来哦~";
 "MessageContentRedPacketView2" = "红包已领取";
 "MessageContentRedPacketView3" = "可前往账单查看详情";
-"MessageContentRedPacketView4" = "点击进房领取";
+"MessageContentRedPacketView4" = "点击进房领取>";
 "MessageContentRedPacketView5" = "发出了一个全服红包";

 "MessageContentUnSupportView0" = "暂不支持此种类型消息";
@@ -1828,9 +1853,9 @@
 "MessageContentText0" = "未知消息类型";

 "SessionUserInfoTableViewCell0" = "魔羯水瓶双鱼白羊金牛双子巨蟹狮子处女天秤天蝎射手魔羯";
-"SessionUserInfoTableViewCell1" = "错误日期格式";
-"SessionUserInfoTableViewCell2" = "错误日期格式";
-"SessionUserInfoTableViewCell3" = "错误日期格式";
+"SessionUserInfoTableViewCell1" = "错误日期格式!";
+"SessionUserInfoTableViewCell2" = "错误日期格式!";
+"SessionUserInfoTableViewCell3" = "错误日期格式!";
 "SessionUserInfoTableViewCell4" = "%@座";
 "SessionUserInfoTableViewCell5" = "这个人还没有设置签名";

@@ -1845,7 +1870,7 @@
 "SessionChatLimitView1" = "财富等级";
 "SessionChatLimitView2" = "魅力等级";

-"SessionRiskView0" = "温馨提示：对方和您非好友关係，请注意隐私安全";
+"SessionRiskView0" = "温馨提示：对方和您非好友关係，请注意隐私安全!";

 "SessionNavLiveView0" = "直播中";

@@ -1856,8 +1881,8 @@
 "XPMonentsDetailViewController0" = "请输入您要评论的内容";
 "XPMonentsDetailViewController1" = "详情";
 "XPMonentsDetailViewController2" = "所有评论";
-"XPMonentsDetailViewController3" = "回覆";
-"XPMonentsDetailViewController4" = "回覆";
+"XPMonentsDetailViewController3" = "回复";
+"XPMonentsDetailViewController4" = "回复";
 "XPMonentsDetailViewController5" = "删除后不可恢复\n确定删除该动态吗";
 "XPMonentsDetailViewController6" = "发表评论";
 "XPMonentsDetailViewController7" = "发表评论";
@@ -1876,11 +1901,14 @@
 "XPMomentsSimpleDetailViewController10" = "发表评论";
 "XPMomentsSimpleDetailViewController11" = "发表评论";
 "XPMomentsSimpleDetailViewController12" = "删除成功";
+"XPMomentsSimpleDetailViewController12" = "还没有发布哎~确定要返回吗";
+

 "XPMonentsLatestViewController0" = "没有更多数据了";
 "XPMonentsLatestViewController1" = "删除后不可恢复\n确定删除该动态吗";
 "XPMonentsLatestViewController2" = "删除成功";

+
 "XPMonentsTopicRecommondViewController0" = "没有更多数据了";
 "XPMonentsTopicRecommondViewController1" = "删除后不可恢复\n确定删除该动态吗";
 "XPMonentsTopicRecommondViewController2" = "删除成功";
@@ -1930,7 +1958,7 @@
 "XPMonentsReplyMoreTableViewCell0" = "展开%ld条回覆";

 "XPMonentsTopicLatestViewController0" = "没有更多数据了";
-"XPMonentsTopicLatestViewController1" = "删除后不可恢复\n确定删除该动态吗";
+"XPMonentsTopicLatestViewController1" = "删除后不可恢复\n确定删除该动态吗?";
 "XPMonentsTopicLatestViewController2" = "删除成功";

 "XPMomentListViewController0" = "没有更多数据了";
@@ -1947,7 +1975,7 @@
 "XPMonentsPublishViewController7" = "发佈动态";
 "XPMonentsPublishViewController8" = "发佈";
 "XPMonentsPublishViewController9" = "记录你此刻生活，分享给有趣的人看";
-"XPMonentsPublishViewController10" = "禁止出现商业广告、微信号码、QQ号码、电话号码,  以及低俗、色情、恐怖、暴力和具有侮辱性语言等内容，违规者封号处理";
+"XPMonentsPublishViewController10" = "禁止出现商业广告、电话号码,  以及低俗、色情、恐怖、暴力和具有侮辱性语言等内容，违规者封号处理";

 "XPMonentsInteractiveViewController0" = "全部消息";
 "XPMonentsInteractiveViewController1" = "没有更多数据了";
@@ -2541,3 +2569,6 @@
 "App_Common_gei" = "给";
 "App_Common_nin" = "您";
 "App_Common_Year" = "yyyy年";
+"App_Common_hao" = "号";
+
+