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; }