kanglai
/
kicc-notify-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

111

master
LiuSiXiang-007 1 year ago
parent
b783472472
commit
1413d6f54b
2 changed files with 8 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      app/src/main/java/com/kanglai/push/ui/vm/MessageViewModel.java
  2. 14
      app/src/main/java/com/kanglai/push/util/HistoryMsgUtil.java

2
app/src/main/java/com/kanglai/push/ui/vm/MessageViewModel.java
Unescape View File

@ -59,7 +59,7 @@ public class MessageViewModel extends ToolbarViewModel<MessageFragment> {
public void refresh(RefreshLayout refresh) { public void refresh(RefreshLayout refresh) {
Map<String, LocalPushChatMsg> localHistoryMsg = HistoryMsgUtil.select(); Map<String, LocalPushChatMsg> localHistoryMsg = HistoryMsgUtil.select();
if (localHistoryMsg != null) { if (localHistoryMsg != null && !localHistoryMsg.isEmpty()) {
mActivity.mAdapter.refresh(localHistoryMsg.values()); mActivity.mAdapter.refresh(localHistoryMsg.values());
mActivity.mLoadingLayout.showContent(); mActivity.mLoadingLayout.showContent();
} else mActivity.mLoadingLayout.showEmpty(); } else mActivity.mLoadingLayout.showEmpty();

14
app/src/main/java/com/kanglai/push/util/HistoryMsgUtil.java
Unescape View File

@ -9,7 +9,7 @@ import com.kanglai.push.entity.LocalPushChatMsg;
import com.kanglai.push.entity.User; import com.kanglai.push.entity.User;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.util.Map; import java.util.HashMap;
import java.util.Objects; import java.util.Objects;
import lombok.experimental.UtilityClass; import lombok.experimental.UtilityClass;
@ -19,17 +19,17 @@ public class HistoryMsgUtil {
private User user = CacheDiskUtils.getInstance().getParcelable(CacheConstant.USER_INFO, User.CREATOR, new User()); private User user = CacheDiskUtils.getInstance().getParcelable(CacheConstant.USER_INFO, User.CREATOR, new User());
public Map<String, LocalPushChatMsg> select() { public HashMap<String, LocalPushChatMsg> select() {
String localHistoryMsgJson = CacheDiskUtils.getInstance().getString(user.getId().concat(user.getUserType()) ,""); String localHistoryMsgJson = CacheDiskUtils.getInstance().getString(user.getId().concat(user.getUserType()) ,"");
Type type = new TypeToken<Map<String, LocalPushChatMsg>>(){}.getType(); Type type = new TypeToken<HashMap<String, LocalPushChatMsg>>(){}.getType();
return new Gson().fromJson(localHistoryMsgJson, type); return new Gson().fromJson(localHistoryMsgJson, type);
} }
public void put(String key,LocalPushChatMsg value) { public void put(String key,LocalPushChatMsg value) {
Objects.requireNonNull(key); Objects.requireNonNull(key);
String localHistoryMsgJson = CacheDiskUtils.getInstance().getString(user.getId().concat(user.getUserType()) ,""); String localHistoryMsgJson = CacheDiskUtils.getInstance().getString(user.getId().concat(user.getUserType()) ,"");
Type type = new TypeToken<Map<String, LocalPushChatMsg>>(){}.getType(); Type type = new TypeToken<HashMap<String, LocalPushChatMsg>>(){}.getType();
Map<String, LocalPushChatMsg> localHistoryMsg = Objects.requireNonNullElse(new Gson().fromJson(localHistoryMsgJson, type), MapUtils.newHashMap()); HashMap<String, LocalPushChatMsg> localHistoryMsg = Objects.requireNonNullElse(new Gson().fromJson(localHistoryMsgJson, type), MapUtils.newHashMap());
localHistoryMsg.put(key, value); localHistoryMsg.put(key, value);
String newLocalHistoryMsgJson = new Gson().toJson(localHistoryMsg); String newLocalHistoryMsgJson = new Gson().toJson(localHistoryMsg);
CacheDiskUtils.getInstance().put(user.getId().concat(user.getUserType()), newLocalHistoryMsgJson); CacheDiskUtils.getInstance().put(user.getId().concat(user.getUserType()), newLocalHistoryMsgJson);
@ -38,8 +38,8 @@ public class HistoryMsgUtil {
public void del(String key){ public void del(String key){
Objects.requireNonNull(key); Objects.requireNonNull(key);
String localHistoryMsgJson = CacheDiskUtils.getInstance().getString(user.getId().concat(user.getUserType()) ,""); String localHistoryMsgJson = CacheDiskUtils.getInstance().getString(user.getId().concat(user.getUserType()) ,"");
Type type = new TypeToken<Map<String, LocalPushChatMsg>>(){}.getType(); Type type = new TypeToken<HashMap<String, LocalPushChatMsg>>(){}.getType();
Map<String, LocalPushChatMsg> localHistoryMsg = Objects.requireNonNullElse(new Gson().fromJson(localHistoryMsgJson, type), MapUtils.newHashMap()); HashMap<String, LocalPushChatMsg> localHistoryMsg = Objects.requireNonNullElse(new Gson().fromJson(localHistoryMsgJson, type), MapUtils.newHashMap());
localHistoryMsg.remove(key); localHistoryMsg.remove(key);
String newLocalHistoryMsgJson = new Gson().toJson(localHistoryMsg); String newLocalHistoryMsgJson = new Gson().toJson(localHistoryMsg);
CacheDiskUtils.getInstance().put(user.getId().concat(user.getUserType()), newLocalHistoryMsgJson); CacheDiskUtils.getInstance().put(user.getId().concat(user.getUserType()), newLocalHistoryMsgJson);

Write Preview
Loading…
Cancel
Save