From 2162879d96e883a81ec3b2d4fb7d05dacfc68f21 Mon Sep 17 00:00:00 2001 From: yanqizhou <> Date: Wed, 13 Dec 2017 16:17:28 +0800 Subject: [PATCH] =?UTF-8?q?swiftdemo=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DebugDatabase/DebugDatabaseManager.h | 2 +- DebugDatabase/DebugDatabaseManager.m | 1 - SwiftDebugDatabase/Podfile | 3 ++- .../project.pbxproj | 21 ++++++++++++++++--- .../xcschemes/SwiftDebugDatabase.xcscheme | 4 +++- .../xcdebugger/Breakpoints_v2.xcbkptlist | 4 ++-- YYDebugDatabase/AppDelegate.m | 2 +- 7 files changed, 27 insertions(+), 10 deletions(-) diff --git a/DebugDatabase/DebugDatabaseManager.h b/DebugDatabase/DebugDatabaseManager.h index 4dacac6..20ffbd0 100644 --- a/DebugDatabase/DebugDatabaseManager.h +++ b/DebugDatabase/DebugDatabaseManager.h @@ -7,7 +7,7 @@ // #import -#import "GCDWebServer.h" +#import @interface DebugDatabaseManager : GCDWebServer diff --git a/DebugDatabase/DebugDatabaseManager.m b/DebugDatabase/DebugDatabaseManager.m index cc3b6ff..3c437d5 100644 --- a/DebugDatabase/DebugDatabaseManager.m +++ b/DebugDatabase/DebugDatabaseManager.m @@ -10,7 +10,6 @@ #import "NSURL+scheme.h" #import "DatabaseUtil.h" #import "NSString+json.h" -#import "GCDWebServer.h" #import "GCDWebServerRequest.h" #import "GCDWebServerDataResponse.h" diff --git a/SwiftDebugDatabase/Podfile b/SwiftDebugDatabase/Podfile index 4bedcd0..d7cde24 100644 --- a/SwiftDebugDatabase/Podfile +++ b/SwiftDebugDatabase/Podfile @@ -1,5 +1,6 @@ target 'SwiftDebugDatabase' do use_frameworks! - pod 'YYDebugDatabase', :path => '../' +# pod 'YYDebugDatabase', :git => 'https://github.com/y500/iOSDebugDatabase.git', :tag => '2.0.0' +pod 'YYDebugDatabase', :path => '../' end diff --git a/SwiftDebugDatabase/SwiftDebugDatabase.xcodeproj/project.pbxproj b/SwiftDebugDatabase/SwiftDebugDatabase.xcodeproj/project.pbxproj index 69a0277..5fc1928 100644 --- a/SwiftDebugDatabase/SwiftDebugDatabase.xcodeproj/project.pbxproj +++ b/SwiftDebugDatabase/SwiftDebugDatabase.xcodeproj/project.pbxproj @@ -126,11 +126,12 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0820; - LastUpgradeCheck = 0820; + LastUpgradeCheck = 0920; ORGANIZATIONNAME = wentian; TargetAttributes = { E8D7933E1F989FC6007BECF8 = { CreatedOnToolsVersion = 8.2.1; + DevelopmentTeam = DUD9TSG469; LastSwiftMigration = 0820; ProvisioningStyle = Automatic; }; @@ -177,14 +178,14 @@ ); inputPaths = ( "${SRCROOT}/Pods/Target Support Files/Pods-SwiftDebugDatabase/Pods-SwiftDebugDatabase-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/CocoaAsyncSocket/CocoaAsyncSocket.framework", "${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework", + "${BUILT_PRODUCTS_DIR}/GCDWebServer/GCDWebServer.framework", "${BUILT_PRODUCTS_DIR}/YYDebugDatabase/YYDebugDatabase.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CocoaAsyncSocket.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FMDB.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GCDWebServer.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYDebugDatabase.framework", ); runOnlyForDeploymentPostprocessing = 0; @@ -268,7 +269,9 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; @@ -276,7 +279,11 @@ CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -318,7 +325,9 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; @@ -326,7 +335,11 @@ CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -358,6 +371,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; + DEVELOPMENT_TEAM = DUD9TSG469; INFOPLIST_FILE = SwiftDebugDatabase/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = swift.debug.database.SwiftDebugDatabase; @@ -374,6 +388,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; + DEVELOPMENT_TEAM = DUD9TSG469; INFOPLIST_FILE = SwiftDebugDatabase/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = swift.debug.database.SwiftDebugDatabase; diff --git a/SwiftDebugDatabase/SwiftDebugDatabase.xcodeproj/xcuserdata/wentian.xcuserdatad/xcschemes/SwiftDebugDatabase.xcscheme b/SwiftDebugDatabase/SwiftDebugDatabase.xcodeproj/xcuserdata/wentian.xcuserdatad/xcschemes/SwiftDebugDatabase.xcscheme index 09fa698..8cd1fa5 100644 --- a/SwiftDebugDatabase/SwiftDebugDatabase.xcodeproj/xcuserdata/wentian.xcuserdatad/xcschemes/SwiftDebugDatabase.xcscheme +++ b/SwiftDebugDatabase/SwiftDebugDatabase.xcodeproj/xcuserdata/wentian.xcuserdatad/xcschemes/SwiftDebugDatabase.xcscheme @@ -1,6 +1,6 @@ @@ -45,6 +46,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/SwiftDebugDatabase/SwiftDebugDatabase.xcworkspace/xcuserdata/wentian.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/SwiftDebugDatabase/SwiftDebugDatabase.xcworkspace/xcuserdata/wentian.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 9d3c0ce..5a0b8a8 100644 --- a/SwiftDebugDatabase/SwiftDebugDatabase.xcworkspace/xcuserdata/wentian.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/SwiftDebugDatabase/SwiftDebugDatabase.xcworkspace/xcuserdata/wentian.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -15,7 +15,7 @@ endingColumnNumber = "9223372036854775807" startingLineNumber = "101" endingLineNumber = "101" - landmarkName = "-socket:didReadData:withTag:" + landmarkName = "-setupAdvanceRoutes" landmarkType = "7"> @@ -31,7 +31,7 @@ endingColumnNumber = "9223372036854775807" startingLineNumber = "242" endingLineNumber = "242" - landmarkName = "-getAllDBPathsWithDirectories:" + landmarkName = "-getTableNameFromQuery:" landmarkType = "7"> diff --git a/YYDebugDatabase/AppDelegate.m b/YYDebugDatabase/AppDelegate.m index 04c582a..af57b62 100644 --- a/YYDebugDatabase/AppDelegate.m +++ b/YYDebugDatabase/AppDelegate.m @@ -36,7 +36,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( NSString *databaseDirectory = [NSHomeDirectory() stringByAppendingPathComponent:@"Documents/database"]; NSString *documentDirectory = [NSHomeDirectory() stringByAppendingPathComponent:@"Documents"]; NSString *cacheDirectory = [NSHomeDirectory() stringByAppendingPathComponent:@"Library/Cache"]; - [[DebugDatabaseManager shared] startServerOnPort:80 directories:@[resourceDirectory, databaseDirectory, documentDirectory, cacheDirectory]]; + [[DebugDatabaseManager shared] startServerOnPort:9002 directories:@[resourceDirectory, databaseDirectory, documentDirectory, cacheDirectory]]; return YES; }