From 0f645e2dd81564a2678e8249967092f31e060644 Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Thu, 18 Mar 2021 17:01:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=A4=9A=E5=8D=A1=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF&=E8=8E=B7=E5=8F=96=E5=8D=A1=E6=A7=BD=E5=A4=87?=
 =?UTF-8?q?=E6=B3=A8=E4=BC=98=E5=8C=96=EF=BC=88=E6=9A=82=E6=97=B6=E7=A6=81?=
 =?UTF-8?q?=E7=94=A8=E5=8F=8D=E5=B0=84=E8=8E=B7=E5=8F=96=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sms/forwarder/utils/PhoneUtils.java       |  6 ++++--
 .../idormy/sms/forwarder/utils/SimUtil.java   | 20 ++++++++++++++++++-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/PhoneUtils.java b/app/src/main/java/com/idormy/sms/forwarder/utils/PhoneUtils.java
index a1c04485..b7f8fca8 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/utils/PhoneUtils.java
+++ b/app/src/main/java/com/idormy/sms/forwarder/utils/PhoneUtils.java
@@ -388,7 +388,7 @@ public class PhoneUtils {
             }
         }
 
-        Log.d(TAG, "3.通过反射读取卡槽信息，最后通过IMEI去重");
+        /*Log.d(TAG, "3.通过反射读取卡槽信息，最后通过IMEI去重");
         //3.通过反射读取卡槽信息，最后通过IMEI去重
         for (int i = 0; i < getSimCount(); i++) {
             infos.add(getReflexSimInfo(context, i));
@@ -399,7 +399,9 @@ public class PhoneUtils {
                 simInfos.add(new SimInfo());
             }
         }
-        return simInfos;
+        return simInfos;*/
+
+        return infos;
     }
 
     @Nullable
diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/SimUtil.java b/app/src/main/java/com/idormy/sms/forwarder/utils/SimUtil.java
index 3d4c31fe..ede27e6d 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/utils/SimUtil.java
+++ b/app/src/main/java/com/idormy/sms/forwarder/utils/SimUtil.java
@@ -52,12 +52,30 @@ public class SimUtil {
         return 0;
     }
 
+
+    //通过卡槽ID获取SubscriptionId
+    public static int getSubscriptionIdBySimId(int simId) {
+        try {
+            for (PhoneUtils.SimInfo simInfo : MyApplication.SimInfoList) {
+                Log.d(TAG, "mSimSlotIndex = " + simInfo.mSimSlotIndex);
+                if (simInfo.mSimSlotIndex != -1 && simInfo.mSimSlotIndex == simId) {
+                    return simInfo.mSubscriptionId;
+                }
+            }
+        } catch (Exception e) {
+            Log.d(TAG, "getSimExtra Fail: " + e.getMessage());
+        }
+
+        return 0;
+    }
+
     //获取卡槽备注
     public static String getSimInfo(int simId) {
         String res = "";
         try {
             for (PhoneUtils.SimInfo simInfo : MyApplication.SimInfoList) {
-                if (simInfo.mSimSlotIndex + 1 == simId) {
+                Log.d(TAG, String.valueOf(simInfo));
+                if (simInfo.mSimSlotIndex != -1 && simInfo.mSimSlotIndex + 1 == simId) {
                     res = simInfo.mCarrierName + "_" + simInfo.mNumber;
                     break;
                 }