Skip to content

Commit 32b9d70

Browse files
author
ljh
committed
Demo更新 支持NSURL
1 parent 0dbdc67 commit 32b9d70

File tree

14 files changed

+123
-106
lines changed

14 files changed

+123
-106
lines changed

‎Demo-MAC/LKDB-Demo.xcodeproj/project.pbxproj

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
28182F26611160A985D5BD75 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 97CC89D0CF1C3033F6322828 /* libPods.a */; };
1110
366B23491CFD8D17006743C0 /* LKTestModels.m in Sources */ = {isa = PBXBuildFile; fileRef = 366B23471CFD8D17006743C0 /* LKTestModels.m */; };
1211
366B234B1CFD8D20006743C0 /* Snip20130620_6.png in Resources */ = {isa = PBXBuildFile; fileRef = 366B234A1CFD8D20006743C0 /* Snip20130620_6.png */; };
12+
3FD6EB9753080E31E717D05C /* libPods-LKDB-Demo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 99315F78949F082F14C946C2 /* libPods-LKDB-Demo.a */; };
1313
C541086F18E27786009D0644 /* libsqlite3.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = C541086E18E27786009D0644 /* libsqlite3.0.dylib */; };
1414
C5549E5E18E2675D00F92DED /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C5549E5D18E2675D00F92DED /* Cocoa.framework */; };
1515
C5549E6818E2675D00F92DED /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = C5549E6618E2675D00F92DED /* InfoPlist.strings */; };
@@ -24,7 +24,9 @@
2424
366B23471CFD8D17006743C0 /* LKTestModels.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LKTestModels.m; sourceTree = "<group>"; };
2525
366B23481CFD8D17006743C0 /* LKTestModels.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LKTestModels.h; sourceTree = "<group>"; };
2626
366B234A1CFD8D20006743C0 /* Snip20130620_6.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Snip20130620_6.png; path = ../../screenshot/Snip20130620_6.png; sourceTree = "<group>"; };
27-
97CC89D0CF1C3033F6322828 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
27+
40654376722B25A2212AEF70 /* Pods-LKDB-Demo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LKDB-Demo.release.xcconfig"; path = "Pods/Target Support Files/Pods-LKDB-Demo/Pods-LKDB-Demo.release.xcconfig"; sourceTree = "<group>"; };
28+
46DCE4EF486448C6DA5D363D /* Pods-LKDB-Demo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LKDB-Demo.debug.xcconfig"; path = "Pods/Target Support Files/Pods-LKDB-Demo/Pods-LKDB-Demo.debug.xcconfig"; sourceTree = "<group>"; };
29+
99315F78949F082F14C946C2 /* libPods-LKDB-Demo.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-LKDB-Demo.a"; sourceTree = BUILT_PRODUCTS_DIR; };
2830
C541086E18E27786009D0644 /* libsqlite3.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.0.dylib; path = usr/lib/libsqlite3.0.dylib; sourceTree = SDKROOT; };
2931
C5549E5A18E2675D00F92DED /* LKDB-Demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "LKDB-Demo.app"; sourceTree = BUILT_PRODUCTS_DIR; };
3032
C5549E5D18E2675D00F92DED /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
@@ -41,8 +43,6 @@
4143
C5549E7318E2675D00F92DED /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
4244
C5549E7518E2675D00F92DED /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
4345
C5549E7C18E2675D00F92DED /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
44-
E28258FADD0D933997F7CD9E /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
45-
FD773219247B8F040F883C75 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
4646
/* End PBXFileReference section */
4747

4848
/* Begin PBXFrameworksBuildPhase section */
@@ -52,20 +52,29 @@
5252
files = (
5353
C541086F18E27786009D0644 /* libsqlite3.0.dylib in Frameworks */,
5454
C5549E5E18E2675D00F92DED /* Cocoa.framework in Frameworks */,
55-
28182F26611160A985D5BD75 /* libPods.a in Frameworks */,
55+
3FD6EB9753080E31E717D05C /* libPods-LKDB-Demo.a in Frameworks */,
5656
);
5757
runOnlyForDeploymentPostprocessing = 0;
5858
};
5959
/* End PBXFrameworksBuildPhase section */
6060

6161
/* Begin PBXGroup section */
62+
B7149AE0793C081725AC5706 /* Pods */ = {
63+
isa = PBXGroup;
64+
children = (
65+
46DCE4EF486448C6DA5D363D /* Pods-LKDB-Demo.debug.xcconfig */,
66+
40654376722B25A2212AEF70 /* Pods-LKDB-Demo.release.xcconfig */,
67+
);
68+
name = Pods;
69+
sourceTree = "<group>";
70+
};
6271
C5549E5118E2675D00F92DED = {
6372
isa = PBXGroup;
6473
children = (
6574
C5549E6318E2675D00F92DED /* LKDB-Demo */,
6675
C5549E5C18E2675D00F92DED /* Frameworks */,
6776
C5549E5B18E2675D00F92DED /* Products */,
68-
C6C8FC5123E58922E57112A7 /* Pods */,
77+
B7149AE0793C081725AC5706 /* Pods */,
6978
);
7079
sourceTree = "<group>";
7180
};
@@ -84,7 +93,7 @@
8493
C5549E5D18E2675D00F92DED /* Cocoa.framework */,
8594
C5549E7C18E2675D00F92DED /* XCTest.framework */,
8695
C5549E5F18E2675D00F92DED /* Other Frameworks */,
87-
97CC89D0CF1C3033F6322828 /* libPods.a */,
96+
99315F78949F082F14C946C2 /* libPods-LKDB-Demo.a */,
8897
);
8998
name = Frameworks;
9099
sourceTree = "<group>";
@@ -126,28 +135,19 @@
126135
name = "Supporting Files";
127136
sourceTree = "<group>";
128137
};
129-
C6C8FC5123E58922E57112A7 /* Pods */ = {
130-
isa = PBXGroup;
131-
children = (
132-
FD773219247B8F040F883C75 /* Pods.debug.xcconfig */,
133-
E28258FADD0D933997F7CD9E /* Pods.release.xcconfig */,
134-
);
135-
name = Pods;
136-
sourceTree = "<group>";
137-
};
138138
/* End PBXGroup section */
139139

140140
/* Begin PBXNativeTarget section */
141141
C5549E5918E2675D00F92DED /* LKDB-Demo */ = {
142142
isa = PBXNativeTarget;
143143
buildConfigurationList = C5549E8B18E2675D00F92DED /* Build configuration list for PBXNativeTarget "LKDB-Demo" */;
144144
buildPhases = (
145-
840E007DEBA27486DC207555 /* Check Pods Manifest.lock */,
145+
602369954EB92204B21A7340 /* [CP] Check Pods Manifest.lock */,
146146
C5549E5618E2675D00F92DED /* Sources */,
147147
C5549E5718E2675D00F92DED /* Frameworks */,
148148
C5549E5818E2675D00F92DED /* Resources */,
149-
838BB34F01762E4815C11B03 /* Embed Pods Frameworks */,
150-
F74CFCD02D9EC2C3A570E622 /* Copy Pods Resources */,
149+
686DD3019C0E9C61D7DE306E /* [CP] Embed Pods Frameworks */,
150+
6EEB271FDB1FCC6F9CD9681F /* [CP] Copy Pods Resources */,
151151
);
152152
buildRules = (
153153
);
@@ -202,49 +202,49 @@
202202
/* End PBXResourcesBuildPhase section */
203203

204204
/* Begin PBXShellScriptBuildPhase section */
205-
838BB34F01762E4815C11B03 /* Embed Pods Frameworks */ = {
205+
602369954EB92204B21A7340 /* [CP] Check Pods Manifest.lock */ = {
206206
isa = PBXShellScriptBuildPhase;
207207
buildActionMask = 2147483647;
208208
files = (
209209
);
210210
inputPaths = (
211211
);
212-
name = "Embed Pods Frameworks";
212+
name = "[CP] Check Pods Manifest.lock";
213213
outputPaths = (
214214
);
215215
runOnlyForDeploymentPostprocessing = 0;
216216
shellPath = /bin/sh;
217-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
217+
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
218218
showEnvVarsInLog = 0;
219219
};
220-
840E007DEBA27486DC207555 /* Check Pods Manifest.lock */ = {
220+
686DD3019C0E9C61D7DE306E /* [CP] Embed Pods Frameworks */ = {
221221
isa = PBXShellScriptBuildPhase;
222222
buildActionMask = 2147483647;
223223
files = (
224224
);
225225
inputPaths = (
226226
);
227-
name = "Check Pods Manifest.lock";
227+
name = "[CP] Embed Pods Frameworks";
228228
outputPaths = (
229229
);
230230
runOnlyForDeploymentPostprocessing = 0;
231231
shellPath = /bin/sh;
232-
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
232+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-LKDB-Demo/Pods-LKDB-Demo-frameworks.sh\"\n";
233233
showEnvVarsInLog = 0;
234234
};
235-
F74CFCD02D9EC2C3A570E622 /* Copy Pods Resources */ = {
235+
6EEB271FDB1FCC6F9CD9681F /* [CP] Copy Pods Resources */ = {
236236
isa = PBXShellScriptBuildPhase;
237237
buildActionMask = 2147483647;
238238
files = (
239239
);
240240
inputPaths = (
241241
);
242-
name = "Copy Pods Resources";
242+
name = "[CP] Copy Pods Resources";
243243
outputPaths = (
244244
);
245245
runOnlyForDeploymentPostprocessing = 0;
246246
shellPath = /bin/sh;
247-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n";
247+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-LKDB-Demo/Pods-LKDB-Demo-resources.sh\"\n";
248248
showEnvVarsInLog = 0;
249249
};
250250
/* End PBXShellScriptBuildPhase section */
@@ -362,7 +362,7 @@
362362
};
363363
C5549E8C18E2675D00F92DED /* Debug */ = {
364364
isa = XCBuildConfiguration;
365-
baseConfigurationReference = FD773219247B8F040F883C75 /* Pods.debug.xcconfig */;
365+
baseConfigurationReference = 46DCE4EF486448C6DA5D363D /* Pods-LKDB-Demo.debug.xcconfig */;
366366
buildSettings = {
367367
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
368368
COMBINE_HIDPI_IMAGES = YES;
@@ -378,7 +378,7 @@
378378
};
379379
C5549E8D18E2675D00F92DED /* Release */ = {
380380
isa = XCBuildConfiguration;
381-
baseConfigurationReference = E28258FADD0D933997F7CD9E /* Pods.release.xcconfig */;
381+
baseConfigurationReference = 40654376722B25A2212AEF70 /* Pods-LKDB-Demo.release.xcconfig */;
382382
buildSettings = {
383383
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
384384
COMBINE_HIDPI_IMAGES = YES;

‎Demo-MAC/LKDB-Demo/LKAppDelegate.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ -(void)test
6565

6666
test.name = @"zhan san";
6767
test.age = 16;
68+
test.url = [NSURL URLWithString:@"http://xx"];
6869

6970
//外键 foreign key
7071
test.address = foreign;

‎Demo-MAC/LKDB-Demo/LKTestModels.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
@property(strong,nonatomic) LKTestForeign* nestModel;
3030

31+
@property(copy,nonatomic)NSURL* url;
3132
@property(copy,nonatomic)NSString* name;
3233
@property NSUInteger age;
3334
@property BOOL isGirl;

‎Demo-MAC/Podfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1-
platform :osx,10.6
2-
pod 'LKDBHelper'
1+
platform :osx, 10.6
2+
target 'LKDB-Demo' do
3+
pod 'LKDBHelper'
4+
end

‎Demo-MAC/Podfile.lock

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@ PODS:
22
- FMDB (2.6.2):
33
- FMDB/standard (= 2.6.2)
44
- FMDB/standard (2.6.2)
5-
- LKDBHelper (2.2.1):
5+
- LKDBHelper (2.3.2):
66
- FMDB
77

88
DEPENDENCIES:
99
- LKDBHelper
1010

1111
SPEC CHECKSUMS:
1212
FMDB: 854a0341b4726e53276f2a8996f06f1b80f9259a
13-
LKDBHelper: a8d2ac92cde1f462a3314ab5e2629a527eb0cc54
13+
LKDBHelper: 282cb4e56541e8f07d430465700bf2b891837a44
1414

15-
COCOAPODS: 0.39.0
15+
PODFILE CHECKSUM: ed29d60a42995845b9d80a336b783a78e6ce4ba3
16+
17+
COCOAPODS: 1.0.1

‎Demo-Swift/Podfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
platform :ios,8.0
22
use_frameworks!
3-
4-
pod 'LKDBHelper'
3+
target 'Swift-Demo' do
4+
pod 'LKDBHelper'
5+
end

‎Demo-Swift/Podfile.lock

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@ PODS:
22
- FMDB (2.6.2):
33
- FMDB/standard (= 2.6.2)
44
- FMDB/standard (2.6.2)
5-
- LKDBHelper (2.2.1):
5+
- LKDBHelper (2.3.2):
66
- FMDB
77

88
DEPENDENCIES:
99
- LKDBHelper
1010

1111
SPEC CHECKSUMS:
1212
FMDB: 854a0341b4726e53276f2a8996f06f1b80f9259a
13-
LKDBHelper: a8d2ac92cde1f462a3314ab5e2629a527eb0cc54
13+
LKDBHelper: 282cb4e56541e8f07d430465700bf2b891837a44
1414

15-
COCOAPODS: 0.39.0
15+
PODFILE CHECKSUM: 21f5851a057fd7dc5601e3d2806ec16c9e0e327b
16+
17+
COCOAPODS: 1.0.1

0 commit comments

Comments
 (0)