littlebalalafairy/SmsForwarder
1
0
Fork 0
mirror of https://github.com/pppscn/SmsForwarder synced 2025-08-04 01:47:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

解决“设置页面关闭卡槽信息，同时使用默认模板时，发送消息卡槽信息仍显示”

Browse Source
This commit is contained in:
miaoc 2021-06-28 15:42:01 +08:00
parent 9508c63b52
commit 074e6d378a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/idormy/sms/forwarder/model/vo/SmsVo.java
View File

@ -59,13 +59,14 @@ public class SmsVo implements Serializable {
boolean switchSmsTemplate = SettingUtil.getSwitchSmsTemplate(); boolean switchSmsTemplate = SettingUtil.getSwitchSmsTemplate();
String smsTemplate = SettingUtil.getSmsTemplate().trim(); String smsTemplate = SettingUtil.getSmsTemplate().trim();
String deviceMark = SettingUtil.getAddExtraDeviceMark().trim(); String deviceMark = SettingUtil.getAddExtraDeviceMark().trim();
if (!switchAddExtra) {
smsTemplate = smsTemplate.replace("{{卡槽信息}}\n", "").replace("{{卡槽信息}}", "");
}
if (!switchSmsTemplate) { if (!switchSmsTemplate) {
smsTemplate = "{{来源号码}}\n{{短信内容}}\n{{卡槽信息}}\n{{接收时间}}\n{{设备名称}}"; smsTemplate = "{{来源号码}}\n{{短信内容}}\n{{卡槽信息}}\n{{接收时间}}\n{{设备名称}}";
} }
if (!switchAddExtra) {
smsTemplate = smsTemplate.replace("{{卡槽信息}}\n", "").replace("{{卡槽信息}}", "");
}
return smsTemplate.replace("{{来源号码}}", mobile) return smsTemplate.replace("{{来源号码}}", mobile)
.replace("{{短信内容}}", content) .replace("{{短信内容}}", content)
.replace("{{卡槽信息}}", simInfo) .replace("{{卡槽信息}}", simInfo)