Skip to content

勾选大写ID时，添加id->ID的映射方法 #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jokerping wants to merge 1 commit into
base: master
Choose a base branch
from
Open

勾选大写ID时，添加id->ID的映射方法 #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions ESJsonFormat/ESJsonFormat.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,16 @@ -(void)outputResult:(NSNotification*)noti{
NSURL *writeUrl = [NSURL URLWithString:urlStr];
//The original content
NSString *originalContent = [NSString stringWithContentsOfURL:writeUrl encoding:NSUTF8StringEncoding error:nil];
//大写ID时生成对应的映射方法
if (ESJsonFormatSetting.defaultSetting.uppercaseKeyWordForId &&
(classInfo.classDic[@"id"] || classInfo.classDic[@"ID"]))
{
NSString *methodStr = @"\n+ (NSDictionary *)replacedKeyFromPropertyName\n{\n return @{@\"ID\" : @\"id\"};\n}\n";
NSRange lastEndRange = [originalContent rangeOfString:@"@end"];
if (lastEndRange.location != NSNotFound) {
originalContent = [originalContent stringByReplacingCharactersInRange:NSMakeRange(lastEndRange.location, 0) withString:methodStr];
}
}

//输出RootClass的impOjbClassInArray方法
if ([ESJsonFormatSetting defaultSetting].impOjbClassInArray) {
Expand All @@ -147,6 +157,7 @@ -(void)outputResult:(NSNotification*)noti{
}
}
}

originalContent = [originalContent stringByReplacingCharactersInRange:NSMakeRange(originalContent.length, 0) withString:classInfo.classInsertTextViewContentForM];
[originalContent writeToURL:writeUrl atomically:YES encoding:NSUTF8StringEncoding error:nil];

Expand Down
25 changes: 23 additions & 2 deletions ESJsonFormat/ESJsonFormatManager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,9 +167,30 @@ + (NSString *)parseClassImpContentWithClassInfo:(ESClassInfo *)classInfo{

NSMutableString *result = [NSMutableString stringWithString:@""];
if ([ESJsonFormatSetting defaultSetting].impOjbClassInArray) {
[result appendFormat:@"@implementation %@\n%@\n@end\n",classInfo.className,[self methodContentOfObjectClassInArrayWithClassInfo:classInfo]];
if (ESJsonFormatSetting.defaultSetting.uppercaseKeyWordForId &&
(classInfo.classDic[@"id"] || classInfo.classDic[@"ID"]))
{
NSString *methodStr = @"\n+ (NSDictionary *)replacedKeyFromPropertyName\n{\n return @{@\"ID\" : @\"id\"};\n}\n";
[result appendFormat:@"@implementation %@\n%@\n\n%@\n@end\n",classInfo.className,methodStr,[self methodContentOfObjectClassInArrayWithClassInfo:classInfo]];
}
else
{
[result appendFormat:@"@implementation %@\n%@\n@end\n",classInfo.className,[self methodContentOfObjectClassInArrayWithClassInfo:classInfo]];
}

}else{
[result appendFormat:@"@implementation %@\n\n@end\n",classInfo.className];
if (ESJsonFormatSetting.defaultSetting.uppercaseKeyWordForId &&
(classInfo.classDic[@"id"] || classInfo.classDic[@"ID"]))
{
NSString *methodStr = @"\n+ (NSDictionary *)replacedKeyFromPropertyName\n{\n return @{@\"ID\" : @\"id\"};\n}\n";
[result appendFormat:@"@implementation %@\n%@\n@end\n",classInfo.className,methodStr];

}
else
{
[result appendFormat:@"@implementation %@\n\n@end\n",classInfo.className];
}

}

if ([ESJsonFormatSetting defaultSetting].outputToFiles) {
Expand Down