dev:合并dev_login,增加了登录界面和注册界面

RainesGit · Nov 13, 2015 · 045da1e · 045da1e
2 parents 62f98da + 1ee6203
commit 045da1e
Show file tree

Hide file tree

Showing 7 changed files with 257 additions and 17 deletions.
diff --git a/Oncenote.xcodeproj/project.pbxproj b/Oncenote.xcodeproj/project.pbxproj
@@ -24,6 +24,7 @@
 		717903301BF48FC200428756 /* NotificationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7179032F1BF48FC200428756 /* NotificationController.m */; };
 		717903331BF48FC200428756 /* GlanceController.m in Sources */ = {isa = PBXBuildFile; fileRef = 717903321BF48FC200428756 /* GlanceController.m */; };
 		717903351BF48FC200428756 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 717903341BF48FC200428756 /* Assets.xcassets */; };
+		71A793751BF5B5F000410FFC /* LoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71A793741BF5B5F000410FFC /* LoginViewController.m */; settings = {ASSET_TAGS = (); }; };
 		FAC95080E1299F0315B3C301 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 52A3A8C36BAD439F0DCC8BC9 /* libPods.a */; };
 /* End PBXBuildFile section */
 
@@ -118,6 +119,8 @@
 		717903321BF48FC200428756 /* GlanceController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GlanceController.m; sourceTree = "<group>"; };
 		717903341BF48FC200428756 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		717903361BF48FC200428756 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		71A793731BF5B5F000410FFC /* LoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginViewController.h; sourceTree = "<group>"; };
+		71A793741BF5B5F000410FFC /* LoginViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginViewController.m; sourceTree = "<group>"; };
 		C6D3406A90F2A54E2CBA0100 /* 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>"; };
 /* End PBXFileReference section */
 
@@ -193,6 +196,8 @@
 			children = (
 				717902EB1BF48FC100428756 /* AppDelegate.h */,
 				717902EC1BF48FC100428756 /* AppDelegate.m */,
+				71A793731BF5B5F000410FFC /* LoginViewController.h */,
+				71A793741BF5B5F000410FFC /* LoginViewController.m */,
 				717902EE1BF48FC100428756 /* ViewController.h */,
 				717902EF1BF48FC100428756 /* ViewController.m */,
 				717902F11BF48FC100428756 /* Main.storyboard */,
@@ -522,6 +527,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				71A793751BF5B5F000410FFC /* LoginViewController.m in Sources */,
 				717902F01BF48FC100428756 /* ViewController.m in Sources */,
 				717902ED1BF48FC100428756 /* AppDelegate.m in Sources */,
 				717902EA1BF48FC100428756 /* main.m in Sources */,

diff --git a/Oncenote/Assets.xcassets/LoginAppIcon.imageset/Contents.json b/Oncenote/Assets.xcassets/LoginAppIcon.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "LoginAppIcon.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/Oncenote/Assets.xcassets/LoginAppIcon.imageset/LoginAppIcon.png b/Oncenote/Assets.xcassets/LoginAppIcon.imageset/LoginAppIcon.png
diff --git a/Oncenote/Base.lproj/Main.storyboard b/Oncenote/Base.lproj/Main.storyboard
diff --git a/Oncenote/Info.plist b/Oncenote/Info.plist
@@ -33,8 +33,6 @@
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>

diff --git a/Oncenote/LoginViewController.h b/Oncenote/LoginViewController.h
@@ -0,0 +1,13 @@
+//
+//  LoginViewController.h
+//  Oncenote
+//
+//  Created by chenyufeng on 15/11/13.
+//  Copyright © 2015年 chenyufengweb. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface LoginViewController : UIViewController
+
+@end
diff --git a/Oncenote/LoginViewController.m b/Oncenote/LoginViewController.m
@@ -0,0 +1,36 @@
+
+//
+//  LoginViewController.m
+//  Oncenote
+//
+//  Created by chenyufeng on 15/11/13.
+//  Copyright © 2015年 chenyufengweb. All rights reserved.
+//
+
+#import "LoginViewController.h"
+
+@interface LoginViewController ()
+
+@end
+
+@implementation LoginViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+
+
+
+
+}
+
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end