yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DemoCache整理

Browse Source
This commit is contained in:
huangjian
2022-07-29 18:20:16 +08:00
parent 9a97d6321d
commit ad12c4dbe1
6 changed files with 73 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/yizhuan/erban/ui/setting/LabActivity.java
View File

@@ -68,7 +68,6 @@ public class LabActivity extends BaseActivity {
}
toast("请手动关闭APP重新打开！！");
Env.changeEnv((Env.EnvType) obj);
DemoCache.saveInitDataApiHost(new ArrayList<>());
AuthModel.get().logout().subscribe();
finish();
}

186
core/src/main/java/com/yizhuan/xchat_android_core/DemoCache.java
View File

@@ -1,20 +1,15 @@
package com.yizhuan.xchat_android_core;
import android.content.Context;
import android.text.TextUtils;
import androidx.annotation.Nullable;
import android.text.TextUtils;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.netease.nimlib.sdk.StatusBarNotificationConfig;
import com.netease.nimlib.sdk.auth.LoginInfo;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.auth.entity.AccountInfo;
import com.yizhuan.xchat_android_core.auth.entity.ThirdUserInfo;
import com.yizhuan.xchat_android_core.auth.entity.TicketInfo;
import com.yizhuan.xchat_android_core.gift.bean.GiftListInfo;
import com.yizhuan.xchat_android_core.home.bean.MainTabInfo;
import com.yizhuan.xchat_android_core.initial.SplashComponent;
import com.yizhuan.xchat_android_core.initial.bean.InitInfo;
@@ -22,7 +17,6 @@ import com.yizhuan.xchat_android_core.noble.NobleConfig;
import com.yizhuan.xchat_android_core.noble.NobleRight;
import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils;
import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils;
import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
import com.yizhuan.xchat_android_library.utils.pref.ObjectPref;
import com.yizhuan.xchat_android_library.utils.pref.SettingsPref;
@@ -38,15 +32,9 @@ import java.util.Map;
public class DemoCache {
public static final String KEY_IS_FIRST_HOME_HIGH_PARTY_DIALOG = "IsFirstHomeHighPartyDialog";
public static final String KEY_VIP_RED_POINT = "key_vip_red_point";
private static final String KEY_BOX_MESSAGE = "key_box_message";
private static final String KEY_TICKET_INFO = "TicketInfo";
private static final String KEY_ACCOUNT_INFO = "AccountInfo";
private static final String KEY_THIRD_USER_INFO = "ThirdUserInfo";
private static final String KEY_LOGIN_INFO = "LoginInfo";
private static final String KEY_NOTI_TOGGLE = "NotiToggle";
private static final String KEY_NOTI_CONFIG = "StatusBarNotificationConfig";
private static final String KEY_GIFT_LIST_INFO = "GiftListInfo";
private static final String KEY_FACE_LIST_INFO = "FaceListInfo";
private static final String KEY_INIT_DATA = "InitInfo";
private static final String KEY_INIT_DATA_SAVE_TIME = "InitInfoSavingTime";
@@ -55,39 +43,26 @@ public class DemoCache {
private static final String KEY_INIT_DATA_NOBLE_VERSION = "InitInfoNobleVersion";
private static final String KEY_INIT_DATA_NOBLE_RIGHTS = "InitInfoNobleRights";
private static final String KEY_INIT_DATA_NOBLE_CONFIGS = "InitInfoNobleConfigs";
private static final String KEY_IS_FIRST_EXIT_ROOM = "IsFirstExitRoom";
private static final String KEY_IS_FIRST_MATCH_DIALOG = "IsFirstMatchDialog";
private static final String KEY_IS_FIRST_HIGH_PARTY_DIALOG = "IsFirstHighPartyDialog";
private static final String KEY_FILTRATE_TYPE = "FilTrateType";
private static final String KEY_RED_PACKAGE = "RedPackage";
private static final String KEY_AT_MSG_UUID = "AtMsgUuid";
private static final String KEY_BGM_SINGLE_CYCLE = "key_bgm_single_cycle";
private static final String KEY_SINGLE_ROOM_TIP = "key_single_room_tip";
private static final String KEY_NEW_USER_GIFT = "key_new_user_gift";
private static final String KEY_NEW_USER_CHARGE_GIFT = "key_new_user_charge_gift";
/**
* 保存网页域名
*/
private static final String KEY_INIT_DATA_WEBHOSTNAME = "InitDataWebHostName";
private static final String KEY_MAIN_TAB_DATA = "key_main_tab_data";
/**
* 从 cilent/init 里拿到的候选域名
*/
private static final String KEY_INIT_DATA_API_HOST = "InitDataApiHost";
private static final String KEY_SPEEDY_MESSAGE_GONE_TIME = "SpeedyMessageGoneTime";
private static StatusBarNotificationConfig notificationConfig;
public static Long readSpeedyMessageGoneTime() {
return (Long) ObjectPref.instance(BasicConfig.INSTANCE.getAppContext()).get(KEY_SPEEDY_MESSAGE_GONE_TIME, 0L);
return (Long) ObjectPref.instance().get(KEY_SPEEDY_MESSAGE_GONE_TIME, 0L);
}
public static void saveSpeedyMessageGoneTime(Long savingTime) {
ObjectPref.instance(BasicConfig.INSTANCE.getAppContext()).put(KEY_SPEEDY_MESSAGE_GONE_TIME, savingTime);
ObjectPref.instance().put(KEY_SPEEDY_MESSAGE_GONE_TIME, savingTime);
}
public static Map<String, NobleRight> readNobleRights() {
String string = SettingsPref.instance(BasicConfig.INSTANCE.getAppContext()).getString(KEY_INIT_DATA_NOBLE_RIGHTS, null);
String string = SettingsPref.instance().getString(KEY_INIT_DATA_NOBLE_RIGHTS, null);
if (TextUtils.isEmpty(string)) return null;
return new Gson().fromJson(string,
new TypeToken<Map<String, NobleRight>>() {
@@ -95,15 +70,15 @@ public class DemoCache {
}
public static void saveNobleRights(String json) {
SettingsPref.instance(BasicConfig.INSTANCE.getAppContext()).putString(KEY_INIT_DATA_NOBLE_RIGHTS, json);
SettingsPref.instance().putString(KEY_INIT_DATA_NOBLE_RIGHTS, json);
}
public static void saveNobleConfigs(String json) {
SettingsPref.instance(BasicConfig.INSTANCE.getAppContext()).putString(KEY_INIT_DATA_NOBLE_CONFIGS, json);
SettingsPref.instance().putString(KEY_INIT_DATA_NOBLE_CONFIGS, json);
}
public static Map<String, NobleConfig> readNobleConfigs() {
String string = SettingsPref.instance(BasicConfig.INSTANCE.getAppContext()).getString(KEY_INIT_DATA_NOBLE_CONFIGS, null);
String string = SettingsPref.instance().getString(KEY_INIT_DATA_NOBLE_CONFIGS, null);
if (TextUtils.isEmpty(string)) return null;
return new Gson().fromJson(string,
new TypeToken<Map<String, NobleConfig>>() {
@@ -153,83 +128,51 @@ public class DemoCache {
public static void saveBoolean(String key, boolean value) {
SettingsPref.instance(BasicConfig.INSTANCE.getAppContext()).putBoolean(key, value);
SettingsPref.instance().putBoolean(key, value);
}
public static Boolean readBoolean(String key, boolean defult) {
return SettingsPref.instance(BasicConfig.INSTANCE.getAppContext()).getBoolean(key, defult);
}
public static void saveFilTrateType(int type) {
SettingsPref.instance(BasicConfig.INSTANCE.getAppContext()).putInt(KEY_FILTRATE_TYPE, type);
}
public static int readFilTrateType() {
return SettingsPref.instance(BasicConfig.INSTANCE.getAppContext()).getInt(KEY_FILTRATE_TYPE, 3);
}
public static void saveFirstHighPartyDialog() {
SettingsPref.instance(BasicConfig.INSTANCE.getAppContext()).putBoolean(KEY_IS_FIRST_HIGH_PARTY_DIALOG, false);
}
public static boolean readFirstHighPartyDialog() {
return SettingsPref.instance(BasicConfig.INSTANCE.getAppContext()).getBoolean(KEY_IS_FIRST_HIGH_PARTY_DIALOG, true);
}
public static void saveFirstMatchDialog() {
SettingsPref.instance(BasicConfig.INSTANCE.getAppContext()).putBoolean(KEY_IS_FIRST_MATCH_DIALOG, false);
}
public static boolean readFirstMatchDialog() {
return SettingsPref.instance(BasicConfig.INSTANCE.getAppContext()).getBoolean(KEY_IS_FIRST_MATCH_DIALOG, true);
}
public static void saveFirstExitRoom() {
SettingsPref.instance(BasicConfig.INSTANCE.getAppContext()).putBoolean(KEY_IS_FIRST_EXIT_ROOM, false);
}
public static boolean readFirstExitRoom() {
return SettingsPref.instance(BasicConfig.INSTANCE.getAppContext()).getBoolean(KEY_IS_FIRST_EXIT_ROOM, true);
return SettingsPref.instance().getBoolean(key, defult);
}
public static String readNobleVersion() {
return SettingsPref.instance(BasicConfig.INSTANCE.getAppContext()).getString(KEY_INIT_DATA_NOBLE_VERSION);
return SettingsPref.instance().getString(KEY_INIT_DATA_NOBLE_VERSION);
}
public static void saveNobleVersion(String version) {
SettingsPref.instance(BasicConfig.INSTANCE.getAppContext()).putString(KEY_INIT_DATA_NOBLE_VERSION, version);
SettingsPref.instance().putString(KEY_INIT_DATA_NOBLE_VERSION, version);
}
public static String readSplashPicture() {
return SettingsPref.instance(BasicConfig.INSTANCE.getAppContext()).getString(KEY_INIT_DATA_SPLASH_PICTURE);
return SettingsPref.instance().getString(KEY_INIT_DATA_SPLASH_PICTURE);
}
public static void saveSplashPicture(String path) {
SettingsPref.instance(BasicConfig.INSTANCE.getAppContext()).putString(KEY_INIT_DATA_SPLASH_PICTURE, path);
SettingsPref.instance().putString(KEY_INIT_DATA_SPLASH_PICTURE, path);
}
public static Long readInitInfoSavingTime() {
return (Long) ObjectPref.instance(BasicConfig.INSTANCE.getAppContext()).get(KEY_INIT_DATA_SAVE_TIME, System.currentTimeMillis());
return (Long) ObjectPref.instance().get(KEY_INIT_DATA_SAVE_TIME, System.currentTimeMillis());
}
public static void saveInitInfoSavingTime(Long savingTime) {
ObjectPref.instance(BasicConfig.INSTANCE.getAppContext()).put(KEY_INIT_DATA_SAVE_TIME, savingTime);
ObjectPref.instance().put(KEY_INIT_DATA_SAVE_TIME, savingTime);
}
public static SplashComponent readSplashInfo() {
return (SplashComponent) ObjectPref.instance(BasicConfig.INSTANCE.getAppContext()).readObject(KEY_INIT_DATA_SPLASH_DATA);
return (SplashComponent) ObjectPref.instance().readObject(KEY_INIT_DATA_SPLASH_DATA);
}
public static void saveSplashInfo(SplashComponent splashComponent) {
ObjectPref.instance(BasicConfig.INSTANCE.getAppContext()).saveObject(KEY_INIT_DATA_SPLASH_DATA, splashComponent);
ObjectPref.instance().saveObject(KEY_INIT_DATA_SPLASH_DATA, splashComponent);
}
public static InitInfo readInitInfo() {
return (InitInfo) ObjectPref.instance(BasicConfig.INSTANCE.getAppContext()).readObject(KEY_INIT_DATA);
return (InitInfo) ObjectPref.instance().readObject(KEY_INIT_DATA);
}
public static void saveInitInfo(InitInfo initInfo) {
ObjectPref.instance(BasicConfig.INSTANCE.getAppContext()).saveObject(KEY_INIT_DATA, initInfo);
ObjectPref.instance().saveObject(KEY_INIT_DATA, initInfo);
}
@Nullable
@@ -247,59 +190,27 @@ public class DemoCache {
@Nullable
public static String readFaceList() {
return (String) ObjectPref.instance(BasicConfig.INSTANCE.getAppContext()).get(KEY_FACE_LIST_INFO, null);
return (String) ObjectPref.instance().get(KEY_FACE_LIST_INFO, null);
}
public static void saveFaceList(String encrypt) {
ObjectPref.instance(BasicConfig.INSTANCE.getAppContext()).put(KEY_FACE_LIST_INFO, encrypt);
}
public static void saveGiftList(GiftListInfo giftListInfo) {
ObjectPref.instance(BasicConfig.INSTANCE.getAppContext()).saveObject(KEY_GIFT_LIST_INFO, giftListInfo);
}
public static GiftListInfo readGiftList() {
return (GiftListInfo) ObjectPref.instance(BasicConfig.INSTANCE.getAppContext()).readObject(KEY_GIFT_LIST_INFO);
}
public static void saveTicketInfo(TicketInfo ticketInfo) {
ObjectPref.instance(BasicConfig.INSTANCE.getAppContext()).saveObject(KEY_TICKET_INFO, ticketInfo);
ObjectPref.instance().put(KEY_FACE_LIST_INFO, encrypt);
}
public static void saveCurrentAccountInfo(AccountInfo accountInfo) {
ObjectPref.instance(BasicConfig.INSTANCE.getAppContext()).saveObject(KEY_ACCOUNT_INFO, accountInfo);
}
public static void saveThirdUserInfo(ThirdUserInfo accountInfo) {
ObjectPref.instance(BasicConfig.INSTANCE.getAppContext()).saveObject(KEY_THIRD_USER_INFO, accountInfo);
}
public static void saveLoginInfo(LoginInfo loginInfo) {
ObjectPref.instance(BasicConfig.INSTANCE.getAppContext()).saveObject(KEY_LOGIN_INFO, loginInfo);
ObjectPref.instance().saveObject(KEY_ACCOUNT_INFO, accountInfo);
}
public static AccountInfo readCurrentAccountInfo() {
return (AccountInfo) ObjectPref.instance(BasicConfig.INSTANCE.getAppContext()).readObject(KEY_ACCOUNT_INFO);
return (AccountInfo) ObjectPref.instance().readObject(KEY_ACCOUNT_INFO);
}
public static ThirdUserInfo readThirdUserInfo() {
return (ThirdUserInfo) ObjectPref.instance(BasicConfig.INSTANCE.getAppContext()).readObject(KEY_THIRD_USER_INFO);
public static void saveTicketInfo(TicketInfo ticketInfo) {
ObjectPref.instance().saveObject(KEY_TICKET_INFO, ticketInfo);
}
public static TicketInfo readTicketInfo() {
return (TicketInfo) ObjectPref.instance(BasicConfig.INSTANCE.getAppContext()).readObject(KEY_TICKET_INFO);
}
public static LoginInfo readLoginInfo(Context context) {
return (LoginInfo) ObjectPref.instance(context).readObject(KEY_LOGIN_INFO);
}
public static boolean readNotificationToggle() {
return SettingsPref.instance(BasicConfig.INSTANCE.getAppContext()).getBoolean(KEY_NOTI_TOGGLE, true);
}
public static void setNotificationToggle(boolean isOpen) {
SettingsPref.instance(BasicConfig.INSTANCE.getAppContext()).putBoolean(KEY_NOTI_TOGGLE, isOpen);
return (TicketInfo) ObjectPref.instance().readObject(KEY_TICKET_INFO);
}
public static StatusBarNotificationConfig getNotificationConfig() {
@@ -310,72 +221,47 @@ public class DemoCache {
DemoCache.notificationConfig = notificationConfig;
}
public static void saveStatusBarNotificationConfig(StatusBarNotificationConfig notificationConfig) {
ObjectPref.instance(BasicConfig.INSTANCE.getAppContext()).put(KEY_NOTI_CONFIG, notificationConfig);
}
public static StatusBarNotificationConfig readStatusBarNotificationConfig() {
return (StatusBarNotificationConfig) ObjectPref.instance(BasicConfig.INSTANCE.getAppContext()).readObject(KEY_NOTI_CONFIG);
}
public static String readWebHostName() {
return (String) ObjectPref.instance(BasicConfig.INSTANCE.getAppContext()).readObject(KEY_INIT_DATA_WEBHOSTNAME);
}
public static void saveWebHostName(String webHostName) {
ObjectPref.instance(BasicConfig.INSTANCE.getAppContext()).saveObject(KEY_INIT_DATA_WEBHOSTNAME, webHostName);
}
public static List<String> readInitDataApiHost() {
return (List<String>) ObjectPref.instance(BasicConfig.INSTANCE.getAppContext()).readObject(KEY_INIT_DATA_API_HOST);
}
public static void saveInitDataApiHost(List<String> initDataApiHost) {
ObjectPref.instance(BasicConfig.INSTANCE.getAppContext()).saveObject(KEY_INIT_DATA_API_HOST, initDataApiHost);
}
public static void saveNeedBoxMsg(boolean value) {
SettingsPref.instance(BasicConfig.INSTANCE.getAppContext()).putBoolean(KEY_BOX_MESSAGE + AuthModel.get().getCurrentUid(), value);
SettingsPref.instance().putBoolean(KEY_BOX_MESSAGE + AuthModel.get().getCurrentUid(), value);
}
public static Boolean readNeedBoxMsg() {
return SettingsPref.instance(BasicConfig.INSTANCE.getAppContext()).getBoolean(KEY_BOX_MESSAGE + AuthModel.get().getCurrentUid(), true);
return SettingsPref.instance().getBoolean(KEY_BOX_MESSAGE + AuthModel.get().getCurrentUid(), true);
}
public static void saveBgmSingleCycle(boolean value) {
SettingsPref.instance(BasicConfig.INSTANCE.getAppContext()).putBoolean(KEY_BGM_SINGLE_CYCLE , value);
SettingsPref.instance().putBoolean(KEY_BGM_SINGLE_CYCLE, value);
}
public static Boolean readBgmSingleCycle() {
return SettingsPref.instance(BasicConfig.INSTANCE.getAppContext()).getBoolean(KEY_BGM_SINGLE_CYCLE, false);
return SettingsPref.instance().getBoolean(KEY_BGM_SINGLE_CYCLE, false);
}
public static void saveSingleRoomTip(boolean value) {
SettingsPref.instance(BasicConfig.INSTANCE.getAppContext()).putBoolean(KEY_SINGLE_ROOM_TIP , value);
SettingsPref.instance().putBoolean(KEY_SINGLE_ROOM_TIP, value);
}
public static Boolean readSingleRoomTip() {
return SettingsPref.instance(BasicConfig.INSTANCE.getAppContext()).getBoolean(KEY_SINGLE_ROOM_TIP, true);
return SettingsPref.instance().getBoolean(KEY_SINGLE_ROOM_TIP, true);
}
public static void saveNewUserGift(boolean value) {
SettingsPref.instance(BasicConfig.INSTANCE.getAppContext()).putBoolean(KEY_NEW_USER_GIFT , value);
SettingsPref.instance().putBoolean(KEY_NEW_USER_GIFT, value);
}
public static Boolean readNewUserGift() {
return SettingsPref.instance(BasicConfig.INSTANCE.getAppContext()).getBoolean(KEY_NEW_USER_GIFT, true);
return SettingsPref.instance().getBoolean(KEY_NEW_USER_GIFT, true);
}
/**
*
* @param value 0初始值 1 需要弹窗 2 不需要弹窗
*/
public static void saveNewUserChargeGift(int value) {
SettingsPref.instance(BasicConfig.INSTANCE.getAppContext()).putInt(KEY_NEW_USER_CHARGE_GIFT , value);
SettingsPref.instance().putInt(KEY_NEW_USER_CHARGE_GIFT, value);
}
public static int readNewUserChargeGift() {
return SettingsPref.instance(BasicConfig.INSTANCE.getAppContext()).getInt(KEY_NEW_USER_CHARGE_GIFT, 0);
return SettingsPref.instance().getInt(KEY_NEW_USER_CHARGE_GIFT, 0);
}

10
core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java
View File

@@ -27,7 +27,11 @@ import com.yizhuan.xchat_android_core.auth.event.GetCurrentUidEvent;
import com.yizhuan.xchat_android_core.auth.event.KickOutEvent;
import com.yizhuan.xchat_android_core.auth.event.LoginEvent;
import com.yizhuan.xchat_android_core.auth.event.LogoutEvent;
import com.yizhuan.xchat_android_core.auth.exception.*;
import com.yizhuan.xchat_android_core.auth.exception.AccountCancelException;
import com.yizhuan.xchat_android_core.auth.exception.BanAccountException;
import com.yizhuan.xchat_android_core.auth.exception.BigHeadPhoneException;
import com.yizhuan.xchat_android_core.auth.exception.IsSuperAdminException;
import com.yizhuan.xchat_android_core.auth.exception.ShowPhoneCodeException;
import com.yizhuan.xchat_android_core.base.BaseModel;
import com.yizhuan.xchat_android_core.bean.response.ServiceResult;
import com.yizhuan.xchat_android_core.bean.response.result.LoginResult;
@@ -38,7 +42,6 @@ import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachParser;
import com.yizhuan.xchat_android_core.initial.InitialModel;
import com.yizhuan.xchat_android_core.linked.LinkedModel;
import com.yizhuan.xchat_android_core.linked.bean.LinkedInfo;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.utils.APIEncryptUtil;
import com.yizhuan.xchat_android_core.utils.CheckUtils;
import com.yizhuan.xchat_android_core.utils.OldHttpErrorHandleUtil;
@@ -398,7 +401,6 @@ public class AuthModel extends BaseModel implements IAuthModel {
thirdUserInfo.setUserName(platform.getDb().getUserName());
thirdUserInfo.setUserGender(platform.getDb().getUserGender());
thirdUserInfo.setUserIcon(platform.getDb().getUserIcon());
DemoCache.saveThirdUserInfo(thirdUserInfo);
e.onSuccess(platform);
}
}
@@ -474,7 +476,6 @@ public class AuthModel extends BaseModel implements IAuthModel {
thirdUserInfo.setUserName(platform.getDb().getUserName());
thirdUserInfo.setUserGender(platform.getDb().getUserGender());
thirdUserInfo.setUserIcon(platform.getDb().getUserIcon());
DemoCache.saveThirdUserInfo(thirdUserInfo);
e.onSuccess(platform);
}
}
@@ -684,7 +685,6 @@ public class AuthModel extends BaseModel implements IAuthModel {
thirdUserInfo = new ThirdUserInfo();
DemoCache.saveCurrentAccountInfo(new AccountInfo());
DemoCache.saveTicketInfo(new TicketInfo());
DemoCache.saveThirdUserInfo(new ThirdUserInfo());
}
private String DESAndBase64(String psw) {

8
core/src/main/java/com/yizhuan/xchat_android_core/initial/InitialModel.java
View File

@@ -234,10 +234,6 @@ public class InitialModel extends BaseModel implements IInitialModel {
SharedPreferenceUtils.setExchangeGoldRate(initInfo.getExchangeGoldRate());
}
if (!TextUtils.isEmpty(initInfo.getWebHostName())) {
DemoCache.saveWebHostName(initInfo.getWebHostName());
}
// 获取公聊大厅的 ID
if (initInfo.getPublicChatRoomId() != 0) {
PublicChatHallDataManager.get().setPublicChatHallId(initInfo.getPublicChatRoomId());
@@ -282,10 +278,6 @@ public class InitialModel extends BaseModel implements IInitialModel {
!TextUtils.isEmpty(initInfo.getUpdateUrl().getAndroidUrl())) {
SharedPreferenceUtils.put(KEY_UPDATE_URL, initInfo.getUpdateUrl().getAndroidUrl());
}
// 候选域名名单更新
DemoCache.saveInitDataApiHost(initInfo.getDomainList());
}
public String getPublicChatHallUid() {

9
library/src/main/java/com/yizhuan/xchat_android_library/utils/pref/ObjectPref.java
View File

@@ -3,8 +3,9 @@ package com.yizhuan.xchat_android_library.utils.pref;
import android.content.Context;
import android.content.SharedPreferences;
public class ObjectPref extends XSharedPref
{
import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
public class ObjectPref extends XSharedPref {
private static ObjectPref sInst;
private ObjectPref(SharedPreferences preferences) {
@@ -19,4 +20,8 @@ public class ObjectPref extends XSharedPref
return sInst;
}
public static ObjectPref instance() {
return instance(BasicConfig.INSTANCE.getAppContext());
}
}

30
library/src/main/java/com/yizhuan/xchat_android_library/utils/pref/SettingsPref.java
View File

@@ -14,32 +14,28 @@ import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
*/
public class SettingsPref extends YSharedPref {
private static SettingsPref instanse;
private static SettingsPref instance;
private SettingsPref(SharedPreferences preferences) {
super(preferences);
}
public synchronized static SettingsPref instance(Context applicationContext) {
if (instance == null) {
SharedPreferences pref = applicationContext.getSharedPreferences("SettingsPrefs", Context.MODE_PRIVATE);
instance = new SettingsPref(pref);
}
return instance;
}
public static SettingsPref instance() {
return instance(BasicConfig.INSTANCE.getAppContext());
}
public SharedPreferences getSharePref() {
return mPref;
}
public synchronized static SettingsPref instance(Context applicationContext) {
if(instanse == null){
SharedPreferences pref = applicationContext.getSharedPreferences("SettingsPrefs", Context.MODE_PRIVATE);
instanse = new SettingsPref(pref);
}
return instanse;
}
public synchronized static SettingsPref instance() {
if(instanse == null){
SharedPreferences pref = BasicConfig.INSTANCE.getAppContext().getSharedPreferences("SettingsPrefs", Context.MODE_PRIVATE);
instanse = new SettingsPref(pref);
}
return instanse;
}
public String getString(String key, String defaultValue) {
return get(key) == null ? defaultValue : get(key);
}