Browse Source

合代码冲突

research/11.0
neil 5 years ago
parent
commit
28548fe174
  1. 7
      designer-base/src/main/java/com/fr/design/notification/SnapChat.java
  2. 8
      designer-base/src/main/java/com/fr/design/notification/SnapChatConfig.java

7
designer-base/src/main/java/com/fr/design/notification/SnapChat.java

@ -7,6 +7,13 @@ package com.fr.design.notification;
**/
public interface SnapChat {
/**
* 默认状态
*
* @return 默认状态
*/
boolean defaultStatus();
/**
* 已读
*

8
designer-base/src/main/java/com/fr/design/notification/SnapChatConfig.java

@ -31,8 +31,7 @@ public class SnapChatConfig implements XMLable {
public Boolean hasRead(String key) {
Map<String, Boolean> map = markReadMap;
Boolean val = map.get(key);
return val == null ? Boolean.FALSE : val;
return map.get(key);
}
public void markRead(String key) {
@ -40,6 +39,11 @@ public class SnapChatConfig implements XMLable {
markReadMap.put(key, Boolean.TRUE);
}
public void resetRead(String key) {
markReadMap.put(key, Boolean.FALSE);
}
@Override
public void readXML(XMLableReader reader) {

Loading…
Cancel
Save