From 94fec0387ff6c1137a6334c449e62cbd99786b1b Mon Sep 17 00:00:00 2001 From: lvxinran Date: Mon, 12 Apr 2021 23:32:38 +0800 Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/mail/MailLogic.java | 9 ++++++--- .../main/java/com/ljsd/jieling/util/CBean2Proto.java | 10 ++++++++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mail/MailLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mail/MailLogic.java index 8a849c89f..75cf4e436 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mail/MailLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mail/MailLogic.java @@ -185,7 +185,7 @@ public class MailLogic { private void getAllMailProtoList(List cMailList, List mailList) { for (Mail mail :cMailList){ - mailList.add(CBean2Proto.getMail(mail)); + mailList.add(CBean2Proto.getMailWithoutContent(mail)); } } @@ -203,11 +203,14 @@ public class MailLogic { mail.setState(Global.MAIL_STATE_READ); mail.setNoUseDeleteTime(TimeUtils.now()+TimeUtils.DAY*Global.MAIL_NOUSE_DELETE_TIME); }else{ - mail.setState(Global.MAIL_DRAW_ST_UNGET); + if(mail.getState()!=Global.MAIL_DRAW_ST_GOT){ + mail.setState(Global.MAIL_DRAW_ST_UNGET); + } } mailManager.addMail(mail); ReportUtil.onReportEvent(user, ReportEventEnum.OPEN_MAIL.getType()); - MessageUtil.sendMessage(iSession, 1,msgId, null, true); + PlayerInfoProto.MailReadResponse.Builder builder = PlayerInfoProto.MailReadResponse.newBuilder().setMailInfo(CBean2Proto.getMail(mail, false)); + MessageUtil.sendMessage(iSession, 1,msgId, builder.build(), true); } /** diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java index 43d5b32a3..b61cb7d8c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -240,22 +240,28 @@ public class CBean2Proto { .build(); }*/ - public static CommonProto.Mail getMail(Mail mail){ + public static CommonProto.Mail getMail(Mail mail,boolean withOutContent){ CommonProto.Mail.Builder mailProto = CommonProto.Mail .newBuilder() .setMailId(mail.getId()) .setHead(mail.getHead()) - .setContent(mail.getContent()) .setState(mail.getState()) .setEffectiveTime(mail.getEffectiveTime()) .setSendTime(mail.getSendTime()) .setSendName(mail.getSendName()) .setMailType(mail.getMailType()); + + if(!withOutContent){ + mailProto.setContent(mail.getContent()); + } if(mail.getMailItem()!=null){ mailProto.setMailItem(mail.getMailItem()); } return mailProto.build(); } + public static CommonProto.Mail getMailWithoutContent(Mail mail){ + return getMail(mail,true); + } public static CommonProto.Equip getEquipProto(PropertyItem equip){