diff --git a/lib/common/core/app_config_helper.dart b/lib/common/core/app_config_helper.dart index 45df42b..d088356 100644 --- a/lib/common/core/app_config_helper.dart +++ b/lib/common/core/app_config_helper.dart @@ -1,11 +1,9 @@ -import 'dart:ffi'; import 'dart:io'; import 'package:flutter/cupertino.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; import 'package:package_info_plus/package_info_plus.dart'; -import 'package:wow_english/common/core/sp_const.dart'; import 'package:wow_english/common/core/user_util.dart'; import '../../models/app_config_entity.dart'; @@ -14,6 +12,8 @@ import '../request/dao/system_dao.dart'; class AppConfigHelper { + static const String _prefsKeyAgreementAccepted = "privacy_agreement_accepted"; + static AppConfigEntity? configEntityEntity; static String _versionCode = ''; @@ -56,15 +56,15 @@ class AppConfigHelper { } static void saveAgreementAccepted(bool accepted) { - SpUtil.getInstance().setData(SpConst.prefsKeyAgreementAccepted, accepted); + SpUtil.getInstance().setData(_prefsKeyAgreementAccepted, accepted); } static bool getAgreementAccepted() { - return SpUtil.getInstance().get(SpConst.prefsKeyAgreementAccepted) ?? false; + return SpUtil.getInstance().get(_prefsKeyAgreementAccepted) ?? false; } static void _clearUserData() { - SpUtil.getInstance().remove(SpConst.prefsKeyAgreementAccepted); + SpUtil.getInstance().remove(_prefsKeyAgreementAccepted); } static void exitApp() { diff --git a/lib/common/core/sp_const.dart b/lib/common/core/sp_const.dart deleted file mode 100644 index 547e52a..0000000 --- a/lib/common/core/sp_const.dart +++ /dev/null @@ -1,5 +0,0 @@ -class SpConst { - static const String prefsKeyUserInfo = "key_user_info"; - - static const String prefsKeyAgreementAccepted = "privacy_agreement_accepted"; -} diff --git a/lib/common/core/user_util.dart b/lib/common/core/user_util.dart index 40a227e..fea43a2 100644 --- a/lib/common/core/user_util.dart +++ b/lib/common/core/user_util.dart @@ -2,7 +2,6 @@ import 'dart:convert'; import 'package:flutter/foundation.dart'; import 'package:umeng_common_sdk/umeng_common_sdk.dart'; -import 'package:wow_english/common/core/sp_const.dart'; import 'package:wow_english/models/user_entity.dart'; import 'package:wow_english/route/route.dart'; import 'package:wow_english/utils/sp_util.dart'; @@ -10,6 +9,9 @@ import 'package:wow_english/utils/sp_util.dart'; import '../../utils/audio_player_util.dart'; class UserUtil { + + static const String _prefsKeyUserInfo = "key_user_info"; + static UserEntity? _userEntity; static void saveUser(UserEntity? user) { @@ -41,16 +43,16 @@ class UserUtil { } static void _saveUserJson(String userJson) { - SpUtil.getInstance().setData(SpConst.prefsKeyUserInfo, userJson); + SpUtil.getInstance().setData(_prefsKeyUserInfo, userJson); } static String? _getUserJson() { - return SpUtil.getInstance().get(SpConst.prefsKeyUserInfo); + return SpUtil.getInstance().get(_prefsKeyUserInfo); } static void _clearUserData() { _userEntity = null; - SpUtil.getInstance().remove(SpConst.prefsKeyUserInfo); + SpUtil.getInstance().remove(_prefsKeyUserInfo); } static void logout([bool showPasswordLoginPage = false]) {