From 5e2c5080c52b141f7e78520b84aedb6e3c7946f8 Mon Sep 17 00:00:00 2001 From: liyuhua <15626451870@163.com> Date: Mon, 11 Dec 2023 16:11:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- YuMi.xcodeproj/project.pbxproj | 8 +- YuMi/Modules/YMLogin/Model/LoginAreaModel.h | 3 +- YuMi/Modules/YMLogin/Model/LoginAreaModel.m | 4 +- .../View/NewLogin/XPLoginAraeViewController.m | 18 +- .../View/NewLogin/XPLoginAreaTableViewCell.m | 7 +- .../Modules/YMRoom/View/StageView/StageView.m | 4 +- YuMi/Tools/NSString/NSString+Utils.m | 2 +- YuMi/pi_area_info.json | 1097 +++++++---------- YuMi/zh-Hans.lproj/Localizable.strings | 2 +- YuMi/zh-Hant.lproj/Localizable.strings | 2 +- 10 files changed, 468 insertions(+), 679 deletions(-) diff --git a/YuMi.xcodeproj/project.pbxproj b/YuMi.xcodeproj/project.pbxproj index d30278ec..0fd60151 100644 --- a/YuMi.xcodeproj/project.pbxproj +++ b/YuMi.xcodeproj/project.pbxproj @@ -300,7 +300,7 @@ 239141C92AE1358F00322CA9 /* PIInputEntireServerScrollingView.m in Sources */ = {isa = PBXBuildFile; fileRef = 239141C82AE1358F00322CA9 /* PIInputEntireServerScrollingView.m */; }; 239141CC2AE267EF00322CA9 /* PIReceiveRedPacketSuccessView.m in Sources */ = {isa = PBXBuildFile; fileRef = 239141CB2AE267EF00322CA9 /* PIReceiveRedPacketSuccessView.m */; }; 23942E912A86424500D0ECC2 /* XPLoginAuthCodeVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 23942E902A86424500D0ECC2 /* XPLoginAuthCodeVC.m */; }; - 2396FCE22B21D34A0014021D /* pi_area_info.json in Resources */ = {isa = PBXBuildFile; fileRef = 2396FCE12B21D34A0014021D /* pi_area_info.json */; }; + 2396FCE42B22BE5D0014021D /* pi_area_info.json in Resources */ = {isa = PBXBuildFile; fileRef = 2396FCE32B22BE5D0014021D /* pi_area_info.json */; }; 239BEEDB2AA1E058005CDA94 /* PIHoemCategoryTitleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 239BEEDA2AA1E058005CDA94 /* PIHoemCategoryTitleView.m */; }; 23A439742AA1CF7C002E6039 /* XPNewHomeHeadView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23A439732AA1CF7C002E6039 /* XPNewHomeHeadView.m */; }; 23B2AEC12A64E9C200543D17 /* LoginForgetEditView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23B2AEC02A64E9C200543D17 /* LoginForgetEditView.m */; }; @@ -2064,7 +2064,7 @@ 239141CB2AE267EF00322CA9 /* PIReceiveRedPacketSuccessView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIReceiveRedPacketSuccessView.m; sourceTree = ""; }; 23942E8F2A86424500D0ECC2 /* XPLoginAuthCodeVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPLoginAuthCodeVC.h; sourceTree = ""; }; 23942E902A86424500D0ECC2 /* XPLoginAuthCodeVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPLoginAuthCodeVC.m; sourceTree = ""; }; - 2396FCE12B21D34A0014021D /* pi_area_info.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = pi_area_info.json; sourceTree = ""; }; + 2396FCE32B22BE5D0014021D /* pi_area_info.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = pi_area_info.json; sourceTree = ""; }; 239BEED92AA1E058005CDA94 /* PIHoemCategoryTitleView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIHoemCategoryTitleView.h; sourceTree = ""; }; 239BEEDA2AA1E058005CDA94 /* PIHoemCategoryTitleView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIHoemCategoryTitleView.m; sourceTree = ""; }; 23A439722AA1CF7C002E6039 /* XPNewHomeHeadView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPNewHomeHeadView.h; sourceTree = ""; }; @@ -4595,7 +4595,7 @@ E84A2EAC2A52F20900D6AF8A /* Launch Screen.storyboard */, 23E9EB322A85E97B00B792F2 /* pi_login_new_logo.png */, 23E9EB302A85E5D100B792F2 /* pi_app_logo_new_bg.png */, - 2396FCE12B21D34A0014021D /* pi_area_info.json */, + 2396FCE32B22BE5D0014021D /* pi_area_info.json */, 189DD53D26DE255600AB55B1 /* Info.plist */, E80E09AB2A40B70100CD2BE7 /* Localizable.strings */, 189DD53E26DE255600AB55B1 /* main.m */, @@ -10752,7 +10752,7 @@ E80EC87628ACD84000D133C5 /* emoji_139@2x.png in Resources */, 23CEFC572AFB8FC100576D89 /* pay_off@2x.png in Resources */, E80EC86328ACD84000D133C5 /* emoji_41@2x.png in Resources */, - 2396FCE22B21D34A0014021D /* pi_area_info.json in Resources */, + 2396FCE42B22BE5D0014021D /* pi_area_info.json in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/YuMi/Modules/YMLogin/Model/LoginAreaModel.h b/YuMi/Modules/YMLogin/Model/LoginAreaModel.h index e50289cd..1d432026 100644 --- a/YuMi/Modules/YMLogin/Model/LoginAreaModel.h +++ b/YuMi/Modules/YMLogin/Model/LoginAreaModel.h @@ -13,8 +13,7 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic,copy) NSString *codeId; @property (nonatomic,copy) NSString *name; @property (nonatomic,copy) NSString *abbr; -@property (nonatomic,copy) NSString *phone_area_code; -@property (nonatomic,copy) NSString *pi_phoneAreaCode; +@property (nonatomic,copy) NSString *code; @property (nonatomic,copy) NSString *seq; @property (nonatomic,copy) NSString *status; @property (nonatomic,copy) NSString *region; diff --git a/YuMi/Modules/YMLogin/Model/LoginAreaModel.m b/YuMi/Modules/YMLogin/Model/LoginAreaModel.m index 15a006b4..a552d633 100644 --- a/YuMi/Modules/YMLogin/Model/LoginAreaModel.m +++ b/YuMi/Modules/YMLogin/Model/LoginAreaModel.m @@ -8,7 +8,5 @@ #import "LoginAreaModel.h" @implementation LoginAreaModel -+ (NSDictionary *)replacedKeyFromPropertyName { - return @{@"pi_phoneAreaCode":@"phoneAreaCode"}; -} + @end diff --git a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginAraeViewController.m b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginAraeViewController.m index 8369346d..2635b3c3 100644 --- a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginAraeViewController.m +++ b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginAraeViewController.m @@ -54,19 +54,19 @@ for (NSString *letter in letterList) { NSMutableArray *modelList = [NSMutableArray array]; for (LoginAreaModel *model in list) { - if([model.phone_area_code isEqualToString:@"886"]){ + if([model.code isEqualToString:@"886"]){ TwModel = model; } - if([model.phone_area_code isEqualToString:@"852"]){ + if([model.code isEqualToString:@"852"]){ HKModel = model; } - if([model.phone_area_code isEqualToString:@"65"]){ + if([model.code isEqualToString:@"65"]){ SPModel = model; } - if([model.phone_area_code isEqualToString:@"60"]){ + if([model.code isEqualToString:@"60"]){ MYModel = model; } - if([model.phone_area_code isEqualToString:@"86"]){ + if([model.code isEqualToString:@"86"]){ ChinsModel = model; } NSString *fristLetter = [model.name substringWithRange:NSMakeRange(0, 1)]; @@ -100,8 +100,10 @@ [defaultList addObject:ChinsModel]; } [self.listData insertObject:defaultList atIndex:0]; - [self.listData addObject:otherList]; - [self.titleList addObject:@"#"]; + if(otherList.count > 0){ + [self.listData addObject:otherList]; + [self.titleList addObject:@"#"]; + } [self.tableView reloadData]; } #pragma mark - UITableViewDelegate @@ -139,7 +141,7 @@ LoginAreaModel *codeModel = model; if(self.delegate && [self.delegate respondsToSelector:@selector(chooseAreaCodeSuccess:)]){ - [self.delegate chooseAreaCodeSuccess:codeModel.pi_phoneAreaCode ?: codeModel.phone_area_code]; + [self.delegate chooseAreaCodeSuccess:codeModel.code]; } [self.navigationController popViewControllerAnimated:YES]; } diff --git a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginAreaTableViewCell.m b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginAreaTableViewCell.m index 1c811272..5d00b822 100644 --- a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginAreaTableViewCell.m +++ b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginAreaTableViewCell.m @@ -55,11 +55,8 @@ - (void)setAreaModel:(LoginAreaModel *)areaModel{ _areaModel = areaModel; _areaVeiw.text = _areaModel.name; - if(_areaModel.pi_phoneAreaCode == nil){ - _codeView.text = _areaModel.phone_area_code; - return; - } - _codeView.text = _areaModel.pi_phoneAreaCode; + _codeView.text = _areaModel.code; + } #pragma mark - 懒加载 diff --git a/YuMi/Modules/YMRoom/View/StageView/StageView.m b/YuMi/Modules/YMRoom/View/StageView/StageView.m index 96d31084..320df883 100644 --- a/YuMi/Modules/YMRoom/View/StageView/StageView.m +++ b/YuMi/Modules/YMRoom/View/StageView/StageView.m @@ -512,7 +512,9 @@ break; } } - + if (content.source.userId.integerValue == [AccountInfoStorage instance].getUid.integerValue){ + [self initNIMMicroQueues]; + } } break; diff --git a/YuMi/Tools/NSString/NSString+Utils.m b/YuMi/Tools/NSString/NSString+Utils.m index e1ca9582..46f5a815 100644 --- a/YuMi/Tools/NSString/NSString+Utils.m +++ b/YuMi/Tools/NSString/NSString+Utils.m @@ -223,7 +223,7 @@ if([mccCode isEqualToString:@"65535"])return @"+886"; for (LoginAreaModel *obj in codeList) { if([mccCode isEqualToString:obj.mcc]){ - countryCode = obj.mcc; + countryCode = obj.code; break; } } diff --git a/YuMi/pi_area_info.json b/YuMi/pi_area_info.json index eb8f3bd8..24059769 100644 --- a/YuMi/pi_area_info.json +++ b/YuMi/pi_area_info.json @@ -1,1173 +1,964 @@ { "RECORDS": [ { - "name": "Taiwan", - "abbr": "TW", - "phone_area_code": "886", - "seq": 1, - "mcc": "466" - }, - { - "name": "Hongkong", - "abbr": "HK", - "phone_area_code": "852", - "seq": 2, - "mcc": "454" - }, - { - "name": "Macao", - "abbr": "MO", - "phone_area_code": "853", - "seq": 3, - "mcc": "455" - }, - { - "name": "Malaysia", - "abbr": "MY", - "phone_area_code": "60", - "seq": 4, - "mcc": "502" - }, - { - "name": "Singapore", - "abbr": "SG", - "phone_area_code": "65", - "seq": 5, - "mcc": "525" - }, - { - "name": "India", - "abbr": "IN", - "phone_area_code": "91", - "seq": 6, - "mcc": "404" - }, - { - "name": "Indonesia", - "abbr": "ID", - "phone_area_code": "62", - "seq": 7, - "mcc": "510" - }, - { - "name": "ישראל", - "abbr": "IL", - "phone_area_code": "972", - "seq": 8, - "mcc": "425" - }, - { - "name": "الاردن ", - "abbr": "JO", - "phone_area_code": "962", - "seq": 9, - "mcc": "416" - }, - { - "name": "البحرين", - "abbr": "BH", - "phone_area_code": "973", - "seq": 10, - "mcc": "426" - }, - { - "name": "الجزائر", - "abbr": "DZ", - "phone_area_code": "213", - "seq": 11, - "mcc": "603" - }, - { - "name": "العراق", - "abbr": "IQ", - "phone_area_code": "964", - "seq": 12, - "mcc": "418" - }, - { - "name": "الكويت", - "abbr": "KW", - "phone_area_code": "965", - "seq": 13, - "mcc": "419" - }, - { - "name": "المغرب", - "abbr": "MA", - "phone_area_code": "212", - "seq": 14, - "mcc": "604" - }, - { - "name": "المملكة العربية السعودية", - "abbr": "SA", - "phone_area_code": "966", - "seq": 15, - "mcc": "420" - }, - { - "name": "باكستان", - "abbr": "PK", - "phone_area_code": "92", - "seq": 16, - "mcc": "410" - }, - { - "name": "عُمان", - "abbr": "OM", - "phone_area_code": "968", - "seq": 17, - "mcc": "422" - }, - { - "name": "قطر", - "abbr": "QA", - "phone_area_code": "974", - "seq": 18, - "mcc": "427" - }, - { - "name": "مصر", - "abbr": "EG", - "phone_area_code": "20", - "seq": 19, - "mcc": "602" - }, - { - "name": "Brazil", - "abbr": "BR", - "phone_area_code": "55", - "seq": 20, - "mcc": "724" - }, - { - "name": "Colombia", - "abbr": "CO", - "phone_area_code": "57", - "seq": 21, - "mcc": "732" - }, - { - "name": "Philippines", - "abbr": "PH", - "phone_area_code": "63", - "seq": 22, - "mcc": "515" - }, - { - "name": "افغانستان", + "name": "Afghanistan", "abbr": "AF", - "phone_area_code": "93", - "seq": 23, - "mcc": "412" + "mcc": "412", + "code": "93" }, { - "name": "Shqipëria", + "name": "Albania", "abbr": "AL", - "phone_area_code": "355", - "seq": 24, - "mcc": "276" + "mcc": "276", + "code": "355" }, { - "name": "American samoa", + "name": "Algeria", + "abbr": "DZ", + "mcc": "603", + "code": "213" + }, + { + "name": "American Samoa", "abbr": "AS", - "phone_area_code": "1684", - "seq": 25, - "mcc": "544" + "mcc": "544", + "code": "1684" }, { "name": "Andorra", "abbr": "AD", - "phone_area_code": "376", - "seq": 26, - "mcc": "213" + "mcc": "213", + "code": "376" }, { "name": "Angola", "abbr": "AO", - "phone_area_code": "244", - "seq": 27, - "mcc": "631" + "mcc": "631", + "code": "244" }, { "name": "Anguilla", "abbr": "AI", - "phone_area_code": "1264", - "seq": 28, - "mcc": "365" + "mcc": "365", + "code": "1264" }, { "name": "Antigua and Barbuda", "abbr": "AG", - "phone_area_code": "1268", - "seq": 29, - "mcc": "344" + "mcc": "344", + "code": "1268" }, { "name": "Argentina", "abbr": "AR", - "phone_area_code": "54", - "seq": 30, - "mcc": "722" - }, - { - "name": "Արմենիան", - "abbr": "AM", - "phone_area_code": "374", - "seq": 31, - "mcc": "283" + "mcc": "722", + "code": "54" }, { "name": "Aruba", "abbr": "AW", - "phone_area_code": "297", - "seq": 32, - "mcc": "363" - }, - { - "name": "Ascension Island", - "abbr": "AC", - "phone_area_code": "247", - "seq": 33, - "mcc": "" + "mcc": "363", + "code": "297" }, { "name": "Australia", "abbr": "AU", - "phone_area_code": "61", - "seq": 34, - "mcc": "505" + "mcc": "505", + "code": "61" }, { - "name": "Österreich", + "name": "Austria", "abbr": "AT", - "phone_area_code": "43", - "seq": 35, - "mcc": "232" + "mcc": "232", + "code": "43" }, { "name": "Azerbaijan", "abbr": "AZ", - "phone_area_code": "994", - "seq": 36, - "mcc": "400" + "mcc": "400", + "code": "994" }, { "name": "Bahamas", "abbr": "BS", - "phone_area_code": "1242", - "seq": 37, - "mcc": "364" + "mcc": "364", + "code": "1242" }, { - "name": "বাংলাদেশ", + "name": "Bahrain", + "abbr": "BH", + "mcc": "426", + "code": "973" + }, + { + "name": "Bangladesh", "abbr": "BD", - "phone_area_code": "880", - "seq": 38, - "mcc": "470" + "mcc": "470", + "code": "880" }, { "name": "Barbados", "abbr": "BB", - "phone_area_code": "1246", - "seq": 39, - "mcc": "342" + "mcc": "342", + "code": "1246" }, { - "name": "Беларусь", + "name": "Belarus", "abbr": "BY", - "phone_area_code": "375", - "seq": 40, - "mcc": "257" + "mcc": "257", + "code": "375" }, { - "name": "België", + "name": "Belgium", "abbr": "BE", - "phone_area_code": "32", - "seq": 41, - "mcc": "206" + "mcc": "206", + "code": "32" }, { "name": "Belize", "abbr": "BZ", - "phone_area_code": "501", - "seq": 42, - "mcc": "702" + "mcc": "702", + "code": "501" }, { "name": "Benin", "abbr": "BJ", - "phone_area_code": "229", - "seq": 43, - "mcc": "616" + "mcc": "616", + "code": "229" }, { - "name": "Bermuda Is.", + "name": "Bermuda", "abbr": "BM", - "phone_area_code": "1441", - "seq": 44, - "mcc": "350" + "mcc": "350", + "code": "1441" }, { - "name": "Bolivia", + "name": "Bolivia, Plurinational State of", "abbr": "BO", - "phone_area_code": "591", - "seq": 45, - "mcc": "736" + "mcc": "736", + "code": "591" }, { "name": "Botswana", "abbr": "BW", - "phone_area_code": "267", - "seq": 46, - "mcc": "652" + "mcc": "652", + "code": "267" }, { - "name": "Brunei", + "name": "Brazil", + "abbr": "BR", + "mcc": "724", + "code": "55" + }, + { + "name": "Brunei Darussalam", "abbr": "BN", - "phone_area_code": "673", - "seq": 47, - "mcc": "528" + "mcc": "528", + "code": "673" }, { "name": "Bulgaria", "abbr": "BG", - "phone_area_code": "359", - "seq": 48, - "mcc": "284" + "mcc": "284", + "code": "359" }, { - "name": "Burkina-faso", + "name": "Burkina Faso", "abbr": "BF", - "phone_area_code": "226", - "seq": 49, - "mcc": "613" - }, - { - "name": "ဗာရမာ", - "abbr": "MM", - "phone_area_code": "95", - "seq": 50, - "mcc": "414" + "mcc": "613", + "code": "226" }, { "name": "Burundi", "abbr": "BI", - "phone_area_code": "257", - "seq": 51, - "mcc": "642" + "mcc": "642", + "code": "257" }, { - "name": "China", - "abbr": "CN", - "phone_area_code": "86", - "seq": 52, - "mcc": "460" + "name": "Cambodia", + "abbr": "KH", + "mcc": "456", + "code": "855" }, { "name": "Cameroon", "abbr": "CM", - "phone_area_code": "237", - "seq": 53, - "mcc": "624" + "mcc": "624", + "code": "237" }, { "name": "Canada", "abbr": "CA", - "phone_area_code": "1", - "seq": 54, - "mcc": "302" + "mcc": "302", + "code": "1" }, { - "name": "Kabu Verdi", + "name": "Cape Verde", "abbr": "CV", - "phone_area_code": "238", - "seq": 55, - "mcc": "625" + "mcc": "625", + "code": "238" }, { "name": "Cayman Islands", "abbr": "KY", - "phone_area_code": "1345", - "seq": 56, - "mcc": "346" + "mcc": "346", + "code": "1345" }, { "name": "Central African Republic", "abbr": "CF", - "phone_area_code": "236", - "seq": 57, - "mcc": "623" + "mcc": "623", + "code": "236" }, { "name": "Chad", "abbr": "TD", - "phone_area_code": "235", - "seq": 58, - "mcc": "622" + "mcc": "622", + "code": "235" }, { "name": "Chile", "abbr": "CL", - "phone_area_code": "56", - "seq": 59, - "mcc": "730" + "mcc": "730", + "code": "56" + }, + { + "name": "China", + "abbr": "CN", + "mcc": "460", + "code": "86" + }, + { + "name": "Colombia", + "abbr": "CO", + "mcc": "732", + "code": "57" }, { "name": "Congo", "abbr": "CG", - "phone_area_code": "242", - "seq": 60, - "mcc": "629" + "mcc": "629", + "code": "242" }, { - "name": "Jamhuri ya Kidemokrasia ya Kongo", - "abbr": "CD", - "phone_area_code": "249", - "seq": 61, - "mcc": "630" - }, - { - "name": "Cook Is.", + "name": "Cook Islands", "abbr": "CK", - "phone_area_code": "682", - "seq": 62, - "mcc": "548" + "mcc": "548", + "code": "682" }, { "name": "Costa Rica", "abbr": "CR", - "phone_area_code": "506", - "seq": 63, - "mcc": "712" + "mcc": "712", + "code": "506" }, { - "name": "Hrvatska", + "name": "Croatia", "abbr": "HR", - "phone_area_code": "385", - "seq": 64, - "mcc": "219" + "mcc": "219", + "code": "385" }, { "name": "Cuba", "abbr": "CU", - "phone_area_code": "53", - "seq": 65, - "mcc": "368" + "mcc": "368", + "code": "53" }, { - "name": "Curacao", + "name": "Curaçao", "abbr": "CW", - "phone_area_code": "599", - "seq": 66, - "mcc": "362" + "mcc": "362", + "code": "599" }, { "name": "Cyprus", "abbr": "CY", - "phone_area_code": "357", - "seq": 67, - "mcc": "280" + "mcc": "280", + "code": "357" }, { "name": "Czech Republic", "abbr": "CZ", - "phone_area_code": "420", - "seq": 68, - "mcc": "230" + "mcc": "230", + "code": "420" }, { "name": "Denmark", "abbr": "DK", - "phone_area_code": "45", - "seq": 69, - "mcc": "238" + "mcc": "238", + "code": "45" }, { "name": "Djibouti", "abbr": "DJ", - "phone_area_code": "253", - "seq": 70, - "mcc": "638" + "mcc": "638", + "code": "253" }, { "name": "Dominica", "abbr": "DM", - "phone_area_code": "1767", - "seq": 71, - "mcc": "366" + "mcc": "366", + "code": "1767" }, { - "name": "Dominica Rep.", + "name": "Dominican Republic", "abbr": "DO", - "phone_area_code": "1809", - "seq": 72, - "mcc": "370" + "mcc": "370", + "code": "1809" }, { "name": "Ecuador", "abbr": "EC", - "phone_area_code": "593", - "seq": 73, - "mcc": "740" + "mcc": "740", + "code": "593" }, { - "name": "EI Salvador", + "name": "Egypt", + "abbr": "EG", + "mcc": "602", + "code": "20" + }, + { + "name": "El Salvador", "abbr": "SV", - "phone_area_code": "503", - "seq": 74, - "mcc": "706" + "mcc": "706", + "code": "503" }, { - "name": "Guinea Ecuatorial", + "name": "Equatorial Guinea", "abbr": "GQ", - "phone_area_code": "240", - "seq": 75, - "mcc": "627" + "mcc": "627", + "code": "240" }, { "name": "Estonia", "abbr": "EE", - "phone_area_code": "372", - "seq": 76, - "mcc": "248" + "mcc": "248", + "code": "372" }, { "name": "Ethiopia", "abbr": "ET", - "phone_area_code": "251", - "seq": 77, - "mcc": "636" + "mcc": "636", + "code": "251" }, { "name": "Fiji", "abbr": "FJ", - "phone_area_code": "679", - "seq": 78, - "mcc": "542" + "mcc": "542", + "code": "679" }, { "name": "Finland", "abbr": "FI", - "phone_area_code": "358", - "seq": 79, - "mcc": "244" + "mcc": "244", + "code": "358" }, { "name": "France", "abbr": "FR", - "phone_area_code": "33", - "seq": 80, - "mcc": "208" + "mcc": "208", + "code": "33" }, { "name": "French Guiana", "abbr": "GF", - "phone_area_code": "594", - "seq": 81, - "mcc": "742" + "mcc": "742", + "code": "594" }, { "name": "French Polynesia", "abbr": "PF", - "phone_area_code": "689", - "seq": 82, - "mcc": "547" + "mcc": "547", + "code": "689" }, { "name": "Gabon", "abbr": "GA", - "phone_area_code": "241", - "seq": 83, - "mcc": "628" + "mcc": "628", + "code": "241" }, { "name": "Gambia", "abbr": "GM", - "phone_area_code": "220", - "seq": 84, - "mcc": "607" - }, - { - "name": "Georgia", - "abbr": "GE", - "phone_area_code": "995", - "seq": 85, - "mcc": "282" + "mcc": "607", + "code": "220" }, { "name": "Germany", "abbr": "DE", - "phone_area_code": "49", - "seq": 86, - "mcc": "262" + "mcc": "262", + "code": "49" }, { "name": "Ghana", "abbr": "GH", - "phone_area_code": "233", - "seq": 87, - "mcc": "620" + "mcc": "620", + "code": "233" }, { "name": "Gibraltar", "abbr": "GI", - "phone_area_code": "350", - "seq": 88, - "mcc": "266" + "mcc": "266", + "code": "350" }, { "name": "Greece", "abbr": "GR", - "phone_area_code": "30", - "seq": 89, - "mcc": "202" + "mcc": "202", + "code": "30" }, { - "name": "Kalaallit Nunaat", + "name": "Greenland", "abbr": "GL", - "phone_area_code": "299", - "seq": 90, - "mcc": "290" + "mcc": "290", + "code": "299" }, { "name": "Grenada", "abbr": "GD", - "phone_area_code": "1473", - "seq": 91, - "mcc": "352" + "mcc": "352", + "code": "1473" }, { "name": "Guam", "abbr": "GU", - "phone_area_code": "1671", - "seq": 92, - "mcc": "535" + "mcc": "535", + "code": "1671" }, { "name": "Guatemala", "abbr": "GT", - "phone_area_code": "502", - "seq": 93, - "mcc": "704" + "mcc": "704", + "code": "502" }, { "name": "Guinea", "abbr": "GN", - "phone_area_code": "224", - "seq": 94, - "mcc": "611" + "mcc": "611", + "code": "224" }, { "name": "Guyana", "abbr": "GY", - "phone_area_code": "592", - "seq": 95, - "mcc": "738" + "mcc": "738", + "code": "592" }, { "name": "Haiti", "abbr": "HT", - "phone_area_code": "509", - "seq": 96, - "mcc": "372" + "mcc": "372", + "code": "509" }, { "name": "Honduras", "abbr": "HN", - "phone_area_code": "504", - "seq": 97, - "mcc": "708" + "mcc": "708", + "code": "504" }, { - "name": "Hungary", - "abbr": "HU", - "phone_area_code": "36", - "seq": 98, - "mcc": "216" + "name": "Hong Kong", + "abbr": "HK", + "mcc": "454", + "code": "852" }, { "name": "Iceland", "abbr": "IS", - "phone_area_code": "354", - "seq": 99, - "mcc": "274" + "mcc": "274", + "code": "354" }, { - "name": "ایران", + "name": "India", + "abbr": "IN", + "mcc": "404", + "code": "91" + }, + { + "name": "Indonesia", + "abbr": "ID", + "mcc": "510", + "code": "62" + }, + { + "name": "Iran, Islamic Republic of", "abbr": "IR", - "phone_area_code": "98", - "seq": 100, - "mcc": "432" + "mcc": "432", + "code": "98" + }, + { + "name": "Iraq", + "abbr": "IQ", + "mcc": "418", + "code": "964" }, { "name": "Ireland", "abbr": "IE", - "phone_area_code": "353", - "seq": 101, - "mcc": "272" + "mcc": "272", + "code": "353" + }, + { + "name": "Israel", + "abbr": "IL", + "mcc": "425", + "code": "972" }, { "name": "Italy", "abbr": "IT", - "phone_area_code": "39", - "seq": 102, - "mcc": "222" + "mcc": "222", + "code": "39" }, { "name": "Jamaica", "abbr": "JM", - "phone_area_code": "1876", - "seq": 103, - "mcc": "338" + "mcc": "338", + "code": "1876" }, { "name": "Japan", "abbr": "JP", - "phone_area_code": "81", - "seq": 104, - "mcc": "440" + "mcc": "440", + "code": "81" }, { - "name": "កម្ពុជា", - "abbr": "KH", - "phone_area_code": "855", - "seq": 105, - "mcc": "456" + "name": "Jordan", + "abbr": "JO", + "mcc": "416", + "code": "962" }, { - "name": "Kazakstan", + "name": "Kazakhstan", "abbr": "KZ", - "phone_area_code": "327", - "seq": 106, - "mcc": "401" + "mcc": "401", + "code": "327" }, { "name": "Kenya", "abbr": "KE", - "phone_area_code": "254", - "seq": 107, - "mcc": "639" + "mcc": "639", + "code": "254" }, { "name": "Kiribati", "abbr": "KI", - "phone_area_code": "686", - "seq": 108, - "mcc": "545" + "mcc": "545", + "code": "686" }, { - "name": "Korea", + "name": "Korea, Republic of", "abbr": "KR", - "phone_area_code": "82", - "seq": 109, - "mcc": "450" + "mcc": "450", + "code": "82" }, { - "name": "Kazakstan", - "abbr": "KZ", - "phone_area_code": "996", - "seq": 110, - "mcc": "401" + "name": "Kuwait", + "abbr": "KW", + "mcc": "419", + "code": "965" }, { - "name": "Laos", + "name": "Lao People's Democratic Republic", "abbr": "LA", - "phone_area_code": "856", - "seq": 111, - "mcc": "457" + "mcc": "457", + "code": "856" }, { "name": "Latvia", "abbr": "LV", - "phone_area_code": "371", - "seq": 112, - "mcc": "247" + "mcc": "247", + "code": "371" }, { - "name": "لبنان", + "name": "Lebanon", "abbr": "LB", - "phone_area_code": "961", - "seq": 113, - "mcc": "415" + "mcc": "415", + "code": "961" }, { "name": "Lesotho", "abbr": "LS", - "phone_area_code": "266", - "seq": 114, - "mcc": "651" + "mcc": "651", + "code": "266" }, { "name": "Liberia", "abbr": "LR", - "phone_area_code": "231", - "seq": 115, - "mcc": "618" + "mcc": "618", + "code": "231" }, { - "name": "ليبيا", + "name": "Libya", "abbr": "LY", - "phone_area_code": "218", - "seq": 116, - "mcc": "606" - }, - { - "name": "Liechtenstein", - "abbr": "LI", - "phone_area_code": "423", - "seq": 117, - "mcc": "295" + "mcc": "606", + "code": "218" }, { "name": "Lithuania", "abbr": "LT", - "phone_area_code": "370", - "seq": 118, - "mcc": "246" + "mcc": "246", + "code": "370" }, { "name": "Luxembourg", "abbr": "LU", - "phone_area_code": "352", - "seq": 119, - "mcc": "270" + "mcc": "270", + "code": "352" + }, + { + "name": "Macao", + "abbr": "MO", + "mcc": "455", + "code": "853" }, { "name": "Madagascar", "abbr": "MG", - "phone_area_code": "261", - "seq": 120, - "mcc": "646" + "mcc": "646", + "code": "261" }, { "name": "Malawi", "abbr": "MW", - "phone_area_code": "265", - "seq": 121, - "mcc": "650" + "mcc": "650", + "code": "265" + }, + { + "name": "Malaysia", + "abbr": "MY", + "mcc": "502", + "code": "60" }, { "name": "Maldives", "abbr": "MV", - "phone_area_code": "960", - "seq": 122, - "mcc": "472" + "mcc": "472", + "code": "960" }, { "name": "Mali", "abbr": "ML", - "phone_area_code": "223", - "seq": 123, - "mcc": "610" + "mcc": "610", + "code": "223" }, { "name": "Malta", "abbr": "MT", - "phone_area_code": "356", - "seq": 124, - "mcc": "278" + "mcc": "278", + "code": "356" }, { "name": "Mauritius", "abbr": "MU", - "phone_area_code": "230", - "seq": 125, - "mcc": "617" + "mcc": "617", + "code": "230" }, { "name": "Mexico", "abbr": "MX", - "phone_area_code": "52", - "seq": 126, - "mcc": "334" + "mcc": "334", + "code": "52" }, { "name": "Moldova, Republic of", "abbr": "MD", - "phone_area_code": "373", - "seq": 127, - "mcc": "259" + "mcc": "259", + "code": "373" }, { "name": "Monaco", "abbr": "MC", - "phone_area_code": "377", - "seq": 128, - "mcc": "212" + "mcc": "212", + "code": "377" }, { "name": "Mongolia", "abbr": "MN", - "phone_area_code": "976", - "seq": 129, - "mcc": "428" + "mcc": "428", + "code": "976" + }, + { + "name": "Morocco", + "abbr": "MA", + "mcc": "604", + "code": "212" }, { "name": "Mozambique", "abbr": "MZ", - "phone_area_code": "258", - "seq": 130, - "mcc": "643" + "mcc": "643", + "code": "258" + }, + { + "name": "Myanmar", + "abbr": "MM", + "mcc": "414", + "code": "95" }, { "name": "Namibia", "abbr": "NA", - "phone_area_code": "264", - "seq": 131, - "mcc": "649" + "mcc": "649", + "code": "264" }, { "name": "Nepal", "abbr": "NP", - "phone_area_code": "977", - "seq": 132, - "mcc": "429" + "mcc": "429", + "code": "977" }, { "name": "Netherlands", "abbr": "NL", - "phone_area_code": "31", - "seq": 133, - "mcc": "204" + "mcc": "204", + "code": "31" }, { "name": "New Zealand", "abbr": "NZ", - "phone_area_code": "64", - "seq": 134, - "mcc": "530" + "mcc": "530", + "code": "64" }, { "name": "Nicaragua", "abbr": "NI", - "phone_area_code": "505", - "seq": 135, - "mcc": "710" + "mcc": "710", + "code": "505" }, { - "name": "Nijar", + "name": "Niger", "abbr": "NE", - "phone_area_code": "227", - "seq": 136, - "mcc": "614" + "mcc": "614", + "code": "227" }, { "name": "Nigeria", "abbr": "NG", - "phone_area_code": "234", - "seq": 137, - "mcc": "621" + "mcc": "621", + "code": "234" }, { "name": "Norway", "abbr": "NO", - "phone_area_code": "47", - "seq": 138, - "mcc": "242" + "mcc": "242", + "code": "47" + }, + { + "name": "Oman", + "abbr": "OM", + "mcc": "422", + "code": "968" + }, + { + "name": "Pakistan", + "abbr": "PK", + "mcc": "410", + "code": "92" }, { "name": "Panama", "abbr": "PA", - "phone_area_code": "507", - "seq": 139, - "mcc": "714" + "mcc": "714", + "code": "507" }, { - "name": "Papua New Cuinea", + "name": "Papua New Guinea", "abbr": "PG", - "phone_area_code": "675", - "seq": 140, - "mcc": "537" + "mcc": "537", + "code": "675" }, { "name": "Paraguay", "abbr": "PY", - "phone_area_code": "595", - "seq": 141, - "mcc": "744" + "mcc": "744", + "code": "595" }, { "name": "Peru", "abbr": "PE", - "phone_area_code": "51", - "seq": 142, - "mcc": "716" + "mcc": "716", + "code": "51" + }, + { + "name": "Philippines", + "abbr": "PH", + "mcc": "515", + "code": "63" }, { "name": "Poland", "abbr": "PL", - "phone_area_code": "48", - "seq": 143, - "mcc": "260" + "mcc": "260", + "code": "48" }, { "name": "Portugal", "abbr": "PT", - "phone_area_code": "351", - "seq": 144, - "mcc": "268" + "mcc": "268", + "code": "351" }, { "name": "Puerto Rico", "abbr": "PR", - "phone_area_code": "1787", - "seq": 145, - "mcc": "330" + "mcc": "330", + "code": "1787" + }, + { + "name": "Qatar", + "abbr": "QA", + "mcc": "427", + "code": "974" }, { "name": "Romania", "abbr": "RO", - "phone_area_code": "40", - "seq": 146, - "mcc": "226" + "mcc": "226", + "code": "40" }, { - "name": "St.Lucia", + "name": "Saint Lucia", "abbr": "LC", - "phone_area_code": "1758", - "seq": 147, - "mcc": "358" + "mcc": "358", + "code": "1758" }, { "name": "San Marino", "abbr": "SM", - "phone_area_code": "378", - "seq": 148, - "mcc": "292" + "mcc": "292", + "code": "378" }, { "name": "Sao Tome and Principe", "abbr": "ST", - "phone_area_code": "239", - "seq": 149, - "mcc": "626" + "mcc": "626", + "code": "239" + }, + { + "name": "Saudi Arabia", + "abbr": "SA", + "mcc": "420", + "code": "966" }, { "name": "Senegal", "abbr": "SN", - "phone_area_code": "221", - "seq": 150, - "mcc": "608" + "mcc": "608", + "code": "221" }, { "name": "Seychelles", "abbr": "SC", - "phone_area_code": "248", - "seq": 151, - "mcc": "633" + "mcc": "633", + "code": "248" }, { "name": "Sierra Leone", "abbr": "SL", - "phone_area_code": "232", - "seq": 152, - "mcc": "619" + "mcc": "619", + "code": "232" + }, + { + "name": "Singapore", + "abbr": "SG", + "mcc": "525", + "code": "65" }, { "name": "Slovakia", "abbr": "SK", - "phone_area_code": "421", - "seq": 153, - "mcc": "231" + "mcc": "231", + "code": "421" }, { "name": "Slovenia", "abbr": "SI", - "phone_area_code": "386", - "seq": 154, - "mcc": "293" + "mcc": "293", + "code": "386" }, { - "name": "Solomon Is", + "name": "Solomon Islands", "abbr": "SB", - "phone_area_code": "677", - "seq": 155, - "mcc": "540" + "mcc": "540", + "code": "677" }, { - "name": "Somali", + "name": "Somalia", "abbr": "SO", - "phone_area_code": "252", - "seq": 156, - "mcc": "637" + "mcc": "637", + "code": "252" }, { "name": "South Africa", "abbr": "ZA", - "phone_area_code": "27", - "seq": 157, - "mcc": "655" + "mcc": "655", + "code": "27" }, { "name": "Spain", "abbr": "ES", - "phone_area_code": "34", - "seq": 158, - "mcc": "214" + "mcc": "214", + "code": "34" }, { "name": "Sri Lanka", "abbr": "LK", - "phone_area_code": "94", - "seq": 159, - "mcc": "413" + "mcc": "413", + "code": "94" }, { "name": "Sudan", "abbr": "SD", - "phone_area_code": "249", - "seq": 160, - "mcc": "634" + "mcc": "634", + "code": "249" }, { "name": "Suriname", "abbr": "SR", - "phone_area_code": "597", - "seq": 161, - "mcc": "746" + "mcc": "746", + "code": "597" }, { "name": "Swaziland", "abbr": "SZ", - "phone_area_code": "268", - "seq": 162, - "mcc": "653" + "mcc": "653", + "code": "268" }, { "name": "Sweden", "abbr": "SE", - "phone_area_code": "46", - "seq": 163, - "mcc": "240" + "mcc": "240", + "code": "46" }, { "name": "Switzerland", "abbr": "CH", - "phone_area_code": "41", - "seq": 164, - "mcc": "228" + "mcc": "228", + "code": "41" }, { - "name": "Syria", + "name": "Syrian Arab Republic", "abbr": "SY", - "phone_area_code": "963", - "seq": 165, - "mcc": "417" + "mcc": "417", + "code": "963" + }, + { + "name": "Taiwan", + "abbr": "TW", + "mcc": "466", + "code": "886" }, { "name": "Vanuatu", "abbr": "VU", - "phone_area_code": "678", - "seq": 166, - "mcc": "541" + "mcc": "541", + "code": "678" }, { - "name": "British Virgin Islands", + "name": "Virgin Islands, British", "abbr": "VG", - "phone_area_code": "1284", - "seq": 167, - "mcc": "348" + "mcc": "348", + "code": "1284" } ] } diff --git a/YuMi/zh-Hans.lproj/Localizable.strings b/YuMi/zh-Hans.lproj/Localizable.strings index a6477e79..a1b067c6 100644 --- a/YuMi/zh-Hans.lproj/Localizable.strings +++ b/YuMi/zh-Hans.lproj/Localizable.strings @@ -2282,7 +2282,7 @@ "XPRoomInsidekfjdskfjks" = "努力寻找合适房间中~"; -"XPChooseRreaCodeVC0"="选择区号"; +"XPChooseRreaCodeVC0"="选择国家或地区"; "PKIDLoginViewController11" = "短信发送成功"; "LoginVerifCodeViewController3" = "验证码"; diff --git a/YuMi/zh-Hant.lproj/Localizable.strings b/YuMi/zh-Hant.lproj/Localizable.strings index 87622fcc..30901953 100644 --- a/YuMi/zh-Hant.lproj/Localizable.strings +++ b/YuMi/zh-Hant.lproj/Localizable.strings @@ -2280,7 +2280,7 @@ "XPRoomInsidekfjdskfjks" = "努力尋找合適房間中~"; -"XPChooseRreaCodeVC0"="選擇區號"; +"XPChooseRreaCodeVC0"="選擇國家或地區"; "PKIDLoginViewController11" = "短信發送成功"; "LoginVerifCodeViewController3" = "驗證碼";