From 93fb0b657a76de61dc201ac336288457f6c05bdb Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Mon, 4 Jul 2022 21:40:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9Av3.0.5=E5=9C=A8?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E6=9C=BA=E5=9E=8B=E8=A7=A3=E6=9E=90/config/q?=
 =?UTF-8?q?uery=E8=BF=94=E5=9B=9Esim=5Finfo=5Flist=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E6=97=B6=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/idormy/sms/forwarder/entity/SimInfo.kt  | 8 ++++----
 .../java/com/idormy/sms/forwarder/utils/PhoneUtils.kt     | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/idormy/sms/forwarder/entity/SimInfo.kt b/app/src/main/java/com/idormy/sms/forwarder/entity/SimInfo.kt
index 344ccba0..04f3e3bd 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/entity/SimInfo.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/entity/SimInfo.kt
@@ -7,19 +7,19 @@ import java.io.Serializable
 data class SimInfo(
     //运营商信息：中国移动 中国联通 中国电信
     @SerializedName("carrier_name")
-    var mCarrierName: CharSequence? = null,
+    var mCarrierName: String? = null,
     //集成电路卡识别码即SIM卡卡号
     @SerializedName("icc_id")
-    var mIccId: CharSequence? = null,
+    var mIccId: String? = null,
     //卡槽id：-1=没插入、 0=卡槽1 、1=卡槽2
     @SerializedName("sim_slot_index")
     var mSimSlotIndex: Int = 0,
     //号码
     @SerializedName("number")
-    var mNumber: CharSequence? = null,
+    var mNumber: String? = null,
     //国家代码
     @SerializedName("country_iso")
-    var mCountryIso: CharSequence? = null,
+    var mCountryIso: String? = null,
     //SIM的 Subscription Id (SIM插入顺序)
     @SerializedName("subscription_id")
     var mSubscriptionId: Int = 0,
diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/PhoneUtils.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/PhoneUtils.kt
index fe2a3c33..3d76827d 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/utils/PhoneUtils.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/utils/PhoneUtils.kt
@@ -52,11 +52,11 @@ class PhoneUtils private constructor() {
                         //1.1.1 有使用的卡，就遍历所有卡
                         for (subscriptionInfo in activeSubscriptionInfoList) {
                             val simInfo = SimInfo()
-                            simInfo.mCarrierName = subscriptionInfo.carrierName
-                            simInfo.mIccId = subscriptionInfo.iccId
+                            simInfo.mCarrierName = subscriptionInfo.carrierName.toString()
+                            simInfo.mIccId = subscriptionInfo.iccId.toString()
                             simInfo.mSimSlotIndex = subscriptionInfo.simSlotIndex
-                            simInfo.mNumber = subscriptionInfo.number
-                            simInfo.mCountryIso = subscriptionInfo.countryIso
+                            simInfo.mNumber = subscriptionInfo.number.toString()
+                            simInfo.mCountryIso = subscriptionInfo.countryIso.toString()
                             simInfo.mSubscriptionId = subscriptionInfo.subscriptionId
                             println(simInfo.toString())
                             infoList[simInfo.mSimSlotIndex] = simInfo