From 439877c67414df2eb5c6eec6f714d1f32992ff9a Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Sun, 26 Jun 2022 13:29:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E8=BF=9C=E7=A8=8B?=
 =?UTF-8?q?=E6=9F=A5=E9=85=8D=E7=BD=AE=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=8D=A1=E6=A7=BD=E4=BF=A1=E6=81=AF=E4=B8=8E=E5=A4=87=E6=B3=A8?=
 =?UTF-8?q?=20#174?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/idormy/sms/forwarder/entity/SimInfo.kt | 11 +++++++++--
 .../forwarder/server/controller/ConfigController.kt | 13 +++++++++++++
 .../idormy/sms/forwarder/server/model/ConfigData.kt |  9 +++++++++
 3 files changed, 31 insertions(+), 2 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 e34b177c..344ccba0 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
@@ -1,20 +1,27 @@
 package com.idormy.sms.forwarder.entity
 
+import com.google.gson.annotations.SerializedName
 import java.io.Serializable
 
 //SIM卡信息
 data class SimInfo(
     //运营商信息：中国移动 中国联通 中国电信
+    @SerializedName("carrier_name")
     var mCarrierName: CharSequence? = null,
-    //卡槽ID，SimSerialNumber
+    //集成电路卡识别码即SIM卡卡号
+    @SerializedName("icc_id")
     var mIccId: CharSequence? = null,
     //卡槽id：-1=没插入、 0=卡槽1 、1=卡槽2
+    @SerializedName("sim_slot_index")
     var mSimSlotIndex: Int = 0,
     //号码
+    @SerializedName("number")
     var mNumber: CharSequence? = null,
-    //城市
+    //国家代码
+    @SerializedName("country_iso")
     var mCountryIso: CharSequence? = null,
     //SIM的 Subscription Id (SIM插入顺序)
+    @SerializedName("subscription_id")
     var mSubscriptionId: Int = 0,
 ) : Serializable {
     override fun toString(): String {
diff --git a/app/src/main/java/com/idormy/sms/forwarder/server/controller/ConfigController.kt b/app/src/main/java/com/idormy/sms/forwarder/server/controller/ConfigController.kt
index 6c88396c..938aecfc 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/server/controller/ConfigController.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/server/controller/ConfigController.kt
@@ -1,9 +1,12 @@
 package com.idormy.sms.forwarder.server.controller
 
 import android.util.Log
+import com.idormy.sms.forwarder.App
 import com.idormy.sms.forwarder.server.model.BaseRequest
 import com.idormy.sms.forwarder.server.model.ConfigData
 import com.idormy.sms.forwarder.utils.HttpServerUtils
+import com.idormy.sms.forwarder.utils.PhoneUtils
+import com.idormy.sms.forwarder.utils.SettingUtils
 import com.yanzhenjie.andserver.annotation.*
 
 @Suppress("PrivatePropertyName")
@@ -19,6 +22,12 @@ class ConfigController {
     fun test(@RequestBody bean: BaseRequest<*>): ConfigData {
         Log.d(TAG, bean.data.toString())
 
+        //获取卡槽信息
+        if (App.SimInfoList.isEmpty()) {
+            App.SimInfoList = PhoneUtils.getSimMultiInfo()
+        }
+        Log.d(TAG, App.SimInfoList.toString())
+
         return ConfigData(
             HttpServerUtils.enableApiClone,
             HttpServerUtils.enableApiSmsSend,
@@ -26,6 +35,10 @@ class ConfigController {
             HttpServerUtils.enableApiCallQuery,
             HttpServerUtils.enableApiContactQuery,
             HttpServerUtils.enableApiBatteryQuery,
+            SettingUtils.extraDeviceMark.toString(),
+            SettingUtils.extraSim1.toString(),
+            SettingUtils.extraSim2.toString(),
+            App.SimInfoList
         )
     }
 
diff --git a/app/src/main/java/com/idormy/sms/forwarder/server/model/ConfigData.kt b/app/src/main/java/com/idormy/sms/forwarder/server/model/ConfigData.kt
index 935f9e1a..e560581a 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/server/model/ConfigData.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/server/model/ConfigData.kt
@@ -1,6 +1,7 @@
 package com.idormy.sms.forwarder.server.model
 
 import com.google.gson.annotations.SerializedName
+import com.idormy.sms.forwarder.entity.SimInfo
 import java.io.Serializable
 
 data class ConfigData(
@@ -16,4 +17,12 @@ data class ConfigData(
     var enableApiContactQuery: Boolean = false,
     @SerializedName("enable_api_battery_query")
     var enableApiBatteryQuery: Boolean = false,
+    @SerializedName("extra_device_mark")
+    var extraDeviceMark: String = "",
+    @SerializedName("extra_sim1")
+    var extraSim1: String = "",
+    @SerializedName("extra_sim2")
+    var extraSim2: String = "",
+    @SerializedName("sim_info_list")
+    var simInfoList: MutableMap<Int, SimInfo> = mutableMapOf(),
 ) : Serializable
\ No newline at end of file