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

修复“转发时附加设备名称”开关无效BUG

Browse Source
This commit is contained in:
pppscn 2021-10-04 19:12:50 +08:00
parent f0c06af472
commit 8fed647c8d
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,6 +32,7 @@ public class SmsVo implements Serializable {
@SuppressLint("SimpleDateFormat") @SuppressLint("SimpleDateFormat")
public String getSmsVoForSend() { public String getSmsVoForSend() {
boolean switchAddExtra = SettingUtil.getSwitchAddExtra(); boolean switchAddExtra = SettingUtil.getSwitchAddExtra();
boolean switchAddDeviceName = SettingUtil.getSwitchAddDeviceName();
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();
@ -43,6 +44,10 @@ public class SmsVo implements Serializable {
smsTemplate = smsTemplate.replace("{{卡槽信息}}\n", "").replace("{{卡槽信息}}", ""); smsTemplate = smsTemplate.replace("{{卡槽信息}}\n", "").replace("{{卡槽信息}}", "");
} }
if (!switchAddDeviceName) {
smsTemplate = smsTemplate.replace("\n{{设备名称}}", "").replace("{{设备名称}}", "");
}
return smsTemplate.replace("{{来源号码}}", mobile) return smsTemplate.replace("{{来源号码}}", mobile)
.replace("{{短信内容}}", content) .replace("{{短信内容}}", content)
.replace("{{卡槽信息}}", simInfo) .replace("{{卡槽信息}}", simInfo)