diff --git a/app/src/main/java/com/idormy/sms/forwarder/receiver/NetworkChangeReceiver.kt b/app/src/main/java/com/idormy/sms/forwarder/receiver/NetworkChangeReceiver.kt index cbd8d91d..d8ebfc1e 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/receiver/NetworkChangeReceiver.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/receiver/NetworkChangeReceiver.kt @@ -65,13 +65,10 @@ class NetworkChangeReceiver : BroadcastReceiver() { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { TaskUtils.dataSimSlot = getSlotIndex(context) + 1 } + TaskUtils.wifiSsid = "" } else if (networkInfo.type == ConnectivityManager.TYPE_WIFI) { //WiFi网络 TaskUtils.networkState = 2 - //获取WiFi名称 - val wifiManager = context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager - val wifiInfo = wifiManager.connectionInfo - TaskUtils.wifiSsid = wifiInfo.ssid.replace("\"", "") } } else { Log.d(TAG, "Network Disconnected") diff --git a/app/src/main/java/com/idormy/sms/forwarder/workers/NetworkWorker.kt b/app/src/main/java/com/idormy/sms/forwarder/workers/NetworkWorker.kt index 1225f1c5..a711de2a 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/workers/NetworkWorker.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/workers/NetworkWorker.kt @@ -1,6 +1,7 @@ package com.idormy.sms.forwarder.workers import android.content.Context +import android.net.wifi.WifiManager import androidx.work.CoroutineWorker import androidx.work.Data import androidx.work.OneTimeWorkRequestBuilder @@ -100,6 +101,11 @@ class NetworkWorker(context: Context, params: WorkerParameters) : CoroutineWorke //WiFi 2 -> { + //获取WiFi名称 + val wifiManager = App.context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager + val wifiInfo = wifiManager.connectionInfo + TaskUtils.wifiSsid = wifiInfo.ssid.replace("\"", "") + if (networkSetting.wifiSsid.isNotEmpty() && TaskUtils.wifiSsid != networkSetting.wifiSsid) { Log.d(TAG, "TASK-${task.id}:wifiSsid is not match, networkSetting = $networkSetting") continue