英文适配

YuMi.xcodeproj/project.pbxproj

@@ -55,7 +55,6 @@
 		14EB640D29A5C16000A4A00B /* XPMomentsSimpleDetailNav.m in Sources */ = {isa = PBXBuildFile; fileRef = 14EB640C29A5C16000A4A00B /* XPMomentsSimpleDetailNav.m */; };
 		180116F9279E8C4C00F2CBC0 /* PLTimeUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 180116F8279E8C4C00F2CBC0 /* PLTimeUtil.m */; };
 		180116FC279E8CCE00F2CBC0 /* NVDate.m in Sources */ = {isa = PBXBuildFile; fileRef = 180116FA279E8CCE00F2CBC0 /* NVDate.m */; };
-		180806D827293794001FD836 /* NSObject+MJExtension.m in Sources */ = {isa = PBXBuildFile; fileRef = 180806D727293794001FD836 /* NSObject+MJExtension.m */; };
 		180806FB2729A354001FD836 /* ThemeColor+Room.m in Sources */ = {isa = PBXBuildFile; fileRef = 180806FA2729A354001FD836 /* ThemeColor+Room.m */; };
 		1808072D2731598F001FD836 /* XPNetImageYYLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 1808072C2731598F001FD836 /* XPNetImageYYLabel.m */; };
 		1808073027315E8E001FD836 /* NetImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1808072F27315E8E001FD836 /* NetImageView.m */; };
@@ -245,6 +244,7 @@
 		236BA4982BB6AFED00C7C73A /* PINoblePrivilegeEmptyCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 236BA4972BB6AFED00C7C73A /* PINoblePrivilegeEmptyCell.m */; };
 		237700CD2BC697A100D661F1 /* pi_app_logo_new_bg.png in Resources */ = {isa = PBXBuildFile; fileRef = 237700CC2BC697A100D661F1 /* pi_app_logo_new_bg.png */; };
 		237700CF2BC697D500D661F1 /* pi_login_new_logo.png in Resources */ = {isa = PBXBuildFile; fileRef = 237700CE2BC697D400D661F1 /* pi_login_new_logo.png */; };
+		237700D32BC7CC7C00D661F1 /* NSObject+MJExtension.m in Sources */ = {isa = PBXBuildFile; fileRef = 237700D22BC7CC7C00D661F1 /* NSObject+MJExtension.m */; };
 		237B94BC2A984DA7007853E3 /* XPTrumpetPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 237B94AE2A984DA7007853E3 /* XPTrumpetPresenter.m */; };
 		237B94BD2A984DA7007853E3 /* XPNobleTrumpetModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 237B94B32A984DA7007853E3 /* XPNobleTrumpetModel.m */; };
 		237B94BE2A984DA7007853E3 /* XPRoomTrumpetViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 237B94B72A984DA7007853E3 /* XPRoomTrumpetViewController.m */; };
@@ -1583,8 +1583,6 @@
 		180116F8279E8C4C00F2CBC0 /* PLTimeUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PLTimeUtil.m; sourceTree = "<group>"; };
 		180116FA279E8CCE00F2CBC0 /* NVDate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NVDate.m; sourceTree = "<group>"; };
 		180116FB279E8CCE00F2CBC0 /* NVDate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NVDate.h; sourceTree = "<group>"; };
-		180806D627293794001FD836 /* NSObject+MJExtension.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSObject+MJExtension.h"; sourceTree = "<group>"; };
-		180806D727293794001FD836 /* NSObject+MJExtension.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSObject+MJExtension.m"; sourceTree = "<group>"; };
 		180806DA27297269001FD836 /* MicroViewProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MicroViewProtocol.h; sourceTree = "<group>"; };
 		180806F827298F9B001FD836 /* RoomGuestDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomGuestDelegate.h; sourceTree = "<group>"; };
 		180806F92729A354001FD836 /* ThemeColor+Room.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ThemeColor+Room.h"; sourceTree = "<group>"; };
@@ -1968,6 +1966,8 @@
 		236BA4972BB6AFED00C7C73A /* PINoblePrivilegeEmptyCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PINoblePrivilegeEmptyCell.m; sourceTree = "<group>"; };
 		237700CC2BC697A100D661F1 /* pi_app_logo_new_bg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pi_app_logo_new_bg.png; sourceTree = "<group>"; };
 		237700CE2BC697D400D661F1 /* pi_login_new_logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pi_login_new_logo.png; sourceTree = "<group>"; };
+		237700D12BC7CC7C00D661F1 /* NSObject+MJExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSObject+MJExtension.h"; sourceTree = "<group>"; };
+		237700D22BC7CC7C00D661F1 /* NSObject+MJExtension.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSObject+MJExtension.m"; sourceTree = "<group>"; };
 		237B94AD2A984DA7007853E3 /* XPTrumpetPresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPTrumpetPresenter.h; sourceTree = "<group>"; };
 		237B94AE2A984DA7007853E3 /* XPTrumpetPresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPTrumpetPresenter.m; sourceTree = "<group>"; };
 		237B94B02A984DA7007853E3 /* XPRoomTrumpetProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPRoomTrumpetProtocol.h; sourceTree = "<group>"; };
@@ -4882,8 +4882,7 @@
 				189DD74D26E21D9000AB55B1 /* GCDHelper */,
 				189DD74226E21CCC00AB55B1 /* Reachability */,
 				189DD73626E21C3F00AB55B1 /* YYUtility */,
-				180806D627293794001FD836 /* NSObject+MJExtension.h */,
+				237700D02BC7CC7C00D661F1 /* MJExtension */,
-				180806D727293794001FD836 /* NSObject+MJExtension.m */,
 			);
 			path = Tools;
 			sourceTree = "<group>";
@@ -5549,6 +5548,15 @@
 			path = Api;
 			sourceTree = "<group>";
 		};
+		237700D02BC7CC7C00D661F1 /* MJExtension */ = {
+			isa = PBXGroup;
+			children = (
+				237700D12BC7CC7C00D661F1 /* NSObject+MJExtension.h */,
+				237700D22BC7CC7C00D661F1 /* NSObject+MJExtension.m */,
+			);
+			path = MJExtension;
+			sourceTree = "<group>";
+		};
 		237B94AB2A984DA7007853E3 /* NobleTrumpet */ = {
 			isa = PBXGroup;
 			children = (
@@ -11256,7 +11264,6 @@
 				E83ABEF9280EAF3F00322EE4 /* MessageContentOpenLiveView.m in Sources */,
 				E83ABF06280EDE2B00322EE4 /* MessageContentLevelUpgradeView.m in Sources */,
 				E85E7B0E2A4EB0D200B6D00A /* GuildSearchSuperAdminModel.m in Sources */,
-				180806D827293794001FD836 /* NSObject+MJExtension.m in Sources */,
 				E85E7B4C2A4EB0D300B6D00A /* XPMineGuildManagerPerViewController.m in Sources */,
 				E87DF4BF2A42C8C1009C1185 /* HomeTagModel.m in Sources */,
 				23FF25652ABC3B3C0064E904 /* XPHomeGameView.m in Sources */,
@@ -12067,6 +12074,7 @@
 				E8788948273A55D000BF1D57 /* XPGiftBarView.m in Sources */,
 				E89DCF5728FFF076001647EC /* XPWishGiftEmptyTableViewCell.m in Sources */,
 				14A6034929A3567200D2A6A5 /* XPSimpleMineViewController.m in Sources */,
+				237700D32BC7CC7C00D661F1 /* NSObject+MJExtension.m in Sources */,
 				E8D4DE442940462C00EC788D /* XPGiftTwelveStarBroadcastView.m in Sources */,
 				E81060DF29876D3A00B772F0 /* MessageTimeModel.m in Sources */,
 				E81A65422835120200F55894 /* XPMonentsInteractivePresenter.m in Sources */,

YuMi/Assets.xcassets/Login/ms_login_choose_phone_icon.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "ms_login_choose_phone_icon@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "ms_login_choose_phone_icon@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

YuMi/CustomUI/InputView/InputView/QinputPhotoView.m

@@ -75,7 +75,8 @@
 	}];
 
 	[self.originButton mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.size.mas_equalTo(CGSizeMake(50, 25));
+        make.height.mas_equalTo(25);
+        make.width.mas_equalTo(100);
 		make.left.mas_equalTo(self.photoButton.mas_right).offset(20);
 		make.centerY.mas_equalTo(self.photoButton);
 	}];

YuMi/Global/YUMIHtmlUrl.h

@@ -44,9 +44,9 @@ typedef NS_ENUM(NSUInteger, URLType) {
 	kHomeRankURL,
 	///相亲规则介绍
 	kRoomDatingRule,
-    ///贵族规则
+    ///VIP规则
     kNobleRuleURL,
-    ///贵族排行榜
+    ///VIP排行榜
     kNobleRankURL,
 	///用户充值协议
 	kUserRechargeAgrURL,

YuMi/Global/YUMIHtmlUrl.m

@@ -12,24 +12,17 @@
 @implementation YUMIHtmlUrl
 
 NSString * const URLWithType(URLType type) {
-	NSString * prefix = @"p";
+    NSString * prefix = @"molistar";
-    prefix = [NSString stringWithFormat:@"%@e",prefix];
+    NSDictionary *newDic = @{
-    prefix = [NSString stringWithFormat:@"%@k",prefix];
+        @(kTreasureTicketBuyURL) : @"modules/act-treasureSnatching/index.html",///夺宝购买
-    prefix = [NSString stringWithFormat:@"%@o",prefix];
+        @(kTreasureRankListURL)  : @"modules/act-treasureSnatching/list.html",///夺宝达人
-    
+        @(kTreasureRuleURL)      : @"modules/act-treasureSnatching/rule.html",///夺宝规则说明
-   
+        @(kTreasureRecordURL)    : @"modules/act-treasureSnatching/record.html",///夺宝记录
-    
+        @(kNobleRankURL)         : @"modules/noble/index.html",///排行榜
-    
+        @(kGoldEarningsRecord)   : @"modules/myincome/index.html#/GoldLog",///金币收益记录
-  NSDictionary *newDic = @{
+        @(kCandyTreeRuleURL)     : @"modules/rule/newWishingWellRule.html",///糖果树规则 modules/rank/index.html#/wishingWellRule
-      @(kTreasureTicketBuyURL) : @"modules/act-treasureSnatching/index.html",///夺宝购买
+        @(kChannelUrl)           : @"modules/%@/index.html?channelType=%@&deviceId=%@",
-      @(kTreasureRankListURL)  : @"modules/act-treasureSnatching/list.html",///夺宝达人
+    };
-      @(kTreasureRuleURL)      : @"modules/act-treasureSnatching/rule.html",///夺宝规则说明
-      @(kTreasureRecordURL)    : @"modules/act-treasureSnatching/record.html",///夺宝记录
-      @(kNobleRankURL)         : @"modules/noble/index.html",///排行榜
-      @(kGoldEarningsRecord)   : @"modules/myincome/index.html#/GoldLog",///金币收益记录
-      @(kCandyTreeRuleURL)     : @"modules/rule/newWishingWellRule.html",///糖果树规则 modules/rank/index.html#/wishingWellRule
-      @(kChannelUrl)           : @"modules/%@/index.html?channelType=%@&deviceId=%@",
-  };
     NSString * newUrl = [newDic objectForKey:@(type)];
     if(newUrl != nil){
         NSString * url = [newDic objectForKey:@(type)];
@@ -38,56 +31,56 @@ NSString * const URLWithType(URLType type) {
     
     
     
-	NSDictionary * dic = @{
+    NSDictionary * dic = @{
         @(kPrivacyURL)           : @"sPa8x4YF1hFEeCeH5v+RMOulemxgjjZLbxkN8ZrBSM8=",//隐私政策 modules/rule/privacy-wap.html
         @(kPrivacySDKURL)        : @"EXbb0qKoel1tyEL3rQ3//BQ6p/uA56xs9iAOyFI7TRU=",//隐私政策-SDK modules/rule/sdk.html
         @(kPrivacyPersonalURL)   : @"u+t46y/9x4S49BgHUeSXxxu2D69UtZtmyhA93HUTvzI=",//隐私政策-个人信息 modules/rule/personal-info.html
         @(kPrivacyDeviceURL)     : @"u+t46y/9x4S49BgHUeSXx/rPFwLB78TiQyN+xJKENGQ=",//隐私政策-设备权限 modules/rule/permissions.html
-		@(kUserProtocalURL)      : @"0sBhBaRqf7oBlYvNK4azCrVPTFjv9FYF0A2v9+qkSxg=",///用户协议 modules/rule/protocol.html
+        @(kUserProtocalURL)      : @"0sBhBaRqf7oBlYvNK4azCrVPTFjv9FYF0A2v9+qkSxg=",///用户协议 modules/rule/protocol.html
         @(kUserInviteFriendURL)  : @"HInhWCyiR3L4dAlHrmQ/GttrZqXhOtq85WujAcETPPI=",///邀请好友
-		@(kFAQURL)               : @"k/Bqnh8nGkuhV8KhU6xN5a8EkxEQrbDMAWNBtaAdJCo=",//常见问题 modules/rule/guide.html
+        @(kFAQURL)               : @"k/Bqnh8nGkuhV8KhU6xN5a8EkxEQrbDMAWNBtaAdJCo=",//常见问题 modules/rule/guide.html
-		@(kIdentityURL)          : @"EQtrsRlCX2+rJN89+qyAT6JtfEnprTylInFU0tTPyLA=",//实人认证  modules/identity/new.html
+        @(kIdentityURL)          : @"EQtrsRlCX2+rJN89+qyAT6JtfEnprTylInFU0tTPyLA=",//实人认证  modules/identity/new.html
-		@(kGameBindAccountURL)   : @"5s9YWzw5Lt6ro86UN4pUFETAyuCsIL3wl00gLK5rCek=",///绑定账号 modules/game/bindAccount.html
+        @(kGameBindAccountURL)   : @"5s9YWzw5Lt6ro86UN4pUFETAyuCsIL3wl00gLK5rCek=",///绑定账号 modules/game/bindAccount.html
-		@(kNurseryURL)           : @"ZT1/YWK/T7gXs1rGDAYnbqG0OrzjhPKJfaebh80/1ro=",///护苗计划 activity/cleanNet/index.html
+        @(kNurseryURL)           : @"ZT1/YWK/T7gXs1rGDAYnbqG0OrzjhPKJfaebh80/1ro=",///护苗计划 activity/cleanNet/index.html
-		@(kRechargePrivacyURL)   : @"boJayVmf9bj+vVXabUop2cc110U9LaDdAJhHfbinDzXLhlBtiv3h7J6Sivv3v1Lr",//充值协议 modules/rule/rechargeAgreement.html
+        @(kRechargePrivacyURL)   : @"boJayVmf9bj+vVXabUop2cc110U9LaDdAJhHfbinDzXLhlBtiv3h7J6Sivv3v1Lr",//充值协议 modules/rule/rechargeAgreement.html
-		@(kReportRoomURL)        : @"TbIA4vIU9O5Z/RGJKEELZNe7SFzF9ig/Lvo6D1upv/g=",///举报房间
+        @(kReportRoomURL)        : @"TbIA4vIU9O5Z/RGJKEELZNe7SFzF9ig/Lvo6D1upv/g=",///举报房间
-		@(kShareRoomURL)         : @"k+TyUH/PriZr4MWmS/rq8BUYAu34MX3ZyAZsDLF0Eck=",///分享房间 modules/share_room/index.html
+        @(kShareRoomURL)         : @"k+TyUH/PriZr4MWmS/rq8BUYAu34MX3ZyAZsDLF0Eck=",///分享房间 modules/share_room/index.html
-		@(kCandyTreeURL)         : @"uGP8LbEVEzTWPSSD357NnkHsXf118dGp9qeZO+8idY4=",///参加糖果树  activity/explore/index.html
+        @(kCandyTreeURL)         : @"uGP8LbEVEzTWPSSD357NnkHsXf118dGp9qeZO+8idY4=",///参加糖果树  activity/explore/index.html
-		@(kCandyTreeRecordURL)   : @"V6XAvR9DZVl5TTczQ/JABDNKGpFSnSP/r6WLbu91uPKWKlwVlmlYvkETALeLk7Jz",///糖果树记录 modules/rank/index.html#/newWishingWellRecord
+        @(kCandyTreeRecordURL)   : @"V6XAvR9DZVl5TTczQ/JABDNKGpFSnSP/r6WLbu91uPKWKlwVlmlYvkETALeLk7Jz",///糖果树记录 modules/rank/index.html#/newWishingWellRecord
-		@(kRoomCharmRankURL)     : @"a5qVnItWuLLh148cl8R/+VuVNfOSOd1nzVzfSFbAxUA=",//房间魅力榜 modules/charm/index.html
+        @(kRoomCharmRankURL)     : @"a5qVnItWuLLh148cl8R/+VuVNfOSOd1nzVzfSFbAxUA=",//房间魅力榜 modules/charm/index.html
-		@(kRoomRankURL)          : @"DqPWO/9EdbpkGl4PoRVQy4+hE8o8EuE30v2vN/yeZFg=", //房间榜 modules/room_rank/index.html
+        @(kRoomRankURL)          : @"DqPWO/9EdbpkGl4PoRVQy4+hE8o8EuE30v2vN/yeZFg=", //房间榜 modules/room_rank/index.html
         @(kRoomHourRankURL)      : @"DqPWO/9EdbpkGl4PoRVQy7m9/mGnCSpoi673bWBnwBc=", //房间小时榜 modules/room_rank/hourRank.html
-		@(kUserLevelURL)         : @"NE+tamYZsEj7S9BySlTpcCyRDMdxsWDzm6KrZTs9Lbo=",//我的等级 modules/level/index.html
+        @(kUserLevelURL)         : @"NE+tamYZsEj7S9BySlTpcCyRDMdxsWDzm6KrZTs9Lbo=",//我的等级 modules/level/index.html
-		@(kHomeRankURL)          : @"V6XAvR9DZVl5TTczQ/JABNoH8I7E1sQ4oZmqs01zOfc=", // 排行榜  modules/rank/index.html#/rank
+        @(kHomeRankURL)          : @"V6XAvR9DZVl5TTczQ/JABNoH8I7E1sQ4oZmqs01zOfc=", // 排行榜  modules/rank/index.html#/rank
-		@(kRoomDatingRule)       : @"BbMeRujqQH/yCud2VyM4tZMYe8oHwrQCEcP50kTTxgQ=",//相亲玩法 modules/rule/dating.html
+        @(kRoomDatingRule)       : @"BbMeRujqQH/yCud2VyM4tZMYe8oHwrQCEcP50kTTxgQ=",//相亲玩法 modules/rule/dating.html
-        @(kNobleRuleURL)         : @"4x4Blbka3DFMAyZGSVqxAp0jXvE4/JUx48YfowufzircU1vr/Du8GqrouZUzD9Uq", // 贵族规则 modules/rule/introduction-patrician.html
+        @(kNobleRuleURL)         : @"4x4Blbka3DFMAyZGSVqxAp0jXvE4/JUx48YfowufzircU1vr/Du8GqrouZUzD9Uq", // VIP规则 modules/rule/introduction-patrician.html
-      
+        
-		@(kUserRechargeAgrURL)   : @"boJayVmf9bj+vVXabUop2cc110U9LaDdAJhHfbinDzXLhlBtiv3h7J6Sivv3v1Lr",	///用户充值协议
+        @(kUserRechargeAgrURL)   : @"boJayVmf9bj+vVXabUop2cc110U9LaDdAJhHfbinDzXLhlBtiv3h7J6Sivv3v1Lr",	///用户充值协议
-		@(kUserRegiServiceAgrURL): @"0sBhBaRqf7oBlYvNK4azCrVPTFjv9FYF0A2v9+qkSxg=",//用户注册服务协议 modules/rule/protocol.html
+        @(kUserRegiServiceAgrURL): @"0sBhBaRqf7oBlYvNK4azCrVPTFjv9FYF0A2v9+qkSxg=",//用户注册服务协议 modules/rule/protocol.html
-		@(kLiveServiceAgrURL)    : @"83qLuhoOlxXOw3gwkchLAnb0iz5PEjqOS5dKRRzIxVw=", ///直播服务协议 modules/rule/live-protocol.html
+        @(kLiveServiceAgrURL)    : @"83qLuhoOlxXOw3gwkchLAnb0iz5PEjqOS5dKRRzIxVw=", ///直播服务协议 modules/rule/live-protocol.html
-		@(kCommunitySpecURL)     : @"oZs0ygpb9qtOkpZG1zcj1qS3fx0xzBArL1h358e1NM3hbbSU8qTOBmxkpJ03iq+K", ///社区规范 modules/rule/community-norms.html
+        @(kCommunitySpecURL)     : @"oZs0ygpb9qtOkpZG1zcj1qS3fx0xzBArL1h358e1NM3hbbSU8qTOBmxkpJ03iq+K", ///社区规范 modules/rule/community-norms.html
-		@(kAccountlogoutAgrURL)  : @"8pzk0dLk9GPSIKjn894dHtmPvxfIJTkUYNP5qTE7GzYpYAG7LWwF1pK7NWb4E0D9", ///账号注销协议
+        @(kAccountlogoutAgrURL)  : @"8pzk0dLk9GPSIKjn894dHtmPvxfIJTkUYNP5qTE7GzYpYAG7LWwF1pK7NWb4E0D9", ///账号注销协议
         @(kAccountlogoutURL)     : @"8pzk0dLk9GPSIKjn894dHmMgQS2OHgRpZ6NNmxGMZ7E=",  ///账号注销 modules/rule/loginout.html
         @(kAnchorFansOpenURL)    : @"mLMTNiyvF2Tbv4qan6+ogPrhx2U0FdD+3WkY/LdNbduiPL2qYSUiF2VJ2Dfbgnpn", ///主播粉丝团-铭牌申请v modules/fans_club/nameplate.html
         @(kAnchorFansListURL)    : @"mLMTNiyvF2Tbv4qan6+ogDXuGLEHnNEEiALV6JCC/gE=", ///主播粉丝团-粉丝列表 modules/fans_club/myfans.html
         @(kAnchorFansRankURL)    : @"mLMTNiyvF2Tbv4qan6+ogCO6lES2UPVnrnZbAxJMj9o+Oz0MAqy0RX8j1QuItbfT", ///主播粉丝团-粉丝排行 modules/fans_club/fans_rank.html
         @(kAnchorFansRuleURL)    : @"mLMTNiyvF2Tbv4qan6+ogG32ymd/DYTOoOeZFye3U9A=", ///主播粉丝团-粉丝团规则 modules/fans_club/rule.html
         @(kNewWeekStarURL)       : @"GmT6HOvcXNUSbxa4g7oNm8j+6DnTtsNc9nMk6SrEyCdP95p3Jwz84r/fjSNcBBRi", ///周星礼物-周星榜 modules/weekStar/newWeekStar.html
-		@(kLicenseHourRankURL)   : @"DqPWO/9EdbpkGl4PoRVQyyMfaOgNqIr7sGIOi+kLkijf1EAcL9tVSblMXjNuq+Qy",///牌照房小时榜礼物 modules/room_rank/hourRankLicense.html
+        @(kLicenseHourRankURL)   : @"DqPWO/9EdbpkGl4PoRVQyyMfaOgNqIr7sGIOi+kLkijf1EAcL9tVSblMXjNuq+Qy",///牌照房小时榜礼物 modules/room_rank/hourRankLicense.html
-		@(kLuckyGiftPlayRuleURL) : @"DcADpWwvzNDc5QYX9hmrJDFatpu+zp4ynUPdb+KeBx0+iFBaBI/MRU80MenYMHKQ",///幸运礼物玩法说明 modules/rule/luckyGiftRule.html?giftID=%@
+        @(kLuckyGiftPlayRuleURL) : @"DcADpWwvzNDc5QYX9hmrJDFatpu+zp4ynUPdb+KeBx0+iFBaBI/MRU80MenYMHKQ",///幸运礼物玩法说明 modules/rule/luckyGiftRule.html?giftID=%@
-		@(kSailingActivityURL)   : @"ZrQv+cP5sXzlvQp0nvUa20JB5cyCS6X8LTGvUroUfxk=", ///航海活动地址 activity/act-sail/more.html
+        @(kSailingActivityURL)   : @"ZrQv+cP5sXzlvQp0nvUa20JB5cyCS6X8LTGvUroUfxk=", ///航海活动地址 activity/act-sail/more.html
-		@(kSailingPlayDescdURL)  : @"ZrQv+cP5sXzlvQp0nvUa23RXydMeqE8YfwP1J1xHCv3PdHFTlEJiRJ1vhrmu25pu", ///航海玩法规则 activity/act-sail/play_explain.html
+        @(kSailingPlayDescdURL)  : @"ZrQv+cP5sXzlvQp0nvUa23RXydMeqE8YfwP1J1xHCv3PdHFTlEJiRJ1vhrmu25pu", ///航海玩法规则 activity/act-sail/play_explain.html
-		@(kSailingRecordURL)     : @"ZrQv+cP5sXzlvQp0nvUa2w5kpdXwSP1aQbPEWUi/gPvrXEWTD9m43qlvhznGtWx1", ///航海中奖记录 activity/act-sail/win_record.html
+        @(kSailingRecordURL)     : @"ZrQv+cP5sXzlvQp0nvUa2w5kpdXwSP1aQbPEWUi/gPvrXEWTD9m43qlvhznGtWx1", ///航海中奖记录 activity/act-sail/win_record.html
-		@(kNetworkRenovateURL)   : @"vMZOLHkGF9uAzm9Ii2dzmQVhtZPf5IUKeg8H7/5FGcWE3YbMNrK59iMSV91HEHz/",///网络整治乱象 activity/activemodel/index.html?code=ZBGG
+        @(kNetworkRenovateURL)   : @"vMZOLHkGF9uAzm9Ii2dzmQVhtZPf5IUKeg8H7/5FGcWE3YbMNrK59iMSV91HEHz/",///网络整治乱象 activity/activemodel/index.html?code=ZBGG
-		@(kMonentsShareURL)      : @"s06Uv+UqjOdDhupnk0YpKKnSCSFCZssMEJxKZdf+s0Ge3zIFKv3knVVNr710Y5eF",///分享动态 modules/world/share-page/index.html
+        @(kMonentsShareURL)      : @"s06Uv+UqjOdDhupnk0YpKKnSCSFCZssMEJxKZdf+s0Ge3zIFKv3knVVNr710Y5eF",///分享动态 modules/world/share-page/index.html
         @(kRedPacketRuleURL)     : @"nRMNKGz9zmwOEcoRr/bGneWzsrl+qHbvUGgXJhFAfVGcldkazbiNrc/v2rR0HFw+",///红包规则 modules/rule/red-packet-rule.html
-		@(kXinZuoStarURL)        : @"3l3NxeDKO2bNAESpzjZ76mvJa2D26Bgqy+nNusiuH1UHYM+bYk+MM/TNM4VRqk1K",///星座礼物 activity/act-constellation/index.html
+        @(kXinZuoStarURL)        : @"3l3NxeDKO2bNAESpzjZ76mvJa2D26Bgqy+nNusiuH1UHYM+bYk+MM/TNM4VRqk1K",///星座礼物 activity/act-constellation/index.html
-		@(kMineEarningsRecord)   : @"0HJ5o+40NtYGeHo1KRoQE3VdLhFQnvGyqgph9CCLjyU53rS29T2nD7UEh3CpX2BG",///收益记录
+        @(kMineEarningsRecord)   : @"0HJ5o+40NtYGeHo1KRoQE3VdLhFQnvGyqgph9CCLjyU53rS29T2nD7UEh3CpX2BG",///收益记录
-       
+        
-     
+        
-	};
+    };
-	NSString * url = [dic objectForKey:@(type)];
+    NSString * url = [dic objectForKey:@(type)];
-	NSString * webUrl = [AESUtils aesDecrypt:url];
+    NSString * webUrl = [AESUtils aesDecrypt:url];
-	return [NSString stringWithFormat:@"%@/%@",prefix, webUrl];
+    return [NSString stringWithFormat:@"%@/%@",prefix, webUrl];
 }
 @end

YuMi/Modules/YMLogin/Presenter/LoginPresenter.h

@@ -27,6 +27,21 @@ NS_ASSUME_NONNULL_BEGIN
 -(void)thirdLoginByFBWithPresentingViewController:(UIViewController *)presentingViewController;
 ///第三方登录，line登录
 -(void)thirdLoginByLine:(UIViewController *)presentingViewController;
+
+/// 获取手机的验证码
+/// @param phone 手机号
+/// @param type 类型
+- (void)phoneSmsCode:(NSString *)phone type:(GetSmsType)type phoneAreaCode:(NSString *)phoneAreaCode;
+
+/// 使用手机号和验证码登录
+/// @param phone 手机号
+/// @param code 验证码
+- (void)loginWithPhone:(NSString *)phone code:(NSString *)code phoneAreaCode:(NSString *)phoneAreaCode;
+/// 使用手机号和密码登录
+/// @param phone 手机号
+/// @param password 验证码
+- (void)loginWithPhone:(NSString *)phone password:(NSString *)password;
+
 @end
 
 NS_ASSUME_NONNULL_END

YuMi/Modules/YMLogin/Presenter/LoginPresenter.m

@@ -20,7 +20,7 @@
 ///Model
 #import "ThirdUserInfo.h"
 #import "AccountModel.h"
-
+#import "DESEncrypt.h"
 #import <FBSDKCoreKit/FBSDKCoreKit.h>
 #import <FBSDKLoginKit/FBSDKLoginKit.h>
 #import "YuMi-swift.h"
@@ -39,7 +39,7 @@
                                                            queue:[NSOperationQueue mainQueue]
                                                       usingBlock:
          ^(NSNotification *notification) {
-            @strongify(self);
+
             if ([FBSDKProfile currentProfile]) {
                 //获取当前用户名
                 [FBSDKProfile loadCurrentProfileWithCompletion:
@@ -147,7 +147,7 @@
         AccountModel * model =  [AccountModel modelWithDictionary:data.data];
         if (model != nil) {
             [[AccountInfoStorage instance] saveAccountInfo:model];
-            [[self getView] loginSuccess];
+            [[self getView] loginThirdPartSuccess];
             [XPAdjustEvent loginEvent];
             [XNDJTDDLoadingTool hideOnlyView:kWindow];
             [[NSUserDefaults standardUserDefaults]setValue:@(type) forKey:@"kLoginSuccessType"];
@@ -247,7 +247,7 @@
         AccountModel * model =  [AccountModel modelWithDictionary:data.data];
         if (model != nil) {
             [[AccountInfoStorage instance] saveAccountInfo:model];
-            [[self getView] loginSuccess];
+            [[self getView] loginThirdPartSuccess];
             [XPAdjustEvent loginEvent];
             [[NSUserDefaults standardUserDefaults]setValue:@(ThirdLoginType_Gmail) forKey:@"kLoginSuccessType"];
             [[NSUserDefaults standardUserDefaults]synchronize];
@@ -259,6 +259,47 @@
     } showLoading:YES] openid:openid unionid:unionid access_token:access_token type:[NSString stringWithFormat:@"%lu", (unsigned long)ThirdLoginType_Gmail]];
 }
 
+/// 获取手机的验证码
+/// @param phone 手机号
+/// @param type 类型
+- (void)phoneSmsCode:(NSString *)phone type:(GetSmsType)type phoneAreaCode:(NSString *)phoneAreaCode {
+    NSString * desPhone = [DESEncrypt encryptUseDES:phone key:KeyWithType(KeyType_PasswordEncode)];
+    [Api phoneSmsCode:[self createHttpCompletion:^(id  _Nonnull data) {
+        [[self getView] phoneSmsCodeSuccess];
+    }] mobile:desPhone type:[NSString stringWithFormat:@"%lu", (unsigned long)type] phoneAreaCode:phoneAreaCode];
+}
 
+/// 使用手机号和验证码登录
+/// @param phone 手机号
+/// @param code 验证码
+- (void)loginWithPhone:(NSString *)phone code:(NSString *)code phoneAreaCode:(NSString *)phoneAreaCode{
+    NSString * desPhone = [DESEncrypt encryptUseDES:phone key:KeyWithType(KeyType_PasswordEncode)];
+    [Api loginWithCode:[self createHttpCompletion:^(BaseModel * _Nonnull data) {
+        AccountModel * accountModel = [AccountModel modelWithDictionary:data.data];
+        
+        if (accountModel && accountModel.access_token.length > 0) {
+            [[AccountInfoStorage instance] saveAccountInfo:accountModel];
+        }
+        [[self getView] loginWithPhoenSuccess];
+    } fail:^(NSInteger code, NSString * _Nullable msg) {
+        [[self getView] loginFailWithMsg:msg];
+    } errorToast:YES] phone:desPhone code:code client_secret:@"uyzjdhds" version:@"1" client_id:@"erban-client" grant_type:@"password" phoneAreaCode:phoneAreaCode];
+}
+/// 使用手机号和密码登录
+/// @param phone 手机号
+/// @param password 验证码
+- (void)loginWithPhone:(NSString *)phone password:(NSString *)password {
+    NSString * desPassword = [DESEncrypt encryptUseDES:password key:KeyWithType(KeyType_PasswordEncode)];
+    NSString * desPhone = [DESEncrypt encryptUseDES:phone key:KeyWithType(KeyType_PasswordEncode)];
+    [Api loginWithPassword:[self createHttpCompletion:^(BaseModel * _Nonnull data) {
+        AccountModel * accountModel = [AccountModel modelWithDictionary:data.data];
+        if (accountModel && accountModel.access_token.length > 0) {
+            [[AccountInfoStorage instance] saveAccountInfo:accountModel];
+        }
+        [[self getView] loginSuccess];
+    } fail:^(NSInteger code, NSString * _Nullable msg) {
+        [[self getView] loginFailWithMsg:msg];
+    } errorToast:YES] phone:desPhone password:desPassword client_secret:@"uyzjdhds" version:@"1" client_id:@"erban-client" grant_type:@"password"];
+}
 
 @end

YuMi/Modules/YMLogin/Presenter/LoginVerifCodePresent.h

@@ -19,15 +19,15 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param phone 手机号
 /// @param code 验证码
 - (void)loginWithPhone:(NSString *)phone code:(NSString *)code phoneAreaCode:(NSString *)phoneAreaCode;
-
-/// 绑定手机号
-/// @param phone 手机号
-/// @param code 验证码
-- (void)bindWithPhone:(NSString *)phone code:(NSString *)code phoneAreaCode:(NSString *)phoneAreaCode;
 /// 使用手机号和密码登录
 /// @param phone 手机号
 /// @param password 验证码
 - (void)loginWithPhone:(NSString *)phone password:(NSString *)password;
+/// 绑定手机号
+/// @param phone 手机号
+/// @param code 验证码
+- (void)bindWithPhone:(NSString *)phone code:(NSString *)code phoneAreaCode:(NSString *)phoneAreaCode;
+
 ///绑定授权码
 -(void)bindAuthorizationCodeWithAuthCode:(NSString *)authCode;
 @end

YuMi/Modules/YMLogin/Protocol/LoginProtocol.h

@@ -11,7 +11,14 @@ NS_ASSUME_NONNULL_BEGIN
 
 @protocol LoginProtocol <NSObject>
 
+- (void)loginThirdPartSuccess;
 - (void)loginSuccess;
+///请求手机号的验证码成功
+- (void)phoneSmsCodeSuccess;
+///手机号登录成功
+- (void)loginWithPhoenSuccess;
+///登录失败
+- (void)loginFailWithMsg:(NSString *)msg;
 @end
 
 NS_ASSUME_NONNULL_END

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

@@ -42,7 +42,10 @@
 - (LoginForgetPasswordPresent *)createPresenter {
     return [[LoginForgetPasswordPresent alloc] init];
 }
-
+- (void)viewWillDisappear:(BOOL)animated{
+    [super viewWillDisappear:animated];
+    [self.codeInputView cancelTimer];
+}
 - (void)viewDidLoad {
     NSString *code = [NSString getCountryCode];
      self.pi_phoneAreaCode = [code stringByReplacingOccurrencesOfString:@"+" withString:@""];

YuMi/Modules/YMLogin/View/NewLogin/XPLoginInputView.h

@@ -31,7 +31,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 //开启倒计时
 - (void)fireTimer;
-
+-(void)cancelTimer;
 @end
 
 NS_ASSUME_NONNULL_END

YuMi/Modules/YMLogin/View/NewLogin/XPLoginInputView.m

@@ -23,7 +23,7 @@
 - (instancetype)initWithFrame:(CGRect)frame {
     self = [super initWithFrame:frame];
     if (self) {
-        self.backgroundColor = UIColorFromRGB(0xF5F6FA);
+        self.backgroundColor = UIColorFromRGB(0xF3F5FA);
         self.layer.cornerRadius = kGetScaleWidth(52)/2;
         self.layer.masksToBounds = YES;
         
@@ -158,6 +158,7 @@
             [self.smsCodeBtn setTitle:YMLocalizedString(@"XPLoginInputView1") forState:UIControlStateNormal];
             self.smsCodeBtn.userInteractionEnabled = YES;
             dispatch_cancel(self.timer);
+            self.timer = nil;
         }else{
             [self.smsCodeBtn setTitle:[NSString stringWithFormat:@"%lds",count] forState:UIControlStateNormal];
             self.smsCodeBtn.userInteractionEnabled = NO;
@@ -166,5 +167,10 @@
     dispatch_resume(timer);
     self.timer = timer;
 }
-
+-(void)cancelTimer{
+    if (self.timer != nil){
+        dispatch_cancel(self.timer);
+        self.timer = nil;
+    }
+}
 @end

YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m

@@ -27,17 +27,19 @@
 #import "LoginPresenter.h"
 #import "LoginProtocol.h"
 #import "PILoginManager.h"
+#import "XPLoginInputView.h"
+#import "XPLoginAraeViewController.h"
+#import "XPForgetPwdViewController.h"
+
 UIKIT_EXTERN NSString * const kYouMiNumberCountKey;
 NSString * const HadAgreePrivacy = @"HadAgreePrivacy";
 
-@interface XPLoginViewController ()<LoginProtocol>
+@interface XPLoginViewController ()<LoginProtocol,XPLoginInputViewDelegate,XPLoginAraeViewControllerDelegate>
 ///背景
 @property(nonatomic,strong) UIImageView *bgImageView;
 ///logo
 @property(nonatomic,strong) UIImageView *logoView;
-/// 一键登录
+
-@property (nonatomic, strong) UIButton *quickLoginBtn;
-@property(nonatomic,strong) UIImageView *quickArrowView;
 /// 同意按钮
 @property (nonatomic, strong) UIButton *agreeBtn;
 /// 协议隐私政策
@@ -64,6 +66,34 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy";
 ///上次登錄
 @property(nonatomic,strong) UILabel *nextLabel;
 
+///选择类型背景
+@property(nonatomic,strong) UIImageView *chooseTypeView;
+///选择手机登录
+@property(nonatomic,strong) UIButton *chooseAccountBtn;
+///选择密码登录
+@property(nonatomic,strong) UIButton *chooseSMSBtn;
+/// 手机号输入框
+@property (nonatomic, strong) XPLoginInputView *phoneInputView;
+/// 验证码输入框
+@property (nonatomic, strong) XPLoginInputView *codeInputView;
+
+
+///// 账号登录手机号输入框
+@property (nonatomic, strong) XPLoginInputView *accountView;
+/// 账号登录密码输入框
+@property (nonatomic, strong) XPLoginInputView *accountPwdView;
+
+/// 忘记密码
+@property (nonatomic, strong) UIButton *forgetBtn;
+
+/// 登录按钮
+@property (nonatomic, strong) UIButton *loginBtn;
+
+///区号
+@property (nonatomic,copy) NSString *pi_phoneAreaCode;
+///类型,0，密码，1.手机
+@property(nonatomic,assign) int selectType;
+
 @end
 
 @implementation XPLoginViewController
@@ -78,16 +108,29 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy";
 
 
 - (void)viewDidLoad {
-    
     [super viewDidLoad];
     [self createUI];
+    [self racBind];
+    self.selectType = 0;
+    NSString *code = [NSString getCountryCode];
+    self.pi_phoneAreaCode = [code stringByReplacingOccurrencesOfString:@"+" withString:@""];
     [[NSNotificationCenter defaultCenter]postNotificationName:@"kInLoginVC" object:nil];
 }
-
+- (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event{
-- (void)viewWillAppear:(BOOL)animated {
+    [self.view endEditing:YES];
-    [super viewWillAppear:animated];
-    
 }
+- (void)racBind {
+    @weakify(self);
+    RAC(self.loginBtn, enabled) = [[RACSignal combineLatest:@[self.phoneInputView.inputTextField.rac_textSignal, self.codeInputView.inputTextField.rac_textSignal,self.accountView.inputTextField.rac_textSignal,self.accountPwdView.inputTextField.rac_textSignal] reduce:^id _Nonnull(NSString *phone, NSString* smsCode,NSString *account,NSString *accountPwd){
+        @strongify(self);
+        if(self.selectType == 0){
+            return @(account.length > 0 && accountPwd.length >= 6);
+        }
+        return @((phone.length > 0) && smsCode.length > 0);
+    }] takeUntil:self.rac_willDeallocSignal];
+}
+
+
 
 - (void)createUI {
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
@@ -96,9 +139,22 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy";
     self.view.backgroundColor = [UIColor whiteColor];
     [self.view addSubview:self.bgImageView];
     [self.view addSubview:self.logoView];
+    
+    [self.view addSubview:self.chooseAccountBtn];
+    [self.view addSubview:self.chooseSMSBtn];
+    [self.view addSubview:self.chooseTypeView];
+    
+    [self.view addSubview:self.accountView];
+    [self.view addSubview:self.accountPwdView];
+    [self.view addSubview:self.phoneInputView];
+    [self.view addSubview:self.codeInputView];
+    [self.view addSubview:self.forgetBtn];
+    [self.view addSubview:self.loginBtn];
+    
+    
+    
+    
     [self.view addSubview:self.stackView];
-    [self.view addSubview:self.quickLoginBtn];
-    [self.view addSubview:self.quickArrowView];
     [self.view addSubview:self.protocolLabel];
     [self.view addSubview:self.agreeBtn];
     
@@ -108,13 +164,7 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy";
     
     if (@available(iOS 13.0, *)) {
 #ifdef DEBUG
-        
-        
-        
         [self.stackView addArrangedSubview:self.appleButton];
-        
-        
-        
 #else
         if(isEnterprise == YES){
             [self.stackView addArrangedSubview:self.appleButton];
@@ -129,32 +179,82 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy";
     
     [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.right.top.equalTo(self.view);
-        make.height.mas_equalTo(kGetScaleWidth(355));
+        make.height.mas_equalTo(kGetScaleWidth(91));
     }];
     [self.logoView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.width.mas_offset(kGetScaleWidth(130));
+        make.width.mas_offset(kGetScaleWidth(162));
-        make.height.mas_equalTo(kGetScaleWidth(148));
+        make.height.mas_equalTo(kGetScaleWidth(32));
         make.centerX.equalTo(self.view);
-        make.top.mas_equalTo(kGetScaleWidth(100));
+        make.top.equalTo(self.bgImageView.mas_bottom).mas_offset(kGetScaleWidth(10));
     }];
     
+    
+   
+    CGFloat width = KScreenWidth/2;
+    [self.chooseAccountBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.leading.mas_equalTo(0);
+        make.height.mas_equalTo(kGetScaleWidth(22));
+        make.width.mas_equalTo(width);
+        make.top.equalTo(self.logoView.mas_bottom).mas_offset(kGetScaleWidth(31));
+    }];
+    
+    [self.chooseSMSBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.height.mas_equalTo(kGetScaleWidth(22));
+        make.width.mas_equalTo(width);
+        make.top.equalTo(self.logoView.mas_bottom).mas_offset(kGetScaleWidth(31));
+        make.trailing.mas_equalTo(0);
+    }];
+ 
+    [self.chooseTypeView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.equalTo(self.logoView.mas_bottom).mas_offset(kGetScaleWidth(48));
+        make.width.height.mas_equalTo(kGetScaleWidth(24));
+        make.leading.mas_equalTo(KScreenWidth/4 - kGetScaleWidth(12));
+    }];
+    
+   
+    
+    [self.accountView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerX.equalTo(self.view);
+        make.width.mas_equalTo(kGetScaleWidth(303));
+        make.top.mas_equalTo(self.chooseTypeView.mas_bottom).offset(kGetScaleWidth(13));
+        make.height.mas_equalTo(kGetScaleWidth(52));
+    }];
+    
+    [self.accountPwdView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerX.equalTo(self.view);
+        make.width.mas_equalTo(kGetScaleWidth(303));
+        make.top.mas_equalTo(self.phoneInputView.mas_bottom).offset(kGetScaleWidth(20));
+        make.height.mas_equalTo(kGetScaleWidth(52));
+    }];
+    
+    [self.phoneInputView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.edges.equalTo(self.accountView);
+    }];
+    [self.codeInputView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.edges.equalTo(self.accountPwdView);
+    }];
+    
+    [self.forgetBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.equalTo(self.codeInputView.mas_bottom).mas_offset(kGetScaleWidth(8));
+        make.trailing.mas_equalTo(-kGetScaleWidth(52));
+        make.height.mas_equalTo(kGetScaleWidth(17));
+    }];
+    
+    [self.loginBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.width.mas_equalTo(kGetScaleWidth(303));
+        make.centerX.equalTo(self.view);
+        make.top.equalTo(self.forgetBtn.mas_bottom).mas_offset(kGetScaleWidth(23));
+        make.height.mas_equalTo(kGetScaleWidth(48));
+    }];
+  
     [self.stackView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.mas_equalTo(self.self.logoView.mas_bottom).offset(kGetScaleWidth(60));
+        make.top.mas_equalTo(self.loginBtn.mas_bottom).offset(kGetScaleWidth(27));
         make.centerX.mas_equalTo(self.view);
     }];
     
     
   
-    [self.quickLoginBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+    
-        make.centerX.equalTo(self.view);
-        make.height.mas_equalTo(kGetScaleWidth(22));
-        make.top.equalTo(self.stackView.mas_bottom).mas_offset(kGetScaleWidth(18));
-    }];
-    [self.quickArrowView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.leading.equalTo(self.quickLoginBtn.mas_trailing).mas_offset(kGetScaleWidth(2));
-        make.centerY.equalTo(self.quickLoginBtn);
-        make.width.height.mas_equalTo(kGetScaleWidth(10));
-    }];
     [self.protocolLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerX.mas_equalTo(self.view).offset(10);
         make.right.mas_lessThanOrEqualTo(-10);
@@ -180,15 +280,10 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy";
     }];
     if (@available(iOS 13.0, *)) {
 #ifdef DEBUG
-        
-        
         [self.appleButton mas_makeConstraints:^(MASConstraintMaker *make) {
             make.width.mas_equalTo(kGetScaleWidth(295));
             make.height.mas_equalTo(kGetScaleWidth(46));
         }];
-        
-        
-        
 #else
         if(isEnterprise == YES){
             [self.appleButton mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -208,6 +303,8 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy";
         make.width.mas_equalTo(kGetScaleWidth(295));
         make.height.mas_equalTo(kGetScaleWidth(46));
     }];
+    self.fbButtonView.hidden = YES;
+    self.lineButtonView.hidden = YES;
     [self.lineButtonView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.width.mas_equalTo(kGetScaleWidth(295));
         make.height.mas_equalTo(kGetScaleWidth(46));
@@ -220,11 +317,12 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy";
             typeButton = self.appleButton;
         }else if([type intValue] == ThirdLoginType_Gmail){
             typeButton = self.googleButtonView;
-        }else if([type intValue] == ThirdLoginType_FB){
-            typeButton = self.fbButtonView;
-        }else if([type intValue] == ThirdLoginType_Line){
-            typeButton = self.lineButtonView;
         }
+//        else if([type intValue] == ThirdLoginType_FB){
+//            typeButton = self.fbButtonView;
+//        }else if([type intValue] == ThirdLoginType_Line){
+//            typeButton = self.lineButtonView;
+//        }
         if(typeButton == nil){
             return;
         }
@@ -324,32 +422,113 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy";
         }];
     }
 }
+/// 登录
+- (void)loginBtnClicked {
+    [XNDJTDDLoadingTool showOnlyView:self.view];
+    if(self.selectType == 0){
+        NSString *phone = self.accountView.inputTextField.text;
+        NSString *password = self.accountPwdView.inputTextField.text;
+        [self.presenter loginWithPhone:phone password:password];
+        return;
+    }
+    
+    
+    NSString *phone = self.phoneInputView.inputTextField.text;
+    NSString *smsCode = self.codeInputView.inputTextField.text;
+    NSString * phoneStr = [NSString stringWithFormat:@"%@%@",self.pi_phoneAreaCode, phone];
+    [self.presenter loginWithPhone:phoneStr code:smsCode phoneAreaCode:self.pi_phoneAreaCode];
+}
+
+- (void)forgetBtnClicked {
+    XPForgetPwdViewController *forgetVC = [[XPForgetPwdViewController alloc] init];
+    [self.navigationController pushViewController:forgetVC animated:YES];
+}
 #pragma mark - LoginProtocol
-- (void)loginSuccess {
+- (void)loginThirdPartSuccess {
+    [self.codeInputView cancelTimer];
     [PILoginManager loginWithVC:self isLoginPhone:NO];
     [self showSuccessToast:YMLocalizedString(@"XPLoginViewController4")];
 }
+-(void)chooseAccountAction{
+    self.selectType = 0;
+}
+-(void)chooseSMSAction{
+    self.selectType = 1;
+}
+-(void)setSelectType:(int)selectType{
+    _selectType = selectType;
+  
+    _chooseAccountBtn.selected = _selectType == 0;
+    _chooseSMSBtn.selected = _selectType != 0;
+    _forgetBtn.hidden = _selectType != 0;
+    
+    
+    _accountView.hidden = _selectType != 0;
+    _accountPwdView.hidden = _selectType != 0;
+    
+    _phoneInputView.hidden = _selectType == 0;
+    _codeInputView.hidden = _selectType == 0;
+   
+    [self.chooseTypeView.superview layoutIfNeeded];
+    CGFloat lead = _selectType == 0 ? KScreenWidth/4 - kGetScaleWidth(12) : KScreenWidth/4 * 3 - kGetScaleWidth(12);
+    [UIView animateWithDuration:0.1 animations:^{
+            [self.chooseTypeView mas_updateConstraints:^(MASConstraintMaker *make) {
+                make.leading.mas_equalTo(lead);
+            }];
+        [self.chooseTypeView.superview layoutIfNeeded];
+    }];
+    
+   
+}
+#pragma mark - XPLoginInputViewDelegate
 
+- (void)smsCodeAction {
+    NSString *phone = self.phoneInputView.inputTextField.text;
+    if (phone.length == 0 ) {
+        [self showErrorToast:YMLocalizedString(@"XPLoginPhoneViewController0")];
+        return;
+    }
+    [self.presenter phoneSmsCode:[NSString stringWithFormat:@"%@%@",self.pi_phoneAreaCode,phone] type:GetSmsType_Regist phoneAreaCode:self.pi_phoneAreaCode];
+}
+
+- (void)areaListAction {
+    XPLoginAraeViewController *codeVC = [XPLoginAraeViewController new];
+    codeVC.delegate = self;
+    [self.navigationController pushViewController:codeVC animated:YES];
+}
+#pragma  mark - XPLoginAraeViewControllerDelegate
+- (void)chooseAreaCodeSuccess:(NSString *)code {
+    if (code.length > 0) {
+        self.pi_phoneAreaCode = code;
+        [self.phoneInputView.areaCodeBtn setTitle:[NSString stringWithFormat:@"+%@", code] forState:UIControlStateNormal];
+    }
+}
+#pragma mark - LoginVerifCodeProtocol
+- (void)loginWithPhoenSuccess{
+    [XNDJTDDLoadingTool hideOnlyView:self.view];
+    [[NSUserDefaults standardUserDefaults]setValue:@(ThirdLoginType_Phone) forKey:@"kLoginSuccessType"];
+    [[NSUserDefaults standardUserDefaults]synchronize];
+    [self showSuccessToast:YMLocalizedString(@"XPLoginPhoneViewController1")];
+    [PILoginManager loginWithVC:self isLoginPhone:YES];
+}
+- (void)loginSuccess {
+    [self.codeInputView cancelTimer];
+    [XNDJTDDLoadingTool hideOnlyView:self.view];
+    [[NSUserDefaults standardUserDefaults]removeObjectForKey:@"kLoginSuccessType"];
+    [self showSuccessToast:YMLocalizedString(@"XPLoginPhoneViewController1")];
+    [PILoginManager loginWithVC:self isLoginPhone:NO];
+}
+- (void)loginFailWithMsg:(NSString *)msg{
+    [self showErrorToast:msg];
+    [XNDJTDDLoadingTool hideOnlyView:self.view];
+}
+- (void)phoneSmsCodeSuccess {
+    [self showSuccessToast:YMLocalizedString(@"XPLoginPhoneViewController2")];
+    [self.codeInputView fireTimer];
+}
 #pragma mark - 懒加载
 
-- (UIButton *)quickLoginBtn {
+
-    if (!_quickLoginBtn) {
-        _quickLoginBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        
-        [_quickLoginBtn setTitle:YMLocalizedString(@"XPLoginViewController16") forState:UIControlStateNormal];
-        _quickLoginBtn.titleLabel.font = kFontRegular(14);
-        [_quickLoginBtn setTitleColor:UIColorFromRGB(0x1F1B4F) forState:UIControlStateNormal];
-        [_quickLoginBtn addTarget:self action:@selector(quickLoginBtnClicked) forControlEvents:UIControlEventTouchUpInside];
-    }
-    return  _quickLoginBtn;
-}
-- (UIImageView *)quickArrowView{
-    if(!_quickArrowView){
-        _quickArrowView = [UIImageView new];
-        _quickArrowView.image = kImage(@"login_phone_white");
-    }
-    return _quickArrowView;
-}
 - (UIButton *)agreeBtn {
     if(!_agreeBtn) {
         _agreeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
@@ -541,4 +720,130 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy";
     }
     return _nextLabel;
 }
+
+- (XPLoginInputView *)phoneInputView {
+    if (!_phoneInputView) {
+        _phoneInputView = [[XPLoginInputView alloc] init];
+        _phoneInputView.areaStackView.hidden = NO;
+        _phoneInputView.delegate = self;
+        NSMutableAttributedString *placeholder = [[NSMutableAttributedString alloc] initWithString:YMLocalizedString(@"XPLoginPhoneViewController5")];
+        [placeholder addAttribute:NSForegroundColorAttributeName value:UIColorFromRGB(0xB3B3C3) range:NSMakeRange(0, placeholder.length)];
+        _phoneInputView.inputTextField.attributedPlaceholder = placeholder;
+        _phoneInputView.inputTextField.keyboardType = UIKeyboardTypeNumberPad;
+        _phoneInputView.hidden = YES;
+    }
+    return _phoneInputView;
+}
+
+- (XPLoginInputView *)codeInputView {
+    if (!_codeInputView) {
+        _codeInputView = [[XPLoginInputView alloc] init];
+        _codeInputView.smsCodeBtn.hidden = NO;
+        NSMutableAttributedString *placeholder = [[NSMutableAttributedString alloc] initWithString:YMLocalizedString(@"XPLoginPhoneViewController6")];
+        [placeholder addAttribute:NSForegroundColorAttributeName value:UIColorFromRGB(0xB3B3C3) range:NSMakeRange(0, placeholder.length)];
+        _codeInputView.inputTextField.attributedPlaceholder = placeholder;
+        _codeInputView.inputTextField.keyboardType = UIKeyboardTypeNumberPad;
+        _codeInputView.delegate = self;
+        _codeInputView.hidden = YES;
+    }
+    return _codeInputView;
+}
+
+- (UIButton *)loginBtn {
+    if (!_loginBtn) {
+        _loginBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+        
+        UIImage *nextImage = [UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor],[DJDKMIMOMColor confirmButtonGradientMiddleColor],[DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(kGetScaleWidth(303), kGetScaleWidth(48))];
+        UIImage *disableImage = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0xD1F9FF),UIColorFromRGB(0xDEE4FF),UIColorFromRGB(0xEEDCFF)] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(kGetScaleWidth(303), kGetScaleWidth(48))];
+        
+        [_loginBtn setImage:nextImage forState:UIControlStateNormal];
+        [_loginBtn setImage:disableImage forState:UIControlStateDisabled];
+        _loginBtn.layer.cornerRadius = kGetScaleWidth(48)/2;
+        _loginBtn.layer.masksToBounds = YES;
+        
+       
+        UILabel *titleView = [UILabel labelInitWithText:YMLocalizedString(@"XPLoginPhoneViewController8") font:kFontMedium(16) textColor:[UIColor whiteColor]];
+        titleView.textAlignment = NSTextAlignmentCenter;
+        [_loginBtn addSubview:titleView];
+        [titleView mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.edges.equalTo(self.loginBtn);
+        }];
+        [_loginBtn addTarget:self action:@selector(loginBtnClicked) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _loginBtn;
+}
+
+
+
+- (UIImageView *)chooseTypeView{
+    if(!_chooseTypeView){
+        _chooseTypeView = [UIImageView new];
+        _chooseTypeView.userInteractionEnabled = YES;
+        [_chooseTypeView setImage:kImage(@"ms_login_choose_phone_icon")];
+      
+      
+    }
+    return _chooseTypeView;
+}
+- (UIButton *)chooseAccountBtn{
+    if(!_chooseAccountBtn){
+        _chooseAccountBtn = [UIButton new];
+        [_chooseAccountBtn setTitle:YMLocalizedString(@"XPLoginPhoneViewController9" ) forState:UIControlStateNormal];
+        [_chooseAccountBtn setTitleColor:UIColorFromRGB(0x84868A) forState:UIControlStateNormal];
+        [_chooseAccountBtn setTitleColor:UIColorFromRGB(0x000000) forState:UIControlStateSelected];
+        _chooseAccountBtn.titleLabel.font = kFontMedium(16);
+        [_chooseAccountBtn setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10];
+        _chooseAccountBtn.selected = YES;
+        [_chooseAccountBtn addTarget:self action:@selector(chooseAccountAction) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _chooseAccountBtn;
+}
+- (UIButton *)chooseSMSBtn{
+    if(!_chooseSMSBtn){
+        _chooseSMSBtn = [UIButton new];
+        [_chooseSMSBtn setTitle:YMLocalizedString(@"XPLoginPhoneViewController10") forState:UIControlStateNormal];
+        [_chooseSMSBtn setTitleColor:UIColorFromRGB(0x84868A) forState:UIControlStateNormal];
+        [_chooseSMSBtn setTitleColor:UIColorFromRGB(0x000000) forState:UIControlStateSelected];
+        _chooseSMSBtn.titleLabel.font = kFontMedium(16);
+        [_chooseSMSBtn setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10];
+        [_chooseSMSBtn addTarget:self action:@selector(chooseSMSAction) forControlEvents:UIControlEventTouchUpInside];
+        
+    }
+    return _chooseSMSBtn;
+}
+
+- (XPLoginInputView *)accountView {
+    if (!_accountView) {
+        _accountView = [[XPLoginInputView alloc] init];
+        _accountView.areaStackView.hidden = YES;
+        NSMutableAttributedString *placeholder = [[NSMutableAttributedString alloc] initWithString:YMLocalizedString(@"XPLoginPwdViewController6")];
+        [placeholder addAttribute:NSForegroundColorAttributeName value:UIColorFromRGB(0xB4B7BD) range:NSMakeRange(0, placeholder.length)];
+        _accountView.inputTextField.attributedPlaceholder = placeholder;
+        _accountView.inputTextField.keyboardType = UIKeyboardTypeNumberPad;
+    }
+    return _accountView;
+}
+
+- (XPLoginInputView *)accountPwdView {
+    if (!_accountPwdView) {
+        _accountPwdView = [[XPLoginInputView alloc] init];
+        NSMutableAttributedString *placeholder = [[NSMutableAttributedString alloc] initWithString:YMLocalizedString(@"XPLoginPwdViewController3")];
+        [placeholder addAttribute:NSForegroundColorAttributeName value:UIColorFromRGB(0xB4B7BD) range:NSMakeRange(0, placeholder.length)];
+        _accountPwdView.inputTextField.attributedPlaceholder = placeholder;
+        _accountPwdView.inputTextField.keyboardType = UIKeyboardTypeAlphabet;
+        _accountPwdView.inputTextField.secureTextEntry = YES;
+    }
+    return _accountPwdView;
+}
+- (UIButton *)forgetBtn {
+    if (!_forgetBtn) {
+        _forgetBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+        [_forgetBtn setTitle:YMLocalizedString(@"XPRoomRedPacketPwdView1") forState:UIControlStateNormal];
+        [_forgetBtn setTitleColor:UIColorFromRGB(0xB4B7BD) forState:UIControlStateNormal];
+        _forgetBtn.titleLabel.font = kFontRegular(12);
+        [_forgetBtn addTarget:self action:@selector(forgetBtnClicked) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _forgetBtn;
+}
+
 @end

YuMi/Modules/YMMessage/Model/AttachmentModel.h

@@ -78,7 +78,7 @@ typedef NS_ENUM(NSUInteger, CustomMessageType) {
 	CustomMessageType_Room_Sailing = 81,
 	///跨房PK
 	CustomMessageType_Across_Room_PK = 83,
-    ///贵族VIP
+    ///VIPVIP
     CustomMessageType_Noble_VIP = 85,
     ///个播房观众点击空坑位，房主收到请求上麦提示
     CustomMessageType_AnchorRoom_AudienceUpMic = 86,
@@ -492,19 +492,19 @@ typedef NS_ENUM(NSUInteger, CustomMessageSubAcrossRoomPK) {
 
 ///first = CustomMessageType_Noble_VIP
 typedef NS_ENUM(NSUInteger, CustomMessageSubNobleVIP) {
-    /// 开通贵族房内消息（公屏显示）
+    /// 开通VIP房内消息（公屏显示）
     Custom_Message_Sub_Room_Open_Noble_VIP = 851,
-    /// 开通贵族成功通知消息
+    /// 开通VIP成功通知消息
     Custom_Message_Sub_Open_Noble_Success = 852,
-    /// 贵族升级房内消息（公屏显示）
+    /// VIP升级房内消息（公屏显示）
     Custom_Message_Sub_Room_Noble_LevelUp = 853,
-    /// 贵族升级用户通知消息（弹窗）
+    /// VIP升级用户通知消息（弹窗）
     Custom_Message_Sub_Noble_LevelUp_User = 854,
-    /// 贵族升级全服飘屏通知消息
+    /// VIP升级全服飘屏通知消息
     Custom_Message_Sub_Room_Noble_LevelUp_Suspend = 855,
-    /// 贵族升级全服房间公屏通知消息
+    /// VIP升级全服房间公屏通知消息
     Custom_Message_Sub_AllRoom_Noble_LevelUp_Suspend = 856,
-    /// 贵族小喇叭房间消息
+    /// VIP小喇叭房间消息
     Custom_Message_Sub_Room_Trumpet = 857,
     
 };

YuMi/Modules/YMMessage/Model/SessionContent/ContentSecretaryModel.h

@@ -28,11 +28,11 @@ typedef NS_ENUM(NSInteger, SecretaryRouterType) {
 	SecretaryRouterType_Nameplate = 9,
 	///设置密码
 	SecretaryRouterType_Set_Password = 53,
-	///贵族中心
+	///VIP中心
 	SecretaryRouterType_Nobel_Center = 54,
 	///资料卡装扮
 	SecretaryRouterType_User_Card = 55,
-	///贵族气泡
+	///VIP气泡
 	SecretaryRouterType_Nobel_Bubble = 56,
     ///装扮商城
     SecretaryRouterType_Dressup_Shop = 73,

YuMi/Modules/YMMessage/View/Session/Cell/SessionUserInfoTableViewCell.m

@@ -75,7 +75,7 @@
 @property (nonatomic,strong) UIView *userView;
 ///头像
 @property (nonatomic,strong) NetImageView * avatarImageView;
-///贵族等级icon
+///VIP等级icon
 @property (nonatomic,strong) NetImageView *nobleImageView;
 ///普通的
 @property (nonatomic,strong) YYAnimatedImageView *headWearImageView;

YuMi/Modules/YMMessage/View/Session/SessionViewController.m

@@ -448,11 +448,11 @@
 				[self.riskAlertView mas_makeConstraints:^(MASConstraintMaker *make) {
 					make.left.right.mas_equalTo(self.view);
 					make.top.mas_equalTo(self.sessionNavView.mas_bottom);
-					make.height.mas_equalTo(20);
+					make.height.mas_equalTo(30);
 				}];
 			}
 			[self.sessionTableView mas_updateConstraints:^(MASConstraintMaker *make) {
-				make.top.mas_equalTo(self.sessionNavView.mas_bottom).mas_offset(20);
+				make.top.mas_equalTo(self.sessionNavView.mas_bottom).mas_offset(30);
 			}];
 		} else {
 			[self.sessionTableView mas_updateConstraints:^(MASConstraintMaker *make) {
@@ -467,11 +467,11 @@
 				[self.riskAlertView mas_makeConstraints:^(MASConstraintMaker *make) {
 					make.left.right.mas_equalTo(self.view);
 					make.top.mas_equalTo(self.sessionNavView.mas_bottom);
-					make.height.mas_equalTo(20);
+					make.height.mas_equalTo(30);
 				}];
 			}
 			[self.sessionTableView mas_updateConstraints:^(MASConstraintMaker *make) {
-				make.top.mas_equalTo(self.sessionNavView.mas_bottom).mas_offset(20);
+				make.top.mas_equalTo(self.sessionNavView.mas_bottom).mas_offset(30);
 			}];
 		} else {
 			[self.sessionTableView mas_updateConstraints:^(MASConstraintMaker *make) {

YuMi/Modules/YMMessage/View/Session/View/SessionRiskView.m

@@ -40,7 +40,8 @@
 
 - (void)initSubViewConstraints {
 	[self.warnTextLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-		make.centerX.mas_equalTo(self.mas_centerX);
+        make.leading.equalTo(self).inset(kGetScaleWidth(5));
+        make.trailing.mas_equalTo(-kGetScaleWidth(20));
 		make.centerY.mas_equalTo(self.mas_centerY);
 	}];
 	[self.closeButton mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -71,6 +72,8 @@
 		_warnTextLabel.text = YMLocalizedString(@"SessionRiskView0");
 		_warnTextLabel.textColor = UIColorFromRGB(0xFF5858);
 		_warnTextLabel.font = [UIFont systemFontOfSize:12.f];
+        _warnTextLabel.numberOfLines = 2;
+        _warnTextLabel.textAlignment = NSTextAlignmentCenter;
 	}
 	return _warnTextLabel;
 }

YuMi/Modules/YMMine/Model/Friend/FansInfoModel.h

@@ -34,7 +34,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic,assign) BOOL valid;
 ///当前用户所在的房间  映射的字段
 @property (nonatomic,copy) NSString *userInRoomUid;
-///贵族信息
+///VIP信息
 @property (nonatomic, strong) UserVipInfoVo *userVipInfoVO;
 ///是否在房间中 本地字段
 @property (nonatomic,assign) ContactUseingType useingType;

YuMi/Modules/YMMine/Model/XPMineItemModel.h

@@ -20,7 +20,7 @@ typedef NS_ENUM(NSInteger, XPMineItemType) {
     XPMineItemType_Attention_List,///关注列表
     XPMineItemType_Foot_Print, ///足迹、进房记录
     XPMineItemType_Fans_List,///粉丝列表
-    XPMineItemType_Noble_Center,///贵族中心
+    XPMineItemType_Noble_Center,///VIP中心
     XPMineItemType_Skill_Card, ///技能卡
     XPMineItemType_My_Room = 64, ///我的房间
     XPMineItemType_Collect_Room = 65, ///收藏房间

YuMi/Modules/YMMine/Presenter/XPMinePresent.h

@@ -18,7 +18,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 /// 获取家族详细的信息
 - (void)getClanDetailInfo;
-///获取贵族信息
+///获取VIP信息
 - (void)getNobleInfo;
 ///获取个人功能列表
 - (void)getPersonItemList ;

YuMi/Modules/YMMine/Presenter/XPMinePresent.m

@@ -89,7 +89,7 @@
 		[[self getView] onGetMineFuntionItemFail];
 	}] uid:uid];
 }
-///获取贵族信息
+///获取VIP信息
 - (void)getNobleInfo {
     [Api nobleCenterLevelList:[self createHttpCompletion:^(BaseModel * _Nonnull data) {
         NobleCenterModel *model = [NobleCenterModel modelWithDictionary:data.data];

YuMi/Modules/YMMine/Protocol/XPMineProtocol.h

@@ -17,9 +17,9 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)getUserWalletInfo:(WalletInfoModel *)balanceInfo;
 ///获取账户余额失败
 - (void)getUserWalletInfoFail;
-///获取贵族信息成功
+///获取VIP信息成功
 - (void)getNobleCenterInfoSuccess:(NobleCenterModel *)model;
-///获取贵族信息失败
+///获取VIP信息失败
 - (void)getNobleCenterInfoFail;
 ///获取家族信息成功
 - (void)onGetClanDetailInfoSuccess:(ClanDetailInfoModel *)clanInfo ;

YuMi/Modules/YMMine/View/Cell/Friend/XPMineAttentionTableViewCell.m

@@ -27,7 +27,7 @@
 @property (nonatomic,strong) NetImageView *experImageView;
 ///魅力等级
 @property (nonatomic,strong) NetImageView *charmImageView;
-///贵族
+///VIP
 @property (nonatomic,strong) NetImageView *nobleImageView;
 ///签名
 @property (nonatomic,strong) UILabel *signLabel;

YuMi/Modules/YMMine/View/Cell/Friend/XPMineFansTableViewCell.m

@@ -28,7 +28,7 @@
 @property (nonatomic,strong) NetImageView *experImageView;
 ///魅力等级
 @property (nonatomic,strong) NetImageView *charmImageView;
-///贵族
+///VIP
 @property (nonatomic,strong) NetImageView *nobleImageView;
 ///签名
 @property (nonatomic,strong) UILabel *signLabel;

YuMi/Modules/YMMine/View/DressUp/Api/Api+DressUp.h

@@ -28,7 +28,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param uid uid
 + (void)nameplateList:(HttpRequestHelperCompletion)completion ticket:(NSString *)ticket uid:(NSString *)uid page:(NSString *)page pageSize:(NSString *)pageSize;
 
-/// 获取用户贵族资料卡
+/// 获取用户VIP资料卡
 /// @param completion 完成
 /// @param ticket ticket
 /// @param uid uid
@@ -61,7 +61,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param uid uid
 + (void)useNameplate:(HttpRequestHelperCompletion)completion userNameplateId:(NSString *)userNameplateId ticket:(NSString *)ticket uid:(NSString *)uid;
 
-/// 使用贵族资料卡
+/// 使用VIP资料卡
 /// @param completion 完成
 /// @param cardId 资料卡idd 0 取消使用
 /// @param ticket ticket

YuMi/Modules/YMMine/View/DressUp/Api/Api+DressUp.m

@@ -37,7 +37,7 @@
 }
 
 
-/// 获取用户贵族资料卡
+/// 获取用户VIP资料卡
 /// @param completion 完成
 /// @param ticket ticket
 /// @param uid uid
@@ -85,9 +85,9 @@
 	[self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, userNameplateId, ticket, uid, nil];
 }
 
-/// 使用贵族资料卡
+/// 使用VIP资料卡
 /// @param completion 完成
-/// @param cardId 资料卡id 0 取消使用贵族资料卡
+/// @param cardId 资料卡id 0 取消使用VIP资料卡
 /// @param ticket ticket
 /// @param uid uid
 + (void)useNobleCard:(HttpRequestHelperCompletion)completion cardId:(NSString *)cardId ticket:(NSString *)ticket uid:(NSString *)uid {

YuMi/Modules/YMMine/View/DressUp/Presenter/XPMineDressUpPresenter.h

@@ -16,7 +16,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)getUserCarList;
 /// 获取用户铭牌列表
 - (void)getUserNameplateList;
-/// 获取用户贵族资料卡列表
+/// 获取用户VIP资料卡列表
 - (void)getUserNobleCardList;
 /// 获取用户公屏聊天气泡列表
 - (void)getUserChatBubbleList;
@@ -29,8 +29,8 @@ NS_ASSUME_NONNULL_BEGIN
 /// 使用铭牌
 /// @param userNameplateId 铭牌的id  不使用的时候传0
 - (void)useNameplate:(NSString *)userNameplateId;
-/// 使用贵族资料卡
+/// 使用VIP资料卡
-/// @param nobleCardId 贵族资料卡的id  不使用的时候传0
+/// @param nobleCardId VIP资料卡的id  不使用的时候传0
 - (void)userNobleCard:(NSString *)nobleCardId;
 /// 使用气泡
 /// @param bubbleId 气泡id

YuMi/Modules/YMMine/View/DressUp/Presenter/XPMineDressUpPresenter.m

@@ -49,7 +49,7 @@
 	}] ticket:ticket uid:uid page:@"1" pageSize:@"500"];
 }
 
-/// 获取用户贵族资料卡列表
+/// 获取用户VIP资料卡列表
 - (void)getUserNobleCardList {
     NSString * uid = [AccountInfoStorage instance].getUid;
     NSString * ticket = [AccountInfoStorage instance].getTicket;
@@ -97,8 +97,8 @@
 	} showLoading:YES] userNameplateId:userNameplateId ticket:ticket uid:uid];
 }
 
-/// 使用贵族资料卡
+/// 使用VIP资料卡
-/// @param nobleCardId 贵族资料卡的id  不使用的时候传0
+/// @param nobleCardId VIP资料卡的id  不使用的时候传0
 - (void)userNobleCard:(NSString *)nobleCardId {
     NSString * uid = [AccountInfoStorage instance].getUid;
     NSString * ticket = [AccountInfoStorage instance].getTicket;

YuMi/Modules/YMMine/View/DressUp/Protocol/XPDressUpShopProtocol.h

@@ -35,7 +35,7 @@ typedef NS_ENUM(NSInteger, DressUpShopListType) {
 - (void)getUserCarListSuccess:(NSArray *)array;
 ///获取用户头饰列表成功
 - (void)getUserNameplateListSuccess:(NSArray *)array;
-///获取用户贵族资料卡成功
+///获取用户VIP资料卡成功
 - (void)getUserNobleCardListSuccess:(NSArray *)array;
 ///获取用户公屏气泡成功
 - (void)getUserChatBubbleListSuccess:(NSArray *)array;
@@ -45,7 +45,7 @@ typedef NS_ENUM(NSInteger, DressUpShopListType) {
 - (void)useCarSuccess:(NSString *)carId;
 ///使用铭牌成功
 - (void)useNameplateSuccess:(NSString *)nameplateId;
-///使用贵族资料卡成功
+///使用VIP资料卡成功
 - (void)userNobleCardSuccess:(NSString *)nobleCardId;
 ///使用气泡成功
 - (void)useBubbleSuccess:(NSString *)bubbleId;

YuMi/Modules/YMMine/View/DressUp/Protocol/XPMineDressUpProtocol.h

@@ -16,7 +16,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)getUserCarListSuccess:(NSArray *)array;
 ///获取用户头饰列表成功
 - (void)getUserNameplateListSuccess:(NSArray *)array;
-///获取用户贵族资料卡成功
+///获取用户VIP资料卡成功
 - (void)getUserNobleCardListSuccess:(NSArray *)array;
 ///获取用户公屏气泡成功
 - (void)getUserChatBubbleListSuccess:(NSArray *)array;
@@ -26,7 +26,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)useCarSuccess:(NSString *)carId;
 ///使用铭牌成功
 - (void)useNameplateSuccess:(NSString *)nameplateId;
-///使用贵族资料卡成功
+///使用VIP资料卡成功
 - (void)userNobleCardSuccess:(NSString *)nobleCardId;
 ///使用气泡成功
 - (void)useBubbleSuccess:(NSString *)bubbleId;

YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineNobleCardTableViewCell.h

@@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
 @class NobleCardModel, XPMineNobleCardTableViewCell;
 @protocol XPMineNobleCardTableViewCellDelegate <NSObject>
 
-///使用贵族资料卡
+///使用VIP资料卡
 - (void)xPMineNobleCardTableViewCell:(XPMineNobleCardTableViewCell *)view nobleCardId:(NSString *)nobleCardId;
 
 @end

YuMi/Modules/YMMine/View/DressUp/View/XPDressUpShopViewController.m

@@ -44,7 +44,7 @@
 @property (nonatomic,strong) XPDressUpShopListViewController *carView;
 ///铭牌
 @property (nonatomic,strong) XPDressUpShopListViewController *nameplateView;
-///贵族资料卡
+///VIP资料卡
 @property (nonatomic, strong) XPDressUpShopCardViewController *nobleView;
 ///公屏气泡
 @property (nonatomic, strong) XPDressUpShopListViewController *bubbleView;

YuMi/Modules/YMMine/View/DressUp/View/XPMineDressUpViewController.m

@@ -36,7 +36,7 @@
 @property (nonatomic,strong) XPMineDressUpListViewController *carView;
 ///铭牌
 @property (nonatomic,strong) XPMineDressUpListViewController *nameplateView;
-///贵族资料卡
+///VIP资料卡
 @property (nonatomic, strong) XPMineDressUpListViewController *nobleView;
 ///公屏气泡
 @property (nonatomic, strong) XPMineDressUpBubbleViewController *bubbleView;

YuMi/Modules/YMMine/View/Noble/Api/Api+NobleCenter.h

@@ -11,12 +11,12 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface Api (NobleCenter)
 
-/// 贵族中心等级列表
+/// VIP中心等级列表
 /// @param completion 完成
 + (void)nobleCenterLevelList:(HttpRequestHelperCompletion)completion;
 ///领取返利钻石
 + (void)getNobleCenterDiamond:(HttpRequestHelperCompletion)completion returnProfitRecordId:(NSString *)returnProfitRecordId;
-///获取开通贵族产品列表
+///获取开通VIP产品列表
 + (void)getChargeList:(HttpRequestHelperCompletion)completion type:(NSString *)type;
 
 /// 苹果下单
@@ -43,7 +43,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param complection 完成回调
 /// @param open 是否打开
 + (void)changeEnterHidCompletion:(HttpRequestHelperCompletion)complection open:(NSString *)open;
-/// 使用钻石开通贵族
+/// 使用钻石开通VIP
 /// @param complection 完成回调
 /// @param roomUid 房主的uid
 +(void)openWithDiamond:(HttpRequestHelperCompletion)complection roomUid:(NSString *)roomUid vipLevel:(NSString *)vipLevel;

YuMi/Modules/YMMine/View/Noble/Api/Api+NobleCenter.m

@@ -9,7 +9,7 @@
 
 @implementation Api (NobleCenter)
 
-/// 贵族中心等级列表
+/// VIP中心等级列表
 /// @param completion 完成
 + (void)nobleCenterLevelList:(HttpRequestHelperCompletion)completion {
     [self makeRequest:@"vip/getVipPageInfo" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, nil];
@@ -18,7 +18,7 @@
 + (void)getNobleCenterDiamond:(HttpRequestHelperCompletion)completion returnProfitRecordId:(NSString *)returnProfitRecordId{
     [self makeRequest:@"vip/returnProfit/receive" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, returnProfitRecordId,nil];
 }
-///获取开通贵族产品列表
+///获取开通VIP产品列表
 + (void)getChargeList:(HttpRequestHelperCompletion)completion type:(NSString *)type  {
     [self makeRequest:@"chargeprod/getVipList" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, type, nil];
 }
@@ -56,7 +56,7 @@
 + (void)changeEnterHidCompletion:(HttpRequestHelperCompletion)complection open:(NSString *)open {
     [self makeRequest:@"vip/changeInvisibleInRoom" method:HttpRequestHelperMethodGET completion:complection, __FUNCTION__,open, nil];
 }
-/// 使用钻石开通贵族
+/// 使用钻石开通VIP
 /// @param complection 完成回调
 /// @param roomUid 房主的uid
 +(void)openWithDiamond:(HttpRequestHelperCompletion)complection roomUid:(NSString *)roomUid vipLevel:(NSString *)vipLevel{

YuMi/Modules/YMMine/View/Noble/Model/NobleCenterModel.h

@@ -13,15 +13,15 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface NobleCenterModel : PIBaseModel
 
-///用户当前贵族等级
+///用户当前VIP等级
 @property (nonatomic, assign) NSInteger currLevel;
 ///用户当前权力值
 @property (nonatomic, assign) NSInteger currScore;
-///贵族到期剩余秒数
+///VIP到期剩余秒数
 @property (nonatomic, assign) NSInteger remainSeconds;
-///贵族权限信息列表
+///VIP权限信息列表
 @property (nonatomic, strong) NSArray<NobleAuthInfo *> *vipAuthInfos;
-///贵族信息列表
+///VIP信息列表
 @property (nonatomic, strong) NSArray<NobleInfo *> *vipInfos;
 ///当前是否为最高等级
 @property (nonatomic, assign) BOOL isMaxLevel;

YuMi/Modules/YMMine/View/Noble/Model/NobleInfo.h

@@ -13,21 +13,21 @@ NS_ASSUME_NONNULL_BEGIN
 
 ///是否敬请期待：1. 否 2.是
 @property (nonatomic,  assign) NSInteger comingSoon;
-///贵族保级值
+///VIP保级值
 @property (nonatomic,  assign) NSInteger levelKeepScore;
-///贵族升级值
+///VIP升级值
 @property (nonatomic,  assign) NSInteger levelUpScore;
 
 @property (nonatomic, copy) NSString *ownAuthTypeStr;
 ///有用的权限type列表
 @property (nonatomic, copy) NSArray<NSNumber *> *ownAuthTypes;
-///贵族icon
+///VIPicon
 @property (nonatomic, copy) NSString *vipIcon;
-///贵族等级
+///VIP等级
 @property (nonatomic, assign) NSInteger vipLevel;
-///贵族logo
+///VIPlogo
 @property (nonatomic, copy) NSString *vipLogo;
-///贵族名称
+///VIP名称
 @property (nonatomic, copy) NSString *vipName;
 ///返钻
 @property(nonatomic,copy) NSArray<PINobleRebateModel *> *returnProfits;

YuMi/Modules/YMMine/View/Noble/Model/NobleLevelUpModel.h

@@ -15,15 +15,15 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong) NSString *nick;
 ///UID
 @property (nonatomic, assign) long long uid;
-///贵族等级
+///VIP等级
 @property (nonatomic, assign) NSInteger vipLevel;
-///贵族名称
+///VIP名称
 @property (nonatomic, strong) NSString *vipName;
 
 @property (nonatomic, copy) NSString *floatPic;
 ///头像
 @property (nonatomic, copy) NSString *vipIcon;
-///贵族logo动图
+///VIPlogo动图
 @property (nonatomic, copy) NSString *vipLogo;
 
 @end

YuMi/Modules/YMMine/View/Noble/Presenter/XPNobleCenterPresenter.h

@@ -11,17 +11,17 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface XPNobleCenterPresenter : BaseMvpPresenter
 
-/// 获取贵族中心数据
+/// 获取VIP中心数据
 - (void)getNobleCenterInfo;
-/// 获取贵族中心数据
+/// 获取VIP中心数据
 - (void)getNobleCenterReturnDiamond:(NSString *)recordId;
 /// 获取用户信息
 - (void)getUserInfo;
 
-///获取贵族充值产品列表
+///获取VIP充值产品列表
 - (void)getNobleChargeProductListWithChannelType:(NSString *)type;
 
-/// 生成贵族充值的订单
+/// 生成VIP充值的订单
 /// @param chargeProdId  苹果服务器的充值 的id
 - (void)requestNobleIAPRechargeOrderWithChargeProdId:(NSString *)chargeProdId roomUid:(NSString *)roomUid ;
 
@@ -37,7 +37,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// 切换隐身进房
 /// @param enterHide 隐身进房
 - (void)changeEnterHide:(BOOL)enterHide;
-/// 使用钻石开通贵族
+/// 使用钻石开通VIP
 
 /// @param roomUid 房主的uid
 - (void)openVipWithDiamondRoomUid:(NSString *)roomUid vipLevel:(NSString *)vipLevel;

YuMi/Modules/YMMine/View/Noble/Presenter/XPNobleCenterPresenter.m

@@ -23,14 +23,14 @@
 
 @implementation XPNobleCenterPresenter
 
-/// 获取贵族中心数据
+/// 获取VIP中心数据
 - (void)getNobleCenterInfo {
     [Api nobleCenterLevelList:[self createHttpCompletion:^(BaseModel * _Nonnull data) {
         NobleCenterModel *model = [NobleCenterModel modelWithDictionary:data.data];
         [[self getView] getNobleCenterInfoSuccess:model];
     }]];
 }
-/// 获取贵族中心数据
+/// 获取VIP中心数据
 - (void)getNobleCenterReturnDiamond:(NSString *)recordId{
     [Api getNobleCenterDiamond:[self createHttpCompletion:^(BaseModel * _Nonnull data) {
         [[self getView]getNobleCenterDiamondSuccess:recordId];
@@ -47,7 +47,7 @@
     }] uid:uid];
 }
 
-///获取贵族充值产品列表
+///获取VIP充值产品列表
 - (void)getNobleChargeProductListWithChannelType:(NSString *)type {
     [Api getChargeList:[self createHttpCompletion:^(BaseModel * _Nonnull data) {
         NSArray *list = [RechargeListModel modelsWithArray:data.data];
@@ -57,7 +57,7 @@
     }] type:type];
 }
 
-/// 生成贵族充值的订单
+/// 生成VIP充值的订单
 /// @param chargeProdId  苹果服务器的充值 的id
 - (void)requestNobleIAPRechargeOrderWithChargeProdId:(NSString *)chargeProdId roomUid:(NSString *)roomUid {
     NSString * uid = [AccountInfoStorage instance].getUid;
@@ -105,7 +105,7 @@
         [[self getView] changeEnterHideFail];
     }] open:[NSString stringWithFormat:@"%d", enterHide]];
 }
-/// 使用钻石开通贵族
+/// 使用钻石开通VIP
 
 /// @param roomUid 房主的uid
 - (void)openVipWithDiamondRoomUid:(NSString *)roomUid vipLevel:(NSString *)vipLevel{

YuMi/Modules/YMMine/View/Noble/Protocol/XPNobleCenterProtocol.h

@@ -10,14 +10,14 @@
 @class NobleCenterModel, UserInfoModel, NobleRechargeModel;
 @protocol XPNobleCenterProtocol <NSObject>
 @optional
-///获取贵族信息成功
+///获取VIP信息成功
 - (void)getNobleCenterInfoSuccess:(NobleCenterModel *)model;
-///获取贵族信息成功
+///获取VIP信息成功
 - (void)getNobleCenterDiamondSuccess:(NSString *)recordId;
 ///获取用户信息成功
 - (void)onGetUserInfoSuccess:(UserInfoModel *)userInfo;
 
-///获取贵族充值信息成功
+///获取VIP充值信息成功
 - (void)onGetNobleRechargeDataSuccess:(NSArray *)list;
 
 ///请求充值id的状态成功

YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterTitleView.h

@@ -12,7 +12,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface PINobleCenterTitleView : JXCategoryTitleView
-///贵族信息列表
+///VIP信息列表
 @property (nonatomic, strong) NSArray<NobleInfo *> *vipInfos;
 @end
 

YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleAuthorityDescView.h

@@ -3,7 +3,7 @@
 //  xplan-ios
 //
 //  Created by GreenLand on 2022/1/5.
-// 贵族权限说明弹窗
+// VIP权限说明弹窗
 
 #import <UIKit/UIKit.h>
 #import "NobleAuthInfo.h"

YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterMyNobleView.m

@@ -39,7 +39,7 @@
 @property (nonatomic, strong) UILabel *safeValueLabel;
 ///升级权力值
 @property (nonatomic, strong) UILabel *upGradeValueLabel;
-///开通贵族
+///开通VIP
 @property (nonatomic, strong) UILabel *openNobleButton;
 ///
 @property (nonatomic,strong) UIImageView *openNobleView;

YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterTableHeadView.h

@@ -20,7 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
 ///当前权力值
 @property (nonatomic, assign) NSInteger currentScore;
 
-///当前用户是否开通了贵族
+///当前用户是否开通了VIP
 @property (nonatomic, assign) BOOL isOpenNoble;
 
 @end

YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterTableHeadView.m

@@ -17,15 +17,15 @@
 
 @interface XPNobleCenterTableHeadView ()
 
-///贵族图标
+///VIP图标
 //@property (nonatomic, strong) NetImageView *iconImageView;
-///贵族logo
+///VIPlogo
 @property (nonatomic, strong) SVGAImageView *svgDisplayView;
 ///我的等级图标
 @property (nonatomic, strong) UIImageView *myLevelImageView;
 ///当前权力值
 @property (nonatomic, strong) UILabel *currentValueLabel;
-///尚未开通贵族
+///尚未开通VIP
 @property (nonatomic, strong) UILabel *noOpenNobleLabel;
 
 @property (strong, nonatomic) SVGAParser *parser;

YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleUpgradeLevelView.h

@@ -3,7 +3,7 @@
 //  xplan-ios
 //
 //  Created by GreenLand on 2022/1/6.
-// 贵族等级提升view
+// VIP等级提升view
 
 #import <UIKit/UIKit.h>
 

YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleUpgradeLevelView.m

@@ -26,7 +26,7 @@
 
 ///背景
 @property (nonatomic, strong) UIImageView *bgImageView;
-///贵族logo
+///VIPlogo
 @property (nonatomic, strong) SVGAImageView *svgDisplayView;
 ///主标题
 @property (nonatomic, strong) UILabel *titleLabel;
@@ -34,7 +34,7 @@
 @property (nonatomic, strong) UILabel *subTitleLabel;
 ///关闭按钮
 @property (nonatomic, strong) UIButton *closeButton;
-///前往贵族中心
+///前往VIP中心
 @property (nonatomic, strong) UIButton *jumpButton;
 
 @property (strong, nonatomic) SVGAParser *parser;

YuMi/Modules/YMMine/View/Noble/View/ThemeColor+NobleCenter.h

@@ -17,13 +17,13 @@ NS_ASSUME_NONNULL_BEGIN
 ///高亮文字颜色（0xFFE3AF）
 + (UIColor *)hightNobleLightTextColor;
 
-///贵族特权未点亮标题颜色（0x9F8052）
+///VIP特权未点亮标题颜色（0x9F8052）
 + (UIColor *)noContainTitleTextColor;
 
-///贵族特权未点亮短描述颜色（0x8B7245）
+///VIP特权未点亮短描述颜色（0x8B7245）
 + (UIColor *)noContainDescTextColor;
 
-///贵族设置背景颜色（0x232017）
+///VIP设置背景颜色（0x232017）
 + (UIColor *)nobleSettingBgColor;
 
 @end

YuMi/Modules/YMMine/View/Noble/View/ThemeColor+NobleCenter.m

@@ -19,17 +19,17 @@
     return UIColorFromRGB(0xFFE3AF);
 }
 
-///贵族特权未点亮标题颜色（0x9F8052）
+///VIP特权未点亮标题颜色（0x9F8052）
 + (UIColor *)noContainTitleTextColor {
     return UIColorFromRGB(0x9F8052);
 }
 
-///贵族特权未点亮短描述颜色（0x8B7245）
+///VIP特权未点亮短描述颜色（0x8B7245）
 + (UIColor *)noContainDescTextColor {
     return UIColorFromRGB(0x8B7245);
 }
 
-///贵族设置背景颜色（0x232017）
+///VIP设置背景颜色（0x232017）
 + (UIColor *)nobleSettingBgColor {
     return UIColorFromRGB(0x232017);
 }

YuMi/Modules/YMMine/View/Noble/View/XPNobleCenterListViewController.h

@@ -20,7 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) BOOL isCurrentLevel;
 ///当前权力值
 @property (nonatomic, assign) NSInteger currentScore;
-///当前用户是否开通了贵族
+///当前用户是否开通了VIP
 @property (nonatomic, assign) BOOL isOpenNoble;
 
 @end

YuMi/Modules/YMMine/View/Noble/View/XPNobleCenterViewController.m

@@ -66,12 +66,12 @@
 @property (nonatomic, strong) NobleCenterModel *model;
 ///用户信息
 @property (nonatomic, strong) UserInfoModel *userInfo;
-///开通贵族
+///开通VIP
 @property (nonatomic, strong) UILabel *openNobleButton;
 ///
 @property (nonatomic,strong) UIImageView *openNobleView;
 @property (nonatomic,strong) UIImageView *openNobleIconView;
-///当前用户贵族信息-开通了贵族才显示
+///当前用户VIP信息-开通了VIP才显示
 @property (nonatomic, strong) XPNobleCenterMyNobleView *myNobleView;
 ///更新用户信息
 @property (nonatomic, assign) BOOL needUpdateUserInfo;
@@ -259,7 +259,7 @@
         }];
     }
 }
-///请求贵族中心数据
+///请求VIP中心数据
 - (void)requestHttp {
     [self.presenter getUserInfo];
     [self checkTranscationIds];
@@ -396,7 +396,7 @@
     }
 }
 
-///获取贵族充值信息成功
+///获取VIP充值信息成功
 - (void)onGetNobleRechargeDataSuccess:(NSArray *)list {
     self.rechargeList = list;
 }
@@ -618,7 +618,7 @@
                 NSLog(@"json解析失败：%@",err);
                 return;
             }
-            if ([dic[@"first"] intValue] == CustomMessageType_Noble_VIP && [dic[@"second"] intValue] == Custom_Message_Sub_Open_Noble_Success) { // 开通贵族成功
+            if ([dic[@"first"] intValue] == CustomMessageType_Noble_VIP && [dic[@"second"] intValue] == Custom_Message_Sub_Open_Noble_Success) { // 开通VIP成功
                 [self requestHttp];
             }
         }

YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m

@@ -114,7 +114,7 @@
 @property (nonatomic,strong) UILabel *soundPromptView;
 ///录制声音按钮
 @property (nonatomic,strong) UIButton *toSoundBtn;
-///贵族等级icon
+///VIP等级icon
 @property (nonatomic,strong) NetImageView *nobleImageView;
 
 @end

YuMi/Modules/YMMine/View/SubViews/XPMineHeadView.h

@@ -19,7 +19,7 @@ typedef void(^CompletionHandler)(NSMutableAttributedString *);
 - (void)xpMineHeadViewClickFans;
 ///点击了账户中心
 - (void)xpMineHeadViewClickAcount;
-///点击了贵族中心
+///点击了VIP中心
 - (void)xPMineHeadViewCliekNobleCenter;
 @end
 @interface XPMineHeadView : UIView

YuMi/Modules/YMMine/View/SubViews/XPMineHeadView.m

@@ -49,7 +49,7 @@
 @property (nonatomic,strong) XPMineFriendNumberView *fansView;
 ///账户中心
 @property (nonatomic, strong) XPMineAccountView *accountView;
-///贵族中心
+///VIP中心
 @property (nonatomic, strong) XPNobleCenterEntranceView *nobleEntranceView;
 //审核View
 @property (nonatomic,strong) UIImageView *reviewView;
@@ -187,7 +187,7 @@
 		[self.delegate xpMineHeadViewClickAcount];
 	}
 }
-///贵族中心
+///VIP中心
 - (void)tapNobleCenterrecognizer {
     if (self.delegate && [self.delegate respondsToSelector:@selector(xPMineHeadViewCliekNobleCenter)]) {
         [self.delegate xPMineHeadViewCliekNobleCenter];

YuMi/Modules/YMMine/View/XPMineViewController.m

@@ -526,7 +526,7 @@ UIKIT_EXTERN NSString *kRequestRicket;
 	[self pushViewControllerWithType:XPMineItemType_Account functionItem:nil];
 }
 
-///点击了贵族中心
+///点击了VIP中心
 - (void)xPMineHeadViewCliekNobleCenter {
 	[StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventvipEntranceMeClick];
 	[StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventusercenter_noble_card_click];
@@ -632,7 +632,7 @@ UIKIT_EXTERN NSString *kRequestRicket;
 - (void)getUserWalletInfoFail{
 
 }
-///获取贵族信息成功
+///获取VIP信息成功
 - (void)getNobleCenterInfoSuccess:(NobleCenterModel *)model  {
     self.headView.nobleInfo = model;
     [self.tableView reloadData];

YuMi/Modules/YMMonents/Model/MonentsInfoModel.h

@@ -51,7 +51,7 @@ typedef NS_ENUM(NSInteger, MonentsContentType) {
 @property (nonatomic,assign) BOOL squareTop;
 ///话题是否置顶
 @property (nonatomic,assign) BOOL topicTop;
-///贵族信息
+///VIP信息
 @property (nonatomic, strong) UserVipInfoVo *userVipInfoVO;
 ///发布的内容
 @property (nonatomic,copy) NSArray<MonentsPicInfoModel *> *dynamicResList;

YuMi/Modules/YMMonents/View/SubViews/XPMonentsUserInfoView.m

@@ -25,7 +25,7 @@
 @property (nonatomic,strong) UIStackView *nickStackView;
 ///头像
 @property (nonatomic,strong) NetImageView *avatarImageView;
-///贵族
+///VIP
 @property (nonatomic, strong) NetImageView *nobleImageView;
 ///昵称
 @property (nonatomic,strong) UILabel *nickLabel;

YuMi/Modules/YMRoom/Presenter/XPRoomPresenter.m

@@ -170,7 +170,7 @@
 	[[XPGiftStorage shareStorage] getGiftDatasource:roomUid];
 	[Api requestNormalGiftList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) {
         NSArray *luckyBagGift = [GiftInfoModel modelsWithArray:data.data[@"luckyBagGift"]];   // 福袋礼物
-        NSArray *vipGift = [GiftInfoModel modelsWithArray:data.data[@"vipGift"]];            // 贵族礼物
+        NSArray *vipGift = [GiftInfoModel modelsWithArray:data.data[@"vipGift"]];            // VIP礼物
         NSArray *luckyPoolGift = [GiftInfoModel modelsWithArray:data.data[@"luckyPoolGift"]];// 福袋奖池礼物
         NSArray *normalGift = [GiftInfoModel modelsWithArray:data.data[@"normalGift"]];      // 普通面板礼物
         NSArray *weekStarGift = [GiftInfoModel modelsWithArray:data.data[@"weekStarGift"]];  // 周星礼物

YuMi/Modules/YMRoom/View/AnchorCycleView/AnchorRoomSrollTipView.m

@@ -63,7 +63,7 @@
     [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerX.mas_equalTo(self);
         make.top.mas_equalTo(self.tipImageView.mas_bottom).mas_offset(46);
-        make.left.right.mas_equalTo(0);
+        make.left.right.equalTo(self).inset(10);
     }];
 }
 
@@ -88,6 +88,7 @@
     if (!_titleLabel) {
         _titleLabel = [[UILabel alloc] init];
         _titleLabel.text = YMLocalizedString(@"AnchorRoomSrollTipView0");
+        _titleLabel.adjustsFontSizeToFitWidth = YES;
         _titleLabel.font = [UIFont systemFontOfSize:20];
         _titleLabel.textColor = [UIColor whiteColor];
         _titleLabel.textAlignment = NSTextAlignmentCenter;

YuMi/Modules/YMRoom/View/AnimationView/Model/PIBaseAnimationViewModel.h

@@ -9,7 +9,7 @@
 typedef enum : NSUInteger {
     GiftBannerType_Lucky,///福袋
     GiftBannerType_Love,///寻爱之旅
-    GiftBannerType_Nobleman,///贵族
+    GiftBannerType_Nobleman,///VIP
     GiftBannerType_kitchen,///厨房
     GiftBannerType_AnchorHour,///个播小时榜
     GiftBannerType_LicneseHour,///牌照房小时榜

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

@@ -241,7 +241,7 @@
         AttachmentModel *attachment = [AttachmentModel modelWithJSON:msgDictionary[@"body"]];
         if (attachment.first == CustomMessageType_Gift && attachment.second == Custom_Message_Sub_Gift_ChannelNotify){///广播 全服礼物飘屏
             [self receiveBroadcastGift:attachment];
-        } else if (attachment.first == CustomMessageType_Noble_VIP && attachment.second == Custom_Message_Sub_Room_Noble_LevelUp_Suspend) {///贵族升级全服飘屏
+        } else if (attachment.first == CustomMessageType_Noble_VIP && attachment.second == Custom_Message_Sub_Room_Noble_LevelUp_Suspend) {///VIP升级全服飘屏
             [self receiveNobleLevelUp:attachment];
         }else if(attachment.first == CustomMessageType_LuckyBag && attachment.second == Custom_Message_Sub_Room_Gift_LuckBag_FullScree){
             [self receiveLuckyGiftBigPrize:attachment];
@@ -1218,7 +1218,7 @@
     [sailingView pop_addAnimation:springAnimation forKey:@"candyTreespingOutAnimation"];
 }
 
-#pragma mark - 贵族升级
+#pragma mark - VIP升级
 - (void)receiveNobleLevelUp:(AttachmentModel *)attachment {
     [[NetImageView new]loadImageWithUrl:attachment.data[@"avatar"] completion:^(UIImage * _Nonnull image, NSURL * _Nonnull url) {
         PIBaseAnimationViewModel *nobleModel = [PIBaseAnimationViewModel new];

YuMi/Modules/YMRoom/View/AnimationView/XPRoomNobleLevelUpView.h

@@ -13,7 +13,7 @@ typedef void(^CompletionBlock)(void);
 
 @interface XPRoomNobleLevelUpView : UIView
 
-///贵族升级的信息
+///VIP升级的信息
 @property (nonatomic,copy) NSDictionary * nobleInfo;
 @property(nonatomic,copy) CompletionBlock completionBlock;
 @end

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

@@ -19,7 +19,7 @@
 ///动画管理类
 @property (strong, nonatomic) SVGAParser *parser;
 
-///贵族特效
+///VIP特效
 @property (nonatomic,strong) SVGAImageView *nobleView;
 
 

YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomAnchorRankEnterView.m

@@ -56,7 +56,8 @@
     }];
     [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerY.mas_equalTo(self);
-        make.left.mas_equalTo(self.iconImageView.mas_right).mas_offset(4);
+        make.leading.mas_equalTo(self.iconImageView.mas_trailing).mas_offset(4);
+        make.trailing.mas_equalTo(-kGetScaleWidth(0));
     }];
     [self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.width.height.mas_equalTo(22);
@@ -88,8 +89,10 @@
     if (_titleLabel == nil) {
         _titleLabel = [[UILabel alloc] init];
         _titleLabel.textColor = UIColor.whiteColor;
-        _titleLabel.font = [UIFont systemFontOfSize:10 weight:UIFontWeightMedium];
+        _titleLabel.font = [UIFont systemFontOfSize:9 weight:UIFontWeightMedium];
         _titleLabel.text = YMLocalizedString(@"XPRoomAnchorRankEnterView0");
+        _titleLabel.numberOfLines = 2;
+      
     }
     return _titleLabel;
 }

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

@@ -1481,7 +1481,7 @@
     self.delegate.getRoomInfo.winUid = nil;
     self.delegate.getRoomInfo.pkMatchStartTime = nil;
 }
-#pragma mark - 房间贵族小喇叭
+#pragma mark - 房间VIP小喇叭
 - (void)handleTrumpet:(AttachmentModel *)attachment {
     if (self.trumpetQueue.count) {
         [self.trumpetQueue addObject:attachment.data];
@@ -1597,7 +1597,7 @@
 			[self.hourRankEntranceView mas_makeConstraints:^(MASConstraintMaker *make) {
 				make.left.mas_equalTo(15);
 				make.centerY.mas_equalTo(self.contributeEnterView);
-				make.width.mas_equalTo(61);
+				make.width.mas_equalTo(66);
 				make.height.mas_equalTo(22);
 			}];
 		}

YuMi/Modules/YMRoom/View/FaceView/Model/RoomFaceInfoModel.h

@@ -38,7 +38,7 @@ typedef NS_ENUM(NSInteger, FaceDisplayType) {
 @property (nonatomic, assign) NSInteger iconPos;
 ///是否是幸运表情
 @property (nonatomic,assign) BOOL isLuckFace;
-///是否是贵族表情
+///是否是VIP表情
 @property (nonatomic,assign) BOOL isNobleFace;
 ///表情的名字
 @property (nonatomic,copy) NSString *name;

YuMi/Modules/YMRoom/View/FaceView/Model/RoomFaceTitleItemModel.h

@@ -11,7 +11,7 @@ NS_ASSUME_NONNULL_BEGIN
 typedef NS_ENUM(NSInteger, RoomFaceTitleItemType) {
 	///普通的表情
 	RoomFaceTitleItemType_Normal = 1,
-	///贵族表情
+	///VIP表情
 	RoomFaceTitleItemType_Nobel,
 };
 

YuMi/Modules/YMRoom/View/FaceView/View/Cell/XPRoomFaceCollectionViewCell.h

@@ -10,7 +10,7 @@
 NS_ASSUME_NONNULL_BEGIN
 @class RoomFaceInfoModel;
 @interface XPRoomFaceCollectionViewCell : UICollectionViewCell
-///贵族的等级
+///VIP的等级
 @property (nonatomic,assign) NSInteger vipLevel;
 ///表情信息
 @property (nonatomic,strong) RoomFaceInfoModel *faceInfo;

YuMi/Modules/YMRoom/View/FaceView/View/Cell/XPRoomFaceCollectionViewCell.m

@@ -19,9 +19,9 @@
 @property (nonatomic,strong) UIImageView *faceImageView;
 ///表情的标题
 @property (nonatomic,strong) UILabel *faceTitleLabel;
-///贵族的类型
+///VIP的类型
 @property (nonatomic,strong) NetImageView *nobleTypeImageView;
-///是否是贵族🔐
+///是否是VIP🔐
 @property (nonatomic,strong) UIImageView *nobleLockImageView;
 ///覆盖的背景
 @property (nonatomic,strong) UIView * coverView;

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

@@ -41,7 +41,7 @@
 @property (nonatomic,strong) UIStackView *titleStackView;
 ///列表
 @property (nonatomic,strong) UICollectionView *titleCollectionView;
-///贵族特权
+///VIP特权
 @property (nonatomic,strong) UIButton *noblePrivilButton;
 ///列表
 @property (nonatomic,strong) UICollectionView *faceCollectionView;
@@ -53,7 +53,7 @@
 @property (nonatomic,strong) RoomFaceTitleItemModel *selectTitleItem;
 ///表情
 @property (nonatomic,strong) NSArray<RoomFaceInfoModel *> *faceList;
-///贵族表情
+///VIP表情
 @property (nonatomic,strong) NSArray<RoomFaceInfoModel *> *nobelFaceList;
 ///用户信息
 @property (nonatomic,strong) UserInfoModel *userInfo;
@@ -244,7 +244,7 @@
 - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath {
 	if (collectionView == self.titleCollectionView) {
 		RoomFaceTitleItemModel * itemModel = [self.titleList safeObjectAtIndex1:indexPath.row];
-	     CGSize size = [itemModel.title boundingRectWithSize:CGSizeMake(100, CGFLOAT_MAX) options:NSStringDrawingUsesFontLeading | NSStringDrawingTruncatesLastVisibleLine
+	     CGSize size = [itemModel.title boundingRectWithSize:CGSizeMake(120, CGFLOAT_MAX) options:NSStringDrawingUsesFontLeading | NSStringDrawingTruncatesLastVisibleLine
 												  attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:13]} context:nil].size;
 		return CGSizeMake(size.width + 10, size.height);
 	}

YuMi/Modules/YMRoom/View/LittleGame/View/XPRoomLittleGameContainerView.m

@@ -117,17 +117,17 @@
 			NSLog(@"用户ID：%@，房间ID：%@, 游戏ID：%lld, code:%@", userId, roomId, self.currentmgId, self.code);
 //
             
-            NSString *language = [NSLocale preferredLanguages].firstObject;
+            NSString *language = [NSBundle getLanguageText];
            if ([language hasPrefix:@"zh"]) {
-                if ([language rangeOfString:@"Hans"].location != NSNotFound) {
+               if ([language rangeOfString:@"Hans"].location != NSNotFound) {
-                    language = @"zh-Hans"; // 简体中文
+                   language = @"zh-CN"; // 简体中文
-                } else {
+               } else {
-                    language = @"zh-Hant"; // 繁體中文
+                   language = @"zh-TW"; // 繁體中文
-                }
+               }
            }else{
-               language = @"zh-Hant"; // 繁體中文
+               language = @"en-US"; // 英文
            }
-            self.fsmAPP2MG = [SudMGP loadMG:userId roomId:roomId code:self.code mgId:self.currentmgId language:[language isEqualToString:@"zh-Hant"]? @"zh-TW" :  @"zh-CN" fsmMG:self rootView:self];
+            self.fsmAPP2MG = [SudMGP loadMG:userId roomId:roomId code:self.code mgId:self.currentmgId language:language fsmMG:self rootView:self];
 		} else {
 			/// 初始化失败, 可根据业务重试
 			NSLog(@"ISudFSMMG:initGameSDKWithAppID:初始化sdk失败 :%@",retMsg);

YuMi/Modules/YMRoom/View/MenuContainerView/Model/XPRoomMenuItem.h

@@ -18,7 +18,7 @@ typedef NS_ENUM(NSInteger, XPRoomMenuItemType) {
     XPRoomMenuItemType_More,///更多
     XPRoomMenuItemType_ArrangeMic,///排麦
     XPRoomMenuItemType_Gift,///礼物
-    XPRoomMenuItemType_Noble,///贵族
+    XPRoomMenuItemType_Noble,///VIP
 };
 
 @interface XPRoomMenuItem : NSObject

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

@@ -54,7 +54,7 @@
 @property (nonatomic,strong) UIButton *giftButton;
 ///排麦
 @property (nonatomic,strong) UIButton *arrangeMicButton;
-///贵族
+///VIP
 @property (nonatomic,strong) UIButton *nobleButton;
 ///输入框
 @property (nonatomic,strong) XPRoomSendTextView *inputTextView;
@@ -249,7 +249,7 @@
     }];
   
     [self.inputButton  mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.size.mas_equalTo(CGSizeMake(95, 32));
+        make.size.mas_equalTo(CGSizeMake(100, 32));
     }];
     
     [self.giftButton mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -460,7 +460,7 @@
         _inputButton = [UIButton buttonWithType:UIButtonTypeCustom];
         [_inputButton setTitle:YMLocalizedString(@"XPRoomMenuContainerView2") forState:UIControlStateNormal];
         [_inputButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
-        _inputButton.titleLabel.font = [UIFont systemFontOfSize:12];
+        _inputButton.titleLabel.font = [UIFont systemFontOfSize:11];
         _inputButton.titleLabel.numberOfLines = 2;
         _inputButton.layer.masksToBounds = YES;
         _inputButton.layer.cornerRadius = 15;

YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageRemoteExtModel.h

@@ -13,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface XPMessageRemoteExtModel : PIBaseModel
 @property (nonatomic , strong) UserLevelVo              * userLevelVo;
-///贵族信息
+///VIP信息
 @property (nonatomic, strong) UserVipInfoVo *userVipInfoVO;
 ///魅力等级
 @property (nonatomic,copy) NSString *charmUrl;
@@ -41,7 +41,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic,copy) NSString *inRoomNameplatePic;
 ///铭牌的字
 @property (nonatomic,copy) NSString *inRoomNameplateWord;
-///贵族icon
+///VIPicon
 @property (nonatomic, copy) NSString *vipIcon;
 ///安卓房间公屏气泡
 @property (nonatomic, copy) NSString *androidBubbleUrl;

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

@@ -133,9 +133,9 @@
 		return [self createCollectRoomAttribute:attachment messageInfo:messageInfo];
 	} else if(first == CustomMessageType_RoomPlay_Dating) {
 		return [self createRoomDatingAttribute:attachment messageInfo:messageInfo];
-	} else if (first == CustomMessageType_Noble_VIP) {//贵族
+	} else if (first == CustomMessageType_Noble_VIP) {//VIP
         return [self createNobleLevelAttribute:attachment messageInfo:messageInfo];
-    } else if (first == CustomMessageType_Face) {//贵族
+    } else if (first == CustomMessageType_Face) {//VIP
 		return [self createRoomFaceAttribute:attachment messageInfo:messageInfo];
     } else if (first == CustomMessageType_Tarot) {//塔罗
         return [self createTarotAttribute:attachment messageInfo:messageInfo];
@@ -208,7 +208,7 @@
 			[attribute appendAttributedString:[self createLanguageImageAttribute:@"common_super_admin"]];
 		}
 
-		if (model.vipIcon) {//贵族icon
+		if (model.vipIcon) {//VIPicon
 			[attribute appendAttributedString:[self createUrlImageAttribute:model.vipIcon]];
 			[attribute appendAttributedString:[self createSapceAttribute:2]];
 		}
@@ -309,7 +309,7 @@
 					[attribute appendAttributedString:[self createSapceAttribute:2]];
 				}
 
-				if (extModel.vipIcon.length > 0) {//贵族icon
+				if (extModel.vipIcon.length > 0) {//VIPicon
 					[attribute appendAttributedString:[self createUrlImageAttribute:extModel.vipIcon]];
 					[attribute appendAttributedString:[self createSapceAttribute:2]];
 				}
@@ -925,7 +925,7 @@
 	return messageInfo;
 }
 
-#pragma mark - 贵族
+#pragma mark - VIP
 - (XPMessageInfoModel *)createNobleLevelAttribute:(AttachmentModel *)attachment messageInfo:(XPMessageInfoModel *)messageInfo{
     NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] init];
     NSInteger uid = 0;
@@ -934,13 +934,13 @@
     } else if ([attachment.data[@"uid"] isKindOfClass:[NSString class]]) {
         uid = ((NSString *)attachment.data[@"uid"]).integerValue;
     }
-    if (attachment.second == Custom_Message_Sub_Room_Open_Noble_VIP) {/// 开通贵族房内消息 851
+    if (attachment.second == Custom_Message_Sub_Room_Open_Noble_VIP) {/// 开通VIP房内消息 851
         [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser80") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]];
         [attribute appendAttributedString:[self createTextAttribute:[NSString stringWithFormat:@"%@(%@)", attachment.data[@"nick"], attachment.data[@"erbanNo"]] color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]];
         [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser81") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]];
         [attribute appendAttributedString:[self createTextAttribute:attachment.data[@"currVipName"] color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]];
         [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser82") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]];
-    } else if (attachment.second == Custom_Message_Sub_Room_Noble_LevelUp || attachment.second == Custom_Message_Sub_AllRoom_Noble_LevelUp_Suspend) {///贵族升级
+    } else if (attachment.second == Custom_Message_Sub_Room_Noble_LevelUp || attachment.second == Custom_Message_Sub_AllRoom_Noble_LevelUp_Suspend) {///VIP升级
         [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser83") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]];
         [attribute appendAttributedString:[self createTextAttribute:attachment.data[@"nick"] color:[DJDKMIMOMColor messageNickColor] font:kRoomMessageDefalutFont]];
         [attribute appendAttributedString:[self createTextAttribute:YMLocalizedString(@"XPRoomMessageParser84") color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]];

YuMi/Modules/YMRoom/View/MoreView/Api/Api+MoreMenu.h

@@ -54,7 +54,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param type 房间类型
 + (void)roomRadioGetMsg:(HttpRequestHelperCompletion)completion roomType:(NSString *)type;
 
-/// 获取房间贵族小喇叭
+/// 获取房间VIP小喇叭
 /// @param completion 完成
 /// @param roomUid 房主的uid
 + (void)getUserVipRoomTrumpet:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid;

YuMi/Modules/YMRoom/View/MoreView/Api/Api+MoreMenu.m

@@ -76,7 +76,7 @@
     [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, type, nil];
 }
 
-/// 获取房间贵族小喇叭
+/// 获取房间VIP小喇叭
 /// @param completion 完成
 + (void)getUserVipRoomTrumpet:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid {
 	NSString * fang = [NSString stringFromBase64String:@"dmlwL2dldFVzZXJWaXBSb29tSG9ybg=="];///vip/getUserVipRoomHorn

YuMi/Modules/YMRoom/View/MoreView/Presenter/XPMoreMenuPresenter.h

@@ -38,7 +38,7 @@ NS_ASSUME_NONNULL_BEGIN
 ///获取房间广播模板内容
 /// @param type 房间类型
 - (void)getRoomRadioMessageListWithType:(NSString *)type;
-/// 获取房间贵族小喇叭信息
+/// 获取房间VIP小喇叭信息
 - (void)getRoomgetUserVipRoomTrumpet:(NSString *)roomUid;
 ///结束个播跨房PK
 - (void)requestFinishAnchorPK:(NSString *)roundId;

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

@@ -269,7 +269,7 @@
         [[self getView] getReleaseRadioSuccess:model];
     }] roomType:type];
 }
-/// 获取房间贵族小喇叭信息
+/// 获取房间VIP小喇叭信息
 - (void)getRoomgetUserVipRoomTrumpet:(NSString *)roomUid {
     [Api getUserVipRoomTrumpet:[self createHttpCompletion:^(BaseModel * _Nonnull data) {
         XPNobleTrumpetModel *model = [XPNobleTrumpetModel modelWithJSON:data.data];

YuMi/Modules/YMRoom/View/MoreView/Protocol/XPMoreMenuProtocol.h

@@ -26,7 +26,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)closeRoomDatingSuccess;
 ///获取房间广播信息成功
 - (void)getReleaseRadioSuccess:(XPReleaseRadioModel *)model;
-///获取房间贵族喇叭成功
+///获取房间VIP喇叭成功
 - (void)getTrumpetSuccess:(XPNobleTrumpetModel *)model;
 ///结束个播跨房PK回调
 - (void)endAnchorPkSuccess:(BOOL)success msg:(NSString *)msg;

YuMi/Modules/YMRoom/View/MoreView/View/Cell/XPRoomMoreMenuCollectionViewCell.m

@@ -73,6 +73,7 @@
 		_titleLabel.textAlignment = NSTextAlignmentCenter;
 		_titleLabel.font = [UIFont systemFontOfSize:10];
 		_titleLabel.textColor = [DJDKMIMOMColor mainTextColor];
+        _titleLabel.numberOfLines = 2;
 	}
 	return _titleLabel;
 }

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

@@ -195,7 +195,7 @@ UIKIT_EXTERN NSString * const kRoomGiftEffectUpdateNotificationKey;
 	releaseRadioVC.modalPresentationStyle = UIModalPresentationOverFullScreen;
 	[self.hostDelegate.getCurrentNav presentViewController:releaseRadioVC animated:YES completion:nil];
 }
-///获取房间贵族小喇叭
+///获取房间VIP小喇叭
 - (void)getTrumpetSuccess:(XPNobleTrumpetModel *)model {
     [self dismissViewControllerAnimated:YES completion:nil];
     XPRoomTrumpetViewController * trumpetVC = [[XPRoomTrumpetViewController alloc] initWithDelegate:self.hostDelegate];

YuMi/Modules/YMRoom/View/NobleTrumpet/Api/Api+RoomTrumpet.h

@@ -11,7 +11,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface Api (RoomTrumpet)
 
-// 发送贵族小喇叭消息
+// 发送VIP小喇叭消息
 + (void)sendRoomTrumpet:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid content:(NSString *)content;
 
 @end

YuMi/Modules/YMRoom/View/NobleTrumpet/Api/Api+RoomTrumpet.m

@@ -9,7 +9,7 @@
 
 @implementation Api (RoomTrumpet)
 
-// 发送贵族小喇叭消息
+// 发送VIP小喇叭消息
 + (void)sendRoomTrumpet:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid content:(NSString *)content {
     [self makeRequest:@"vip/sendRoomHorn" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, roomUid, content, nil];
 }

YuMi/Modules/YMRoom/View/NobleTrumpet/View/XPRoomTrumpetView.m

@@ -22,7 +22,7 @@
 @property (nonatomic, strong) UIImageView *backView;
 ///头像
 @property (nonatomic,strong) NetImageView *avatarImageView;
-///贵族勋章
+///VIP勋章
 @property (nonatomic,strong) NetImageView *nobleImageView;
 ///昵称
 @property (nonatomic, strong) UILabel *nickLabel;

YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/Cell/PIRoomPhotoAlbumChoosePhotoCell.m

@@ -47,8 +47,8 @@
         make.top.mas_equalTo(kGetScaleWidth(17));
     }];
     [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.height.mas_equalTo(kGetScaleWidth(20));
+       
-        make.leading.trailing.equalTo(self.bgImageView);
+        make.leading.trailing.equalTo(self.bgImageView).inset(1);
         make.top.mas_equalTo(kGetScaleWidth(68));
         
     }];
@@ -90,6 +90,7 @@
     if(!_titleView){
         _titleView = [UILabel labelInitWithText:YMLocalizedString(@"PIRoomPhotoAlbumChoosePhotoCell0") font:kFontRegular(10) textColor:UIColorFromRGB(0xB3B3C3)];
         _titleView.textAlignment = NSTextAlignmentCenter;
+        _titleView.numberOfLines = 2;
     }
     return _titleView;
 }

YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumChoosePhotoGiftView.m

@@ -50,6 +50,7 @@
 -(void)installConstraints{
     [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.leading.mas_equalTo(kGetScaleWidth(20));
+        make.width.mas_equalTo(kGetScaleWidth(100));
         make.centerY.equalTo(self);
     }];
     [self.arrowView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -59,6 +60,7 @@
     }];
     [self.tipsView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.trailing.equalTo(self.arrowView.mas_leading).mas_offset(-kGetScaleWidth(6));
+        make.leading.equalTo(self.titleView.mas_trailing).mas_offset(kGetScaleWidth(5));
         make.centerY.equalTo(self);
     }];
     [self.pi_priceView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -118,6 +120,8 @@
 - (UILabel *)tipsView{
     if(!_tipsView){
         _tipsView = [UILabel labelInitWithText:@"" font:kFontRegular(14) textColor:UIColorFromRGB(0xB3B3C3)];
+        _tipsView.numberOfLines = 2;
+        _tipsView.textAlignment = NSTextAlignmentRight;
     }
     return _tipsView;
 }

YuMi/Modules/YMRoom/View/RoomRecommend/SubViews/XPRoomInsideRecommendEmptyCell.m

@@ -36,7 +36,7 @@
 
 - (void)initSubViewConstraints {
     [self.emptyLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.right.mas_equalTo(self.contentView);
+        make.left.right.mas_equalTo(self.contentView).inset(10);
         make.centerY.mas_equalTo(self.contentView);
     }];
 }
@@ -49,6 +49,7 @@
         _emptyLabel.font = [UIFont systemFontOfSize:14];
         _emptyLabel.textAlignment = NSTextAlignmentCenter;
         _emptyLabel.textColor = [UIColor whiteColor];
+        _emptyLabel.numberOfLines = 2;
     }
     return _emptyLabel;
 }

YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftInfoModel.h

@@ -15,7 +15,7 @@ typedef NS_ENUM(NSUInteger, GiftType) {
 	GiftType_Game = 2, // 游戏轰趴礼物
 	GiftType_Lucky = 3, // 福袋礼物
     GiftType_LuckyPool = 5, //福袋奖池礼物
-    GiftType_Noble = 7, // 贵族礼物
+    GiftType_Noble = 7, // VIP礼物
     GiftType_WeekStar = 8, //周星礼物
 	GiftType_Graffiti = 10, //涂鸦礼物
 	GiftType_Anchor = 11,  //个播礼物
@@ -109,7 +109,7 @@ typedef NS_ENUM(NSUInteger, RoomSendGiftType) {
 @property (nonatomic,assign) BOOL isSelected;//是否被选中
 ///礼物来源
 @property (nonatomic,assign) GiftSourceType sourceType;
-///贵族礼物专属信息
+///VIP礼物专属信息
 @property (nonatomic, strong) GiftNobleInfoModel *giftVipInfo;
 
 /*----------周星礼物--------*/

YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftNobleInfoModel.h

@@ -11,11 +11,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface GiftNobleInfoModel : PIBaseModel
 
-///贵族图标
+///VIP图标
 @property (nonatomic, copy)NSString *vipIcon;
-///可用贵族等级
+///可用VIP等级
 @property (nonatomic, assign) NSInteger vipLevel;
-///贵族名称
+///VIP名称
 @property (nonatomic, copy) NSString *vipName;
 
 @end

YuMi/Modules/YMRoom/View/SendGiftView/Presenter/XPGiftPresenter.m

@@ -59,7 +59,7 @@
 	}
         [Api requestNormalGiftList:[self createHttpCompletion:^(BaseModel * _Nonnull data) {
             NSArray *luckyBagGift = [GiftInfoModel modelsWithArray:data.data[@"luckyGift"]];   // 福袋礼物
-            NSArray *vipGift = [GiftInfoModel modelsWithArray:data.data[@"vipGift"]];            // 贵族礼物
+            NSArray *vipGift = [GiftInfoModel modelsWithArray:data.data[@"vipGift"]];            // VIP礼物
             NSArray *luckyPoolGift = [GiftInfoModel modelsWithArray:data.data[@"luckyPoolGift"]];// 福袋奖池礼物
             NSArray *normalGift = [GiftInfoModel modelsWithArray:data.data[@"normalGift"]];      // 普通面板礼物
             NSArray *weekStarGift = [GiftInfoModel modelsWithArray:data.data[@"weekStarGift"]];  // 周星礼物

YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftItemCollectionViewCell.h

@@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface XPGiftItemCollectionViewCell : UICollectionViewCell
 ///
 @property (nonatomic,strong) GiftInfoModel *giftInfo;
-///当前用户贵族等级
+///当前用户VIP等级
 @property (nonatomic, assign) NSInteger curUserNobleLevel;
 ///使用的地方
 @property (nonatomic,assign) SendGiftType usingplaceType;

YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftItemCollectionViewCell.m

@@ -39,9 +39,9 @@
 @property (nonatomic,strong) UIView * coverView;
 ///
 @property (nonatomic,strong) UILabel *giftNumLabel;
-///贵族icon
+///VIPicon
 @property (nonatomic, strong) NetImageView *nobleIconImageView;
-///贵族礼物锁
+///VIP礼物锁
 @property (nonatomic, strong) UIImageView *lockImageView;
 ///超级礼物icon
 @property(nonatomic,strong) UIImageView *superGiftView;

YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftInfoSegmentedView.h

@@ -28,7 +28,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface PIGiftInfoSegmentedView : UIView
 @property(nonatomic,weak) id<PIGiftInfoSegmentedViewDelegate>delegate;
 @property (nonatomic,assign) SendGiftType usingplaceType;
-///普通礼物/幸运礼物/贵族礼物
+///普通礼物/幸运礼物/VIP礼物
 @property (nonatomic,strong) NSArray *normalOriginArray;
 ///背包礼物
 @property (nonatomic,strong) NSArray *packOriginArray;
@@ -36,7 +36,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic,strong) XPFreeGiftModel *freeModel;
 ///免费礼物送完删除了，不能出现在背包，防止数据更新时重新加进来
 @property (nonatomic,assign) BOOL isDelFreeGift;
-///当前用户贵族等级
+///当前用户VIP等级
 @property (nonatomic, assign) NSInteger curUserNobleLevel;
 ///最后一次选中的礼物
 @property (nonatomic,strong,readonly) GiftInfoModel *lastSelectGift;

YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftInfoSegmentedView.m

@@ -39,7 +39,7 @@
 @property (nonatomic,strong)XPGiftInfoView *luckyVC;
 ///周星
 @property (nonatomic,strong)XPGiftInfoView *weekStarVC;
-///贵族
+///VIP
 @property (nonatomic,strong)XPGiftInfoView *nobleVC;
 ///人气
 @property (nonatomic,strong)XPGiftInfoView *anchorVC;
@@ -81,7 +81,7 @@
     [self.packGiftButton mas_makeConstraints:^(MASConstraintMaker *make) {
         make.trailing.mas_equalTo(-15);
         make.centerY.height.mas_equalTo(self.titleView);
-        make.width.mas_equalTo(30);
+        make.width.mas_equalTo(35);
     }];
     [self.totalValueLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.right.mas_equalTo(self.packGiftButton.mas_left).mas_offset(-3);
@@ -329,7 +329,7 @@
         _titleView.defaultSelectedIndex = 0;
         _titleView.cellSpacing = 0;
         _titleView.cellWidthIncrement = 5;
-        _titleView.cellWidth = 30;
+//        _titleView.cellWidth = 30;
         _titleView.listContainer = self.pi_containerView;
       
     }

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

@@ -89,7 +89,7 @@
 		[self.giftCountView mas_makeConstraints:^(MASConstraintMaker *make) {
 			make.right.mas_equalTo(-15);
 			make.bottom.mas_equalTo(self.superview.superview.mas_bottom).offset(-45 -kSafeAreaBottomHeight);
-			make.width.mas_equalTo(135);
+			make.width.mas_equalTo(160);
 		}];
 	}
 	[self updateCountStatus];
@@ -353,13 +353,13 @@
             return;
         }
         NSTextAttachment * addAtt = [[NSTextAttachment alloc] init];
-        UIImage *addIconImage = [UIImage imageNamed:@"exchange_gold_icon"];;
+        UIImage *addIconImage = [UIImage imageNamed:@"pi_gift_diamond_add"];;
         addAtt.bounds = CGRectMake(0, roundf(self.balanceLabel.font.capHeight - 14)/2.f, 14, 14);
         addAtt.image = addIconImage;
         NSAttributedString *addAttribute = [NSMutableAttributedString attributedStringWithAttachment:(NSTextAttachment *)addAtt];
 		
         NSTextAttachment * goldAtt = [[NSTextAttachment alloc] init];
-        UIImage *goldIconImage = [UIImage imageNamed:@"pi_gift_gold"];;
+        UIImage *goldIconImage = [UIImage imageNamed:@"common_diamond"];;
         goldAtt.bounds = CGRectMake(0, roundf(self.balanceLabel.font.capHeight - 14)/2.f, 14, 14);
         goldAtt.image = goldIconImage;
         NSAttributedString *goldAttribute = [NSMutableAttributedString attributedStringWithAttachment:(NSTextAttachment *)goldAtt];