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

修复：v3.0.5在部分机型解析/config/query返回sim_info_list节点时报错

Browse Source
This commit is contained in:
pppscn 2022-07-04 21:40:24 +08:00
parent eacaa19517
commit 93fb0b657a
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/idormy/sms/forwarder/entity/SimInfo.kt
View File

@ -7,19 +7,19 @@ import java.io.Serializable
data class SimInfo( data class SimInfo(
//运营商信息：中国移动 中国联通 中国电信 //运营商信息：中国移动 中国联通 中国电信
@SerializedName("carrier_name") @SerializedName("carrier_name")
var mCarrierName: CharSequence? = null, var mCarrierName: String? = null,
//集成电路卡识别码即SIM卡卡号 //集成电路卡识别码即SIM卡卡号
@SerializedName("icc_id") @SerializedName("icc_id")
var mIccId: CharSequence? = null, var mIccId: String? = null,
//卡槽id：-1=没插入、 0=卡槽1 、1=卡槽2 //卡槽id：-1=没插入、 0=卡槽1 、1=卡槽2
@SerializedName("sim_slot_index") @SerializedName("sim_slot_index")
var mSimSlotIndex: Int = 0, var mSimSlotIndex: Int = 0,
//号码 //号码
@SerializedName("number") @SerializedName("number")
var mNumber: CharSequence? = null, var mNumber: String? = null,
//国家代码 //国家代码
@SerializedName("country_iso") @SerializedName("country_iso")
var mCountryIso: CharSequence? = null, var mCountryIso: String? = null,
//SIM的 Subscription Id (SIM插入顺序) //SIM的 Subscription Id (SIM插入顺序)
@SerializedName("subscription_id") @SerializedName("subscription_id")
var mSubscriptionId: Int = 0, var mSubscriptionId: Int = 0,

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

@ -52,11 +52,11 @@ class PhoneUtils private constructor() {
//1.1.1 有使用的卡，就遍历所有卡 //1.1.1 有使用的卡，就遍历所有卡
for (subscriptionInfo in activeSubscriptionInfoList) { for (subscriptionInfo in activeSubscriptionInfoList) {
val simInfo = SimInfo() val simInfo = SimInfo()
simInfo.mCarrierName = subscriptionInfo.carrierName simInfo.mCarrierName = subscriptionInfo.carrierName.toString()
simInfo.mIccId = subscriptionInfo.iccId simInfo.mIccId = subscriptionInfo.iccId.toString()
simInfo.mSimSlotIndex = subscriptionInfo.simSlotIndex simInfo.mSimSlotIndex = subscriptionInfo.simSlotIndex
simInfo.mNumber = subscriptionInfo.number simInfo.mNumber = subscriptionInfo.number.toString()
simInfo.mCountryIso = subscriptionInfo.countryIso simInfo.mCountryIso = subscriptionInfo.countryIso.toString()
simInfo.mSubscriptionId = subscriptionInfo.subscriptionId simInfo.mSubscriptionId = subscriptionInfo.subscriptionId
println(simInfo.toString()) println(simInfo.toString())
infoList[simInfo.mSimSlotIndex] = simInfo infoList[simInfo.mSimSlotIndex] = simInfo