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

修复bug

Browse Source
This commit is contained in:
liyuhua
2023-12-11 16:11:56 +08:00
parent ce308df1b6
commit 5e2c5080c5
10 changed files with 468 additions and 679 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
YuMi.xcodeproj/project.pbxproj
View File

@@ -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 = "<group>"; };
23942E8F2A86424500D0ECC2 /* XPLoginAuthCodeVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPLoginAuthCodeVC.h; sourceTree = "<group>"; };
23942E902A86424500D0ECC2 /* XPLoginAuthCodeVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPLoginAuthCodeVC.m; sourceTree = "<group>"; };
2396FCE12B21D34A0014021D /* pi_area_info.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = pi_area_info.json; sourceTree = "<group>"; };
2396FCE32B22BE5D0014021D /* pi_area_info.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = pi_area_info.json; sourceTree = "<group>"; };
239BEED92AA1E058005CDA94 /* PIHoemCategoryTitleView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIHoemCategoryTitleView.h; sourceTree = "<group>"; };
239BEEDA2AA1E058005CDA94 /* PIHoemCategoryTitleView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIHoemCategoryTitleView.m; sourceTree = "<group>"; };
23A439722AA1CF7C002E6039 /* XPNewHomeHeadView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPNewHomeHeadView.h; sourceTree = "<group>"; };
@@ -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;
};

3
YuMi/Modules/YMLogin/Model/LoginAreaModel.h
View File

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

4
YuMi/Modules/YMLogin/Model/LoginAreaModel.m
View File

@@ -8,7 +8,5 @@
#import "LoginAreaModel.h"
@implementation LoginAreaModel
+ (NSDictionary *)replacedKeyFromPropertyName {
return @{@"pi_phoneAreaCode":@"phoneAreaCode"};
}
@end

18
YuMi/Modules/YMLogin/View/NewLogin/XPLoginAraeViewController.m
View File

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

7
YuMi/Modules/YMLogin/View/NewLogin/XPLoginAreaTableViewCell.m
View File

@@ -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 - 懒加载

4
YuMi/Modules/YMRoom/View/StageView/StageView.m
View File

@@ -512,7 +512,9 @@
break;
}
}
if (content.source.userId.integerValue == [AccountInfoStorage instance].getUid.integerValue){
[self initNIMMicroQueues];
}
}
break;

2
YuMi/Tools/NSString/NSString+Utils.m
View File

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

1097
YuMi/pi_area_info.json
View File

File diff suppressed because it is too large Load Diff

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

@@ -2282,7 +2282,7 @@
"XPRoomInsidekfjdskfjks" = "努力寻找合适房间中~";
"XPChooseRreaCodeVC0"="选择区号";
"XPChooseRreaCodeVC0"="选择国家或地区";
"PKIDLoginViewController11" = "短信发送成功";
"LoginVerifCodeViewController3" = "验证码";

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

@@ -2280,7 +2280,7 @@
"XPRoomInsidekfjdskfjks" = "努力尋找合適房間中~";
"XPChooseRreaCodeVC0"="選擇區號";
"XPChooseRreaCodeVC0"="選擇國家或地區";
"PKIDLoginViewController11" = "短信發送成功";
"LoginVerifCodeViewController3" = "驗證碼";