4

keyBoard/Class/Me/VM/KBMyVM.m

@@ -11,23 +11,34 @@
 @implementation KBMyVM
 - (void)logout{
     [KBHUD show];
-    [[KBNetworkManager shared] GET:API_LOGOUT parameters:nil headers:nil completion:^(NSDictionary  * jsonOrData, NSURLResponse * _Nullable response, NSError * _Nullable error) {
-        if (error != nil) {
+    [[KBNetworkManager shared] GET:API_LOGOUT
+                        parameters:nil
+                           headers:nil
+                        completion:^(NSDictionary *jsonOrData, NSURLResponse * _Nullable response, NSError * _Nullable error) {
+        // 不管成功失败，都先把 HUD 收掉
+        [KBHUD dismiss];
+
+        if (error) {
+            // 如果是业务错误，可以把服务端 message 提示出来
+            NSString *msg = KBBizMessageFromJSONObject(jsonOrData) ?: error.localizedDescription ?: KBLocalized(@"Network error");
+            [KBHUD showInfo:msg];
             return;
         }
-        NSString *message = jsonOrData[KBMessage];
-//        if (code == KBBizCodeSuccess) {
+
+        NSString *message = jsonOrData[KBMessage] ?: KBLocalized(@"Success");
         [KBHUD showSuccess:message];
-            [[KBUserSessionManager shared] logout];
-            // 登录成功后切换到主 TabBar
-            dispatch_async(dispatch_get_main_queue(), ^{
-                id<UIApplicationDelegate> appDelegate = UIApplication.sharedApplication.delegate;
-                if ([appDelegate respondsToSelector:@selector(setupRootVC)]) {
-                    AppDelegate *delegate = (AppDelegate *)appDelegate;
-                    [delegate setupRootVC];
-                }
-            });
-//        }
+
+        // 本地会话退出
+        [[KBUserSessionManager shared] logout];
+
+        // 回到登录 / 主界面
+        dispatch_async(dispatch_get_main_queue(), ^{
+            id<UIApplicationDelegate> appDelegate = UIApplication.sharedApplication.delegate;
+            if ([appDelegate respondsToSelector:@selector(setupRootVC)]) {
+                AppDelegate *delegate = (AppDelegate *)appDelegate;
+                [delegate setupRootVC];
+            }
+        });
     }];
 }
 @end