邮件修改
parent
2a1e6d891e
commit
94fec0387f
|
@ -185,7 +185,7 @@ public class MailLogic {
|
||||||
|
|
||||||
private void getAllMailProtoList(List<Mail> cMailList, List<CommonProto.Mail> mailList) {
|
private void getAllMailProtoList(List<Mail> cMailList, List<CommonProto.Mail> mailList) {
|
||||||
for (Mail mail :cMailList){
|
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.setState(Global.MAIL_STATE_READ);
|
||||||
mail.setNoUseDeleteTime(TimeUtils.now()+TimeUtils.DAY*Global.MAIL_NOUSE_DELETE_TIME);
|
mail.setNoUseDeleteTime(TimeUtils.now()+TimeUtils.DAY*Global.MAIL_NOUSE_DELETE_TIME);
|
||||||
}else{
|
}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);
|
mailManager.addMail(mail);
|
||||||
ReportUtil.onReportEvent(user, ReportEventEnum.OPEN_MAIL.getType());
|
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -240,22 +240,28 @@ public class CBean2Proto {
|
||||||
.build();
|
.build();
|
||||||
}*/
|
}*/
|
||||||
|
|
||||||
public static CommonProto.Mail getMail(Mail mail){
|
public static CommonProto.Mail getMail(Mail mail,boolean withOutContent){
|
||||||
CommonProto.Mail.Builder mailProto = CommonProto.Mail
|
CommonProto.Mail.Builder mailProto = CommonProto.Mail
|
||||||
.newBuilder()
|
.newBuilder()
|
||||||
.setMailId(mail.getId())
|
.setMailId(mail.getId())
|
||||||
.setHead(mail.getHead())
|
.setHead(mail.getHead())
|
||||||
.setContent(mail.getContent())
|
|
||||||
.setState(mail.getState())
|
.setState(mail.getState())
|
||||||
.setEffectiveTime(mail.getEffectiveTime())
|
.setEffectiveTime(mail.getEffectiveTime())
|
||||||
.setSendTime(mail.getSendTime())
|
.setSendTime(mail.getSendTime())
|
||||||
.setSendName(mail.getSendName())
|
.setSendName(mail.getSendName())
|
||||||
.setMailType(mail.getMailType());
|
.setMailType(mail.getMailType());
|
||||||
|
|
||||||
|
if(!withOutContent){
|
||||||
|
mailProto.setContent(mail.getContent());
|
||||||
|
}
|
||||||
if(mail.getMailItem()!=null){
|
if(mail.getMailItem()!=null){
|
||||||
mailProto.setMailItem(mail.getMailItem());
|
mailProto.setMailItem(mail.getMailItem());
|
||||||
}
|
}
|
||||||
return mailProto.build();
|
return mailProto.build();
|
||||||
}
|
}
|
||||||
|
public static CommonProto.Mail getMailWithoutContent(Mail mail){
|
||||||
|
return getMail(mail,true);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public static CommonProto.Equip getEquipProto(PropertyItem equip){
|
public static CommonProto.Equip getEquipProto(PropertyItem equip){
|
||||||
|
|
Loading…
Reference in New Issue