diff --git a/YuMi.xcodeproj/project.pbxproj b/YuMi.xcodeproj/project.pbxproj index 76ba50c6..eb561d5c 100644 --- a/YuMi.xcodeproj/project.pbxproj +++ b/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 = ""; }; 180116FA279E8CCE00F2CBC0 /* NVDate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NVDate.m; sourceTree = ""; }; 180116FB279E8CCE00F2CBC0 /* NVDate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NVDate.h; sourceTree = ""; }; - 180806D627293794001FD836 /* NSObject+MJExtension.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSObject+MJExtension.h"; sourceTree = ""; }; - 180806D727293794001FD836 /* NSObject+MJExtension.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSObject+MJExtension.m"; sourceTree = ""; }; 180806DA27297269001FD836 /* MicroViewProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MicroViewProtocol.h; sourceTree = ""; }; 180806F827298F9B001FD836 /* RoomGuestDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RoomGuestDelegate.h; sourceTree = ""; }; 180806F92729A354001FD836 /* ThemeColor+Room.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ThemeColor+Room.h"; sourceTree = ""; }; @@ -1968,6 +1966,8 @@ 236BA4972BB6AFED00C7C73A /* PINoblePrivilegeEmptyCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PINoblePrivilegeEmptyCell.m; sourceTree = ""; }; 237700CC2BC697A100D661F1 /* pi_app_logo_new_bg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pi_app_logo_new_bg.png; sourceTree = ""; }; 237700CE2BC697D400D661F1 /* pi_login_new_logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pi_login_new_logo.png; sourceTree = ""; }; + 237700D12BC7CC7C00D661F1 /* NSObject+MJExtension.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSObject+MJExtension.h"; sourceTree = ""; }; + 237700D22BC7CC7C00D661F1 /* NSObject+MJExtension.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSObject+MJExtension.m"; sourceTree = ""; }; 237B94AD2A984DA7007853E3 /* XPTrumpetPresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPTrumpetPresenter.h; sourceTree = ""; }; 237B94AE2A984DA7007853E3 /* XPTrumpetPresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPTrumpetPresenter.m; sourceTree = ""; }; 237B94B02A984DA7007853E3 /* XPRoomTrumpetProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPRoomTrumpetProtocol.h; sourceTree = ""; }; @@ -4882,8 +4882,7 @@ 189DD74D26E21D9000AB55B1 /* GCDHelper */, 189DD74226E21CCC00AB55B1 /* Reachability */, 189DD73626E21C3F00AB55B1 /* YYUtility */, - 180806D627293794001FD836 /* NSObject+MJExtension.h */, - 180806D727293794001FD836 /* NSObject+MJExtension.m */, + 237700D02BC7CC7C00D661F1 /* MJExtension */, ); path = Tools; sourceTree = ""; @@ -5549,6 +5548,15 @@ path = Api; sourceTree = ""; }; + 237700D02BC7CC7C00D661F1 /* MJExtension */ = { + isa = PBXGroup; + children = ( + 237700D12BC7CC7C00D661F1 /* NSObject+MJExtension.h */, + 237700D22BC7CC7C00D661F1 /* NSObject+MJExtension.m */, + ); + path = MJExtension; + sourceTree = ""; + }; 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 */, diff --git a/YuMi/Assets.xcassets/Login/ms_login_choose_phone_icon.imageset/Contents.json b/YuMi/Assets.xcassets/Login/ms_login_choose_phone_icon.imageset/Contents.json new file mode 100644 index 00000000..f125998b --- /dev/null +++ b/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 + } +} diff --git a/YuMi/Assets.xcassets/Login/ms_login_choose_phone_icon.imageset/ms_login_choose_phone_icon@2x.png b/YuMi/Assets.xcassets/Login/ms_login_choose_phone_icon.imageset/ms_login_choose_phone_icon@2x.png new file mode 100644 index 00000000..67ac396a Binary files /dev/null and b/YuMi/Assets.xcassets/Login/ms_login_choose_phone_icon.imageset/ms_login_choose_phone_icon@2x.png differ diff --git a/YuMi/Assets.xcassets/Login/ms_login_choose_phone_icon.imageset/ms_login_choose_phone_icon@3x.png b/YuMi/Assets.xcassets/Login/ms_login_choose_phone_icon.imageset/ms_login_choose_phone_icon@3x.png new file mode 100644 index 00000000..d3f122fb Binary files /dev/null and b/YuMi/Assets.xcassets/Login/ms_login_choose_phone_icon.imageset/ms_login_choose_phone_icon@3x.png differ diff --git a/YuMi/CustomUI/InputView/InputView/QinputPhotoView.m b/YuMi/CustomUI/InputView/InputView/QinputPhotoView.m index 065c8e5e..d1adc45b 100644 --- a/YuMi/CustomUI/InputView/InputView/QinputPhotoView.m +++ b/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); }]; diff --git a/YuMi/Global/YUMIHtmlUrl.h b/YuMi/Global/YUMIHtmlUrl.h index b50a063a..c2a3a6f5 100644 --- a/YuMi/Global/YUMIHtmlUrl.h +++ b/YuMi/Global/YUMIHtmlUrl.h @@ -44,9 +44,9 @@ typedef NS_ENUM(NSUInteger, URLType) { kHomeRankURL, ///相亲规则介绍 kRoomDatingRule, - ///贵族规则 + ///VIP规则 kNobleRuleURL, - ///贵族排行榜 + ///VIP排行榜 kNobleRankURL, ///用户充值协议 kUserRechargeAgrURL, diff --git a/YuMi/Global/YUMIHtmlUrl.m b/YuMi/Global/YUMIHtmlUrl.m index b9f3286c..a5c2d099 100644 --- a/YuMi/Global/YUMIHtmlUrl.m +++ b/YuMi/Global/YUMIHtmlUrl.m @@ -12,24 +12,17 @@ @implementation YUMIHtmlUrl NSString * const URLWithType(URLType type) { - NSString * prefix = @"p"; - prefix = [NSString stringWithFormat:@"%@e",prefix]; - prefix = [NSString stringWithFormat:@"%@k",prefix]; - prefix = [NSString stringWithFormat:@"%@o",prefix]; - - - - - NSDictionary *newDic = @{ - @(kTreasureTicketBuyURL) : @"modules/act-treasureSnatching/index.html",///夺宝购买 - @(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 * prefix = @"molistar"; + NSDictionary *newDic = @{ + @(kTreasureTicketBuyURL) : @"modules/act-treasureSnatching/index.html",///夺宝购买 + @(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 - @(kIdentityURL) : @"EQtrsRlCX2+rJN89+qyAT6JtfEnprTylInFU0tTPyLA=",//实人认证 modules/identity/new.html - @(kGameBindAccountURL) : @"5s9YWzw5Lt6ro86UN4pUFETAyuCsIL3wl00gLK5rCek=",///绑定账号 modules/game/bindAccount.html - @(kNurseryURL) : @"ZT1/YWK/T7gXs1rGDAYnbqG0OrzjhPKJfaebh80/1ro=",///护苗计划 activity/cleanNet/index.html - @(kRechargePrivacyURL) : @"boJayVmf9bj+vVXabUop2cc110U9LaDdAJhHfbinDzXLhlBtiv3h7J6Sivv3v1Lr",//充值协议 modules/rule/rechargeAgreement.html - @(kReportRoomURL) : @"TbIA4vIU9O5Z/RGJKEELZNe7SFzF9ig/Lvo6D1upv/g=",///举报房间 - @(kShareRoomURL) : @"k+TyUH/PriZr4MWmS/rq8BUYAu34MX3ZyAZsDLF0Eck=",///分享房间 modules/share_room/index.html - @(kCandyTreeURL) : @"uGP8LbEVEzTWPSSD357NnkHsXf118dGp9qeZO+8idY4=",///参加糖果树 activity/explore/index.html - @(kCandyTreeRecordURL) : @"V6XAvR9DZVl5TTczQ/JABDNKGpFSnSP/r6WLbu91uPKWKlwVlmlYvkETALeLk7Jz",///糖果树记录 modules/rank/index.html#/newWishingWellRecord - @(kRoomCharmRankURL) : @"a5qVnItWuLLh148cl8R/+VuVNfOSOd1nzVzfSFbAxUA=",//房间魅力榜 modules/charm/index.html - @(kRoomRankURL) : @"DqPWO/9EdbpkGl4PoRVQy4+hE8o8EuE30v2vN/yeZFg=", //房间榜 modules/room_rank/index.html + @(kFAQURL) : @"k/Bqnh8nGkuhV8KhU6xN5a8EkxEQrbDMAWNBtaAdJCo=",//常见问题 modules/rule/guide.html + @(kIdentityURL) : @"EQtrsRlCX2+rJN89+qyAT6JtfEnprTylInFU0tTPyLA=",//实人认证 modules/identity/new.html + @(kGameBindAccountURL) : @"5s9YWzw5Lt6ro86UN4pUFETAyuCsIL3wl00gLK5rCek=",///绑定账号 modules/game/bindAccount.html + @(kNurseryURL) : @"ZT1/YWK/T7gXs1rGDAYnbqG0OrzjhPKJfaebh80/1ro=",///护苗计划 activity/cleanNet/index.html + @(kRechargePrivacyURL) : @"boJayVmf9bj+vVXabUop2cc110U9LaDdAJhHfbinDzXLhlBtiv3h7J6Sivv3v1Lr",//充值协议 modules/rule/rechargeAgreement.html + @(kReportRoomURL) : @"TbIA4vIU9O5Z/RGJKEELZNe7SFzF9ig/Lvo6D1upv/g=",///举报房间 + @(kShareRoomURL) : @"k+TyUH/PriZr4MWmS/rq8BUYAu34MX3ZyAZsDLF0Eck=",///分享房间 modules/share_room/index.html + @(kCandyTreeURL) : @"uGP8LbEVEzTWPSSD357NnkHsXf118dGp9qeZO+8idY4=",///参加糖果树 activity/explore/index.html + @(kCandyTreeRecordURL) : @"V6XAvR9DZVl5TTczQ/JABDNKGpFSnSP/r6WLbu91uPKWKlwVlmlYvkETALeLk7Jz",///糖果树记录 modules/rank/index.html#/newWishingWellRecord + @(kRoomCharmRankURL) : @"a5qVnItWuLLh148cl8R/+VuVNfOSOd1nzVzfSFbAxUA=",//房间魅力榜 modules/charm/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 - @(kHomeRankURL) : @"V6XAvR9DZVl5TTczQ/JABNoH8I7E1sQ4oZmqs01zOfc=", // 排行榜 modules/rank/index.html#/rank - @(kRoomDatingRule) : @"BbMeRujqQH/yCud2VyM4tZMYe8oHwrQCEcP50kTTxgQ=",//相亲玩法 modules/rule/dating.html - @(kNobleRuleURL) : @"4x4Blbka3DFMAyZGSVqxAp0jXvE4/JUx48YfowufzircU1vr/Du8GqrouZUzD9Uq", // 贵族规则 modules/rule/introduction-patrician.html - - @(kUserRechargeAgrURL) : @"boJayVmf9bj+vVXabUop2cc110U9LaDdAJhHfbinDzXLhlBtiv3h7J6Sivv3v1Lr", ///用户充值协议 - @(kUserRegiServiceAgrURL): @"0sBhBaRqf7oBlYvNK4azCrVPTFjv9FYF0A2v9+qkSxg=",//用户注册服务协议 modules/rule/protocol.html - @(kLiveServiceAgrURL) : @"83qLuhoOlxXOw3gwkchLAnb0iz5PEjqOS5dKRRzIxVw=", ///直播服务协议 modules/rule/live-protocol.html - @(kCommunitySpecURL) : @"oZs0ygpb9qtOkpZG1zcj1qS3fx0xzBArL1h358e1NM3hbbSU8qTOBmxkpJ03iq+K", ///社区规范 modules/rule/community-norms.html - @(kAccountlogoutAgrURL) : @"8pzk0dLk9GPSIKjn894dHtmPvxfIJTkUYNP5qTE7GzYpYAG7LWwF1pK7NWb4E0D9", ///账号注销协议 + @(kUserLevelURL) : @"NE+tamYZsEj7S9BySlTpcCyRDMdxsWDzm6KrZTs9Lbo=",//我的等级 modules/level/index.html + @(kHomeRankURL) : @"V6XAvR9DZVl5TTczQ/JABNoH8I7E1sQ4oZmqs01zOfc=", // 排行榜 modules/rank/index.html#/rank + @(kRoomDatingRule) : @"BbMeRujqQH/yCud2VyM4tZMYe8oHwrQCEcP50kTTxgQ=",//相亲玩法 modules/rule/dating.html + @(kNobleRuleURL) : @"4x4Blbka3DFMAyZGSVqxAp0jXvE4/JUx48YfowufzircU1vr/Du8GqrouZUzD9Uq", // VIP规则 modules/rule/introduction-patrician.html + + @(kUserRechargeAgrURL) : @"boJayVmf9bj+vVXabUop2cc110U9LaDdAJhHfbinDzXLhlBtiv3h7J6Sivv3v1Lr", ///用户充值协议 + @(kUserRegiServiceAgrURL): @"0sBhBaRqf7oBlYvNK4azCrVPTFjv9FYF0A2v9+qkSxg=",//用户注册服务协议 modules/rule/protocol.html + @(kLiveServiceAgrURL) : @"83qLuhoOlxXOw3gwkchLAnb0iz5PEjqOS5dKRRzIxVw=", ///直播服务协议 modules/rule/live-protocol.html + @(kCommunitySpecURL) : @"oZs0ygpb9qtOkpZG1zcj1qS3fx0xzBArL1h358e1NM3hbbSU8qTOBmxkpJ03iq+K", ///社区规范 modules/rule/community-norms.html + @(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 - @(kLuckyGiftPlayRuleURL) : @"DcADpWwvzNDc5QYX9hmrJDFatpu+zp4ynUPdb+KeBx0+iFBaBI/MRU80MenYMHKQ",///幸运礼物玩法说明 modules/rule/luckyGiftRule.html?giftID=%@ - @(kSailingActivityURL) : @"ZrQv+cP5sXzlvQp0nvUa20JB5cyCS6X8LTGvUroUfxk=", ///航海活动地址 activity/act-sail/more.html - @(kSailingPlayDescdURL) : @"ZrQv+cP5sXzlvQp0nvUa23RXydMeqE8YfwP1J1xHCv3PdHFTlEJiRJ1vhrmu25pu", ///航海玩法规则 activity/act-sail/play_explain.html - @(kSailingRecordURL) : @"ZrQv+cP5sXzlvQp0nvUa2w5kpdXwSP1aQbPEWUi/gPvrXEWTD9m43qlvhznGtWx1", ///航海中奖记录 activity/act-sail/win_record.html - @(kNetworkRenovateURL) : @"vMZOLHkGF9uAzm9Ii2dzmQVhtZPf5IUKeg8H7/5FGcWE3YbMNrK59iMSV91HEHz/",///网络整治乱象 activity/activemodel/index.html?code=ZBGG - @(kMonentsShareURL) : @"s06Uv+UqjOdDhupnk0YpKKnSCSFCZssMEJxKZdf+s0Ge3zIFKv3knVVNr710Y5eF",///分享动态 modules/world/share-page/index.html + @(kLicenseHourRankURL) : @"DqPWO/9EdbpkGl4PoRVQyyMfaOgNqIr7sGIOi+kLkijf1EAcL9tVSblMXjNuq+Qy",///牌照房小时榜礼物 modules/room_rank/hourRankLicense.html + @(kLuckyGiftPlayRuleURL) : @"DcADpWwvzNDc5QYX9hmrJDFatpu+zp4ynUPdb+KeBx0+iFBaBI/MRU80MenYMHKQ",///幸运礼物玩法说明 modules/rule/luckyGiftRule.html?giftID=%@ + @(kSailingActivityURL) : @"ZrQv+cP5sXzlvQp0nvUa20JB5cyCS6X8LTGvUroUfxk=", ///航海活动地址 activity/act-sail/more.html + @(kSailingPlayDescdURL) : @"ZrQv+cP5sXzlvQp0nvUa23RXydMeqE8YfwP1J1xHCv3PdHFTlEJiRJ1vhrmu25pu", ///航海玩法规则 activity/act-sail/play_explain.html + @(kSailingRecordURL) : @"ZrQv+cP5sXzlvQp0nvUa2w5kpdXwSP1aQbPEWUi/gPvrXEWTD9m43qlvhznGtWx1", ///航海中奖记录 activity/act-sail/win_record.html + @(kNetworkRenovateURL) : @"vMZOLHkGF9uAzm9Ii2dzmQVhtZPf5IUKeg8H7/5FGcWE3YbMNrK59iMSV91HEHz/",///网络整治乱象 activity/activemodel/index.html?code=ZBGG + @(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 - @(kMineEarningsRecord) : @"0HJ5o+40NtYGeHo1KRoQE3VdLhFQnvGyqgph9CCLjyU53rS29T2nD7UEh3CpX2BG",///收益记录 - - - }; - NSString * url = [dic objectForKey:@(type)]; - NSString * webUrl = [AESUtils aesDecrypt:url]; - return [NSString stringWithFormat:@"%@/%@",prefix, webUrl]; + @(kXinZuoStarURL) : @"3l3NxeDKO2bNAESpzjZ76mvJa2D26Bgqy+nNusiuH1UHYM+bYk+MM/TNM4VRqk1K",///星座礼物 activity/act-constellation/index.html + @(kMineEarningsRecord) : @"0HJ5o+40NtYGeHo1KRoQE3VdLhFQnvGyqgph9CCLjyU53rS29T2nD7UEh3CpX2BG",///收益记录 + + + }; + NSString * url = [dic objectForKey:@(type)]; + NSString * webUrl = [AESUtils aesDecrypt:url]; + return [NSString stringWithFormat:@"%@/%@",prefix, webUrl]; } @end diff --git a/YuMi/Modules/YMLogin/Presenter/LoginPresenter.h b/YuMi/Modules/YMLogin/Presenter/LoginPresenter.h index dc5c543d..5543f08f 100644 --- a/YuMi/Modules/YMLogin/Presenter/LoginPresenter.h +++ b/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 diff --git a/YuMi/Modules/YMLogin/Presenter/LoginPresenter.m b/YuMi/Modules/YMLogin/Presenter/LoginPresenter.m index e241ce73..edcb977f 100644 --- a/YuMi/Modules/YMLogin/Presenter/LoginPresenter.m +++ b/YuMi/Modules/YMLogin/Presenter/LoginPresenter.m @@ -20,7 +20,7 @@ ///Model #import "ThirdUserInfo.h" #import "AccountModel.h" - +#import "DESEncrypt.h" #import #import #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 diff --git a/YuMi/Modules/YMLogin/Presenter/LoginVerifCodePresent.h b/YuMi/Modules/YMLogin/Presenter/LoginVerifCodePresent.h index b5b28658..c9343df0 100644 --- a/YuMi/Modules/YMLogin/Presenter/LoginVerifCodePresent.h +++ b/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 diff --git a/YuMi/Modules/YMLogin/Protocol/LoginProtocol.h b/YuMi/Modules/YMLogin/Protocol/LoginProtocol.h index 2e52ba2b..50e714cc 100644 --- a/YuMi/Modules/YMLogin/Protocol/LoginProtocol.h +++ b/YuMi/Modules/YMLogin/Protocol/LoginProtocol.h @@ -11,7 +11,14 @@ NS_ASSUME_NONNULL_BEGIN @protocol LoginProtocol +- (void)loginThirdPartSuccess; - (void)loginSuccess; +///请求手机号的验证码成功 +- (void)phoneSmsCodeSuccess; +///手机号登录成功 +- (void)loginWithPhoenSuccess; +///登录失败 +- (void)loginFailWithMsg:(NSString *)msg; @end NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMLogin/View/NewLogin/XPForgetPwdViewController.m b/YuMi/Modules/YMLogin/View/NewLogin/XPForgetPwdViewController.m index 37e41eab..d1dda184 100644 --- a/YuMi/Modules/YMLogin/View/NewLogin/XPForgetPwdViewController.m +++ b/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:@""]; diff --git a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginInputView.h b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginInputView.h index 6a9c6b31..9a753e72 100644 --- a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginInputView.h +++ b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginInputView.h @@ -31,7 +31,7 @@ NS_ASSUME_NONNULL_BEGIN //开启倒计时 - (void)fireTimer; - +-(void)cancelTimer; @end NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginInputView.m b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginInputView.m index b445b58d..7f120229 100644 --- a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginInputView.m +++ b/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 diff --git a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m index 4825b889..5a624c36 100644 --- a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m +++ b/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 () +@interface XPLoginViewController () ///背景 @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)viewWillAppear:(BOOL)animated { - [super viewWillAppear:animated]; - +- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event{ + [self.view endEditing:YES]; } +- (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.height.mas_equalTo(kGetScaleWidth(148)); + make.width.mas_offset(kGetScaleWidth(162)); + 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 diff --git a/YuMi/Modules/YMMessage/Model/AttachmentModel.h b/YuMi/Modules/YMMessage/Model/AttachmentModel.h index 12a269ec..bdcba82a 100644 --- a/YuMi/Modules/YMMessage/Model/AttachmentModel.h +++ b/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, }; diff --git a/YuMi/Modules/YMMessage/Model/SessionContent/ContentSecretaryModel.h b/YuMi/Modules/YMMessage/Model/SessionContent/ContentSecretaryModel.h index 943991c7..ce892b34 100644 --- a/YuMi/Modules/YMMessage/Model/SessionContent/ContentSecretaryModel.h +++ b/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, diff --git a/YuMi/Modules/YMMessage/View/Session/Cell/SessionUserInfoTableViewCell.m b/YuMi/Modules/YMMessage/View/Session/Cell/SessionUserInfoTableViewCell.m index 5ae338ff..e58f3101 100644 --- a/YuMi/Modules/YMMessage/View/Session/Cell/SessionUserInfoTableViewCell.m +++ b/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; diff --git a/YuMi/Modules/YMMessage/View/Session/SessionViewController.m b/YuMi/Modules/YMMessage/View/Session/SessionViewController.m index 52219326..7215d8fa 100644 --- a/YuMi/Modules/YMMessage/View/Session/SessionViewController.m +++ b/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) { diff --git a/YuMi/Modules/YMMessage/View/Session/View/SessionRiskView.m b/YuMi/Modules/YMMessage/View/Session/View/SessionRiskView.m index 96ca88cf..74b88fc2 100644 --- a/YuMi/Modules/YMMessage/View/Session/View/SessionRiskView.m +++ b/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; } diff --git a/YuMi/Modules/YMMine/Model/Friend/FansInfoModel.h b/YuMi/Modules/YMMine/Model/Friend/FansInfoModel.h index e1671571..3c00fc7b 100644 --- a/YuMi/Modules/YMMine/Model/Friend/FansInfoModel.h +++ b/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; diff --git a/YuMi/Modules/YMMine/Model/XPMineItemModel.h b/YuMi/Modules/YMMine/Model/XPMineItemModel.h index 4dfe2f6b..ba5489ca 100644 --- a/YuMi/Modules/YMMine/Model/XPMineItemModel.h +++ b/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, ///收藏房间 diff --git a/YuMi/Modules/YMMine/Presenter/XPMinePresent.h b/YuMi/Modules/YMMine/Presenter/XPMinePresent.h index d400a38d..7c444951 100644 --- a/YuMi/Modules/YMMine/Presenter/XPMinePresent.h +++ b/YuMi/Modules/YMMine/Presenter/XPMinePresent.h @@ -18,7 +18,7 @@ NS_ASSUME_NONNULL_BEGIN /// 获取家族详细的信息 - (void)getClanDetailInfo; -///获取贵族信息 +///获取VIP信息 - (void)getNobleInfo; ///获取个人功能列表 - (void)getPersonItemList ; diff --git a/YuMi/Modules/YMMine/Presenter/XPMinePresent.m b/YuMi/Modules/YMMine/Presenter/XPMinePresent.m index 007c3ea5..2bef27e8 100644 --- a/YuMi/Modules/YMMine/Presenter/XPMinePresent.m +++ b/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]; diff --git a/YuMi/Modules/YMMine/Protocol/XPMineProtocol.h b/YuMi/Modules/YMMine/Protocol/XPMineProtocol.h index ba1fd1a4..20f2f661 100644 --- a/YuMi/Modules/YMMine/Protocol/XPMineProtocol.h +++ b/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 ; diff --git a/YuMi/Modules/YMMine/View/Cell/Friend/XPMineAttentionTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/Friend/XPMineAttentionTableViewCell.m index 899d6c4d..334501d0 100644 --- a/YuMi/Modules/YMMine/View/Cell/Friend/XPMineAttentionTableViewCell.m +++ b/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; diff --git a/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFansTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFansTableViewCell.m index 7a82a112..ce6db809 100644 --- a/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFansTableViewCell.m +++ b/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; diff --git a/YuMi/Modules/YMMine/View/DressUp/Api/Api+DressUp.h b/YuMi/Modules/YMMine/View/DressUp/Api/Api+DressUp.h index 421c246a..fb29a3da 100644 --- a/YuMi/Modules/YMMine/View/DressUp/Api/Api+DressUp.h +++ b/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 diff --git a/YuMi/Modules/YMMine/View/DressUp/Api/Api+DressUp.m b/YuMi/Modules/YMMine/View/DressUp/Api/Api+DressUp.m index 6700f1c5..2b87b15d 100644 --- a/YuMi/Modules/YMMine/View/DressUp/Api/Api+DressUp.m +++ b/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 { diff --git a/YuMi/Modules/YMMine/View/DressUp/Presenter/XPMineDressUpPresenter.h b/YuMi/Modules/YMMine/View/DressUp/Presenter/XPMineDressUpPresenter.h index 814cf572..882b4b86 100644 --- a/YuMi/Modules/YMMine/View/DressUp/Presenter/XPMineDressUpPresenter.h +++ b/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; -/// 使用贵族资料卡 -/// @param nobleCardId 贵族资料卡的id 不使用的时候传0 +/// 使用VIP资料卡 +/// @param nobleCardId VIP资料卡的id 不使用的时候传0 - (void)userNobleCard:(NSString *)nobleCardId; /// 使用气泡 /// @param bubbleId 气泡id diff --git a/YuMi/Modules/YMMine/View/DressUp/Presenter/XPMineDressUpPresenter.m b/YuMi/Modules/YMMine/View/DressUp/Presenter/XPMineDressUpPresenter.m index 0737ed61..f065c42d 100644 --- a/YuMi/Modules/YMMine/View/DressUp/Presenter/XPMineDressUpPresenter.m +++ b/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]; } -/// 使用贵族资料卡 -/// @param nobleCardId 贵族资料卡的id 不使用的时候传0 +/// 使用VIP资料卡 +/// @param nobleCardId VIP资料卡的id 不使用的时候传0 - (void)userNobleCard:(NSString *)nobleCardId { NSString * uid = [AccountInfoStorage instance].getUid; NSString * ticket = [AccountInfoStorage instance].getTicket; diff --git a/YuMi/Modules/YMMine/View/DressUp/Protocol/XPDressUpShopProtocol.h b/YuMi/Modules/YMMine/View/DressUp/Protocol/XPDressUpShopProtocol.h index d64608e3..4ded6c96 100644 --- a/YuMi/Modules/YMMine/View/DressUp/Protocol/XPDressUpShopProtocol.h +++ b/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; diff --git a/YuMi/Modules/YMMine/View/DressUp/Protocol/XPMineDressUpProtocol.h b/YuMi/Modules/YMMine/View/DressUp/Protocol/XPMineDressUpProtocol.h index da56473d..16436b47 100644 --- a/YuMi/Modules/YMMine/View/DressUp/Protocol/XPMineDressUpProtocol.h +++ b/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; diff --git a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineNobleCardTableViewCell.h b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineNobleCardTableViewCell.h index 01326612..35f8a777 100644 --- a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineNobleCardTableViewCell.h +++ b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineNobleCardTableViewCell.h @@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN @class NobleCardModel, XPMineNobleCardTableViewCell; @protocol XPMineNobleCardTableViewCellDelegate -///使用贵族资料卡 +///使用VIP资料卡 - (void)xPMineNobleCardTableViewCell:(XPMineNobleCardTableViewCell *)view nobleCardId:(NSString *)nobleCardId; @end diff --git a/YuMi/Modules/YMMine/View/DressUp/View/XPDressUpShopViewController.m b/YuMi/Modules/YMMine/View/DressUp/View/XPDressUpShopViewController.m index 676ba588..6a4421c0 100644 --- a/YuMi/Modules/YMMine/View/DressUp/View/XPDressUpShopViewController.m +++ b/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; diff --git a/YuMi/Modules/YMMine/View/DressUp/View/XPMineDressUpViewController.m b/YuMi/Modules/YMMine/View/DressUp/View/XPMineDressUpViewController.m index 39e5e543..b07a9f0d 100644 --- a/YuMi/Modules/YMMine/View/DressUp/View/XPMineDressUpViewController.m +++ b/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; diff --git a/YuMi/Modules/YMMine/View/Noble/Api/Api+NobleCenter.h b/YuMi/Modules/YMMine/View/Noble/Api/Api+NobleCenter.h index 0c3dffa2..381e08f1 100644 --- a/YuMi/Modules/YMMine/View/Noble/Api/Api+NobleCenter.h +++ b/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; diff --git a/YuMi/Modules/YMMine/View/Noble/Api/Api+NobleCenter.m b/YuMi/Modules/YMMine/View/Noble/Api/Api+NobleCenter.m index 54e0152c..f3aa46f3 100644 --- a/YuMi/Modules/YMMine/View/Noble/Api/Api+NobleCenter.m +++ b/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{ diff --git a/YuMi/Modules/YMMine/View/Noble/Model/NobleCenterModel.h b/YuMi/Modules/YMMine/View/Noble/Model/NobleCenterModel.h index efcfb361..fb821aee 100644 --- a/YuMi/Modules/YMMine/View/Noble/Model/NobleCenterModel.h +++ b/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 *vipAuthInfos; -///贵族信息列表 +///VIP信息列表 @property (nonatomic, strong) NSArray *vipInfos; ///当前是否为最高等级 @property (nonatomic, assign) BOOL isMaxLevel; diff --git a/YuMi/Modules/YMMine/View/Noble/Model/NobleInfo.h b/YuMi/Modules/YMMine/View/Noble/Model/NobleInfo.h index 0823c582..c49309c1 100644 --- a/YuMi/Modules/YMMine/View/Noble/Model/NobleInfo.h +++ b/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 *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 *returnProfits; diff --git a/YuMi/Modules/YMMine/View/Noble/Model/NobleLevelUpModel.h b/YuMi/Modules/YMMine/View/Noble/Model/NobleLevelUpModel.h index 30631d76..ee185a54 100644 --- a/YuMi/Modules/YMMine/View/Noble/Model/NobleLevelUpModel.h +++ b/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 diff --git a/YuMi/Modules/YMMine/View/Noble/Presenter/XPNobleCenterPresenter.h b/YuMi/Modules/YMMine/View/Noble/Presenter/XPNobleCenterPresenter.h index 13230f9a..fe639d08 100644 --- a/YuMi/Modules/YMMine/View/Noble/Presenter/XPNobleCenterPresenter.h +++ b/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; diff --git a/YuMi/Modules/YMMine/View/Noble/Presenter/XPNobleCenterPresenter.m b/YuMi/Modules/YMMine/View/Noble/Presenter/XPNobleCenterPresenter.m index fe5aa081..314697fa 100644 --- a/YuMi/Modules/YMMine/View/Noble/Presenter/XPNobleCenterPresenter.m +++ b/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{ diff --git a/YuMi/Modules/YMMine/View/Noble/Protocol/XPNobleCenterProtocol.h b/YuMi/Modules/YMMine/View/Noble/Protocol/XPNobleCenterProtocol.h index 2affe05e..5888611d 100644 --- a/YuMi/Modules/YMMine/View/Noble/Protocol/XPNobleCenterProtocol.h +++ b/YuMi/Modules/YMMine/View/Noble/Protocol/XPNobleCenterProtocol.h @@ -10,14 +10,14 @@ @class NobleCenterModel, UserInfoModel, NobleRechargeModel; @protocol XPNobleCenterProtocol @optional -///获取贵族信息成功 +///获取VIP信息成功 - (void)getNobleCenterInfoSuccess:(NobleCenterModel *)model; -///获取贵族信息成功 +///获取VIP信息成功 - (void)getNobleCenterDiamondSuccess:(NSString *)recordId; ///获取用户信息成功 - (void)onGetUserInfoSuccess:(UserInfoModel *)userInfo; -///获取贵族充值信息成功 +///获取VIP充值信息成功 - (void)onGetNobleRechargeDataSuccess:(NSArray *)list; ///请求充值id的状态成功 diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterTitleView.h b/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterTitleView.h index 8da45257..347caac3 100644 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterTitleView.h +++ b/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 *vipInfos; @end diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleAuthorityDescView.h b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleAuthorityDescView.h index 0fcd324d..0dd05be2 100644 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleAuthorityDescView.h +++ b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleAuthorityDescView.h @@ -3,7 +3,7 @@ // xplan-ios // // Created by GreenLand on 2022/1/5. -// 贵族权限说明弹窗 +// VIP权限说明弹窗 #import #import "NobleAuthInfo.h" diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterMyNobleView.m b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterMyNobleView.m index ad82cc74..e4ed3bb4 100644 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterMyNobleView.m +++ b/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; diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterTableHeadView.h b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterTableHeadView.h index 5053519b..9ae657bb 100644 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterTableHeadView.h +++ b/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 diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterTableHeadView.m b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterTableHeadView.m index 7162fa78..7a66fbfc 100644 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterTableHeadView.m +++ b/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; diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleUpgradeLevelView.h b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleUpgradeLevelView.h index fe61c641..1fa0f616 100644 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleUpgradeLevelView.h +++ b/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 diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleUpgradeLevelView.m b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleUpgradeLevelView.m index 3f5b3a8d..ae057716 100644 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleUpgradeLevelView.m +++ b/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; diff --git a/YuMi/Modules/YMMine/View/Noble/View/ThemeColor+NobleCenter.h b/YuMi/Modules/YMMine/View/Noble/View/ThemeColor+NobleCenter.h index ec9d3720..89ac7e33 100644 --- a/YuMi/Modules/YMMine/View/Noble/View/ThemeColor+NobleCenter.h +++ b/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 diff --git a/YuMi/Modules/YMMine/View/Noble/View/ThemeColor+NobleCenter.m b/YuMi/Modules/YMMine/View/Noble/View/ThemeColor+NobleCenter.m index 0e69914b..ca515c6e 100644 --- a/YuMi/Modules/YMMine/View/Noble/View/ThemeColor+NobleCenter.m +++ b/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); } diff --git a/YuMi/Modules/YMMine/View/Noble/View/XPNobleCenterListViewController.h b/YuMi/Modules/YMMine/View/Noble/View/XPNobleCenterListViewController.h index 7d6e6591..b6dae613 100644 --- a/YuMi/Modules/YMMine/View/Noble/View/XPNobleCenterListViewController.h +++ b/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 diff --git a/YuMi/Modules/YMMine/View/Noble/View/XPNobleCenterViewController.m b/YuMi/Modules/YMMine/View/Noble/View/XPNobleCenterViewController.m index 72488ebf..9691d646 100644 --- a/YuMi/Modules/YMMine/View/Noble/View/XPNobleCenterViewController.m +++ b/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]; } } diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m index 16725da3..65ad5896 100644 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m +++ b/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 diff --git a/YuMi/Modules/YMMine/View/SubViews/XPMineHeadView.h b/YuMi/Modules/YMMine/View/SubViews/XPMineHeadView.h index 22d8b579..e6a90623 100644 --- a/YuMi/Modules/YMMine/View/SubViews/XPMineHeadView.h +++ b/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 diff --git a/YuMi/Modules/YMMine/View/SubViews/XPMineHeadView.m b/YuMi/Modules/YMMine/View/SubViews/XPMineHeadView.m index f6edb779..e3e7c9d0 100644 --- a/YuMi/Modules/YMMine/View/SubViews/XPMineHeadView.m +++ b/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]; diff --git a/YuMi/Modules/YMMine/View/XPMineViewController.m b/YuMi/Modules/YMMine/View/XPMineViewController.m index 75c189ce..09672dca 100644 --- a/YuMi/Modules/YMMine/View/XPMineViewController.m +++ b/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]; diff --git a/YuMi/Modules/YMMonents/Model/MonentsInfoModel.h b/YuMi/Modules/YMMonents/Model/MonentsInfoModel.h index da9c38ae..f4d49706 100644 --- a/YuMi/Modules/YMMonents/Model/MonentsInfoModel.h +++ b/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 *dynamicResList; diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsUserInfoView.m b/YuMi/Modules/YMMonents/View/SubViews/XPMonentsUserInfoView.m index 86ba689f..961d81d2 100644 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsUserInfoView.m +++ b/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; diff --git a/YuMi/Modules/YMRoom/Presenter/XPRoomPresenter.m b/YuMi/Modules/YMRoom/Presenter/XPRoomPresenter.m index 003c96cc..fa945f41 100644 --- a/YuMi/Modules/YMRoom/Presenter/XPRoomPresenter.m +++ b/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"]]; // 周星礼物 diff --git a/YuMi/Modules/YMRoom/View/AnchorCycleView/AnchorRoomSrollTipView.m b/YuMi/Modules/YMRoom/View/AnchorCycleView/AnchorRoomSrollTipView.m index 11ed96be..0fb74655 100644 --- a/YuMi/Modules/YMRoom/View/AnchorCycleView/AnchorRoomSrollTipView.m +++ b/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; diff --git a/YuMi/Modules/YMRoom/View/AnimationView/Model/PIBaseAnimationViewModel.h b/YuMi/Modules/YMRoom/View/AnimationView/Model/PIBaseAnimationViewModel.h index a6e64ea8..f043ba1b 100644 --- a/YuMi/Modules/YMRoom/View/AnimationView/Model/PIBaseAnimationViewModel.h +++ b/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,///牌照房小时榜 diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m index d526b2c2..0cbf11d9 100644 --- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m +++ b/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]; diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomNobleLevelUpView.h b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomNobleLevelUpView.h index 59aaff8f..83bf1743 100644 --- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomNobleLevelUpView.h +++ b/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 diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomNobleLevelUpView.m b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomNobleLevelUpView.m index a3161934..0b2b646d 100644 --- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomNobleLevelUpView.m +++ b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomNobleLevelUpView.m @@ -19,7 +19,7 @@ ///动画管理类 @property (strong, nonatomic) SVGAParser *parser; -///贵族特效 +///VIP特效 @property (nonatomic,strong) SVGAImageView *nobleView; diff --git a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomAnchorRankEnterView.m b/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomAnchorRankEnterView.m index 893a70d1..36dbcbe4 100644 --- a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomAnchorRankEnterView.m +++ b/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; } diff --git a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomFunctionContainerView.m b/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomFunctionContainerView.m index 953447c4..39436ae4 100644 --- a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomFunctionContainerView.m +++ b/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); }]; } diff --git a/YuMi/Modules/YMRoom/View/FaceView/Model/RoomFaceInfoModel.h b/YuMi/Modules/YMRoom/View/FaceView/Model/RoomFaceInfoModel.h index 8880b505..9ba9a47f 100644 --- a/YuMi/Modules/YMRoom/View/FaceView/Model/RoomFaceInfoModel.h +++ b/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; diff --git a/YuMi/Modules/YMRoom/View/FaceView/Model/RoomFaceTitleItemModel.h b/YuMi/Modules/YMRoom/View/FaceView/Model/RoomFaceTitleItemModel.h index 4ea1d448..346f2082 100644 --- a/YuMi/Modules/YMRoom/View/FaceView/Model/RoomFaceTitleItemModel.h +++ b/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, }; diff --git a/YuMi/Modules/YMRoom/View/FaceView/View/Cell/XPRoomFaceCollectionViewCell.h b/YuMi/Modules/YMRoom/View/FaceView/View/Cell/XPRoomFaceCollectionViewCell.h index 42a028d5..e8f3b99d 100644 --- a/YuMi/Modules/YMRoom/View/FaceView/View/Cell/XPRoomFaceCollectionViewCell.h +++ b/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; diff --git a/YuMi/Modules/YMRoom/View/FaceView/View/Cell/XPRoomFaceCollectionViewCell.m b/YuMi/Modules/YMRoom/View/FaceView/View/Cell/XPRoomFaceCollectionViewCell.m index 88415056..c15f3883 100644 --- a/YuMi/Modules/YMRoom/View/FaceView/View/Cell/XPRoomFaceCollectionViewCell.m +++ b/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; diff --git a/YuMi/Modules/YMRoom/View/FaceView/View/XPRoomFaceViewController.m b/YuMi/Modules/YMRoom/View/FaceView/View/XPRoomFaceViewController.m index 7fa43239..d930ba5f 100644 --- a/YuMi/Modules/YMRoom/View/FaceView/View/XPRoomFaceViewController.m +++ b/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 *faceList; -///贵族表情 +///VIP表情 @property (nonatomic,strong) NSArray *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); } diff --git a/YuMi/Modules/YMRoom/View/LittleGame/View/XPRoomLittleGameContainerView.m b/YuMi/Modules/YMRoom/View/LittleGame/View/XPRoomLittleGameContainerView.m index 9a5d6bf0..c3f66da4 100644 --- a/YuMi/Modules/YMRoom/View/LittleGame/View/XPRoomLittleGameContainerView.m +++ b/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) { - language = @"zh-Hans"; // 简体中文 - } else { - language = @"zh-Hant"; // 繁體中文 - } + if ([language rangeOfString:@"Hans"].location != NSNotFound) { + language = @"zh-CN"; // 简体中文 + } else { + 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); diff --git a/YuMi/Modules/YMRoom/View/MenuContainerView/Model/XPRoomMenuItem.h b/YuMi/Modules/YMRoom/View/MenuContainerView/Model/XPRoomMenuItem.h index d00e1dc4..abe4643c 100644 --- a/YuMi/Modules/YMRoom/View/MenuContainerView/Model/XPRoomMenuItem.h +++ b/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 diff --git a/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomMenuContainerView.m b/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomMenuContainerView.m index fb86b233..a16b7d4f 100644 --- a/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomMenuContainerView.m +++ b/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; diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageRemoteExtModel.h b/YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageRemoteExtModel.h index 8da637a3..8e9eb45b 100644 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageRemoteExtModel.h +++ b/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; diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageParser.m b/YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageParser.m index cbc78e16..93eeedff 100644 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageParser.m +++ b/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]]; diff --git a/YuMi/Modules/YMRoom/View/MoreView/Api/Api+MoreMenu.h b/YuMi/Modules/YMRoom/View/MoreView/Api/Api+MoreMenu.h index aeeeeb4b..0befd5f8 100644 --- a/YuMi/Modules/YMRoom/View/MoreView/Api/Api+MoreMenu.h +++ b/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; diff --git a/YuMi/Modules/YMRoom/View/MoreView/Api/Api+MoreMenu.m b/YuMi/Modules/YMRoom/View/MoreView/Api/Api+MoreMenu.m index b08616c1..685bfe6f 100644 --- a/YuMi/Modules/YMRoom/View/MoreView/Api/Api+MoreMenu.m +++ b/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 diff --git a/YuMi/Modules/YMRoom/View/MoreView/Presenter/XPMoreMenuPresenter.h b/YuMi/Modules/YMRoom/View/MoreView/Presenter/XPMoreMenuPresenter.h index edb8dede..39c0f189 100644 --- a/YuMi/Modules/YMRoom/View/MoreView/Presenter/XPMoreMenuPresenter.h +++ b/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; diff --git a/YuMi/Modules/YMRoom/View/MoreView/Presenter/XPMoreMenuPresenter.m b/YuMi/Modules/YMRoom/View/MoreView/Presenter/XPMoreMenuPresenter.m index b90e0115..d823cc72 100644 --- a/YuMi/Modules/YMRoom/View/MoreView/Presenter/XPMoreMenuPresenter.m +++ b/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]; diff --git a/YuMi/Modules/YMRoom/View/MoreView/Protocol/XPMoreMenuProtocol.h b/YuMi/Modules/YMRoom/View/MoreView/Protocol/XPMoreMenuProtocol.h index 9912dffb..802449d4 100644 --- a/YuMi/Modules/YMRoom/View/MoreView/Protocol/XPMoreMenuProtocol.h +++ b/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; diff --git a/YuMi/Modules/YMRoom/View/MoreView/View/Cell/XPRoomMoreMenuCollectionViewCell.m b/YuMi/Modules/YMRoom/View/MoreView/View/Cell/XPRoomMoreMenuCollectionViewCell.m index c69ed63f..72a43915 100644 --- a/YuMi/Modules/YMRoom/View/MoreView/View/Cell/XPRoomMoreMenuCollectionViewCell.m +++ b/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; } diff --git a/YuMi/Modules/YMRoom/View/MoreView/View/XPRoomMoreMenuViewController.m b/YuMi/Modules/YMRoom/View/MoreView/View/XPRoomMoreMenuViewController.m index ceeea359..5f4faea0 100644 --- a/YuMi/Modules/YMRoom/View/MoreView/View/XPRoomMoreMenuViewController.m +++ b/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]; diff --git a/YuMi/Modules/YMRoom/View/NobleTrumpet/Api/Api+RoomTrumpet.h b/YuMi/Modules/YMRoom/View/NobleTrumpet/Api/Api+RoomTrumpet.h index 5c0a8364..f03afa65 100644 --- a/YuMi/Modules/YMRoom/View/NobleTrumpet/Api/Api+RoomTrumpet.h +++ b/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 diff --git a/YuMi/Modules/YMRoom/View/NobleTrumpet/Api/Api+RoomTrumpet.m b/YuMi/Modules/YMRoom/View/NobleTrumpet/Api/Api+RoomTrumpet.m index 80c162f1..28cdb284 100644 --- a/YuMi/Modules/YMRoom/View/NobleTrumpet/Api/Api+RoomTrumpet.m +++ b/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]; } diff --git a/YuMi/Modules/YMRoom/View/NobleTrumpet/View/XPRoomTrumpetView.m b/YuMi/Modules/YMRoom/View/NobleTrumpet/View/XPRoomTrumpetView.m index 929e9fde..2b1ca1bd 100644 --- a/YuMi/Modules/YMRoom/View/NobleTrumpet/View/XPRoomTrumpetView.m +++ b/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; diff --git a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/Cell/PIRoomPhotoAlbumChoosePhotoCell.m b/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/Cell/PIRoomPhotoAlbumChoosePhotoCell.m index 02b13f33..5d82b153 100644 --- a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/Cell/PIRoomPhotoAlbumChoosePhotoCell.m +++ b/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; } diff --git a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumChoosePhotoGiftView.m b/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumChoosePhotoGiftView.m index bb5b7bb7..6532dc00 100644 --- a/YuMi/Modules/YMRoom/View/RoomPhotoAlbum/View/SubViews/PIRoomPhotoAlbumChoosePhotoGiftView.m +++ b/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; } diff --git a/YuMi/Modules/YMRoom/View/RoomRecommend/SubViews/XPRoomInsideRecommendEmptyCell.m b/YuMi/Modules/YMRoom/View/RoomRecommend/SubViews/XPRoomInsideRecommendEmptyCell.m index 01a317ca..a5b81bbd 100644 --- a/YuMi/Modules/YMRoom/View/RoomRecommend/SubViews/XPRoomInsideRecommendEmptyCell.m +++ b/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; } diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftInfoModel.h b/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftInfoModel.h index aa430de4..c7d8a18e 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftInfoModel.h +++ b/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; /*----------周星礼物--------*/ diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftNobleInfoModel.h b/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftNobleInfoModel.h index d7617341..faa15511 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/Model/GiftNobleInfoModel.h +++ b/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 diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/Presenter/XPGiftPresenter.m b/YuMi/Modules/YMRoom/View/SendGiftView/Presenter/XPGiftPresenter.m index 4167e169..fa907c67 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/Presenter/XPGiftPresenter.m +++ b/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"]]; // 周星礼物 diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftItemCollectionViewCell.h b/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftItemCollectionViewCell.h index bceec32a..290a2e51 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftItemCollectionViewCell.h +++ b/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; diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftItemCollectionViewCell.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftItemCollectionViewCell.m index 4c1a1ae0..cca7f57b 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftItemCollectionViewCell.m +++ b/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; diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftInfoSegmentedView.h b/YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftInfoSegmentedView.h index be815b6d..f61eb03a 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftInfoSegmentedView.h +++ b/YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftInfoSegmentedView.h @@ -28,7 +28,7 @@ NS_ASSUME_NONNULL_BEGIN @interface PIGiftInfoSegmentedView : UIView @property(nonatomic,weak) iddelegate; @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; diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftInfoSegmentedView.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftInfoSegmentedView.m index a0372ada..acf11175 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftInfoSegmentedView.m +++ b/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; } diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftBarView.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftBarView.m index 5d8d3d54..ff32d036 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftBarView.m +++ b/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]; diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftCountView.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftCountView.m index 546e8eef..76bbd0a0 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftCountView.m +++ b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftCountView.m @@ -147,7 +147,7 @@ - (UICollectionView *)countCollectionView{ if (!_countCollectionView) { UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init]; - layout.itemSize = CGSizeMake(135, 28); + layout.itemSize = CGSizeMake(160, 28); layout.minimumLineSpacing = 0; layout.minimumInteritemSpacing = 0; layout.sectionInset = UIEdgeInsetsMake(3, 0, 3, 0); diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftHeadTypeView.h b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftHeadTypeView.h index cde3add0..e44b18d5 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftHeadTypeView.h +++ b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftHeadTypeView.h @@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN @class XPGiftHeadTypeView; @protocol XPGiftHeadTypeViewDelegate -///点击了贵族 +///点击了VIP - (void)xPGiftHeadTypeViewDidClickNoble:(XPGiftHeadTypeView *)view; ///点击了首充 - (void)xPGiftHeadTypeViewDidClickFirstRecharge:(XPGiftHeadTypeView *)view; diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftInfoView.h b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftInfoView.h index b99e07a7..6c1bf006 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftInfoView.h +++ b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftInfoView.h @@ -16,7 +16,7 @@ typedef NS_ENUM(NSInteger, GiftSegmentType) { GiftSegmentType_Normal = 0, ///普通的礼物 GiftSegmentType_Lucky,///幸运礼物 GiftSegmentType_WeekStar, ///周星礼物 - GiftSegmentType_Noble,///贵族礼物 + GiftSegmentType_Noble,///VIP礼物 GiftSegmentType_Anchor,///个播 GiftSegmentType_Pack,///背包礼物 GiftSegmentType_Graffiti,///涂鸦礼物 @@ -38,7 +38,7 @@ typedef NS_ENUM(NSInteger, GiftSegmentType) { @interface XPGiftInfoView : UIView ///使用的地方 @property (nonatomic,assign) SendGiftType usingplaceType; -///普通礼物/幸运礼物/贵族礼物 +///普通礼物/幸运礼物/VIP礼物 @property (nonatomic,strong) NSArray *normalOriginArray; ///背包礼物 @property (nonatomic,strong) NSArray *packOriginArray; @@ -49,7 +49,7 @@ typedef NS_ENUM(NSInteger, GiftSegmentType) { @property (nonatomic,weak) id delegate; ///最后一次选中的礼物 @property (nonatomic,strong,readonly) GiftInfoModel *lastSelectGift; -///当前用户贵族等级 +///当前用户VIP等级 @property (nonatomic, assign) NSInteger curUserNobleLevel; diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftUsersView.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftUsersView.m index 9dfa1620..2a7e39ab 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftUsersView.m +++ b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftUsersView.m @@ -103,7 +103,7 @@ }]; [self.allMicroButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(50, 28)); + make.size.mas_equalTo(CGSizeMake(60, 28)); }]; [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPSendGiftView.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPSendGiftView.m index 11d6a5f6..03b739ba 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPSendGiftView.m +++ b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPSendGiftView.m @@ -496,7 +496,7 @@ UIKIT_EXTERN NSString * kShowFirstRechargeView; } #pragma mark - XPGiftHeadTypeViewDelegate -///点击了贵族 +///点击了VIP - (void)xPGiftHeadTypeViewDidClickNoble:(XPGiftHeadTypeView *)view { [self dismissViewControllerAnimated:NO completion:^{ [StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventvipEntranceGiftClick]; @@ -753,7 +753,7 @@ UIKIT_EXTERN NSString * kShowFirstRechargeView; self.giftBarView.sendButtonIsEnable = YES; if (code == 31005) {// 余额不足 [self showNotSufficientFundsWithToast:msg]; - } else if (code == 8535) {//贵族等级未达到礼物等级 + } else if (code == 8535) {//VIP等级未达到礼物等级 GiftInfoModel * giftInfo = self.giftInfoView.lastSelectGift; TTAlertConfig *config = [[TTAlertConfig alloc] init]; diff --git a/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroView.m b/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroView.m index 3d4f0e08..7a7d216c 100644 --- a/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroView.m +++ b/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroView.m @@ -44,7 +44,7 @@ @property (nonatomic,strong) UIButton *sexImageView; ///声波动画 @property (nonatomic,strong) MicroWaveView *animationView; -///贵族声波动画 +///VIP声波动画 @property (nonatomic, strong) MicroNobleWaveView *nobleWaveView; ///离开模式 @property (nonatomic,strong) UILabel *leaveLabel; diff --git a/YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.m b/YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.m index 8b307cc8..61bc2d7c 100644 --- a/YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.m +++ b/YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.m @@ -55,7 +55,7 @@ @property (nonatomic,strong) UIStackView *stackView; ///展示用户的信息 @property (nonatomic,strong) UIView * userInfoView; -///贵族资料卡头饰 +///VIP资料卡头饰 @property (nonatomic, strong) NetImageView *nobleImageView; ///模糊效果 @property (strong, nonatomic) UIVisualEffectView *effectView; @@ -79,7 +79,7 @@ @property (nonatomic,strong) UIStackView *tagStackView; ///魅力等级 @property (nonatomic,strong) NetImageView *charmImageView; -///贵族icon +///VIPicon @property (nonatomic, strong) NetImageView *nobleIconImageView; ///等级 @property (nonatomic,strong) NetImageView *experImageView; @@ -515,7 +515,7 @@ self.backImageView.imageUrl = userInfo.avatar; self.nobleImageView.imageUrl = userInfo.userInfoCardPic; self.nobleIconImageView.imageUrl = userInfo.userVipInfoVO.vipIcon; - if (userInfo.userVipInfoVO && userInfo.userVipInfoVO.vipIcon) {//贵族icon + if (userInfo.userVipInfoVO && userInfo.userVipInfoVO.vipIcon) {//VIPicon [self.nobleIconImageView mas_updateConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(20); }]; diff --git a/YuMi/Modules/YMRoom/View/XPRoomViewController.m b/YuMi/Modules/YMRoom/View/XPRoomViewController.m index f5c88f9c..6bd6f2bd 100644 --- a/YuMi/Modules/YMRoom/View/XPRoomViewController.m +++ b/YuMi/Modules/YMRoom/View/XPRoomViewController.m @@ -533,7 +533,7 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出 attachment.first = CustomMessageType_Car_Notify; attachment.second = Custom_Message_Sub_Car_EnterRoom; NSMutableDictionary *att = [NSMutableDictionary dictionary]; - if (self.userInfo.userVipInfoVO.enterHide) {///贵族隐身进房,不发座驾消息 + if (self.userInfo.userVipInfoVO.enterHide) {///VIP隐身进房,不发座驾消息 return; } if (self.userInfo.viewUrl.length > 0) { diff --git a/YuMi/Modules/YMTabbar/View/PIFullScreenBannerAnimation.m b/YuMi/Modules/YMTabbar/View/PIFullScreenBannerAnimation.m index abd18f15..43d91e3b 100644 --- a/YuMi/Modules/YMTabbar/View/PIFullScreenBannerAnimation.m +++ b/YuMi/Modules/YMTabbar/View/PIFullScreenBannerAnimation.m @@ -661,7 +661,7 @@ }]; [candyTreeView 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]; diff --git a/YuMi/Modules/YMTabbar/View/TabbarViewController.m b/YuMi/Modules/YMTabbar/View/TabbarViewController.m index 72d0b1aa..8fac14fb 100644 --- a/YuMi/Modules/YMTabbar/View/TabbarViewController.m +++ b/YuMi/Modules/YMTabbar/View/TabbarViewController.m @@ -630,7 +630,7 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey; } else if (attachment.first == CustomMessageType_Licnese_Hour_Rank && attachment.second == Custom_Message_Sub_Licnese_Hour_Rank) {///牌照房小时榜 if([XPSkillCardPlayerManager shareInstance].isInRoomVC == YES)return; [self.roomAnimation receiveAnchorHourRank: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升级全服飘屏 if([XPSkillCardPlayerManager shareInstance].isInRoomVC == YES)return; [self.roomAnimation receiveNobleLevelUp:attachment]; diff --git a/YuMi/Structure/MVP/Model/UserInfoModel.h b/YuMi/Structure/MVP/Model/UserInfoModel.h index e4c4de87..df3b8d0e 100644 --- a/YuMi/Structure/MVP/Model/UserInfoModel.h +++ b/YuMi/Structure/MVP/Model/UserInfoModel.h @@ -99,7 +99,7 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic,assign) BOOL hasSelectUser; ///所选择的麦序 @property (nonatomic,assign) int selectMicPosition; -///贵族信息 +///VIP信息 @property (nonatomic, strong) UserVipInfoVo *userVipInfoVO; ///当前使用的资料卡装扮 @property (nonatomic, copy) NSString *userInfoCardPic; diff --git a/YuMi/Structure/MVP/Model/UserVipInfoVo.h b/YuMi/Structure/MVP/Model/UserVipInfoVo.h index 90850a18..55635db4 100644 --- a/YuMi/Structure/MVP/Model/UserVipInfoVo.h +++ b/YuMi/Structure/MVP/Model/UserVipInfoVo.h @@ -3,7 +3,7 @@ // YUMI // // Created by YUMI on 2022/1/4. -// 贵族信息 +// VIP信息 #import @@ -11,9 +11,9 @@ NS_ASSUME_NONNULL_BEGIN @interface UserVipInfoVo : PIBaseModel -///贵族图标 +///VIP图标 @property (nonatomic, copy) NSString *vipIcon; -///贵族等级 +///VIP等级 @property (nonatomic, assign) NSInteger vipLevel; //用户好友昵称颜色 @property (nonatomic, copy) NSString *friendNickColour; @@ -21,9 +21,9 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, assign) BOOL preventKick; ///是否隐身进房 @property (nonatomic, assign) BOOL enterHide; -///贵族进房特效 +///VIP进房特效 @property (nonatomic, copy) NSString *enterRoomEffects; -///贵族名称 +///VIP名称 @property (nonatomic, copy) NSString *vipName; ///隐身访问主页 @property (nonatomic,assign) BOOL lookHomepageHide; diff --git a/YuMi/Tools/Bundle/NSBundle+Localizable.m b/YuMi/Tools/Bundle/NSBundle+Localizable.m index 70739534..31435849 100644 --- a/YuMi/Tools/Bundle/NSBundle+Localizable.m +++ b/YuMi/Tools/Bundle/NSBundle+Localizable.m @@ -8,6 +8,8 @@ #import "NSBundle+Localizable.h" @implementation NSBundle (Localizable) + + +(NSString *)ymLocalizedStringForKey:(NSString *)key { return [self ymLocalizedStringForKey:key value:nil]; diff --git a/YuMi/Tools/Event/XPEventHandle.h b/YuMi/Tools/Event/XPEventHandle.h index 9e9e310d..9043f6a1 100644 --- a/YuMi/Tools/Event/XPEventHandle.h +++ b/YuMi/Tools/Event/XPEventHandle.h @@ -32,7 +32,7 @@ NS_ASSUME_NONNULL_BEGIN +(void)loginClickEventWithType:(NSString *)type; ///登录页面展示 +(void)loginShowEvent; -///根据点击充值的入口上报,type,=房间内背包的充值入口，2=房间内赠送礼物时余额不足的充值入口，3=房间内贵族icon的充值入口；个人中心的充值入口，4=贵族中心的充值入口，5=星级厨房的充值入口；6=寻找小精灵的充值入口；7=寻爱之旅的充值入口；8=私聊送礼的充值入口,balance,返回用户具体余额 +///根据点击充值的入口上报,type,=房间内背包的充值入口，2=房间内赠送礼物时余额不足的充值入口，3=房间内VIPicon的充值入口；个人中心的充值入口，4=VIP中心的充值入口，5=星级厨房的充值入口；6=寻找小精灵的充值入口；7=寻爱之旅的充值入口；8=私聊送礼的充值入口,balance,返回用户具体余额 +(void)payPageShowEventWithType:(NSString *)type balance:(NSString *)balance; ///点击确认支付按钮,money,金额 +(void)payClickEventWithMoney:(NSString *)money; diff --git a/YuMi/Tools/Event/XPEventHandle.m b/YuMi/Tools/Event/XPEventHandle.m index 6c384de2..893ada7f 100644 --- a/YuMi/Tools/Event/XPEventHandle.m +++ b/YuMi/Tools/Event/XPEventHandle.m @@ -126,7 +126,7 @@ static NSString *const isHaveWindow = @"0"; } -///根据点击充值的入口上报,type,=房间内背包的充值入口，2=房间内赠送礼物时余额不足的充值入口，3=房间内贵族icon的充值入口；个人中心的充值入口，4=贵族中心的充值入口，5=星级厨房的充值入口；6=寻找小精灵的充值入口；7=寻爱之旅的充值入口；8=私聊送礼的充值入口,balance,返回用户具体余额 +///根据点击充值的入口上报,type,=房间内背包的充值入口，2=房间内赠送礼物时余额不足的充值入口，3=房间内VIPicon的充值入口；个人中心的充值入口，4=VIP中心的充值入口，5=星级厨房的充值入口；6=寻找小精灵的充值入口；7=寻爱之旅的充值入口；8=私聊送礼的充值入口,balance,返回用户具体余额 +(void)payPageShowEventWithType:(NSString *)type balance:(NSString *)balance{ NSMutableDictionary *attributes = [XPEventHandle getCommonAttributes]; [attributes setValue:kMoliStarPay forKey:kModule]; diff --git a/YuMi/Tools/NSObject+MJExtension.h b/YuMi/Tools/MJExtension/NSObject+MJExtension.h similarity index 100% rename from YuMi/Tools/NSObject+MJExtension.h rename to YuMi/Tools/MJExtension/NSObject+MJExtension.h diff --git a/YuMi/Tools/NSObject+MJExtension.m b/YuMi/Tools/MJExtension/NSObject+MJExtension.m similarity index 100% rename from YuMi/Tools/NSObject+MJExtension.m rename to YuMi/Tools/MJExtension/NSObject+MJExtension.m diff --git a/YuMi/Tools/StatisticsService/StatisticsServiceHelper.h b/YuMi/Tools/StatisticsService/StatisticsServiceHelper.h index 6c9de0bc..11afd8f9 100644 --- a/YuMi/Tools/StatisticsService/StatisticsServiceHelper.h +++ b/YuMi/Tools/StatisticsService/StatisticsServiceHelper.h @@ -20,12 +20,12 @@ UIKIT_EXTERN NSString *const StatisticsServiceEventLoginQQClick;///QQ登录 UIKIT_EXTERN NSString *const StatisticsServiceEventLoginWXClick;///wx登录 UIKIT_EXTERN NSString *const StatisticsServiceEventLoginRepariSuccess;///注册个人资料保存成功 -#pragma mark - 贵族 -UIKIT_EXTERN NSString *const StatisticsServiceEventVipOpenClick;///开通贵族点击 -UIKIT_EXTERN NSString *const StatisticsServiceEventvipEntranceRoomClick;///贵族房间入口点击 -UIKIT_EXTERN NSString *const StatisticsServiceEventvipEntranceGiftClick;///贵族礼物面板入口点击 -UIKIT_EXTERN NSString *const StatisticsServiceEventvipEntranceFaceClick;///贵族表情面板入口点击 -UIKIT_EXTERN NSString *const StatisticsServiceEventvipEntranceMeClick;///贵族我的页面入口点击 +#pragma mark - VIP +UIKIT_EXTERN NSString *const StatisticsServiceEventVipOpenClick;///开通VIP点击 +UIKIT_EXTERN NSString *const StatisticsServiceEventvipEntranceRoomClick;///VIP房间入口点击 +UIKIT_EXTERN NSString *const StatisticsServiceEventvipEntranceGiftClick;///VIP礼物面板入口点击 +UIKIT_EXTERN NSString *const StatisticsServiceEventvipEntranceFaceClick;///VIP表情面板入口点击 +UIKIT_EXTERN NSString *const StatisticsServiceEventvipEntranceMeClick;///VIP我的页面入口点击 #pragma mark - 首页个播tab UIKIT_EXTERN NSString *const StatisticsServiceEventRecent_card_show;///最近在看卡片曝光 @@ -48,8 +48,8 @@ UIKIT_EXTERN NSString *const StatisticsServiceEventPersonalshowTopCardVoiceClick #pragma mark - 个人中心 UIKIT_EXTERN NSString *const StatisticsServiceEventusercenter_recharge_card_show; ///个人中心充值卡片曝光 UIKIT_EXTERN NSString *const StatisticsServiceEventusercenter_recharge_card_click; ///个人中心充值卡片点击（跳转充值页） -UIKIT_EXTERN NSString *const StatisticsServiceEventusercenter_noble_card_show; ///个人中心贵族卡片曝光 -UIKIT_EXTERN NSString *const StatisticsServiceEventusercenter_noble_card_click;///个人中心贵族卡片片点击（跳转贵族页） +UIKIT_EXTERN NSString *const StatisticsServiceEventusercenter_noble_card_show; ///个人中心VIP卡片曝光 +UIKIT_EXTERN NSString *const StatisticsServiceEventusercenter_noble_card_click;///个人中心VIP卡片片点击（跳转VIP页） UIKIT_EXTERN NSString *const StatisticsServiceEventusercenter_function_show; ///个人中心功能板块曝光,曝光时统计功能的名称 UIKIT_EXTERN NSString *const StatisticsServiceEventusercenter_function_click; ///个人中心功能板块点击,点击时统计功能的名称 UIKIT_EXTERN NSString *const StatisticsServiceEventusercenter_quick_entry_show; ///个人中心快捷进房曝光,曝光时统计房间的id @@ -77,7 +77,7 @@ UIKIT_EXTERN NSString *const StatisticsServiceEventroom_pop_click; ///房间pop UIKIT_EXTERN NSString *const StatisticsServiceEventroom_chatbox_click; ///房间聊天框点击 UIKIT_EXTERN NSString *const StatisticsServiceEventroom_music_click; ///房间音乐点击 UIKIT_EXTERN NSString *const StatisticsServiceEventroom_privateletter_click; ///房间私信点击 -UIKIT_EXTERN NSString *const StatisticsServiceEventroom_noble_click; ///房间贵族点击 +UIKIT_EXTERN NSString *const StatisticsServiceEventroom_noble_click; ///房间VIP点击 UIKIT_EXTERN NSString *const StatisticsServiceEventroom_gift_click; ///房间送礼点击 UIKIT_EXTERN NSString *const StatisticsServiceEventroom_more_tool_click; ///房间底部更多工具栏点击,统计用户展开面板后的行为 #pragma mark - 收藏房间列表 diff --git a/YuMi/Tools/StatisticsService/StatisticsServiceHelper.m b/YuMi/Tools/StatisticsService/StatisticsServiceHelper.m index bc7e8f7d..8b69ba03 100644 --- a/YuMi/Tools/StatisticsService/StatisticsServiceHelper.m +++ b/YuMi/Tools/StatisticsService/StatisticsServiceHelper.m @@ -17,12 +17,12 @@ NSString *const StatisticsServiceEventLoginPhoneClick = @"login_phone_click"; NSString *const StatisticsServiceEventLoginQQClick = @"login_qq_click";///QQ登录 NSString *const StatisticsServiceEventLoginWXClick = @"login_wx_click";///wx登录 NSString *const StatisticsServiceEventLoginRepariSuccess = @"login_repari_success";///注册个人资料保存成功 -#pragma mark - 贵族 -NSString *const StatisticsServiceEventVipOpenClick = @"vip_open_click";///开通贵族点击 -NSString *const StatisticsServiceEventvipEntranceRoomClick = @"vip_entrance_room_click";///贵族房间入口点击 -NSString *const StatisticsServiceEventvipEntranceGiftClick = @"vip_entrance_gift_click";///贵族礼物面板入口点击 -NSString *const StatisticsServiceEventvipEntranceFaceClick = @"vip_entrance_face_click";///贵族表情面板入口点击 -NSString *const StatisticsServiceEventvipEntranceMeClick = @"vip_entrance_me_click";///贵族我的页面入口点击 +#pragma mark - VIP +NSString *const StatisticsServiceEventVipOpenClick = @"vip_open_click";///开通VIP点击 +NSString *const StatisticsServiceEventvipEntranceRoomClick = @"vip_entrance_room_click";///VIP房间入口点击 +NSString *const StatisticsServiceEventvipEntranceGiftClick = @"vip_entrance_gift_click";///VIP礼物面板入口点击 +NSString *const StatisticsServiceEventvipEntranceFaceClick = @"vip_entrance_face_click";///VIP表情面板入口点击 +NSString *const StatisticsServiceEventvipEntranceMeClick = @"vip_entrance_me_click";///VIP我的页面入口点击 #pragma mark - 首页直播模块 NSString *const StatisticsServiceEventRecent_card_show = @"recent_card_show";///最近在看卡片曝光 NSString *const StatisticsServiceEventRecent_card_click = @"recent_card_click";///最近在看卡片点击 @@ -44,8 +44,8 @@ NSString *const StatisticsServiceEventPersonalshowTopCardVoiceClick = @"personal #pragma mark - 个人中心 NSString *const StatisticsServiceEventusercenter_recharge_card_show = @"usercenter_recharge_card_show"; ///个人中心充值卡片曝光 NSString *const StatisticsServiceEventusercenter_recharge_card_click = @"usercenter_recharge_card_click"; ///个人中心充值卡片点击（跳转充值页） -NSString *const StatisticsServiceEventusercenter_noble_card_show = @"usercenter_noble_card_show"; ///个人中心贵族卡片曝光 -NSString *const StatisticsServiceEventusercenter_noble_card_click = @"usercenter_noble_card_click";///个人中心贵族卡片片点击（跳转贵族页） +NSString *const StatisticsServiceEventusercenter_noble_card_show = @"usercenter_noble_card_show"; ///个人中心VIP卡片曝光 +NSString *const StatisticsServiceEventusercenter_noble_card_click = @"usercenter_noble_card_click";///个人中心VIP卡片片点击（跳转VIP页） NSString *const StatisticsServiceEventusercenter_function_show = @"usercenter_function_show"; ///个人中心功能板块曝光,曝光时统计功能的名称 NSString *const StatisticsServiceEventusercenter_function_click = @"usercenter_function_click"; ///个人中心功能板块点击,点击时统计功能的名称 NSString *const StatisticsServiceEventusercenter_quick_entry_show = @"usercenter_quick_entry_show"; ///个人中心快捷进房曝光,曝光时统计房间的id @@ -73,7 +73,7 @@ NSString *const StatisticsServiceEventroom_pop_click = @"room_pop_click"; ///房 NSString *const StatisticsServiceEventroom_chatbox_click = @"room_chatbox_click"; ///房间聊天框点击 NSString *const StatisticsServiceEventroom_music_click = @"room_music_click"; ///房间音乐点击 NSString *const StatisticsServiceEventroom_privateletter_click = @"room_privateletter_click"; ///房间私信点击 -NSString *const StatisticsServiceEventroom_noble_click = @"room_noble_click"; ///房间贵族点击 +NSString *const StatisticsServiceEventroom_noble_click = @"room_noble_click"; ///房间VIP点击 NSString *const StatisticsServiceEventroom_gift_click = @"room_gift_click"; ///房间送礼点击 NSString *const StatisticsServiceEventroom_more_tool_click = @"room_more_tool_click"; ///房间底部更多工具栏点击,统计用户展开面板后的行为 #pragma mark - 收藏房间列表 diff --git a/YuMi/ar.lproj/Localizable.strings b/YuMi/ar.lproj/Localizable.strings index 2834da2c..802cdd7b 100644 --- a/YuMi/ar.lproj/Localizable.strings +++ b/YuMi/ar.lproj/Localizable.strings @@ -619,8 +619,9 @@ "XPLoginPhoneViewController6" = "الرجاء إدخال رمز التحقق"; "XPLoginPhoneViewController7" = "تسجيل الدخول بكلمة المرور"; "XPLoginPhoneViewController8" = "تسجيل الدخول"; -"XPLoginPhoneViewController9" = "تسجيل الدخول بالحساب"; -"XPLoginPhoneViewController10" = "تسجيل الدخول عبر الرسائل القصيرة"; +"XPLoginPhoneViewController9" = "الحساب"; +"XPLoginPhoneViewController10" = "الرسائل القصيرة"; + "XPLoginInputView0" = "الحصول على رمز التحقق"; "XPLoginInputView1" = "إعادة إرسال"; @@ -1614,14 +1615,14 @@ ineHeadView12" = "الحمل"; "XPUserCardViewController1" = "تم حظر المستخدم بالفعل"; "XPUserCardViewController2" = "تمت العملية بنجاح"; "XPUserCardViewController3" = "تمت العملية بنجاح"; -"XPUserCardViewController4" = "هذا المستخدم %@ نبيل، ويمكن لمالك الغرفة فقط طرده"; -"XPUserCardViewController5" = "هذا المستخدم %@ نبيل\nهل أنت متأكد أنك تريد طرده؟"; +"XPUserCardViewController4" = "هذا المستخدم %@ VIP، ويمكن لمالك الغرفة فقط طرده"; +"XPUserCardViewController5" = "هذا المستخدم %@ VIP\nهل أنت متأكد أنك تريد طرده؟"; "XPUserCardViewController6" = "في وضع اللعب الافتراضي، هل ترغب في طرد هذا المستخدم إذا خرج من اللعبة؟"; "XPUserCardViewController7" = "في وضع اللعب الافتراضي، هل ترغب في طرد هذا المستخدم إذا خرج من اللعبة؟"; "XPUserCardViewController8" = "هل تريد طرد %@ من الغرفة؟"; "XPUserCardViewController9" = "تذكير العملية"; -"XPUserCardViewController10" = "هذا المستخدم %@ نبيل، ويمكن لمالك الغرفة فقط طرده"; -"XPUserCardViewController11" = "هذا المستخدم %@ نبيل\nهل أنت متأكد أنك تريد حظره؟"; +"XPUserCardViewController10" = "هذا المستخدم %@ VIP، ويمكن لمالك الغرفة فقط طرده"; +"XPUserCardViewController11" = "هذا المستخدم %@ VIP\nهل أنت متأكد أنك تريد حظره؟"; "XPUserCardViewController12" = "في وضع اللعب الافتراضي، هل ترغب في طرد هذا المستخدم إذا خرج من اللعبة؟"; "XPUserCardViewController13" = "هل ترغب في إضافة %@ إلى القائمة السوداء؟ بعد الإضافة، لن يتمكن من دخول هذه الغرفة، وفي وضع اللعب الافتراضي، سيتم طرده إذا خرج من اللعبة"; "XPUserCardViewController14" = "أنت تقوم بحظر %@"; @@ -1644,7 +1645,7 @@ ineHeadView12" = "الحمل"; "XPAnchorFansTeamEntranceView0" = "الفريق الفانز (%ld)"; "XPAnchorFansTeamEntranceView1" = "افتح الفريق الفانز"; -"XPAnchorFansTeamEntranceView2" = "نبيل LV.%zd "; +"XPAnchorFansTeamEntranceView2" = "VIP LV.%zd "; "XPAnchorFansTeamEntranceView3" = "انضم إلى الفريق الفانز"; "XPAnchorFansTeamEntranceView4" = "لم يتم فتح الفريق الفانز لهذا المستخدم بعد"; @@ -1685,7 +1686,7 @@ ineHeadView12" = "الحمل"; "XPRoomFunctionContainerView13" = "ابدأ الاختيار>"; "XPRoomFunctionContainerView18" = "غير مسموح بتغيير اللعبة أو وضع اللعبة وأنت في اللعبة!"; -"XPRoomBackContainerView0" = "فشل تحميل صورة الخلفية الخاصة بالنبيل"; +"XPRoomBackContainerView0" = "فشل تحميل صورة الخلفية الخاصة بالVIP"; "XPRoomBackContainerView1" = "فشل تحميل صورة الخلفية الخاصة بالمشغل"; "XPRoomRankEntranceView0" = "قائمة الغرف"; @@ -1997,11 +1998,11 @@ ineHeadView12" = "الحمل"; "XPRoomMessageParser77" = "رائع "; "XPRoomMessageParser78" = "حصل على"; "XPRoomMessageParser79" = "(مرئي فقط للنفس)"; -"XPRoomMessageParser80" = "النبيل يحين! تهانينا"; +"XPRoomMessageParser80" = "الVIP يحين! تهانينا"; "XPRoomMessageParser81" = "افتتاح نظام النبلاء، حصل على"; -"XPRoomMessageParser82" = "هوية النبيل!"; +"XPRoomMessageParser82" = "هوية الVIP!"; "XPRoomMessageParser83" = "هتافات الحضور!! تهانينا"; -"XPRoomMessageParser84" = "ترقية الهوية النبيلة ل"; +"XPRoomMessageParser84" = "ترقية الهوية الVIPة ل"; "XPRoomMessageParser85" = "تهانينا"; "XPRoomMessageParser86" = "لقد"; "XPRoomMessageParser87" = "تهانينا"; @@ -2054,8 +2055,8 @@ ineHeadView12" = "الحمل"; "XPGiftBarView5" = "الرجاء إدخال مبلغ الهدية"; "XPGiftBarView6" = "تأكيد"; -"XPGiftUsersView0" = "الإهداء للجميع"; -"XPGiftUsersView1" = "الإهداء للجميع"; +"XPGiftUsersView0" = "إرسال الكل"; +"XPGiftUsersView1" = "إرسال الكل"; "XPGiftHeadTypeView0" = "هدية التجديد الأولى"; "XPGiftHeadTypeView1" = "هدية التجديد الأولى"; @@ -2072,7 +2073,7 @@ ineHeadView12" = "الحمل"; "XPSendGiftView1" = "يمكن فقط الإهداء الكلي لشخص واحد"; "XPSendGiftView2" = "الرجاء تحديد شخص واحد على الأقل"; "XPSendGiftView3" = "تم إرسال هدية الرسم: %@ بنجاح"; -"XPSendGiftView4" = "لم يتم الوصول بعد إلى مستوى النبيل المطلوب لإرسال %@\nمستوى النبيل المطلوب: %@"; +"XPSendGiftView4" = "لم يتم الوصول بعد إلى مستوى الVIP المطلوب لإرسال %@\nمستوى الVIP المطلوب: %@"; "XPGraffitiGiftView0" = "يمكن رسم ما يصل إلى 300 فقط"; "XPGraffitiGiftView1" = "يجب رسم الحد الأدنى من 10 لإرسالها"; @@ -2092,7 +2093,7 @@ ineHeadView12" = "الحمل"; "XPGiftTwelveStarBroadcastView4" = "قصص الأبراج، افتتاح محدود لشهر الأبراج"; -"XPGiftInfoView0" = "القيمة الإجمالية:"; +"XPGiftInfoView0" = "الإجمالي:"; "XPGiftInfoView1" = "لا توجد هدايا حالياً~"; "XPGiftInfoView2" = "الهدايا"; "XPGiftInfoView3" = "الحظ السعيد"; @@ -2121,7 +2122,7 @@ ineHeadView12" = "الحمل"; "XPGiftWeekStarBroadcastView5" = "مقعد شاغر"; "XPRoomFaceViewController0" = "فشل التحميل، يرجى المحاولة مرة أخرى"; -"XPRoomFaceViewController1" = "لم تصل بعد إلى مستوى النبيل المطلوب لإرسال %@،\n المستوى النبيل المطلوب: %@"; +"XPRoomFaceViewController1" = "لم تصل بعد إلى مستوى الVIP المطلوب لإرسال %@،\n المستوى الVIP المطلوب: %@"; "XPRoomFaceViewController2" = "الرموز التعبيرية"; "XPRoomFaceViewController3" = "رموز تعبيرية النبلاء"; @@ -2188,7 +2189,7 @@ ineHeadView12" = "الحمل"; "XPRoomGiftCompoundView0" = "تهانينا"; // "XPRoomNobleLevelUpView0" = "تفجير المسرح! تهانينا "; -"XPRoomNobleLevelUpView1" = "تمت ترقية النبيل إلى %@!"; +"XPRoomNobleLevelUpView1" = "تمت ترقية الVIP إلى %@!"; "XPRoomCandyGiftView0" = "رائع! "; "XPRoomCandyGiftView1" = "حصل على "; @@ -2796,24 +2797,10 @@ ineHeadView12" = "الحمل"; "XPAnchorCardView0" = "الباقي"; "XPAnchorCardView1" = "الدخول إلى الغرفة"; -"TabbarViewController0" = "لقد تم طردك من الخط، إذا لم يكن هذا سلوكًا طبيعيًا، يرجى تغيير كلمة المرور في الوقت المناسب"; -"TabbarViewController1" = "قام الطرف الآخر بسحب رسالة واحدة"; -"TabbarViewController2" = "الصفحة الرئيسية"; -"TabbarViewController3" = "المنتديات"; -"TabbarViewController4" = "الرسائل"; -"TabbarViewController5" = "حسابي"; -"XPLoginPhoneViewController0" = "الرجاء إدخال رقم هاتف صحيح"; -"XPLoginPhoneViewController1" = "تم تسجيل الدخول بنجاح"; -"XPLoginPhoneViewController2" = "تم إرسال رمز التحقق بنجاح"; -"XPLoginPhoneViewController3" = "تسجيل الدخول باستخدام رقم الهاتف"; -"XPLoginPhoneViewController4" = "تسجيل الدخول تلقائيًا باستخدام رقم الهاتف غير المسجل"; -"XPLoginPhoneViewController5" = "الرجاء إدخال رقم الهاتف"; -"XPLoginPhoneViewController6" = "الرجاء إدخال رمز التحقق"; -"XPLoginPhoneViewController7" = "تسجيل الدخول بكلمة المرور"; -"XPLoginPhoneViewController8" = "تسجيل الدخول"; -"XPLoginPhoneViewController9" = "تسجيل الدخول باستخدام الحساب"; -"XPLoginPhoneViewController10" = "تسجيل الدخول برسالة نصية"; + + + "XPLoginInputView0" = "الحصول على رمز التحقق"; "XPLoginInputView1" = "إعادة الحصول"; @@ -3159,7 +3146,7 @@ ineHeadView12" = "الحمل"; "XPIncomeRecordGoldDetailsVC0" = "تفاصيل الألماس"; ///XPNobleCenterMyNobleView.m "XPNobleCenterMyNobleView0" = "المستوى الحالي"; -"XPNobleCenterMyNobleView1" = "لقد تم الوصول إلى أعلى مستوى نبيل قابل للإستخدام"; +"XPNobleCenterMyNobleView1" = "لقد تم الوصول إلى أعلى مستوى VIP قابل للإستخدام"; "XPNobleCenterMyNobleView2" = "المتبقي:"; "XPNobleCenterMyNobleView3" = "يمكن ترقية قوة السلطة إلى"; "XPNobleCenterMyNobleView4" = "الوقت المتبقي:"; @@ -3638,7 +3625,7 @@ ineHeadView12" = "الحمل"; "PIRoomPhotoAlbumItemVC4"="هل أنت متأكد من رغبتك في حذف هذه الصورة؟"; "PIRoomPhotoAlbumItemVC5"="هل ترغب في إرسال هذه الصورة إلى الشاشة العامة؟"; ///PIRoomPhotoAlbumChoosePhotoCell -"PIRoomPhotoAlbumChoosePhotoCell0"="يمكن تحميل ما يصل إلى 6 صور في كل مرة"; +"PIRoomPhotoAlbumChoosePhotoCell0"="حد أقصى 6 صور/تحميل"; ///PIRoomPhotoAlbumChoosePhotoTypeView "PIRoomPhotoAlbumChoosePhotoTypeView0"="نوع الصورة"; "PIRoomPhotoAlbumChoosePhotoTypeView1"="صور عادية"; diff --git a/YuMi/en.lproj/Localizable.strings b/YuMi/en.lproj/Localizable.strings index d314a7fd..86dae1ce 100644 --- a/YuMi/en.lproj/Localizable.strings +++ b/YuMi/en.lproj/Localizable.strings @@ -365,7 +365,8 @@ "XPLoginPhoneViewController7" = "Password login"; "XPLoginPhoneViewController8" = "Login"; -"XPLoginPhoneViewController9" = "Account login"; +"XPLoginPhoneViewController9" = "Account"; +"XPLoginPhoneViewController10" = "SMS"; "XPLoginInputView0" = "Get verification code"; @@ -847,7 +848,7 @@ "XPMineUserInfoViewController5" = "By adding to blacklist, you will no longer receive messages from this user"; "XPMineUserInfoViewController6" = "Removed from blacklist successfully"; "XPMineUserInfoViewController7" = "Added to blacklist successfully"; -"XPMineUserInfoViewController8" = "Private Message"; +"XPMineUserInfoViewController8" = "chat"; "XPMineUserInfoViewController9" = "Follow"; "XPMineUserInfoViewController10" = "Following"; "XPMineUserInfoViewController11" = "Profile"; @@ -1842,14 +1843,14 @@ "XPGiftBarView0" = "Balance: %@"; "XPGiftBarView1" = "Recharge"; -"XPGiftBarView2" = "Gift"; +"XPGiftBarView2" = "Send"; "XPGiftBarView3" = "Sending..."; -"XPGiftBarView4" = "Gift"; +"XPGiftBarView4" = "Send"; "XPGiftBarView5" = "Please enter gift amount"; "XPGiftBarView6" = "Confirm"; -"XPGiftUsersView0" = "Wheat Gift"; -"XPGiftUsersView1" = "Wheat Gift"; +"XPGiftUsersView0" = "Send All"; +"XPGiftUsersView1" = "Send All"; "XPGiftHeadTypeView0" = "First Recharge Bonus"; "XPGiftHeadTypeView1" = "First Recharge Bonus"; @@ -1883,15 +1884,15 @@ "XPGiftTwelveStarBroadcastView3" = "Event Details"; "XPGiftTwelveStarBroadcastView4" = "Zodiac Story, limited to opening zodiac month"; -"XPGiftInfoView0" = "Total value:"; +"XPGiftInfoView0" = "Total:"; "XPGiftInfoView1" = "No gifts available at the moment~"; "XPGiftInfoView2" = "Gifts"; "XPGiftInfoView3" = "Luck"; -"XPGiftInfoView4" = "Weekly Star"; -"XPGiftInfoView5" = "Backpack"; +"XPGiftInfoView4" = "WeekStar"; +"XPGiftInfoView5" = "Pack"; "XPGiftInfoView6" = "Graffiti Gifts"; "XPGiftInfoView7" = "Penalty Gifts"; -"XPGiftInfoView8" = "Popularity"; +"XPGiftInfoView8" = "Popular"; "XPGiftInfoView9" = "Noble"; "XPGiftCountView0" = "Other amounts"; "XPGiftCountView1" = "All"; @@ -2285,24 +2286,9 @@ "XPAnchorCardView0" = "Left: "; "XPAnchorCardView1" = "Enter Room"; -"TabbarViewController0" = "You have been logged out. If this is not normal, please change your password promptly"; -"TabbarViewController1" = "The other party has recalled a message"; -"TabbarViewController2" = "Home"; -"TabbarViewController3" = "Forum"; -"TabbarViewController4" = "Messages"; -"TabbarViewController5" = "My"; -"XPLoginPhoneViewController0" = "Please enter a valid phone number"; -"XPLoginPhoneViewController1" = "Login successful"; -"XPLoginPhoneViewController2" = "Verification code sent successfully"; -"XPLoginPhoneViewController3" = "Phone Number Login"; -"XPLoginPhoneViewController4" = "Auto-login with unregistered phone number"; -"XPLoginPhoneViewController5" = "Please enter phone number"; -"XPLoginPhoneViewController6" = "Verification code"; -"XPLoginPhoneViewController7" = "Password Login"; -"XPLoginPhoneViewController8" = "Login"; -"XPLoginPhoneViewController9" = "Account Login"; -"XPLoginPhoneViewController10" = "SMS Login"; + + "XPLoginInputView0" = "Get Verification Code"; "XPLoginInputView1" = "Resend"; @@ -3058,7 +3044,7 @@ "XPNobleUpgradeLevelView3" = "Go to Noble Center"; "XPNobleUpgradeLevelView4" = "Congratulations on becoming '%@'! The current level outfit has been automatically worn. Do you want to keep the original outfit?"; -"XPNobleCenterEntranceView0" = "You need %@ power values to upgrade"; +"XPNobleCenterEntranceView0" = "%@ Points to Upgrade"; "XPNobleCenterEntranceView1" = "Noble Center"; "XPNobleCenterEntranceView2" = "Open to enjoy various privileges"; @@ -3470,8 +3456,8 @@ ///PIRoomPhotoAlbumVC "PIRoomPhotoAlbumVC0"="Room Album"; "PIRoomPhotoAlbumVC1"="My Photos"; -"PIRoomPhotoAlbumVC2"="Regular Photos"; -"PIRoomPhotoAlbumVC3"="Unlocked Photos"; +"PIRoomPhotoAlbumVC2"="Ordinary"; +"PIRoomPhotoAlbumVC3"="Unlock"; ///PIRoomPhotoAlbumItemVC "PIRoomPhotoAlbumItemVC0"="Upload Photo"; "PIRoomPhotoAlbumItemVC1"="Upload Failed, Please Retry"; @@ -3483,8 +3469,8 @@ "PIRoomPhotoAlbumChoosePhotoCell0"="Up to 6 photos per upload"; ///PIRoomPhotoAlbumChoosePhotoTypeView "PIRoomPhotoAlbumChoosePhotoTypeView0"="Photo Type"; -"PIRoomPhotoAlbumChoosePhotoTypeView1"="Regular Photos"; -"PIRoomPhotoAlbumChoosePhotoTypeView2"="Unlocked Photos"; +"PIRoomPhotoAlbumChoosePhotoTypeView1"="Ordinary"; +"PIRoomPhotoAlbumChoosePhotoTypeView2"="Unlock"; ///PIRoomPhotoAlbumChoosePhotoGiftView "PIRoomPhotoAlbumChoosePhotoGiftView0"="Unlock Gifts"; "PIRoomPhotoAlbumChoosePhotoGiftView1"="No need to select unlock gifts currently"; diff --git a/YuMi/zh-Hans.lproj/Localizable.strings b/YuMi/zh-Hans.lproj/Localizable.strings index dffa01cc..074a078f 100644 --- a/YuMi/zh-Hans.lproj/Localizable.strings +++ b/YuMi/zh-Hans.lproj/Localizable.strings @@ -74,11 +74,11 @@ "StatisticsServiceHelper3" = "qq登录"; "StatisticsServiceHelper4" = "微信登录"; "StatisticsServiceHelper5" = "注册时候的个人资料保存成功"; -"StatisticsServiceHelper6" = "开通贵族点击"; -"StatisticsServiceHelper7" = "贵族房间入口点击"; -"StatisticsServiceHelper8" = "贵族礼物面板入口点击"; -"StatisticsServiceHelper9" = "贵族表情面板入口点击"; -"StatisticsServiceHelper10" = "贵族我的页面入口点击"; +"StatisticsServiceHelper6" = "开通VIP点击"; +"StatisticsServiceHelper7" = "VIP房间入口点击"; +"StatisticsServiceHelper8" = "VIP礼物面板入口点击"; +"StatisticsServiceHelper9" = "VIP表情面板入口点击"; +"StatisticsServiceHelper10" = "VIP我的页面入口点击"; "SDPhotoBrowser0" = "保存"; @@ -1004,14 +1004,14 @@ "XPUserCardViewController1" = "用户已经被拉黑了"; "XPUserCardViewController2" = "清除成功"; "XPUserCardViewController3" = "操作成功"; -"XPUserCardViewController4" = "该用户为%@贵族，只有房主才可以踢出哦~"; -"XPUserCardViewController5" = "该用户为%@贵族\n确认是否要将其踢出房间？"; +"XPUserCardViewController4" = "该用户为%@VIP，只有房主才可以踢出哦~"; +"XPUserCardViewController5" = "该用户为%@VIP\n确认是否要将其踢出房间？"; "XPUserCardViewController6" = "游戏模式下默认该玩家退出游戏是否要将此用户踢出房间？"; "XPUserCardViewController7" = "游戏模式下默认该玩家退出游戏是否要将此用户踢出房间"; "XPUserCardViewController8" = "是否需要将%@踢出房间？"; "XPUserCardViewController9" = "操作提醒"; -"XPUserCardViewController10" = "该用户为%@贵族，只有房主才可以踢出哦"; -"XPUserCardViewController11" = "该用户为%@贵族\n确认是否要将其拉黑？"; +"XPUserCardViewController10" = "该用户为%@VIP，只有房主才可以踢出哦"; +"XPUserCardViewController11" = "该用户为%@VIP\n确认是否要将其拉黑？"; "XPUserCardViewController12" = "游戏模式下默认该玩家退出游戏是否要将此用户踢出房间"; "XPUserCardViewController13" = "是否将%@加入黑名单？加入后他将无法进入此房间游戏模式下默认该玩家退出游戏"; "XPUserCardViewController14" = "你正在拉黑%@"; @@ -1078,7 +1078,7 @@ "XPRoomFunctionContainerView13" = "开始选择>"; "XPRoomFunctionContainerView18" = "游戏中不可切换游戏或玩法!"; -"XPRoomBackContainerView0" = "贵族专属背景图加载失败"; +"XPRoomBackContainerView0" = "VIP专属背景图加载失败"; "XPRoomBackContainerView1" = "个播背景图加载失败"; "XPRoomRankEntranceView0" = "房间榜"; @@ -1408,11 +1408,11 @@ "XPRoomMessageParser77" = "厉害了 "; "XPRoomMessageParser78" = "通过寻爱之旅获取"; "XPRoomMessageParser79" = "(仅自己可见)"; -"XPRoomMessageParser80" = "贵族降临！恭喜"; -"XPRoomMessageParser81" = "开通贵族系统，获得"; -"XPRoomMessageParser82" = "贵族身份！"; +"XPRoomMessageParser80" = "VIP降临！恭喜"; +"XPRoomMessageParser81" = "开通VIP系统，获得"; +"XPRoomMessageParser82" = "VIP身份！"; "XPRoomMessageParser83" = "全场欢呼！！恭喜"; -"XPRoomMessageParser84" = "的贵族身份成功升级为"; +"XPRoomMessageParser84" = "的VIP身份成功升级为"; "XPRoomMessageParser85" = "恭喜"; "XPRoomMessageParser86" = "您"; "XPRoomMessageParser87" = "恭喜"; @@ -1472,7 +1472,7 @@ "XPGiftHeadTypeView1" = "首充有礼"; "XPGiftHeadTypeView2" = "送礼"; "XPGiftHeadTypeView3" = "互动"; -"XPGiftHeadTypeView4" = "贵族中心"; +"XPGiftHeadTypeView4" = "VIP中心"; "XPGiftLuckyGiftBroadcastCell0" = "恭喜 "; "XPGiftLuckyGiftBroadcastCell1" = "开出%@获得 "; @@ -1484,7 +1484,7 @@ "XPSendGiftView1" = "只能全部赠送给一人"; "XPSendGiftView2" = "请选择至少一个人"; "XPSendGiftView3" = "发送涂鸦礼物：%@成功"; -"XPSendGiftView4" = "尚未达到赠送%@所需要的贵族等级哦\n所需贵族等级：%@"; +"XPSendGiftView4" = "尚未达到赠送%@所需要的VIP等级哦\n所需VIP等级：%@"; "XPGraffitiGiftView0" = "最多只能画300个呦"; "XPGraffitiGiftView1" = "至少画10个才能送出"; @@ -1511,7 +1511,7 @@ "XPGiftInfoView6" = "涂鸦礼物"; "XPGiftInfoView7" = "惩罚礼物"; "XPGiftInfoView8" = "人气"; -"XPGiftInfoView9" = "贵族"; +"XPGiftInfoView9" = "VIP"; "XPGiftCountView0" = "其他数额"; "XPGiftCountView1" = "全部"; "XPGiftCountView2" = "其他数额"; @@ -1531,9 +1531,9 @@ "XPGiftWeekStarBroadcastView5" = "虚位以待"; "XPRoomFaceViewController0" = "加载失败请重试"; -"XPRoomFaceViewController1" = "尚未达到发送%@所需贵族等级，\n 所需贵族等级：%@"; +"XPRoomFaceViewController1" = "尚未达到发送%@所需VIP等级，\n 所需VIP等级：%@"; "XPRoomFaceViewController2" = "表情"; -"XPRoomFaceViewController3" = "贵族表情"; +"XPRoomFaceViewController3" = "VIP表情"; "XPSailingAnimationView0" = "厉害了"; "XPSailingAnimationView1" = "在航海冒险中获得"; @@ -1603,7 +1603,7 @@ "XPRoomGiftCompoundView0" = "恭喜"; "XPRoomNobleLevelUpView0" = "引爆全场！恭喜 "; -"XPRoomNobleLevelUpView1" = "贵族身份升级为%@!"; +"XPRoomNobleLevelUpView1" = "VIP身份升级为%@!"; "XPRoomCandyGiftView0" = "厉害了! "; "XPRoomCandyGiftView1" = "通过寻爱之旅获取 "; @@ -2652,17 +2652,17 @@ "XPIncomeRecordGoldDetailsPickViewView4"="月"; "XPIncomeRecordGoldDetailsPickViewView5"="日"; ///XPNobleSettingViewController.m -"XPNobleSettingViewController0" = "贵族设置"; +"XPNobleSettingViewController0" = "VIP设置"; "XPNobleSettingViewController1" = "隐身进房"; ///XPNobleCenterViewController.m -"XPNobleCenterViewController0" = "%.2f立即开通贵族特权"; +"XPNobleCenterViewController0" = "%.2f立即开通VIP特权"; "XPNobleCenterViewController1" = "购买失败"; "XPNobleCenterViewController2" = "出现未知错误，请重新尝试"; "XPNobleCenterViewController3" = "金币余额不足，是否充值"; ///XPNobleCenterMyNobleView.m "XPNobleCenterMyNobleView0" = "当前等级"; -"XPNobleCenterMyNobleView1" = " 已达到可用最高贵族等级"; +"XPNobleCenterMyNobleView1" = " 已达到可用最高VIP等级"; "XPNobleCenterMyNobleView2" = " 还差:"; "XPNobleCenterMyNobleView3" = "权力力值可升级到到"; "XPNobleCenterMyNobleView4" = " 剩馀时间:"; @@ -2679,29 +2679,29 @@ "XPNobleCenterWindow0"="充值"; "XPNobleCenterWindow1"="您当前是%@等级，确认购买更高%@等级"; ///XPNobleSettingNavView.m -"XPNobleSettingNavView0" = "贵族设置"; +"XPNobleSettingNavView0" = "VIP设置"; ///XPNobleCenterNavView.m -"XPNobleCenterNavView0" = "贵族中心"; +"XPNobleCenterNavView0" = "VIP中心"; ///XPNobleCenterTableHeadView.m "XPNobleCenterTableHeadView0" = "当前权力值：%zd"; -"XPNobleCenterTableHeadView1" = "尚未开通贵族"; +"XPNobleCenterTableHeadView1" = "尚未开通VIP"; "XPNobleCenterTableHeadView2" = "当前权力值："; ///XPNobleCenterResidueView.m "XPNobleCenterResidueView0" = "剩馀时间说明"; -"XPNobleCenterResidueView1" = "剩馀时间以30天为周期，以获得新的贵族等级次日起算30日后的中午12:00为截止时间，周期内贵族等级出现变化则剩馀时间自动重置为30天。"; +"XPNobleCenterResidueView1" = "剩馀时间以30天为周期，以获得新的VIP等级次日起算30日后的中午12:00为截止时间，周期内VIP等级出现变化则剩馀时间自动重置为30天。"; ///XPNobleUpgradeLevelView.m "XPNobleUpgradeLevelView0" = "升级啦！"; "XPNobleUpgradeLevelView1" = "保留原有装扮"; "XPNobleUpgradeLevelView2" = "佩戴高等级装扮"; -"XPNobleUpgradeLevelView3" = "前往贵族中心"; +"XPNobleUpgradeLevelView3" = "前往VIP中心"; "XPNobleUpgradeLevelView4" = "恭喜你成为‘%@’！当前已自动佩戴该等级装扮，是否保留原有装扮？"; ///XPNobleCenterEntranceView.m "XPNobleCenterEntranceView0" = "距升级还差%@权力值"; -"XPNobleCenterEntranceView1" = "贵族中心"; +"XPNobleCenterEntranceView1" = "VIP中心"; "XPNobleCenterEntranceView2" = "开通立享各项特权"; ///XPNobleCenterPayView "XPNobleCenterPayView0" = "支付"; @@ -2709,7 +2709,7 @@ "XPNobleCenterPayView2" = "金币支付"; "XPNobleCenterPayView3" = "确认支付"; ///XPNoblePrivilegeContentCell -"XPNoblePrivilegeContentCell0"="贵族特权"; +"XPNoblePrivilegeContentCell0"="VIP特权"; "XPNoblePrivilegeContentCell1"="返钻特权"; //PINobleCenterListCell "PINobleCenterListCell0"="领取"; @@ -2725,7 +2725,7 @@ "PINoblePrivilegeEmptyCell0"="当前等级不享有该特权～"; //PINobleCenterListView "PINobleCenterListView0"="用户直接购买%@等级，除了直接享有等级对应的所有特权，还能获得额外返利金币。\n\n具体返利日期以及返利金币数量如下："; -"PINobleCenterListView1"="注：\n返利金币需在贵族开通后30天内领取完毕，逾期失效\n领取后的返利金币可到【我的-收益记录-金币明细-收入记录】中查看。"; +"PINobleCenterListView1"="注：\n返利金币需在VIP开通后30天内领取完毕，逾期失效\n领取后的返利金币可到【我的-收益记录-金币明细-收入记录】中查看。"; ///LoginForgetEditView.m "LoginForgetEditView0" = "获取验证码"; diff --git a/YuMi/zh-Hant.lproj/Localizable.strings b/YuMi/zh-Hant.lproj/Localizable.strings index 38487134..b048e0da 100644 --- a/YuMi/zh-Hant.lproj/Localizable.strings +++ b/YuMi/zh-Hant.lproj/Localizable.strings @@ -74,11 +74,11 @@ "StatisticsServiceHelper3" = "qq登錄"; "StatisticsServiceHelper4" = "微信登錄"; "StatisticsServiceHelper5" = "註冊時候的個人資料保存成功"; -"StatisticsServiceHelper6" = "開通貴族點擊"; -"StatisticsServiceHelper7" = "貴族房間入口點擊"; -"StatisticsServiceHelper8" = "貴族禮物面板入口點擊"; -"StatisticsServiceHelper9" = "貴族表情面板入口點擊"; -"StatisticsServiceHelper10" = "貴族我的頁面入口點擊"; +"StatisticsServiceHelper6" = "開通VIP點擊"; +"StatisticsServiceHelper7" = "VIP房間入口點擊"; +"StatisticsServiceHelper8" = "VIP禮物面板入口點擊"; +"StatisticsServiceHelper9" = "VIP表情面板入口點擊"; +"StatisticsServiceHelper10" = "VIP我的頁面入口點擊"; "SDPhotoBrowser0" = "保存"; @@ -1005,14 +1005,14 @@ "XPUserCardViewController1" = "用戶已經被拉黑了"; "XPUserCardViewController2" = "清除成功"; "XPUserCardViewController3" = "操作成功"; -"XPUserCardViewController4" = "該用戶為%@貴族，只有房主才可以踢出哦~"; -"XPUserCardViewController5" = "該用戶為%@貴族\n確認是否要將其踢出房間？"; +"XPUserCardViewController4" = "該用戶為%@VIP，只有房主才可以踢出哦~"; +"XPUserCardViewController5" = "該用戶為%@VIP\n確認是否要將其踢出房間？"; "XPUserCardViewController6" = "遊戲模式下默認該玩家退出遊戲是否要將此用戶踢出房間？"; "XPUserCardViewController7" = "遊戲模式下默認該玩家退出遊戲是否要將此用戶踢出房間"; "XPUserCardViewController8" = "是否需要將%@踢出房間？"; "XPUserCardViewController9" = "操作提醒"; -"XPUserCardViewController10" = "該用戶為%@貴族，只有房主才可以踢出哦"; -"XPUserCardViewController11" = "該用戶為%@貴族\n確認是否要將其拉黑？"; +"XPUserCardViewController10" = "該用戶為%@VIP，只有房主才可以踢出哦"; +"XPUserCardViewController11" = "該用戶為%@VIP\n確認是否要將其拉黑？"; "XPUserCardViewController12" = "遊戲模式下默認該玩家退出遊戲是否要將此用戶踢出房間"; "XPUserCardViewController13" = "是否將%@加入黑名單？加入後他將無法進入此房間遊戲模式下默認該玩家退出遊戲"; "XPUserCardViewController14" = "你正在拉黑%@"; @@ -1079,7 +1079,7 @@ "XPRoomFunctionContainerView13" = "開始選擇>"; "XPRoomFunctionContainerView18" = "遊戲中不可切換遊戲或玩法!"; -"XPRoomBackContainerView0" = "貴族專屬背景圖加載失敗"; +"XPRoomBackContainerView0" = "VIP專屬背景圖加載失敗"; "XPRoomBackContainerView1" = "個播背景圖加載失敗"; "XPRoomRankEntranceView0" = "房間榜"; @@ -1409,11 +1409,11 @@ "XPRoomMessageParser77" = "厲害了 "; "XPRoomMessageParser78" = "通過尋愛之旅獲取"; "XPRoomMessageParser79" = "(僅自己可見)"; -"XPRoomMessageParser80" = "貴族降臨！恭喜"; -"XPRoomMessageParser81" = "開通貴族系統，獲得"; -"XPRoomMessageParser82" = "貴族身份！"; +"XPRoomMessageParser80" = "VIP降臨！恭喜"; +"XPRoomMessageParser81" = "開通VIP系統，獲得"; +"XPRoomMessageParser82" = "VIP身份！"; "XPRoomMessageParser83" = "全場歡呼！！恭喜"; -"XPRoomMessageParser84" = "的貴族身份成功升級為"; +"XPRoomMessageParser84" = "的VIP身份成功升級為"; "XPRoomMessageParser85" = "恭喜"; "XPRoomMessageParser86" = "您"; "XPRoomMessageParser87" = "恭喜"; @@ -1473,7 +1473,7 @@ "XPGiftHeadTypeView1" = "首充有禮"; "XPGiftHeadTypeView2" = "送禮"; "XPGiftHeadTypeView3" = "互動"; -"XPGiftHeadTypeView4" = "貴族中心"; +"XPGiftHeadTypeView4" = "VIP中心"; "XPGiftLuckyGiftBroadcastCell0" = "恭喜 "; "XPGiftLuckyGiftBroadcastCell1" = "開出%@獲得 "; @@ -1483,7 +1483,7 @@ "XPSendGiftView1" = "只能全部贈送給一人"; "XPSendGiftView2" = "請選擇至少一個人"; "XPSendGiftView3" = "發送塗鴉禮物：%@成功"; -"XPSendGiftView4" = "尚未達到贈送%@所需要的貴族等級哦\n所需貴族等級：%@"; +"XPSendGiftView4" = "尚未達到贈送%@所需要的VIP等級哦\n所需VIP等級：%@"; "XPGraffitiGiftView0" = "最多只能畫300個呦"; "XPGraffitiGiftView1" = "至少畫10個才能送出"; @@ -1510,7 +1510,7 @@ "XPGiftInfoView6" = "塗鴉禮物"; "XPGiftInfoView7" = "懲罰禮物"; "XPGiftInfoView8" = "人氣"; -"XPGiftInfoView9" = "貴族"; +"XPGiftInfoView9" = "VIP"; "XPGiftCountView0" = "其他數額"; "XPGiftCountView1" = "全部"; "XPGiftCountView2" = "其他數額"; @@ -1530,9 +1530,9 @@ "XPGiftWeekStarBroadcastView5" = "虛位以待"; "XPRoomFaceViewController0" = "加載失敗請重試"; -"XPRoomFaceViewController1" = "尚未達到發送%@所需貴族等級，\n 所需貴族等級：%@"; +"XPRoomFaceViewController1" = "尚未達到發送%@所需VIP等級，\n 所需VIP等級：%@"; "XPRoomFaceViewController2" = "表情"; -"XPRoomFaceViewController3" = "貴族表情"; +"XPRoomFaceViewController3" = "VIP表情"; "XPSailingAnimationView0" = "厲害了"; "XPSailingAnimationView1" = "在航海冒險中獲得"; @@ -1602,7 +1602,7 @@ "XPRoomGiftCompoundView0" = "恭喜"; "XPRoomNobleLevelUpView0" = "引爆全場！恭喜 "; -"XPRoomNobleLevelUpView1" = "貴族身份升級為%@!"; +"XPRoomNobleLevelUpView1" = "VIP身份升級為%@!"; "XPRoomCandyGiftView0" = "厲害了! "; "XPRoomCandyGiftView1" = "通過尋愛之旅獲取 "; @@ -2640,17 +2640,17 @@ "XPIncomeRecordGoldDetailsPickViewView4"="月"; "XPIncomeRecordGoldDetailsPickViewView5"="日"; ///XPNobleSettingViewController.m -"XPNobleSettingViewController0" = "貴族設置"; +"XPNobleSettingViewController0" = "VIP設置"; "XPNobleSettingViewController1" = "隱身進房"; ///XPNobleCenterViewController.m -"XPNobleCenterViewController0" = "%.2f立即開通貴族特權"; +"XPNobleCenterViewController0" = "%.2f立即開通VIP特權"; "XPNobleCenterViewController1" = "購買失敗"; "XPNobleCenterViewController2" = "出現未知錯誤，請重新嘗試"; "XPNobleCenterViewController3" = "金幣余額不足，是否充值"; ///XPNobleCenterMyNobleView.m "XPNobleCenterMyNobleView0" = "當前等級"; -"XPNobleCenterMyNobleView1" = " 已達到可用最高貴族等級"; +"XPNobleCenterMyNobleView1" = " 已達到可用最高VIP等級"; "XPNobleCenterMyNobleView2" = " 還差:"; "XPNobleCenterMyNobleView3" = "權力力值可升級到到"; "XPNobleCenterMyNobleView4" = " 剩餘時間:"; @@ -2667,29 +2667,29 @@ "XPNobleCenterWindow0"="充值"; "XPNobleCenterWindow1"="您當前是%@等級，確認購買更高%@等級"; ///XPNobleSettingNavView.m -"XPNobleSettingNavView0" = "貴族設置"; +"XPNobleSettingNavView0" = "VIP設置"; ///XPNobleCenterNavView.m -"XPNobleCenterNavView0" = "貴族中心"; +"XPNobleCenterNavView0" = "VIP中心"; ///XPNobleCenterTableHeadView.m "XPNobleCenterTableHeadView0" = "當前權力值：%zd"; -"XPNobleCenterTableHeadView1" = "尚未開通貴族"; +"XPNobleCenterTableHeadView1" = "尚未開通VIP"; "XPNobleCenterTableHeadView2" = "當前權力值："; ///XPNobleCenterResidueView.m "XPNobleCenterResidueView0" = "剩餘時間說明"; -"XPNobleCenterResidueView1" = "剩餘時間以30天為周期，以獲得新的貴族等級次日起算30日後的中午12:00為截止時間，周期內貴族等級出現變化則剩餘時間自動重置為30天。"; +"XPNobleCenterResidueView1" = "剩餘時間以30天為周期，以獲得新的VIP等級次日起算30日後的中午12:00為截止時間，周期內VIP等級出現變化則剩餘時間自動重置為30天。"; ///XPNobleUpgradeLevelView.m "XPNobleUpgradeLevelView0" = "升級啦！"; "XPNobleUpgradeLevelView1" = "保留原有裝扮"; "XPNobleUpgradeLevelView2" = "佩戴高等級裝扮"; -"XPNobleUpgradeLevelView3" = "前往貴族中心"; +"XPNobleUpgradeLevelView3" = "前往VIP中心"; "XPNobleUpgradeLevelView4" = "恭喜你成為『%@』！當前已自動佩戴該等級裝扮，是否保留原有裝扮？"; ///XPNobleCenterEntranceView.m "XPNobleCenterEntranceView0" = "距升級還差%@權力值"; -"XPNobleCenterEntranceView1" = "貴族中心"; +"XPNobleCenterEntranceView1" = "VIP中心"; "XPNobleCenterEntranceView2" = "開通立享各項特權"; ///XPNobleCenterPayView "XPNobleCenterPayView0" = "支付"; @@ -2697,7 +2697,7 @@ "XPNobleCenterPayView2" = "金幣支付"; "XPNobleCenterPayView3" = "確認支付"; ///XPNoblePrivilegeContentCell -"XPNoblePrivilegeContentCell0"="贵族特權"; +"XPNoblePrivilegeContentCell0"="VIP特權"; "XPNoblePrivilegeContentCell1"="返钻特權"; //PINobleCenterListCell "PINobleCenterListCell0"="領取"; @@ -2713,7 +2713,7 @@ "PINoblePrivilegeEmptyCell0"="當前等級不享有該特權～"; //PINobleCenterListView "PINobleCenterListView0"="用戶直接購買%@等級，除了直接享有等級對應的所有特權，還能獲得額外返利金幣。\n\n具體返利日期以及返利金幣數量如下："; -"PINobleCenterListView1"="注：\n返利金幣需在貴族開通後30天內領取完畢，逾期失效\n領取後的返利金幣可到【我的-收益記錄-金幣明細-收入記錄】中查看。"; +"PINobleCenterListView1"="注：\n返利金幣需在VIP開通後30天內領取完畢，逾期失效\n領取後的返利金幣可到【我的-收益記錄-金幣明細-收入記錄】中查看。"; ///LoginForgetEditView.m "LoginForgetEditView0" = "獲取驗證碼";