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(), 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(), 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" /> - + android:orientation="horizontal"> + + + + + + + + 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 @@ SIM Slot Same source Receive Mobile Phone Numbers - Separated by ; , e.g. 15888888888;19999999999 + Tips:\n1.Separated by ; , e.g. 15888888888;19999999999\n2.Allow to insert `{{FROM}}` tag to realize SMS auto-reply (SMS/Call scenario) Enable only when no network Notify Content 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 @@ 发送卡槽 原进原出 接收手机 - 多个号码以半角分号分隔,例如:15888888888;19999999999 + Tips:\n1.多个号码以半角分号分隔,例如:15888888888;19999999999\n2.允许插入`{{来源号码}}`标签来实现短信自动回复(短信/来电场景) 仅当无网络时启用 通知文案