From b210243a46175c42e14ecffcb8f464d227c639ed Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Wed, 8 Jun 2022 10:29:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=87=86=E7=A1=AE?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=9F=AD=E4=BF=A1=E5=B9=BF=E6=92=AD=E7=9A=84?=
 =?UTF-8?q?=E5=8D=A1=E6=A7=BD=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sms/forwarder/receiver/SmsReceiver.kt     | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/idormy/sms/forwarder/receiver/SmsReceiver.kt b/app/src/main/java/com/idormy/sms/forwarder/receiver/SmsReceiver.kt
index 3a7fc304..ef5023d4 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/receiver/SmsReceiver.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/receiver/SmsReceiver.kt
@@ -14,6 +14,7 @@ import androidx.work.workDataOf
 import com.google.gson.Gson
 import com.idormy.sms.forwarder.App
 import com.idormy.sms.forwarder.entity.MsgInfo
+import com.idormy.sms.forwarder.utils.PhoneUtils
 import com.idormy.sms.forwarder.utils.SettingUtils
 import com.idormy.sms.forwarder.utils.Worker
 import com.idormy.sms.forwarder.workers.SendWorker
@@ -45,17 +46,25 @@ class SmsReceiver : BroadcastReceiver() {
             Log.d(TAG, "from = $from")
             Log.d(TAG, "content = $content")
 
+            //获取卡槽信息
+            if (App.SimInfoList.isEmpty()) {
+                App.SimInfoList = PhoneUtils.getSimMultiInfo()
+            }
+            Log.e(TAG, "SimInfoList = " + App.SimInfoList.toString())
+
             //TODO：准确获取卡槽信息，目前测试结果只有 subscription 相对靠谱
-            //val slot = intent.extras?.getInt("slot") ?: -1
-            //val simId = intent.extras?.getInt("simId") ?: -1
-            val subscription = intent.extras?.getInt("subscription") ?: -1
-            //Logs.d(TAG, "slot = $slot, simId = $simId, subscription = $subscription")
+            val slot = intent.extras?.getInt("slot") ?: -1
+            val simId = intent.extras?.getInt("simId") ?: slot
+            val subscription = intent.extras?.getInt("subscription") ?: simId
+            Log.d(TAG, "slot = $slot, simId = $simId, subscription = $subscription")
+
             //卡槽id：-1=获取失败、0=卡槽1、1=卡槽2
             var simSlot = -1
             if (App.SimInfoList.isNotEmpty()) {
                 for (simInfo in App.SimInfoList.values) {
                     if (simInfo.mSubscriptionId == subscription) {
                         simSlot = simInfo.mSimSlotIndex
+                        break
                     }
                 }
             }
@@ -67,6 +76,8 @@ class SmsReceiver : BroadcastReceiver() {
             }
 
             val msgInfo = MsgInfo("sms", from, content, Date(), simInfo, simSlot)
+            Log.d(TAG, "msgInfo = $msgInfo")
+
             val request = OneTimeWorkRequestBuilder<SendWorker>()
                 .setInputData(
                     workDataOf(