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

添加卡槽信息获取补偿机制,修复远程发短信指定卡不明确问题 (#293)

Browse Source
This commit is contained in:
tomcat927 2023-05-07 15:02:19 +08:00 committed by GitHub
parent 42794a5b2c
commit cdf0cae0cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 77 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,6 +91,57 @@ class PhoneUtils private constructor() {
} catch (e: java.lang.Exception) { } catch (e: java.lang.Exception) {
e.printStackTrace() e.printStackTrace()
} }
//仍然获取不到/只获取到一个->取出备注
if (infoList.isEmpty() || infoList.size == 1) {
println("3.直接取出备注框的数据作为信息")
//为空，两个卡都没有获取到信息
if (infoList.isEmpty()) {
//卡1备注信息不为空
var etExtraSim1 = SettingUtils.extraSim1
if (!TextUtils.isEmpty(etExtraSim1)) {
val simInfo1 = SimInfo()
//卡1
simInfo1.mSimSlotIndex = 0
simInfo1.mNumber = etExtraSim1
simInfo1.mSubscriptionId = SettingUtils.subidSim1
//把卡放入
infoList[simInfo1.mSimSlotIndex] = simInfo1
}
//卡2备注信息不为空
var etExtraSim2 = SettingUtils.extraSim2
if (!TextUtils.isEmpty(etExtraSim2)) {
val simInfo2 = SimInfo()
simInfo2.mSimSlotIndex = 1
simInfo2.mNumber = etExtraSim2
simInfo2.mSubscriptionId = SettingUtils.subidSim2
//把卡放入
infoList[simInfo2.mSimSlotIndex] = simInfo2
}
//有一张卡,判断是卡几
} else {
var infoListIndex = -1;
for (obj in infoList) {
infoListIndex = obj.key
}
//获取到卡1，且卡2备注信息不为空
if (infoListIndex == 0 && !TextUtils.isEmpty(SettingUtils.extraSim2)) {
//获取到卡1信息，卡2备注不为空，创建卡2实体
val simInfo2 = SimInfo()
simInfo2.mSimSlotIndex = 1
simInfo2.mNumber = SettingUtils.extraSim2
simInfo2.mSubscriptionId = SettingUtils.subidSim1
infoList[simInfo2.mSimSlotIndex] = simInfo2
} else if (infoListIndex == 1 && !TextUtils.isEmpty(SettingUtils.extraSim1)) {
//获取到卡2信息，卡1备注不为空，创建卡1实体
val simInfo1 = SimInfo()
simInfo1.mSimSlotIndex = 0
simInfo1.mNumber = SettingUtils.extraSim1
simInfo1.mSubscriptionId = SettingUtils.subidSim1
infoList[simInfo1.mSimSlotIndex] = simInfo1
}
}
}
Log.e(TAG, infoList.toString()) Log.e(TAG, infoList.toString())
return infoList return infoList
} }