From 9ac3548719d47c3d85606243697b296288ba3027 Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Wed, 22 Nov 2023 20:35:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E7=BD=91=E7=BB=9C?=
=?UTF-8?q?=E7=8A=B6=E6=80=81=E5=8F=98=E5=8C=96=E9=80=9A=E7=9F=A5=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0=E5=BD=93=E5=89=8DWiFi=E5=90=8D=E7=A7=B0(SSID)/?=
=?UTF-8?q?=E7=A7=BB=E5=8A=A8=E6=95=B0=E6=8D=AE=E5=8D=A1=E6=A7=BD=20#355?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../forwarder/service/NetworkStateService.kt | 60 +++++++++----------
app/src/main/res/values-en/strings.xml | 11 ++++
app/src/main/res/values/strings.xml | 11 ++++
3 files changed, 51 insertions(+), 31 deletions(-)
diff --git a/app/src/main/java/com/idormy/sms/forwarder/service/NetworkStateService.kt b/app/src/main/java/com/idormy/sms/forwarder/service/NetworkStateService.kt
index 2b73c59f..3f12af40 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/service/NetworkStateService.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/service/NetworkStateService.kt
@@ -31,7 +31,6 @@ import android.telephony.SubscriptionManager
import androidx.annotation.RequiresApi
import com.idormy.sms.forwarder.App
import com.idormy.sms.forwarder.utils.PhoneUtils
-import com.xuexiang.xutil.resource.ResUtils
import java.lang.reflect.Method
@Suppress("DEPRECATION")
@@ -87,33 +86,35 @@ class NetworkStateService : Service() {
val netStateType = NetworkUtils.getNetStateType()
Log.d(TAG, "netStateType: $netStateType")
val netStateTypeName = when (netStateType) {
- NetworkUtils.NetState.NET_NO -> "没有网络"
- NetworkUtils.NetState.NET_2G -> "2G网络"
- NetworkUtils.NetState.NET_3G -> "3G网络"
- NetworkUtils.NetState.NET_4G -> "4G网络"
- NetworkUtils.NetState.NET_5G -> "5G网络"
- NetworkUtils.NetState.NET_WIFI -> "Wifi"
- NetworkUtils.NetState.NET_ETHERNET -> "有线网络"
- NetworkUtils.NetState.NET_UNKNOWN -> "未知网络"
- else -> "未知网络"
+ NetworkUtils.NetState.NET_NO -> getString(R.string.no_network)
+ NetworkUtils.NetState.NET_2G -> getString(R.string.net_2g)
+ NetworkUtils.NetState.NET_3G -> getString(R.string.net_3g)
+ NetworkUtils.NetState.NET_4G -> getString(R.string.net_4g)
+ NetworkUtils.NetState.NET_5G -> getString(R.string.net_5g)
+ NetworkUtils.NetState.NET_WIFI -> getString(R.string.net_wifi)
+ NetworkUtils.NetState.NET_ETHERNET -> getString(R.string.net_ethernet)
+ NetworkUtils.NetState.NET_UNKNOWN -> getString(R.string.net_unknown)
+ else -> getString(R.string.net_unknown)
}
msg.append(getString(R.string.network_type)).append(": ").append(netStateTypeName).append("\n")
if (netStateType == NetworkUtils.NetState.NET_2G || netStateType == NetworkUtils.NetState.NET_3G || netStateType == NetworkUtils.NetState.NET_4G || netStateType == NetworkUtils.NetState.NET_5G) {
- //获取网络运营商名称：中国移动、中国联通、中国电信
- // 获取 SIM 卡信息
- App.SimInfoList = PhoneUtils.getSimMultiInfo()
- Log.d(TAG, App.SimInfoList.toString())
// 获取当前使用的 SIM index
- val sim_index = getSlotId(context)
- val msgTemp = StringBuilder()
- msgTemp.append("[SIM-").append(sim_index + 1).append("]__")
- msgTemp.append(ResUtils.getString(R.string.carrier_name)).append(": ").append(App.SimInfoList[sim_index]?.mCarrierName)
- msg.append(getString(R.string.operator_name)).append(": ").append(msgTemp).append("\n")
+ val simIndex = getSlotId(context)
+ if (simIndex != -1) {
+ // 获取 SIM 卡信息
+ App.SimInfoList = PhoneUtils.getSimMultiInfo()
+ Log.d(TAG, App.SimInfoList.toString())
+ if (App.SimInfoList[simIndex]?.mCarrierName != null) {
+ //获取网络运营商名称：中国移动、中国联通、中国电信
+ msg.append(getString(R.string.carrier_name)).append(": ").append(App.SimInfoList[simIndex]?.mCarrierName).append("\n")
+ }
+ msg.append(getString(R.string.data_sim_index)).append(": SIM-").append(simIndex + 1).append("\n")
+ }
} else if (netStateType == NetworkUtils.NetState.NET_WIFI) {
//获取当前连接的WiFi名称
val wifiSSID = getWifiSSID(context)
- msg.append("SSID: ").append(wifiSSID).append("\n")
+ msg.append(getString(R.string.wifi_ssid)).append(": ").append(wifiSSID).append("\n")
}
//获取IP地址
@@ -167,6 +168,7 @@ class NetworkStateService : Service() {
}
// 获取数据连接的订阅ID
+ @SuppressLint("DiscouragedPrivateApi")
private fun getDataSubId(context: Context): Int {
val defaultDataSlotId = getDefaultDataSlotId(context)
try {
@@ -194,9 +196,7 @@ class NetworkStateService : Service() {
val subClass = Class.forName(subscriptionManager.javaClass.name)
val getSubID = subClass.getMethod("getDefaultDataSubscriptionInfo")
val subInfo = getSubID.invoke(subscriptionManager) as SubscriptionInfo
- if (subInfo != null) {
- return subInfo.simSlotIndex
- }
+ return subInfo.simSlotIndex
} catch (e: Exception) {
e.printStackTrace()
}
@@ -204,20 +204,18 @@ class NetworkStateService : Service() {
} else {
try {
val cls = Class.forName("android.telephony.SubscriptionManager")
- var getSubId: Method
- try {
- getSubId = cls.getDeclaredMethod("getDefaultDataSubId")
+ val getSubId: Method = try {
+ cls.getDeclaredMethod("getDefaultDataSubId")
} catch (e: NoSuchMethodException) {
- getSubId = cls.getDeclaredMethod("getDefaultDataSubscriptionId")
+ cls.getDeclaredMethod("getDefaultDataSubscriptionId")
}
val subId = getSubId.invoke(null) as Int
- val slotId: Int
- if (Build.VERSION.SDK_INT == Build.VERSION_CODES.LOLLIPOP) {
+ val slotId: Int = if (Build.VERSION.SDK_INT == Build.VERSION_CODES.LOLLIPOP) {
val getSlotId = cls.getDeclaredMethod("getSlotId", Long::class.javaPrimitiveType)
- slotId = getSlotId.invoke(null, subId.toLong()) as Int
+ getSlotId.invoke(null, subId.toLong()) as Int
} else {
val getSlotId = cls.getDeclaredMethod("getSlotId", Int::class.javaPrimitiveType)
- slotId = getSlotId.invoke(null, subId) as Int
+ getSlotId.invoke(null, subId) as Int
}
return slotId
} catch (e: Exception) {
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 8f4d3336..36a1ade5 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -1055,10 +1055,21 @@
Carrier Name
ICC ID
Sim Slot Index
+ Data Sim Slot
Number
Country
Subscription ID
+ No Net
+ 2G Net
+ 3G Net
+ 4G Net
+ 5G Net
+ WiFi
+ Ethernet
+ Unknown
+ WiFi SSID
+
Enable {{LOCATION}} Tag
Insert location info into forwarded msg.
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 59706f2f..bb0a5e2a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1056,10 +1056,21 @@
运营商名
ICC ID
卡槽索引
+ 数据卡槽
手机号码
国家代码
订阅标识
+ 没有网络
+ 2G网络
+ 3G网络
+ 4G网络
+ 5G网络
+ WiFi
+ 有线网络
+ 未知网络
+ WiFi名称
+
启用 {{定位信息}} 标签
在转发信息中插入手机的当前定位信息