From 8fed647c8de0a25a72ef88d558da980fa292c45f Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Mon, 4 Oct 2021 19:12:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E2=80=9C=E8=BD=AC=E5=8F=91?=
 =?UTF-8?q?=E6=97=B6=E9=99=84=E5=8A=A0=E8=AE=BE=E5=A4=87=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E2=80=9D=E5=BC=80=E5=85=B3=E6=97=A0=E6=95=88BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/idormy/sms/forwarder/model/vo/SmsVo.java   | 5 +++++
 1 file changed, 5 insertions(+)

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 f1ab3dcd..73d4a241 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
@@ -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)