From a36ece4cd6e2b5b536ac327fe3629843529a5db5 Mon Sep 17 00:00:00 2001
From: miaoc <luoyangchong@163.com>
Date: Mon, 28 Jun 2021 15:42:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E2=80=9C=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=85=B3=E9=97=AD=E5=8D=A1=E6=A7=BD=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=EF=BC=8C=E5=90=8C=E6=97=B6=E4=BD=BF=E7=94=A8=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E6=A8=A1=E6=9D=BF=E6=97=B6=EF=BC=8C=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=8D=A1=E6=A7=BD=E4=BF=A1=E6=81=AF=E4=BB=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E2=80=9D?=
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 | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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)