fix login bugs

GYDemo/GYDemo.xcodeproj/project.pbxproj

@@ -1023,7 +1023,7 @@
 				CODE_SIGN_ENTITLEMENTS = GYDemo/GYDemo.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 130;
+				CURRENT_PROJECT_VERSION = 131;
 				DEVELOPMENT_TEAM = XWMRLLSSFL;
 				ENABLE_BITCODE = NO;
 				GCC_INCREASE_PRECOMPILED_HEADER_SHARING = NO;
@@ -1055,7 +1055,7 @@
 				CODE_SIGN_ENTITLEMENTS = GYDemo/GYDemo.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 130;
+				CURRENT_PROJECT_VERSION = 131;
 				DEVELOPMENT_TEAM = XWMRLLSSFL;
 				ENABLE_BITCODE = NO;
 				GCC_INCREASE_PRECOMPILED_HEADER_SHARING = NO;

GYDemo/GYDemo/AppDelegate.mm

@@ -770,7 +770,6 @@ NSDictionary* appLaunchOpts;
             [[[self ufw] appController].window makeKeyAndVisible];
             [[CGUserManager shared] addLocCollection:@"tab_imp" value:@"1"];
 
-            
         });
     }];
     if ([[data Read] objectForKey:@"isFirstInstall"]) {
@@ -790,19 +789,41 @@ NSDictionary* appLaunchOpts;
 
 - (void)launchAdSuccesShow {
     
-    NSString *status = [[CGUserManager shared].appSwitch[@"isopenH5"] stringValue];
-    NSLog(@"isopenH5  = %@", status);
-    if ([status isEqualToString:@"1"]) {
-        Data * data = [[Data alloc] init];
-        if([[data Read] objectForKey:@"refresh_token"] == nil) {
-            GYLoginViewController *loginVC = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"GYLoginViewController"];
-            loginVC.modalPresentationStyle = UIModalPresentationFullScreen;
-            UINavigationController *naviVC = [[UINavigationController alloc] initWithRootViewController:loginVC];
-            naviVC.modalPresentationStyle = UIModalPresentationFullScreen;
-            naviVC.view.frame = UIScreen.mainScreen.bounds;
-            [[[self ufw] appController].window.rootViewController.view addSubview:naviVC.view];
-            [[[self ufw] appController].window.rootViewController addChildViewController:naviVC];
+    if ([CGUserManager shared].model == nil) {
+        [[CGUserManager shared] getServiceInfo:^{
+            NSString *status = [[CGUserManager shared].appSwitch[@"isopenH5"] stringValue];
+            NSLog(@"isopenH5  = %@", status);
+            if ([status isEqualToString:@"1"]) {
+                Data * data = [[Data alloc] init];
+                if([[data Read] objectForKey:@"refresh_token"] == nil) {
+                    GYLoginViewController *loginVC = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"GYLoginViewController"];
+                    loginVC.modalPresentationStyle = UIModalPresentationFullScreen;
+                    UINavigationController *naviVC = [[UINavigationController alloc] initWithRootViewController:loginVC];
+                    naviVC.modalPresentationStyle = UIModalPresentationFullScreen;
+                    naviVC.view.frame = UIScreen.mainScreen.bounds;
+                    [[[self ufw] appController].window.rootViewController.view addSubview:naviVC.view];
+                    [[[self ufw] appController].window.rootViewController addChildViewController:naviVC];
+                    
+                }
+            }
+        } failure:^{
             
+        }];
+    } else {
+        NSString *status = [[CGUserManager shared].appSwitch[@"isopenH5"] stringValue];
+        NSLog(@"isopenH5  = %@", status);
+        if ([status isEqualToString:@"1"]) {
+            Data * data = [[Data alloc] init];
+            if([[data Read] objectForKey:@"refresh_token"] == nil) {
+                GYLoginViewController *loginVC = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"GYLoginViewController"];
+                loginVC.modalPresentationStyle = UIModalPresentationFullScreen;
+                UINavigationController *naviVC = [[UINavigationController alloc] initWithRootViewController:loginVC];
+                naviVC.modalPresentationStyle = UIModalPresentationFullScreen;
+                naviVC.view.frame = UIScreen.mainScreen.bounds;
+                [[[self ufw] appController].window.rootViewController.view addSubview:naviVC.view];
+                [[[self ufw] appController].window.rootViewController addChildViewController:naviVC];
+                
+            }
         }
     }
 }