From c9312c3c7447b82e4c7e47ae7e3839f7726f0406 Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Thu, 11 Mar 2021 09:18:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=A1=AB=E5=85=85=E5=8D=A1?=
 =?UTF-8?q?=E6=A7=BD=E4=BF=A1=E6=81=AF=E5=88=B0SIM1=E5=A4=87=E6=B3=A8/SIM2?=
 =?UTF-8?q?=E5=A4=87=E6=B3=A8=EF=BC=88Android=208.0=20=E4=BB=A5=E4=B8=8B?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              |  1 -
 .../sms/forwarder/utils/SettingUtil.java      | 13 +++++++++++--
 .../idormy/sms/forwarder/utils/SimUtil.java   | 19 +++++++++++++++++++
 app/src/main/res/layout/activity_setting.xml  |  4 ++--
 4 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a829422b..0a998f4a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -30,7 +30,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
         <activity
             android:name=".AboutActivity"
             android:label="关于" />
diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/SettingUtil.java b/app/src/main/java/com/idormy/sms/forwarder/utils/SettingUtil.java
index e33817eb..b25b2101 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/utils/SettingUtil.java
+++ b/app/src/main/java/com/idormy/sms/forwarder/utils/SettingUtil.java
@@ -66,7 +66,12 @@ public class SettingUtil {
     }
 
     public static String getAddExtraSim1() {
-        return sp_setting.getString(Define.SP_MSG_KEY_STRING_ADD_EXTRA_SIM1, "");
+        String res = sp_setting.getString(Define.SP_MSG_KEY_STRING_ADD_EXTRA_SIM1, "");
+        Log.d(TAG, "res=" + res);
+        if (res == null || res.equals("")) {
+            res = SimUtil.getSimExtra(1);
+        }
+        return res;
     }
 
     public static void setAddExtraSim1(String sim1) {
@@ -77,7 +82,11 @@ public class SettingUtil {
     }
 
     public static String getAddExtraSim2() {
-        return sp_setting.getString(Define.SP_MSG_KEY_STRING_ADD_EXTRA_SIM2, "");
+        String res = sp_setting.getString(Define.SP_MSG_KEY_STRING_ADD_EXTRA_SIM2, "");
+        if (res == null || res.equals("")) {
+            res = SimUtil.getSimExtra(2);
+        }
+        return res;
     }
 
     public static void setAddExtraSim2(String sim2) {
diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/SimUtil.java b/app/src/main/java/com/idormy/sms/forwarder/utils/SimUtil.java
index 291ae995..dcbe131e 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/utils/SimUtil.java
+++ b/app/src/main/java/com/idormy/sms/forwarder/utils/SimUtil.java
@@ -82,4 +82,23 @@ public class SimUtil {
             //Toast.makeText(MainActivity.this, "获取SIM卡信息失败：请先手动设置", Toast.LENGTH_LONG).show();
         }
     }
+
+    //获取卡槽备注
+    public static String getSimExtra(int simId) {
+        String res = "";
+        try {
+            for (Map.Entry<String, Map> entry : MyApplication.SimInfo.entrySet()) {
+                Map<String, String> sim = entry.getValue();
+                int sim_id = Integer.parseInt(sim.get("sim_id")) + 1;
+                if (sim_id == simId) {
+                    res = sim.get("carrier_name") + "_" + sim.get("phone_number");
+                    break;
+                }
+            }
+        } catch (Exception e) {
+            Log.d(TAG, "getSimExtra Fail: " + e.getMessage());
+        }
+
+        return res;
+    }
 }
diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml
index 6eb6c64a..7cdfd194 100644
--- a/app/src/main/res/layout/activity_setting.xml
+++ b/app/src/main/res/layout/activity_setting.xml
@@ -59,7 +59,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="end"
-                    android:text="运营商-手机号"
+                    android:text="运营商_手机号"
                     android:textSize="9dp" />
             </LinearLayout>
 
@@ -98,7 +98,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="end"
-                    android:text="运营商-手机号"
+                    android:text="运营商_手机号"
                     android:textSize="9dp" />
             </LinearLayout>