diff --git a/lib/modules/settings/controllers/settings_controller.dart b/lib/modules/settings/controllers/settings_controller.dart index 8d5069816..9fe723ee2 100644 --- a/lib/modules/settings/controllers/settings_controller.dart +++ b/lib/modules/settings/controllers/settings_controller.dart @@ -8,6 +8,8 @@ import '../../../data/services/speech_factory.dart'; import '../models/language_model.dart'; //import '../../../data/models/user_model.dart'; import '../../../data/models/user_Info.dart'; +import '../../../modules/login/controllers/googleLogin.dart'; +import '../../../modules/login/controllers/facebookLogin.dart'; class SettingsController extends GetxController { // 语言设置 @@ -222,10 +224,15 @@ class SettingsController extends GetxController { targetLanguage.value = temp; } - void signOut() { + Future signOut() async { // 在此实现退出登录逻辑 _storage.write("logintoken", ""); _storage.write("user_info", ""); + final google = Google(); + final facebook = Facebook(); + + await google.signOutGoogle(); + await facebook.signOutFacebook(); Get.offAllNamed('/login'); } } diff --git a/lib/modules/splash/controllers/splash_controller.dart b/lib/modules/splash/controllers/splash_controller.dart index a26016bb7..b5dd9d823 100644 --- a/lib/modules/splash/controllers/splash_controller.dart +++ b/lib/modules/splash/controllers/splash_controller.dart @@ -78,7 +78,8 @@ class SplashController extends GetxController { Future _navigateToLogin() async { bool isLoggedIn = false; final token = _storage.read('logintoken'); - if (token != "") { + print('getLoginToken:进来了${token}'); + if (token != null && token.isNotEmpty) { isLoggedIn = await getLoginToken(); } if (isLoggedIn) {