修复“转发时附加设备名称”开关无效BUG
This commit is contained in:
parent
f0c06af472
commit
8fed647c8d
|
@ -32,6 +32,7 @@ public class SmsVo implements Serializable {
|
|||
@SuppressLint("SimpleDateFormat")
|
||||
public String getSmsVoForSend() {
|
||||
boolean switchAddExtra = SettingUtil.getSwitchAddExtra();
|
||||
boolean switchAddDeviceName = SettingUtil.getSwitchAddDeviceName();
|
||||
boolean switchSmsTemplate = SettingUtil.getSwitchSmsTemplate();
|
||||
String smsTemplate = SettingUtil.getSmsTemplate().trim();
|
||||
String deviceMark = SettingUtil.getAddExtraDeviceMark().trim();
|
||||
|
@ -43,6 +44,10 @@ public class SmsVo implements Serializable {
|
|||
smsTemplate = smsTemplate.replace("{{卡槽信息}}\n", "").replace("{{卡槽信息}}", "");
|
||||
}
|
||||
|
||||
if (!switchAddDeviceName) {
|
||||
smsTemplate = smsTemplate.replace("\n{{设备名称}}", "").replace("{{设备名称}}", "");
|
||||
}
|
||||
|
||||
return smsTemplate.replace("{{来源号码}}", mobile)
|
||||
.replace("{{短信内容}}", content)
|
||||
.replace("{{卡槽信息}}", simInfo)
|
||||
|
|
Loading…
Reference in New Issue