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.

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

Jump to bottom

加入了支持 YYModel 的选项 #101

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

加入了支持 YYModel 的选项 #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
daae523
add YYModel selection
tanpengsccd Feb 15, 2017
34fb3c3
添加xcode 8.1 8.2 8.2.1 UDID
tanpengsccd Feb 15, 2017
fae01e2
add gitignore
tanpengsccd Feb 15, 2017
2549632
rm ds
tanpengsccd Feb 15, 2017
4cc7e7c
update readme
tanpengsccd Feb 15, 2017
f7e1a6e
update readme
tanpengsccd Feb 16, 2017
f2b5d3e
添加9 beta 的UUID
tanpengsccd Sep 6, 2017
f91ec2f
merged error
tanpengsccd Sep 6, 2017
9d3743d
合并原作者最新code
tanpengsccd Sep 6, 2017
90203e0
update readme
tanpengsccd Sep 10, 2017
2ebc753
Update README.md
tanpengsccd Oct 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Binary file added .DS_Store
View file
Open in desktop
Binary file not shown.
100 changes: 100 additions & 0 deletions ESJsonFormat.xcodeproj/xcshareddata/xcschemes/ESJsonFormat.xcscheme.orig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0500"
version = "2.0">
<BuildAction
parallelizeBuildables = "NO"
buildImplicitDependencies = "NO">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4FF8F3391B400F8B005C73C2"
BuildableName = "ESJsonFormat.xcplugin"
BlueprintName = "ESJsonFormat"
ReferencedContainer = "container:ESJsonFormat.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "NO"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "8966AFCA173EB7BF004150C0"
BuildableName = "ESJsonFormatTests.xctest"
BlueprintName = "ESJsonFormatTests"
ReferencedContainer = "container:ESJsonFormat.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
<<<<<<< HEAD
buildConfiguration = "Release"
=======
buildConfiguration = "Debug"
>>>>>>> 761e20d0334233346748565e58affb4ab5b04c23
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "NO"
debugXPCServices = "NO"
debugServiceExtension = "internal"
allowLocationSimulation = "NO"
viewDebuggingEnabled = "No">
<<<<<<< HEAD
=======
<PathRunnable
runnableDebuggingMode = "0"
FilePath = "/Applications/Xcode-beta.app">
</PathRunnable>
>>>>>>> 761e20d0334233346748565e58affb4ab5b04c23
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4FF8F3391B400F8B005C73C2"
BuildableName = "ESJsonFormat.xcplugin"
BlueprintName = "ESJsonFormat"
ReferencedContainer = "container:ESJsonFormat.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
108 changes: 108 additions & 0 deletions ESJsonFormat/Controller/ESDialogController.xib.orig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
<<<<<<< HEAD
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="16D32" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
=======
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9531" systemVersion="15C50" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9531"/>
>>>>>>> 761e20d0334233346748565e58affb4ab5b04c23
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="ESDialogController">
<connections>
<outlet property="a" destination="NxW-qe-4hI" id="CT9-4E-mLe"/>
<outlet property="checkButtonBottomConstraint" destination="ksp-y4-og5" id="wYR-CN-vUc"/>
<outlet property="classNameField" destination="Lz0-SS-Wl7" id="9cj-r6-1Lh"/>
<outlet property="fieldBottomConstraint" destination="TOK-5W-WEq" id="Dqr-Ye-7QR"/>
<outlet property="implementCheckButton" destination="DCJ-Hb-a6L" id="G2i-V0-OVi"/>
<outlet property="implementCustomView" destination="1We-vS-cHB" id="zM1-In-L3C"/>
<outlet property="msgLabel" destination="yaf-0Z-Omg" id="gS1-Ns-xHx"/>
<outlet property="window" destination="F0z-JX-Cv5" id="gIp-Ho-8D9"/>
</connections>
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="F0z-JX-Cv5">
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="196" y="240" width="350" height="129"/>
<<<<<<< HEAD
<rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
=======
<rect key="screenRect" x="0.0" y="0.0" width="1920" height="1057"/>
>>>>>>> 761e20d0334233346748565e58affb4ab5b04c23
<view key="contentView" id="se5-gp-TjO">
<rect key="frame" x="0.0" y="0.0" width="350" height="129"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Lz0-SS-Wl7">
<rect key="frame" x="100" y="67" width="150" height="22"/>
<constraints>
<constraint firstAttribute="width" constant="150" id="hLK-Eo-EEQ"/>
</constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" state="on" borderStyle="bezel" alignment="center" bezelStyle="round" id="xdf-GD-G2k">
<font key="font" metaFont="system"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="yaf-0Z-Omg">
<rect key="frame" x="6" y="97" width="338" height="17"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="Multiline LabelMultiline" id="0nu-Df-5FF">
<font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<customView misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="1We-vS-cHB">
<rect key="frame" x="79" y="8" width="192" height="51"/>
<subviews>
<button translatesAutoresizingMaskIntoConstraints="NO" id="NxW-qe-4hI">
<rect key="frame" x="6" y="17" width="22" height="18"/>
<buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" alignment="center" truncatesLastVisibleLine="YES" state="on" inset="2" id="DCJ-Hb-a6L">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
</button>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" misplaced="YES" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="CF8-wJ-h9l">
<rect key="frame" x="32" y="0.0" width="154" height="51"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="Implement method 'objectClassInArray' for MJExtension" id="lMq-GB-Loj">
<font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
</subviews>
<constraints>
<constraint firstItem="CF8-wJ-h9l" firstAttribute="leading" secondItem="NxW-qe-4hI" secondAttribute="trailing" constant="8" id="KT2-g9-4pF"/>
<constraint firstAttribute="height" secondItem="CF8-wJ-h9l" secondAttribute="height" id="U7v-Lc-Crd"/>
<constraint firstItem="NxW-qe-4hI" firstAttribute="leading" secondItem="1We-vS-cHB" secondAttribute="leading" constant="8" id="Vhn-lh-rPb"/>
<constraint firstAttribute="trailing" secondItem="CF8-wJ-h9l" secondAttribute="trailing" constant="8" id="e1s-KD-dJc"/>
<constraint firstAttribute="centerY" secondItem="NxW-qe-4hI" secondAttribute="centerY" id="oV9-Eg-mrH"/>
<constraint firstAttribute="width" relation="lessThanOrEqual" constant="250" id="vtK-sx-ZKp"/>
<constraint firstAttribute="centerY" secondItem="CF8-wJ-h9l" secondAttribute="centerY" id="z5a-LL-3fT"/>
</constraints>
</customView>
</subviews>
<constraints>
<constraint firstItem="yaf-0Z-Omg" firstAttribute="leading" secondItem="se5-gp-TjO" secondAttribute="leading" constant="8" id="12u-YA-KCJ"/>
<constraint firstItem="Lz0-SS-Wl7" firstAttribute="top" secondItem="yaf-0Z-Omg" secondAttribute="bottom" constant="8" id="2M3-X0-XOJ"/>
<constraint firstItem="1We-vS-cHB" firstAttribute="top" secondItem="Lz0-SS-Wl7" secondAttribute="bottom" constant="8" id="QGp-sA-Oc3"/>
<constraint firstAttribute="bottom" secondItem="Lz0-SS-Wl7" secondAttribute="bottom" constant="67" id="TOK-5W-WEq"/>
<constraint firstAttribute="centerX" secondItem="1We-vS-cHB" secondAttribute="centerX" id="h1S-BR-kBJ"/>
<constraint firstAttribute="trailing" secondItem="yaf-0Z-Omg" secondAttribute="trailing" constant="8" id="jx2-aA-UjX"/>
<constraint firstAttribute="bottom" secondItem="1We-vS-cHB" secondAttribute="bottom" constant="8" id="ksp-y4-og5"/>
<constraint firstAttribute="centerX" secondItem="Lz0-SS-Wl7" secondAttribute="centerX" id="ru1-tC-Bgx"/>
<constraint firstItem="yaf-0Z-Omg" firstAttribute="top" secondItem="se5-gp-TjO" secondAttribute="top" constant="15" id="wUW-LA-9wY"/>
</constraints>
</view>
<connections>
<outlet property="delegate" destination="-2" id="0bl-1N-AYu"/>
</connections>
<point key="canvasLocation" x="-640" y="17.5"/>
</window>
</objects>
</document>