littlebalalafairy/SmsForwarder
1
0
Fork 0
mirror of https://github.com/pppscn/SmsForwarder synced 2025-08-03 17:37:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

新增：卡槽信息获取补偿机制，修复远程发短信指定卡不明确问题 #293

Browse Source 
格式化代码
This commit is contained in:
pppscn 2023-05-07 15:06:00 +08:00
parent cdf0cae0cf
commit d6b39b09c2
1 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/idormy/sms/forwarder/utils/PhoneUtils.kt
View File

@ -32,7 +32,7 @@ import com.xuexiang.xutil.resource.ResUtils
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.* import java.util.*
@Suppress("PropertyName", "DEPRECATION") @Suppress("DEPRECATION")
class PhoneUtils private constructor() { class PhoneUtils private constructor() {
companion object { companion object {
@ -50,7 +50,7 @@ class PhoneUtils private constructor() {
XUtil.getContext(), permission.READ_PHONE_STATE XUtil.getContext(), permission.READ_PHONE_STATE
) )
val activeSubscriptionInfoList: List<SubscriptionInfo>? = mSubscriptionManager.activeSubscriptionInfoList val activeSubscriptionInfoList: List<SubscriptionInfo>? = mSubscriptionManager.activeSubscriptionInfoList
if (activeSubscriptionInfoList != null && activeSubscriptionInfoList.isNotEmpty()) { if (!activeSubscriptionInfoList.isNullOrEmpty()) {
//1.1.1 有使用的卡，就遍历所有卡 //1.1.1 有使用的卡，就遍历所有卡
for (subscriptionInfo in activeSubscriptionInfoList) { for (subscriptionInfo in activeSubscriptionInfoList) {
val simInfo = SimInfo() val simInfo = SimInfo()
@ -97,7 +97,7 @@ class PhoneUtils private constructor() {
//为空，两个卡都没有获取到信息 //为空，两个卡都没有获取到信息
if (infoList.isEmpty()) { if (infoList.isEmpty()) {
//卡1备注信息不为空 //卡1备注信息不为空
var etExtraSim1 = SettingUtils.extraSim1 val etExtraSim1 = SettingUtils.extraSim1
if (!TextUtils.isEmpty(etExtraSim1)) { if (!TextUtils.isEmpty(etExtraSim1)) {
val simInfo1 = SimInfo() val simInfo1 = SimInfo()
//卡1 //卡1
@ -108,7 +108,7 @@ class PhoneUtils private constructor() {
infoList[simInfo1.mSimSlotIndex] = simInfo1 infoList[simInfo1.mSimSlotIndex] = simInfo1
} }
//卡2备注信息不为空 //卡2备注信息不为空
var etExtraSim2 = SettingUtils.extraSim2 val etExtraSim2 = SettingUtils.extraSim2
if (!TextUtils.isEmpty(etExtraSim2)) { if (!TextUtils.isEmpty(etExtraSim2)) {
val simInfo2 = SimInfo() val simInfo2 = SimInfo()
simInfo2.mSimSlotIndex = 1 simInfo2.mSimSlotIndex = 1
@ -120,7 +120,7 @@ class PhoneUtils private constructor() {
//有一张卡,判断是卡几 //有一张卡,判断是卡几
} else { } else {
var infoListIndex = -1; var infoListIndex = -1
for (obj in infoList) { for (obj in infoList) {
infoListIndex = obj.key infoListIndex = obj.key
} }