Commit 939ad3a7 authored by Sandy's avatar Sandy

添加用户信息单例

parent 8f09a06a
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
199BC7D31C9BBE0100E4E0B8 /* StoreViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 199BC7D21C9BBE0100E4E0B8 /* StoreViewController.m */; }; 199BC7D31C9BBE0100E4E0B8 /* StoreViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 199BC7D21C9BBE0100E4E0B8 /* StoreViewController.m */; };
199BC7D61C9BBE0D00E4E0B8 /* MineViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 199BC7D51C9BBE0D00E4E0B8 /* MineViewController.m */; }; 199BC7D61C9BBE0D00E4E0B8 /* MineViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 199BC7D51C9BBE0D00E4E0B8 /* MineViewController.m */; };
199BC7D91C9BBE1A00E4E0B8 /* MassageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 199BC7D81C9BBE1A00E4E0B8 /* MassageViewController.m */; }; 199BC7D91C9BBE1A00E4E0B8 /* MassageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 199BC7D81C9BBE1A00E4E0B8 /* MassageViewController.m */; };
19A1C8411CA27564003E5DD9 /* UserInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 19A1C8401CA27564003E5DD9 /* UserInfo.m */; };
19DCCB591C9A9EB30072C3BF /* IBTAudioController.m in Sources */ = {isa = PBXBuildFile; fileRef = 19DCCB0C1C9A9EB30072C3BF /* IBTAudioController.m */; }; 19DCCB591C9A9EB30072C3BF /* IBTAudioController.m in Sources */ = {isa = PBXBuildFile; fileRef = 19DCCB0C1C9A9EB30072C3BF /* IBTAudioController.m */; };
19DCCB5A1C9A9EB30072C3BF /* IBTAudioRecorder.m in Sources */ = {isa = PBXBuildFile; fileRef = 19DCCB0E1C9A9EB30072C3BF /* IBTAudioRecorder.m */; }; 19DCCB5A1C9A9EB30072C3BF /* IBTAudioRecorder.m in Sources */ = {isa = PBXBuildFile; fileRef = 19DCCB0E1C9A9EB30072C3BF /* IBTAudioRecorder.m */; };
19DCCB5B1C9A9EB30072C3BF /* IBTAudioServicesManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 19DCCB101C9A9EB30072C3BF /* IBTAudioServicesManager.m */; }; 19DCCB5B1C9A9EB30072C3BF /* IBTAudioServicesManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 19DCCB101C9A9EB30072C3BF /* IBTAudioServicesManager.m */; };
...@@ -190,6 +191,8 @@ ...@@ -190,6 +191,8 @@
199BC7D51C9BBE0D00E4E0B8 /* MineViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MineViewController.m; sourceTree = "<group>"; }; 199BC7D51C9BBE0D00E4E0B8 /* MineViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MineViewController.m; sourceTree = "<group>"; };
199BC7D71C9BBE1A00E4E0B8 /* MassageViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MassageViewController.h; sourceTree = "<group>"; }; 199BC7D71C9BBE1A00E4E0B8 /* MassageViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MassageViewController.h; sourceTree = "<group>"; };
199BC7D81C9BBE1A00E4E0B8 /* MassageViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MassageViewController.m; sourceTree = "<group>"; }; 199BC7D81C9BBE1A00E4E0B8 /* MassageViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MassageViewController.m; sourceTree = "<group>"; };
19A1C83F1CA27564003E5DD9 /* UserInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserInfo.h; sourceTree = "<group>"; };
19A1C8401CA27564003E5DD9 /* UserInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UserInfo.m; sourceTree = "<group>"; };
19DCCACD1C9A9AD60072C3BF /* PrefixHeader.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PrefixHeader.pch; sourceTree = "<group>"; }; 19DCCACD1C9A9AD60072C3BF /* PrefixHeader.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PrefixHeader.pch; sourceTree = "<group>"; };
19DCCB0B1C9A9EB30072C3BF /* IBTAudioController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IBTAudioController.h; sourceTree = "<group>"; }; 19DCCB0B1C9A9EB30072C3BF /* IBTAudioController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IBTAudioController.h; sourceTree = "<group>"; };
19DCCB0C1C9A9EB30072C3BF /* IBTAudioController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IBTAudioController.m; sourceTree = "<group>"; }; 19DCCB0C1C9A9EB30072C3BF /* IBTAudioController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IBTAudioController.m; sourceTree = "<group>"; };
...@@ -411,6 +414,7 @@ ...@@ -411,6 +414,7 @@
1940D2E91C9A56730080678C /* ALand */ = { 1940D2E91C9A56730080678C /* ALand */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
19A1C83E1CA27403003E5DD9 /* Global */,
1929F16E1C9FCFA6000E9B26 /* Assets.xcassets */, 1929F16E1C9FCFA6000E9B26 /* Assets.xcassets */,
19DCCBF21C9AA2180072C3BF /* UIAlertView-Blocks */, 19DCCBF21C9AA2180072C3BF /* UIAlertView-Blocks */,
19DCCBE71C9AA1D50072C3BF /* UserUtil */, 19DCCBE71C9AA1D50072C3BF /* UserUtil */,
...@@ -624,6 +628,15 @@ ...@@ -624,6 +628,15 @@
path = "UIButton+Category"; path = "UIButton+Category";
sourceTree = "<group>"; sourceTree = "<group>";
}; };
19A1C83E1CA27403003E5DD9 /* Global */ = {
isa = PBXGroup;
children = (
19A1C83F1CA27564003E5DD9 /* UserInfo.h */,
19A1C8401CA27564003E5DD9 /* UserInfo.m */,
);
path = Global;
sourceTree = "<group>";
};
19DCCA851C9A95E70072C3BF /* Home */ = { 19DCCA851C9A95E70072C3BF /* Home */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
...@@ -1197,6 +1210,7 @@ ...@@ -1197,6 +1210,7 @@
19DCCB741C9A9EB30072C3BF /* IBTUISearchBar.m in Sources */, 19DCCB741C9A9EB30072C3BF /* IBTUISearchBar.m in Sources */,
19DCCBDB1C9AA0450072C3BF /* GXFButtonAndLineView.m in Sources */, 19DCCBDB1C9AA0450072C3BF /* GXFButtonAndLineView.m in Sources */,
1929F1841CA0EA64000E9B26 /* MoneyView.m in Sources */, 1929F1841CA0EA64000E9B26 /* MoneyView.m in Sources */,
19A1C8411CA27564003E5DD9 /* UserInfo.m in Sources */,
19DCCBC81C9AA0450072C3BF /* NSMutableArray+SafeInsert.m in Sources */, 19DCCBC81C9AA0450072C3BF /* NSMutableArray+SafeInsert.m in Sources */,
19DCCBFA1C9AA2180072C3BF /* UIActionSheet+Blocks.m in Sources */, 19DCCBFA1C9AA2180072C3BF /* UIActionSheet+Blocks.m in Sources */,
19DCCBCA1C9AA0450072C3BF /* NSString+TrimmingAdditions.m in Sources */, 19DCCBCA1C9AA0450072C3BF /* NSString+TrimmingAdditions.m in Sources */,
......
...@@ -21,11 +21,19 @@ ...@@ -21,11 +21,19 @@
// Override point for customization after application launch. // Override point for customization after application launch.
self.window.backgroundColor = [UIColor whiteColor]; self.window.backgroundColor = [UIColor whiteColor];
[self.window makeKeyAndVisible]; [self.window makeKeyAndVisible];
BaseViewController *baseVC = [[BaseViewController alloc] init];
self.window.rootViewController = baseVC;
// LoginViewController *baseVC = [[LoginViewController alloc] init]; if ([UserInfo shareInstance].userName) {
// IBTUINavigationController *navc = [[IBTUINavigationController alloc] initWithRootViewController:baseVC]; BaseViewController *baseVC = [[BaseViewController alloc] init];
// self.window.rootViewController = navc; self.window.rootViewController = baseVC;
}else{
LoginViewController *loginVC = [[LoginViewController alloc] init];
IBTUINavigationController *navc = [[IBTUINavigationController alloc] initWithRootViewController:loginVC];
self.window.rootViewController = navc;
}
return YES; return YES;
} }
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#import "ToLoginViewController.h" #import "ToLoginViewController.h"
#import "ResetPasswordViewController.h" #import "ResetPasswordViewController.h"
#import "BaseViewController.h"
@interface ToLoginViewController () @interface ToLoginViewController ()
@property (weak, nonatomic) IBOutlet UITextField *phoneNumberTextFiled; @property (weak, nonatomic) IBOutlet UITextField *phoneNumberTextFiled;
@property (weak, nonatomic) IBOutlet UITextField *passwordTextFiled; @property (weak, nonatomic) IBOutlet UITextField *passwordTextFiled;
...@@ -25,7 +25,9 @@ ...@@ -25,7 +25,9 @@
- (IBAction)toLoginAction:(UIButton *)sender { - (IBAction)toLoginAction:(UIButton *)sender {
BaseViewController *baseVC = [[BaseViewController alloc] init];
baseVC.modalTransitionStyle = UIModalTransitionStyleCrossDissolve;
[self presentViewController:baseVC animated:YES completion:nil];
} }
......
//
// UserInfo.h
// ALand
//
// Created by Z on 16/3/23.
// Copyright © 2016年 Z. All rights reserved.
//
#import <Foundation/Foundation.h>
@interface UserInfo : NSObject
@property (nonatomic, copy) NSString *userName;
@property (nonatomic, copy) NSString *token;
+ (UserInfo *)shareInstance;
@end
//
// UserInfo.m
// ALand
//
// Created by Z on 16/3/23.
// Copyright © 2016年 Z. All rights reserved.
//
#import "UserInfo.h"
@implementation UserInfo
+ (UserInfo *)shareInstance {
static UserInfo *userInfo = nil;
static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^{
userInfo = [[UserInfo alloc] init];
});
return userInfo;
}
@end
...@@ -13,4 +13,5 @@ ...@@ -13,4 +13,5 @@
#import "UIView+SDAutoLayout.h" #import "UIView+SDAutoLayout.h"
#import "UIView+Category.h" #import "UIView+Category.h"
#import "UIImageView+WebCache.h" #import "UIImageView+WebCache.h"
#import "UserInfo.h"
#endif /* IMPHeader_h */ #endif /* IMPHeader_h */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment