From 80bc9af9820b10315595f4f79a8faf73bac7de7b Mon Sep 17 00:00:00 2001
From: Matthew <wakinchau@msn.com>
Date: Sat, 22 Jun 2024 14:47:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E7=BB=B4=E6=8F=90=E4=BA=A4=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=B8=AD=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E7=9A=84sim=E5=8D=A1=E6=A7=BD=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

数据形如： slot:1
---
 .../main/java/com/xypower/mpmaster/AppMaster.java    |  5 +++++
 .../java/com/xypower/mpmaster/MpMasterService.java   | 12 ++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java b/mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java
index 81b991b0..136f8056 100644
--- a/mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java
+++ b/mpmaster/src/main/java/com/xypower/mpmaster/AppMaster.java
@@ -259,6 +259,10 @@ public class AppMaster {
                 ex.printStackTrace();
             }
 
+            // if (BuildConfig.DEBUG) {
+            postParams.add(new Pair<String, String>("slot", Integer.toString(mService.getActiveSlotIndex())));
+            // }
+
             try {
                 String battery = getBatteryVoltage() + "V/" + getChargingBatteryVoltage() + "V";
                 postParams.add(new Pair<String, String>("battery", battery));
@@ -370,6 +374,7 @@ public class AppMaster {
             if (items[11] > 0) {
                 stats.add(new Pair<String, String>("i1RebootTimesWk", Integer.toString(items[11])));
             }
+
         } catch (Exception ex) {
             ex.printStackTrace();
         }
diff --git a/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java b/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java
index caee4379..e3c8bdc1 100644
--- a/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java
+++ b/mpmaster/src/main/java/com/xypower/mpmaster/MpMasterService.java
@@ -896,6 +896,18 @@ public class MpMasterService extends Service {
         context.startActivity(LaunchIntent);
     }
 
+    public int getActiveSlotIndex() {
+        Context context = getApplicationContext();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+
+            SubscriptionManager subscriptionManager = (SubscriptionManager) getSystemService(Context.TELEPHONY_SUBSCRIPTION_SERVICE);
+            int activeSubId = SubscriptionManager.getActiveDataSubscriptionId();
+            int activeSlotIdx = SubscriptionManager.getSlotIndex(activeSubId);
+            return activeSlotIdx + 1;
+        }
+        return 0;
+    }
+
     public void selectSimCard(int num) {
         logger.info("Try to Switch To SimCard: " + Integer.toString(num));