Skip to content

Commit 2162879

Browse files
author
yanqizhou
committed
swiftdemo同步
1 parent 2cd2905 commit 2162879

File tree

7 files changed

+27
-10
lines changed

7 files changed

+27
-10
lines changed

DebugDatabase/DebugDatabaseManager.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//
88

99
#import <Foundation/Foundation.h>
10-
#import "GCDWebServer.h"
10+
#import <GCDWebServer/GCDWebServer.h>
1111

1212
@interface DebugDatabaseManager : GCDWebServer
1313

DebugDatabase/DebugDatabaseManager.m

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#import "NSURL+scheme.h"
1111
#import "DatabaseUtil.h"
1212
#import "NSString+json.h"
13-
#import "GCDWebServer.h"
1413
#import "GCDWebServerRequest.h"
1514
#import "GCDWebServerDataResponse.h"
1615

SwiftDebugDatabase/Podfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
target 'SwiftDebugDatabase' do
22
use_frameworks!
3-
pod 'YYDebugDatabase', :path => '../'
3+
# pod 'YYDebugDatabase', :git => 'https://github.com/y500/iOSDebugDatabase.git', :tag => '2.0.0'
4+
pod 'YYDebugDatabase', :path => '../'
45
end
56

SwiftDebugDatabase/SwiftDebugDatabase.xcodeproj/project.pbxproj

+18-3
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,12 @@
126126
isa = PBXProject;
127127
attributes = {
128128
LastSwiftUpdateCheck = 0820;
129-
LastUpgradeCheck = 0820;
129+
LastUpgradeCheck = 0920;
130130
ORGANIZATIONNAME = wentian;
131131
TargetAttributes = {
132132
E8D7933E1F989FC6007BECF8 = {
133133
CreatedOnToolsVersion = 8.2.1;
134+
DevelopmentTeam = DUD9TSG469;
134135
LastSwiftMigration = 0820;
135136
ProvisioningStyle = Automatic;
136137
};
@@ -177,14 +178,14 @@
177178
);
178179
inputPaths = (
179180
"${SRCROOT}/Pods/Target Support Files/Pods-SwiftDebugDatabase/Pods-SwiftDebugDatabase-frameworks.sh",
180-
"${BUILT_PRODUCTS_DIR}/CocoaAsyncSocket/CocoaAsyncSocket.framework",
181181
"${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework",
182+
"${BUILT_PRODUCTS_DIR}/GCDWebServer/GCDWebServer.framework",
182183
"${BUILT_PRODUCTS_DIR}/YYDebugDatabase/YYDebugDatabase.framework",
183184
);
184185
name = "[CP] Embed Pods Frameworks";
185186
outputPaths = (
186-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CocoaAsyncSocket.framework",
187187
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FMDB.framework",
188+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GCDWebServer.framework",
188189
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYDebugDatabase.framework",
189190
);
190191
runOnlyForDeploymentPostprocessing = 0;
@@ -268,15 +269,21 @@
268269
CLANG_CXX_LIBRARY = "libc++";
269270
CLANG_ENABLE_MODULES = YES;
270271
CLANG_ENABLE_OBJC_ARC = YES;
272+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
271273
CLANG_WARN_BOOL_CONVERSION = YES;
274+
CLANG_WARN_COMMA = YES;
272275
CLANG_WARN_CONSTANT_CONVERSION = YES;
273276
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
274277
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
275278
CLANG_WARN_EMPTY_BODY = YES;
276279
CLANG_WARN_ENUM_CONVERSION = YES;
277280
CLANG_WARN_INFINITE_RECURSION = YES;
278281
CLANG_WARN_INT_CONVERSION = YES;
282+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
283+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
279284
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
285+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
286+
CLANG_WARN_STRICT_PROTOTYPES = YES;
280287
CLANG_WARN_SUSPICIOUS_MOVE = YES;
281288
CLANG_WARN_UNREACHABLE_CODE = YES;
282289
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -318,15 +325,21 @@
318325
CLANG_CXX_LIBRARY = "libc++";
319326
CLANG_ENABLE_MODULES = YES;
320327
CLANG_ENABLE_OBJC_ARC = YES;
328+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
321329
CLANG_WARN_BOOL_CONVERSION = YES;
330+
CLANG_WARN_COMMA = YES;
322331
CLANG_WARN_CONSTANT_CONVERSION = YES;
323332
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
324333
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
325334
CLANG_WARN_EMPTY_BODY = YES;
326335
CLANG_WARN_ENUM_CONVERSION = YES;
327336
CLANG_WARN_INFINITE_RECURSION = YES;
328337
CLANG_WARN_INT_CONVERSION = YES;
338+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
339+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
329340
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
341+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
342+
CLANG_WARN_STRICT_PROTOTYPES = YES;
330343
CLANG_WARN_SUSPICIOUS_MOVE = YES;
331344
CLANG_WARN_UNREACHABLE_CODE = YES;
332345
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -358,6 +371,7 @@
358371
buildSettings = {
359372
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
360373
CLANG_ENABLE_MODULES = YES;
374+
DEVELOPMENT_TEAM = DUD9TSG469;
361375
INFOPLIST_FILE = SwiftDebugDatabase/Info.plist;
362376
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
363377
PRODUCT_BUNDLE_IDENTIFIER = swift.debug.database.SwiftDebugDatabase;
@@ -374,6 +388,7 @@
374388
buildSettings = {
375389
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
376390
CLANG_ENABLE_MODULES = YES;
391+
DEVELOPMENT_TEAM = DUD9TSG469;
377392
INFOPLIST_FILE = SwiftDebugDatabase/Info.plist;
378393
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
379394
PRODUCT_BUNDLE_IDENTIFIER = swift.debug.database.SwiftDebugDatabase;

SwiftDebugDatabase/SwiftDebugDatabase.xcodeproj/xcuserdata/wentian.xcuserdatad/xcschemes/SwiftDebugDatabase.xcscheme

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0820"
3+
LastUpgradeVersion = "0920"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
</Testables>
@@ -45,6 +46,7 @@
4546
buildConfiguration = "Debug"
4647
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4748
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
49+
language = ""
4850
launchStyle = "0"
4951
useCustomWorkingDirectory = "NO"
5052
ignoresPersistentStateOnLaunch = "NO"

SwiftDebugDatabase/SwiftDebugDatabase.xcworkspace/xcuserdata/wentian.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
endingColumnNumber = "9223372036854775807"
1616
startingLineNumber = "101"
1717
endingLineNumber = "101"
18-
landmarkName = "-socket:didReadData:withTag:"
18+
landmarkName = "-setupAdvanceRoutes"
1919
landmarkType = "7">
2020
</BreakpointContent>
2121
</BreakpointProxy>
@@ -31,7 +31,7 @@
3131
endingColumnNumber = "9223372036854775807"
3232
startingLineNumber = "242"
3333
endingLineNumber = "242"
34-
landmarkName = "-getAllDBPathsWithDirectories:"
34+
landmarkName = "-getTableNameFromQuery:"
3535
landmarkType = "7">
3636
</BreakpointContent>
3737
</BreakpointProxy>

YYDebugDatabase/AppDelegate.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
3636
NSString *databaseDirectory = [NSHomeDirectory() stringByAppendingPathComponent:@"Documents/database"];
3737
NSString *documentDirectory = [NSHomeDirectory() stringByAppendingPathComponent:@"Documents"];
3838
NSString *cacheDirectory = [NSHomeDirectory() stringByAppendingPathComponent:@"Library/Cache"];
39-
[[DebugDatabaseManager shared] startServerOnPort:80 directories:@[resourceDirectory, databaseDirectory, documentDirectory, cacheDirectory]];
39+
[[DebugDatabaseManager shared] startServerOnPort:9002 directories:@[resourceDirectory, databaseDirectory, documentDirectory, cacheDirectory]];
4040

4141
return YES;
4242
}

0 commit comments

Comments
 (0)