diff --git a/DBDemo/DBDemo.xcodeproj/project.pbxproj b/DBDemo/DBDemo.xcodeproj/project.pbxproj index 3f60eac..c9ecfb7 100644 --- a/DBDemo/DBDemo.xcodeproj/project.pbxproj +++ b/DBDemo/DBDemo.xcodeproj/project.pbxproj @@ -10,9 +10,7 @@ CB1D863A19CEAB820025052A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = CB1D863919CEAB820025052A /* main.m */; }; CB1D863D19CEAB820025052A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CB1D863C19CEAB820025052A /* AppDelegate.m */; }; CB1D864019CEAB820025052A /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CB1D863F19CEAB820025052A /* ViewController.m */; }; - CB1D864319CEAB820025052A /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = CB1D864119CEAB820025052A /* Main.storyboard */; }; CB1D864519CEAB820025052A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = CB1D864419CEAB820025052A /* Images.xcassets */; }; - CB1D864819CEAB820025052A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = CB1D864619CEAB820025052A /* LaunchScreen.xib */; }; CB1D865419CEAB820025052A /* DBDemoTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CB1D865319CEAB820025052A /* DBDemoTests.m */; }; CB1D867519CEABD80025052A /* GXMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = CB1D865F19CEABD80025052A /* GXMessage.m */; }; CB1D867619CEABD80025052A /* FMDatabase.m in Sources */ = {isa = PBXBuildFile; fileRef = CB1D866219CEABD80025052A /* FMDatabase.m */; }; @@ -50,9 +48,7 @@ CB1D863C19CEAB820025052A /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; CB1D863E19CEAB820025052A /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = ""; }; CB1D863F19CEAB820025052A /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = ""; }; - CB1D864219CEAB820025052A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; CB1D864419CEAB820025052A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; - CB1D864719CEAB820025052A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; CB1D864D19CEAB820025052A /* DBDemoTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DBDemoTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; CB1D865219CEAB820025052A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; CB1D865319CEAB820025052A /* DBDemoTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DBDemoTests.m; sourceTree = ""; }; @@ -137,9 +133,7 @@ CB1D863C19CEAB820025052A /* AppDelegate.m */, CB1D863E19CEAB820025052A /* ViewController.h */, CB1D863F19CEAB820025052A /* ViewController.m */, - CB1D864119CEAB820025052A /* Main.storyboard */, CB1D864419CEAB820025052A /* Images.xcassets */, - CB1D864619CEAB820025052A /* LaunchScreen.xib */, CB1D863719CEAB820025052A /* Supporting Files */, CBD5E26719CFFEA400097CD3 /* play.playground */, ); @@ -289,6 +283,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, Base, ); @@ -308,8 +303,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - CB1D864319CEAB820025052A /* Main.storyboard in Resources */, - CB1D864819CEAB820025052A /* LaunchScreen.xib in Resources */, CB8560FE19D114FD00B67244 /* iphone-512.png in Resources */, CB1D864519CEAB820025052A /* Images.xcassets in Resources */, CB85610419D1183200B67244 /* iphone-25@2x.png in Resources */, @@ -367,25 +360,6 @@ }; /* End PBXTargetDependency section */ -/* Begin PBXVariantGroup section */ - CB1D864119CEAB820025052A /* Main.storyboard */ = { - isa = PBXVariantGroup; - children = ( - CB1D864219CEAB820025052A /* Base */, - ); - name = Main.storyboard; - sourceTree = ""; - }; - CB1D864619CEAB820025052A /* LaunchScreen.xib */ = { - isa = PBXVariantGroup; - children = ( - CB1D864719CEAB820025052A /* Base */, - ); - name = LaunchScreen.xib; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - /* Begin XCBuildConfiguration section */ CB1D865519CEAB820025052A /* Debug */ = { isa = XCBuildConfiguration; @@ -467,6 +441,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; INFOPLIST_FILE = DBDemo/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 6.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -478,6 +453,7 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; INFOPLIST_FILE = DBDemo/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 6.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; diff --git a/DBDemo/DBDemo/AppDelegate.m b/DBDemo/DBDemo/AppDelegate.m index f79d05c..9c85d58 100644 --- a/DBDemo/DBDemo/AppDelegate.m +++ b/DBDemo/DBDemo/AppDelegate.m @@ -7,6 +7,7 @@ // #import "AppDelegate.h" +#import "ViewController.h" @interface AppDelegate () @@ -17,6 +18,12 @@ @implementation AppDelegate - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { // Override point for customization after application launch. + + self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]]; + ViewController *vc= [[ViewController alloc] init]; + + self.window.rootViewController = vc; + [self.window makeKeyAndVisible]; return YES; } diff --git a/DBDemo/DBDemo/Images.xcassets/AppIcon.appiconset/Contents.json b/DBDemo/DBDemo/Images.xcassets/AppIcon.appiconset/Contents.json index 118c98f..8121323 100644 --- a/DBDemo/DBDemo/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/DBDemo/DBDemo/Images.xcassets/AppIcon.appiconset/Contents.json @@ -2,37 +2,52 @@ "images" : [ { "idiom" : "iphone", - "size" : "29x29", - "scale" : "2x" + "scale" : "2x", + "size" : "20x20" }, { "idiom" : "iphone", - "size" : "29x29", - "scale" : "3x" + "scale" : "3x", + "size" : "20x20" }, { "idiom" : "iphone", - "size" : "40x40", - "scale" : "2x" + "scale" : "2x", + "size" : "29x29" }, { "idiom" : "iphone", - "size" : "40x40", - "scale" : "3x" + "scale" : "3x", + "size" : "29x29" }, { "idiom" : "iphone", - "size" : "60x60", - "scale" : "2x" + "scale" : "2x", + "size" : "40x40" }, { "idiom" : "iphone", - "size" : "60x60", - "scale" : "3x" + "scale" : "3x", + "size" : "40x40" + }, + { + "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" + }, + { + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" + }, + { + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/DBDemo/DBDemo/Images.xcassets/Contents.json b/DBDemo/DBDemo/Images.xcassets/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/DBDemo/DBDemo/Images.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/DBDemo/DBDemo/Images.xcassets/LaunchImage.launchimage/Contents.json b/DBDemo/DBDemo/Images.xcassets/LaunchImage.launchimage/Contents.json new file mode 100644 index 0000000..04a2c3e --- /dev/null +++ b/DBDemo/DBDemo/Images.xcassets/LaunchImage.launchimage/Contents.json @@ -0,0 +1,119 @@ +{ + "images" : [ + { + "extent" : "full-screen", + "filename" : "default_1.png", + "idiom" : "iphone", + "minimum-system-version" : "12.0", + "orientation" : "portrait", + "scale" : "3x", + "subtype" : "2688h" + }, + { + "extent" : "full-screen", + "idiom" : "iphone", + "minimum-system-version" : "12.0", + "orientation" : "landscape", + "scale" : "3x", + "subtype" : "2688h" + }, + { + "extent" : "full-screen", + "filename" : "default_2.png", + "idiom" : "iphone", + "minimum-system-version" : "12.0", + "orientation" : "portrait", + "scale" : "2x", + "subtype" : "1792h" + }, + { + "extent" : "full-screen", + "idiom" : "iphone", + "minimum-system-version" : "12.0", + "orientation" : "landscape", + "scale" : "2x", + "subtype" : "1792h" + }, + { + "extent" : "full-screen", + "filename" : "default_3.png", + "idiom" : "iphone", + "minimum-system-version" : "11.0", + "orientation" : "portrait", + "scale" : "3x", + "subtype" : "2436h" + }, + { + "extent" : "full-screen", + "idiom" : "iphone", + "minimum-system-version" : "11.0", + "orientation" : "landscape", + "scale" : "3x", + "subtype" : "2436h" + }, + { + "extent" : "full-screen", + "filename" : "default_4.png", + "idiom" : "iphone", + "minimum-system-version" : "8.0", + "orientation" : "portrait", + "scale" : "3x", + "subtype" : "736h" + }, + { + "extent" : "full-screen", + "idiom" : "iphone", + "minimum-system-version" : "8.0", + "orientation" : "landscape", + "scale" : "3x", + "subtype" : "736h" + }, + { + "extent" : "full-screen", + "filename" : "default_5.png", + "idiom" : "iphone", + "minimum-system-version" : "8.0", + "orientation" : "portrait", + "scale" : "2x", + "subtype" : "667h" + }, + { + "extent" : "full-screen", + "idiom" : "iphone", + "minimum-system-version" : "7.0", + "orientation" : "portrait", + "scale" : "2x" + }, + { + "extent" : "full-screen", + "idiom" : "iphone", + "minimum-system-version" : "7.0", + "orientation" : "portrait", + "scale" : "2x", + "subtype" : "retina4" + }, + { + "extent" : "full-screen", + "idiom" : "iphone", + "orientation" : "portrait", + "scale" : "1x" + }, + { + "extent" : "full-screen", + "idiom" : "iphone", + "orientation" : "portrait", + "scale" : "2x" + }, + { + "extent" : "full-screen", + "idiom" : "iphone", + "orientation" : "portrait", + "scale" : "2x", + "subtype" : "retina4" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/DBDemo/DBDemo/Images.xcassets/LaunchImage.launchimage/default_1.png b/DBDemo/DBDemo/Images.xcassets/LaunchImage.launchimage/default_1.png new file mode 100644 index 0000000..7c9334a Binary files /dev/null and b/DBDemo/DBDemo/Images.xcassets/LaunchImage.launchimage/default_1.png differ diff --git a/DBDemo/DBDemo/Images.xcassets/LaunchImage.launchimage/default_2.png b/DBDemo/DBDemo/Images.xcassets/LaunchImage.launchimage/default_2.png new file mode 100644 index 0000000..afd10ce Binary files /dev/null and b/DBDemo/DBDemo/Images.xcassets/LaunchImage.launchimage/default_2.png differ diff --git a/DBDemo/DBDemo/Images.xcassets/LaunchImage.launchimage/default_3.png b/DBDemo/DBDemo/Images.xcassets/LaunchImage.launchimage/default_3.png new file mode 100644 index 0000000..ef116b4 Binary files /dev/null and b/DBDemo/DBDemo/Images.xcassets/LaunchImage.launchimage/default_3.png differ diff --git a/DBDemo/DBDemo/Images.xcassets/LaunchImage.launchimage/default_4.png b/DBDemo/DBDemo/Images.xcassets/LaunchImage.launchimage/default_4.png new file mode 100644 index 0000000..39e4d47 Binary files /dev/null and b/DBDemo/DBDemo/Images.xcassets/LaunchImage.launchimage/default_4.png differ diff --git a/DBDemo/DBDemo/Images.xcassets/LaunchImage.launchimage/default_5.png b/DBDemo/DBDemo/Images.xcassets/LaunchImage.launchimage/default_5.png new file mode 100644 index 0000000..17e9906 Binary files /dev/null and b/DBDemo/DBDemo/Images.xcassets/LaunchImage.launchimage/default_5.png differ diff --git a/DBDemo/DBDemo/Info.plist b/DBDemo/DBDemo/Info.plist index 41f5990..5a516f8 100644 --- a/DBDemo/DBDemo/Info.plist +++ b/DBDemo/DBDemo/Info.plist @@ -22,10 +22,6 @@ 1 LSRequiresIPhoneOS - UILaunchStoryboardName - LaunchScreen - UIMainStoryboardFile - Main UIRequiredDeviceCapabilities armv7 diff --git a/DBDemo/DBDemo/ViewController.m b/DBDemo/DBDemo/ViewController.m index a6f5ebe..c07f94a 100644 --- a/DBDemo/DBDemo/ViewController.m +++ b/DBDemo/DBDemo/ViewController.m @@ -29,6 +29,7 @@ - (void)viewDidLoad { [super viewDidLoad]; // Do any additional setup after loading the view, typically from a nib. + self.view.backgroundColor = [UIColor whiteColor]; [self addView]; } diff --git a/testDB.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/testDB.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/testDB.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + +