Skip to content
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.

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

Develop #18

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file modified .DS_Store
Binary file not shown.
13 changes: 13 additions & 0 deletions ESJsonFormatForMac.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
objects = {

/* Begin PBXBuildFile section */
14F92BE222B9F74A00A5C5E4 /* NSApplication+Helper.m in Sources */ = {isa = PBXBuildFile; fileRef = 14F92BE122B9F74A00A5C5E4 /* NSApplication+Helper.m */; };
14F92C2422BB7EA300A5C5E4 /* NSFileManager+Helper.m in Sources */ = {isa = PBXBuildFile; fileRef = 14F92C2222BB7EA300A5C5E4 /* NSFileManager+Helper.m */; };
FB4532681EE01AAD00B5457C /* DataModel.m in Sources */ = {isa = PBXBuildFile; fileRef = FB4532671EE01AAD00B5457C /* DataModel.m */; };
FB49E6BD1EE106BE00789060 /* HttpRequestTool.m in Sources */ = {isa = PBXBuildFile; fileRef = FB49E6BC1EE106BE00789060 /* HttpRequestTool.m */; };
FB63B6E11EF01F0800802A5E /* FileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = FB63B6E01EF01F0800802A5E /* FileManager.m */; };
Expand Down Expand Up @@ -53,6 +55,10 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
14F92BE022B9F74A00A5C5E4 /* NSApplication+Helper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSApplication+Helper.h"; sourceTree = "<group>"; };
14F92BE122B9F74A00A5C5E4 /* NSApplication+Helper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSApplication+Helper.m"; sourceTree = "<group>"; };
14F92C2222BB7EA300A5C5E4 /* NSFileManager+Helper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSFileManager+Helper.m"; sourceTree = "<group>"; };
14F92C2322BB7EA300A5C5E4 /* NSFileManager+Helper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSFileManager+Helper.h"; sourceTree = "<group>"; };
FB4532661EE01AAD00B5457C /* DataModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataModel.h; sourceTree = "<group>"; };
FB4532671EE01AAD00B5457C /* DataModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DataModel.m; sourceTree = "<group>"; };
FB49E6BB1EE106BE00789060 /* HttpRequestTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HttpRequestTool.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -219,6 +225,10 @@
FB7C77181EC5608200949F64 /* NSObject_Extension.m */,
FB7C77191EC5608200949F64 /* NSString+ESExtension.h */,
FB7C771A1EC5608200949F64 /* NSString+ESExtension.m */,
14F92BE022B9F74A00A5C5E4 /* NSApplication+Helper.h */,
14F92BE122B9F74A00A5C5E4 /* NSApplication+Helper.m */,
14F92C2322BB7EA300A5C5E4 /* NSFileManager+Helper.h */,
14F92C2222BB7EA300A5C5E4 /* NSFileManager+Helper.m */,
);
path = Category;
sourceTree = "<group>";
Expand Down Expand Up @@ -362,6 +372,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
Base,
);
Expand Down Expand Up @@ -413,6 +424,7 @@
files = (
FB7C77381EC560B700949F64 /* ESJsonFormatManager.m in Sources */,
FB7C76B61EC554B100949F64 /* ViewController.m in Sources */,
14F92BE222B9F74A00A5C5E4 /* NSApplication+Helper.m in Sources */,
FB7C77241EC5608200949F64 /* ESUtils.m in Sources */,
FB7C772E1EC5608D00949F64 /* ESClassInfo.m in Sources */,
FB7C77231EC5608200949F64 /* ESJsonFormatSetting.m in Sources */,
Expand All @@ -428,6 +440,7 @@
FB4532681EE01AAD00B5457C /* DataModel.m in Sources */,
FB7C77311EC5608D00949F64 /* ESPbxprojInfo.m in Sources */,
FB7C77221EC5608200949F64 /* NSString+ESExtension.m in Sources */,
14F92C2422BB7EA300A5C5E4 /* NSFileManager+Helper.m in Sources */,
FB7C77301EC5608D00949F64 /* ESPair.m in Sources */,
FB49E6BD1EE106BE00789060 /* HttpRequestTool.m in Sources */,
);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1020"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "FB7C76AA1EC554B100949F64"
BuildableName = "ESJsonFormatForMac.app"
BlueprintName = "ESJsonFormatForMac"
ReferencedContainer = "container:ESJsonFormatForMac.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "FB7C76C01EC554B100949F64"
BuildableName = "ESJsonFormatForMacTests.xctest"
BlueprintName = "ESJsonFormatForMacTests"
ReferencedContainer = "container:ESJsonFormatForMac.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "FB7C76CB1EC554B100949F64"
BuildableName = "ESJsonFormatForMacUITests.xctest"
BlueprintName = "ESJsonFormatForMacUITests"
ReferencedContainer = "container:ESJsonFormatForMac.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "FB7C76AA1EC554B100949F64"
BuildableName = "ESJsonFormatForMac.app"
BlueprintName = "ESJsonFormatForMac"
ReferencedContainer = "container:ESJsonFormatForMac.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "FB7C76AA1EC554B100949F64"
BuildableName = "ESJsonFormatForMac.app"
BlueprintName = "ESJsonFormatForMac"
ReferencedContainer = "container:ESJsonFormatForMac.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Debug"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "FB7C76AA1EC554B100949F64"
BuildableName = "ESJsonFormatForMac.app"
BlueprintName = "ESJsonFormatForMac"
ReferencedContainer = "container:ESJsonFormatForMac.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1020"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "FB7C76AA1EC554B100949F64"
BuildableName = "ESJsonFormatForMac.app"
BlueprintName = "ESJsonFormatForMac"
ReferencedContainer = "container:ESJsonFormatForMac.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "FB7C76AA1EC554B100949F64"
BuildableName = "ESJsonFormatForMac.app"
BlueprintName = "ESJsonFormatForMac"
ReferencedContainer = "container:ESJsonFormatForMac.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Release"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "FB7C76AA1EC554B100949F64"
BuildableName = "ESJsonFormatForMac.app"
BlueprintName = "ESJsonFormatForMac"
ReferencedContainer = "container:ESJsonFormatForMac.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "FB7C76AA1EC554B100949F64"
BuildableName = "ESJsonFormatForMac.app"
BlueprintName = "ESJsonFormatForMac"
ReferencedContainer = "container:ESJsonFormatForMac.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
<Bucket
uuid = "E2B0FAB2-5EED-44D0-B952-2691C65452F5"
type = "1"
version = "2.0">
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "1E0DED24-3128-44EE-99F4-978B59AC023F"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ESJsonFormatForMac/Controller/ESInputJsonController.m"
timestampString = "583222481.06905"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "506"
endingLineNumber = "506"
landmarkName = "-refreshUI:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "CBAFE835-36E7-4E2F-B7BA-125AE8EBD87D"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ESJsonFormatForMac/Format/ESJsonFormat.m"
timestampString = "583222511.9397219"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "59"
endingLineNumber = "59"
landmarkName = "-notificationLog:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>ESJsonFormatForMac.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
</dict>
<key>ESJsonFormatForMacRelease.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>1</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>FB7C76AA1EC554B100949F64</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>FB7C76C01EC554B100949F64</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>FB7C76CB1EC554B100949F64</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>
Binary file modified ESJsonFormatForMac/.DS_Store
Binary file not shown.
3 changes: 1 addition & 2 deletions ESJsonFormatForMac/AppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@ @implementation AppDelegate

- (void)applicationDidFinishLaunching:(NSNotification *)aNotification {


self.inputJsonController = [[ESInputJsonController alloc] initWithNibName:@"ESInputJsonController" bundle:nil];
self.window = [[NSApplication sharedApplication] keyWindow];
self.window = NSApplication.sharedApplication.keyWindow;
[self.window.contentView addSubview:self.inputJsonController.view];
self.inputJsonController.view.frame = self.window.contentView.bounds;

Expand Down
17 changes: 17 additions & 0 deletions ESJsonFormatForMac/Category/NSApplication+Helper.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
//
// NSApp+Helper.h
// ESJsonFormatForMac
//
// Created by Bin Shang on 2019/6/19.
// Copyright © 2019 ZX. All rights reserved.
//

NS_ASSUME_NONNULL_BEGIN

@interface NSApplication (Helper)

+ (void)beginSheet:(NSWindowController *)windowController;

@end

NS_ASSUME_NONNULL_END
18 changes: 18 additions & 0 deletions ESJsonFormatForMac/Category/NSApplication+Helper.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
//
// NSApp+Helper.m
// ESJsonFormatForMac
//
// Created by Bin Shang on 2019/6/19.
// Copyright © 2019 ZX. All rights reserved.
//

#import "NSApplication+Helper.h"

@implementation NSApplication (Helper)

+ (void)beginSheet:(NSWindowController *)windowController{
[NSApp beginSheet:windowController.window modalForWindow:NSApp.mainWindow modalDelegate:nil didEndSelector:nil contextInfo:nil];
[NSApp runModalForWindow:windowController.window];
}

@end
Loading