From 657eb41547f20d99e55317575c6e0c6313ef6994 Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Mon, 22 Aug 2022 22:35:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A`=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E7=9F=AD=E4=BF=A1`=20=E5=8F=91=E9=80=81=E9=80=9A=E9=81=93?=
 =?UTF-8?q?=E7=9A=84=20`=E6=8E=A5=E6=94=B6=E6=89=8B=E6=9C=BA`=20=E5=85=81?=
 =?UTF-8?q?=E8=AE=B8=E6=8F=92=E5=85=A5=20`{{=E6=9D=A5=E6=BA=90=E5=8F=B7?=
 =?UTF-8?q?=E7=A0=81}}`=20=E6=A0=87=E7=AD=BE=E6=9D=A5=E5=AE=9E=E7=8E=B0?=
 =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E8=87=AA=E5=8A=A8=E5=9B=9E=E5=A4=8D=EF=BC=88?=
 =?UTF-8?q?=E7=9F=AD=E4=BF=A1/=E6=9D=A5=E7=94=B5=E5=9C=BA=E6=99=AF?=
 =?UTF-8?q?=EF=BC=89=20#211?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../forwarder/fragment/senders/SmsFragment.kt |  5 ++++
 .../sms/forwarder/utils/sender/SmsUtils.kt    |  5 +++-
 .../main/res/layout/fragment_senders_sms.xml  | 30 +++++++++++++++----
 app/src/main/res/values-en/strings.xml        |  2 +-
 app/src/main/res/values/strings.xml           |  2 +-
 5 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/SmsFragment.kt b/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/SmsFragment.kt
index e5a6b528..d41a2b4d 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/SmsFragment.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/fragment/senders/SmsFragment.kt
@@ -155,6 +155,7 @@ class SmsFragment : BaseFragment<FragmentSendersSmsBinding?>(), View.OnClickList
     }
 
     override fun initListeners() {
+        binding!!.btInsertSender.setOnClickListener(this)
         binding!!.btnTest.setOnClickListener(this)
         binding!!.btnDel.setOnClickListener(this)
         binding!!.btnSave.setOnClickListener(this)
@@ -165,6 +166,10 @@ class SmsFragment : BaseFragment<FragmentSendersSmsBinding?>(), View.OnClickList
     override fun onClick(v: View) {
         try {
             when (v.id) {
+                R.id.bt_insert_sender -> {
+                    CommonUtils.insertOrReplaceText2Cursor(binding!!.etMobiles, getString(R.string.tag_from))
+                    return
+                }
                 R.id.btn_test -> {
                     mCountDownHelper?.start()
                     Thread {
diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/SmsUtils.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/SmsUtils.kt
index 7d53ac75..24b472d4 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/utils/sender/SmsUtils.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/utils/sender/SmsUtils.kt
@@ -54,9 +54,12 @@ class SmsUtils {
             }
             Log.d(TAG, App.SimInfoList.toString())
 
+            //替换 {{来源号码}} 标签
+            val mobiles = setting.mobiles.replace(ResUtils.getString(R.string.tag_from), msgInfo.from)
+
             //TODO：取不到卡槽信息时，采用默认卡槽发送
             val mSubscriptionId: Int = App.SimInfoList[simSlotIndex]?.mSubscriptionId ?: -1
-            val res: String? = PhoneUtils.sendSms(mSubscriptionId, setting.mobiles, content)
+            val res: String? = PhoneUtils.sendSms(mSubscriptionId, mobiles, content)
             if (res == null) {
                 SendUtils.updateLogs(logId, 2, ResUtils.getString(R.string.request_succeeded))
             } else {
diff --git a/app/src/main/res/layout/fragment_senders_sms.xml b/app/src/main/res/layout/fragment_senders_sms.xml
index 399ce0e0..6f144aab 100644
--- a/app/src/main/res/layout/fragment_senders_sms.xml
+++ b/app/src/main/res/layout/fragment_senders_sms.xml
@@ -99,13 +99,33 @@
                     android:text="@string/SmsMobiles"
                     android:textStyle="bold" />
 
-                <com.xuexiang.xui.widget.edittext.materialedittext.MaterialEditText
-                    android:id="@+id/et_mobiles"
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:hint="@string/SmsMobilesTips"
-                    android:singleLine="true"
-                    app:met_clearButton="true" />
+                    android:orientation="horizontal">
+
+                    <com.xuexiang.xui.widget.edittext.materialedittext.MaterialEditText
+                        android:id="@+id/et_mobiles"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="5"
+                        android:singleLine="true"
+                        app:met_clearButton="true" />
+
+                    <com.xuexiang.xui.widget.button.shadowbutton.RippleShadowShadowButton
+                        android:id="@+id/bt_insert_sender"
+                        style="@style/insertButtonStyle"
+                        android:layout_marginStart="5dp"
+                        android:text="@string/insert_sender" />
+
+                </LinearLayout>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/SmsMobilesTips"
+                    android:textSize="10sp"
+                    tools:ignore="SmallSp" />
 
             </LinearLayout>
 
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index dd482196..164919d5 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -337,7 +337,7 @@
     <string name="SmsSimSlot">SIM Slot</string>
     <string name="same_source">Same source</string>
     <string name="SmsMobiles">Receive Mobile Phone Numbers</string>
-    <string name="SmsMobilesTips">Separated by ; , e.g. 15888888888;19999999999</string>
+    <string name="SmsMobilesTips">Tips:\n1.Separated by ; , e.g. 15888888888;19999999999\n2.Allow to insert `{{FROM}}` tag to realize SMS auto-reply (SMS/Call scenario)</string>
     <string name="OnlyNoNetwork">Enable only when no network</string>
     <!--SettingActivity-->
     <string name="notify_content">Notify Content</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index de570417..e1b37028 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -338,7 +338,7 @@
     <string name="SmsSimSlot">发送卡槽</string>
     <string name="same_source">原进原出</string>
     <string name="SmsMobiles">接收手机</string>
-    <string name="SmsMobilesTips">多个号码以半角分号分隔，例如：15888888888;19999999999</string>
+    <string name="SmsMobilesTips">Tips：\n1.多个号码以半角分号分隔，例如：15888888888;19999999999\n2.允许插入`{{来源号码}}`标签来实现短信自动回复（短信/来电场景）</string>
     <string name="OnlyNoNetwork">仅当无网络时启用</string>
     <!--SettingActivity-->
     <string name="notify_content">通知文案</string>