Browse Source

退出登录操作

huangyp 6 years ago
parent
commit
c40ed7ede9

+ 55 - 6
UU_Ent/UU_Ent/Modules/App/AppDelegate.m

@@ -24,36 +24,85 @@
     
     [self initializeData];
     
+    [self chooseLoadController];
+    
+    return YES;
+}
+
+/**
+ 选择要启动的页面
+ */
+-(void)chooseLoadController{
+    
+    self.window = [[UIWindow alloc]initWithFrame:[UIScreen mainScreen].bounds];
+    
+    self.window.backgroundColor = [UIColor whiteColor];
+    //自动登录,直接显示主页面
+    if ([YRUserInfo shareManager].isAutoLogin) {
+        
+        YRMainVC *mainVC = [[YRMainVC alloc]init];
+        
+        self.window.rootViewController = mainVC;
+        
+        [YRLoginManager autoLoginsuccess:^{
+            //自动登录成功
+            
+            
+        } failure:^(NSString * _Nonnull errorStr) {
+            //自动登录失败
+            [YRAlertView showWithTitle:nil content:errorStr sureTitle:nil cancelTitle:nil click:^(NSInteger index) {
+               
+                YRLoginVC *loginVC = [[YRLoginVC alloc]init];
+                
+                loginVC.completed = ^(BOOL success) {
+                    
+                    YRMainVC *mainVC = [[YRMainVC alloc]init];
+                    
+                    [UIView animateWithDuration:0.3f animations:^{
+                        
+                        self.window.rootViewController = mainVC;
+                        
+                    }];
+                    
+                    
+                };
+                
+                self.window.rootViewController = loginVC;
+                
+            }];
+            
+        }];
+        
+    }else{
+    
     YRLoginVC *loginVC = [[YRLoginVC alloc]init];
     
     loginVC.completed = ^(BOOL success) {
-      
+        
         YRMainVC *mainVC = [[YRMainVC alloc]init];
         
         [UIView animateWithDuration:0.3f animations:^{
             
             self.window.rootViewController = mainVC;
-           
+            
         }];
         
         
     };
     
-    self.window = [[UIWindow alloc]initWithFrame:[UIScreen mainScreen].bounds];
     
     self.window.rootViewController = loginVC;
     
-    self.window.backgroundColor = [UIColor whiteColor];
+    }
     
     [self.window makeKeyAndVisible];
     //加载动画结束后
     [YRAdView startLoad].loadCompleted = ^{
         
-       
+        
         
     };
     
-    return YES;
 }
 
 /**

+ 1 - 1
UU_Ent/UU_Ent/Modules/Login/Main/Controllers/YRLoginVC.h

@@ -7,7 +7,7 @@
 //
 
 #import "YRBaseVC.h"
-
+#import "YRLoginManager.h"
 NS_ASSUME_NONNULL_BEGIN
 
 @interface YRLoginVC : YRBaseVC

+ 5 - 1
UU_Ent/UU_Ent/Modules/Login/Main/Others/YRLoginManager.m

@@ -113,6 +113,9 @@
             
             if (response.companyArray.count == 1) {
                 
+                //登录成功之后默认设置为自动登录
+                [YRUserInfo shareManager].autoLogin = YES;
+                
                 [YRUserInfo shareManager].currCompanyInfo = response.companyArray[0].mj_keyValues;
                 
                 [YRUserInfo shareManager].lastCompanyInfo = response.companyArray[0].mj_keyValues;
@@ -170,7 +173,8 @@
             [YRUserInfo shareManager].currCompanyInfo = company;
             
             [YRUserInfo shareManager].lastCompanyInfo = company;
-            
+            //登录成功之后默认设置为自动登录
+            [YRUserInfo shareManager].autoLogin = YES;
             
             if (success) {
                 

+ 6 - 0
UU_Ent/UU_Ent/Modules/Mine/Main/Others/YRUserInfo.h

@@ -43,6 +43,12 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property(strong,nonatomic)NSDictionary *lastCompanyInfo;
 
+
+/**
+ 是否自动登录
+ */
+@property(assign,nonatomic,getter=isAutoLogin)BOOL autoLogin;
+
 /**
  是否切换账套
  */

+ 30 - 3
UU_Ent/UU_Ent/Modules/Mine/Main/Others/YRUserInfo.m

@@ -26,14 +26,26 @@
 
 }
 
--(void)setLastCompanyInfo:(NSDictionary *)lastCompanyInfo{
+-(void)setToken:(NSString *)token{
     
-    if (lastCompanyInfo) {
+    if (token) {
         
-        [[NSUserDefaults standardUserDefaults] setObject:lastCompanyInfo forKey:@"UUCompanyLastCompanyInfo"];
+        [[NSUserDefaults standardUserDefaults] setObject:token forKey:@"UUUserInfoToken"];
         
     }
     
+}
+
+-(NSString *)token{
+    
+    return [[NSUserDefaults standardUserDefaults] objectForKey:@"UUUserInfoToken"];
+    
+}
+
+-(void)setLastCompanyInfo:(NSDictionary *)lastCompanyInfo{
+    
+    [[NSUserDefaults standardUserDefaults] setObject:lastCompanyInfo forKey:@"UUCompanyLastCompanyInfo"];
+        
     
 }
 
@@ -43,4 +55,19 @@
     return [[NSUserDefaults standardUserDefaults] objectForKey:@"UUCompanyLastCompanyInfo"];
 
 }
+
+
+-(void)setAutoLogin:(BOOL)autoLogin{
+    
+    [[NSUserDefaults standardUserDefaults] setObject:@(autoLogin) forKey:@"UUUserAutoLoginOrNot"];
+    
+}
+
+
+-(BOOL)isAutoLogin{
+    
+    return [[[NSUserDefaults standardUserDefaults] objectForKey:@"UUUserAutoLoginOrNot"] boolValue];
+    
+}
+
 @end

+ 1 - 0
UU_Ent/UU_Ent/Supporting Files/defines/import.h

@@ -29,6 +29,7 @@
 #import "YRShowMessageFromNavi.h"
 #import "YRBaseNav.h"
 #import "UIPopoverListView.h"
+#import "YRAlertView.h"
 
 //第三方导入
 #import <GRPCClient/GRPCCall+Tests.h>