diff --git a/app/src/main/java/com/idormy/sms/forwarder/model/vo/SmsVo.java b/app/src/main/java/com/idormy/sms/forwarder/model/vo/SmsVo.java index 1fc769e7..0aa6a90b 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/model/vo/SmsVo.java +++ b/app/src/main/java/com/idormy/sms/forwarder/model/vo/SmsVo.java @@ -59,13 +59,14 @@ public class SmsVo implements Serializable { boolean switchSmsTemplate = SettingUtil.getSwitchSmsTemplate(); String smsTemplate = SettingUtil.getSmsTemplate().trim(); String deviceMark = SettingUtil.getAddExtraDeviceMark().trim(); - if (!switchAddExtra) { - smsTemplate = smsTemplate.replace("{{卡槽信息}}\n", "").replace("{{卡槽信息}}", ""); - } if (!switchSmsTemplate) { smsTemplate = "{{来源号码}}\n{{短信内容}}\n{{卡槽信息}}\n{{接收时间}}\n{{设备名称}}"; } + if (!switchAddExtra) { + smsTemplate = smsTemplate.replace("{{卡槽信息}}\n", "").replace("{{卡槽信息}}", ""); + } + return smsTemplate.replace("{{来源号码}}", mobile) .replace("{{短信内容}}", content) .replace("{{卡槽信息}}", simInfo)