系统用户过滤

core/src/diff_src_erban/java/com/nnbc123/core/home/bean/HomeRoomInfo.java

@@ -43,11 +43,21 @@ public class HomeRoomInfo implements MultiItemEntity, Serializable {
     private boolean needOpenSelfRoom;
     private boolean isChecked;
 
+    private String iconContent;
+
     @Override
     public int getItemType() {
         return isBanner ? TYPE_BANNER : (!TextUtils.isEmpty(broadMsg) ? TYPE_BROADCAST : TYPE_ROOM);
     }
 
+    public String getIconContent() {
+        return iconContent;
+    }
+
+    public void setIconContent(String iconContent) {
+        this.iconContent = iconContent;
+    }
+
     //<editor-fold defaultstate="collapsed" desc="delombok">
     @SuppressWarnings("all")
     public HomeRoomInfo() {

core/src/main/java/com/nnbc123/core/initial/bean/InitInfo.java

@@ -189,6 +189,7 @@ public class InitInfo implements Serializable {
     private double hideCarEffectGiftPrice;
     private int linearlyPoolOpenLevel;
     private List<String> officialMsgUids;
+    private List<String> officialAccountUids;
     private boolean twelveStarSwitch;
 
     //<editor-fold defaultstate="collapsed" desc="delombok">
@@ -196,6 +197,14 @@ public class InitInfo implements Serializable {
     public InitInfo() {
     }
 
+    public List<String> getOfficialAccountUids() {
+        return officialAccountUids;
+    }
+
+    public void setOfficialAccountUids(List<String> officialAccountUids) {
+        this.officialAccountUids = officialAccountUids;
+    }
+
     @SuppressWarnings("all")
     public FaceComponent getFaceJson() {
         return this.faceJson;

core/src/main/java/com/nnbc123/core/pay/PayModel.java

@@ -119,12 +119,7 @@ public class PayModel extends BaseModel implements IPayModel {
                 if (jsonObject == null) return;
                 WalletInfo walletInfo = new WalletInfo();
                 walletInfo.setUid(jsonObject.getLong("uid"));
-                walletInfo.setDepositNum(jsonObject.getIntValue("depositNum"));
-                walletInfo.setDiamondNum(jsonObject.getLong("diamonds"));
-                walletInfo.setGoldNum(jsonObject.getIntValue("golds"));
-                walletInfo.setCrystals(jsonObject.getDoubleValue("crystals"));
-                walletInfo.nobleGoldNum = jsonObject.getDoubleValue("nobleGoldNum");
-                walletInfo.chargeGoldNum = jsonObject.getDoubleValue("chargeGoldNum");
+                walletInfo.setDiamondNum(jsonObject.getDoubleValue("diamonds"));
                 this.walletInfo = walletInfo;
                 // 兼容新版
                 setWalletInfo(walletInfo);

core/src/main/java/com/nnbc123/core/utils/SystemUidUtil.java

@@ -17,8 +17,12 @@ public class SystemUidUtil {
                 initInfo.getOfficialMsgUids().contains(uid)) {
             return true;
         }
-        return XChatConstants.SECRETARY_UID.equals(uid)
-                || XChatConstants.SYSTEM_MESSAGE_UID.equals(uid)
-                || XChatConstants.MATCH_UID.equals(uid);
+
+        if (initInfo != null &&
+                !ListUtils.isListEmpty(initInfo.getOfficialAccountUids()) &&
+                initInfo.getOfficialAccountUids().contains(uid)) {
+            return true;
+        }
+        return false;
     }
 }