5
This commit is contained in:
@@ -94,13 +94,20 @@
|
||||
[self.window makeKeyAndVisible];
|
||||
|
||||
// 根据当前是否已登录决定入口:有 token 进主 TabBar,否则先进入登录页
|
||||
BOOL loggedIn = [[KBUserSessionManager shared] isLoggedIn];
|
||||
// BOOL loggedIn = [[KBUserSessionManager shared] isLoggedIn];
|
||||
UIViewController *rootVC = nil;
|
||||
if (loggedIn) {
|
||||
|
||||
rootVC = [[BaseTabBarController alloc] init];
|
||||
} else {
|
||||
rootVC = [[KBLoginVC alloc] init];
|
||||
}
|
||||
|
||||
self.window.rootViewController = rootVC;
|
||||
}
|
||||
|
||||
- (void)toMainTabbarVC{
|
||||
self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
|
||||
self.window.backgroundColor = [UIColor whiteColor];
|
||||
[self.window makeKeyAndVisible];
|
||||
UIViewController *rootVC = nil;
|
||||
rootVC = [[BaseTabBarController alloc] init];
|
||||
self.window.rootViewController = rootVC;
|
||||
}
|
||||
|
||||
@@ -209,35 +216,37 @@
|
||||
}
|
||||
|
||||
- (void)goLogin{
|
||||
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.25 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
|
||||
KBLoginPopView *view = [[KBLoginPopView alloc] initWithFrame:CGRectMake(0, 0, KB_SCREEN_WIDTH, KB_SCREEN_WIDTH)];
|
||||
// 创建并弹出
|
||||
LSTPopView *pop = [LSTPopView initWithCustomView:view
|
||||
parentView:nil
|
||||
popStyle:LSTPopStyleSmoothFromBottom
|
||||
dismissStyle:LSTDismissStyleSmoothToBottom];
|
||||
pop.hemStyle = LSTHemStyleBottom;
|
||||
pop.bgColor = [[UIColor blackColor] colorWithAlphaComponent:0.4];
|
||||
pop.isClickBgDismiss = YES; // 点击背景关闭
|
||||
pop.cornerRadius = 0; // 自定义 view 自处理圆角
|
||||
|
||||
__weak typeof(pop) weakPop = pop;
|
||||
view.appleLoginHandler = ^{
|
||||
[weakPop dismiss];
|
||||
// 交给 VM 统一处理 Apple 登录 + 服务端登录
|
||||
[[KBLoginVM shared] signInWithAppleFromViewController:KB_CURRENT_NAV completion:^(BOOL success, NSError * _Nullable error) {
|
||||
if (success) {
|
||||
[KBHUD showInfo:KBLocalized(@"Signed in successfully")];
|
||||
} else {
|
||||
NSString *msg = error.localizedDescription ?: KBLocalized(@"Sign-in failed");
|
||||
[KBHUD showInfo:msg];
|
||||
}
|
||||
}];
|
||||
};
|
||||
view.closeHandler = ^{ [weakPop dismiss]; };
|
||||
|
||||
[pop pop];
|
||||
});
|
||||
KBLoginVC *vc = [[KBLoginVC alloc] init];
|
||||
[KB_CURRENT_NAV pushViewController:vc animated:true];
|
||||
// dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.25 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
|
||||
// KBLoginPopView *view = [[KBLoginPopView alloc] initWithFrame:CGRectMake(0, 0, KB_SCREEN_WIDTH, KB_SCREEN_WIDTH)];
|
||||
// // 创建并弹出
|
||||
// LSTPopView *pop = [LSTPopView initWithCustomView:view
|
||||
// parentView:nil
|
||||
// popStyle:LSTPopStyleSmoothFromBottom
|
||||
// dismissStyle:LSTDismissStyleSmoothToBottom];
|
||||
// pop.hemStyle = LSTHemStyleBottom;
|
||||
// pop.bgColor = [[UIColor blackColor] colorWithAlphaComponent:0.4];
|
||||
// pop.isClickBgDismiss = YES; // 点击背景关闭
|
||||
// pop.cornerRadius = 0; // 自定义 view 自处理圆角
|
||||
//
|
||||
// __weak typeof(pop) weakPop = pop;
|
||||
// view.appleLoginHandler = ^{
|
||||
// [weakPop dismiss];
|
||||
// // 交给 VM 统一处理 Apple 登录 + 服务端登录
|
||||
// [[KBLoginVM shared] signInWithAppleFromViewController:KB_CURRENT_NAV completion:^(BOOL success, NSError * _Nullable error) {
|
||||
// if (success) {
|
||||
// [KBHUD showInfo:KBLocalized(@"Signed in successfully")];
|
||||
// } else {
|
||||
// NSString *msg = error.localizedDescription ?: KBLocalized(@"Sign-in failed");
|
||||
// [KBHUD showInfo:msg];
|
||||
// }
|
||||
// }];
|
||||
// };
|
||||
// view.closeHandler = ^{ [weakPop dismiss]; };
|
||||
//
|
||||
// [pop pop];
|
||||
// });
|
||||
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user